修改物业管理详情显示

operationSupport/src/components/Tinymce/plugins.js

@@ -6,7 +6,7 @@
 // ];
 
 // const plugins = ['fullscreen'];
-const plugins = ['  colorpicker contextmenu directionality  fullscreen hr ', 'textcolor textpattern visualblocks visualchars wordcount'];
+const plugins = ['  colorpicker contextmenu directionality  fullscreen  ', 'textcolor textpattern visualblocks visualchars wordcount'];
 // const plugins = ['fullscreen save searchreplace spellchecker tabfocus template textcolor'];
 
 export default plugins;

operationSupport/src/components/common/treeHouse.vue

@@ -5,7 +5,7 @@
                 <el-input v-model="filterText" v-if="!showCheckboxTree" placeholder="请输入关键字" suffix-icon="el-icon-search"></el-input>
                 <el-input
                     v-model="selectHouse"
-                    disabled
+                    :disabled="disabledHouse"
                     placeholder="选择的房间"
                     maxlength="10"
                     suffix-icon="el-icon-search"
@@ -41,6 +41,7 @@
                     :data="dataPeopleList"
                     ref="treePeople"
                     node-key="id"
+                    :disabled="disabledPeople"
                     :highlight-current="true"
                     :props="defaultPropsPeople"
                     :expand-on-click-node="false"
@@ -69,6 +70,14 @@ export default {
             type: Boolean,
             default: false
         },
