From 963a2313f4f8959715293d38f69894078150d508 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 14 六月 2024 11:29:47 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/master/person/main/personDepartment.vue | 204 ++++++++++++++++++++++++++++++++------------------
1 files changed, 131 insertions(+), 73 deletions(-)
diff --git a/src/views/master/person/main/personDepartment.vue b/src/views/master/person/main/personDepartment.vue
index ed3ea84..9f3708a 100644
--- a/src/views/master/person/main/personDepartment.vue
+++ b/src/views/master/person/main/personDepartment.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-09 21:00:31
+ * @LastEditTime: 2024-04-10 17:05:04
* @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
-->
@@ -12,48 +12,36 @@
<div class="right-top">
<div class="right-bottom">
<el-button type="primary" @click="addPerson">+ 娣诲姞閮ㄩ棬</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>
<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"/>
+ <el-option key="1" label="鍚敤" value="1" size="small"/>
+ <el-option key="0" label="鍋滅敤" value="0" size="small"/>
</el-select>
- <el-input v-model="searchData.name" style="width: 200px" size="small" placeholder="璇疯緭鍏ュ叧閿瓧杩涜杩囨护">
+ <el-input v-model="searchData.keywords" style="width: 200px" size="small" placeholder="璇疯緭鍏ュ叧閿瓧杩涜杩囨护">
<template #append>
- <el-button :icon="searchIcon" @click="getOrganizationList" />
+ <el-button @click="getOrganizationList">
+ <i class="el-icon"><svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="m795.904 750.72 124.992 124.928a32 32 0 0 1-45.248 45.248L750.656 795.904a416 416 0 1 1 45.248-45.248zM480 832a352 352 0 1 0 0-704 352 352 0 0 0 0 704z"></path></svg></i>
+ </el-button>
</template>
</el-input>
</div>
</div>
<div class="right-table">
- <el-table
- ref="multipleTableRef"
- :data="departmentList"
- border
- style="width: 100%"
- class="multipleTableRef"
- @selection-change="handleSelectionChange"
- >
+ <el-table :data="departmentList" style="width: 100%;margin-bottom: 20px;" row-key="id" border default-expand-all ref="treeRef" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
- <el-table-column
- prop="date"
- label="宀椾綅鍚嶇О">
- </el-table-column>
- <el-table-column
- prop="name"
- label="閮ㄩ棬浜烘暟">
- </el-table-column>
- <el-table-column
- prop="name"
- label="涓婄骇閮ㄩ棬">
- </el-table-column>
- <el-table-column
- fixed="right"
- label="鎿嶄綔">
- <template #default="scope">
- <el-button type="text" size="small" @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
- <el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">鏌ョ湅</el-button>
- </template>
+ <el-table-column prop="name" label="宀椾綅鍚嶇О"></el-table-column>
+ <el-table-column prop="peopleNum" label="閮ㄩ棬浜烘暟"></el-table-column>
+ <el-table-column prop="parentName" label="涓婄骇閮ㄩ棬"></el-table-column>
+ <el-table-column fixed="right" label="鎿嶄綔">
+ <template #default="scope">
+ <el-button type="text" size="small" @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
+ </template>
</el-table-column>
</el-table>
<el-pagination
@@ -68,15 +56,32 @@
</div>
</div>
</div>
-
- <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSuccess" @closed="dialog.save=false"></save-dialog>
+ <!-- 鍒犻櫎 -->
+ <el-dialog title="" v-model="delPersonModel" :width="300" destroy-on-close>
+ <div>
+ <div style="margin-bottom: 6px;"><span class="delIcon">!</span>璇蜂綘璋ㄦ厧閫夋嫨锛�</div>
+ <div style="text-indent: 24px;">鍒犻櫎鏁版嵁浼氬奖鍝嶅凡鍏宠仈鐨勪笟鍔� ,鑻ユ偍鎯冲湪宸插叧鑱旂殑涓氬姟涓緷鐒舵樉绀鸿繖浜涙暟鎹�, 鎮ㄥ彲浠ラ�夋嫨 鍋滅敤 鎿嶄綔銆傚仠鐢ㄥ悗姝ゆ暟鎹皢涓嶈兘鍐嶈鏂颁笟鍔′娇鐢ㄣ��</div>
+ </div>
+ <template #footer>
+ <div class="footerDiv">
+ <div class="delBtn" @click="delData(0)">鍒犻櫎</div>
+ <div class="delBtn" @click="delData(1)">鍋滅敤</div>
+ </div>
+ </template>
+ </el-dialog>
+ <save-dialog v-if="dialog.save" ref="saveDialog" @success="addHandleSuccess" @closed="dialog.save=false"></save-dialog>
</template>
<script>
+ import importTable from '@/layout/components/importTable.vue'
import saveDialog from './department'
export default {
name: "bakalaka",
data(){
return {
+ uploadUrl: "/api/blade-cps/group/import?groupType=group_organization&groupCategory=1",
+ exportUrl: "/api/blade-cps/organization/export-template",
+ selectId: "",
+ selection: [],
total: 0,
searchData: {
groupType: 'group_organization',
@@ -86,27 +91,11 @@
},
statusList: [],
isSaveing: false,
- groups: [],
- departmentFrom: {
- department: ""
- },
- departmentVisibleRules: {
- department:[
- {required: true, message: '璇烽�夋嫨閮ㄩ棬'}
- ]
- },
- departmentVisible: false,
dialog: {
save: false
},
- leftActive: true,
- input: '',
- options: [{
- value: '閫夐」1',
- label: '榛勯噾绯�'
- }],
- input3: '',
- departmentList: []
+ departmentList: [],
+ delPersonModel: false
}
},
created(){
@@ -114,15 +103,49 @@
},
mounted(){
this.getStatus();
+ this.getOrganizationList();
},
components: {
- saveDialog
+ saveDialog,importTable
},
methods: {
+ getExport() {
+ this.$HTTP.get(`/api/blade-cps/organization/export-organization?`+this.$TOOL.qsStringify(this.searchData)).then(res=> {
+ if(res.code == 200) {
+ window.open(res.data.link);
+ }
+ })
+ },
+ addHandleSuccess() {
+ this.getOrganizationList();
+ },
+ delData(type) {
+ this.$HTTP.delete(`/api/blade-cps/organization?ids=${this.selectId}&type=${type}`).then(res=> {
+ if(res.code == 200) {
+ this.$message.success("鎿嶄綔鎴愬姛");
+ this.delPersonModel = false;
+ this.selectId = "";
+ this.getOrganizationList();
+ }
+ })
+ },
+ removeHasChildren(arr) {
+ return arr.map(item => {
+ // 鍒涘缓涓�涓笉鍖呭惈hasChildren鐨勬柊瀵硅薄
+ const newItem = { ...item };
+ delete newItem.hasChildren; // 鍒犻櫎hasChildren瀛楁
+ // 濡傛灉children瀛楁瀛樺湪涓旀槸鏁扮粍锛屽垯閫掑綊澶勭悊children
+ if (Array.isArray(newItem.children)) {
+ newItem.children = this.removeHasChildren(newItem.children);
+ }
+
+ return newItem;
+ });
+ },
getOrganizationList() {
this.$HTTP.get(`/api/blade-cps/organization/tree?` + this.$TOOL.qsStringify(this.searchData)).then(res=> {
if(res.code == 200) {
- this.departmentList = res.data;
+ this.departmentList = this.removeHasChildren(res.data);
}
})
},
@@ -132,9 +155,6 @@
this.statusList = res.data;
}
})
- },
- departmentSubmit() {
- this.departmentVisible=false; //閮ㄩ棬璋冩暣
},
//娣诲姞
addPerson(){
@@ -149,24 +169,23 @@
this.$refs.saveDialog.open('edit').setData(row)
})
},
- //鏌ョ湅
- table_show(row){
- this.dialog.save = true
- this.$nextTick(() => {
- this.$refs.saveDialog.open('show').setData(row)
- })
+ handleSelectionChange (selection) {
+ this.selection = selection;
},
- handleSelectionChange() {},
- delPerson() {},
- changeDepartment() {
- this.departmentVisible = true;
- },
- changeTab(name) {
- if(name == 1) {
- this.leftActive = true;
- }else {
- this.leftActive = false;
+ 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;
},
handleSizeChange(val) {
console.log(`姣忛〉 ${val} 鏉);
@@ -229,7 +248,7 @@
border-left: 0px;
}
.person-left-active {
- background-color: #3b8e8e;
+ background-color: #409eff;
color: #fff;
}
.person-left-search {
@@ -274,4 +293,43 @@
.multipleTableRef {
margin-bottom: 8px;
}
+ .footerDiv {
+ text-align: center;
+ }
+ .delBtn {
+ color: #fff;
+ width: 112px;
+ height: 32px;
+ display: inline-block;
+ color: #fa554c;
+ background-color: #fff;
+ border: 1px solid #fdbbb7;
+ text-align: center;
+ line-height: 32px;
+ cursor: pointer;
+ }
+ .delBtn:nth-child(1) {
+ margin-right:4px;
+ }
+ .delBtn:hover {
+ background-color: #f34d5b;
+ border-color: #f34d5b;
+ color: #fff;
+ }
+ .delIcon {
+ color: #fff;
+ background: red;
+ border-radius: 50%;
+ display: inline-block;
+ width: 20px;
+ height: 20px;
+ font-size: 14px;
+ text-align: center;
+ line-height: 20px;
+ margin-right: 6px;
+ }
+ .exportBtn {
+ margin-left:8px;
+ margin-right:8px;
+ }
</style>
--
Gitblit v1.9.3