Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -367,6 +367,9 @@
         height="180"
       >
         <el-table-column prop="operatorMajorRoleName" label="审核人">
+          <template scope="scope">
+            {{scope.row.operatorMajorRoleName}}{{scope.row.operatorName}}
+            </template>
         </el-table-column>
         <el-table-column prop="inOutTaskNo" label="审核结果">
           <template scope="scope">

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -983,9 +983,9 @@ export default {
     },
     requestadd(list, status) {
       list.compId = sessionStorage.getItem('ws-pf_compId')
-      list.publisher =
-        sessionStorage.getItem('ws-pf_roleName') +
-        sessionStorage.getItem('ws-pf_staffName')
+      // list.publisher =
+      //   sessionStorage.getItem('ws-pf_roleName') +
+      //   sessionStorage.getItem('ws-pf_staffName')
       warehousetask(list)
         .toPromise()
         .then(response => {
@@ -1004,9 +1004,9 @@ export default {
     },
     requestaudit(list, status) {
       list.compId = sessionStorage.getItem('ws-pf_compId')
-      list.publisher =
-        sessionStorage.getItem('ws-pf_roleName') +
-        sessionStorage.getItem('ws-pf_staffName')
+      // list.publisher =
+      //   sessionStorage.getItem('ws-pf_roleName') +
+      //   sessionStorage.getItem('ws-pf_staffName')
       warehousetask(list)
         .toPromise()
         .then(response => {