From b2a08ac8ad5702b5aeddaae612789adda9f5e965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
 <411641505@qq.com>
Date: Wed, 27 Nov 2024 14:38:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E9=AA=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=80=BC=E7=B1=BB=E5=9E=8B=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/qc/qcindex/index.vue | 47 +++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/src/views/mes/qc/qcindex/index.vue b/src/views/mes/qc/qcindex/index.vue
index b0db0d3..de5b93e 100644
--- a/src/views/mes/qc/qcindex/index.vue
+++ b/src/views/mes/qc/qcindex/index.vue
@@ -89,6 +89,11 @@
         </template>
       </el-table-column>
       <el-table-column label="检测工具" align="center" prop="qcTool" />
+      <el-table-column label="检测值类型" align="center" prop="qcResultType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.mes_qc_result_type" :value="scope.row.qcResultType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -160,6 +165,32 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="检测值类型" prop="qcResultType">
+              <el-select v-model="form.qcResultType" placeholder="请选择检测值类型">
+                <el-option
+                  v-for="dict in dict.type.mes_qc_result_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="值属性" v-if="form.qcResultType == 'FILE' " prop="qcResultSpc">
+              <el-input v-model="form.qcResultSpc" placeholder="请输入文件格式" />
+            </el-form-item>
+
+            <el-form-item label="值属性" v-else-if="form.qcResultType == 'DICT' " prop="qcResultSpc">
+              <el-input v-model="form.qcResultSpc" readonly placeholder="请选择字典" >
+                <el-button slot="append" @click="handleSelectDict" icon="el-icon-search"></el-button>
+              </el-input>
+            </el-form-item>
+            <DictSelect ref="dictSelect" @onSelected="onDictSelected"></DictSelect>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
@@ -179,10 +210,12 @@
 
 <script>
 import { listQcindex, getQcindex, delQcindex, addQcindex, updateQcindex } from "@/api/mes/qc/qcindex";
+import DictSelect from "@/components/DictSelect/index.vue";
 import {genCode} from "@/api/system/autocode/rule"
 export default {
   name: "Qcindex",
-  dicts: ['mes_index_type'],
+  dicts: ['mes_index_type','mes_qc_result_type'],
+  components: {DictSelect},
   data() {
     return {
       //自动生成编码
@@ -228,6 +261,9 @@ export default {
         indexType: [
           { required: true, message: "检测项类型不能为空", trigger: "change" }
         ],
+        qcResultType: [
+          { required: true, message: "请选择检测项值类型", trigger: "change" }
+        ]
       }
     };
   },
@@ -351,6 +387,15 @@ export default {
         ...this.queryParams
       }, `qcindex_${new Date().getTime()}.xlsx`)
     },
+    //字典选择弹出框
+    handleSelectDict(){
+      this.$refs.dictSelect.showFlag = true;
+    },
+    //字典选择返回
+    onDictSelected(row){
+      debugger;
+      this.form.qcResultSpc=row.dictType;
+    },
     //自动生成编码
     handleAutoGenChange(autoGenFlag){
       if(autoGenFlag){