From 1d54251546a06fc8e7cdbb3f28db7cba76ca07a0 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 29 十月 2024 14:57:09 +0800
Subject: [PATCH] 调整页面，修改bug
---
Source/plt-web/plt-web-ui/src/views/system/role/index.vue | 1
Source/plt-web/plt-web-ui/src/views/system/user/index.vue | 90 ++++-----------------------------------------
Source/plt-web/plt-web-ui/src/views/system/user/option.js | 18 +++++++-
3 files changed, 24 insertions(+), 85 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/system/role/index.vue b/Source/plt-web/plt-web-ui/src/views/system/role/index.vue
index 53aaddb..6f9e5f6 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/role/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/role/index.vue
@@ -113,6 +113,7 @@
refreshBtn: false,
addBtn: false,
menu: false,
+ header:false,
column: [
{
label: '閮ㄩ棬',
diff --git a/Source/plt-web/plt-web-ui/src/views/system/user/index.vue b/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
index 2f6ccea..1f75a2b 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
@@ -2,7 +2,6 @@
<basic-container>
<avue-crud
ref="userCrud"
- :before-open="beforeOpen"
:data="tableData"
:option="option"
:page.sync="page"
@@ -18,26 +17,6 @@
@row-save="rowSaveHandler"
@row-update="rowUpdateHandler"
>
- <!-- 閮ㄩ棬澶撮儴鎼滅储鎻掓Ы -->
- <template slot-scope="{disabled,size}" slot="pkDepartmentNameSearch">
- <div style="display: flex;gap: 5px">
- <el-select v-model="departSearchValue" clearable placeholder="璇烽�夋嫨閮ㄩ棬">
- <el-option :label="departSearchObj.name" :value="departSearchObj.oid"></el-option>
- </el-select>
- <el-button size="small" type="success" @click="dialogDepartSearchHandler">閫夋嫨閮ㄩ棬</el-button>
- </div>
- </template>
-
- <!-- 瀵硅瘽妗嗛儴闂ㄦ彃妲� -->
- <template slot="pkDepartmentNameForm" slot-scope="scope">
- <div style="display: flex;gap: 5px">
- <el-select v-model="departValue" clearable placeholder="璇烽�夋嫨閮ㄩ棬">
- <el-option :label="departObj.name" :value="departObj.oid"></el-option>
- </el-select>
- <el-button size="small" type="success" @click="dialogDepartHandler">閫夋嫨閮ㄩ棬</el-button>
- </div>
- </template>
-
<template slot="status" slot-scope="{row}">
<el-tag v-if="row.status === 0" type="success">鍚敤</el-tag>
<el-tag v-if="row.status === 1" type="danger">鍋滅敤</el-tag>
@@ -154,8 +133,6 @@
departSearchValue:'',
loadKey: 0,
departStatus: '', // 鍖哄垎涓嶅悓鏂瑰紡鎵撳紑閮ㄩ棬瀵硅瘽妗�
- departValue: '', // 閮ㄩ棬瀵硅瘽妗嗕笅鎷夋缁戝畾鍊�
- departObj: {}, // 閮ㄩ棬瀵硅瘽妗嗕笅鎷夋閫夐」缁戝畾鍊�
departCurrenRow: {},
departOption: {
...basicOption,
@@ -168,6 +145,7 @@
menu: false,
refreshBtn: false,
gridBtn: false,
+ header:false,
column: [
{
label: '鍚嶇О',
@@ -221,15 +199,6 @@
created() {
},
methods: {
- // 鏂板鎴栦慨鏀瑰璇濇鎵撳紑鍓�
- beforeOpen(done, type) {
- if(type == 'add'){
- this.departObj = {};
- this.departValue = "";
- }
- done();
- },
-
// 琛ㄦ牸璇锋眰
getTableList() {
this.tableLoading = true;
@@ -239,6 +208,7 @@
this.page.total = res.data.total;
this.tableLoading = false;
})
+ this.departmentQueryOnLoad()
},
// 琛ㄦ牸鍙充晶鍒锋柊鍥炬爣
@@ -249,10 +219,6 @@
// 鎼滅储鏌ヨ
handleSearch(params, done) {
this.searchParams = {};
- if(this.departSearchObj && this.departSearchValue){
- this.searchParams['conditionMap["pkDepartment"]'] = this.departSearchValue;
- }
-
if (!func.isEmptyObject(params)) {
for (let key in params) {
if (params.hasOwnProperty(key)) {
@@ -263,7 +229,7 @@
}
}
- if (func.isEmptyObject(params) && !this.departSearchValue) {
+ if (func.isEmptyObject(params)) {
this.searchParams = {};
}
@@ -273,8 +239,6 @@
// 閲嶇疆鎼滅储鏉′欢
handleReset() {
- this.departSearchObj = {};
- this.departSearchValue = "";
this.searchParams = {};
this.getTableList();
},
@@ -399,7 +363,6 @@
this.$message.error('璇锋鏌ヤ袱娆″瘑鐮佹槸鍚﹁緭鍏ヤ竴鑷达紒')
return this.$refs.userCrud.$refs.dialogForm.$refs.tableForm.allDisabled = false;
}
- row.pkDepartment = this.departValue; // 灏嗗綋鍓嶈鐨勯儴闂ㄥ弬鏁皃kDepartment 璧嬪�间负涓嬫媺妗嗙粦瀹氱殑鍊�
addUser(row).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.obj);
@@ -413,14 +376,7 @@
// 鎿嶄綔鏍忕紪杈�
rowEditHandler(row, index) {
- let obj = { name: row.pkDepartmentName, oid: row.pkDepartment, rowOid: row.oid };
- this.departValue = row.pkDepartment;
- this.departObj = obj;
-
- if (this.departObj.rowOid) {
- this.$refs.userCrud.rowEdit(row, index);
- }
-
+ this.$refs.userCrud.rowEdit(row, index);
},
// 缂栬緫
@@ -429,7 +385,6 @@
this.$message.error('璇锋鏌ヤ袱娆″瘑鐮佹槸鍚﹁緭鍏ヤ竴鑷达紒')
return this.$refs.userCrud.$refs.dialogForm.$refs.tableForm.allDisabled = false;
}
- row.pkDepartment = this.departValue; // 灏嗗綋鍓嶈鐨勯儴闂ㄥ弬鏁皃kDepartment 璧嬪�间负涓嬫媺妗嗙粦瀹氱殑鍊�
updateUser(row).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.obj);
@@ -497,11 +452,8 @@
// 涓嬭浇瀵煎叆妯℃澘
downloadHandler() {
download().then(res => {
- console.log(res);
func.downloadFileByBlobHandler(res);
this.$message.success('涓嬭浇鎴愬姛');
- }).catch(err => {
- this.$message.error(err);
})
},
@@ -517,7 +469,7 @@
return;
}
this.departStatus = 'default'; // 鍖哄垎涓嶅悓鏂瑰紡鎵撳紑閮ㄩ棬瀵硅瘽妗�
- this.departmentQueryOnLoad();
+ this.departVisible = true;
},
// 鍒嗛厤閮ㄩ棬琛ㄦ牸鍒濆鍖栬姹�
@@ -525,7 +477,8 @@
departmentQueryController({queryAllLevel: true}).then(res => {
const data = res.data.treeData;
this.departData = this.departDtaFormAtter(data);
- this.departVisible = true;
+ this.option.column[7].dicData=[{oid:'ALLDept',name:'鎵�鏈夐儴闂�',expand:true,disabled:true,children:this.departData}]
+ this.option.column[7].defaultExpandedKeys=['ALLDept'];
}).catch(err => {
this.$message.error(err);
})
@@ -562,6 +515,7 @@
return;
}
+ //鍒嗛厤閮ㄩ棬
if (this.departStatus == 'default') {
let params = {
userOIds: this.selectList.map(item => item.oid).join(','),
@@ -573,37 +527,9 @@
this.getTableList();
this.$message.success('鍒嗛厤鎴愬姛锛�')
}
- }).catch(err => {
- console.log(err);
})
return;
}
-
- if (this.departStatus == 'handle') {
- this.departObj = this.departCurrenRow;
- this.departValue = this.departCurrenRow.oid;
- this.departVisible = false;
- return;;
- }
-
- if(this.departStatus == 'search'){
- this.departSearchObj = this.departCurrenRow;
- this.departSearchValue = this.departCurrenRow.oid;
- this.departVisible = false;
- return;
- }
- },
-
- // 瀵硅瘽妗嗗垎閰嶉儴闂ㄦ寜閽�
- dialogDepartHandler() {
- this.departmentQueryOnLoad();
- this.departStatus = 'handle'; // 鍖哄垎涓嶅悓鏂瑰紡鎵撳紑閮ㄩ棬瀵硅瘽妗�
- },
-
- // 鎼滅储瀵硅瘽妗嗗垎閰嶉儴闂ㄦ寜閽�
- dialogDepartSearchHandler(){
- this.departmentQueryOnLoad();
- this.departStatus = 'search'; // 鍖哄垎涓嶅悓鏂瑰紡鎵撳紑閮ㄩ棬瀵硅瘽妗�
},
}
diff --git a/Source/plt-web/plt-web-ui/src/views/system/user/option.js b/Source/plt-web/plt-web-ui/src/views/system/user/option.js
index a4dbce6..890f98b 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/user/option.js
+++ b/Source/plt-web/plt-web-ui/src/views/system/user/option.js
@@ -4,6 +4,7 @@
prop: 'id',
search:true,
sortable:true,
+ editDisabled: true,
rules: [
{
required: true,
@@ -61,23 +62,32 @@
prop: 'status',
display:false,
sortable:true,
+ width: 80,
},
{
label: '瀵嗙爜绛栫暐',
prop: 'pkPasswordStrategyName',
sortable:true,
display:false,
+ width: 100
},
{
label: '閿佸畾鐘舵��',
prop: 'lockFlag',
sortable:true,
display:false,
+ width: 100,
},
{
label: '鎵�灞為儴闂�',
- prop: 'pkDepartmentName',
+ prop: 'pkDepartment',
align:'center',
+ type:'tree',
+ dicData: [],
+ props: {
+ label: 'name',
+ value: 'oid'
+ },
search:true,
sortable:true,
overHidden: true,
@@ -107,7 +117,8 @@
prop: 'email',
sortable:true,
overHidden: true,
- row:true
+ row:true,
+ span:24
},
{
label: '鎻忚堪',
@@ -115,6 +126,7 @@
prop: 'description',
sortable:true,
overHidden: true,
+ span:24
},
{
label: '閮ㄩ棬棰嗗',
@@ -125,7 +137,7 @@
{
label: '鎵�灞炲瘑绾�',
prop: 'secretGradeText',
- sortable:true,
display:false,
+ width: 80
},
];
--
Gitblit v1.9.3