From f73ac8d2b62d348217f50199d2d3c7dac5582edb Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Fri, 27 Mar 2026 18:43:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=B4=A8=E9=87=8F=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionTesting/productionQuality.vue   | 75 +++++++++++--------
 1 file changed, 43 insertions(+), 32 deletions(-)

diff --git a/src/views/productionTesting/productionQuality.vue b/src/views/productionTesting/productionQuality.vue
index 8ba590c..cc743a7 100644
--- a/src/views/productionTesting/productionQuality.vue
+++ b/src/views/productionTesting/productionQuality.vue
@@ -136,7 +136,15 @@
         @expand-change="handleExpandChange"
         :default-expand-all="false"
       >
-        <el-table-column type="expand" v-if="dialogData.ppsName != '烧结包装防护'">
+        <el-table-column type="expand" 
+          v-if="dialogData.ppsName != '烧结包装防护' &&
+          (
+            (
+              vxeTableData.find(item => item.item.name == '尺寸检测') && vxeTableData.find(item => item.item.name == '尺寸检测').wpItemDetailList &&
+              vxeTableData.find(item => item.item.name == '尺寸检测').wpItemDetailList.length > 0
+            ) ||
+            vxeTableData.find(item => item.item.name == '厚度检测')
+          )">
           <template #default="scope">
             <el-table
               :data="scope.row.wpItemDetailList"
@@ -154,49 +162,49 @@
               <el-table-column label="量具编号" prop="trialNo" align="center">
                 <template #default="scope1">
                   <!-- {{scope.row}} -->
-                  <el-select v-model="scope1.row.actMtId" placeholder="请输入" :disabled="scope.row.checkUserRealName != ''">
+                  <el-select v-model="scope1.row.actMtId" placeholder="请输入" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' ">
                     <el-option v-for="item in measureList" :key="item.id" :label="item.mcName" :value="item.id" />
                   </el-select>
                 </template>
               </el-table-column>
               <el-table-column label="测量值1" prop="gaugeValue1" align="center">
                 <template #default="scope1">
-                  <el-input v-model="scope1.row.gaugeValue1" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="scope1.row.gaugeValue1" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="测量值2" prop="gaugeValue2" align="center">
                 <template #default="scope1">
-                  <el-input v-model="scope1.row.gaugeValue2" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="scope1.row.gaugeValue2" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="测量值3" prop="gaugeValue3" align="center">
                 <template #default="scope1">
-                  <el-input v-model="scope1.row.gaugeValue3" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="scope1.row.gaugeValue3" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="测量值4" prop="gaugeValue4" align="center">
                 <template #default="scope1">
-                  <el-input v-model="scope1.row.gaugeValue4" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="scope1.row.gaugeValue4" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="测量值5" prop="gaugeValue5" align="center">
                 <template #default="scope1">
-                  <el-input v-model="scope1.row.gaugeValue5" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="scope1.row.gaugeValue5" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="测量值6" prop="gaugeValue6" align="center">
                 <template #default="scope1">
-                  <el-input v-model="scope1.row.gaugeValue6" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="scope1.row.gaugeValue6" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="测量值7" prop="gaugeValue7" align="center">
                 <template #default="scope1">
-                  <el-input v-model="scope1.row.gaugeValue7" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="scope1.row.gaugeValue7" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="测量值8" prop="gaugeValue8" align="center">
                 <template #default="scope1">
-                  <el-input v-model="scope1.row.gaugeValue8" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="scope1.row.gaugeValue8" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
             </el-table>
@@ -240,49 +248,49 @@
                   </div>
                 </template>
                 <template #default="subScope">
-                  <el-input v-model="subScope.row.gaugeValue7" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="subScope.row.gaugeValue7" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="名称1" prop="gaugeValue1" align="center">
                 <template #default="subScope">
-                  <el-input v-model="subScope.row.gaugeValue1" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="subScope.row.gaugeValue1" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="参数1(um)" prop="gaugeValue2" align="center">
                 <template #default="subScope">
-                  <el-input v-model="subScope.row.gaugeValue2" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="subScope.row.gaugeValue2" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="名称2" prop="gaugeValue3" align="center">
                 <template #default="subScope">
-                  <el-input v-model="subScope.row.gaugeValue3" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="subScope.row.gaugeValue3" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="参数2(um)" prop="gaugeValue4" align="center">
                 <template #default="subScope">
-                  <el-input v-model="subScope.row.gaugeValue4" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="subScope.row.gaugeValue4" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="名称3" prop="gaugeValue5" align="center">
                 <template #default="subScope">
