Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/material/product/components/QualityInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="other">
     <el-form label-width="130px" ref="form" :model="form" :rules="rules">
-      <div class="divider" v-if="form.dataType == 1">
+      <div class="divider">
         <div class="title">
           <div class="ele-bg-primary"></div>
           <span>质量配置</span>
@@ -9,19 +9,19 @@
         <div class="ele-bg-primary ele-width"></div>
       </div>
       <el-row :gutter="24">
-        <el-col :span="4">
+        <el-col :span="8" v-for="(item, index) in form" :key="index">
           <el-form-item
             :label="
-              form.dataType == 1
+              item.dataType == 1
                 ? '是否采购来料检验'
-                : form.dataType == 2
+                : item.dataType == 2
                 ? '是否委外来料检验'
                 : '是否受托来料检验'
             "
             prop="isComeCheck"
           >
-            <el-radio v-model="form.isComeCheck" :label="1">是</el-radio>
-            <el-radio v-model="form.isComeCheck" :label="0">否</el-radio>
+            <el-radio v-model="item.isComeCheck" :label="1">是</el-radio>
+            <el-radio v-model="item.isComeCheck" :label="0">否</el-radio>
           </el-form-item>
         </el-col>
         <!-- <el-col :span="6" v-if="form.isComeCheck == 1">
@@ -186,10 +186,9 @@
       //     };
       //   });
       // },
-      qualityTemplateIdsChange(data){
-        this.form.sampleProportion=data.sampleProportion
-        this.form.sampleProportionUnit=data.sampleProportionUnit
-
+      qualityTemplateIdsChange(data) {
+        this.form.sampleProportion = data.sampleProportion;
+        this.form.sampleProportionUnit = data.sampleProportionUnit;
       },
       levelChange(val) {
         this.form.levelItem = val;

src/views/material/product/detail.vue

@@ -390,12 +390,7 @@
     <PlanInfo ref="planRefs" :form="categoryAps" />
     <!-- 质量配置 -->
 
-    <QualityInfo
-      ref="qualityRefs"
-      :form="item"
-      v-for="(item, index) in categoryQms"
-      :key="index"
-    />
+    <QualityInfo ref="qualityRefs" :form="categoryQms" />
     <!-- 舟皿信息 -->
     <BoatInfo :form="categoryPallet" />
     <!-- 周转车信息 -->
@@ -1170,12 +1165,12 @@
           });
         });
       },
-      levelChange(val) {
-        this.$refs.qualityRefs?.forEach((item) => {
-          item.levelChange(val);
-          // console.log(item)
-        });
-      },
+      // levelChange(val) {
+      //   this.$refs.qualityRefs?.forEach((item) => {
+      //     item.levelChange(val);
+      //     // console.log(item)
+      //   });
+      // },
       // 确定分类
       async confirmCategory(node, title, PathInfo, ruleCode) {
         this.categoryLevelPathId = PathInfo.categoryLevelPathId.split(',')[0];