修改生产工单

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

@@ -402,6 +402,16 @@
         prop="productName"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="生产版本"
+        width="200"
+        align="center"
+        :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"
@@ -1103,13 +1113,13 @@ export default {
         });
 
         batchAddCombination(params).then(response => {
-          if (response && response.length > 0) {
-            this.combOpen = true
-            this.combinationCodes = response
-            this.$modal.msgSuccess("新增组合单成功");
-          } else {
-            this.$modal.msgError("新增组合单失败，组合规则不同，不允许组合！");
-          }
+          // if (response && response.length > 0) {
+          this.combOpen = true
+          this.combinationCodes = response
+          this.$modal.msgSuccess("新增组合单成功");
+          // } else {
+          //   this.$modal.msgError("新增组合单失败，组合规则不同，不允许组合！");
+          // }
           this.getList();
         });
       }

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

@@ -459,6 +459,9 @@ export default {
     },
   },
   activated() {
+    // if(!this.$route.query.workorderId) {
+    //   this.resetForm()
+    // }
     if (this.$route.query && this.$route.query.workorderId && this.workorderId !== this.$route.query.workorderId) {
       this.resetForm()
       this.workorderId = this.$route.query.workorderId
@@ -594,7 +597,7 @@ export default {
           .then(({ data }) => {
             
             Object.assign(this.form, data);
-            this.form.group = `${this.form.groupCounter ? this.form.groupCounter: ''}-${this.form.groupKey ? this.form.groupKey: ''}`
+            this.form.group = `${this.form.groupKey ? this.form.groupKey: ''}${this.form.groupCounter ? this.form.groupCounter: ''}`
             this.currentData = {}
             if (this.mode == 'make') {
               this.currentData = data
@@ -647,10 +650,11 @@ export default {
     //物料选择弹出框
 
     onRoutesProcessSelect(row) {
+      console.log('row44', row)
       if (row != undefined && row != null) {
         this.form.productionSolutionId = row.productionSolutionId;
         this.form.productionSolutionCode = row.productionSolutionCode;
-        this.form.group = `${row.groupCounter ? row.groupCounter: ''}-${row.groupKey ? row.groupKey: ''}`
+        this.form.group = `${row.groupKey ? row.groupKey: ''}${row.groupCounter ? row.groupCounter: ''}`
         this.form.productCode = row.itemCode;
         this.form.groupCounter = row.groupCounter;
         this.form.groupKey = row.groupKey;