Merge pull request #53 from lanyulei/dev

fix: 修复主动接单无法使用的bug。

src/views/process/list/handle.vue

@@ -93,9 +93,7 @@
         </div>
         </div>
         <div class="text item" style="text-align: center;margin-top:18px">
         <div class="text item" style="text-align: center;margin-top:18px">
           <div
           <div
-            v-if="
-              processStructureValue.workOrder.state.length > 1 &&
-                currentNode.activeOrder"
+            v-if="isActiveProcessing && currentNode.activeOrder"
           >
           >
             <el-button
             <el-button
               v-permisaction="['process:list:handle:active']"
               v-permisaction="['process:list:handle:active']"
@@ -177,6 +175,7 @@ import { mapGetters } from 'vuex'
 export default {
 export default {
   data() {
   data() {
     return {
     return {
+      isActiveProcessing: false,
       tpls: [],
       tpls: [],
       remarks: '', // 备注信息
       remarks: '', // 备注信息
       alertMessage: '',
       alertMessage: '',
@@ -225,6 +224,7 @@ export default {
         processId: this.$route.query.processId,
         processId: this.$route.query.processId,
         workOrderId: this.$route.query.workOrderId
         workOrderId: this.$route.query.workOrderId
       }).then(response => {
       }).then(response => {
+        this.isActiveProcessing = false
         this.processStructureValue = response.data
         this.processStructureValue = response.data
         this.circulationHistoryList = this.processStructureValue.circulationHistory
         this.circulationHistoryList = this.processStructureValue.circulationHistory
         // 获取当前展示节点列表
         // 获取当前展示节点列表
@@ -251,6 +251,14 @@ export default {
             this.currentNode.writeTpls.push(tplTmp.form_structure.id)
             this.currentNode.writeTpls.push(tplTmp.form_structure.id)
           }
           }
         }
         }
+
+        // 判断是否需要主动处理
+        for (var stateValue of this.processStructureValue.workOrder.state) {
+          if (this.processStructureValue.workOrder.current_state === stateValue.id && stateValue.processor.length > 1) {
+            this.isActiveProcessing = true
+            break
+          }
+        }
         this.getAlertMessage()
         this.getAlertMessage()
       })
       })
     },
     },