diff --git a/src/views/productionTesting/prPlanTestRec.vue b/src/views/productionTesting/prPlanTestRec.vue
index 54e0115..50edb20 100644
--- a/src/views/productionTesting/prPlanTestRec.vue
+++ b/src/views/productionTesting/prPlanTestRec.vue
@@ -66,7 +66,7 @@ export default {
labelWidth: 120,
searchLabelWidth: 120,
menu: true,
- menuWidth: 120,
+ menuWidth: 80,
dialogWidth: 1200,
dialogClickModal: false,
searchEnter: true,
@@ -81,13 +81,14 @@ export default {
searchLabelPosition:'left',
searchGutter:24,
searchSpan:6,
- menuAlign: 'left',
+ menuAlign: 'center',
gridBtn:false,
searchMenuPosition:'right',
column: [
{
label: '流程卡号',
- prop: 'cardNo',
+ prop:"code",
+ // prop: 'cardNo',
// bind: 'prWorkPlan.prWorkOrder.cardNo',
width: 200,
search: true,
@@ -103,7 +104,7 @@ export default {
},
{
label: '转试人',
- prop: 'testUserRealName',
+ prop: 'testUserName',
// bind: 'testUser.userName',
width: 200,
search: false,
diff --git a/src/views/productionTesting/productionQuality.vue b/src/views/productionTesting/productionQuality.vue
index 2b2fad1..a506b31 100644
--- a/src/views/productionTesting/productionQuality.vue
+++ b/src/views/productionTesting/productionQuality.vue
@@ -165,24 +165,28 @@
circle
type="danger"
icon="el-icon-delete"
- @click="removeRules(scope.row.wpItemDetailList,subScope.$index, subScope.row)"
+ @click="removeRules(scope.row.wpItemDetailList,subScope.$index, scope.row)"
/>
-
-
+
+
-
-
+
+
-
+
-
+
@@ -261,7 +265,7 @@
circle
type="danger"
icon="el-icon-delete"
- @click="removeSpecimen(subScope.$index, subScope.row)"
+ @click="removeSpecimen(subScope.$index, subScope.row,scope.row)"
/>
@@ -344,17 +348,17 @@
>
{{scope.row.standard && scope.row.standard.name}}
-
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+ {{ row.reDoNum }}
+ {{ row.scrapNum }}
+
+
+ 审理
+
+
+
-
- 是
- 否
-
-
-
-
-
-
-
-
-
-
- {{row.reDoNum}}
- {{row.scrapNum}}
-
-
- 审理
-
-
-
-
-
-
-
-
-
+
+