From 3e5ffb4c27ae30046bdaa4793ff623a67c407e17 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 16 Jan 2024 17:41:15 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

---
 src/views/userHouse/houseList.vue |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/views/userHouse/houseList.vue b/src/views/userHouse/houseList.vue
index 8b2f087..dc511ea 100644
--- a/src/views/userHouse/houseList.vue
+++ b/src/views/userHouse/houseList.vue
@@ -162,16 +162,19 @@
                     row: true,
                     dicData: [{
                         label: '撤销',
-                        value: '#EBEDF0'
+                        // value: '#EBEDF0'
                     }, {
                         label: '绿',
-                        value: '#30D17C'
+                        // value: '#30D17C'
+                        value:'green'
                     }, {
                         label: '黄',
-                        value: '#FFB42B'
+                        // value: '#FFB42B'
+                        value:'yellow'
                     }, {
                         label: '红',
-                        value: '#EA1F1F'
+                        // value: '#EA1F1F'
+                        value:'red'
                     }],
                     rules: [{
                         required: true,
@@ -228,9 +231,19 @@
                         overHidden: true,
                         label: "地址",
                         prop: "address",
-                        display: false
+                        display: false,
                     },
-
+                    {
+                        // hide: true, 
+                        width: 220,
+                        overHidden: true,
+                        label: '地址',
+                        parent: false,
+                        prop: "houseName",
+                        searchSpan: 4,
+                        display: false,
+                        search: true,
+                    },
                     {
                         hide: true,
                         parent: false,

--
Gitblit v1.9.3