From 3ee7ff4151ceaa781018727ecb15d0200ab684a9 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Tue, 26 May 2026 17:38:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E6=A8=A1=E5=9D=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8F=8A=E8=B4=A8=E9=87=8F=E6=A3=80=E9=AA=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionTesting/productionQuality.vue   |  5 ++--
 .../components/batchDialog.vue                | 28 +++++++++----------
 .../components/disposeDialog.vue              |  4 +--
 .../tankSolutionTaskDispose.vue               | 20 ++++++-------
 4 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/views/productionTesting/productionQuality.vue b/src/views/productionTesting/productionQuality.vue
index 360d06d6..3a16ca9b 100644
--- a/src/views/productionTesting/productionQuality.vue
+++ b/src/views/productionTesting/productionQuality.vue
@@ -1306,8 +1306,8 @@ export default {
     getThickness(val,allData,endTime,itemDetail){
       
       getThicknessList({
-        // startTime:this.startTime,
-        // endTime:endTime, 
+        startTime:this.startTime,
+        endTime:endTime, 
         allData,
         // count:val
       }).then(res =>{
@@ -1628,6 +1628,7 @@ export default {
         // res.data.data.wpItemList[0].item.name = '厚度检测'
         // res.data.data.wpItemList[0].checkUserRealName = null
         this.vxeTableData = res.data.data.wpItemList;
+        console.log('this.vxeTableData', this.vxeTableData);
         this.vxeTableData.map(item => {
           item.lossQty = (item.checkUserRealName != null && item.checkUserRealName != '' ) 
             ? item.lossQty : item.lossQty != null && item.lossQty != '' && item.lossQty != -1
diff --git a/src/views/qualityManagement/tankSolutionSystem/components/batchDialog.vue b/src/views/qualityManagement/tankSolutionSystem/components/batchDialog.vue
index a9f11b7b..bcc7d40e 100644
--- a/src/views/qualityManagement/tankSolutionSystem/components/batchDialog.vue
+++ b/src/views/qualityManagement/tankSolutionSystem/components/batchDialog.vue
@@ -63,10 +63,10 @@
         {{scope.row.qualified == 1 ? '合格' : scope.row.qualified == 2 ? '不合格' : ''}}
       </template>
       <!-- 复测电导率 -->
-      <template #conductivityRepeatTestValue="scope">
+      <!-- <template #conductivityRepeatTestValue="scope">
         <div class="inpu-text">
             <el-input @input="val => scope.row.conductivityRepeatTestValue = formatDecimal(val, 5)" :disabled="scope.row.status == 2 || scope.row.status == 4" v-model="scope.row.conductivityRepeatTestValue" /></div>
-      </template>
+      </template> -->
       <template #firstTestDate="scope">
         <div class="inpu-text">
             <el-date-picker
@@ -426,17 +426,17 @@ export default {
                         width: 200,
 
                     },
-                    {
-                        label: '复测电导率测量值',
-                        prop: 'conductivityRepeatTestValue',
-                        sortable: true,
-                        filter: true,
-                        span: 24,
-                        search: false,
-                        width: 220,
-                        cell: true
-
-                    },
+                    // {
+                    //     label: '复测电导率测量值',
+                    //     prop: 'conductivityRepeatTestValue',
+                    //     sortable: true,
+                    //     filter: true,
+                    //     span: 24,
+                    //     search: false,
+                    //     width: 220,
+                    //     cell: true
+
+                    // },
 
                 ]
             },
@@ -596,7 +596,7 @@ export default {
                 })
             }else if(this.data[0].status == 8){
                 const requiredFields = [
-                    { key: 'conductivityRepeatTestValue', label: '复测电导率测量值' },
+                    // { key: 'conductivityRepeatTestValue', label: '复测电导率测量值' },
                     { key: 'repeatTestValue', label: '复测测量值' },
                 ];
                 // 遍历所有行进行校验和计算
diff --git a/src/views/qualityManagement/tankSolutionSystem/components/disposeDialog.vue b/src/views/qualityManagement/tankSolutionSystem/components/disposeDialog.vue
index c9a77542..ec14d4f1 100644
--- a/src/views/qualityManagement/tankSolutionSystem/components/disposeDialog.vue
+++ b/src/views/qualityManagement/tankSolutionSystem/components/disposeDialog.vue
@@ -267,9 +267,9 @@
                         <el-col :span="6">
                             <span>测量值：</span><span>{{ detailForm.repeatTestValue }}</span>
                         </el-col>
-                        <el-col :span="6">
+                        <!-- <el-col :span="6">
                             <span>电导率测量值：</span><span>{{ detailForm.conductivityRepeatTestValue }}</span>
-                        </el-col>
+                        </el-col> -->
                         <el-col :span="6">
                             <span>化验人：</span><span>{{ detailForm.repeatTestUserRealName }}</span>
                         </el-col>
diff --git a/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue b/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
index be97aeed..216b425a 100644
--- a/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
+++ b/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
@@ -375,15 +375,15 @@ export default {
                         span: 24,
                         width: 220,
                     },
-                    {
-                        label: '复测电导率测量值',
-                        prop: 'conductivityRepeatTestValue',
-                        search: false,
-                        sortable: 'custom',
-                        filter: true,
-                        span: 24,
-                        width: 220,
-                    },
+                    // {
+                    //     label: '复测电导率测量值',
+                    //     prop: 'conductivityRepeatTestValue',
+                    //     search: false,
+                    //     sortable: 'custom',
+                    //     filter: true,
+                    //     span: 24,
+                    //     width: 220,
+                    // },
                     {
                         label: '上次化验时间',
                         prop: 'firstTestDate',
@@ -859,7 +859,7 @@ export default {
                         item.actualAddValue = ''
                         item.afterAddTheoryValue = ''
                         item.repeatTestValue = ''
-                        item.conductivityRepeatTestValue = ''
+                        // item.conductivityRepeatTestValue = ''
                     }
                 })
                 this.page.total = res.data.data.total