Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-qms into dengfei

src/views/inspectionClassify/components/user-search.vue

@@ -3,7 +3,7 @@
   <el-form label-width="80px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
     <el-row :gutter="24">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="质检名称:">
+        <el-form-item label="参数名称:">
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>

src/views/inspectionPlan/components/new-edit.vue

@@ -640,6 +640,11 @@
         handler(newVal) {
           // 计算重量跟数量
           this.calculate(newVal);
+          newVal.map(async(el)=>{
+            if(!el.sampleCode){
+               el.sampleCode = await this.getSampleCode();
+            }
+          })
         },
         deep: true,
         immediate: true
@@ -805,7 +810,7 @@
           //   sampleNoQualifiedNumber += el.measureQuantity - 0;
           // }
         });
-         this.$set(this.baseForm, 'sampleQuantity', sampleQuantity); // 样品数量
+        this.$set(this.baseForm, 'sampleQuantity', sampleQuantity); // 样品数量
         this.$set(this.baseForm, 'sampleWeight', sampleWeight); // 样品重量
         // // 计算合格率和不合格率（百分比形式）
         // let sampleQualificationRate = ''; // 合格率
@@ -962,10 +967,13 @@
       },
 
       //成品类型检验类型，计划来源库存台账, 生成来源清单
-      changesStokledgerNumberModal(val, dimension, type) {
+      async changesStokledgerNumberModal(val, dimension, type) {
         val.map((el) => (el.sourceId = el.id));
         console.log(val, dimension, '获取成品检验订单数据', type);
         // this.$refs.table12.setData([]);
+        val = this.proceSources(val);
+        console.log(val, 'valvalvalvalvalvalval');
+
         this.sourceList = [];
         this.packingList = [];
         if (dimension) this.dimensionType = dimension;
@@ -1232,6 +1240,7 @@
       },
       // 处理来源清单数据
       proceSources(arr) {
+        console.log('方法调用没 443');
         let list = arr;
         let o = list[0];
         let listArr = [];
@@ -2697,7 +2706,7 @@
           try {
             if (this.isStandard1OrWeightSample()) {
               // 新增校验 数量  取整样 ***
-              console.log(this.baseForm.conditionType,'33333333333')
+              console.log(this.baseForm.conditionType, '33333333333');
               if (this.conditionType == 1) {
                 let isFlag = this.validateSampleQuantity(
                   sampleCount,
@@ -2737,7 +2746,10 @@
       },
       // 当计量类型 是数量的时候 取整样 校验
       validateSampleQuantity(sampleCount, specifications) {
-        let packingUnit = this.selectedList[0].packingUnit.trim();
+        console.log(this.selectedList, 'this.selectedList 9999');
+        console.log(specifications, 'specificationsspecifications');
+        let packingUnit = this.selectedList[0].packingUnit?.trim() || '';
+        console.log(packingUnit, 'packingUnitpackingUnit');
         let totalS = 0;
         let labelKey =
           packingUnit == specifications.conversionUnit.trim()

src/views/inspectionWork/components/newQualityContentTabs.vue

@@ -1065,7 +1065,8 @@
         this.$emit('countQualityResults');
       },
       addInspectionTemplate() {
-        this.$refs.inspectionTemplateRef.open(2);
+        let type = this.form.qualityType || 1;
+        this.$refs.inspectionTemplateRef.open(type);
       },
       async inspectionTemplateSuccess(select) {
         let data = await getQualityTemplateByIds({

src/views/inspectionWork/edit.vue

@@ -875,7 +875,7 @@
       },
       // 当计量类型 是数量的时候 取整样 校验
       validateSampleQuantity(sampleCount, specifications) {
-        let packingUnit = this.selectedList[0].packingUnit.trim();
+        let packingUnit = this.selectedList[0].packingUnit?.trim() || '';
         let totalS = 0;
         let labelKey =
           packingUnit == specifications.conversionUnit.trim()
@@ -1296,7 +1296,8 @@
         if (index != null) {
           this.$set(this.sampleList, index, list[0]);
         } else {
-          this.$set(this.sampleList, null, list);
+          // this.$set(this.sampleList, null, list);
+          this.sampleList = list;
         }
         this.activeName = '2';
         // *** 选完批量质检调用