From b03d80f7743535f6a2fa830c7ab79f8fa3c3eeed Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期三, 08 五月 2024 23:53:59 +0800
Subject: [PATCH] 1
---
src/views/master/person/main/personPerson.vue | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 152 insertions(+), 26 deletions(-)
diff --git a/src/views/master/person/main/personPerson.vue b/src/views/master/person/main/personPerson.vue
index 8b7446a..981cc55 100644
--- a/src/views/master/person/main/personPerson.vue
+++ b/src/views/master/person/main/personPerson.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-04-08 11:03:11
+ * @LastEditTime: 2024-04-10 15:37:41
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -17,12 +17,15 @@
<el-input v-model="input" placeholder="璇疯緭鍏ュ唴瀹�" size="small"></el-input>
</div>
<div class="person-tree">
- <div v-for="item in organizationList" :data-id="item.id">{{item.name}}</div>
+ <!-- 閮ㄩ棬 -->
+ <el-tree style="max-width: 600px" :data="titleList" :expand-on-click-node="false" default-expand-all :props="{label: 'name', children: 'children'}" class="treeActive" @node-click="titleListNode" />
+ <!-- 宀椾綅 -->
+ <div v-for="(item,index) in titleList" :data-id="item.id" v-if="!leftActive" :class="{treeActive: item.active}" @click="selectbtn(index)">{{item.postName}}</div>
</div>
</div>
<div class="person-person-right">
<div class="right-top">
- <div class="right-title">閮ㄩ棬锛氬崈鏂囩鎶�</div>
+ <div class="right-title"><span v-if="leftActive">閮ㄩ棬锛氬崈鏂囩鎶�</span></div>
<div>
<el-select v-model="searchData.status" placeholder="鐘舵��" class="searchStatus">
<el-option v-for="item in statusList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" size="small"/>
@@ -37,6 +40,10 @@
<div class="right-bottom">
<el-button type="primary" @click="addPerson">+ 娣诲姞鍛樺伐</el-button>
<el-button type="primary" @click="changeDepartment">閮ㄩ棬璋冩暣</el-button>
+ <!-- 瀵煎叆 -->
+ <import-table class="exportBtn" :exportUrl="exportUrl" :uploadUrl="uploadUrl"></import-table>
+ <!-- 瀵煎嚭 -->
+ <el-button type="primary" @click="getExport">瀵煎嚭</el-button>
<el-button type="danger" plain @click="delPerson">鍒犻櫎</el-button>
</div>
<div class="right-table">
@@ -81,8 +88,8 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage4"
- :page-sizes="[100, 200, 300, 400]"
- :page-size="100"
+ :page-sizes="[15, 50, 100]"
+ :page-size="15"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
@@ -94,10 +101,8 @@
<el-form :model="departmentFrom" :rules="departmentVisibleRules" :disabled="mode=='show'" ref="dialogForm" label-width="80px" label-position="center">
<el-row>
<el-col :span="24">
- <el-form-item label="閮ㄩ棬" prop="department">
- <el-select v-model="departmentFrom.department" style="width: 100%">
- <el-option v-for="item in groups" :key="item.id" :label="item.label" :value="item.id"/>
- </el-select>
+ <el-form-item label="閮ㄩ棬" prop="parentId">
+ <el-tree-select @change= "parentIdChange" v-model="departmentFrom.parentId" clearable placeholder="閮ㄩ棬" default-expand-all check-on-click-nod :data="titleList" check-strictly :props="{ label: 'name' }" node-key="id" ref="parentTree" />
</el-form-item>
</el-col>
</el-row>
@@ -124,21 +129,25 @@
<save-dialog v-if="dialog.save" ref="saveDialog" @success="personHandleSuccess" @closed="dialog.save=false"></save-dialog>
</template>
<script>
+ import importTable from '@/layout/components/importTable.vue'
import saveDialog from './save'
export default {
name: "personPerson",
data(){
return {
- organizationList: [],
+ uploadUrl: "/api/blade-cps/employee/import-employee",
+ exportUrl: "/api/blade-cps/employee/export-template",
+ titleList: [],
delPersonModel: false,
searchIcon: "el-icon-search",
searchData: {
current: 1,
size: 15,
status: "1",
+ total: "1",
keywords: "",
postId: "", //postId
- organizationCode: "00001" //缁勭粐code
+ organizationCode: "" //缁勭粐code
},
total: 0,
isSaveing: false,
@@ -147,9 +156,7 @@
department: ""
},
departmentVisibleRules: {
- department:[
- {required: true, message: '璇烽�夋嫨閮ㄩ棬'}
- ]
+ parentId:[{required: true, message: '璇烽�夋嫨閮ㄩ棬'}]
},
departmentVisible: false,
dialog: {
@@ -159,7 +166,11 @@
input: '',
statusList: [],
input3: '',
- tableData: []
+ tableData: [],
+ selection: [],
+ departmentFrom: {
+ parentId: ""
+ }
}
},
created(){
@@ -167,30 +178,81 @@
},
mounted(){
this.getStatus();
- this.searchPerson();
this.getOrganizationList(); //閮ㄩ棬
},
components: {
- saveDialog
+ saveDialog,importTable
},
methods: {
+ getExport() {
+ this.$HTTP.get(`/api/blade-cps/employee/export-employee?`+this.$TOOL.qsStringify(this.searchData)).then(res=> {
+ if(res.code == 200) {
+ window.open(res.data.link);
+ }
+ })
+ },
+ parentIdChange(val) {
+ // var $parentId = this.$refs.parentTree.getCurrentNode().title;
+ // this.depatmentForm.$parentId = $parentId;
+ },
+ titleListNode(data) {
+ this.searchData.organizationCode = data.code;
+ this.searchPerson();
+ },
+ selectbtn(index) {
+ this.titleList.forEach(item=> {
+ item.active = false;
+ })
+ this.titleList[index].active = true;
+ if(this.leftActive) { //閮ㄩ棬
+ this.searchData.organizationCode = this.titleList[index].code;
+ this.searchData.postId= "";
+ }else { //宀椾綅
+ this.searchData.organizationCode = "";
+ this.searchData.postId= this.titleList[index].id;
+ }
+ this.searchPerson();
+ },
getOrganizationList() { //閮ㄩ棬
this.$HTTP.get(`/api/blade-cps/organization/tree?groupType=group_organization&groupCategory=1`).then(res=> {
if(res.code == 200) {
- this.organizationList = res.data;
+ this.titleList = res.data;
+ this.titleList[0].active = true;
+ this.searchData.organizationCode = res.data[0].code;
+ this.searchPerson();
+ }
+ })
+ },
+ getPost() { //宀椾綅
+ var obj = {
+ current: 1,
+ size: -1,
+ }
+ this.$HTTP.get(`/api/blade-system/post/page?`+this.$TOOL.qsStringify(obj)).then(res=> {
+ if(res.code == 200) {
+ this.titleList = res.data.records;
+ this.titleList[0].active = true;
+ this.searchData.postId = res.data.records[0].id;
+ this.searchPerson();
}
})
},
delData(type) {
- this.$HTTP.get(`/api/blade-cps/employee/remove?ids=${this.selectId}&type=${type}`).then(res=> {
+ this.$HTTP.post(`/api/blade-cps/employee/remove?ids=${this.selectId}&type=${type}`).then(res=> {
if(res.code == 200) {
+ this.$message.success("鎿嶄綔鎴愬姛");
this.delPersonModel = false;
- this.searchPerson();
+ this.selectId = "";
this.getOrganizationList();
}
})
},
personHandleSuccess() {
+ if(this.leftActive) {
+ this.changeTab(1);
+ }else {
+ this.changeTab(2);
+ }
this.searchPerson();
},
searchPerson() {
@@ -202,6 +264,7 @@
}
})
this.tableData = res.data.records;
+ this.total = res.data.total;
}
})
},
@@ -213,7 +276,26 @@
})
},
departmentSubmit() {
- this.departmentVisible=false; //閮ㄩ棬璋冩暣
+ var employeeIds = [];
+ this.selection.forEach(item=> {
+ employeeIds.push(item.id);
+ })
+ this.$refs.dialogForm.validate(async (valid) => {
+ if (valid) {
+ this.$HTTP.put(`/api/blade-cps/employee/change-organization?organizationId=${this.departmentFrom.parentId}&employeeIds=${employeeIds.join(",")}`).then(res=> {
+ if(res.code == 200) {
+ this.searchPerson();
+ this.departmentVisible=false; //閮ㄩ棬璋冩暣
+ this.departmentFrom.parentId = "";
+ this.$message.success("鎿嶄綔鎴愬姛");
+ }else {
+ this.$alert(res.message, "鎻愮ず", {type: 'error'});
+ }
+ })
+ }else{
+ return false;
+ }
+ })
},
//娣诲姞
addPerson(){
@@ -233,16 +315,52 @@
this.selectId = row.id;
this.delPersonModel = true;
},
- handleSelectionChange() {},
- delPerson() {},
+ handleSelectionChange(selection) {
+ this.selection = selection;
+ },
+ delPerson() {
+ if(this.selection.length == 0) {
+ this.$message({
+ message: '璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�',
+ type: 'warning'
+ });
+ return;
+ }
+ var selStr = "";
+ this.selection.map(item=> {
+ selStr += item.id + ","
+ })
+ this.selectId = selStr.replace(/,$/, '');
+ this.delPersonModel = true;
+ },
changeDepartment() {
+ if(this.selection.length == 0) {
+ this.$message({
+ message: '璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�',
+ type: 'warning'
+ });
+ return;
+ }
+ var selStr = "";
+ this.selection.map(item=> {
+ selStr += item.id + ","
+ })
+ this.selectId = selStr.replace(/,$/, '');
this.departmentVisible = true;
},
changeTab(name) {
+ this.searchData.current = 1;
+ this.searchData.size = 15;
+ this.searchData.organizationCode = "";
+ this.searchData.postId= "";
if(name == 1) {
+ this.searchData.total = '0';
this.leftActive = true;
- }else {
+ this.getOrganizationList();
+ }else { //宀椾綅
+ this.searchData.total = '1';
this.leftActive = false;
+ this.getPost();
}
},
handleSizeChange(val) {
@@ -314,10 +432,13 @@
padding-bottom: 8px;
}
.person-tree {
- background-color: #d8e8e8;
- padding: 4px 18px;
font-size: 14px;
font-weight: 400;
+ }
+ .person-tree div {
+ margin-bottom: 8px;
+ padding: 4px 18px;
+ cursor: pointer;
}
.right-top {
display: flex;
@@ -332,6 +453,7 @@
font-weight: bold;
padding-bottom: 12px;
margin-bottom: 8px;
+ height: 37px;
}
.searchStatus {
margin-right: 6px;
@@ -386,4 +508,8 @@
line-height: 20px;
margin-right: 6px;
}
+ .exportBtn {
+ margin-left:8px;
+ margin-right:8px;
+ }
</style>
--
Gitblit v1.9.3