From 881d104a2e491ba289ddbe5d7f09f07b8d13e085 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Fri, 26 Jan 2024 16:43:14 +0800
Subject: [PATCH] =?UTF-8?q?2024.1.26=20=E6=A3=80=E9=AA=8C=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/qc/FAIResultEntry.vue  | 20 ++++++++--------
 src/views/modules/qc/FQCResultEntry.vue  | 20 ++++++++--------
 src/views/modules/qc/IPQCResultEntry.vue | 20 ++++++++--------
 src/views/modules/qc/qcTemplate.vue      | 30 +++++++++++++++---------
 4 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 7c0db39..627a473 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -619,16 +619,16 @@
           <el-form-item :label="'模板名称'">
             <el-input v-model="templateData.templateName" clearable style="width: 120px"></el-input>
           </el-form-item>
-          <el-form-item :label="'检验类型'">
-            <el-select v-model="templateData.inspectionTypeNo" style="width: 100px">
-              <el-option
-                v-for = "i in typeOptions"
-                :key = "i.inspectionTypeNo"
-                :label = "i.inspectionTypeName"
-                :value = "i.inspectionTypeNo">
-              </el-option>
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item :label="'检验类型'">-->
+<!--            <el-select v-model="templateData.inspectionTypeNo" style="width: 100px">-->
+<!--              <el-option-->
+<!--                v-for = "i in typeOptions"-->
+<!--                :key = "i.inspectionTypeNo"-->
+<!--                :label = "i.inspectionTypeName"-->
+<!--                :value = "i.inspectionTypeNo">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item :label="' '">
             <el-button type="primary" @click="queryTemplateList()">查询</el-button>
           </el-form-item>
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 38667d8..c0b7a71 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -570,16 +570,16 @@
           <el-form-item :label="'模板名称'">
             <el-input v-model="templateData.templateName" clearable style="width: 120px"></el-input>
           </el-form-item>
-          <el-form-item :label="'检验类型'">
-            <el-select v-model="templateData.inspectionTypeNo" style="width: 100px">
-              <el-option
-                v-for = "i in typeOptions"
-                :key = "i.inspectionTypeNo"
-                :label = "i.inspectionTypeName"
-                :value = "i.inspectionTypeNo">
-              </el-option>
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item :label="'检验类型'">-->
+<!--            <el-select v-model="templateData.inspectionTypeNo" style="width: 100px">-->
+<!--              <el-option-->
+<!--                v-for = "i in typeOptions"-->
+<!--                :key = "i.inspectionTypeNo"-->
+<!--                :label = "i.inspectionTypeName"-->
+<!--                :value = "i.inspectionTypeNo">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item :label="' '">
             <el-button type="primary" @click="queryTemplateList()">查询</el-button>
           </el-form-item>
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index f137fb2..14f0a6b 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -641,16 +641,16 @@
           <el-form-item :label="'模板名称'">
             <el-input v-model="templateData.templateName" clearable style="width: 120px"></el-input>
           </el-form-item>
-          <el-form-item :label="'检验类型'">
-            <el-select v-model="templateData.inspectionTypeNo" style="width: 100px">
-              <el-option
-                v-for = "i in typeOptions"
-                :key = "i.inspectionTypeNo"
-                :label = "i.inspectionTypeName"
-                :value = "i.inspectionTypeNo">
-              </el-option>
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item :label="'检验类型'">-->
+<!--            <el-select v-model="templateData.inspectionTypeNo" style="width: 100px">-->
+<!--              <el-option-->
+<!--                v-for = "i in typeOptions"-->
+<!--                :key = "i.inspectionTypeNo"-->
+<!--                :label = "i.inspectionTypeName"-->
+<!--                :value = "i.inspectionTypeNo">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item :label="' '">
             <el-button type="primary" @click="queryTemplateList()">查询</el-button>
           </el-form-item>
diff --git a/src/views/modules/qc/qcTemplate.vue b/src/views/modules/qc/qcTemplate.vue
index b1c8dac..a7cce59 100644
--- a/src/views/modules/qc/qcTemplate.vue
+++ b/src/views/modules/qc/qcTemplate.vue
@@ -196,7 +196,7 @@
     </el-dialog>
 
     <!-- 检验项目 -->
-    <el-dialog title="检验项目清单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="940px">
+    <el-dialog title="检验项目清单" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="940px">
       <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
         <el-form-item :label="'检验模板编码'">
           <el-input v-model="detailData.templateId" readonly style="width: 120px"></el-input>
@@ -314,16 +314,16 @@
           <el-form-item :label="'项目名称'">
             <el-input v-model="detailData.itemDesc" clearable style="width: 200px"></el-input>
           </el-form-item>
-          <el-form-item label="检验类型">
-            <el-select v-model="detailData.inspectionTypeNo" clearable placeholder="请选择" style="width: 120px">
-              <el-option
-                v-for = "i in options"
-                :key = "i.inspectionTypeNo"
-                :label = "i.inspectionTypeName"
-                :value = "i.inspectionTypeNo">
-              </el-option>
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="检验类型">-->
+<!--            <el-select v-model="detailData.inspectionTypeNo" clearable placeholder="请选择" style="width: 120px">-->
+<!--              <el-option-->
+<!--                v-for = "i in options"-->
+<!--                :key = "i.inspectionTypeNo"-->
+<!--                :label = "i.inspectionTypeName"-->
+<!--                :value = "i.inspectionTypeNo">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item :label="' '">
             <el-button type="primary" @click="getItem()">查询</el-button>
           </el-form-item>
@@ -533,6 +533,7 @@
           samplingProgrammeDesc: '',
           inspectionTypeNo: '',
           inspectionCycle: '',
+          inspectionTypeName: '',
           createTime: '',
           createBy: this.$store.state.user.name,
           samplingLevelNo: '',
@@ -1274,6 +1275,7 @@
         this.detailData.buNo = row.buNo
         this.detailData.templateId = row.templateId
         this.detailData.templateName = row.templateName
+        this.detailData.inspectionTypeName = row.inspectionTypeName
         templateDetailsSearch(this.detailData).then(({data}) => {
           this.detailList = data.rows
           this.objectSearch()
@@ -1400,6 +1402,12 @@
         })
       },
 
+      closeDialog (){
+        this.detailList = []
+        this.itemList1 = []
+        this.itemList2 = []
+      },
+
       // 删除项目中的明细
       delItemDetails (row) {
         this.$confirm(`是否删除这个检验明细?`, '提示', {