huang_an 2 år sedan
förälder
incheckning
74a0b0dcfa

+ 1 - 1
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/customerReturnOrder.vue

@@ -997,7 +997,7 @@
                 }),
                 returnRecordId: this.form.returnRecordId,
                 id: this.form.id,
-                returnStorageData: this.$refs.inboundDetails.infoData
+                returnStorageData: this.$refs.inboundDetails?.infoData
               };
               resolve(params);
             }

+ 10 - 5
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/inboundDetails.vue

@@ -307,7 +307,7 @@
         <el-table-column label="质检结果" prop="result" width="120">
           <template slot-scope="{ row }">
             <DictSelection
-              v-if="isEdit"
+              v-if="isEdit && metaList?.length <= 0"
               @updateVal="changeWrapStatus($event, row, '包装明细')"
               dictName="质检结果"
               clearable
@@ -363,7 +363,7 @@
         <el-table-column label="质检结果" prop="result" width="120">
           <template slot-scope="{ row }">
             <DictSelection
-              v-if="isEdit"
+              v-if="isEdit && metaList?.length > 0"
               @updateVal="changeWrapStatus($event, row, '物料明细')"
               dictName="质检结果"
               clearable
@@ -423,7 +423,6 @@
     components: {
       WareHouseDailog
     },
-
     data() {
       return {
         codeList: {}, // 物品类型键值对
@@ -515,6 +514,7 @@
           console.log(arr);
           // 首先判断是未填/合格不合格
           let boolen = arr.every((item) => {
+            console.log(item.result);
             return item.result === '' || item.result === undefined;
           });
           // 判断只要物料全部质检结果(未填)——>包装质检结果(未填) 状态(未检)
@@ -566,10 +566,15 @@
               arr.push(inneritem);
             }
           });
-          console.log(arr);
+          console.log('arr--', arr);
           // 首先判断是未填/合格不合格
           let boolen = arr.every((item) => {
-            return item.result === '' || item.result === undefined;
+            console.log(item.result);
+            return (
+              item.result === '' ||
+              item.result === undefined ||
+              item.result === null
+            );
           });
           // 判断只要物料全部质检结果(未填)——>包装质检结果(未填) 状态(未检)
           if (boolen) {

+ 1 - 1
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorProductionStorageQuality.vue

@@ -1221,7 +1221,7 @@
           this.isConfig = true;
           this.formData = deepClone(data);
           // 填充遍历数据
-          console.log('this.formData-----', this.formData);
+          console.log('已经入库this.formData-----', this.formData);
           if (this.formData.outInDetailVOList?.length > 0) {
             this.warehousingMaterialList = []; // 物品列表
             this.materialCodeReqListOrStorage = []; // 包装列表

+ 48 - 7
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/outboundToOutsourcing.vue

@@ -14,7 +14,8 @@
         ></el-col> -->
           <el-col :span="8">
             <el-form-item label="出库场景" prop="bizType">
-              <el-select
+              <span>外协出库</span>
+              <!-- <el-select
                 filterable
                 placeholder="请选择"
                 v-model="formData.bizType"
@@ -32,8 +33,9 @@
                   :value="item.code + ''"
                   :label="item.label"
                 ></el-option>
-              </el-select> </el-form-item
-          ></el-col>
+              </el-select>  -->
+            </el-form-item></el-col
+          >
           <el-col :span="8">
             <el-form-item
               :label="
@@ -107,6 +109,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="出库物品类型" prop="extInfo.assetType">
+              <span>产品</span>
               <!-- <DictSelection
                 dictName="类型用途"
                 :disabled="
@@ -131,7 +134,7 @@
                   :value="item.dictCode"
                 ></el-option>
               </el-select> -->
-              <selectTree
+              <!-- <selectTree
                 ref="trees"
                 class="form-ipt"
                 :isBindPlan="
@@ -151,7 +154,7 @@
                 }"
                 @getValue="codeListValue"
                 :isAll="false"
-              />
+              /> -->
             </el-form-item>
           </el-col>
 
@@ -564,12 +567,12 @@
           </el-tabs>
         </div>
       </div>
-      <div class="center mt20" v-if="!isTask">
+      <!-- <div class="center mt20" v-if="!isTask">
         <el-button type="primary" @click="handleNewSave" :loading="saveLoading"
           >保存</el-button
         >
         <el-button @click="$router.go(-1)">返回</el-button>
-      </div>
+      </div> -->
     </el-card>
 
     <AssetsDialog
@@ -602,6 +605,10 @@
 </template>
 
 <script>
+  import {
+    saleReturnGetByIdAPI,
+    getOutInByIdAPI
+  } from '@/api/bpm/components/saleManage/saleorder';
   import outin from '@/api/warehouseManagement/outin';
   import warehouseDefinition from '@/api/warehouseManagement/warehouseDefinition';
   import { deepClone } from '@/components/FormGenerator/utils/index';
@@ -649,6 +656,24 @@
       // outputType,
       eom
     },
