فهرست منبع

修改了质检工单选择方案为覆盖

wsx 11 ماه پیش
والد
کامیت
4bd1741d62

+ 2 - 1
src/views/inspectionPlan/components/new-edit.vue

@@ -2146,7 +2146,8 @@
           if (this.baseForm.isUnpack == null || this.baseForm.isUnpack == '') {
             this.baseForm.isUnpack = this.isCheck ? 1 : 2;
           }
-          this.baseForm.conditionType = this.conditionType;
+          this.baseForm.conditionType =
+            this.conditionType ?? this.kkconditionType;
           // isSampleList: true,
           // isPackingList: true,
 

+ 3 - 3
src/views/inspectionWork/components/baseInfo.vue

@@ -214,10 +214,10 @@
               style="width: 100%"
               v-model="form.qualityMode"
               placeholder="请选择"
-              :disabled="
-                parseInt(qualityType1) == 1 || parseInt(qualityType1) == 3
-              "
             >
+            <!-- :disabled="
+                parseInt(qualityType1) == 1 || parseInt(qualityType1) == 3
+              " -->
               <el-option
                 v-for="item in qualityModeList"
                 :label="item.label"

+ 12 - 7
src/views/inspectionWork/components/newQualityContentTabs.vue

@@ -969,17 +969,22 @@
         let data = await getQualityTemplateByIds({
           templateIds: select.map((item) => item.id)
         });
-        // planTemplateList
-        console.log(data);
-        this.templateList.push(...data);
-        const strings = this.templateList.map((item) => JSON.stringify(item));
-        const removeDupList = [...new Set(strings)];
-        const result = removeDupList.map((item) => JSON.parse(item));
+
+        // 这里是选择方案后,数据新加,要改为覆盖
+        // this.templateList.push(...data);
+        // const strings = this.templateList.map((item) => JSON.stringify(item));
+        // const removeDupList = [...new Set(strings)];
+        // const result = removeDupList.map((item) => JSON.parse(item));
+
+        this.templateList=[]
+        this.templateList.push(...data)
+
+        
         this.templateList = result.map((item) => {
           item['qualityResults'] = 1;
           return item;
         });
-        // console.log(this.templateList);
+
         this.sampleList.forEach((item, index) => {
           this.$set(
             this.sampleList[index],

+ 1 - 15
src/views/unqualifiedProduct/unqualifiedList/index.vue

@@ -167,21 +167,6 @@
             width: 100,
             showOverflowTooltip: true
           },
-
-          // {
-          //   prop: 'weight',
-          //   label: '重量',
-          //   align: 'center',
-          //   width: 100,
-          //   showOverflowTooltip: true
-          // },
-          // {
-          //   prop: 'weightUnit',
-          //   label: '重量单位',
-          //   align: 'center',
-          //   width: 100,
-          //   showOverflowTooltip: true
-          // },
           // {
           //   prop: 'produceRoutingName',
           //   label: '工艺路线',
@@ -236,6 +221,7 @@
       }
     },
     created() {
+      this.requestDict('质检计划类型');
       this.requestDict('处置状态');
     },
     filters: {},