把 taskWorkunitId 这个查询条件去掉， 作业端报工修改 不需要选择任务

pages/mes/prodReport/components/editFeeding.vue

@@ -206,9 +206,7 @@ export default {
       total: 0,
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
-        taskWorkunitId: null,
-        workunitId: null
+        pageSize: 10
       },
       title: '',
       open: false,
@@ -295,9 +293,8 @@ export default {
 			this.queryParams.pageNum = params.current;
 			this.getList() // 点击的时候去请求查询列表
 		},
-    getList(row) {
-      if(row && row.workunitId) this.queryParams.workunitId = row.workunitId
-      if(row && row.taskWorkunitId) this.queryParams.taskWorkunitId = row.taskWorkunitId
+    getList() {
+      if(this.$store.state && this.$store.state.vuex_workunit) this.queryParams.workunitId = this.$store.state.vuex_workunit.workunitId
         const params = {
             ...this.queryParams,
             createStartTime: dayjs().subtract(5, 'minute').format('YYYY-MM-DD HH:mm:ss'),

pages/mes/prodReport/index.vue

@@ -1607,7 +1607,7 @@ export default {
       }
     },
     commonClick(oper) {
-      if (['Refresh', 'MaterialUsageRecord'].indexOf(oper) === -1 && this.tableSelectData.length === 0) {
+      if (['Refresh', 'MaterialUsageRecord', 'editProd'].indexOf(oper) === -1 && this.tableSelectData.length === 0) {
         this.$u.toast('请选择工作任务！');
         return;
       }
@@ -1655,10 +1655,6 @@ export default {
           this.doFeedback();
           break;
         case 'editProd':
-          if (this.tableSelectData[0].status === 'PREPARE') {
-            this.$u.toast('工序未开工');
-            return;
-          }
           this.doEditProd();
           break;
         case 'MaterialUsageRecord':
@@ -1710,8 +1706,9 @@ export default {
       this.jobAssignmentForm.workunitName = this.$refs.workunitRef.tableSelectData[0].workunitName;
     },
     doEditProd(){
+      // console.log('vuex_workstation', this.$store.state.vuex_workunit)
       const datas = Object.assign({}, this.tableSelectData[0]);
-      this.$refs['editFeeding'].getList(datas).then(() => {
+      this.$refs['editFeeding'].getList().then(() => {
         this.editFeedingVisible = true
       }).catch(()=>{
         this.$u.toast('修改报工出现问题')
@@ -2412,6 +2409,7 @@ export default {
                   name: '指令列表'
                 }
               ];
+              row.tableOrderData.push({reportQuantity: 0, netWeight: 0})
             } else {
               row.tableDirectiveData = [];
             }
@@ -2427,6 +2425,7 @@ export default {
                   name: '报工列表'
                 }
               ];
+              row.tableOrderData.push({reportQuantity: 0, netWeight: 0})
             } else {
               row.tableOrderData = [];
             }