From a0b1fdec2bc5ddad11e981936b80d0fdf1e4bc69 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 09:25:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/a5-laboratory-management.vue | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/components/view/a5-laboratory-management.vue b/src/components/view/a5-laboratory-management.vue
index add07bd..560acea 100644
--- a/src/components/view/a5-laboratory-management.vue
+++ b/src/components/view/a5-laboratory-management.vue
@@ -69,7 +69,7 @@
<div class="role_manage">
<div>
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">鍦烘墍鎴栬鏂斤細</el-col>
+ <el-col :span="12" style="padding-left: 20px;text-align: left;">鍦烘墍鎴栬鏂斤細</el-col>
<el-col :span="12" style="text-align: right;">
<el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
</el-col>
@@ -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,13 +239,13 @@
props: { multiple: false,emitPath:false,},
options:[
{
- value:0,
+ value:'瀹為獙瀹よ祫璐�',
label:'瀹為獙瀹よ祫璐�',
children:[]
},
{
- value:1,
- label:'棰濆绫诲瀷',
+ value:'鎶ュ憡绫诲瀷',
+ label:'鎶ュ憡绫诲瀷',
children:null
},
],
@@ -269,11 +278,12 @@
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.selectField.type.select = arr;
})
},
refresh() {
@@ -345,7 +355,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 +366,7 @@
if (power[i].menuMethod == 'addParameter') {
add = true
}
- if (power[i].menuMethod == 'selectSeal') {
+ if (power[i].menuMethod == 'addSeal') {
file = true
}
}
--
Gitblit v1.9.3