-                  <el-input v-model="subScope.row.gaugeValue5" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="subScope.row.gaugeValue5" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="参数3(um)" prop="gaugeValue6" align="center">
                 <template #default="subScope">
-                  <el-input v-model="subScope.row.gaugeValue6" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="subScope.row.gaugeValue6" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="设备编码" prop="gaugeValue8" align="center">
                 <template #default="subScope">
-                  <el-input v-model="subScope.row.gaugeValue8" :disabled="scope.row.checkUserRealName != ''"></el-input>
+                  <el-input v-model="subScope.row.gaugeValue8" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="检测时间" prop="updateTime" align="center" width="260">
                 <template #default="subScope">
                   <el-date-picker type="datetime" style="width:90%" v-model="subScope.row.updateTime" 
                   format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择时间" 
-                  :disabled="scope.row.checkUserRealName != ''"></el-date-picker>
+                  :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-date-picker>
                 </template>
               </el-table-column>
             </el-table>
@@ -308,10 +316,10 @@
           width="200px"
           align="center"
         >
-          <template #default="scope"> {{scope.row.standard.name}} </template>
+          <template #default="scope"> {{scope.row.standard && scope.row.standard.name}} </template>
         </el-table-column>
         <el-table-column label="标准值" prop="trialStandard" align="center" width="150px">
-          <template #default="scope"> {{scope.row.standard.standardValue}}  {{'(' + scope.row.standard.downValue + '~' + scope.row.standard.upValue+ ')'}} </template>
+          <template #default="scope"> {{scope.row.standard && scope.row.standard.standardValue}}  {{'(' + scope.row.standard && scope.row.standard.downValue + '~' + scope.row.standard && scope.row.standard.upValue+ ')'}} </template>
         </el-table-column>
         <!-- <el-table-column label="上下限" prop="trialStandard"  align="center"></el-table-column>、
         <el-table-column label="下限" prop="trialStandard"  align="center"></el-table-column> -->
@@ -335,7 +343,7 @@
               >
             </div>
             <div v-else>
-              <el-input v-model="scope.row.checkValue" :disabled=" scope.row.checkUserRealName != ''"></el-input>
+              <el-input v-model="scope.row.checkValue" :disabled=" scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
             </div>
           </template>
         </el-table-column>
@@ -347,7 +355,7 @@
           align="center"
         >
           <template #default="scope">
-            <el-input v-model="scope.row.testQty" :disabled=" scope.row.checkUserRealName != ''"></el-input>
+            <el-input v-model="scope.row.testQty" :disabled=" scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -358,12 +366,12 @@
           align="center"
         >
           <template #default="scope">
-            <el-input v-model="scope.row.lossQty" :disabled=" scope.row.checkUserRealName != ''"></el-input>
+            <el-input v-model="scope.row.lossQty" :disabled=" scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
           </template>
         </el-table-column>
         <el-table-column label="检验数量" prop="checkQty" width="100px" align="center">
           <template #default="scope">
-            <el-input v-model="scope.row.checkQty" :disabled=" scope.row.checkUserRealName != ''"></el-input>
+            <el-input v-model="scope.row.checkQty" :disabled=" scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
           </template>
         </el-table-column>
         <el-table-column label="检验结果" prop="checkResult" width="300px" align="center">
@@ -371,7 +379,7 @@
             <el-radio-group
               v-model="scope.row.checkResult"
               @change="val => changeQty(val, scope.$index)"
-              :disabled=" scope.row.checkUserRealName != ''"
+              :disabled=" scope.row.checkUserRealName && scope.row.checkUserRealName != '' "
             >
               <el-radio :label="1">合格</el-radio>
               <el-radio :label="2">不合格</el-radio>
@@ -959,13 +967,16 @@ export default {
     },
     getRowClass(row, index) {
       let res = [];
-      if (row.row.item.name != '尺寸检测' && row.row.item.name != '厚度检测')
-        //即改行没有子元素时，添加row-expand-cover类
-        // res.push('row-expand-cover')
+      if (row.row.item.name != '尺寸检测' && row.row.item.name != '厚度检测'){
         return 'row-expand-cover';
-      /* if (row.operate == 2)
-          res.push('hide-row')
-        return res.join(' ') */
+      }else if(
+        row.row.item.name == '尺寸检测' && 
+        (!row.row.wpItemDetailList || row.row.wpItemDetailList.length === 0)
+      ){
+        return 'row-expand-cover';
+      }
+      return '';
+     
     },
     testMeasurementData(row, index) {
       const itemDetail = {