From bbff46e35d4314b95af6f0019773bc23f0e25c4b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 06 Jan 2024 18:17:40 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/userHouse/houseHoldList.vue | 62 +++++++++++++------------------
1 files changed, 26 insertions(+), 36 deletions(-)
diff --git a/src/views/userHouse/houseHoldList.vue b/src/views/userHouse/houseHoldList.vue
index 089cb7b..862da1b 100644
--- a/src/views/userHouse/houseHoldList.vue
+++ b/src/views/userHouse/houseHoldList.vue
@@ -18,39 +18,24 @@
icon="el-icon-download" @click="handleExport">导出
</el-button>
</template>
- <template slot-scope="scope" slot="menu">
- <el-button type="text" icon="el-icon-circle-plus-outline" size="small"
- v-if="permission.househould_manager" @click="manageLabel(scope.row)">标签
+
+ <template slot-scope="{row, size}" slot="menu">
+ <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
+ v-if="permission.househould_manager" @click="manageLabel(row)">标签
</el-button>
</template>
- <template slot-scope="{row}" slot="phoneNumber">
- <el-button type="text" @click="showStringDispose(row, 'phoneNumberflag')">
+ <template slot-scope="{row, size}" slot="phoneNumber">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneNumberflag')">
{{ textDispose(row, 'phoneNumberflag', 'phoneNumber') }}
</el-button>
</template>
- <template slot-scope="{row}" slot="idCard">
- <el-button type="text" @click="showStringDispose(row, 'idCardflag')"
+ <template slot-scope="{row, size}" slot="idCard">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'idCardflag')"
v-text="textDispose(row, 'idCardflag', 'idCard')"></el-button>
</template>
-
- <template slot-scope="{row}" slot="householdLabelList">
+ <template slot-scope="{row, size}" slot="householdLabelList">
{{ labelDispose(row.householdLabelList) }}
</template>
-
- <template slot-scope="{row}" slot="tenantName">
- <el-tag>{{ row.tenantName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="roleName">
- <el-tag>{{ row.roleName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="deptName">
- <el-tag>{{ row.deptName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="userTypeName">
- <el-tag>{{ row.userTypeName }}</el-tag>
- </template>
-
-
</avue-crud>
<el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px" center>
@@ -59,8 +44,8 @@
</el-tree>
<span slot="footer" class="dialog-footer">
- <el-button @click="roleBox = false">取 消</el-button>
- <el-button type="primary" @click="submitRole">确 定</el-button>
+ <el-button size="small" @click="roleBox = false">取 消</el-button>
+ <el-button size="small" type="primary" @click="submitRole">确 定</el-button>
</span>
</el-dialog>
@@ -92,16 +77,15 @@
<avue-form :option="labelOption" v-model="labelForm" :submit="onsubmit">
</avue-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="editLabelFlge = false">取 消</el-button>
- <el-button type="primary" @click="onsubmit">确 定</el-button>
+ <el-button size="small" @click="editLabelFlge = false">取 消</el-button>
+ <el-button size="small" type="primary" @click="onsubmit">确 定</el-button>
</span>
</el-dialog>
-
<el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
<avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
<template slot="excelTemplate">
- <el-button type="primary" @click="handleTemplate">
+ <el-button size="small" type="primary" @click="handleTemplate">
点击下载<i class="el-icon-download el-icon--right"></i>
</el-button>
</template>
@@ -224,11 +208,14 @@
},
option: {
labelWidth: 144,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 280,
+
height: 'auto',
calcHeight: 80,
tip: false,
- searchShow: true,
- searchMenuSpan: 3,
border: true,
index: true,
selection: true,
@@ -236,7 +223,6 @@
addBtn: true,
dialogType: 'drawer',
dialogClickModal: false,
- menuWidth: 280,
menuFixed: 'right',
column: [
{
@@ -263,8 +249,9 @@
width: 110,
label: "姓名",
prop: "name",
- search: true,
searchSpan: 3,
+ searchLabelWidth: 66,
+ search: true,
rules: [
{
required: true,
@@ -346,7 +333,7 @@
label: "手机号码",
prop: "phoneNumber",
search: true,
- searchSpan: 3,
+ searchSpan: 4,
slot: true,
rules: [
{
@@ -455,7 +442,8 @@
},
{
- width: 140,
+ width: 156,
+ overHidden: true,
label: "地址",
prop: "address",
display: false
@@ -543,6 +531,7 @@
{
width: 210,
+ overHidden: true,
label: "标签",
prop: "householdLabelList",
display: false
@@ -1083,6 +1072,7 @@
onLoad (page, params = {}) {
this.loading = true
+
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = {
...res.data.data,
--
Gitblit v1.9.3