修改通知公告添加人员字段

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

@@ -14,19 +14,19 @@
                     <div v-if="userType == 2">
                         <div class="prev-obj-right">
                             <div class="prev-obj-text">社区住户/{{ '指定房间' }}/{{ houseDataNames }}</div>
-                            <div @click="clickDetail()" class="click-prev">{{ showTreeHouse ? '关闭详情' : '查看详情' }}</div>
+                            <div @click="clickDetailHouse()" class="click-prev">{{ showTreeHouse ? '关闭详情' : '查看详情' }}</div>
                         </div>
                         <div class="prev-obj-right">
                             <div class="prev-obj-text">
                                 社区员工/{{ '指定员工' }}/{{ peopleData[0].value }}/
-                                <span v-for="(item, index) in peopleData.children" :key="index">{{ item }}</span>
+                                {{ houseDataNamesPeople }}
                             </div>
                             <div @click="clickDetailPeople()" class="click-prev">{{ showTreePeople ? '关闭详情' : '查看详情' }}</div>
                         </div>
                     </div>
                     <div class="prev-obj-right" v-else>
                         <div class="prev-obj-text" v-if="userType == 0">社区住户/{{ '指定房间' }}/{{ houseDataNames }}</div>
-                        <div class="prev-obj-text" v-else>社区员工/{{ '指定房间' }}/{{ peopleData[0].value }}/{{ houseDataNames }}</div>
+                        <div class="prev-obj-text" v-else>社区员工/{{ '指定员工' }}/{{ houseDataNamesPeople }}</div>
                         <div @click="clickDetail()" class="click-prev">{{ showTree ? '关闭详情' : '查看详情' }}</div>
                     </div>
                 </div>
@@ -55,7 +55,10 @@
                             </GeminiScrollbar>
                         </div>
                         <!-- 社区人员 -->
-                        <div class="prev-detail-right-two" v-if="userType == 1 || (userType == 2 && showTreePeople)">
+                        <div
+                            :class="{ 'prev-detail-right': true, 'prev-detail-right-two': userType == 2 }"
+                            v-if="(userType == 1 || userType == 2) && showTreePeople"
+                        >
                             <GeminiScrollbar class="prev-my-scroll-bar" :autoshow="true">
                                 <el-tree
                                     class="filter-tree"
