From ba89cd03365eae8aa080a98f011bb6bced286a2e Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 20 Dec 2023 16:50:38 +0800
Subject: [PATCH] 住户、房屋、场所，显示内容调整
---
src/views/userHouse/houseList.vue | 177 ++++++++++++++++-------------
src/views/place/index.vue | 16 ++
src/views/userHouse/houseHoldList.vue | 144 +++++++++++++----------
3 files changed, 194 insertions(+), 143 deletions(-)
diff --git a/src/views/place/index.vue b/src/views/place/index.vue
index 50ea675..ef6ece0 100644
--- a/src/views/place/index.vue
+++ b/src/views/place/index.vue
@@ -149,6 +149,21 @@
dialogClickModal: false,
column: [
{
+ width: 96,
+ label: "所属街道",
+ prop: "townStreetName",
+ },
+ {
+ width: 160,
+ label: "所属社区",
+ prop: "neiName",
+ },
+ {
+ width: 96,
+ label: "所属网格",
+ prop: "gridName",
+ },
+ {
label: "场所名称",
prop: "placeName",
searchSpan: 4,
@@ -159,7 +174,6 @@
trigger: "blur",
},],
},
-
{
label: "负责人",
prop: "principal",
diff --git a/src/views/userHouse/houseHoldList.vue b/src/views/userHouse/houseHoldList.vue
index 1c7121c..e1cf008 100644
--- a/src/views/userHouse/houseHoldList.vue
+++ b/src/views/userHouse/houseHoldList.vue
@@ -180,75 +180,95 @@
dialogClickModal: false,
menuWidth: 280,
menuFixed: 'right',
- column: [{
- label: "姓名",
- prop: "name",
- search: true,
- searchSpan: 4,
- },
- {
- label: "电话",
- prop: "phoneNumber",
- search: true,
- searchSpan: 4,
- slot: true,
- },
- {
- width: 160,
- label: "身份证号",
- prop: "idCard",
- search: true,
- searchSpan: 4,
- slot: true,
- },
- {
- label: "性别",
- prop: "gender",
- type: "select",
- dicData: [{
- label: "男",
- value: 1
+ column: [
+ {
+ width: 96,
+ label: "所属街道",
+ prop: "townStreetName",
},
{
- label: "女",
- value: 0
+ width: 160,
+ label: "所属社区",
+ prop: "neiName",
},
{
- label: "未知",
- value: 1
- }
- ],
- },
- {
- label: "关系",
- prop: "relationship",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
- dataType: "number",
- props: {
- label: "dictValue",
- value: "dictKey",
+ width: 96,
+ label: "所属网格",
+ prop: "gridName",
},
- },
- {
- label: "小区",
- prop: "aoiName",
- search: true,
- searchSpan: 4,
- },
+ {
+ width: 96,
+ label: "姓名",
+ prop: "name",
+ search: true,
+ searchSpan: 4,
+ },
+ {
+ width: 106,
+ label: "电话",
+ prop: "phoneNumber",
+ search: true,
+ searchSpan: 4,
+ slot: true,
+ },
+ {
+ width: 160,
+ label: "身份证号",
+ prop: "idCard",
+ search: true,
+ searchSpan: 4,
+ slot: true,
+ },
+ {
+ label: "性别",
+ prop: "gender",
+ type: "select",
+ dicData: [{
+ label: "男",
+ value: 1
+ },
+ {
+ label: "女",
+ value: 0
+ },
+ {
+ label: "未知",
+ value: 1
+ }
+ ],
+ },
+ {
+ label: "关系",
+ prop: "relationship",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+ {
+ width: 132,
+ label: "小区",
+ prop: "aoiName",
+ search: true,
+ searchSpan: 4,
+ },
- {
- label: "地址",
- prop: "address",
- display: false
- },
+ {
+ width: 132,
+ label: "地址",
+ prop: "address",
+ display: false
+ },
- {
- width: 210,
- label: "标签",
- prop: "householdLabelList",
- display: false
- },
+ {
+ width: 210,
+ label: "标签",
+ prop: "householdLabelList",
+ display: false
+ },
]
},
data: [],
diff --git a/src/views/userHouse/houseList.vue b/src/views/userHouse/houseList.vue
index e0c1a9a..df8ddf2 100644
--- a/src/views/userHouse/houseList.vue
+++ b/src/views/userHouse/houseList.vue
@@ -204,86 +204,103 @@
dialogType: 'drawer',
dialogClickModal: false,
menuWidth: 340,
- column: [{
- label: "房屋编号",
- prop: "houseCode",
- width: 180,
- hide: true,
- display: false
- },
- {
- label: "地址",
- prop: "address",
- width: 180,
- display: false
- },
- {
- label: "小区",
- prop: "districtName",
- search: true,
- rules: [{
- required: true,
- message: "请选择小区",
- trigger: "blur",
- },],
- },
- {
- label: "手机",
- prop: "phone",
- rules: [{
- required: true,
- message: "请输入绑定手机",
- trigger: "blur",
- },],
- },
- {
- label: "幢",
- prop: "building",
- hide: true
- },
- {
- label: "单元",
- prop: "unit",
- hide: true
- },
- {
- label: "室",
- prop: "room",
- hide: true
- },
- {
- label: "楼层",
- prop: "floor",
- type: "number",
- rules: [{
- required: true,
- message: "请输入楼层",
- trigger: "blur",
- },],
- },
- {
- label: "面积",
- prop: "area",
- type: "number",
- },
- {
- label: "物业费",
- prop: "propertyPrice",
- type: "number",
- },
- {
- label: "服务到期",
- prop: "serviceDue",
- type: "datetime",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- },
- {
- width: 210,
- label: "标签",
- prop: "userHouseLabelVOList",
- display: false
- },
+ column: [
+ {
+ width: 96,
+ label: "所属街道",
+ prop: "townStreetName",
+ },
+ {
+ width: 160,
+ label: "所属社区",
+ prop: "neiName",
+ },
+ {
+ width: 96,
+ label: "所属网格",
+ prop: "gridName",
+ },
+ {
+ label: "房屋编号",
+ prop: "houseCode",
+ width: 180,
+ hide: true,
+ display: false
+ },
+ {
+ label: "地址",
+ prop: "address",
+ width: 180,
+ display: false
+ },
+ {
+ width: 132,
+ label: "小区",
+ prop: "districtName",
+ search: true,
+ rules: [{
+ required: true,
+ message: "请选择小区",
+ trigger: "blur",
+ },],
+ },
+ {
+ label: "手机",
+ prop: "phone",
+ rules: [{
+ required: true,
+ message: "请输入绑定手机",
+ trigger: "blur",
+ },],
+ },
+ {
+ label: "幢",
+ prop: "building",
+ hide: true
+ },
+ {
+ label: "单元",
+ prop: "unit",
+ hide: true
+ },
+ {
+ label: "室",
+ prop: "room",
+ hide: true
+ },
+ {
+ label: "楼层",
+ prop: "floor",
+ type: "number",
+ rules: [{
+ required: true,
+ message: "请输入楼层",
+ trigger: "blur",
+ },],
+ },
+ {
+ label: "面积",
+ prop: "area",
+ type: "number",
+ },
+ {
+ label: "物业费",
+ prop: "propertyPrice",
+ type: "number",
+ },
+ {
+ label: "服务到期",
+ prop: "serviceDue",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ },
+ {
+ width: 210,
+ label: "标签",
+ prop: "userHouseLabelVOList",
+ display: false
+ },
]
},
data: [],
--
Gitblit v1.9.3