Hwt 2 年之前
父节点
当前提交
abd8ab6ccc

+ 1 - 1
operationSupport/src/components/common/treeHouse.vue

@@ -314,7 +314,6 @@ export default {
 
     // 选中所有房间
     selectAllHouse () {
-      debugger
       this.$nextTick(() => {
         this.$refs.tree.setCheckedNodes(this.organList);
         this.clickCheckTree();
@@ -486,6 +485,7 @@ export default {
       // 输入框显示的人员
       this.selectLandlady = nameArr.toString();
       // 选中的人员id
+      debugger
       this.$emit('selectLandlady', obj);
     },
 

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

@@ -10,7 +10,10 @@
       </div>
       <div class="prev-text detail">
         <div class="prev-obj">
-          <div class="files-text">发布对象:</div>
+          <div
+            class="files-text"
+            style="width: 76px;"
+          >发布对象:</div>
           <div v-if="userType == 2">
             <div class="prev-obj-right">
               <div class="prev-obj-text">社区住户/{{ '指定房间' }}/{{ houseDataNames.join(',') }}</div>
@@ -45,17 +48,20 @@
             >社区住户/{{ '指定房间' }}/{{ houseDataNames.join(',') }}</div>
             <div
               class="prev-obj-text"
-              v-else-if="userType == 1 || userType == 2"
+              v-else-if="userType == 1 && (houseDataNamesPeople.join(',').length == 0 ? false:true)"
               style="float: left;"
             >社区员工/{{ '指定员工' }}/{{ houseDataNamesPeople.join(',') }}</div>
-            <div
-              @click="clickDetail()"
-              class="click-prev"
-              style="float: left;"
-            >{{ showTree ? '关闭详情' : '查看详情' }}</div>
+            <div v-show=" ((houseDataNamesPeople.join(',').length == 0 ? false:true) || (houseDataNames.join(',').length == 0 ? false:true))">
+              <div
+                @click="clickDetail()"
+                class="click-prev"
+                style="float: left;"
+              >{{ showTree ? '关闭详情' : '查看详情' }}</div>
+            </div>
+
             <div
               class="prev-obj-text"
-              v-if="userType == 1 || userType == 2"
+              v-if="userType == 1 || userType == 2 || userType == 0"
             >房东/{{ '指定房东' }}/{{ houseDataNamesLandlady.join(',') }}</div>
             <div
               @click="clickDetails()"
@@ -584,7 +590,7 @@ export default {
                 flex-wrap: wrap !important;
                 .prev-obj-text {
                     max-width: 495px;
-                    margin-left: 25px;
+                    // margin-left: 25px;
                     overflow: hidden;
                     white-space: nowrap;
                     text-overflow: ellipsis;

+ 17 - 4
operationSupport/src/views/propertyManagement/stepPage/informAdd.vue

@@ -588,7 +588,7 @@ export default {
     },
     // 选择的房东
     selectLandlady (val) {
-
+      debugger
       this.selectDataLandladyTreeData.userList = [];
       this.selectDataLandladyTreeData = val;
     },
@@ -608,14 +608,12 @@ export default {
     },
     // 选择房东复选框变化
     changeCheckboxlandlady (val) {
-
       if (!this.ruleForm.popCommunityId) {
         this.ruleForm.issueRoom.landlord = false;
         return this.$message.warning('请先选择社区');
       }
       if (val) {
         this.ruleForm.issueRoom.landlady = '全部房东';
-
         this.$refs.selectTreelandlady.selectAllLandlady();
       } else {
         this.ruleForm.issueRoom.landlady = '';
@@ -654,6 +652,7 @@ export default {
     },
     // 选择房间复选框变化
     changeCheckboxRoom (val) {
+      debugger
       if (!this.ruleForm.popCommunityId) {
         this.ruleForm.issueRoom.checkAll = false;
         return this.$message.warning('请先选择社区');
@@ -663,11 +662,22 @@ export default {
         // this.ruleForm.issueRoom.checkAll = true;
         this.ruleForm.issueRoom.radioRoom = '全部房间';
         // this.ruleForm.issueRoom.radioStaff = '';
+        debugger
         this.$refs.selectTreeHouse.selectAllHouse();
+        this.ruleForm.issueRoom.landlord = true
+
+        this.ruleForm.issueRoom.landlady = '全部房东';
+        this.$refs.selectTreelandlady.selectAllLandlady();
       } else {
+        debugger
         this.ruleForm.issueRoom.radioRoom = '';
         this.$refs.selectTreeHouse.selectHouseOr();
+
+        this.ruleForm.issueRoom.landlord = false
+        this.ruleForm.issueRoom.landlady = '';
+        this.$refs.selectTreelandlady.selectLandladyOr();
       }
+
     },
     // 指定员工
     changeRadioStaffRoom (val) {
@@ -710,10 +720,12 @@ export default {
           content.replace(/<img [^>]*src=['"]([^'"]+)[^>]*>/g, function (match, capture) {
             img.push(capture);
           });
+          debugger
           if (
             this.selectDataHouseTreeData.userList.length === 0 &&
             this.selectDataPeopleTreeData &&
-            this.selectDataPeopleTreeData.userList.length === 0
+            this.selectDataPeopleTreeData.userList.length === 0 &&
+            this.selectDataLandladyTreeData.userList.length === 0
           ) {
             return this.$message.warning('所选暂无人员,不可发布');
           }
@@ -776,6 +788,7 @@ export default {
             urgentFlag: this.ruleForm.exigencyOr == '是' ? 1 : 0,
             userVos: userVos
           };
+          debugger
           console.log('query', query);
           this.$http.post('/czc-community/notice/add', query).then((res) => {
             if (res.status === 0) {