From a13255b4129ee8a7a7b7e1ecd8e02dd2c78f7c17 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 16 一月 2025 16:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/system/department/index.vue | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
index f87b389..e665d5b 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
@@ -15,31 +15,45 @@
@current-row-change="handleCurrentRowChange"
>
<template slot="menu" slot-scope="{row,size,type}">
- <el-button v-if="permissionList.departmentAddChildrenBtn" icon="el-icon-circle-plus-outline" size="small"
- type="text" @click="handleAdd()">鏂板瀛愮骇
+ <el-button v-if="permissionList.departmentAddChildrenBtn" size="small"
+ type="text" @click="handleAdd()">
+ <icon-show :name="permissionList.departmentAddChildrenBtn.source"></icon-show>
+ 鏂板瀛愮骇
</el-button>
- <el-button v-if="row.ALLDept !== 'ALLDept' && permissionList.editBtn" icon="el-icon-edit" size="small"
+ <el-button v-if="row.ALLDept !== 'ALLDept' && permissionList.editBtn" size="small"
type="text"
- @click="editBtnClick(row)">缂栬緫
+ @click="editBtnClick(row)">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 缂栬緫
</el-button>
- <el-button v-if="row.ALLDept !== 'ALLDept' && permissionList.delBtn" icon="el-icon-delete" size="small"
+ <el-button v-if="row.ALLDept !== 'ALLDept' && permissionList.delBtn" size="small"
type="text"
- @click="rowDeleteHandler(row)">鍒犻櫎
+ @click="rowDeleteHandler(row)">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
</template>
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionList.assignMembersBtn" icon="el-icon-school" plain size="small" type="primary"
- @click="assignMembersHandler">鍒嗛厤鎴愬憳
+ <el-button v-if="permissionList.assignMembersBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="assignMembersHandler">
+ <icon-show :name="permissionList.assignMembersBtn.source"></icon-show>
+ 鍒嗛厤鎴愬憳
</el-button>
- <el-button v-if="permissionList.statisticsBtn" icon="el-icon-user" plain size="small" type="primary"
- @click="statisticsHandler">缁熻
+ <el-button v-if="permissionList.statisticsBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="statisticsHandler">
+ <icon-show :name="permissionList.statisticsBtn.source"></icon-show>
+ 缁熻
</el-button>
- <el-button v-if="permissionList.importDepartmentBtn" icon="el-icon-upload2" plain size="small" type="primary"
- @click="upLoadHandler">瀵煎叆閮ㄩ棬
+ <el-button v-if="permissionList.importDepartmentBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="upLoadHandler">
+ <icon-show :name="permissionList.importDepartmentBtn.source"></icon-show>
+ 瀵煎叆閮ㄩ棬
</el-button>
- <el-button v-if="permissionList.downloadImportTemplateBtn" icon="el-icon-download" plain size="small"
- type="primary" @click="downLoadHandler">涓嬭浇瀵煎叆妯℃澘
+ <el-button v-if="permissionList.downloadImportTemplateBtn" class="button-custom-icon" plain size="small"
+ type="primary" @click="downLoadHandler">
+ <icon-show :name="permissionList.downloadImportTemplateBtn.source"></icon-show>
+ 涓嬭浇瀵煎叆妯℃澘
</el-button>
</template>
</avue-crud>
@@ -170,11 +184,11 @@
return {
delBtn: this.vaildData(this.permission[this.$route.query.id].DELETE, false),
editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
- assignMembersBtn: this.vaildData(this.permission[this.$route.query.id].assignMembers, false),
- departmentAddChildrenBtn: this.vaildData(this.permission[this.$route.query.id].departmentAddChildren, false),
- downloadImportTemplateBtn: this.vaildData(this.permission[this.$route.query.id].downloadImportTemplate, false),
- importDepartmentBtn: this.vaildData(this.permission[this.$route.query.id].importDepartment, false),
- statisticsBtn: this.vaildData(this.permission[this.$route.query.id].statistics, false),
+ assignMembersBtn: this.vaildData(this.permission[this.$route.query.id].ASSIGN, false),
+ departmentAddChildrenBtn: this.vaildData(this.permission[this.$route.query.id].ADD, false),
+ downloadImportTemplateBtn: this.vaildData(this.permission[this.$route.query.id].DOWNLOAD, false),
+ importDepartmentBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
+ statisticsBtn: this.vaildData(this.permission[this.$route.query.id].STATISTICS, false),
};
},
},
@@ -356,8 +370,6 @@
this.rightTransferData = byRoleRes.data.data.map(item => item.oid);
this.$refs.transfer.visible = true;
}
- }).catch(err => {
- console.error(err);
});
},
--
Gitblit v1.9.3