@@ -170,6 +173,7 @@
 export default {
     name: 'previeInform',
     props: {
+        houseDataNamesPeople: '',
         showrightPhone: false,
         houseDataNames: '',
         userType: '',
@@ -206,6 +210,7 @@ export default {
     computed: {},
     data() {
         return {
+            index: 99,
             showTreeHouse: false,
             showTreePeople: false,
             showTree: false,
@@ -224,6 +229,11 @@ export default {
     created() {},
     computed: {},
     methods: {
+        // 关闭弹框事件
+        closeDialog() {
+            this.showTreeHouse = false;
+            this.showTreePeople = false;
+        },
         // 关闭节点事件
         closeTree(e) {
             console.log('e', e);
@@ -235,13 +245,16 @@ export default {
         clickDetail(val) {
             this.showTree = !this.showTree;
             this.showTreeHouse = !this.showTreeHouse;
-            // if (val == 1) {
-            //     this.showTreePeople = !this.showTreePeople;
-            // }
+            this.showTreePeople = !this.showTreePeople;
+        },
+        clickDetailHouse(val) {
+            this.showTree = !this.showTree;
+            this.showTreeHouse = !this.showTreeHouse;
         },
         clickDetailPeople() {
             this.showTree = !this.showTree;
             this.showTreePeople = !this.showTreePeople;
+            // this.showTreeHouse = false;
         },
         filterNode(value, data) {
             if (!value) return true;
@@ -266,6 +279,7 @@ export default {
         }
     }
     .el-tree {
+        padding: 5px;
         .circle {
             display: block;
         }
@@ -452,7 +466,6 @@ export default {
                 // }
             }
             .prev-detail-right-two {
-                @extend .prev-detail-right;
                 top: 44px !important;
             }
         }

operationSupport/src/views/propertyManagement/inform.vue

@@ -47,7 +47,13 @@
             </div>
             <!-- 添加弹框 -->
             <div class="dialog-info">
-                <el-dialog :visible.sync="centerDialogVisible" width="1086px" :close-on-press-escape="false" :close-on-click-modal="false">
+                <el-dialog
+                    :visible.sync="centerDialogVisible"
+                    @close="handleDialogClose"
+                    width="1086px"
+                    :close-on-press-escape="false"
+                    :close-on-click-modal="false"
+                >
                     <div class="dialog">
                         <div class="dialog-header">
                             <i class="el-dialog__close el-icon el-icon-close" @click="dialogButton('clear')"></i>
@@ -240,8 +246,9 @@
                                         :houseData="houseData"
                                         :peopleData="peopleData"
                                         :houseDataNames="houseDataNames"
+                                        :houseDataNamesPeople="houseDataNamesPeople"
                                         :userType="userType"
-                                        ref="filterHouse"
+                                        ref="previeInform"
                                     ></previe-inform>
                                 </div>
                             </div>
@@ -454,6 +461,7 @@ export default {
             // 获取的房间信息
             houseData: [],
             houseDataNames: '',
+            houseDataNamesPeople: '',
             peopleData: [],
             userType: '',
             // 选中的房间
@@ -492,6 +500,11 @@ export default {
     mounted() {},
     watch: {},
     methods: {
+        // 弹框关闭事件
+        handleDialogClose(e) {
+            console.log('handleDialogClose=========', e);
+            this.$refs.previeInform.closeDialog();
+        },
         // 人员树
         // dataPeople(data) {
         //     this.peopleData = data;
@@ -556,7 +569,7 @@ export default {
                 .get('/sc-community/assets/tree/community/find', { buildingType: this.buildingType })
                 .then(({ status, data, msg }) => {
                     if (status === 0 && data) {
-                        this.$refs.selectTreeHouse.filterhouse(val, data);
+                        // this.$refs.selectTreeHouse.filterhouse(val, data);
                         // this.ruleForm.issueRoom.checkAll = true;
                         // this.ruleForm.issueRoom.radioRoom = '全部房间';
                         // this.ruleForm.issueRoom.radioStaff = '';
@@ -674,7 +687,6 @@ export default {
             this.centerDialogVisible = true;
             this.$refs.upImages.clearImageList('');
             this.$refs.endit.setContent('');
-
             console.log('发布活动类型', val);
         },
         // 清空
@@ -918,7 +930,7 @@ export default {
                     this.peopleData = data;
                     this.filterPeople(this.peopleData);
                     this.filterPeopleName(this.peopleData);
-                    this.houseDataNames = this.PeopleNames.toString();
+                    this.houseDataNamesPeople = this.PeopleNames.toString();
                 } else {
                     this.$message(error, res.msg);
                 }
@@ -974,6 +986,7 @@ export default {
 
         /** 查看详情*/
         clickDatail(row) {
+            // 弹框关闭事件
             // this.rowDetail = [];
             this.$http.get('/sc-community-web/notice/find/' + row.id).then((res) => {
                 if (res.status === 0) {
@@ -1012,6 +1025,7 @@ export default {
                     this.contentHtml = res.data.content;
                     this.centerDialogVisible = true;
                     this.showDetail = false;
+                    this.$refs.previeInform.closeDialog();
                 } else {
                     return this.$message.error('获取详情失败！请稍后重试');
                 }

operationSupport/src/views/workbench/index.vue

@@ -204,6 +204,7 @@
                 :title="rowDetail.type == 0 ? '物业通知详情' : '社区活动详情'"
                 :close-on-press-escape="true"
                 :close-on-click-modal="true"
+                @close="handleDialogClose"
             >
                 <previe-inform
                     :dataDetail="rowDetail"
@@ -212,7 +213,8 @@
                     :houseData="houseData"
                     :peopleData="peopleData"
                     :houseDataNames="houseDataNames"
-                    ref="filterHouse"
+                    :houseDataNamesPeople="houseDataNamesPeople"
+                    ref="previeInform"
                     :showrightPhone="showrightPhone"
                     :userType="userType"
                 ></previe-inform>
@@ -237,7 +239,8 @@ export default {
             showRight: false,
             PeopleNames: '',
             houseDataNames: '',
-            userType: ''
+            userType: '',
+            houseDataNamesPeople: ''
         };
     },
     created() {
@@ -248,6 +251,11 @@ export default {
     },
 
     methods: {
+        // 弹框关闭事件
+        handleDialogClose(e) {
+            console.log('弹框关闭事件', e);
+            this.$refs.previeInform.closeDialog();
+        },
         /** 查看通知公告详情*/
         clickDatail(val) {
             // this.rowDetail = [];
@@ -332,7 +340,7 @@ export default {
                     this.peopleData = data;
                     this.filterPeople(this.peopleData);
                     this.filterPeopleName(this.peopleData);
-                    this.houseDataNames = this.PeopleNames.toString();
+                    this.houseDataNamesPeople = this.PeopleNames.toString();
                 } else {
                     this.$message(warning, '获取人员失败,请稍后重试');
                 }