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 | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/views/system/unit/people/index.vue b/src/views/system/unit/people/index.vue
index 59db6de..c78430f 100644
--- a/src/views/system/unit/people/index.vue
+++ b/src/views/system/unit/people/index.vue
@@ -43,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">
@@ -54,7 +53,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['system:people:edit']"
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
@@ -65,7 +63,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['system:people:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -75,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>
@@ -86,8 +82,9 @@
<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" prop="remark" />
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -95,14 +92,12 @@
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>
@@ -141,6 +136,9 @@
<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">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
--
Gitblit v1.8.0