+    props: {
+      taskDefinitionKey: {
+        type: String,
+        default: ''
+      },
+      activeComp: {
+        type: String,
+        default: ''
+      },
+      permissionType: {
+        type: String,
+        default: 'view'
+      },
+      businessId: {
+        type: String,
+        default: ''
+      }
+    },
     data() {
       return {
         isStorage: false,
@@ -743,6 +768,22 @@
     created() {
       this.initData();
     },
+    async mounted() {
+      let info = null;
+      let res = await saleReturnGetByIdAPI(this.businessId);
+      console.logf(res);
+      let outInIds = [...new Set(res?.detailList?.map((item) => item.outInId))];
+      for (const outInId of outInIds) {
+        const data = await getOutInByIdAPI(outInId);
+        info = deepClone(data);
+      }
+      console.log(info);
+      this.formData.bizType = +info.bizType;
+      this.formData.extInfo.assetType = +info.extInfo.assetType;
+      this.$forceUpdate();
+      this.title = '产品';
+      this.selectEquiType = +info.extInfo.assetType;
+    },
     methods: {
       detailData(data, dimension) {
         this.dimension = dimension;

+ 2 - 2
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/repair-tabs-page.vue

@@ -30,10 +30,10 @@
   export default {
     name: 'repairTabsPage',
     components: {
-      outerStoremanOut: () => import('./page1.vue'),
+      outerStoremanOut: () => import('./outboundToOutsourcing.vue'),
       outerStoremanIn: () => import('./page2.vue'),
       outerInQC: () => import('./page1.vue'),
-      innerStoremanIn: () => import('./interiorProductionStorageQuality'),
+      innerStoremanIn: () => import('./interiorProductionStorage'),
       innerInQC: () => import('./interiorProductionStorageQuality')
     },
     props: {

+ 30 - 35
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/submit.vue

@@ -148,23 +148,21 @@
           try {
             const res = await outin.save(storageData);
             data.innerInReceiptId = res.data;
-            const updateRes = await updateReceiptAPI(data);
-            if (updateRes.code == 0) {
-              approveTaskWithVariablesAPI({
-                id: this.taskId,
-                reason: this.form.reason,
-                variables: {
-                  pass: !!pass
-                }
-              }).then((res) => {
-                if (res.code != '-1') {
-                  this.$emit('handleAudit', {
-                    status: pass,
-                    title: !pass ? '驳回' : ''
-                  });
-                }
-              });
-            }
+            await updateReceiptAPI(data);
+            approveTaskWithVariablesAPI({
+              id: this.taskId,
+              reason: this.form.reason,
+              variables: {
+                pass: !!pass
+              }
+            }).then((res) => {
+              if (res.code != '-1') {
+                this.$emit('handleAudit', {
+                  status: pass,
+                  title: !pass ? '驳回' : ''
+                });
+              }
+            });
           } catch (error) {
             console.error('保存失败:', error);
           }
@@ -228,24 +226,21 @@
               const res = await outin.save(storageData);
               console.log('res------------------', res);
               data.returnInReceiptId = res.data;
-              const updateRes = await saleReturnUpdateAPI(data);
-              console.log('updateRes----------', updateRes);
-              if (updateRes.code == 0) {
-                approveTaskWithVariablesAPI({
-                  id: this.taskId,
-                  reason: this.form.reason,
-                  variables: {
-                    pass: !!pass
-                  }
-                }).then((res) => {
-                  if (res.code != '-1') {
-                    this.$emit('handleAudit', {
-                      status: pass,
-                      title: !pass ? '驳回' : ''
-                    });
-                  }
-                });
-              }
+              await saleReturnUpdateAPI(data);
+              approveTaskWithVariablesAPI({
+                id: this.taskId,
+                reason: this.form.reason,
+                variables: {
+                  pass: !!pass
+                }
+              }).then((res) => {
+                if (res.code != '-1') {
+                  this.$emit('handleAudit', {
+                    status: pass,
+                    title: !pass ? '驳回' : ''
+                  });
+                }
+              });
             } catch (error) {
               console.error('保存失败:', error);
             }

+ 340 - 344
src/views/bpm/handleTask/index.vue

@@ -12,7 +12,7 @@
       <el-card class="box-card" v-loading="processInstanceLoading">
         <div slot="header" class="clearfix">
           <span class="el-icon-document"
-          >申请信息【{{ processInstance.name }}】 申请人:【{{
+            >申请信息【{{ processInstance.name }}】 申请人:【{{
               processInstance.startUser?.nickname
             }}】</span
           >
@@ -47,8 +47,6 @@
             :taskDefinitionKey="listData?.taskDefinitionKey"
             @handleAudit="handleAudit"
             @getTableValue="getTableValue"
-            @getReturnStorage="getReturnStorage"
-            @getStatus="getStatus"
             @handleUpdateAssignee="handleUpdateAssignee(item)"
             @handleBackList="handleBackList(item)"
             @submit="submit"
@@ -146,9 +144,8 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitUpdateAssigneeForm"
-          >确 定
-          </el-button
-          >
+            >确 定
+          </el-button>
           <el-button @click="cancelUpdateAssigneeForm">取 消</el-button>
         </div>
       </el-dialog>
@@ -190,9 +187,8 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitUpdateDelegateForm"
-          >确 定
-          </el-button
-          >
+            >确 定
+          </el-button>
           <el-button @click="cancelUpdateDelegateForm">取 消</el-button>
         </div>
       </el-dialog>
@@ -238,7 +234,7 @@
             :disabled="formLoading"
             type="primary"
             @click="submitReturn"
-          >确 定</el-button
+            >确 定</el-button
           >
         </span>
       </el-dialog>
@@ -247,359 +243,359 @@
 </template>
 
 <script>
-// import { getProcessDefinitionBpmnXML } from '@/api/bpm/definition';
-import store from '@/store';
-//   import {decodeFields} from "@/utils/formGenerator";
-//   import Parser from '@/components/parser/Parser'
-import {getProcessInstance} from '@/api/bpm/processInstance';
-import {listAllUserBind} from '@/api/system/organization';
-import Vue from 'vue';
+  // import { getProcessDefinitionBpmnXML } from '@/api/bpm/definition';
+  import store from '@/store';
+  //   import {decodeFields} from "@/utils/formGenerator";
+  //   import Parser from '@/components/parser/Parser'
+  import { getProcessInstance } from '@/api/bpm/processInstance';
+  import { listAllUserBind } from '@/api/system/organization';
+  import Vue from 'vue';
 
-import {
-  approveTask,
-  delegateTask,
-  getReturnList,
-  getTaskListByProcessInstanceId,
-  rejectTask,
-  returnTask,
-  updateTaskAssignee
-} from '@/api/bpm/task';
-// import { getDate } from '@/utils/dateUtils';
-
-// 流程实例的详情页,可用于审批
-export default {
-  name: 'ProcessInstanceDetail',
-  components: {
-    //   Parser
-  },
-  data() {
-    return {
-      // 遮罩层
-      processInstanceLoading: true,
-      dialogVisible: false,
-      // 流程实例
-      listData: {
-        id: undefined, // 流程实例的编号
-        pcHandleRouter: '',
-        pcViewRouter: '',
-        businessId: '', // 业务id
-        taskDefinitionKey: '',
-        taskId: '' //任务编码
-      },
-
-      processInstance: {},
-      formLoading: false,
-      // 流程表单详情
-      detailForm: {
-        fields: []
-      },
-      //回退列表数据
-      returnList: [],
-      formData: {
-        id: '',
-        targetDefinitionKey: undefined,
-        reason: ''
-      },
-      formRules: {
-        targetDefinitionKey: [
-          {required: true, message: '必须选择回退节点', trigger: 'change'}
-        ],
-        reason: [
-          {required: true, message: '回退理由不能为空', trigger: 'blur'}
-        ]
-      },
-      returnOpen: false,
-      activityList: [],
+  import {
+    approveTask,
+    delegateTask,
+    getReturnList,
+    getTaskListByProcessInstanceId,
+    rejectTask,
+    returnTask,
+    updateTaskAssignee
+  } from '@/api/bpm/task';
+  // import { getDate } from '@/utils/dateUtils';
 
-      tasks: [],
+  // 流程实例的详情页,可用于审批
+  export default {
+    name: 'ProcessInstanceDetail',
+    components: {
+      //   Parser
+    },
+    data() {
+      return {
+        // 遮罩层
+        processInstanceLoading: true,
+        dialogVisible: false,
+        // 流程实例
+        listData: {
+          id: undefined, // 流程实例的编号
+          pcHandleRouter: '',
+          pcViewRouter: '',
+          businessId: '', // 业务id
+          taskDefinitionKey: '',
+          taskId: '' //任务编码
+        },
 
-      // 审批表单
-      runningTasks: [],
-      auditForms: [],
-      auditRule: {
-        reason: [
-          {required: true, message: '审批建议不能为空', trigger: 'blur'}
-        ]
-      },
-      // 转派审批人
-      userOptions: [],
-      updateAssignee: {
-        open: false,
-        form: {
-          assigneeUserId: undefined
+        processInstance: {},
+        formLoading: false,
+        // 流程表单详情
+        detailForm: {
+          fields: []
         },
-        rules: {
-          assigneeUserId: [
-            {required: true, message: '新审批人不能为空', trigger: 'change'}
-          ]
-        }
-      },
-      updateDelegate: {
-        open: false,
-        form: {
-          delegateUserId: undefined,
+        //回退列表数据
+        returnList: [],
+        formData: {
+          id: '',
+          targetDefinitionKey: undefined,
           reason: ''
         },
-        rules: {
-          delegateUserId: [
-            {required: true, message: '新审批人不能为空', trigger: 'change'}
+        formRules: {
+          targetDefinitionKey: [
+            { required: true, message: '必须选择回退节点', trigger: 'change' }
           ],
           reason: [
-            {required: true, message: '委派理由不能为空', trigger: 'blur'}
+            { required: true, message: '回退理由不能为空', trigger: 'blur' }
           ]
-        }
-      }
-    };
-  },
-  created() {
-    //   this.id = this.$route.query.id;
-    //   if (!this.id) {
-    //     this.$message.error('未传递 id 参数,无法查看流程信息');
-    //     return;
-    //   }
-    //   this.getDetail();
+        },
+        returnOpen: false,
+        activityList: [],
 
-    // 获得用户列表
-    this.userOptions = [];
-    listAllUserBind().then((data) => {
-      this.userOptions.push(...data);
-    });
-  },
-  methods: {
-    submit(data) {
-      this.$refs.bziRef.save(data);
-    },
-    open(data) {
-      this.listData = data;
-      console.log('实例流程~~~~~~', data);
-      this.dialogVisible = true;
-      this.getDetail();
-    },
-    activeCompChange(activeComp) {
-      console.log(activeComp);
-      this.$refs.subForm[0].activeCompChange(activeComp);
-    },
-    /** 获得流程实例 */
-    getDetail() {
-      // 获得流程实例相关
-      this.processInstanceLoading = true;
-      getProcessInstance(this.listData.id).then((response) => {
-        if (!response) {
-          this.$message.error('查询不到流程信息!');
-          return;
+        tasks: [],
+
+        // 审批表单
+        runningTasks: [],
+        auditForms: [],
+        auditRule: {
+          reason: [
+            { required: true, message: '审批建议不能为空', trigger: 'blur' }
+          ]
+        },
+        // 转派审批人
+        userOptions: [],
+        updateAssignee: {
+          open: false,
+          form: {
+            assigneeUserId: undefined
+          },
+          rules: {
+            assigneeUserId: [
+              { required: true, message: '新审批人不能为空', trigger: 'change' }
+            ]
+          }
+        },
+        updateDelegate: {
+          open: false,
+          form: {
+            delegateUserId: undefined,
+            reason: ''
+          },
+          rules: {
+            delegateUserId: [
+              { required: true, message: '新审批人不能为空', trigger: 'change' }
+            ],
+            reason: [
+              { required: true, message: '委派理由不能为空', trigger: 'blur' }
+            ]
+          }
         }
-        // 设置流程信息
-        console.log('==', response);
-        console.log('==', this.listData);
-        this.processInstance = response;
-        // //将业务表单,注册为动态组件
-        // let formCustomCreatePath = JSON.parse(
-        //   this.processInstance.processDefinition.formCustomCreatePath
-        // );
-        // const bizpath = formCustomCreatePath.pcView;
-        // const subpath = formCustomCreatePath.pcHandle;
-        Vue.component('async-biz-form-component', (resolve) => {
-          require([`@/views${this.listData.pcViewRouter}`], resolve);
-        });
-        Vue.component('async-sub-form-component', (resolve) => {
-          require([`@/views${this.listData.pcHandleRouter}`], resolve);
-        });
-        //   // 设置表单信息
-        //   if (this.processInstance.processDefinition.formType === 10) {
-        //     this.detailForm = {
-        //       ...JSON.parse(this.processInstance.processDefinition.formConf),
-        //       disabled: true, // 表单禁用
-        //       formBtns: false, // 按钮隐藏
-        //       fields: decodeFields(this.processInstance.processDefinition.formFields)
-        //     }
-        //     // 设置表单的值
-        //     this.detailForm.fields.forEach(item => {
-        //       const val = this.processInstance.formVariables[item.__vModel__]
-        //       if (val) {
-        //         item.__config__.defaultValue = val
-        //       }
-        //     });
-        //   }
+      };
+    },
+    created() {
+      //   this.id = this.$route.query.id;
+      //   if (!this.id) {
+      //     this.$message.error('未传递 id 参数,无法查看流程信息');
+      //     return;
+      //   }
+      //   this.getDetail();
 
-        // 取消加载中
-        this.processInstanceLoading = false;
+      // 获得用户列表
+      this.userOptions = [];
+      listAllUserBind().then((data) => {
+        this.userOptions.push(...data);
       });
-
-      this.runningTasks = [];
-      this.auditForms = [];
-      getTaskListByProcessInstanceId(this.listData.id).then((response) => {
-        console.log(response, 'response');
-        // 审批记录
-        this.tasks = [];
-        // 移除已取消的审批
-        response.forEach((task) => {
-          if (task.result !== 4) {
-            this.tasks.push(task);
+    },
+    methods: {
+      submit(data) {
+        this.$refs.bziRef.save(data);
+      },
+      open(data) {
+        this.listData = data;
+        console.log('实例流程~~~~~~', data);
+        this.dialogVisible = true;
+        this.getDetail();
+      },
+      activeCompChange(activeComp) {
+        console.log(activeComp);
+        this.$refs.subForm[0].activeCompChange(activeComp);
+      },
+      /** 获得流程实例 */
+      getDetail() {
+        // 获得流程实例相关
+        this.processInstanceLoading = true;
+        getProcessInstance(this.listData.id).then((response) => {
+          if (!response) {
+            this.$message.error('查询不到流程信息!');
+            return;
           }
+          // 设置流程信息
+          console.log('==', response);
+          console.log('==', this.listData);
+          this.processInstance = response;
+          // //将业务表单,注册为动态组件
+          // let formCustomCreatePath = JSON.parse(
+          //   this.processInstance.processDefinition.formCustomCreatePath
+          // );
+          // const bizpath = formCustomCreatePath.pcView;
+          // const subpath = formCustomCreatePath.pcHandle;
+          Vue.component('async-biz-form-component', (resolve) => {
+            require([`@/views${this.listData.pcViewRouter}`], resolve);
+          });
+          Vue.component('async-sub-form-component', (resolve) => {
+            require([`@/views${this.listData.pcHandleRouter}`], resolve);
+          });
+          //   // 设置表单信息
+          //   if (this.processInstance.processDefinition.formType === 10) {
+          //     this.detailForm = {
+          //       ...JSON.parse(this.processInstance.processDefinition.formConf),
+          //       disabled: true, // 表单禁用
+          //       formBtns: false, // 按钮隐藏
+          //       fields: decodeFields(this.processInstance.processDefinition.formFields)
+          //     }
+          //     // 设置表单的值
+          //     this.detailForm.fields.forEach(item => {
+          //       const val = this.processInstance.formVariables[item.__vModel__]
+          //       if (val) {
+          //         item.__config__.defaultValue = val
+          //       }
+          //     });
+          //   }
+
+          // 取消加载中
+          this.processInstanceLoading = false;
         });
-        // 排序,将未完成的排在前面,已完成的排在后面;
-        this.tasks.sort((a, b) => {
-          // 有已完成的情况,按照完成时间倒序
-          if (a.endTime && b.endTime) {
-            return b.endTime - a.endTime;
-          } else if (a.endTime) {
-            return 1;
-          } else if (b.endTime) {
-            return -1;
-            // 都是未完成,按照创建时间倒序
-          } else {
-            return b.createTime - a.createTime;
-          }
+
+        this.runningTasks = [];
+        this.auditForms = [];
+        getTaskListByProcessInstanceId(this.listData.id).then((response) => {
+          console.log(response, 'response');
+          // 审批记录
+          this.tasks = [];
+          // 移除已取消的审批
+          response.forEach((task) => {
+            if (task.result !== 4) {
+              this.tasks.push(task);
+            }
+          });
+          // 排序,将未完成的排在前面,已完成的排在后面;
+          this.tasks.sort((a, b) => {
+            // 有已完成的情况,按照完成时间倒序
+            if (a.endTime && b.endTime) {
+              return b.endTime - a.endTime;
+            } else if (a.endTime) {
+              return 1;
+            } else if (b.endTime) {
+              return -1;
+              // 都是未完成,按照创建时间倒序
+            } else {
+              return b.createTime - a.createTime;
+            }
+          });
+
+          // 需要审核的记录
+          const userId = store.getters.user.info.userId;
+          this.tasks.forEach((task) => {
+            if (task.result !== 1 && task.result !== 6) {
+              // 只有待处理才需要
+              return;
+            }
+            if (!task.assigneeUser || task.assigneeUser.id !== userId) {
+              // 自己不是处理人
+              return;
+            }
+            if (task.taskDefinitionKey !== this.listData.taskDefinitionKey) {
+              // 不是当前流程的
+              return;
+            }
+            this.runningTasks.push({ ...task });
+            console.log(this.runningTasks, ' this.runningTasks');
+            this.auditForms.push({
+              reason: ''
+            });
+          });
         });
+      },
 
-        // 需要审核的记录
-        const userId = store.getters.user.info.userId;
-        this.tasks.forEach((task) => {
-          if (task.result !== 1 && task.result !== 6) {
-            // 只有待处理才需要
-            return;
-          }
-          if (!task.assigneeUser || task.assigneeUser.id !== userId) {
-            // 自己不是处理人
+      /** 处理审批通过和不通过的操作 */
+      handleAudit(data) {
+        let text = data.status === 1 ? '通过' : '不通过';
+        this.$message.success(`审批${data.title || text}成功!`);
+        this.handleClose(); // 获得最新详情
+
+        // const index = this.runningTasks.indexOf(task);
+        // this.$refs['form' + index][0].validate((valid) => {
+        //   if (!valid) {
+        //     return;
+        //   }
+        //   const data = {
+        //     id: task.id,
+        //     reason: this.auditForms[index].reason
+        //   };
+        //   if (pass) {
+        //     approveTask(data).then((response) => {
+        //       this.$message.success('审批通过成功!');
+        //       this.handleClose(); // 获得最新详情
+        //     });
+        //   } else {
+        //     rejectTask(data).then((response) => {
+        //       this.$message.success('审批不通过成功!');
+        //       this.handleClose(); // 获得最新详情
+        //     });
+        //   }
+        // });
+      },
+      /** 处理转办审批人 */
+      handleUpdateAssignee(task) {
+        // 设置表单
+        this.resetUpdateAssigneeForm();
+        this.updateAssignee.form.id = task.id;
+        // 设置为打开
+        this.updateAssignee.open = true;
+      },
+      /** 提交转办审批人 */
+      submitUpdateAssigneeForm() {
+        this.$refs['updateAssigneeForm'].validate((valid) => {
+          if (!valid) {
             return;
           }
-          if (task.taskDefinitionKey !== this.listData.taskDefinitionKey) {
-            // 不是当前流程的
+          updateTaskAssignee(this.updateAssignee.form).then((response) => {
+            this.$message.success('转办任务成功!');
+
+            this.updateAssignee.open = false;
+            this.handleClose(); // 获得最新详情
+          });
+        });
+      },
+      /** 取消转办审批人 */
+      cancelUpdateAssigneeForm() {
+        this.updateAssignee.open = false;
+        this.resetUpdateAssigneeForm();
+      },
+      /** 重置转办审批人 */
+      resetUpdateAssigneeForm() {
+        this.updateAssignee.form = {
+          id: undefined,
+          assigneeUserId: undefined
+        };
+        this.resetForm('updateAssigneeForm');
+      },
+      /** 处理审批委派的操作 */
+      handleDelegate(task) {
+        //this.$modal.msgError("暂不支持【委派】功能,可以使用【转派】替代!");
+        this.resetUpdateDelegateForm();
+        this.updateDelegate.form.id = task.id;
+        // 设置为打开
+        this.updateDelegate.open = true;
+      },
+      /** 提交委派审批人 */
+      submitUpdateDelegateForm() {
+        this.$refs['updateDelegateForm'].validate((valid) => {
+          if (!valid) {
             return;
           }
-          this.runningTasks.push({...task});
-          console.log(this.runningTasks, ' this.runningTasks');
-          this.auditForms.push({
-            reason: ''
+          delegateTask(this.updateDelegate.form).then((response) => {
+            this.$message.success('委派任务成功!');
+            this.updateDelegate.open = false;
+            this.handleClose(); // 获得最新详情
           });
         });
-      });
-    },
-
-    /** 处理审批通过和不通过的操作 */
-    handleAudit(data) {
-      let text = data.status === 1 ? '通过' : '不通过';
-      this.$message.success(`审批${data.title || text}成功!`);
-      this.handleClose(); // 获得最新详情
-
-      // const index = this.runningTasks.indexOf(task);
-      // this.$refs['form' + index][0].validate((valid) => {
-      //   if (!valid) {
-      //     return;
-      //   }
-      //   const data = {
-      //     id: task.id,
-      //     reason: this.auditForms[index].reason
-      //   };
-      //   if (pass) {
-      //     approveTask(data).then((response) => {
-      //       this.$message.success('审批通过成功!');
-      //       this.handleClose(); // 获得最新详情
-      //     });
-      //   } else {
-      //     rejectTask(data).then((response) => {
-      //       this.$message.success('审批不通过成功!');
-      //       this.handleClose(); // 获得最新详情
-      //     });
-      //   }
-      // });
-    },
-    /** 处理转办审批人 */
-    handleUpdateAssignee(task) {
-      // 设置表单
-      this.resetUpdateAssigneeForm();
-      this.updateAssignee.form.id = task.id;
-      // 设置为打开
-      this.updateAssignee.open = true;
-    },
-    /** 提交转办审批人 */
-    submitUpdateAssigneeForm() {
-      this.$refs['updateAssigneeForm'].validate((valid) => {
-        if (!valid) {
-          return;
-        }
-        updateTaskAssignee(this.updateAssignee.form).then((response) => {
-          this.$message.success('转办任务成功!');
+      },
+      /** 取消委派审批人 */
+      cancelUpdateDelegateForm() {
+        this.updateDelegate.open = false;
+        this.resetUpdateDelegateForm();
+      },
+      /** 重置委派审批人 */
+      resetUpdateDelegateForm() {
+        this.updateDelegate.form = {
+          id: undefined,
+          delegateUserId: undefined
+        };
+        this.resetForm('updateDelegateForm');
+      },
+      /** 处理审批退回的操作 */
+      /** 返回退回节点列表 */
+      handleBackList(task) {
+        // 可参考 http://blog.wya1.com/article/636697030/details/7296
+        getReturnList(task.id).then((response) => {
+          this.returnList = response.data.data;
+          if (this.returnList.length == 0) {
+            this.$message.error('当前没有可回退的节点!');
 
-          this.updateAssignee.open = false;
-          this.handleClose(); // 获得最新详情
-        });
-      });
-    },
-    /** 取消转办审批人 */
-    cancelUpdateAssigneeForm() {
-      this.updateAssignee.open = false;
-      this.resetUpdateAssigneeForm();
-    },
-    /** 重置转办审批人 */
-    resetUpdateAssigneeForm() {
-      this.updateAssignee.form = {
-        id: undefined,
-        assigneeUserId: undefined
-      };
-      this.resetForm('updateAssigneeForm');
-    },
-    /** 处理审批委派的操作 */
-    handleDelegate(task) {
-      //this.$modal.msgError("暂不支持【委派】功能,可以使用【转派】替代!");
-      this.resetUpdateDelegateForm();
-      this.updateDelegate.form.id = task.id;
-      // 设置为打开
-      this.updateDelegate.open = true;
-    },
-    /** 提交委派审批人 */
-    submitUpdateDelegateForm() {
-      this.$refs['updateDelegateForm'].validate((valid) => {
-        if (!valid) {
-          return;
-        }
-        delegateTask(this.updateDelegate.form).then((response) => {
-          this.$message.success('委派任务成功!');
-          this.updateDelegate.open = false;
-          this.handleClose(); // 获得最新详情
+            return;
+          }
+          this.formData.id = task.id;
+          this.returnOpen = true;
         });
-      });
-    },
-    /** 取消委派审批人 */
-    cancelUpdateDelegateForm() {
-      this.updateDelegate.open = false;
-      this.resetUpdateDelegateForm();
-    },
-    /** 重置委派审批人 */
-    resetUpdateDelegateForm() {
-      this.updateDelegate.form = {
-        id: undefined,
-        delegateUserId: undefined
-      };
-      this.resetForm('updateDelegateForm');
-    },
-    /** 处理审批退回的操作 */
-    /** 返回退回节点列表 */
-    handleBackList(task) {
-      // 可参考 http://blog.wya1.com/article/636697030/details/7296
-      getReturnList(task.id).then((response) => {
-        this.returnList = response.data.data;
-        if (this.returnList.length == 0) {
-          this.$message.error('当前没有可回退的节点!');
-
-          return;
-        }
-        this.formData.id = task.id;
-        this.returnOpen = true;
-      });
-    },
-    /** 提交退回任务 */
-    submitReturn() {
-      if (!this.formData.targetDefinitionKey) {
-        this.$message.error('请选择退回节点!');
-      }
-      this.$refs['formRef'].validate((valid) => {
-        if (!valid) {
-          return;
+      },
+      /** 提交退回任务 */
+      submitReturn() {
+        if (!this.formData.targetDefinitionKey) {
+          this.$message.error('请选择退回节点!');
         }
-        returnTask(this.formData).then((res) => {
-          if (res.data) {
-            this.$message.success('回退成功!');
+        this.$refs['formRef'].validate((valid) => {
+          if (!valid) {
+            return;
+          }
+          returnTask(this.formData).then((res) => {
+            if (res.data) {
+              this.$message.success('回退成功!');
 
               this.returnOpen = false;
               this.handleClose(); // 获得最新详情
@@ -619,12 +615,12 @@ export default {
 </script>
 
 <style lang="scss">
-.my-process-designer {
-  height: calc(100vh - 200px);
-}
+  .my-process-designer {
+    height: calc(100vh - 200px);
+  }
 
-.box-card {
-  width: 100%;
-  margin-bottom: 20px;
-}
+  .box-card {
+    width: 100%;
+    margin-bottom: 20px;
+  }
 </style>