Browse Source

修改物业管理弹框提示模块

D4THYL3\long 3 years ago
parent
commit
65b479bd07

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

@@ -2,7 +2,7 @@
     <div class="organ-tree">
         <div v-show="showHouseTree">
             <el-input v-model="filterText" v-if="!showCheckboxTree" placeholder="请输入关键字" suffix-icon="el-icon-search"></el-input>
-            <el-input v-model="selectHouse" placeholder="选择房间" maxlength="10" suffix-icon="el-icon-search"></el-input>
+            <el-input v-model="selectHouse" placeholder="选择房间" maxlength="10" suffix-icon="el-icon-search" v-else></el-input>
             <div class="tree-style-box no-scrollbar">
                 <el-tree
                     class="tree-style"

+ 7 - 2
operationSupport/src/views/propertyManagement/common/previeInform.vue

@@ -18,7 +18,12 @@
             <div class="prev-text">
                 <span>是否紧急:</span><span class="text-right">{{ dataDetail.urgentFlag ? '是' : '否' }}</span>
             </div>
-            <div class="prev-text"><span>通知内容:</span><span class="text-right" v-html="dataDetail.content"></span></div>
+            <!-- <div class="prev-text"><span>主题图片:</span>
+            <img src="" alt="">
+            </div> -->
+            <div class="prev-text">
+                <span>通知内容:</span><span class="text-right"><div v-html="dataDetail.content"></div></span>
+            </div>
             <div class="prev-text files">
                 <div style="margin-right: 25px">文件上传:</div>
                 <div v-if="filePath" style="display: flex">
@@ -61,7 +66,7 @@ export default {
     .prev-text {
         font-size: 12px;
         color: #424656;
-        margin: 34px;
+        margin: 34px 20px;
         :nth-child(2) {
             text-align: end;
         }

+ 18 - 12
operationSupport/src/views/propertyManagement/inform.vue

@@ -126,7 +126,6 @@
                                                     </el-radio-group>
                                                 </div>
                                                 <div class="selet-room" v-show="ruleForm.issueRoom.staff">
-                                                    <!-- @buildingInformation="buildingInformation" -->
                                                     <building-tree
                                                         ref="selectTreePeoples"
                                                         :buildingType="1"
@@ -257,6 +256,7 @@
                                     </el-form>
                                 </div>
                                 <div v-else>
+                                    <!-- 详情显示 -->
                                     <previe-inform :dataDetail="rowDetail" :filePath="filePath"></previe-inform>
                                 </div>
                             </div>
@@ -288,10 +288,10 @@
                                             </div>
                                             <!-- <div><img style="width: 100px; height: 100px" :src="imageUrl" alt="" /></div> -->
                                             <div class="content-inform">
-                                                <div>{{ !showDetail ? rowDetail.communityName : popCommunityName }}</div>
+                                                <!-- <div>{{ !showDetail ? rowDetail.communityName : popCommunityName }}</div>
                                                 <div v-if="rowDetail">{{ rowDetail.pubDate }}</div>
                                                 <div v-else>{{ new Date() | filterTime }}</div>
-                                                <div>物业电话:{{ $store.state.cruUserInfo.phone }}</div>
+                                                <div>物业电话:{{ $store.state.cruUserInfo.phone }}</div> -->
                                             </div>
                                             <div v-if="!rowDetail">
                                                 <div class="file-name" v-for="(item, index) of uploadFileUrl" :key="index">
@@ -327,7 +327,14 @@ import list from '@utils/list.js';
 import previeInform from './common/previeInform';
 // Tinymce 富文本编辑器
 import Tinymce from '@/components/Tinymce';
-const content = `您好!为了给大家提供一个舒适、卫生的生活环境,进一步有效控制小区“四害”孳生,减少四害对大家生活影响,管理处计划12月份安排小区公共区域集中消杀4次。`;
+const content = ` <div>
+                                                    &nbsp;&nbsp;您好!为了给大家提供一个舒适、卫生的生活环境,进一步有效控制小区“四害”孳生,减少四害对大家生活影响,管理处计划12月份安排小区公共区域集中消杀4次。
+                                                    <div style="text-align: end; margin-right: 10px; color: #e0e1e3">
+                                                        <div style="margin-right: 30px">xxx物业管理处</div>
+                                                        <div>2022-02-22 02:02:02</div>
+                                                        <div>物业电话:13123123123</div>
+                                                    </div>
+                                                </div>`;
 export default {
     mixins: [list],
     components: { previeInform, Tinymce },
@@ -335,8 +342,6 @@ export default {
         let _this = this;
         return {
             popCommunityName: '',
-            // 文件上传
-            uploadImageUrl: '/sc-community-web/upload/uploadFile',
             fileList: [],
             // 显示图片上传
             imageUrl: '',
@@ -379,7 +384,7 @@ export default {
                 //发布对象
                 issueRoom: {
                     checkAll: true,
-                    radioRoom: '全部房间',
+                    radioRoom: '',
                     staff: false,
                     radioStaff: ''
                 },
@@ -395,7 +400,7 @@ export default {
             },
             rules: {
                 popCommunityId: [{ required: true, message: '请选择社区', trigger: 'change' }],
-                issueRoom: [{ required: true, message: '请选择房间', trigger: 'change' }],
+                radioRoom: [{ required: true, message: '请选择房间', trigger: 'change' }],
                 informType: [{ required: true, message: '请选择通知类型', trigger: 'change' }],
                 title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
                 exigencyOr: [{ required: true, message: '请选择是否紧急', trigger: 'change' }],
@@ -485,9 +490,7 @@ export default {
             // 选中的人员
             selectDataPeopleTreeData: [],
             // 文件上传地址
-            uploadFileUrl: [],
-            // 远文件名
-            oldFileName: ''
+            uploadFileUrl: []
         };
     },
     created() {
@@ -658,7 +661,7 @@ export default {
                 if (res.status === 0) {
                     this.selectDataHouseTreeData = res.data;
                 } else {
-                    this.$message('获取房间失败!请重试');
+                    // this.$message('请选择房间');
                 }
             });
             console.log('选中的房间val', val);
@@ -770,6 +773,9 @@ export default {
          * */
         dialogButton(type) {
             if (type === 'prev') {
+                if (this.selectDataHouseTreeData.length < 1) {
+                    this.$message.warning('请选择房间');
+                }
                 this.$refs['ruleForm'].validate((valid) => {
                     if (valid) {
                         // this.showDetail = false;

+ 2 - 2
operationSupport/src/views/propertyManagement/neighbor.vue

@@ -88,7 +88,7 @@
                         </div>
                         <div class="complaint-images">
                             <span class="complaint-content-left">图片/视频:</span>
-                            <span>
+                            <span v-if="srcList">
                                 <el-image
                                     class="images"
                                     v-for="(item, index) in imgList"
@@ -104,7 +104,7 @@
                                     </video></span
                                 >
                             </span>
-                            <span v-if="srcList.length == 0"> 暂无图片/视频 </span>
+                            <span v-else> 暂无图片/视频 </span>
                         </div>
                     </div>
                     <div class="complaint-title">