+        disabledHouse: {
+            type: Boolean,
+            default: true
+        },
+        disabledPeople: {
+            type: Boolean,
+            default: true
+        },
         defaultExpandAllTree: {
             //是否默认展开所有节点
             type: Boolean,

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

@@ -5,16 +5,15 @@
                 <span>所属社区: </span><span class="text-right">{{ dataDetail.communityName }}</span>
             </div>
             <!-- <div class="prev-text detail">
-                <div>发布对象:{{ dataDetail.treeData }}</div>
-                <div>发布对象:{{ houseData }}</div>
+                <div>发布对象:{{ dataDetail.houseDataName }}</div>
                 <div class="detail-right">
                     <el-tree
                         class="filter-tree"
-                        ref="filterPeople"
+                        ref="filterHouse"
                         node-key="id"
                         :data="houseData"
                         :props="defaultProps"
-                        default-expand-all
+                        :default-expand-all="false"
                         :filter-node-method="filterNode"
                     >
                     </el-tree>
@@ -95,17 +94,8 @@ export default {
     },
     watch: {
         filterText(val) {
-            this.$refs.filterPeople.filter(val);
-        },
-        dataDetail(val) {
-            val.treeData;
+            this.$refs.filterHouse.filter(val);
         }
-        // detailPeople(val) {
-        //     console.log('====================================');
-        //     this.filterPeople(val);
-        //     console.log('detailPeople', val);
-        //     console.log('====================================');
-        // }
     },
     computed: {},
     data() {
@@ -122,47 +112,11 @@ export default {
             treeArr: []
         };
     },
-    created() {
-        // this.getPeopleList();
-        // this.getOrgTreeList();
-    },
+    created() {},
     computed: {},
 
     methods: {
-        filterPeople(dataSource, currentArr) {
-            // console.log('dataSource', JSON.stringify(dataSource));
-            // console.log('currnArr', JSON.stringify(currentArr));
-            dataSource.forEach((t, i) => {
-                currentArr.forEach((x, xIndex) => {
-                    if (t.id === x.userId) {
-                        if (!this.treeArr.find((x2) => x2.id === t.id)) {
-                            this.treeArr.push({ id: t.id, label: t.label });
-                        }
-                    } else {
-                        if (Array.isArray(t.children) && t.children.length > 0) {
-                            this.filterPeople(t.children, currentArr);
-                        }
-                    }
-                });
-            });
-        },
-
-        // 获取房间
-        // getOrgTreeList() {
-        //     this.$http
-        //         .get('/sc-community/assets/tree/community/find', { buildingType: this.buildingType })
-        //         .then(({ status, data, msg }) => {
-        //             if (status === 0 && data) {
-        //                 this.organList = data;
-        //             }
-        //             // console.log('获取房间', data);
-        //         });
-        // },
         filterNode(value, data) {
-            // console.log('====================================');
-            // console.log('filterNode  value', value);
-            // console.log('filterNode  data', data.id);
-            // console.log('====================================');
             if (!value) return true;
             return data.label.indexOf(value) !== -1;
         }

operationSupport/src/views/propertyManagement/inform.vue

@@ -105,7 +105,7 @@
                                                         :accordion="true"
                                                         :selectAll="true"
                                                         @selectData="selectDataHouseTree"
-                                                        :houseData="houseData"
+                                                        :disabledHouse="disabledHouse"
                                                         ref="selectTreeHouse"
                                                     ></tree-house>
                                                 </div>
@@ -138,6 +138,7 @@
                                                         :selectAll="true"
                                                         @dataPeople="dataPeople"
                                                         @selectPeople="selectPeople"
+                                                        :disabled="disabledPeople"
                                                     ></tree-house>
                                                 </div>
                                             </div>
@@ -234,6 +235,8 @@
                                         :dataDetail="rowDetail"
                                         :filePath="filePath"
                                         :successImageLists="successImageLists"
+                                        :houseData="houseData"
+                                        ref="filterHouse"
                                     ></previe-inform>
                                 </div>
                             </div>
@@ -323,6 +326,8 @@ export default {
     data() {
         let _this = this;
         return {
+            disabledHouse: true,
+            disabledPeople: true,
             organList: [],
             popCommunityName: '',
             fileList: [],
@@ -839,20 +844,32 @@ export default {
             arr.map((item, index) => {
                 if (item.children) {
                     this.dimension(item.children);
-                } else {
-                    if (item.type == 'room' && !this.CheckChinese(item.value)) {
-                        arr.splice(index, 1);
-                    }
+                } else if (item.type == 'room') {
+                    this.filterArr(arr, item, index);
                 }
             });
         },
-
-        CheckChinese(val) {
-            return this.rowDetail.treeData.includes(Number(val));
+        filterArr(arr, item, index) {
+            if (!this.rowDetail.treeData.includes(Number(item.value))) {
+                arr.splice(index, 1);
+                arr.map((item) => {
+                    this.filterArr(arr, item, index);
+                });
+            }
+        },
+        filterName(arr) {
+            var name = '';
+            arr.map((item) => {
+                if (item.children) {
+                    this.filterName(item.children);
+                } else {
+                    name.concat(+',' + item.name);
+                }
+            });
+            return name;
         },
         // 获取房间
         getOrgTreeList() {
-            debugger;
             this.$http
                 .get('/sc-community/assets/tree/community/find', { buildingType: this.buildingType })
                 .then(({ status, data, msg }) => {
@@ -860,6 +877,7 @@ export default {
                         console.log('houseData=1', this.houseData);
                         this.houseData = data;
                         this.dimension(this.houseData);
+                        this.rowDetail.houseDataName = this.filterName(this.houseData);
                         console.log('====================================');
                         console.log('houseData=2', this.houseData);
                         console.log('====================================');
@@ -876,6 +894,7 @@ export default {
                     this.getOrgTreeList();
                     // this.filterHouse(this.organList, res.data.noticeUserVoList);
                     this.rowDetail = res.data;
+                    this.rowDetail.treeData = JSON.parse(res.data.treeData);
                     // let fileArr = row.filePath.split(',');
                     // this.filePath = fileArr.slice(0, fileArr.length - 1);
                     this.filePath = JSON.parse(res.data.filePath);

operationSupport/src/views/propertyManagement/style.scss

@@ -419,10 +419,12 @@ $fontSizeSmall: 14px;
                     }
                     .radio-room {
                         margin-right: 10px;
+                        width: 60%;
                     }
                     .selet-room {
                         display: flex;
                         justify-content: end;
+                        width: 30%;
                         /deep/ .el-input__inner {
                             // margin-left: 10px;
                             width: 275px;

operationSupport/vue.config.js

@@ -16,7 +16,7 @@ module.exports = {
     publicPath: process.env.NODE_ENV === 'sit' ? '/sc-operation' : '/',
     productionSourceMap: false,
     filenameHashing: false,
-    chainWebpack: config => {
+    chainWebpack: (config) => {
         // 配置别名
         config.resolve.alias
             .set('@', resolve('src'))
@@ -31,11 +31,11 @@ module.exports = {
             .use('style-vw-loader')
             .loader('style-vw-loader')
             .options({
-                viewportWidth: 1920,//传参
-            })
+                viewportWidth: 1920 //传参
+            });
         // 配置每次打包浏览器缓存文件名的随机性
-        const filename = path.posix.join('js', `${new Date().getTime()}_[name].js`);
-        config.mode('production').devtool(false).output.filename(filename).chunkFilename(filename)
+        // const filename = path.posix.join('js', `${new Date().getTime()}_[name].js`);
+        // config.mode('production').devtool(false).output.filename(filename).chunkFilename(filename)
     },
     // 配置全局样式变量
     css: {
@@ -58,11 +58,11 @@ module.exports = {
             //         resources: path.relative(__dirname, '../src/assets/css/punlic-style.scss')
             //     }
             // })
-        },
-        extract: { // 打包后css文件名称添加时间戳
-            filename: `css/[name].${new Date().getTime()}.css`,
-            chunkFilename: `css/chunk.[id].${new Date().getTime()}.css`,
         }
+        // extract: { // 打包后css文件名称添加时间戳
+        //     filename: `css/[name].${new Date().getTime()}.css`,
+        //     chunkFilename: `css/chunk.[id].${new Date().getTime()}.css`,
+        // }
     },
     configureWebpack: {
         externals: {
@@ -88,7 +88,7 @@ module.exports = {
                 ws: true, // 代理的WebSockets
                 changeOrigin: true, // 允许websockets跨域
                 pathRewrite: {
-                    //  "^/sc-user-auth": "" 
+                    //  "^/sc-user-auth": ""
                 }
             },
             '/sc-user-center': {
@@ -97,7 +97,7 @@ module.exports = {
                 changeOrigin: true, // 允许websockets跨域
                 logLevel: 'debug',
                 pathRewrite: {
-                    //  "^/sc-user-center": "" 
+                    //  "^/sc-user-center": ""
                 }
             },
             '/sc-community': {
@@ -144,30 +144,30 @@ module.exports = {
                 pathRewrite: {
                     // "^/zoniot-water": ""
                 }
-            },
+            }
         }
     },
     pluginOptions: {
-        "postcss-import": {},
-        "postcss-url": {},
-        "postcss-aspect-ratio-mini": {},
-        "postcss-write-svg": {
+        'postcss-import': {},
+        'postcss-url': {},
+        'postcss-aspect-ratio-mini': {},
+        'postcss-write-svg': {
             utf8: false
         },
-        "postcss-cssnext": {},
-        "postcss-px-to-viewport": {
-            viewportWidth: 1920,     //  视窗的宽度，对应的是我们设计稿的宽度，移动端一般是750，如果是pc端那就是类似1920这样的尺寸
-            viewportHeight: 1080,    // 视窗的高度，移动端一般指定1334，也可以不配置
-            unitPrecision: 3,       // 指定`px`转换为视窗单位值的小数位数（很多时候无法整除）
-            viewportUnit: 'vw',    // 指定需要转换成的视窗单位，建议使用vw
+        'postcss-cssnext': {},
+        'postcss-px-to-viewport': {
+            viewportWidth: 1920, //  视窗的宽度，对应的是我们设计稿的宽度，移动端一般是750，如果是pc端那就是类似1920这样的尺寸
+            viewportHeight: 1080, // 视窗的高度，移动端一般指定1334，也可以不配置
+            unitPrecision: 3, // 指定`px`转换为视窗单位值的小数位数（很多时候无法整除）
+            viewportUnit: 'vw', // 指定需要转换成的视窗单位，建议使用vw
             //   selectorBlackList: ['.ignore', '.hairlines'],  // 指定不转换为视窗单位的类，可以自定义，可以无限添加,建议定义一至两个通用的类名
-            minPixelValue: 1,      // 小于或等于`1px`不转换为视窗单位，你也可以设置为你想要的值
-            mediaQuery: false      // 允许在媒体查询中转换`px`
+            minPixelValue: 1, // 小于或等于`1px`不转换为视窗单位，你也可以设置为你想要的值
+            mediaQuery: false // 允许在媒体查询中转换`px`
         },
-        "postcss-viewport-units": {},
-        "cssnano": {
-            preset: "default", // 设置成default将不会启用autoprefixer
-            "postcss-zindex": false
+        'postcss-viewport-units': {},
+        cssnano: {
+            preset: 'default', // 设置成default将不会启用autoprefixer
+            'postcss-zindex': false
         }
     }
 };