From 9081024f205ed8c4ebee00c8731b7213acb2c6fa Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Tue, 20 Feb 2024 17:26:08 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/userHouse/hireInfoList.vue | 56 +++++++++++++++++++++-----------------------------------
1 files changed, 21 insertions(+), 35 deletions(-)
diff --git a/src/views/userHouse/hireInfoList.vue b/src/views/userHouse/hireInfoList.vue
index 460b5f4..0380030 100644
--- a/src/views/userHouse/hireInfoList.vue
+++ b/src/views/userHouse/hireInfoList.vue
@@ -37,11 +37,6 @@
@search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
@current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange"></avue-crud>
-
- <span slot="footer" class="dialog-footer">
- <el-button @click="roleBox = false">取 消</el-button>
- <el-button type="primary" @click="submitRole">确 定</el-button>
- </span>
</el-dialog>
<el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
@@ -125,7 +120,7 @@
total: 0
},
houseHoldOption: {
- height: 'auto',
+ height: '500',
calcHeight: 80,
tip: false,
searchShow: true,
@@ -146,12 +141,14 @@
{
label: "电话",
prop: "phoneNumber",
+ width:100,
// search: true,
searchSpan: 4,
},
{
label: "身份证号",
prop: "idCard",
+ width:160,
// search: true,
searchSpan: 4,
},
@@ -197,6 +194,8 @@
{
label: "地址",
prop: "address",
+ minWidth:160,
+ overHidden:true,
display: false
},
]
@@ -207,7 +206,6 @@
searchShow: true,
searchMenuSpan: 3,
menuWidth: 280,
-
height: 'auto',
calcHeight: 80,
tip: false,
@@ -218,11 +216,10 @@
addBtn: true,
dialogType: 'drawer',
dialogClickModal: false,
-
column: [
{
label: "房屋",
- prop: "address",
+ prop: "houseName",
display: false
},
{
@@ -237,33 +234,24 @@
searchMenuSpan: 6,
submitText: "确定",
column: [
- {
- width: 220,
- overHidden: true,
- label: '小区名称',
- prop: "districtName",
- search: true,
- searchSpan: 4,
- rules: [{
- required: true,
- message: "请输入小区名称",
- trigger: "blur",
- },],
- },
+ // {
+ // width: 220,
+ // overHidden: true,
+ // label: '小区名称',
+ // prop: "districtName",
+ // search: true,
+ // searchSpan: 4,
+ // rules: [{
+ // required: true,
+ // message: "请输入小区名称",
+ // trigger: "blur",
+ // },],
+ // },
{
label: "地址",
prop: "address",
- width: 180,
+ minWidth: 180,
display: false
- },
- {
- label: "手机",
- prop: "phone",
- rules: [{
- required: true,
- message: "请输入绑定手机",
- trigger: "blur",
- },],
},
],
},
@@ -273,9 +261,7 @@
total: 0
},
formatter: (row) => {
- console.log(row, 888)
- if (!row.districtName) return ''
- return row.districtName + '-' + row.unit + row.building + row.room
+ return row.houseName
},
onLoad: ({
page,
--
Gitblit v1.9.3