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

@@ -4,7 +4,7 @@
     <el-row :gutter="24">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="参数名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model="where.inspectionName" placeholder="请输入" />
         </el-form-item>
       </el-col>
 

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

@@ -654,7 +654,7 @@
       },
       //根据类型获取计划来源下拉
       typeChange(val, type) {
-        if (val == 1) {
+        if (val == 1 || val == 6) {
           this.sourceList = [{ label: '采购收货单', value: '1' }];
         } else if (val == 2) {
           this.sourceList = [
@@ -797,13 +797,13 @@
             val.supplierMark
           );
         }
-        console.log('-----------------');
         this.getProductDetails(
           this.form.productId,
           batchNo,
           productionCode,
           val.id,
-          val.taskId
+          val.taskId,
+          'list'
         );
       },
       //获取产品详情信息-来自主数据
@@ -813,14 +813,21 @@
         batchNo = '',
         productionCode = '',
         id = '',
-        taskId = ''
+        taskId = '',
+        source
       ) {
+        console.log('执行了没 333');
         const data = await getDetailInfo(val);
         this.categoryInfo = data.category;
-        const qmsData = data.categoryQms.find((item) => item.dataType == 1);
+
         // *** 新增 批次号,来源单据 字段传递
         this.form.inspectionStandards = this.categoryInfo.measureType;
-        this.form.qualityMode = qmsData?.checkFormula ? qmsData.checkFormula : 1;
+        if (source == 'list') {
+          const qmsData = data.categoryQms.find((item) => item.dataType == 1);
+          this.form.qualityMode = qmsData?.checkFormula
+            ? qmsData.checkFormula
+            : 1;
+        }
         // this.form.qualityMode = this.form.qualityMode
         //   ? this.form.qualityMode
         //   : qmsData.checkFormula

src/views/inspectionWork/index.vue

@@ -35,6 +35,7 @@
           <div v-if="row.qualityType == 1">{{ row.qualityPlanCode }}</div>
           <div v-if="row.qualityType == 2">{{ row.workOrderCode }}</div>
           <div v-if="row.qualityType == 3">{{ row.qualityPlanCode }}</div>
+          <div v-if="row.qualityType == 6">{{ row.qualityPlanCode }}</div>
         </template>
 
         <template v-slot:files="scope">