From 196c31f1f040c315de09a6808fc9cd63c63f9950 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 23 五月 2024 18:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/a5-capacity-scope.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 3618d06..bf1c8c9 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -224,14 +224,15 @@
props:{
value:'name',
label:'name',
- checkStrictly: true
+ checkStrictly: true,
+ multiple: true
}
},
- requiredAdd: ['sonLaboratory', 'inspectionItem', 'manHour', 'inspectionItemType', 'inspectionValueType',
- 'unit', 'method', 'price', 'manDay'
+ requiredAdd: ['sonLaboratory', 'inspectionItem', 'inspectionItemType', 'inspectionValueType',
+ 'unit', 'method', 'manDay', 'templateId'
],
- requiredUp: ['sonLaboratory', 'inspectionItem', 'manHour', 'inspectionItemType', 'inspectionValueType',
- 'unit', 'method', 'price', 'manDay'
+ requiredUp: ['sonLaboratory', 'inspectionItem', 'inspectionItemType', 'inspectionValueType',
+ 'unit', 'method', 'manDay', 'templateId'
]
},
testObjectData: {
@@ -335,6 +336,7 @@
if (this.radio === '0') {
this.showItemParameter = true;
this.showTestObject = false;
+ this.selectTestObjectByName()
/* this.$nextTick(() => {
this.$refs.itemParameterTable.selectList()
}) */
@@ -347,6 +349,7 @@
refreshTable() {
if (this.radio === '0') {
this.$refs['itemParameterTable'].selectList()
+
} else {
this.$refs['testObjectTable'].selectList()
}
--
Gitblit v1.9.3