33

src/views/material/BOMmanage/qualityTesting/inspectionClassify/components/edit.vue

@@ -164,11 +164,22 @@
 
       /* 保存编辑 */
       save() {
-        let row =JSON.parse(JSON.stringify(this.rowObj));
-        row.qualityStandard.parameterStandards = this.multipleSelection;
-        EventBus.$emit('inspectionSelection', { message: row });
+        let _row = JSON.parse(JSON.stringify(this.rowObj));
+        let row = _row.qualityStandard || {};
+
+        if (!row.parameterStandards) {
+          row.parameterStandards = [];
+        } else {
+          row.singleWeightDivision =
+            row.parameterStandards[0]?.singleWeightDivision;
+          row.tolerance = row.parameterStandards[0]?.tolerance;
+          row.parameterType = row.parameterStandards[0]?.parameterType;
+        }
+
 
-        
+        row.parameterStandards = this.multipleSelection;
+        _row.qualityStandard = row;
+        EventBus.$emit('inspectionSelection', { message: _row });
 
         this.handleClose();
       },

src/views/material/BOMmanage/qualityTesting/term.vue

@@ -1,29 +1,50 @@
 <template>
   <div>
-    <el-button @click="() => this.$refs.termRef.open()"size="small" type="primary">新增</el-button>
-
-   
+    <el-button
+      @click="() => this.$refs.termRef.open()"
+      size="small"
+      type="primary"
+      >新增</el-button
+    >
 
     <div class="content_box" v-if="list.length > 0">
+      <div class="content_box_list" v-for="(item, index) in list" :key="index">
+        <div class="content_ll">
+          <div class="name">标准编码</div>
+          <div class="">{{
+            item.qualityStandard && item.qualityStandard.code
+          }}</div>
+        </div>
 
-      <div class="content_box_list" v-for="(item,index) in list" :key="index">
- 
-        <el-descriptions title="质检标准"   :column="2" border>
-    <el-descriptions-item label="标准编码">{{ item.qualityStandard && item.qualityStandard.code }}</el-descriptions-item>
-    <el-descriptions-item label="标准名称">{{ item.qualityStandard && item.qualityStandard.name }}</el-descriptions-item>
-    <el-descriptions-item label="标准代码">{{ item.qualityStandard && item.qualityStandard.standardCode }}</el-descriptions-item>
-    <el-descriptions-item label="状态">
-      <el-tag size="small">{{ item.qualityStandard && item.qualityStandard.status == 1 ? '启用' : '停用'}}</el-tag>
-    </el-descriptions-item>
+        <div class="content_ll">
+          <div class="name">标准名称</div>
+          <div class="">{{
+            item.qualityStandard && item.qualityStandard.name
+          }}</div>
+        </div>
 
-    
-   
-</el-descriptions>
+        <div class="content_ll">
+          <div class="name">标准代码</div>
+          <div class="">{{
+            item.qualityStandard && item.qualityStandard.standardCode
+          }}</div>
+        </div>
 
+        <div class="content_ll">
+          <div class="name">状态</div>
+          <div class="">
+            <el-tag size="small">{{
+              item.qualityStandard && item.qualityStandard.status == 1
+                ? '启用'
+                : '停用'
+            }}</el-tag></div
+          >
         </div>
 
+
+      </div>
     </div>
- 
+
     <termPop ref="termRef"></termPop>
   </div>
 </template>
@@ -40,9 +61,8 @@
     },
 
     created() {
-
       EventBus.$on('inspectionSelection', (data) => {
-        console.log(data.message); 
+        console.log(data.message);
 
         let _arr = this.updateOrCreateObjectInArray(this.list, data.message);
         this.list = JSON.parse(JSON.stringify(_arr));
@@ -50,29 +70,46 @@
       });
     },
 
-
     methods: {
-
-         updateOrCreateObjectInArray(array, newObj, idKey = 'id') {
-  // 用来检查是否已存在具有特定 id 的对象
-  const exists = array.some(obj => obj[idKey] === newObj[idKey]);
-
-  if (exists) {
-    // 如果存在，使用 map 来替换找到的对象
-    return array.map(obj => obj[idKey] === newObj[idKey] ? newObj : obj);
-  } else {
-    // 如果不存在，将新对象添加到数组中
-    return [...array, newObj];
-  }
-}
-
+      updateOrCreateObjectInArray(array, newObj, idKey = 'id') {
+        // 用来检查是否已存在具有特定 id 的对象
+        const exists = array.some((obj) => obj[idKey] === newObj[idKey]);
+
+        if (exists) {
+          // 如果存在，使用 map 来替换找到的对象
+          return array.map((obj) =>
+            obj[idKey] === newObj[idKey] ? newObj : obj
+          );
+        } else {
+          // 如果不存在，将新对象添加到数组中
+          return [...array, newObj];
+        }
+      }
     }
   };
 </script>
 
 <style lang="scss" scoped>
-.content_box{
+  .content_box {
     width: 100%;
     margin-top: 12px;
-}
+  }
+
+  .content_box_list{
+ display: flex;
+ flex-wrap: wrap;
+  }
+
+  .content_ll{
+    width: 50%;
+    display: flex;
+    flex-direction: row;
+    margin-top: 4px;
+
+    .name{
+        width: 130px;
+        color: #000;
+        font-weight: 700;
+    }
+  }
 </style>