Browse Source

修改手机号模糊查询规则

D4THYL3\long 3 years ago
parent
commit
7dc6cf86ee

+ 9 - 4
operationSupport/src/views/propertyManagement/common/previeInform.vue

@@ -4,14 +4,15 @@
             <div class="prev-text" style="margin-top: 0">
                 <span>所属社区: </span><span class="text-right">{{ dataDetail.communityName }}</span>
             </div>
-            <!-- <div class="prev-text detail">
+            <div class="prev-text detail">
                 <div>发布对象:{{ dataDetail.treeData }}</div>
+                <div>发布对象:{{ houseData }}</div>
                 <div class="detail-right">
                     <el-tree
                         class="filter-tree"
                         ref="filterPeople"
                         node-key="id"
-                        :data="organList"
+                        :data="houseData"
                         :props="defaultProps"
                         default-expand-all
                         :filter-node-method="filterNode"
@@ -19,7 +20,7 @@
                     </el-tree>
                 </div>
                 <div>查看详情</div>
-            </div> -->
+            </div>
             <div class="prev-text">
                 <span>通知类型: </span
                 ><span class="text-right">{{ dataDetail.type == 0 ? '物业通知' : dataDetail.type == 1 ? '社区活动' : '其他' }}</span>
@@ -73,7 +74,11 @@ export default {
     props: {
         dataDetail: {
             type: Object,
-            default: {}
+            default: () => {}
+        },
+        houseData: {
+            type: Array,
+            default: () => []
         },
         detailPeople: {
             type: Array,

+ 11 - 13
operationSupport/src/views/propertyManagement/inform.vue

@@ -105,6 +105,7 @@
                                                         :accordion="true"
                                                         :selectAll="true"
                                                         @selectData="selectDataHouseTree"
+                                                        :houseData="houseData"
                                                         ref="selectTreeHouse"
                                                     ></tree-house>
                                                 </div>
@@ -836,20 +837,16 @@ export default {
         dimension(arr) {
             console.log('dimensiondimensiondimensiondimension', arr);
             arr.map((item, index) => {
-                if (item.children) {
-                    this.dimension(item.children);
-                } else if (item.type == 'room' && item.value == 9733) {
-                    // && !this.rowDetail.treeData.includes(Number(item.value))
-                    console.log('roomroomroomroom', arr);
-                    arr = arr.splice(index, 1);
-                    // arr = arr.filter((item) => {
-                    //     return this.rowDetail.treeData.includes(Number(item.value));
-                    // });
-                }
+                // if (item.children) {
+                //     this.dimension(item.children);
+                // } else if (item.type == 'room' && !this.CheckChinese(item.value)) {
+                //     arr.splice(index, 1);
+                // }
             });
         },
         CheckChinese(val) {
-            return this.rowDetail.treeData.includes(val);
+            // return this.rowDetail.treeData.find((task) => task.includes(val));
+            // return this.rowDetail.treeData.includes(val);
         },
         // 获取房间
         getOrgTreeList() {
@@ -858,10 +855,11 @@ export default {
                 .get('/sc-community/assets/tree/community/find', { buildingType: this.buildingType })
                 .then(({ status, data, msg }) => {
                     if (status === 0 && data) {
-                        let da = this.dimension(data);
+                        console.log('houseData=1', this.houseData);
                         this.houseData = data;
+                        this.dimension(this.houseData);
                         console.log('====================================');
-                        console.log('da=', da);
+                        console.log('houseData=2', this.houseData);
                         console.log('====================================');
                     }
                     console.log('获取房间', this.rowDetail.treeData);

+ 1 - 9
operationSupport/src/views/propertyManagement/phone.vue

@@ -197,15 +197,7 @@ export default {
         },
         /**查询按钮*/
         searchInfo() {
-            this.mixins_query.name = '';
-            this.mixins_query.telephone = '';
-            if (this.location) {
-                if (isNaN(this.location)) {
-                    this.mixins_query.name = this.location;
-                } else {
-                    this.mixins_query.telephone = this.location;
-                }
-            }
+            this.mixins_query.name = this.location;
             this.mixins_search();
         },
         /**