城中村

login/src/App.vue

@@ -6,10 +6,10 @@
  * @Descripttion: 登录项目的主入口文件
 -->
 <template>
-    <div id="app">
-        <router-view></router-view>
-    </div>
+  <div id="app">
+    <router-view></router-view>
+  </div>
 </template>
 <style>
-    @import "./assets/css/main.scss";
+@import './assets/css/main.scss';
 </style>

operationSupport/src/views/ownerManagement/landlordManagement/stepPage/add.vue

@@ -83,7 +83,7 @@
                 ref="uploaduserlogo"
                 class="mini-upload"
                 limit="1"
-                action="/czc-community/upload/uploadFile"
+                action="/sc-community/upload/uploadFile"
                 :on-success="uploadsuccess"
                 :before-upload="beforeAvatarUpload"
                 :auto-upload="true"
@@ -619,10 +619,8 @@ export default {
         },
       ],
       optionTree: [],
-      shareScope: '',
-      idTree: '',
-      shareScopeId: 0,
-      shareScopeTree: '',
+      shareScope: [],
+      shareScopeID: [],
     }
   },
   methods: {
@@ -630,13 +628,16 @@ export default {
       debugger
       var data = this.$refs[`getChecked${index}`][0].getCheckedNodes();
 
-
-
       console.log(data)
+      this.shareScope = [];
       for (let a = 0; a < data.length; a++) {
         if (data[a].children.length != 0) {
           if (data[0].path[0] == data[data.length - 1].path[0]) {
 
+            for (let i = 0; i < data.length; i++) {
+              this.shareScope.push(data[i].path[1]);
+            }
+
             // this.houseInformation[index].region = [];
             // var houseInformation = [];
             // for (let i = 0; i < data.length; i++) {
@@ -657,12 +658,13 @@ export default {
 
             this.houseInformation[index].region = [];
             var houseInformation = [];
+            this.shareScope = [];
             debugger
             for (let k = 0; k < data.length; k++) {
               if (data[k].path[0] == data[data.length - 1].path[0]) {
                 if (data[k].path[3] != undefined) {
                   houseInformation.push(data[k].path)
-                  this.shareScope = data[k].path[1]
+                  this.shareScope.push(data[k].path[1])
                 }
 
               }
@@ -675,7 +677,6 @@ export default {
             this.$nextTick(() => {
               // this.$forceUpdate();
               this.$refs[`getChecked${index}`][0].$refs.panel.clearCheckedNodes();
-              debugger
             })
 
 
@@ -684,7 +685,38 @@ export default {
           }
 
         } else {
+          this.shareScope = [];
+          if (data[0].path[0] == data[data.length - 1].path[0]) {
+            for (let i = 0; i < data.length; i++) {
+              this.shareScope.push(data[i].path[1])
+            }
+          } else {
+            this.shareScope = [];
+            for (let k = 0; k < data.length; k++) {
+              this.shareScope.push(data[k].path[1])
+            }
+            this.$nextTick(() => {
+              // this.$forceUpdate();
+              this.$refs[`getChecked${index}`][0].$refs.panel.clearCheckedNodes();
+            })
+            // this.houseInformation[index].region = [];
+            // var houseInformation = [];
+            // this.shareScope = [];
+            // for (let k = 0; k < data.length; k++) {
+            //   if (data[k].path[0] == data[data.length - 1].path[0]) {
+            //     if (data[k].path[3] != undefined) {
+            //       houseInformation.push(data[k].path)
+            //       this.shareScope.push(data[k].path[1])
+            //     }
 
+            //   }
+            // }
+          }
+          // this.houseInformation[index].region = houseInformation
+          // this.$nextTick(() => {
+          //   // this.$forceUpdate();
+          //   this.$refs[`getChecked${index}`][0].$refs.panel.clearCheckedNodes();
+          // })
           // debugger
           // // this.shareScope = data[index].parent.parent.value;
           // if (data[0].path[0] == data[data.length - 1].path[0]) {
@@ -714,7 +746,14 @@ export default {
 
           // }
         }
+
+
+
       }
+      this.shareScope = Array.from(new Set(this.shareScope))
+      this.shareScopeID[index] = this.shareScope;
+      console.log('shareScope', this.shareScope);
+      console.log('7777', this.shareScopeID)
 
       // this.$forceUpdate();
 
@@ -764,9 +803,10 @@ export default {
                 houseList: []
               })
             } else if (this.houseInformation[i].choice == 2) {
+              debugger
               params.buildingList.push({
                 type: this.houseInformation[i].choice,
-                buildingId: this.shareScope,
+                buildingId: this.shareScopeID[i],
                 strategyId: this.houseInformation[i].billingRules,
                 area: this.houseInformation[i].billingArea,
                 houseList: []

operationSupport/src/views/propertyManagement/common/previeInform.vue

@@ -60,10 +60,10 @@
             <div
               @click="clickDetails()"
               class="click-prev"
-            >{{ (showTree && showTrees) ? '关闭详情' : '查看详情' }}</div>
+            >{{ ( showTrees) ? '关闭详情' : '查看详情' }}</div>
           </div>
         </div>
-        <div v-show="showTree">
+        <div v-show="showTree || showTrees">
           <!-- 社区住户 -->
           <div
             class="prev-detail-right"
@@ -106,7 +106,7 @@
           <!-- 房东 -->
           <div
             :class="{ 'prev-detail-right': true, 'prev-detail-right-two': userType == 2 }"
-            v-show="(userType == 1 || userType == 2 || userType == 0) && showTreeLandlady "
+            v-show="(userType == 1 || userType == 2 || userType == 0) && showTreeLandlady && showTrees "
             style="top:46px"
           >
             <div class="containerScrollbar">
@@ -330,22 +330,22 @@ export default {
   methods: {
     // 关闭弹框事件
     closeDialog () {
-      debugger
+
       this.showTreeHouse = false;
       this.showTreePeople = false;
       this.showTreeLandlady = false;
     },
     // 点击显示发布对象详情
     clickDetail (val) {
-      debugger
+
       this.showTree = !this.showTree;
       this.showTreeHouse = !this.showTreeHouse;
       this.showTreePeople = !this.showTreePeople;
       //   this.showTreeLandlady = !this.showTreeLandlady;
     },
     clickDetails (val) {
-      debugger
-      this.showTree = !this.showTree;
+
+      //   this.showTree = !this.showTree;
       this.showTrees = !this.showTrees;
       //   this.showTreeHouse = !this.showTreeHouse;
       //   this.NamesLandlady = !this.NamesLandlady;
@@ -384,26 +384,30 @@ export default {
       if (node.checked || (node.indeterminate && data.type == 'room')) {
         this.houseDataNames.push(data.name);
       }
+
       return node.checked || node.indeterminate;
     },
     filterNode (value, data, node) {
+      console.log('none', node)
       if (node.checked || (node.indeterminate && data.children == null)) {
-        // debugger
+
         this.houseDataNamesPeople.push(data.label);
       }
+
       return node.checked || node.indeterminate;
     },
     filterNodeLandlady (value, data, node) {
       this.houseDataNamesLandlady.push(data.name);
+      return !node.checked || !node.indeterminate;
     },
   },
   mounted () {
     this.$nextTick(() => {
-      debugger
+
       this.$refs.filterHouse.filter();
       this.$refs.filterPeople.filter();
       this.$refs.filterLandlady.filter();
-      debugger
+
     });
   }
 };

operationSupport/src/views/propertyManagement/inform.vue

@@ -245,7 +245,7 @@ export default {
     getOrgTreeList () {
       this.$http.get('/czc-community/assets/tree/community/find').then(({ status, data, msg }) => {
         if (status === 0 && data) {
-          debugger
+
           this.houseData = data;
         }
       });
@@ -256,7 +256,7 @@ export default {
         .get('/czc-community/landlord/list')
         .then(({ status, data, msg }) => {
           if (status === 0 && data) {
-            debugger
+
             this.dataLandlady = data;
           }
         });
@@ -274,7 +274,7 @@ export default {
     clickDatail (row) {
       this.$http.get('/czc-community/notice/find/' + row.id).then(({ data, status, msg }) => {
         if (status == 0) {
-          debugger
+
           let treeData = JSON.parse(data.treeData);
           let treeDataHome = JSON.parse(treeData[0]);
           let treeDataPeople = JSON.parse(treeData[1]);

operationSupport/src/views/propertyManagement/stepPage/informAdd.vue

@@ -579,7 +579,7 @@ export default {
     },
     // 选择的人员
     selectPeople (val) {
-      debugger
+
       // if (val.userList.length < 1) {
       //     this.ruleForm.issueRoom.radioStaff = '指定员工';
       // }
@@ -588,7 +588,7 @@ export default {
     },
     // 选择的房东
     selectLandlady (val) {
-      debugger
+
       this.selectDataLandladyTreeData.userList = [];
       this.selectDataLandladyTreeData = val;
     },
@@ -608,7 +608,7 @@ export default {
     },
     // 选择房东复选框变化
     changeCheckboxlandlady (val) {
-      debugger
+
       if (!this.ruleForm.popCommunityId) {
         this.ruleForm.issueRoom.landlord = false;
         return this.$message.warning('请先选择社区');