Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

shuishen

2024-01-16 3e5ffb4c27ae30046bdaa4793ff623a67c407e17

 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,