From 24bb2269bf0d9a0aacc057a60d2c76d73b2fccc9 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 31 五月 2024 09:27:12 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/role-manage.vue | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/src/components/view/role-manage.vue b/src/components/view/role-manage.vue
index b932850..0579d43 100644
--- a/src/components/view/role-manage.vue
+++ b/src/components/view/role-manage.vue
@@ -62,12 +62,20 @@
:componentData="componentData" :key="upIndex" @upRole="upRole" @selectRole="selectRole" />
</div>
<el-dialog :title="type" :visible.sync="addDia" width="550px" @closed="closed">
- <div style="max-height: 500px;overflow-y: auto;padding: 10px;" v-if="addDia">
- <el-row style="line-height: 40px;margin-bottom: 20px;">
- <el-col :span="8" style="font-size: 16px;"><span class="required-span">* </span>瑙掕壊鍚�</el-col>
- <el-col :span="16">
+ <div style="max-height: 550px;overflow-y: auto;padding: 10px 20px;" v-if="addDia">
+ <el-row style="line-height: 42px;">
+ <el-col :span="7" style="font-size: 14px;"><span class="required-span">* </span>瑙掕壊鍚�</el-col>
+ <el-col :span="17">
<el-input v-model="addData.roleName" size="medium" placeholder="闇�鍞竴瑙掕壊鍚�" clearable
:disabled="type=='鏌ョ湅'"></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 42px;margin-bottom: 20px;">
+ <el-col :span="7" style="font-size: 14px;"><span class="required-span">* </span>瑙掕壊鍒嗙被</el-col>
+ <el-col :span="17">
+ <el-select v-model="addData.category" size="medium" :disabled="type=='鏌ョ湅'" style="width: 100%;">
+ <el-option v-for="(a, i) in deaprtEnum" :key="i" :label="a.name" :value="a.id"></el-option>
+ </el-select>
</el-col>
</el-row>
<el-divider content-position="left">鏉冮檺鍒嗛厤</el-divider>
@@ -137,7 +145,11 @@
type: 'text',
method: 'selectRole',
}],
- tagField: {},
+ tagField: {
+ category: {
+ select: []
+ }
+ },
selectField: {}
},
entityCopy: {},
@@ -147,18 +159,21 @@
addData: {
roleId2: null,
roleName: null,
+ category: null,
powers: []
},
menu: [],
menuCategroy: [],
menuCopy: [],
type: '鏂板',
- addPower: true
+ addPower: true,
+ deaprtEnum: []
}
},
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
this.selectMenuList()
+ this.selectDepartmentEnum()
this.getPower()
},
methods: {
@@ -187,11 +202,13 @@
upRole(row) {
this.type = '淇敼'
this.addData.roleName = row.name
+ this.addData.category = row.category
this.selectPowerByRoleId(row.id)
},
selectRole(row) {
this.type = '鏌ョ湅'
this.addData.roleName = row.name
+ this.addData.category = row.category
this.selectPowerByRoleId(row.id)
},
openAdd() {
@@ -201,6 +218,10 @@
saveAddData() {
if (this.addData.roleName == '' || this.addData.roleName == null) {
this.$message.error('璇峰～鍐欒鑹插悕')
+ return
+ }
+ if (this.addData.category == '' || this.addData.category == null) {
+ this.$message.error('璇烽�夋嫨瑙掕壊鍒嗙被')
return
}
this.addLoad = true
@@ -295,6 +316,18 @@
this.componentData.do.splice(0, 1)
}
this.addPower = add
+ },
+ selectDepartmentEnum(){
+ this.$axios.get(this.$api.department.selectDepartmentEnum).then(res=>{
+ this.deaprtEnum = res.data
+ this.componentData.tagField.category.select = []
+ res.data.forEach(a=>{
+ this.componentData.tagField.category.select.push({
+ label: a.name,
+ value: a.id
+ })
+ })
+ })
}
}
}
--
Gitblit v1.9.3