Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dengfei_01

src/views/produce/components/taskDialog/index.vue

@@ -101,7 +101,7 @@
           :underline="false"
           type="primary"
           @click="viewRecords(row.id)"
-          >报工记录</el-link
+          >报工修改录</el-link
         >
       </template>
     </ele-pro-table>
@@ -272,6 +272,11 @@
       getData() {
         this.workList = [];
         this.loading = true;
+        for(let key in this.params){
+          if(!this.params[key]){
+            return;
+          }
+        }
         pageAssigneeByTask(this.params)
           .then((res) => {
             this.loading = false;

src/views/produce/index.vue

@@ -336,7 +336,8 @@ import TaskDialog from '@/views/produce/components/taskDialog/index.vue';
         workTaskId: null, //选中的工单工序id
         workStepQueryParam: {
           taskId: null,
-          workOrderId: null
+          workOrderId: null,
+          bomCategoryId: null,
         }
       };
     },
@@ -504,6 +505,7 @@ import TaskDialog from '@/views/produce/components/taskDialog/index.vue';
           data.list.length > 0 ? data.list[0].taskId : null;
         this.workStepQueryParam.workOrderId =
           data.list.length > 0 ? data.list[0].id : null;
+        this.workStepQueryParam.bomCategoryId = data.list.length > 0 ? data.list[0].bomCategoryId : null;
         this.singleReportInspection =
           data.list.length > 0 ? data.list[0].singleReport : null; //获取选中的工单是单个还是批量
         this.isStep = true;

src/views/taskList/index.vue

@@ -41,7 +41,7 @@
           >报工
         </el-link>
         <el-link :underline="false" type="primary" @click="viewRecords(row.id)"
-          >修改记录
+          >报工记录
         </el-link>
       </template>
     </ele-pro-table>