From f18ff6df94830a0147f372f031fa94ab5402ead8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 18 三月 2024 15:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/unit/people/index.vue | 70 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/src/views/system/unit/people/index.vue b/src/views/system/unit/people/index.vue
index cdcf56f..c78430f 100644
--- a/src/views/system/unit/people/index.vue
+++ b/src/views/system/unit/people/index.vue
@@ -1,11 +1,12 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="杩愮淮浜哄憳缂栧彿" prop="ywPersonCode">
<el-input
v-model="queryParams.ywPersonCode"
placeholder="璇疯緭鍏ヨ繍缁翠汉鍛樼紪鍙�"
clearable
+ @clear="handleQuery"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -14,16 +15,19 @@
v-model="queryParams.ywPersonName"
placeholder="璇疯緭鍏ヨ繍缁翠汉鍛樺鍚�"
clearable
+ @clear="handleQuery"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="鎵�灞炶繍缁村崟浣�" prop="belongUnit">
- <el-input
- v-model="queryParams.belongUnit"
- placeholder="璇疯緭鍏ユ墍灞炶繍缁村崟浣�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-select v-model="queryParams.belongUnit" @change="handleQuery" clearable placeholder="鎵�灞炶繍缁村崟浣�">
+ <el-option
+ v-for="item in unitList"
+ :key="item.id"
+ :label="item.value"
+ :value="item.id">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -39,7 +43,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['system:people:add']"
>鏂板</el-button>
</el-col>
<el-col :span="1.5">
@@ -50,7 +53,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['system:people:edit']"
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
@@ -61,7 +63,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['system:people:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -71,7 +72,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['system:people:export']"
>瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -79,27 +79,25 @@
<el-table v-loading="loading" :data="peopleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="涓婚敭" align="center" prop="id" />
<el-table-column label="杩愮淮浜哄憳缂栧彿" align="center" prop="ywPersonCode" />
<el-table-column label="杩愮淮浜哄憳濮撳悕" align="center" prop="ywPersonName" />
<el-table-column label="杩愮淮浜哄憳璐﹀彿" align="center" prop="ywPersonAccount" />
- <el-table-column label="鎵�灞炶繍缁村崟浣�" align="center" prop="belongUnit" />
+ <el-table-column label="鎵�灞炶繍缁村崟浣�" align="center" prop="belongUnitName" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="澶囨敞" align="center" prop="remark" />
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['system:people:edit']"
>淇敼</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['system:people:remove']"
>鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -115,21 +113,31 @@
<!-- 娣诲姞鎴栦慨鏀硅繍缁翠汉鍛樺璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="杩愮淮浜哄憳缂栧彿" prop="ywPersonCode">
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+ <el-form-item label="浜哄憳缂栧彿" prop="ywPersonCode">
<el-input v-model="form.ywPersonCode" placeholder="璇疯緭鍏ヨ繍缁翠汉鍛樼紪鍙�" />
</el-form-item>
- <el-form-item label="杩愮淮浜哄憳濮撳悕" prop="ywPersonName">
+ <el-form-item label="浜哄憳濮撳悕" prop="ywPersonName">
<el-input v-model="form.ywPersonName" placeholder="璇疯緭鍏ヨ繍缁翠汉鍛樺鍚�" />
</el-form-item>
- <el-form-item label="杩愮淮浜哄憳璐﹀彿" prop="ywPersonAccount">
+ <el-form-item label="浜哄憳璐﹀彿" prop="ywPersonAccount">
<el-input v-model="form.ywPersonAccount" placeholder="璇疯緭鍏ヨ繍缁翠汉鍛樿处鍙�" />
</el-form-item>
- <el-form-item label="鎵�灞炶繍缁村崟浣�" prop="belongUnit">
- <el-input v-model="form.belongUnit" placeholder="璇疯緭鍏ユ墍灞炶繍缁村崟浣�" />
+ <el-form-item label="鎵�灞炲崟浣�" prop="belongUnit">
+ <el-select v-model="form.belongUnit" placeholder="鎵�灞炶繍缁村崟浣�">
+ <el-option
+ v-for="item in unitList"
+ :key="item.id"
+ :label="item.value"
+ :value="item.id">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ </el-form-item>
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="remark">
+ <el-input v-model="form.remark" type="textarea" show-word-limit maxlength="150" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -142,6 +150,7 @@
<script>
import { listPeople, getPeople, delPeople, addPeople, updatePeople } from "@/api/platform/people";
+import { unitSelect } from "@/api/platform/unit";
export default {
name: "People",
@@ -173,6 +182,8 @@
ywPersonName: null,
belongUnit: null,
},
+ // 杩愮淮鍗曚綅
+ unitList: [],
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
@@ -189,18 +200,29 @@
belongUnit: [
{ required: true, message: "鎵�灞炶繍缁村崟浣嶄笉鑳戒负绌�", trigger: "blur" }
],
+ phone: [
+ { required: true, message: "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", trigger: "blur" }
+ ],
}
};
},
created() {
this.getList();
+ this.getUnitSelect()
},
methods: {
- /** 鏌ヨ杩愮淮浜哄憳鍒楄〃 */
+ getUnitSelect() {
+ // 杩愮淮鍗曚綅涓嬫媺鍒楄〃
+ unitSelect().then((res) => {
+ this.unitList = res.data;
+ })
+ },
+
+ /** 鏌ヨ杩愮淮浜哄憳鍒嗛〉 */
getList() {
this.loading = true;
listPeople(this.queryParams).then(response => {
- this.peopleList = response.rows;
+ this.peopleList = response.data;
this.total = response.total;
this.loading = false;
});
--
Gitblit v1.8.0