From 0de6edd66b21331abbb2513ee5b0b8013fea03df Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 19 四月 2024 10:22:02 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/a7-standard-method.vue | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/components/view/a7-standard-method.vue b/src/components/view/a7-standard-method.vue
index 9bd74b1..58ebf4e 100644
--- a/src/components/view/a7-standard-method.vue
+++ b/src/components/view/a7-standard-method.vue
@@ -115,6 +115,16 @@
value: 1,
label: '鏄�'
}]
+ },
+ isUse: {
+ select: [{
+ value: 0,
+ type: 'info',
+ label: '鍚�'
+ }, {
+ value: 1,
+ label: '鏄�'
+ }]
}
},
selectField: {
@@ -130,10 +140,20 @@
value: 1,
label: '鏄�'
}]
+ },
+ isUse: {
+ select: [{
+ value: 0,
+ type: 'info',
+ label: '鍚�'
+ }, {
+ value: 1,
+ label: '鏄�'
+ }]
}
},
- requiredAdd: ['code', 'name', 'structureTestObjectId', 'isProduct'],
- requiredUp: ['code', 'name', 'structureTestObjectId', 'isProduct']
+ requiredAdd: ['code', 'name', 'structureTestObjectId', 'isProduct','isUse','nameEn'],
+ requiredUp: ['code', 'name', 'structureTestObjectId', 'isProduct','isUse','nameEn']
},
entityCopy: {},
upIndex: 0,
--
Gitblit v1.9.3