From dc2d2f1e26a84d5600051c0ed086027a28b71162 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 26 十月 2023 11:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/system/dept.vue | 96 +++++++++++++++++++++++++++++-------------------
1 files changed, 58 insertions(+), 38 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/dept.vue b/Source/UBCS-WEB/src/views/system/dept.vue
index c62272e..ce22ee0 100644
--- a/Source/UBCS-WEB/src/views/system/dept.vue
+++ b/Source/UBCS-WEB/src/views/system/dept.vue
@@ -1,41 +1,43 @@
<template>
<basic-container>
<avue-crud :option="option"
- :table-loading="loading"
- :data="data"
- ref="crud"
- v-model="form"
- :permission="permissionList"
- :before-open="beforeOpen"
- :before-close="beforeClose"
- @row-del="rowDel"
- @row-update="rowUpdate"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- @tree-load="treeLoad">
+ :page.sync="page"
+ :table-loading="loading"
+ :data="data"
+ ref="crud"
+ v-model="form"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ :before-close="beforeClose"
+ @row-del="rowDel"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @row-click="clickRowChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ @tree-load="treeLoad">
<template slot="menuLeft">
- <el-button type="danger"
- size="small"
- icon="el-icon-delete"
- v-if="permission.dept_delete"
- plain
- @click="handleDelete">鍒� 闄�
+ <el-button v-if="permissionList.delBtn"
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ plain
+ @click="handleDelete">
+ 鍒� 闄�
</el-button>
</template>
<template slot-scope="scope" slot="menu">
- <el-button
+ <el-button v-if="permissionList.addChildBtn"
type="text"
icon="el-icon-circle-plus-outline"
size="small"
- @click.stop="handleAdd(scope.row,scope.index)"
- v-if="userInfo.role_name.includes('admin')"
- >鏂板瀛愰」
+ @click.stop="handleAdd(scope.row,scope.index)">
+ 鏂板瀛愰」
</el-button>
</template>
<template slot-scope="{row}"
@@ -74,7 +76,10 @@
option: {
lazy: true,
tip: false,
- simplePage: true,
+ height:'auto',
+ maxHeight:600,
+ columnBtn:false,
+ //simplePage: true,
searchShow: true,
searchMenuSpan: 6,
tree: true,
@@ -82,8 +87,11 @@
index: true,
selection: true,
viewBtn: true,
+ editBtn: true,
+ delBtn: true,
menuWidth: 300,
dialogClickModal: false,
+ highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
column: [
{
label: "鏈烘瀯鍚嶇О",
@@ -99,7 +107,7 @@
label: "鎵�灞炵鎴�",
prop: "tenantId",
type: "tree",
- dicUrl: "/api/blade-system/tenant/select",
+ dicUrl: "/api/ubcs-system/tenant/select",
addDisplay: false,
editDisplay: false,
viewDisplay: website.tenantMode,
@@ -145,7 +153,7 @@
{
label: "鏈烘瀯绫诲瀷",
type: "select",
- dicUrl: "/api/blade-system/dict/dictionary?code=org_category",
+ dicUrl: "/api/ubcs-system/dict/dictionary?code=org_category",
props: {
label: "dictValue",
value: "dictKey"
@@ -187,14 +195,18 @@
data: []
};
},
+ created() {
+
+ },
computed: {
...mapGetters(["userInfo", "permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.dept_add, false),
- viewBtn: this.vaildData(this.permission.dept_view, false),
- delBtn: this.vaildData(this.permission.dept_delete, false),
- editBtn: this.vaildData(this.permission.dept_edit, false)
+ addBtn: this.vaildData(this.permission.dept.dept_add, false),
+ viewBtn: this.vaildData(this.permission.dept.dept_view, false),
+ delBtn: this.vaildData(this.permission.dept.dept_delete, false),
+ editBtn: this.vaildData(this.permission.dept.dept_edit, false),
+ addChildBtn: this.vaildData(this.permission.dept.dept_add_child,false),
};
},
ids() {
@@ -307,8 +319,15 @@
this.onLoad(this.page, params);
done();
},
+ clickRowChange(row){
+ this.$refs.crud.toggleSelection();
+ this.selectionList = row;
+ this.$refs.crud.setCurrentRow(row);
+ this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+ },
selectionChange(list) {
this.selectionList = list;
+ this.$refs.crud.setCurrentRow(this.selectionList[list.length-1]);
},
selectionClear() {
this.selectionList = [];
@@ -343,8 +362,9 @@
},
onLoad(page, params = {}) {
this.loading = true;
- getLazyList(this.parentId, Object.assign(params, this.query)).then(res => {
- this.data = res.data.data;
+ getLazyList(this.parentId,Object.assign(params, this.query),this.page.currentPage, this.page.pageSize).then(res => {
+ this.data = res.data.data.records;
+ this.page.total=res.data.data.total
this.loading = false;
this.selectionClear();
});
@@ -352,7 +372,7 @@
treeLoad(tree, treeNode, resolve) {
const parentId = tree.id;
getLazyList(parentId).then(res => {
- resolve(res.data.data);
+ resolve(res.data.data.records);
});
}
}
--
Gitblit v1.9.3