From 64c6ba29438156b2fbc365887fa523e6bb0ddbda Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Mon, 30 Mar 2026 13:36:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionTesting/productionDisposition.js        |  3 ++-
 src/views/productionDisposition/hearingDialog.vue     |  4 ++--
 src/views/productionDisposition/index.vue             |  1 +
 src/views/productionTesting/components/trialItem.vue  |  5 ++---
 src/views/productionTesting/inspectionItem.vue        | 11 ++++-------
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/api/qualityManagement/productionTesting/productionDisposition.js b/src/api/qualityManagement/productionTesting/productionDisposition.js
index 7b292b3..f3b00d3 100644
--- a/src/api/qualityManagement/productionTesting/productionDisposition.js
+++ b/src/api/qualityManagement/productionTesting/productionDisposition.js
@@ -4,7 +4,8 @@ import request from '@/axios';
 // 获取故障分类下拉
 export const getFaultClassList = (params) => {
   return request({
-    url: '/api/blade-desk/QA/Ng/listForSelectGZLB',
+    // url: '/api/blade-desk/QA/Ng/listForSelectGZLB',
+    url:"/api/blade-system/dict/dictionary?code=FAUL_TVPE",
     method: 'get',
     params
   });
diff --git a/src/views/productionDisposition/hearingDialog.vue b/src/views/productionDisposition/hearingDialog.vue
index 1878a28..e3d53a8 100644
--- a/src/views/productionDisposition/hearingDialog.vue
+++ b/src/views/productionDisposition/hearingDialog.vue
@@ -167,8 +167,8 @@
                             </template>
                             <template #default="scope">
                                 <el-select v-model="scope.row.ngType2Id" :disabled="type == 'view'">
-                                    <el-option v-for="item in errorTypeArr" :key="item.id" :value="item.id"
-                                        :label="item.name"></el-option>
+                                    <el-option v-for="item in errorTypeArr" :key="item.id" :value="item.dictKey"
+                                        :label="item.dictValue"></el-option>
                                 </el-select>
                             </template>
                         </el-table-column>
diff --git a/src/views/productionDisposition/index.vue b/src/views/productionDisposition/index.vue
index 1b7223e..07c4412 100644
--- a/src/views/productionDisposition/index.vue
+++ b/src/views/productionDisposition/index.vue
@@ -600,6 +600,7 @@ export default {
             this.page.currentPage = 1;
             this.query.createTimeStart = params.createTime && params.createTime.length != 0 && params.createTime[0]
             this.query.createTimeEnd = params.createTime && params.createTime.length != 0 && params.createTime[1]
+            if(this.query.createTime) delete this.query.createTime
             this.onLoad(this.page, params);
             done();
         },
diff --git a/src/views/productionTesting/components/trialItem.vue b/src/views/productionTesting/components/trialItem.vue
index 12dc499..75a8a93 100644
--- a/src/views/productionTesting/components/trialItem.vue
+++ b/src/views/productionTesting/components/trialItem.vue
@@ -365,7 +365,7 @@ export default {
 </script>
 
 <style scoped>
-.trial-item-container {
+/* .trial-item-container {
   height: calc(100vh - 200px);
   overflow-y: auto;
 }
@@ -375,7 +375,6 @@ export default {
   padding-bottom: 10px;
 }
 .trial-item-container :deep(.el-table) {
-  /* max-height: none !important; */
   height: 300px !important;
-}
+} */
 </style>
diff --git a/src/views/productionTesting/inspectionItem.vue b/src/views/productionTesting/inspectionItem.vue
index a3bc513..5033032 100644
--- a/src/views/productionTesting/inspectionItem.vue
+++ b/src/views/productionTesting/inspectionItem.vue
@@ -2,17 +2,14 @@
   <basic-container>
     <el-tabs
       v-model="activeName"
-     
       class="demo-tabs"
       @tab-click="handleClick"
     >
-      <el-tab-pane label="项目" name="trialItem">
-        <trial-item></trial-item>
-      </el-tab-pane>
-      <el-tab-pane label="标准" name="trialStandard">
-        <trial-standard></trial-standard>
-      </el-tab-pane>
+      <el-tab-pane label="项目" name="trialItem"></el-tab-pane>
+      <el-tab-pane label="标准" name="trialStandard"></el-tab-pane>
     </el-tabs>
+     <trial-item v-if="activeName == 'trialItem'"></trial-item>
+     <trial-standard v-if="activeName == 'trialStandard'"></trial-standard>
   </basic-container>
 </template>