From 198a9047f9481e3bebe6d18d03bde4e167d916ec Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 08 四月 2024 11:19:34 +0800
Subject: [PATCH] 1
---
src/views/master/person/main/personPerson.vue | 166 +++++++++++----------------
src/views/master/person/main/save.vue | 153 ++++++++++--------------
2 files changed, 133 insertions(+), 186 deletions(-)
diff --git a/src/views/master/person/main/personPerson.vue b/src/views/master/person/main/personPerson.vue
index 02e060d..d2e115e 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-03-28 18:18:33
+ * @LastEditTime: 2024-04-08 11:03:11
* @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
-->
@@ -24,24 +24,12 @@
<div class="right-top">
<div class="right-title">閮ㄩ棬锛氬崈鏂囩鎶�</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.keywords" style="width: 200px" size="small" placeholder="璇疯緭鍏ュ叧閿瓧杩涜杩囨护">
<template #append>
- <el-button :icon="Search" />
+ <el-button :icon="searchIcon" @click="searchPerson" />
</template>
</el-input>
</div>
@@ -52,58 +40,41 @@
<el-button type="danger" plain @click="delPerson">鍒犻櫎</el-button>
</div>
<div class="right-table">
- <el-table
- ref="multipleTableRef"
- :data="tableData"
- border
- style="width: 100%"
- class="multipleTableRef"
- @selection-change="handleSelectionChange"
- >
+ <el-table ref="multipleTableRef" :data="tableData" border style="width: 100%" class="multipleTableRef" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
- <el-table-column
- prop="date"
- label="寮犱笁"
- width="150">
+ <el-table-column prop="name" label="濮撳悕" width="150"></el-table-column>
+ <el-table-column prop="jobNumber" label="宸ュ彿" width="150"></el-table-column>
+ <el-table-column label="鍏宠仈璐﹀彿" width="120">
+ <template #default="scope">
+ <span>{{scope.row.account?scope.row.account:'-'}}</span>
+ </template>
</el-table-column>
- <el-table-column
- prop="name"
- label="鍏宠仈璐﹀彿"
- width="120">
+ <el-table-column label="閮ㄩ棬" width="120">
+ <template #default="scope">
+ <span>{{scope.row.organizationName?scope.row.organizationName:'-'}}</span>
+ </template>
</el-table-column>
- <el-table-column
- prop="province"
- label="閮ㄩ棬"
- width="120">
+ <el-table-column label="宀椾綅" width="120">
+ <template #default="scope">
+ <span>{{scope.row.postName?scope.row.postName:'-'}}</span>
+ </template>
</el-table-column>
- <el-table-column
- prop="city"
- label="宀椾綅"
- width="120">
+ <el-table-column label="閭" width="120">
+ <template #default="scope">
+ <span>{{scope.row.email?scope.row.email:'-'}}</span>
+ </template>
</el-table-column>
- <el-table-column
- prop="address"
- label="閭"
- width="300">
+ <el-table-column prop="tel" label="鎵嬫満鍙�" width="120"></el-table-column>
+ <el-table-column prop="tel" label="鐘舵��" width="120">
+ <template #default="scope">
+ <span>{{scope.row.status == "1"?"鍦ㄨ亴":'绂昏亴'}}</span>
+ </template>
</el-table-column>
- <el-table-column
- prop="zip"
- label="鎵嬫満鍙�"
- width="120">
- </el-table-column>
- <el-table-column
- prop="zip"
- label="鐘舵��"
- width="120">
- </el-table-column>
- <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>
- </template>
+ <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>
+ </template>
</el-table-column>
</el-table>
<el-pagination
@@ -142,9 +113,19 @@
<script>
import saveDialog from './save'
export default {
- name: "bakalaka",
+ name: "personPerson",
data(){
return {
+ searchIcon: "el-icon-search",
+ searchData: {
+ current: 1,
+ size: 15,
+ total: 0,
+ status: "1",
+ keywords: "",
+ postId: "",
+ organizationCode: "00001"
+ },
isSaveing: false,
groups: [],
departmentFrom: {
@@ -161,52 +142,41 @@
},
leftActive: true,
input: '',
- options: [{
- value: '閫夐」1',
- label: '榛勯噾绯�'
- }],
+ statusList: [],
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
- }]
+ tableData: []
}
},
created(){
},
mounted(){
-
+ this.getStatus();
+ this.searchPerson(); //鍛樺伐鍒楄〃
},
components: {
saveDialog
},
methods: {
+ searchPerson() {
+ this.$HTTP.get(`/api/blade-cps/employee/list?`+this.$TOOL.qsStringify(this.searchData)).then(res=> {
+ if(res.code == 200) {
+ res.data.records.forEach(item=> {
+ if(item.dictValue == "鍦ㄨ亴") {
+ this.searchData.status = item.dictKey;
+ }
+ })
+ this.tableData = 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;
+ }
+ })
+ },
departmentSubmit() {
this.departmentVisible=false; //閮ㄩ棬璋冩暣
},
diff --git a/src/views/master/person/main/save.vue b/src/views/master/person/main/save.vue
index 6cd6dab..3870d6a 100644
--- a/src/views/master/person/main/save.vue
+++ b/src/views/master/person/main/save.vue
@@ -1,84 +1,79 @@
<template>
<el-dialog :title="titleMap[mode]" v-model="visible" :width="800" destroy-on-close @closed="$emit('closed')">
- <el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="120px" label-position="center">
+ <el-form :model="addPersonForm" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="120px" label-position="center">
<el-row>
- <el-col :span="24">
- <el-form-item label="澶村儚" prop="avatar">
- <sc-upload v-model="form.avatar" title="涓婁紶澶村儚"></sc-upload>
- </el-form-item>
- </el-col>
<el-col :span="12">
- <el-form-item label="宸ュ彿" prop="userName">
- <el-input v-model="form.userName" placeholder="鐢ㄤ簬鐧诲綍绯荤粺" clearable></el-input>
+ <el-form-item label="宸ュ彿" prop="jobNumber">
+ <el-input v-model="addPersonForm.jobNumber" placeholder="宸ュ彿" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="濮撳悕" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ュ畬鏁寸殑鐪熷疄濮撳悕" clearable></el-input>
+ <el-input v-model="addPersonForm.name" placeholder="濮撳悕" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎵嬫満鍙�" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ユ墜鏈哄彿" clearable></el-input>
+ <el-form-item label="鎵嬫満鍙�" prop="tel">
+ <el-input v-model="addPersonForm.tel" placeholder="鎵嬫満鍙�" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐘舵��" prop="name">
- <el-select v-model="form.group" multiple filterable style="width: 100%">
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="addPersonForm.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-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>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="宀椾綅" prop="dept">
- <el-select v-model="form.group" multiple filterable style="width: 100%">
+ <el-form-item label="閭">
+ <el-input v-model="addPersonForm.email" placeholder="閭" clearable></el-input>
+ </el-form-item>
+ </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>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閭" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ラ偖绠�" clearable></el-input>
+ <el-form-item label="PIN鐮�">
+ <el-input v-model="addPersonForm.pinCode" placeholder="PIN鐮�" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閮ㄩ棬" prop="dept">
- <el-select v-model="form.group" multiple filterable 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-col :span="12">
- <el-form-item label="PIN鐮�" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏IN鐮�" clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍏ヨ亴鏃堕棿" prop="name">
+ <el-form-item label="鍏ヨ亴鏃堕棿">
<el-date-picker
style="width: 100%;"
- v-model="value1"
+ v-model="addPersonForm.hireDate"
type="date"
- placeholder="Pick a day"
+ placeholder="鍏ヨ亴鏃堕棿"
:size="size"
/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍏宠仈璐﹀彿" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ュ叧鑱旇处鍙�" clearable></el-input>
+ <el-form-item label="鍏宠仈璐﹀彿">
+ <el-input v-model="form.jobNumber" placeholder="璇疯緭鍏ュ叧鑱旇处鍙�" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏁版嵁鏉冮檺閰嶇疆" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ユ暟鎹潈闄愰厤缃�" clearable></el-input>
+ <el-form-item label="鏁版嵁鏉冮檺閰嶇疆">
+ <el-input v-model="form.deptId" placeholder="璇疯緭鍏ユ暟鎹潈闄愰厤缃�" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<el-button @click="visible=false" >鍙� 娑�</el-button>
- <el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="submit()">淇� 瀛�</el-button>
+ <el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="saveSubmit()">淇� 瀛�</el-button>
</template>
</el-dialog>
</template>
@@ -88,6 +83,7 @@
emits: ['success', 'closed'],
data() {
return {
+ statusList: [],
mode: "add",
titleMap: {
add: '娣诲姞鍛樺伐',
@@ -97,46 +93,23 @@
visible: false,
isSaveing: false,
//琛ㄥ崟鏁版嵁
- form: {
- id:"",
- userName: "",
- avatar: "",
+ addPersonForm: {
+ jobNumber: "",
name: "",
- dept: "",
- group: []
+ tel: "",
+ status: "",
+ postId: "",
+ email: "",
+ organizationId: "",
+ pinCode: "",
+ hireDate: "",
+ jobNumber: "",
+ deptId: ""
},
//楠岃瘉瑙勫垯
rules: {
avatar:[
{required: true, message: '璇蜂笂浼犲ご鍍�'}
- ],
- userName: [
- {required: true, message: '璇疯緭鍏ョ櫥褰曡处鍙�'}
- ],
- name: [
- {required: true, message: '璇疯緭鍏ョ湡瀹炲鍚�'}
- ],
- password: [
- {required: true, message: '璇疯緭鍏ョ櫥褰曞瘑鐮�'},
- {validator: (rule, value, callback) => {
- if (this.form.password2 !== '') {
- this.$refs.dialogForm.validateField('password2');
- }
- callback();
- }}
- ],
- password2: [
- {required: true, message: '璇峰啀娆¤緭鍏ュ瘑鐮�'},
- {validator: (rule, value, callback) => {
- if (value !== this.form.password) {
- callback(new Error('涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷�!'));
- }else{
- callback();
- }
- }}
- ],
- dept: [
- {required: true, message: '璇烽�夋嫨鎵�灞為儴闂�'}
],
group: [
{required: true, message: '璇烽�夋嫨鎵�灞炶鑹�', trigger: 'change'}
@@ -157,10 +130,17 @@
}
},
mounted() {
- // this.getGroup()
+ this.getStatus();
// this.getDept()
},
methods: {
+ getStatus() { //鑾峰彇鍏ㄩ儴璐﹀彿
+ this.$HTTP.get(`/api/blade-system/dict/dictionary?code=employee_status`).then(res=> {
+ if(res.code == 200) {
+ this.statusList = res.data;
+ }
+ })
+ },
//鏄剧ず
open(mode='add'){
this.mode = mode;
@@ -177,19 +157,21 @@
this.depts = res.data;
},
//琛ㄥ崟鎻愪氦鏂规硶
- submit(){
+ saveSubmit(){
+ var obj = Object.assign({},this.addDictForm);
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
this.isSaveing = true;
- var res = await this.$API.demo.post.post(this.form);
- this.isSaveing = false;
- if(res.code == 200){
- this.$emit('success', this.form, this.mode)
- this.visible = false;
- this.$message.success("鎿嶄綔鎴愬姛")
- }else{
- this.$alert(res.message, "鎻愮ず", {type: 'error'})
- }
+ 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.visible = false;
+ this.$message.success("鎿嶄綔鎴愬姛");
+ }else {
+ this.$alert(res.message, "鎻愮ず", {type: 'error'});
+ }
+ })
}else{
return false;
}
@@ -197,12 +179,7 @@
},
//琛ㄥ崟娉ㄥ叆鏁版嵁
setData(data){
- this.form.id = data.id
- this.form.userName = data.userName
- this.form.avatar = data.avatar
- this.form.name = data.name
- this.form.group = data.group
- this.form.dept = data.dept
+ this.addPersonForm.id = data.id
//鍙互鍜屼笂闈竴鏍峰崟涓敞鍏ワ紝涔熷彲浠ュ儚涓嬮潰涓�鏍风洿鎺ュ悎骞惰繘鍘�
//Object.assign(this.form, data)
--
Gitblit v1.9.3