From 7a5910ac61a372a865995d2a71caef3ea87c2050 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 18:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/unit/index.vue | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/views/system/unit/index.vue b/src/views/system/unit/index.vue
index bf074d6..98a4c99 100644
--- a/src/views/system/unit/index.vue
+++ b/src/views/system/unit/index.vue
@@ -31,8 +31,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -44,7 +44,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['system:unit:add']"
+ v-hasPermi="['unit:add']"
>鏂板</el-button>
</el-col>
<el-col :span="1.5">
@@ -55,7 +55,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['system:unit:edit']"
+ v-hasPermi="['unit:edit']"
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
@@ -66,7 +66,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['system:unit:remove']"
+ v-hasPermi="['unit:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -76,7 +76,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['system:unit:export']"
+ v-hasPermi="['unit:export']"
>瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -89,7 +89,7 @@
<el-table-column label="鍗曚綅鑱旂郴浜�" align="center" prop="unitContact" />
<el-table-column label="鍗曚綅鑱旂郴浜虹數璇�" align="center" prop="unitContactPhone" />
<el-table-column label="鍗曚綅绠＄悊鍛樿处鍙�" align="center" prop="unitAdminAccount" />
- <el-table-column label="澶囨敞" align="center" prop="remark" />
+ <el-table-column label="澶囨敞" align="center" prop="remark" show-overflow-tooltip/>
<el-table-column label="娣诲姞鏃堕棿" align="center" prop="createTime" />
<el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -98,14 +98,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['system:unit:edit']"
+ v-hasPermi="['unit:edit']"
>淇敼</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['system:unit:remove']"
+ v-hasPermi="['unit:remove']"
>鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -129,7 +129,7 @@
<el-input v-model="form.unitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" />
</el-form-item>
<el-form-item label="鍗曚綅璐﹀彿" prop="unitAdminAccount">
- <el-input v-model="form.unitAdminAccount" placeholder="璇疯緭鍏ュ崟浣嶇鐞嗗憳璐﹀彿" />
+ <el-input v-model="form.unitAdminAccount" placeholder="璇疯緭鍏ュ崟浣嶇鐞嗗憳璐﹀彿" :disabled="account" />
</el-form-item>
<el-form-item label="鍗曚綅鑱旂郴浜�" prop="unitContact">
<el-input v-model="form.unitContact" placeholder="璇疯緭鍏ュ崟浣嶈仈绯讳汉" />
@@ -138,12 +138,12 @@
<el-input v-model="form.unitContactPhone" placeholder="璇疯緭鍏ュ崟浣嶈仈绯讳汉鐢佃瘽" />
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" maxlength="100" show-word-limit autosize type="textarea" placeholder="澶囨敞淇℃伅" />
+ <el-input v-model="form.remark" maxlength="100" show-word-limit rows="3" type="textarea" placeholder="澶囨敞淇℃伅" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
</div>
</el-dialog>
</div>
@@ -156,6 +156,8 @@
name: "Unit",
data() {
return {
+ // 璐﹀彿涓嶅彲淇敼
+ account: true,
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -267,6 +269,8 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.daterangeCreateTime = [];
+ this.queryParams.start = null;
+ this.queryParams.end = null;
this.resetForm("queryForm");
this.handleQuery();
},
@@ -278,12 +282,14 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
+ this.account = false;
this.reset();
this.open = true;
this.title = "娣诲姞杩愮淮鍗曚綅";
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
+ this.account = true;
this.reset();
const id = row.id || this.ids
getUnit(id).then(response => {
@@ -324,7 +330,7 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.download('system/unit/export', {
+ this.download('yw-unit/export', {
...this.queryParams
}, `unit_${new Date().getTime()}.xlsx`)
}
--
Gitblit v1.8.0