From 1e9c7a02ec2b8caf7dda6000d7f0f79849df6b45 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期四, 09 五月 2024 14:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/a5-laboratory-management.vue | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/components/view/a5-laboratory-management.vue b/src/components/view/a5-laboratory-management.vue
index add07bd..82e8e6d 100644
--- a/src/components/view/a5-laboratory-management.vue
+++ b/src/components/view/a5-laboratory-management.vue
@@ -192,7 +192,11 @@
type: 'text',
method: 'fileManagement'
}],
- tagField: {},
+ tagField: {
+ type:{
+ select:[]
+ }
+ },
selectField: {},
requiredAdd: ['laboratoryName', 'laboratoryNumber', 'head', 'phoneNumber'],
requiredUp: ['laboratoryName', 'laboratoryNumber', 'head', 'phoneNumber']
@@ -212,9 +216,14 @@
select: false,
do: [],
tagField: {},
- selectField: {},
+ selectField: {
+ type:{
+ select:[]
+ }
+ },
requiredAdd: [],
- requiredUp: []
+ requiredUp: [],
+ addUpload:['address'],
},
entityCopy: {},
upIndex: 0,
@@ -230,12 +239,12 @@
props: { multiple: false,emitPath:false,},
options:[
{
- value:0,
+ value:'瀹為獙瀹よ祫璐�',
label:'瀹為獙瀹よ祫璐�',
children:[]
},
{
- value:1,
+ value:'棰濆绫诲瀷',
label:'棰濆绫诲瀷',
children:null
},
@@ -269,11 +278,13 @@
return
}
let arr = res.data.body.records.map(m=>{
- m.value = m.id;
+ m.value = m.name;
m.label = m.name;
return m
})
this.options[0].children = arr;
+ this.fileComponentData.tagField.type.select = arr;
+ this.fileComponentData.selectField.type.select = arr;
})
},
refresh() {
@@ -345,7 +356,7 @@
let up = false
let del = false
let add = false
- let file = false
+ let file = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'upParameter') {
up = true
@@ -356,7 +367,7 @@
if (power[i].menuMethod == 'addParameter') {
add = true
}
- if (power[i].menuMethod == 'selectSeal') {
+ if (power[i].menuMethod == 'addSeal') {
file = true
}
}
--
Gitblit v1.9.3