ly 特种设备流程修改

master/src/main/resources/processes/MyProcess.bpmn

@@ -58,7 +58,9 @@
     <sequenceFlow id="flow5" name="通过" sourceRef="ctmTask" targetRef="exclusivegateway1">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="flow6" name="结束" sourceRef="zfhzTask" targetRef="endevent3"></sequenceFlow>
+    <sequenceFlow id="flow6" name="结束" sourceRef="zfhzTask" targetRef="endevent3">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
+    </sequenceFlow>
     <sequenceFlow id="flow11" name="通过" sourceRef="wxjlTask" targetRef="gyjlTask">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>
@@ -69,6 +71,9 @@
     <sequenceFlow id="flow14" sourceRef="exclusivegateway1" targetRef="zfhzTask">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${isYlgd== 0}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="flow15" name="不通过" sourceRef="zfhzTask" targetRef="endevent2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_myProcess">
     <bpmndi:BPMNPlane bpmnElement="myProcess" id="BPMNPlane_myProcess">
@@ -162,7 +167,7 @@
         <omgdi:waypoint x="945.0" y="52.0"></omgdi:waypoint>
         <omgdi:waypoint x="989.0" y="52.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="32.0" x="958.0" y="66.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="100.0" x="958.0" y="66.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow11" id="BPMNEdge_flow11">
@@ -174,17 +179,26 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow13" id="BPMNEdge_flow13">
         <omgdi:waypoint x="797.0" y="72.0"></omgdi:waypoint>
-        <omgdi:waypoint x="797.0" y="151.0"></omgdi:waypoint>
-        <omgdi:waypoint x="1007.0" y="151.0"></omgdi:waypoint>
+        <omgdi:waypoint x="797.0" y="119.0"></omgdi:waypoint>
+        <omgdi:waypoint x="905.0" y="119.0"></omgdi:waypoint>
+        <omgdi:waypoint x="1006.0" y="119.0"></omgdi:waypoint>
         <omgdi:waypoint x="1006.0" y="70.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="96.0" x="843.0" y="129.0"></omgdc:Bounds>
+          <omgdc:Bounds height="16.0" width="96.0" x="910.0" y="129.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow14" id="BPMNEdge_flow14">
         <omgdi:waypoint x="817.0" y="52.0"></omgdi:waypoint>
         <omgdi:waypoint x="840.0" y="52.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow15" id="BPMNEdge_flow15">
+        <omgdi:waypoint x="892.0" y="80.0"></omgdi:waypoint>
+        <omgdi:waypoint x="892.0" y="167.0"></omgdi:waypoint>
+        <omgdi:waypoint x="412.0" y="167.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="16.0" width="100.0" x="780.0" y="149.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</definitions>
+</definitions>

ui/src/views/approve/pending/spec-detail.vue

@@ -1243,6 +1243,7 @@
     <span v-if="this.taskName == '政府回执'" slot="footer" class="dialog-footer">
       <el-button v-if="this.dataForm.approveType == 5" type="text" size="small" @click="recordLetter()">{{$t('下载延期检验报请备案函')}}</el-button>
       <el-button v-if="!this.taskForm.taskId == ''" type="primary" @click="dataFormSubmit(1)" :disabled="submitDisabled">{{$t('提交回执')}}</el-button>
+      <el-button v-if="!this.taskForm.taskId == ''" type="danger" @click="dataFormSubmit(0)" :disabled="submitDisabled">{{$t('拒绝')}}</el-button>
     </span>
     <span slot="footer" class="dialog-footer" v-else>
       <el-button v-if="this.taskForm.taskId == ''" @click="visible = false">{{$t('message.return')}}</el-button>