Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt into dengfei

src/views/bpm/handleTask/components/purchaseOrder/invoice/submit.vue

@@ -158,7 +158,10 @@
       },
       taskDefinitionKey: {
         default: ''
-      }
+      },
+      fromUser: {
+        default: ''
+      },
     },
     data() {
       return {
@@ -200,9 +203,10 @@
       async storeManagerApprove() {
         let res = await this.getTableValue();
         let storageData = res.returnStorageData;
-        console.log(storageData);
+        console.log('storeManagerApprove', storageData);
         // isSkip 0-正常  1-外部(外部跳过内部审核流程)
         storageData.isSkip = 1;
+        storageData.fromUser = this.fromUser;
         try {
           this.isSaveLoading = true;
           await storageApi.storage(storageData);

src/views/bpm/handleTask/index.vue

@@ -51,6 +51,7 @@
               :businessId="listData?.businessId"
               :id="listData?.id"
               :taskDefinitionKey="listData?.taskDefinitionKey"
+              :fromUser="processInstance.startUser?.nickname"
               @handleAudit="handleAudit"
               @getTableValue="getTableValue"
               @handleUpdateAssignee="handleUpdateAssignee(item)"