From 86794b24a6bb46db006a391617ef3328c1a5c483 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Mon, 1 Apr 2024 11:35:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E6=A3=80=E9=AA=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checkTypeProject/MaterialGroupAdd.vue     | 25 ++++++++++++++++---
 .../quality/qcIncome/checkProjectType.vue     |  9 +++----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
index 12a13750..4e4d23cc 100644
--- a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
+++ b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
@@ -56,10 +56,17 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="物料组名称" prop="groupName">
-          <el-input v-model="form.groupName" placeholder="请输入物料组名称" />
+          <el-select v-model="form.groupCode" filterable clearable placeholder="请选择物料组">
+            <el-option
+              v-for="(item,index) in OriginalGroupList"
+              :key="index"
+              :label="item.groupName"
+              :value="item.groupCode">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="物料组编码" prop="groupCode">
-          <el-input v-model="form.groupCode" placeholder="请输入物料组编码" disabled/>
+        <el-form-item v-show="true" label="物料组编码" prop="groupCode">
+          <el-input v-model="form.groupName" placeholder="请输入物料组编码"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -78,7 +85,7 @@
 
 <script>
 import {
-  getGroupList,
+  getOriginalGroupList,
   addMaterialGroup,
   delMaterialGroup,
   updateMaterialGroup,
@@ -117,6 +124,8 @@ export default {
       groupName: undefined,
       // 物料组表格数据
       materialGroupList: [],
+      // 物料组原始数据
+      OriginalGroupList: [],
       //当前点击的节点数据
       nodeData: {},
       // 弹出层标题
@@ -150,6 +159,7 @@ export default {
   },
   created() {
     this.getMaterialTree();
+    this.getOriginalGroup();
   },
   methods: {
     // 取消按钮
@@ -175,6 +185,13 @@ export default {
       };
       this.resetForm("form");
     },
+    /** 获取初始物料组 */
+    getOriginalGroup() {
+      getOriginalGroupList(this.queryParams).then((response) => {
+        this.OriginalGroupList = response.rows;
+        //this.loading = false;
+      });
+    },
     /** 查询部门下拉树结构 */
     getMaterialTree() {
       materialTreeSelect().then((response) => {
diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index ab4ff315..fe9960cb 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -48,11 +48,6 @@
                 v-hasPermi="['quality:qcIncome:edit']"
               >不良数量</el-button>
             </template>
-          </el-table-column>
-          <el-table-column label="不良数量"  align="left"  prop="defectQuality"  width="120">
-            <template slot-scope="scope">
-              <el-input type="number" v-model="scope.row.defectQuality" placeholder="请输入不良数量"/>
-            </template>
           </el-table-column>
            <el-table-column label="检测值" align="center" class-name="small-padding fixed-width" v-if="this.viewStatus != '1' ">
             <template slot-scope="scope">
@@ -210,7 +205,6 @@ export default {
     this.getDefect();
   },
   methods: {
-
     getDefect(){
       getDefectList(this.typeCode).then(response => {
           this.defectList = response;
@@ -331,6 +325,7 @@ export default {
       this.defectForm.defectItems.forEach(item => {
         item.belongToDetail = row.recordId;
         item.belongTo = row.belongTo;
+        item.noOkQuality = 0;
       });
       getDefectValue(row.recordId).then(response => {
         let values = response.rows;
@@ -343,6 +338,8 @@ export default {
             noOkQuality: item.noOkQuality,
           }));
           this.updateFlag = true;
+        }else{
+          this.updateFlag = false;
         }
         this.defectOpen = true;
       });