From 0633a5c0cb8bb8dce0cc039814f7f71b053dbc90 Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期一, 08 四月 2024 23:50:06 +0800
Subject: [PATCH] 1
---
src/views/master/person/main/personPerson.vue | 96 ++++++++++++++++++++---
src/views/master/person/main/save.vue | 108 ++++++++++++++++++--------
2 files changed, 157 insertions(+), 47 deletions(-)
diff --git a/src/views/master/person/main/personPerson.vue b/src/views/master/person/main/personPerson.vue
index d2e115e..8b7446a 100644
--- a/src/views/master/person/main/personPerson.vue
+++ b/src/views/master/person/main/personPerson.vue
@@ -17,7 +17,7 @@
<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>
</div>
</div>
<div class="person-person-right">
@@ -73,7 +73,7 @@
<el-table-column fixed="right" label="鎿嶄綔" width="140">
<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>
+ <el-button text type="primary" size="small" @click="table_del(scope.row, scope.$index)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -84,7 +84,7 @@
:page-sizes="[100, 200, 300, 400]"
:page-size="100"
layout="total, sizes, prev, pager, next, jumper"
- :total="400">
+ :total="total">
</el-pagination>
</div>
</div>
@@ -107,8 +107,21 @@
<el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="departmentSubmit()">淇� 瀛�</el-button>
</template>
</el-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="handleSuccess" @closed="dialog.save=false"></save-dialog>
+ <save-dialog v-if="dialog.save" ref="saveDialog" @success="personHandleSuccess" @closed="dialog.save=false"></save-dialog>
</template>
<script>
import saveDialog from './save'
@@ -116,16 +129,18 @@
name: "personPerson",
data(){
return {
+ organizationList: [],
+ delPersonModel: false,
searchIcon: "el-icon-search",
searchData: {
current: 1,
size: 15,
- total: 0,
status: "1",
keywords: "",
- postId: "",
- organizationCode: "00001"
+ postId: "", //postId
+ organizationCode: "00001" //缁勭粐code
},
+ total: 0,
isSaveing: false,
groups: [],
departmentFrom: {
@@ -152,12 +167,32 @@
},
mounted(){
this.getStatus();
- this.searchPerson(); //鍛樺伐鍒楄〃
+ this.searchPerson();
+ this.getOrganizationList(); //閮ㄩ棬
},
components: {
saveDialog
},
methods: {
+ getOrganizationList() { //閮ㄩ棬
+ this.$HTTP.get(`/api/blade-cps/organization/tree?groupType=group_organization&groupCategory=1`).then(res=> {
+ if(res.code == 200) {
+ this.organizationList = res.data;
+ }
+ })
+ },
+ delData(type) {
+ this.$HTTP.get(`/api/blade-cps/employee/remove?ids=${this.selectId}&type=${type}`).then(res=> {
+ if(res.code == 200) {
+ this.delPersonModel = false;
+ this.searchPerson();
+ this.getOrganizationList();
+ }
+ })
+ },
+ personHandleSuccess() {
+ this.searchPerson();
+ },
searchPerson() {
this.$HTTP.get(`/api/blade-cps/employee/list?`+this.$TOOL.qsStringify(this.searchData)).then(res=> {
if(res.code == 200) {
@@ -193,12 +228,10 @@
this.$refs.saveDialog.open('edit').setData(row)
})
},
- //鏌ョ湅
- table_show(row){
- this.dialog.save = true
- this.$nextTick(() => {
- this.$refs.saveDialog.open('show').setData(row)
- })
+ //鍒犻櫎
+ table_del(row) {
+ this.selectId = row.id;
+ this.delPersonModel = true;
},
handleSelectionChange() {},
delPerson() {},
@@ -318,4 +351,39 @@
.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;
+ }
</style>
diff --git a/src/views/master/person/main/save.vue b/src/views/master/person/main/save.vue
index 3870d6a..c8f3180 100644
--- a/src/views/master/person/main/save.vue
+++ b/src/views/master/person/main/save.vue
@@ -1,6 +1,6 @@
<template>
<el-dialog :title="titleMap[mode]" v-model="visible" :width="800" destroy-on-close @closed="$emit('closed')">
- <el-form :model="addPersonForm" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="120px" label-position="center">
+ <el-form :model="addPersonForm" :rules="addPersonRules" :disabled="mode=='show'" ref="dialogForm" label-width="120px" label-position="center">
<el-row>
<el-col :span="12">
<el-form-item label="宸ュ彿" prop="jobNumber">
@@ -19,15 +19,15 @@
</el-col>
<el-col :span="12">
<el-form-item label="鐘舵��" prop="status">
- <el-select v-model="addPersonForm.status" placeholder="鐘舵��" class="searchStatus">
+ <el-select v-model="addPersonForm.status" placeholder="鐘舵��" style="width:100%;">
<el-option v-for="item in statusList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" size="small"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="宀椾綅">
- <el-select v-model="addPersonForm.postId" style="width: 100%">
- <el-option v-for="item in groups" :key="item.id" :label="item.label" :value="item.id"/>
+ <el-select v-model="addPersonForm.postId" multiple style="width: 100%">
+ <el-option v-for="item in postList" :key="item.id" :label="item.postName" :value="item.id"/>
</el-select>
</el-form-item>
</el-col>
@@ -38,35 +38,33 @@
</el-col>
<el-col :span="12">
<el-form-item label="閮ㄩ棬">
- <el-select v-model="addPersonForm.organizationId" multiple filterable style="width: 100%" placeholder="閮ㄩ棬">
- <el-option v-for="item in groups" :key="item.id" :label="item.label" :value="item.id"/>
+ <el-select v-model="addPersonForm.organizationId" filterable style="width: 100%" placeholder="閮ㄩ棬">
+ <el-option v-for="item in organizationList" :key="item.id" :label="item.name" :value="item.id"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="PIN鐮�">
+ <el-form-item label="PIN鐮�" prop="pinCode">
<el-input v-model="addPersonForm.pinCode" placeholder="PIN鐮�" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鍏ヨ亴鏃堕棿">
- <el-date-picker
- style="width: 100%;"
- v-model="addPersonForm.hireDate"
- type="date"
- placeholder="鍏ヨ亴鏃堕棿"
- :size="size"
- />
+ <el-date-picker style="width: 100%;" v-model="addPersonForm.hireDate" type="date" placeholder="鍏ヨ亴鏃堕棿" value-format="YYYY-MM-DD" :size="size"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鍏宠仈璐﹀彿">
- <el-input v-model="form.jobNumber" placeholder="璇疯緭鍏ュ叧鑱旇处鍙�" clearable></el-input>
+ <el-select v-model="addPersonForm.userId" filterable style="width: 100%" placeholder="鍏宠仈璐﹀彿">
+ <el-option v-for="item in userIdList" :key="item.id" :label="item.account" :value="item.id"/>
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鏁版嵁鏉冮檺閰嶇疆">
- <el-input v-model="form.deptId" placeholder="璇疯緭鍏ユ暟鎹潈闄愰厤缃�" clearable></el-input>
+ <el-select v-model="addPersonForm.deptId" multiple filterable style="width: 100%" placeholder="鏁版嵁鏉冮檺閰嶇疆" @change="deptIdChange">
+ <el-option v-for="item in deptIdList" :key="item.id" :label="item.title" :value="item.id"/>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -83,6 +81,10 @@
emits: ['success', 'closed'],
data() {
return {
+ deptIdList: [],
+ userIdList: [],
+ organizationList: [],
+ postList: [],
statusList: [],
mode: "add",
titleMap: {
@@ -104,16 +106,16 @@
pinCode: "",
hireDate: "",
jobNumber: "",
- deptId: ""
+ deptId: "",
+ userId: ""
},
//楠岃瘉瑙勫垯
- rules: {
- avatar:[
- {required: true, message: '璇蜂笂浼犲ご鍍�'}
- ],
- group: [
- {required: true, message: '璇烽�夋嫨鎵�灞炶鑹�', trigger: 'change'}
- ]
+ addPersonRules: {
+ jobNumber:[{required: true, message: '璇疯緭鍏ュ伐鍙�'}],
+ name:[{required: true, message: '璇疯緭鍏ュ鍚�'}],
+ tel:[{required: true, message: '璇疯緭鍏ユ墜鏈哄彿'}],
+ status:[{required: true, message: '璇烽�夋嫨鐘舵��', trigger: 'change'}],
+ pinCode:[{required: true, message: '璇疯緭鍏IN鐮�'}],
},
//鎵�闇�鏁版嵁閫夐」
groups: [],
@@ -131,13 +133,49 @@
},
mounted() {
this.getStatus();
- // this.getDept()
+ this.getpost(); //宀椾綅
+ this.getOrganizationList(); //閮ㄩ棬
+ this.getUserId(); //鍏宠仈璐﹀彿
+ this.getdeptId(); //鏁版嵁鏉冮檺璋冩暣
},
methods: {
+ getdeptId() { //鏁版嵁鏉冮檺璋冩暣
+ this.$HTTP.get(`/api/blade-system/data-scope-manager/tree`).then(res=> {
+ if(res.code == 200) {
+ this.deptIdList = res.data;
+ }
+ })
+ },
+ getUserId() { //鍏宠仈璐﹀彿
+ this.$HTTP.get(`/api/blade-user/unbind-account?tel=`).then(res=> {
+ if(res.code == 200) {
+ this.userIdList = res.data;
+ }
+ })
+ },
+ getOrganizationList() { //閮ㄩ棬
+ this.$HTTP.get(`/api/blade-cps/organization/tree?groupType=group_organization&groupCategory=1`).then(res=> {
+ if(res.code == 200) {
+ this.organizationList = res.data;
+ }
+ })
+ },
+ getpost() { //宀椾綅
+ this.$HTTP.get(`/api/blade-system/post/page?current=1&size=-1`).then(res=> {
+ if(res.code == 200) {
+ this.postList = res.data.records;
+ }
+ })
+ },
getStatus() { //鑾峰彇鍏ㄩ儴璐﹀彿
this.$HTTP.get(`/api/blade-system/dict/dictionary?code=employee_status`).then(res=> {
if(res.code == 200) {
this.statusList = res.data;
+ res.data.forEach(item=> {
+ if(item.dictValue == "鍦ㄨ亴") {
+ this.addPersonForm.status = item.dictKey;
+ }
+ })
}
})
},
@@ -158,14 +196,14 @@
},
//琛ㄥ崟鎻愪氦鏂规硶
saveSubmit(){
- var obj = Object.assign({},this.addDictForm);
+ var obj = Object.assign({},this.addPersonForm);
+ obj.deptId = obj.deptId.join(",");
+ obj.postId = obj.postId.join(",");
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
- this.isSaveing = true;
this.$HTTP.post("/api/blade-cps/employee/submit",obj).then(res=> {
- this.isSaveing = false;
if(res.code == 200) {
- this.$emit('success', this.addDictForm, this.mode);
+ this.$emit('success', this.addPersonForm, this.mode);
this.visible = false;
this.$message.success("鎿嶄綔鎴愬姛");
}else {
@@ -179,10 +217,14 @@
},
//琛ㄥ崟娉ㄥ叆鏁版嵁
setData(data){
- this.addPersonForm.id = data.id
-
- //鍙互鍜屼笂闈竴鏍峰崟涓敞鍏ワ紝涔熷彲浠ュ儚涓嬮潰涓�鏍风洿鎺ュ悎骞惰繘鍘�
- //Object.assign(this.form, data)
+ this.$HTTP.get(`/api/blade-cps/employee/detail/${data.id}`).then(res=> {
+ if(res.code == 200) {
+ res.data.postId = res.data.postId.split(",");
+ res.data.deptId = res.data.deptId.split(",");
+ //鍙互鍜屼笂闈竴鏍峰崟涓敞鍏ワ紝涔熷彲浠ュ儚涓嬮潰涓�鏍风洿鎺ュ悎骞惰繘鍘�
+ Object.assign(this.addPersonForm, res.data)
+ }
+ })
}
}
}
--
Gitblit v1.9.3