From 2f97b2570c124711e3fb67943407b75f8f074c02 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Thu, 15 Aug 2024 11:33:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E6=8F=8F=E8=BF=B0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dict/data.js                   |  9 +++++
 .../quality/qcIncome/checkProjectType.vue     | 36 +++++++++++++++----
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/api/system/dict/data.js b/src/api/system/dict/data.js
index 6c9eb79b..cc5fa8c3 100644
--- a/src/api/system/dict/data.js
+++ b/src/api/system/dict/data.js
@@ -9,6 +9,15 @@ export function listData(query) {
   })
 }
 
+// 查询字典数据列表无分页，可筛选
+export function getDictData(query) {
+  return request({
+    url: '/system/dict/data/getDictData',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询字典数据详细
 export function getData(dictCode) {
   return request({
diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index 8540428b..4880428f 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -51,7 +51,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-           
+
             <el-col :span="14">
               <el-form-item v-if="form.startOA == '1'" label="不合格描述" prop="remark">
                 <el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" />
@@ -60,7 +60,15 @@
              -->
               <el-col :span="14">
               <el-form-item label="不合格描述" prop="remark">
-                <el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" />
+                <!-- <el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" /> -->
+                <el-select v-model="form.remark" placeholder="请选择不合格描述" clearable>
+                  <el-option
+                    v-for="dict in remarkList"
+                    :key="dict.dictLabel"
+                    :label="dict.dictLabel"
+                    :value="dict.dictLabel"
+                  ></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -162,7 +170,7 @@
                 />
             </el-select>
           </el-form-item>
-          
+
           <el-form-item label="接受质量限" prop="sampleAql" v-if="this.typeCode == 'material' || this.typeCode == 'product'">
             <el-select placeholder="请选择接受质量限制" clearable
             @change="setSampleAql" v-model="dynamicValidateForm.sampleAql"
@@ -225,6 +233,7 @@ import { getCkeckProjectList,changeCheckDetailStatus,commitActualValue,
   commitCheckResult,getDefectList,getWeightValue,getnoOkVals,getAutoJudge
 } from "@/api/quality/income";
 import { getDefectValue, commitDefectValue, updateDefectValue} from "@/api/quality/checkTaskDefect";
+import { getDictData,} from "@/api/system/dict/data";
 export default {
   name: "itemSelectUser",
   dicts: ["qc_rule_prop","material_type_oa","material_from_oa","sample_level","sample_aql"],
@@ -246,6 +255,7 @@ export default {
       // BOM产品表格数据
       itemList: null,
       qcCheckTaskDetails: [],
+      remarkList: [],
       //树名称
       bomCode: undefined,
       defaultProps: {
@@ -306,6 +316,7 @@ export default {
   },
   created() {
     this.getDefect();
+    this.handleGetDictData();
   },
   methods: {
     getDefect(){
@@ -343,7 +354,7 @@ export default {
       this.queryParams.pageNum = 1;
       this.queryParams.pageSize = 10;
       this.getList();
-       this.getDefect();
+      this.getDefect();
     },
 
     /** 查询表格列表*/
@@ -357,6 +368,17 @@ export default {
       );
     },
 
+    handleGetDictData() {
+     const query = {
+        dictType: 'unqualified_remark',
+      }
+      getDictData(query).then(response => {
+        if (response.code === 200) {
+          this.remarkList = response.data;
+        }
+      });
+    },
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -506,7 +528,7 @@ export default {
           if(this.typeCode=='material' || this.typeCode =='product'){//只有来料和成品有自动判定
           debugger
             //自动判定开始(仅使用范围形)
-            getAutoJudge(this.quality, 
+            getAutoJudge(this.quality,
               this.dynamicValidateForm.checkLevel,
               this.dynamicValidateForm.sampleAql,
               actualValues,
@@ -522,7 +544,7 @@ export default {
               );
 						});
 
-            //结束 
+            //结束
           }else{//不需要自动判定的情况
             this.commitActualValueFun(this.recordId, actualValues,autoStatus,null,null,null,null);
           }
@@ -542,7 +564,7 @@ export default {
         this.getList();
       });
     },
-    
+
     resetForm(formName) {
       this.$refs[formName].resetFields();
     },