From 34a7e21b3508ac0f5f011d958210fdb7176d726b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 09 九月 2023 11:54:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/lims-before
---
src/views/laboratory/role/index.vue | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/views/laboratory/role/index.vue b/src/views/laboratory/role/index.vue
index c4f696c..8c13e3a 100644
--- a/src/views/laboratory/role/index.vue
+++ b/src/views/laboratory/role/index.vue
@@ -2,26 +2,28 @@
<div>
<div class="content-main">
<div class="top-bar">
- <el-form ref="form" :inline="true" :model="searchData">
+ <el-form style="display: flex;align-items: center;margin-top: 10px;" ref="form" :inline="true" :model="searchData">
<el-form-item label="瑙掕壊鍚嶇О锛�" class="sermargin">
- <el-input v-model="searchData.roleName" class="input-form" placeholder="璇疯緭鍏ヨ鑹插悕绉�" style="width:250px">
+ <el-input size="small" v-model="searchData.roleName" class="input-form" placeholder="璇疯緭鍏ヨ鑹插悕绉�" style="width:250px">
</el-input>
</el-form-item>
<el-form-item class="rightBtn">
- <el-button type="primary" @click="searchRole">鏌ヨ</el-button>
- <el-button type="primary" plain>閲嶇疆</el-button>
+ <el-col>
+ <el-button size="small" type="primary" @click="searchRole">鏌ヨ</el-button>
+ <el-button size="small" type="primary" @click="clear()" plain>閲嶇疆</el-button>
+ </el-col>
</el-form-item>
</el-form>
- <el-form>
+ <el-form style="margin-top: 10px;">
<el-form-item class="rightBtn">
- <el-button type="primary" @click="addClickRole" icon="el-icon-plus">鏂板瑙掕壊</el-button>
+ <el-button size="small" type="primary" @click="addClickRole" icon="el-icon-plus">鏂板瑙掕壊</el-button>
</el-form-item>
</el-form>
</div>
<div class="library-table">
<div class="table-box">
- <el-table :max-height="800" :cell-style="{ textAlign: 'center' }"
- :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
+ <el-table :max-height="800" :cell-style="{ textAlign: 'left' }"
+ :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
:data="roleTable" style="width: 100%">
<el-table-column type="index" min-width="8%" />
<el-table-column prop="roleName" label="瑙掕壊鍚嶇О" min-width="20%" />
@@ -285,6 +287,10 @@
searchRole() {
this.start()
},
+ clear(){
+ this.searchData.roleName=''
+ this.start()
+ },
clearUPAll() {
this.updateRole = {
roleId: null,
@@ -358,13 +364,11 @@
},
async upRole(scope) {
- console.log(scope);
this.updateRole.roleId = scope.row.roleId
this.updateRole.roleName = scope.row.roleName
this.updateRole.lastName = scope.row.roleName
let menuSelect = scope.row.roleMenuList
this.updateRole.lastMenuSelect = scope.row.roleMenuList
- console.log(menuSelect);
let res = await getMenusTree();
this.menuUpdateInfo = res.data
this.menuUpdateInfo.forEach(item => {
@@ -386,7 +390,6 @@
})
}
})
- console.log(this.menuUpdateInfo);
menuSelect.forEach(ms => {
this.menuUpdateInfo.forEach(item => {
if (ms.menuName === item.name) {
@@ -784,6 +787,7 @@
#selectRolecheck .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after {
border-color: #fff !important;
}
+
#selectRoleCheck .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
background-color: #409EFF;
border-color: #409EFF;
--
Gitblit v1.9.3