修复bug

src/components/productionSolution/index.vue

@@ -9,10 +9,6 @@
         <el-input v-model="queryParams.itemName" clearable placeholder="请输入成品物名称" @keyup.enter.native="handleQuery">
         </el-input>
       </el-form-item>
-      <el-form-item label="组件号" prop="groupCounter">
-        <el-input v-model="queryParams.groupCounter" clearable placeholder="请输入组件号" @keyup.enter.native="handleQuery">
-        </el-input>
-      </el-form-item>
       <el-form-item label="打样订单号" prop="sapPrototypeMakeCode">
         <el-input v-model="queryParams.sapPrototypeMakeCode" clearable placeholder="请输入打样订单号"
           @keyup.enter.native="handleQuery">
@@ -33,7 +29,6 @@
         </template>
       </el-table-column>
       <el-table-column label="生产版本编码" align="center" prop="productionSolutionCode" />
-      <el-table-column label="组件号" align="center" prop="groupCounter" />
       <el-table-column label="产品版本名称" align="center" prop="productionSolutionName" :show-overflow-tooltip="true" />
       <el-table-column label="成品物料编码" align="center" prop="itemCode" />
       <el-table-column label="成品物料名称" align="center" prop="itemName" />

src/views/mes/pro/proQrcodeRule/index.vue

@@ -146,11 +146,6 @@
                         <el-input v-model="form.serialLen" placeholder="请输入编码流水长度" />
                     </el-form-item>
                 </el-col>
-                <el-col :lg="12" :md="12" :sm="24" :xs="24">
-                    <el-form-item label="当前流水" prop="currentSerial">
-                        <el-input v-model="form.currentSerial" placeholder="请输入当前流水" />
-                    </el-form-item>
-                </el-col>
                 <el-col :lg="12" :md="12" :sm="24" :xs="24">
                     <el-form-item label="客户编码" prop="clientCode">
                         <el-input v-model="form.clientCode" placeholder="请输入客户编码" />

src/views/mes/pro/productionSolution/components/ProogingProcess.vue

@@ -696,7 +696,7 @@ export default {
       });
     },
     getComData() {
-      return this.tableData.filter(item => Object.values(item).some(v => v) );
+      return this.tableData.filter(item => Object.values(item).some(v => v && v.length > 0 ) );
     },
     /**重置表单 */
     resetForm() {

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

@@ -19,6 +19,7 @@
         class="page-form"
         :model="form"
         ref="form"
+        :rules="rules"
         size="small"
         :inline="true"
         label-width="8em"
@@ -181,7 +182,11 @@ export default {
         updateBy: "",
         updateTime: "",
       },
-      rules: {},
+      rules: {
+        productionSolutionName: [
+          { required: true, message: "生产版本名称不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   computed: {
@@ -277,40 +282,44 @@ export default {
         processList,
         specificationSheet: {}
       };
-      this.loading = true;
-      if (this.mode == "apply") {
-        addProductionSolution(params)
-          .then((res) => {
-            this.loading = false;
-            this.$modal.msgSuccess("提交成功！");
-            this.$nextTick(() => {
-              // 关闭页签
-              tabPlugins.closeOpenPage();
-              this.$router.replace({
-                    path: "/mes/md/production",
-                  });
-            })
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      } else {
-        updateProductionSolution(params)
-          .then(() => {
-            this.loading = false;
-            this.$modal.msgSuccess("提交成功！");
-            this.$nextTick(() => {
-              // 关闭页签
-              tabPlugins.closeOpenPage();
-              this.$router.replace({
-                    path: "/mes/md/production",
-                  });
-            })
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      }
+      this.$refs.form.validate( valid => {
+        if (valid) {
+          this.loading = true;
+          if (this.mode == "apply") {
+            addProductionSolution(params)
+              .then((res) => {
+                this.loading = false;
+                this.$modal.msgSuccess("提交成功！");
+                this.$nextTick(() => {
+                  // 关闭页签
+                  tabPlugins.closeOpenPage();
+                  this.$router.replace({
+                        path: "/mes/md/production",
+                      });
+                })
+              })
+              .catch(() => {
+                this.loading = false;
+              });
+          } else {
+            updateProductionSolution(params)
+              .then(() => {
+                this.loading = false;
+                this.$modal.msgSuccess("提交成功！");
+                this.$nextTick(() => {
+                  // 关闭页签
+                  tabPlugins.closeOpenPage();
+                  this.$router.replace({
+                        path: "/mes/md/production",
+                      });
+                })
+              })
+              .catch(() => {
+                this.loading = false;
+              });
+          }
+        }
+      })
     },
     /**重置表单 */
     resetForm() {

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

@@ -266,12 +266,12 @@
         <el-tab-pane label="工艺">
           <ProogingProcess ref="ProogingProcessRef" :bomList="bomList" />
         </el-tab-pane>
-        <el-tab-pane label="指令">
-          <WorkOrderSale ref="WorkOrderSaleRef" />
-        </el-tab-pane>
-        <el-tab-pane label="SIZE">
-          <WorkOrderSize ref="WorkOrderSizeRef" />
-        </el-tab-pane>
+        <!-- <el-tab-pane label="指令" v-if="false"> -->
+          <WorkOrderSale ref="WorkOrderSaleRef" style="display: none" />
+        <!-- </el-tab-pane> -->
+        <!-- <el-tab-pane label="SIZE" v-show="false" > -->
+          <WorkOrderSize ref="WorkOrderSizeRef" style="display: none" />
+        <!-- </el-tab-pane> -->
       </el-tabs>
     </PageWrapper>
     <RoutesProcessSelect
@@ -639,11 +639,12 @@ export default {
       if (row != undefined && row != null) {
         this.form.productionSolutionId = row.productionSolutionId;
         this.form.productionSolutionCode = row.productionSolutionCode;
-        this.form.group = `${row.groupKey ? row.groupKey: ''}${row.groupCounter ? row.groupCounter: ''}`
+        this.form.group = row.productionSolutionCode
         this.form.productCode = row.itemCode;
         this.form.groupCounter = row.groupCounter;
         this.form.groupKey = row.groupKey;
         this.form.productName = row.itemName;
+        this.form.productionSolutionName = row.productionSolutionName;
         const params = {
           pageNum: 1,
           pageSize: 1000,