修改投诉建议bug

operationSupport/src/components/Tinymce/index.vue

@@ -18,7 +18,6 @@
 import plugins from './plugins';
 import toolbar from './toolbar';
 import load from './dynamicLoadScript';
-import envConfig from '../../../src/config';
 
 // why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one
 const tinymceCDN = 'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js';
@@ -130,7 +129,7 @@ export default {
                     const file = items[0].getAsFile();
                     const formData = new FormData();
                     formData.append('file', file);
-                    var imageUrl = '';
+                    console.log('formData======', formData);
                     // 上传图片
                     this.$http.post('/sc-community-web/upload/uploadFile', formData).then((res) => {
                         console.log('onPaste', res);

operationSupport/src/utils/filters.js

@@ -8,7 +8,7 @@ let filterTimeNumber = (val) => {
 };
 // 处理投诉建议状态
 let filterComplaintStatus = (val) => {
-    return val == '1' ? '未处理' : val == '2' ? '已处理' : val == '3' ? '处理中' : val == '4' ? '待评价' : '已评价';
+    return val == 1 ? '未处理' : val == 2 ? '已处理' : val == 3 ? '处理中' : val == 4 ? '待评价' : '已评价';
 };
 // 处理工单状态
 let filterWorkStatus = (val) => {

operationSupport/src/views/propertyManagement/index.vue

@@ -151,51 +151,45 @@
                             </div>
                         </div>
                     </div>
-
-                    <div class="changeStatus">
-                        <div class="changeStatus-left">处理状态</div>
-                        <div class="changeStatus-right">
-                            <el-select
-                                :placeholder="rowData.handleStatus | filterComplaintStatus"
-                                v-model="mixins_query.complaintStatus"
-                                clearable
-                                :disabled="rowData.handleStatus == 2 || rowData.handleStatus == 4 || rowData.handleStatus == 5"
+                    <template v-if="rowData.handleStatus == 1 || rowData.handleStatus == 3">
+                        <el-form :model="replayForm" :rules="rules" ref="replayForm" label-width="80px" class="demo-ruleForm">
+                            <el-form-item label="处理状态" prop="status" class="replay">
+                                <el-select
+                                    v-model="placeholderHandleStatus"
+                                    clearable
+                                    :disabled="rowData.handleStatus == 2 || rowData.handleStatus == 4 || rowData.handleStatus == 5"
+                                >
+                                    <el-option
+                                        v-for="(item, index) in replayForm.complaintStatus"
+                                        :key="index"
+                                        :label="item.label"
+                                        :value="item.status"
+                                    ></el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item
+                                label="物业回复"
+                                prop="replay"
+                                class="replay"
+                                v-if="rowData.handleStatus == 1 || rowData.handleStatus == 3"
                             >
-                                <el-option v-for="(item, index) in complaintStatus" :key="index" :label="item.label" :value="item.status">{{
-                                    item.label
-                                }}</el-option>
-                            </el-select>
-                        </div>
-                    </div>
-                    <el-form
-                        :model="replayForm"
-                        ref="replayForm"
-                        label-width="80px"
-                        class="demo-ruleForm"
-                        v-if="rowData.handleStatus == 1 || rowData.handleStatus == 3"
-                    >
-                        <el-form-item
-                            label="物业回复"
-                            prop="replay"
-                            class="replay"
-                            :rules="[{ required: true, message: '回复内容不能为空' }]"
-                        >
-                            <el-input
-                                v-model="replayForm.replay"
-                                type="textarea"
-                                placeholder="请输入回复内容"
-                                maxlength="100"
-                                rows="3"
-                                show-word-limit
-                            ></el-input>
-                        </el-form-item>
-                        <el-form-item class="dialog-footer">
-                            <span>
-                                <el-button type="primary" plain @click="dialogButton('clear')">重置</el-button>
-                                <el-button type="primary" @click="dialogButton('submit')">提交</el-button>
-                            </span>
-                        </el-form-item>
-                    </el-form>
+                                <el-input
+                                    v-model="replayForm.replay"
+                                    type="textarea"
+                                    placeholder="请输入回复内容"
+                                    maxlength="100"
+                                    rows="3"
+                                    show-word-limit
+                                ></el-input>
+                            </el-form-item>
+                            <el-form-item class="dialog-footer">
+                                <span>
+                                    <el-button type="primary" plain @click="dialogButton('clear')">重置</el-button>
+                                    <el-button type="primary" @click="dialogButton('submit')">提交</el-button>
+                                </span>
+                            </el-form-item>
+                        </el-form>
+                    </template>
                     <!--用户 评价 -->
                     <div v-if="rowData.handleStatus == 5" class="grate">
                         <div class="complaint-title">
@@ -227,6 +221,7 @@ export default {
     data() {
         let _this = this;
         return {
+            placeholderHandleStatus: 0,
             // 处理记录
             recordData: [],
             // 视频获得焦点
@@ -234,7 +229,22 @@ export default {
             mediaList: [],
             // 物业回复
             replayForm: {
-                replay: ''
+                replay: '',
+                // 投诉状态
+                complaintStatus: [
+                    {
+                        status: 3,
+                        label: '处理中'
+                    },
+                    {
+                        status: 4,
+                        label: '已处理'
+                    }
+                ]
+            },
+            rules: {
+                complaintStatus: [{ required: true, message: '请选择处理状态', trigger: 'change' }],
+                replay: [{ required: true, message: '请输入内容', trigger: 'blur' }]
             },
             // 输入地址
             location: '',
@@ -286,17 +296,6 @@ export default {
                     label: '已评价'
                 }
             ],
-            // 投诉状态
-            complaintStatus: [
-                {
-                    status: 4,
-                    label: '已处理'
-                },
-                {
-                    status: 3,
-                    label: '处理中'
-                }
-            ],
             // 查询的时间
             pickerTime: [],
             cols: [
@@ -422,13 +421,16 @@ 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';
             if (this.pickerTime && this.pickerTime.length) {
-                this.mixins_query.startTime = `${this.pickerTime[0]} ${d}`;
-                this.mixins_query.endTime = `${this.pickerTime[1]} ${d}`;
+                this.mixins_query.startTime = this.pickerTime[0] + '' + d;
+                this.mixins_query.endTime = this.pickerTime[1] + '' + d;
             } else {
-                this.mixins_query.startTime = this.$moment(new Date()).subtract(1, 'months').format('YYYY-MM-DD HH:mm:ss');
-                this.mixins_query.endTime = this.$moment(new Date()).format('YYYY-MM-DD HH:mm:ss');
+                this.mixins_query.startTime = this.$moment(new Date())
+                    .subtract(1, 'months')
+                    .format('YYYY-MM-DD' + d);
+                this.mixins_query.endTime = this.$moment(new Date()).format('YYYY-MM-DD' + d);
             }
             this.mixins_search();
         },
@@ -436,19 +438,18 @@ export default {
          *  弹框按钮
          */
         dialogButton(type) {
-            console.log('点击保存', this.rowData);
             if (type === 'submit') {
+                // console.log('点击保存', this.rowData);
                 this.$refs['replayForm'].validate((valid) => {
                     if (valid) {
                         let query = {
                             buildingId: this.rowData.buildingId,
                             communityId: this.rowData.communityId,
                             content: '',
-                            handleStatus: this.mixins_query.complaintStatus,
+                            handleStatus: this.placeholderHandleStatus == '处理中' ? 3 : 4,
                             houseId: this.rowData.houseId,
                             id: this.rowData.id
                         };
-
                         this.$http.post('/sc-community-web/feedback/update', query).then((res) => {
                             // this.message(res.status, '回复');
                             // console.log('点击提交', res, this.mixins_query.complaintStatus, this.replayForm.replay);
@@ -461,16 +462,21 @@ export default {
                             this.message(res.status, res.msg);
                             this.$refs['replayForm'].resetFields();
 
-                            console.log('点击提交', res, this.mixins_query.complaintStatus, this.replayForm.replay);
+                            console.log('点击提交', res, this.placeholderHandleStatus, this.replayForm.replay);
                         });
                     } else {
                         return false;
                     }
                 });
             } else {
+                this.placeholderHandleStatus = '';
                 this.$refs['replayForm'].resetFields();
             }
         },
+        complaintStatus(val) {
+            val = val == 1 || val == 3 ? '处理中' : '已处理';
+            return val;
+        },
         /** 获取社区列表*/
         getCommunityList() {
             this.communityList = [];
@@ -493,7 +499,11 @@ export default {
             this.$http.post(`/sc-community-web/feedback/find/${row.id}`).then((res) => {
                 if (res.status === 0) {
                     this.rowData = res.data;
+                    this.placeholderHandleStatus = this.complaintStatus(this.rowData.handleStatus);
                     this.centerDialogVisible = true;
+                    if (!!this.$refs['replayForm']) {
+                        this.$refs['replayForm'].resetFields();
+                    }
                     if (res.data.imageUrl.length > 0) {
                         this.mediaList = res.data.imageUrl.split(',');
                     }