From 5b2095a1366ebb1c33095894ccfe15a74fa5195c Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 09 四月 2024 22:00:46 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/master/person/main/personDepartment.vue | 102 ++++++++++++++++----------------------------------
1 files changed, 33 insertions(+), 69 deletions(-)
diff --git a/src/views/master/person/main/personDepartment.vue b/src/views/master/person/main/personDepartment.vue
index c9d14e0..ed3ea84 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-03-28 18:25:55
+ * @LastEditTime: 2024-04-09 21:00:31
* @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
-->
@@ -15,24 +15,12 @@
<el-button type="danger" plain @click="delPerson">鍒犻櫎</el-button>
</div>
<div>
- <el-select v-model="input3" placeholder="鐘舵��" class="searchStatus">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- size="small"
- />
+ <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-select>
- <el-input
- v-model="input3"
- style="width: 200px"
- size="small"
- placeholder="璇疯緭鍏ュ叧閿瓧杩涜杩囨护"
- class="input-with-select"
- >
+ <el-input v-model="searchData.name" style="width: 200px" size="small" placeholder="璇疯緭鍏ュ叧閿瓧杩涜杩囨护">
<template #append>
- <el-button :icon="Search" />
+ <el-button :icon="searchIcon" @click="getOrganizationList" />
</template>
</el-input>
</div>
@@ -40,7 +28,7 @@
<div class="right-table">
<el-table
ref="multipleTableRef"
- :data="tableData"
+ :data="departmentList"
border
style="width: 100%"
class="multipleTableRef"
@@ -72,32 +60,14 @@
@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="400">
+ :total="total">
</el-pagination>
</div>
</div>
</div>
-
- <el-dialog title="閮ㄩ棬璋冩暣" v-model="departmentVisible" :width="400" destroy-on-close>
- <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>
- </el-col>
- </el-row>
- </el-form>
- <template #footer>
- <el-button @click="departmentVisible=false" >鍙� 娑�</el-button>
- <el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="departmentSubmit()">淇� 瀛�</el-button>
- </template>
- </el-dialog>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSuccess" @closed="dialog.save=false"></save-dialog>
</template>
@@ -107,6 +77,14 @@
name: "bakalaka",
data(){
return {
+ total: 0,
+ searchData: {
+ groupType: 'group_organization',
+ groupCategory: '1',
+ status: "1",
+ name: ""
+ },
+ statusList: [],
isSaveing: false,
groups: [],
departmentFrom: {
@@ -128,47 +106,33 @@
label: '榛勯噾绯�'
}],
input3: '',
- tableData: [{
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�',
- zip: 200333
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�',
- zip: 200333
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�',
- zip: 200333
- }]
+ departmentList: []
}
},
created(){
},
mounted(){
-
+ this.getStatus();
},
components: {
saveDialog
},
methods: {
+ getOrganizationList() {
+ this.$HTTP.get(`/api/blade-cps/organization/tree?` + this.$TOOL.qsStringify(this.searchData)).then(res=> {
+ if(res.code == 200) {
+ this.departmentList = res.data;
+ }
+ })
+ },
+ getStatus() { //鑾峰彇鍏ㄩ儴璐﹀彿
+ this.$HTTP.get(`/api/blade-system/dict/dictionary?code=employee_status`).then(res=> {
+ if(res.code == 200) {
+ this.statusList = res.data;
+ }
+ })
+ },
departmentSubmit() {
this.departmentVisible=false; //閮ㄩ棬璋冩暣
},
--
Gitblit v1.9.3