Parcourir la source

修改物业管理-物业电话输入框宽度

DESKTOP-4G80JF4\long il y a 3 ans
Parent
commit
8a742109ad

+ 34 - 34
operationSupport/package-lock.json

@@ -63,7 +63,7 @@
         },
         "ms": {
           "version": "2.1.2",
-          "resolved": "https://registry.npmmirror.com/ms/download/ms-2.1.2.tgz",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.2.tgz",
           "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
           "dev": true
         },
@@ -983,7 +983,7 @@
         },
         "ms": {
           "version": "2.1.2",
-          "resolved": "https://registry.npmmirror.com/ms/download/ms-2.1.2.tgz",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.2.tgz",
           "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
           "dev": true
         }
@@ -2083,7 +2083,7 @@
       "dependencies": {
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.nlark.com/source-map/download/source-map-0.6.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
           "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         }
@@ -3456,7 +3456,7 @@
       "dependencies": {
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.nlark.com/source-map/download/source-map-0.6.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
           "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         }
@@ -3493,7 +3493,7 @@
         },
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1601839122515&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
           "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
           "dev": true,
           "requires": {
@@ -3523,7 +3523,7 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz?cache=0&sync_timestamp=1566248870121&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcolor-convert%2Fdownload%2Fcolor-convert-2.0.1.tgz",
           "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
           "dev": true,
           "requires": {
@@ -3544,7 +3544,7 @@
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
           "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
           "dev": true
         },
@@ -3576,7 +3576,7 @@
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/download/supports-color-7.2.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1598611709087&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
           "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
           "dev": true,
           "requires": {
@@ -4431,7 +4431,7 @@
         },
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.nlark.com/source-map/download/source-map-0.6.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
           "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         }
@@ -5087,7 +5087,7 @@
       "dependencies": {
         "memory-fs": {
           "version": "0.5.0",
-          "resolved": "https://registry.nlark.com/memory-fs/download/memory-fs-0.5.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/memory-fs/download/memory-fs-0.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmemory-fs%2Fdownload%2Fmemory-fs-0.5.0.tgz",
           "integrity": "sha1-MkwBKIuIZSlm0WHbd4OHIIRajjw=",
           "dev": true,
           "requires": {
@@ -8966,7 +8966,7 @@
         },
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.nlark.com/source-map/download/source-map-0.6.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
           "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         }
@@ -9722,7 +9722,7 @@
       "dependencies": {
         "postcss-value-parser": {
           "version": "3.3.1",
-          "resolved": "https://registry.npmmirror.com/postcss-value-parser/download/postcss-value-parser-3.3.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-3.3.1.tgz",
           "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
           "dev": true
         }
@@ -10114,7 +10114,7 @@
       "dependencies": {
         "jsesc": {
           "version": "0.5.0",
-          "resolved": "https://registry.nlark.com/jsesc/download/jsesc-0.5.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/jsesc/download/jsesc-0.5.0.tgz",
           "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
           "dev": true
         }
@@ -10985,7 +10985,7 @@
       "dependencies": {
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.nlark.com/source-map/download/source-map-0.6.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
           "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         }
@@ -12496,7 +12496,7 @@
       "dependencies": {
         "anymatch": {
           "version": "2.0.0",
-          "resolved": "https://registry.nlark.com/anymatch/download/anymatch-2.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/anymatch/download/anymatch-2.0.0.tgz",
           "integrity": "sha1-vLJLTzeTTZqnrBe0ra+J58du8us=",
           "dev": true,
           "optional": true,
@@ -12519,7 +12519,7 @@
         },
         "binary-extensions": {
           "version": "1.13.1",
-          "resolved": "https://registry.nlark.com/binary-extensions/download/binary-extensions-1.13.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.13.1.tgz",
           "integrity": "sha1-WYr+VHVbKGilMw0q/51Ou1Mgm2U=",
           "dev": true,
           "optional": true
@@ -12557,7 +12557,7 @@
         },
         "chokidar": {
           "version": "2.1.8",
-          "resolved": "https://registry.npmmirror.com/chokidar/download/chokidar-2.1.8.tgz",
+          "resolved": "https://registry.npm.taobao.org/chokidar/download/chokidar-2.1.8.tgz?cache=0&sync_timestamp=1602585381749&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-2.1.8.tgz",
           "integrity": "sha1-gEs6e2qZNYw8XGHnHYco8EHP+Rc=",
           "dev": true,
           "optional": true,
@@ -12613,7 +12613,7 @@
         },
         "glob-parent": {
           "version": "3.1.0",
-          "resolved": "https://registry.npmmirror.com/glob-parent/download/glob-parent-3.1.0.tgz?cache=0&sync_timestamp=1632953697891&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-3.1.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/glob-parent/download/glob-parent-3.1.0.tgz",
           "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
           "dev": true,
           "optional": true,
@@ -12624,7 +12624,7 @@
           "dependencies": {
             "is-glob": {
               "version": "3.1.0",
-              "resolved": "https://registry.npmmirror.com/is-glob/download/is-glob-3.1.0.tgz",
+              "resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-3.1.0.tgz",
               "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
               "dev": true,
               "optional": true,
@@ -12636,7 +12636,7 @@
         },
         "is-binary-path": {
           "version": "1.0.1",
-          "resolved": "https://registry.nlark.com/is-binary-path/download/is-binary-path-1.0.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-1.0.1.tgz",
           "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
           "dev": true,
           "optional": true,
@@ -12697,7 +12697,7 @@
         },
         "readdirp": {
           "version": "2.2.1",
-          "resolved": "https://registry.nlark.com/readdirp/download/readdirp-2.2.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/readdirp/download/readdirp-2.2.1.tgz?cache=0&sync_timestamp=1602584331621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freaddirp%2Fdownload%2Freaddirp-2.2.1.tgz",
           "integrity": "sha1-DodiKjMlqjPokihcr4tOhGUppSU=",
           "dev": true,
           "optional": true,
@@ -12890,7 +12890,7 @@
         },
         "schema-utils": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmmirror.com/schema-utils/download/schema-utils-1.0.0.tgz?cache=0&sync_timestamp=1637075997986&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-1.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz",
           "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=",
           "dev": true,
           "requires": {
@@ -13041,7 +13041,7 @@
       "dependencies": {
         "anymatch": {
           "version": "2.0.0",
-          "resolved": "https://registry.nlark.com/anymatch/download/anymatch-2.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/anymatch/download/anymatch-2.0.0.tgz",
           "integrity": "sha1-vLJLTzeTTZqnrBe0ra+J58du8us=",
           "dev": true,
           "requires": {
@@ -13062,7 +13062,7 @@
         },
         "binary-extensions": {
           "version": "1.13.1",
-          "resolved": "https://registry.nlark.com/binary-extensions/download/binary-extensions-1.13.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.13.1.tgz",
           "integrity": "sha1-WYr+VHVbKGilMw0q/51Ou1Mgm2U=",
           "dev": true
         },
@@ -13097,7 +13097,7 @@
         },
         "chokidar": {
           "version": "2.1.8",
-          "resolved": "https://registry.npmmirror.com/chokidar/download/chokidar-2.1.8.tgz",
+          "resolved": "https://registry.npm.taobao.org/chokidar/download/chokidar-2.1.8.tgz?cache=0&sync_timestamp=1602585381749&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-2.1.8.tgz",
           "integrity": "sha1-gEs6e2qZNYw8XGHnHYco8EHP+Rc=",
           "dev": true,
           "requires": {
@@ -13159,7 +13159,7 @@
         },
         "glob-parent": {
           "version": "3.1.0",
-          "resolved": "https://registry.npmmirror.com/glob-parent/download/glob-parent-3.1.0.tgz?cache=0&sync_timestamp=1632953697891&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-3.1.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/glob-parent/download/glob-parent-3.1.0.tgz",
           "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
           "dev": true,
           "requires": {
@@ -13169,7 +13169,7 @@
           "dependencies": {
             "is-glob": {
               "version": "3.1.0",
-              "resolved": "https://registry.npmmirror.com/is-glob/download/is-glob-3.1.0.tgz",
+              "resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-3.1.0.tgz",
               "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
               "dev": true,
               "requires": {
@@ -13180,13 +13180,13 @@
         },
         "is-absolute-url": {
           "version": "3.0.3",
-          "resolved": "https://registry.nlark.com/is-absolute-url/download/is-absolute-url-3.0.3.tgz?cache=0&sync_timestamp=1628691761253&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-absolute-url%2Fdownload%2Fis-absolute-url-3.0.3.tgz",
+          "resolved": "https://registry.npm.taobao.org/is-absolute-url/download/is-absolute-url-3.0.3.tgz?cache=0&sync_timestamp=1569736493122&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-absolute-url%2Fdownload%2Fis-absolute-url-3.0.3.tgz",
           "integrity": "sha1-lsaiK2ojkpsR6gr7GDbDatSl1pg=",
           "dev": true
         },
         "is-binary-path": {
           "version": "1.0.1",
-          "resolved": "https://registry.nlark.com/is-binary-path/download/is-binary-path-1.0.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-1.0.1.tgz",
           "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
           "dev": true,
           "requires": {
@@ -13242,13 +13242,13 @@
         },
         "ms": {
           "version": "2.1.2",
-          "resolved": "https://registry.npmmirror.com/ms/download/ms-2.1.2.tgz",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.2.tgz",
           "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
           "dev": true
         },
         "readdirp": {
           "version": "2.2.1",
-          "resolved": "https://registry.nlark.com/readdirp/download/readdirp-2.2.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/readdirp/download/readdirp-2.2.1.tgz?cache=0&sync_timestamp=1602584331621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freaddirp%2Fdownload%2Freaddirp-2.2.1.tgz",
           "integrity": "sha1-DodiKjMlqjPokihcr4tOhGUppSU=",
           "dev": true,
           "requires": {
@@ -13259,7 +13259,7 @@
         },
         "schema-utils": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmmirror.com/schema-utils/download/schema-utils-1.0.0.tgz?cache=0&sync_timestamp=1637075997986&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-1.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz",
           "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=",
           "dev": true,
           "requires": {
@@ -13270,13 +13270,13 @@
         },
         "semver": {
           "version": "6.3.0",
-          "resolved": "https://registry.nlark.com/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1622604551741&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1589682805026&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz",
           "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=",
           "dev": true
         },
         "supports-color": {
           "version": "6.1.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/download/supports-color-6.1.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&sync_timestamp=1598611709087&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
           "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
           "dev": true,
           "requires": {

+ 12 - 2
operationSupport/src/components/common/buildingTree.vue

@@ -46,7 +46,7 @@
                     @node-click="treeClick"
                     @check="clickCheckTreePeople"
                     :default-expand-all="defaultExpandAllTree"
-                    :filter-node-method="filterNode"
+                    :filter-node-method="filterNodePeople"
                     :show-checkbox="showCheckboxTree"
                     :accordion="accordionPeople"
                     :selectAll="selectAll"
@@ -116,6 +116,12 @@ export default {
     watch: {
         filterText(val) {
             this.$refs.tree.filter(val);
+        },
+        dataPeopleList(val) {
+            console.log('====================================');
+            console.log('dataPeopleList', val);
+            console.log('====================================');
+            this.$refs.tree.filter(val);
         }
     },
     computed: {},
@@ -243,8 +249,8 @@ export default {
                 .get('/sc-community/assets/tree/community/find', { buildingType: this.buildingType })
                 .then(({ status, data, msg }) => {
                     if (status === 0 && data) {
-                        this.dimension(data);
                         this.organList = data;
+                        this.dimension(data);
                         this.$nextTick().then(() => {
                             const firstNode = document.querySelector('.el-tree-node');
                             firstNode.click();
@@ -256,6 +262,10 @@ export default {
             if (!value) return true;
             return data.name.indexOf(value) !== -1;
         },
+        filterNodePeople(value, data) {
+            if (!value) return true;
+            return data.label.indexOf(value) !== -1;
+        },
         treeClick(e) {
             if (e.value == 0) return;
             let onData = '';

+ 98 - 23
operationSupport/src/views/propertyManagement/common/previeInform.vue

@@ -6,19 +6,18 @@
             </div>
             <!-- <div class="prev-text detail">
                 <div>发布对象:</div>
-                <div class="detail-right">
-                    <building-tree
+                <div class="detail-right" v-if="showTree">
+                    <el-tree
+                        class="filter-tree"
                         ref="filterPeople"
-                        :buildingType="1"
-                        :prevDetailData="dataDetail.noticeUserVoList"
-                        :defaultExpandAllTree="false"
-                        :showHouseTree="false"
-                        :accordionPeople="true"
-                        :selectAll="true"
-                        @filterPeople="filterPeople"
-                    ></building-tree>
-                    <div>查看详情</div>
+                        :data="detailPeople"
+                        :props="defaultProps"
+                        default-expand-all
+                        :filter-node-method="filterNode"
+                    >
+                    </el-tree>
                 </div>
+                <div>查看详情</div>
             </div> -->
             <div class="prev-text">
                 <span>通知类型: </span
@@ -30,7 +29,7 @@
             <div class="prev-text">
                 <span>是否紧急:</span><span class="text-right">{{ dataDetail.urgentFlag ? '是' : '否' }}</span>
             </div>
-            <div class="prev-text image-content">
+            <div class="prev-text image-content" v-if="dataDetail.type">
                 <div class="image-text">主题图片:</div>
                 <div class="right-image">
                     <img v-for="(item, index) of successImageLists" :key="index" :src="item.url" alt="" />
@@ -66,6 +65,13 @@ export default {
                 return {};
             }
         },
+        detailPeople: {
+            type: Array,
+            default() {
+                return {};
+            }
+        },
+
         filePath: {
             type: Array,
             default() {
@@ -79,14 +85,79 @@ export default {
             }
         }
     },
-
+    watch: {
+        filterText(val) {
+            this.$refs.filterPeople.filter(val);
+        },
+        dataDetail(val) {
+            console.log('====================================');
+            console.log('dataDetail', val);
+            console.log('====================================');
+        }
+    },
+    computed: {},
     data() {
-        return {};
+        return {
+            filterText: '222',
+            dataPeopleList: [],
+            showTree: false,
+            defaultProps: {
+                children: 'children',
+                label: 'userId'
+            }
+        };
     },
-
-    methods: {},
     created() {
-        this.$refs.filterPeople();
+        // this.getPeopleList();
+    },
+    methods: {
+        dimension(arr, arrs) {
+            // var arrs = arrss.noticeUserVoList;
+            // var arrs = [
+            //     {
+            //         userType: 1,
+            //         userId: 472,
+            //         noticeId: 66
+            //     },
+            //     {
+            //         userType: 1,
+            //         userId: 410,
+            //         noticeId: 66
+            //     }
+            // ];
+            // arr.map((item, index) => {
+            //     if (item.children) {
+            //         this.dimension(item.children);
+            //     } else {
+            //         for (let index = 0; index < arrs.length; index++) {
+            //             let userId = arrs[index].userId;
+            //             if (item.id === userId) {
+            //                 this.detailPeople.push(item.label);
+            //             }
+            //         }
+            //     }
+            // });
+            console.log('====================================');
+            console.log('dimension', this.detailPeople);
+            console.log('dimension', arrs);
+            console.log('====================================');
+        },
+        // 获取人员
+        // getPeopleList() {
+        //     this.$http.get('/sc-user-center/user/findUserList').then(({ status, data, msg }) => {
+        //         if (status === 0) {
+        //             this.dataPeopleList = data;
+        //             this.dimension(this.dataPeopleList, this.dataDetail.noticeUserVoList);
+        //         } else {
+        //             this.$message(warning, '获取人员失败,请稍后重试');
+        //         }
+        //         console.log('获取人员', this.dataDetail.noticeUserVoList);
+        //     });
+        // },
+        filterNode(value, data) {
+            if (!value) return true;
+            return data.label.indexOf(value) !== -1;
+        }
     }
 };
 </script>
@@ -98,22 +169,25 @@ export default {
         font-size: 12px;
         color: #424656;
         margin: 34px 20px;
-        :nth-child(2) {
-            text-align: end;
-        }
         .text-right {
-            padding-left: 3%;
+            margin-left: 25px;
         }
     }
     .detail {
         display: flex;
+        position: relative;
+        .detail-right {
+            position: absolute;
+            top: 0;
+            right: 0;
+        }
     }
     .files {
         display: flex;
     }
     .prev-text-none {
         font-size: 12px;
-        margin-left: 10%;
+        margin-left: 25px;
     }
     .image-content {
         width: 100%;
@@ -130,7 +204,7 @@ export default {
                 height: 100px;
                 border: 1px solid #ccc;
                 border-radius: 4px;
-                margin-left: 3%;
+                margin-left: 25px;
                 min-width: 100px;
             }
         }
@@ -156,6 +230,7 @@ export default {
         display: flex;
         width: 100%;
         .html-left {
+            margin-right: 5%;
         }
         .html-right {
             width: 86%;

+ 19 - 7
operationSupport/src/views/propertyManagement/inform.vue

@@ -176,7 +176,7 @@
                                                 :editable="false"
                                             ></el-date-picker>
                                         </el-form-item>
-                                        <el-form-item label="主体图片" prop="image" v-show="showUploadImage">
+                                        <el-form-item label="主体图片" prop="image" v-if="showUploadImage">
                                             <div class="up-image">
                                                 <up-image
                                                     color="#1890ff"
@@ -230,6 +230,7 @@
                                         :dataDetail="rowDetail"
                                         :filePath="filePath"
                                         :successImageLists="successImageLists"
+                                        :detailPeople="detailPeople"
                                     ></previe-inform>
                                 </div>
                             </div>
@@ -317,6 +318,7 @@ export default {
         let _this = this;
         return {
             popCommunityName: '',
+            detailPeople: [],
             fileList: [],
             // 显示图片上传
             showUploadImage: false,
@@ -586,14 +588,14 @@ export default {
                 this.ruleForm.issueRoom.radioRoom = '全部房间';
             }
         },
-        // 选择房间选框变化
+        // 选择房间选框变化
         changeCheckboxRoom(val) {
             if (val) {
-                this.$refs.selectTreeHouse.selectAllHouse();
                 this.ruleForm.issueRoom.staff = false;
                 this.ruleForm.issueRoom.checkAll = true;
                 this.ruleForm.issueRoom.radioRoom = '全部房间';
                 this.ruleForm.issueRoom.radioStaff = '';
+                this.$refs.selectTreeHouse.selectAllHouse();
             }
         },
         // 指定员工
@@ -633,16 +635,26 @@ export default {
         clear() {
             this.rowDetail = '';
             this.showUploadImage = false;
+            this.ruleForm.issueRoom.staff = false;
+            this.ruleForm.issueRoom.checkAll = false;
+            // this.showDetail = false;
             this.filePath = '';
             this.uploadFileUrl = '';
             this.fileList = [];
+            this.ruleForm.exigencyText = true;
             this.$refs.endit.setContent(this.contents);
         },
         /**添加按钮 */
         add() {
             this.centerDialogVisible = true;
             this.showDetail = true;
-            this.clear();
+            this.rowDetail = '';
+            this.showUploadImage = false;
+            this.ruleForm.issueRoom.checkAll = true;
+            this.filePath = '';
+            this.uploadFileUrl = '';
+            this.fileList = [];
+            this.$refs.endit.setContent(this.contents);
             this.$refs.upImages.clearImageList();
             this.$refs['ruleForm'].resetFields();
         },
@@ -741,17 +753,17 @@ export default {
         },
         /** 查看详情*/
         clickDatail(row) {
-            this.rowDetail = [];
+            // this.rowDetail = [];
             this.$http.get('/sc-community-web/notice/find/' + row.id).then((res) => {
                 if (res.status === 0) {
-                    this.centerDialogVisible = true;
-                    this.showDetail = false;
                     this.rowDetail = res.data;
                     // let fileArr = row.filePath.split(',');
                     // this.filePath = fileArr.slice(0, fileArr.length - 1);
                     this.filePath = JSON.parse(row.filePath);
                     this.successImageLists = JSON.parse(row.themePictrue);
                     this.contentHtml = row.content;
+                    this.centerDialogVisible = true;
+                    this.showDetail = false;
                     console.log('查看详情', res);
                 } else {
                     return this.$message('获取详情失败!请稍后重试');

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

@@ -50,7 +50,7 @@
                         <div class="dialog-header">
                             <i class="el-dialog__close el-icon el-icon-close" @click="dialogButton('clear')"></i>
                             <div class="dialogTitle">
-                                添加物业电话1(
+                                添加物业电话(
                                 <span style="color: red"> *</span>
                                 为必填项)
                             </div>

+ 6 - 0
operationSupport/src/views/propertyManagement/style.scss

@@ -260,6 +260,12 @@ $fontSizeSmall: 14px;
         /deep/ .el-select > .el-input{
             width: 324px;
         }
+        /deep/ .el-select,.dialog-select,.el-select--small{
+            width: 100% !important;
+        }
+        /deep/ .el-input,.l-input--small,.el-input--suffix{
+            width: 100% !important;
+        }
        /deep/ .el-upload{
             width: 92px !important;
             height: 30px !important;