生产工单界面功能优化

src/views/mes/pro/workorder/indexApply.vue

@@ -82,6 +82,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="产品分类" prop="itemTypeName">
+        <el-input
+          v-model="queryParams.itemTypeName"
+          placeholder="请输入产品分类"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <!-- <el-form-item label="工单类型" prop="workorderType">
         <el-input
           v-model="queryParams.workorderType"
@@ -232,7 +240,7 @@
         </el-button>
       </el-col>
 
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -243,7 +251,7 @@
           v-hasPermi="['mes:pro:workorder:dofinish']"
         >生成任务单
         </el-button>
-      </el-col> -->
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -403,15 +411,12 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        label="生产版本"
+        label="产品分类"
         width="200"
         align="center"
+        prop="itemTypeName"
         :show-overflow-tooltip="true"
-      >
-        <template slot-scope="scope">
-          {{(scope.row.groupKey ? scope.row.groupKey: '') + (scope.row.groupCounter ? scope.row.groupCounter: '')}}
-        </template>
-      </el-table-column>
+      />
       <el-table-column
         label="规格型号"
         align="center"
@@ -1113,13 +1118,13 @@ export default {
         });
 
         batchAddCombination(params).then(response => {
-          // if (response && response.length > 0) {
+          if (response && response.length > 0) {
             this.combOpen = true
             this.combinationCodes = response
             this.$modal.msgSuccess("新增组合单成功");
-          // } else {
-          //   this.$modal.msgError("新增组合单失败，组合规则不同，不允许组合！");
-          // }
+          } else {
+            this.$modal.msgError("新增组合单失败，组合规则不同，不允许组合！");
+          }
           this.getList();
         });
       }
@@ -1303,7 +1308,7 @@ export default {
     handleSelectionChange(selection) {
       // this.selectedRows = val;
       this.selectedRows = selection;
-      this.ids = selection.map(item => item.toolId)
+      this.ids = selection.map(item => item.workorderId)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -1342,8 +1347,7 @@ export default {
       // });
     },
     handleMake() {
-      let status = this.selectedRows[0].status;
-      if (this.selectedRows[0].workorderType == 'product' && (status == "SCHEDULED"||status == "PRODUCING"||status == "ISSUED")
+      if (this.selectedRows[0].workorderType == 'product' && this.selectedRows[0].status == "SCHEDULED"
       ) {
         const workorderId = this.selectedRows[0].workorderId
         this.$router.push("/mes/pro/workorder/make?workorderId=" + workorderId);