修改运营支持-物业管理-电话和弹框bug

operationSupport/src/views/propertyManagement/inform.vue

@@ -684,10 +684,12 @@ export default {
             let detaH = this.$moment(new Date()).format('HH');
             let detaM = this.$moment(new Date()).format('mm');
             let detaS = this.$moment(new Date()).format('ss');
-            let d = detaH + ':' + detaM + ':' + detaS;
+            // let d = detaH + ':' + detaM + ':' + detaS;
+            let d = '00:00:00';
+            let dEnd = '23:59:59';
             if (this.searchTime && this.searchTime.length) {
                 this.mixins_query.startTime = `${this.searchTime[0]}T${d}`;
-                this.mixins_query.endTime = `${this.searchTime[1]}T${d}`;
+                this.mixins_query.endTime = `${this.searchTime[1]}T${dEnd}`;
             } else {
                 this.mixins_query.startTime = this.$moment(new Date()).subtract(1, 'months').format('YYYY-MM-DDTHH:mm:ss');
                 this.mixins_query.endTime = this.$moment(new Date()).format('YYYY-MM-DDTHH:mm:ss');
@@ -702,9 +704,9 @@ export default {
          * */
         dialogButton(type) {
             if (type === 'prev') {
-                if (this.selectDataHouseTreeData.userID.length < 1 && this.selectDataPeopleTreeData.userList.length < 1) {
-                    return this.$message.warning('请选择房间');
-                }
+                // if (this.selectDataHouseTreeData.userID.length < 1 && this.selectDataPeopleTreeData.userList.length < 1) {
+                //     return this.$message.warning('请选择房间');
+                // }
                 this.$refs['ruleForm'].validate((valid) => {
                     if (valid) {
                         // this.showDetail = false;

operationSupport/src/views/propertyManagement/phone.vue

@@ -1,13 +1,7 @@
 <template>
     <div class="phone">
         <div class="search">
-            <el-input
-                placeholder="请输入管理处名称/电话"
-                maxlength="11"
-                class="search-input"
-                clearable
-                v-model="mixins_query.location"
-            ></el-input>
+            <el-input placeholder="请输入管理处名称/电话" maxlength="11" class="search-input" clearable v-model="location"></el-input>
             <el-select placeholder="请选择所属地区" v-model="mixins_query.communityId" clearable>
                 <el-option v-for="(item, index) in communityListCreate" :key="index" :label="item.label" :value="item.id"></el-option>
             </el-select>
@@ -79,7 +73,7 @@
                                 <el-form-item label="电话号码" prop="newPhone">
                                     <el-input
                                         v-model="ruleForm.newPhone"
-                                        placeholder="列如：010-26888888,13800000001"
+                                        placeholder="例如：010-26888888,13888888888"
                                         maxlength="11"
                                         @keyup.enter.native="dialogButton('addSave')"
                                     ></el-input>
@@ -103,7 +97,7 @@
                         <div>
                             <p>确认删除</p>
                             <p>
-                                是否删除 &nbsp;---&nbsp;<span class="delete-name">{{ deleteName }}</span>
+                                是否删除对应的记录 &nbsp;---&nbsp;<span class="delete-name">{{ deleteName }}</span>
                             </p>
                         </div>
                     </div>
@@ -202,6 +196,13 @@ export default {
         },
         /**查询按钮*/
         searchInfo() {
+            if (this.location) {
+                if (isNaN(this.location)) {
+                    this.mixins_query.name = this.location;
+                } else {
+                    this.mixins_query.telephone = this.location;
+                }
+            }
             this.mixins_search();
         },
         /**
@@ -213,6 +214,9 @@ export default {
             if (type == 'addSave') {
                 this.$refs['ruleForm'].validate((valid) => {
                     if (valid) {
+                        if (this.ruleForm.newManagementName && this.ruleForm.newManagementName.indexOf('中心') != -1) {
+                            return this.$message.warning('不能包含中心');
+                        }
                         let query = {
                             communityId: this.ruleForm.communityList,
                             name: this.ruleForm.newManagementName,
@@ -224,6 +228,7 @@ export default {
                             if (!this.enditShow) {
                                 this.$http.post('/sc-community-web/property/telephone/add', query).then((res) => {
                                     this.message(res.status, '添加');
+                                    this.$refs['ruleForm'].resetFields();
                                 });
                                 console.log('点击保存', this.ruleForm);
                             }
@@ -307,8 +312,29 @@ export default {
                 this.centerDialogVisible = true;
                 this.enditShow = true;
             } else {
-                this.deleteName = row.telephone;
-                this.dialogVisibleDelete = true;
+                // this.deleteName = row.telephone;
+                // this.dialogVisibleDelete = true;
+                const { communityName, buildingName, unitName, roomNumber } = row;
+                // let title = `是否确定删除对应的记录${communityName}${buildingName}${unitName}${telephone}”`;
+                let title = `是否确定删除对应的记录`;
+                this.$msgBox(title)
+                    .then(() => {
+                        let query = {
+                            id: this.rowId
+                        };
+                        this.$http
+                            .get('/sc-community-web/property/telephone/delete', query)
+                            .then(({ status, msg }) => {
+                                if (0 === status) {
+                                    this.$message.success(msg);
+                                    this.mixins_search();
+                                } else {
+                                    this.$message.error(msg);
+                                }
+                            })
+                            .catch(() => {});
+                    })
+                    .catch(() => {});
             }
         }
     }

operationSupport/src/views/propertyManagement/style.scss

@@ -326,6 +326,7 @@ $fontSizeSmall: 14px;
      .dialog-info{
         /deep/ .el-dialog__header{
             display: none;
+            min-width: 1080px;
         }
         /deep/ .el-dialog__body{
             padding: 0;
@@ -348,7 +349,7 @@ $fontSizeSmall: 14px;
             }
         }
     .dialog-contents{
-            width: 102%;
+            width: 101%;
             height: 100%;
             display: flex;
 /deep/ .el-radio-group{
@@ -405,10 +406,16 @@ $fontSizeSmall: 14px;
            
             // justify-content: space-between;
         }
+        .radio-room{
+            margin-right: 10px;
+        }
         .selet-room{
+            display: flex;
+            justify-content: end;
             /deep/ .el-input__inner{
-                width: 280px;
-                margin-left: 10px;
+                // margin-left: 10px;
+                width: 275px;
+                padding-right: 10px;
             }
         }
         }
@@ -578,12 +585,14 @@ $fontSizeSmall: 14px;
 // 富文本编辑器样式
 .editor-container{
     border-radius: 4px;
-    padding-top: 10px;
+    margin-top: 10px;
+    border: 1px solid #E0E1E3;
 }
-
-/deep/ .mce-panel{
-    border:0 solid #f5f1f1 !important; 
+/deep/ .mce-container, .mce-container-body{
+    background: #F8FCFF ;
 }
+
+
 #mceu_17{
     display: none;
 }