Merge branch 'dev' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc into dev

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -1345,7 +1345,7 @@
                   })
                   this.idPrint = response
                   // this.isShowPrintType = true
-                  // this.getList()
+                  this.getList()
                   
                   //贸易入库需要再走入库接口
                   if (this.inWarehouseType == 1) {

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -731,9 +731,9 @@
       requestadd(list, status) {
         console.log(list)
         list.compId = localStorage.getItem('ws-pf_compId')
-        list.publisher =
-          localStorage.getItem('ws-pf_roleName') +
-          localStorage.getItem('ws-pf_staffName')
+        // list.publisher =
+        //   localStorage.getItem('ws-pf_roleName') +
+        //   localStorage.getItem('ws-pf_staffName')
         warehousetask(list)
           .toPromise()
           .then((response) => {
@@ -750,8 +750,8 @@
                 //   console.log(response1)
 
                 workflowcontent({
-                    workflowId: item.workflowId,
-                    businessKey: item.id,
+                    workflowId: list.workflowId,
+                    businessKey: list.id,
                     type: '出入库任务'
                   }).toPromise()
                   .then((response1) => {