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"
>
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -240,49 +248,49 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+ :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' ">
@@ -308,10 +316,10 @@
width="200px"
align="center"
>
- {{scope.row.standard.name}}
+ {{scope.row.standard && scope.row.standard.name}}
- {{scope.row.standard.standardValue}} {{'(' + scope.row.standard.downValue + '~' + scope.row.standard.upValue+ ')'}}
+ {{scope.row.standard && scope.row.standard.standardValue}} {{'(' + scope.row.standard && scope.row.standard.downValue + '~' + scope.row.standard && scope.row.standard.upValue+ ')'}}
@@ -335,7 +343,7 @@
>
-
+
@@ -347,7 +355,7 @@
align="center"
>
-
+
-
+
-
+
@@ -371,7 +379,7 @@
changeQty(val, scope.$index)"
- :disabled=" scope.row.checkUserRealName != ''"
+ :disabled=" scope.row.checkUserRealName && scope.row.checkUserRealName != '' "
>
合格
不合格
@@ -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 = {