Bläddra i källkod

产品详情页新增受托来料检验类型支持并优化历史数据处理逻辑

yusheng 10 månader sedan
förälder
incheckning
99964d2a2e

+ 7 - 3
src/views/material/product/components/QualityInfo.vue

@@ -12,7 +12,11 @@
         <el-col :span="4">
           <el-form-item
             :label="
-              form.dataType == 1 ? '是否采购来料检验' : '是否委外来料检验'
+              form.dataType == 1
+                ? '是否采购来料检验'
+                : form.dataType == 2
+                ? '是否委外来料检验'
+                : '是否受托来料检验'
             "
             prop="isComeCheck"
           >
@@ -189,11 +193,11 @@
       },
       getQualityTemplateList() {
         getQualityTemplate({
-          type: this.form.dataType == 1 ? 1 : 6,
+          type: this.form.dataType == 1 ? 1 : this.form.dataType == 2 ? 6 : 5,
           status: 1,
           size: 999
         }).then((res) => {
-          console.log(res,'res')
+          console.log(res, 'res');
           this.qualityTemplateList = res.list;
         });
       }

+ 29 - 2
src/views/material/product/detail.vue

@@ -461,6 +461,22 @@
       netWeight: null,
       qualityTemplateIds: [],
       dataType: 2
+    },
+    {
+      categoryId: '',
+      checkDepart: null,
+      checkFormula: null,
+      checkPerson: null,
+      checkProportion: null,
+      createTime: '',
+      createUserId: '',
+      inspectionStandards: null,
+      isComeCheck: 0,
+      // level: '',
+      levelItem: null,
+      netWeight: null,
+      qualityTemplateIds: [],
+      dataType: 3
     }
   ];
 
@@ -1055,9 +1071,20 @@
         }
         if (!info.categoryQms || !info.categoryQms?.length) {
           this.categoryQms = [...copyObj(defCategoryQms)];
-        } else if (info.categoryQms.length == 1) {
+        } else if (info.categoryQms.length < defCategoryQms.length) {
           //历史数据处理
-          this.categoryQms = [info.categoryQms[0], copyObj(defCategoryQms[1])];
+          // let num= defCategoryQms.length-info.categoryQms.length
+
+          // info.categoryQms.push();
+          this.categoryQms = [
+            ...info.categoryQms,
+            ...copyObj(
+              defCategoryQms.slice(
+                info.categoryQms.length,
+                defCategoryQms.length
+              )
+            )
+          ];
         } else {
           this.categoryQms = info.categoryQms;
         }