投诉建议和报事报修

src/views/base/informationInfo-complaint-list.vue

@@ -14,23 +14,23 @@
       要resetFields起作用，必须配置:model和prop
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-      <el-form-item label="投诉人" prop="name">
-        <el-input type="text" v-model="queryModel.ownerName"></el-input>
+      <el-form-item label="投诉人" prop="ownerName">
+        <el-input type="text" v-model="queryModel.ownerName" size="mini"></el-input>
       </el-form-item>
-      <el-form-item label="提交时间" prop="createTime">
+      <el-form-item label="提交时间" prop="createTimeRanges">
         <el-date-picker
-          v-model="queryModel.createTime"
+          size="mini"
+          v-model="queryModel.createTimeRanges"
           type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
         ></el-date-picker>
       </el-form-item>
       <el-form-item label="投诉状态" prop="status">
-        <el-select v-model="queryModel.status">
-          <el-option value="0">待回复</el-option>
-          <el-option value="1">已回复</el-option>
-          <el-option value="2">已结束</el-option>
+        <el-select v-model="queryModel.status" size="mini">
+          <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -59,8 +59,8 @@
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column prop="owner.name" sort-by="name_" label="业主名称" width="100"></el-table-column>
-      <el-table-column prop="owner.tel" sort-by="tel_" label="手机号码" width="130"></el-table-column>
+      <el-table-column prop="name" sort-by="name_" label="业主名称" width="100"></el-table-column>
+      <el-table-column prop="phone" sort-by="phone_" label="手机号码" width="130"></el-table-column>
       <el-table-column prop="community" sort-by="community_" label="报修人房号" width="120"></el-table-column>
       <el-table-column prop="content" sort-by="content_" label="投诉内容" width="220"></el-table-column>
       <el-table-column prop="createTime" sort-by="create_time" label="提交时间" width="150"></el-table-column>
@@ -73,10 +73,13 @@
       </el-table-column>
       <el-table-column prop="returnContent" sort-by="return_content" label="回复方案" width="220"></el-table-column>
       <el-table-column prop="returnTime" sort-by="return_time" label="回复时间" width="150"></el-table-column>
-      <el-table-column label="操作" width="180">
-        <template slot-scope>
-          <el-button size="mini" type="success" disabled>已解决</el-button>
-          <el-button size="mini" type="danger" disabled>结束</el-button>
+      <el-table-column label="操作" width="180" fixed="right">
+        <template slot-scope="{row}">
+          <el-button v-if="row.status=='2'" size="mini" type="success" disabled>已解决</el-button>
+          <el-button v-else-if="row.status=='1'" size="mini" type="success" @click="handleEdit(row)">已回复</el-button>
+          <el-button v-else size="mini" type="success" @click="handleEdit(row)">解决方案</el-button>
+          <el-button v-if="row.status=='2'" size="mini" type="danger" disabled>结束</el-button>
+          <el-button v-else size="mini" type="danger" @click="handleFinished(row)">结束</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -111,21 +114,27 @@ export default {
     return {
       queryModel: {
         id: "",
-        createBy: "",
-        createTime: "",
-        updateBy: "",
-        updateTime: "",
-        delFlag: "",
-        ownerId: "",
-        community: "",
-        content: "",
         status: "",
-        returnContent: "",
-        returnTime: "",
-        type: "1"
+        type: "1",
+        ownerName:"",
+        createTimeRanges:[],
       },
       loading: false,
       tableData: [],
+      statusList:[
+        {
+        value:"0",
+        name:"待回复"
+        },
+        {        
+        value:"1",
+        name:"已回复"
+        },
+        {        
+        value:"2",
+        name:"已结束"
+        }
+      ],
       pageIndex: 1,
       pageSize: 10,
       totalPages: 0,
@@ -151,27 +160,12 @@ export default {
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
 
-      formData.append("id", self.queryModel.id);
-      formData.append("createBy", self.queryModel.createBy);
-      formData.append("createTime", self.queryModel.createTime);
-      formData.append("updateBy", self.queryModel.updateBy);
-      formData.append("updateTime", self.queryModel.updateTime);
-      formData.append("delFlag", self.queryModel.delFlag);
-      formData.append("ownerId", self.queryModel.ownerId);
-      formData.append("community", self.queryModel.community);
-      formData.append("content", self.queryModel.content);
-      formData.append("status", self.queryModel.status);
-      formData.append("returnContent", self.queryModel.returnContent);
-      formData.append("returnTime", self.queryModel.returnTime);
-      formData.append("type", self.queryModel.type);
-
-      if (this.field != null) {
-        formData.append("field", this.field);
-      }
-
-      if (this.direction != null) {
-        formData.append("direction", this.direction);
+      formData.append("type", "1");
+      formData.append("name", self.queryModel.ownerName);
+      if(self.queryModel.createTimeRanges!=null&&self.queryModel.createTimeRanges!=""){
+        formData.append("createTimeRanges", self.queryModel.createTimeRanges.toString());
       }
+      formData.append("status", self.queryModel.status);
 
       informationInfoApi
         .pageList(formData)
@@ -210,10 +204,34 @@ export default {
       this.showModal = true;
     },
     handleEdit(record) {
-      this.modalTitle = "编辑";
+      this.modalTitle = "填写解决方案";
       this.businessKey = record.id;
       this.showModal = true;
     },
+    handleFinished(record){
+      var self = this;
+      self
+        .$confirm("是否结束投诉?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+          informationInfoApi.finished(record.id).then(function(response){
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "投诉已结束!"
+              });
+            }
+          })
+        })
+
+    },
     handleDelete(record) {
       var self = this;
 

src/views/base/informationInfo-detail.vue

@@ -12,47 +12,15 @@
     style="text-align:left;"
     @close="closeDialog"
     :close-on-click-modal="false"
+    width="35%"
   >
     <div class="user-panel" v-loading="loading">
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
-        <el-form-item label prop="id">
-          <el-input v-model="formModel.id" placeholder="请输入" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label prop="createBy">
-          <el-input v-model="formModel.createBy" placeholder="请输入" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label prop="createTime">
-          <el-input v-model="formModel.createTime" placeholder="请输入" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label prop="updateBy">
-          <el-input v-model="formModel.updateBy" placeholder="请输入" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label prop="updateTime">
-          <el-input v-model="formModel.updateTime" placeholder="请输入" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="是否删除" prop="delFlag">
-          <el-input v-model="formModel.delFlag" placeholder="请输入是否删除" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="提交人ID" prop="ownerId">
-          <el-input v-model="formModel.ownerId" placeholder="请输入提交人ID" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="所在小区" prop="community">
-          <el-input v-model="formModel.community" placeholder="请输入所在小区" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="提交内容" prop="content">
-          <el-input v-model="formModel.content" placeholder="请输入提交内容" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="提交状态" prop="status">
-          <el-input v-model="formModel.status" placeholder="请输入提交状态" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="回复内容" prop="returnContent">
-          <el-input v-model="formModel.returnContent" placeholder="请输入回复内容" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="回复时间" prop="returnTime">
-          <el-input v-model="formModel.returnTime" placeholder="请输入回复时间" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="状态/1投诉/2报修" prop="type">
-          <el-input v-model="formModel.type" placeholder="请输入状态/1投诉/2报修" style="width:300px"></el-input>
+        <el-form-item label="解决方案" prop="returnContent">
+          <el-input type="textarea"
+                    :rows="10" 
+                    v-model="formModel.returnContent" placeholder="请输入解决方案" style="width:300px">
+          </el-input>
         </el-form-item>
       </el-form>
     </div>
@@ -71,44 +39,17 @@ export default {
   data() {
     return {
       ruleValidate: {
-        id: [{ required: true, message: "不能为空", trigger: "blur" }],
-        createBy: [{ required: true, message: "不能为空", trigger: "blur" }],
-        createTime: [{ required: true, message: "不能为空", trigger: "blur" }],
-        updateBy: [{ required: true, message: "不能为空", trigger: "blur" }],
-        updateTime: [{ required: true, message: "不能为空", trigger: "blur" }],
-        delFlag: [
-          { required: true, message: "是否删除不能为空", trigger: "blur" }
-        ],
-        ownerId: [
-          { required: true, message: "提交人ID不能为空", trigger: "blur" }
-        ],
-        community: [
-          { required: true, message: "所在小区不能为空", trigger: "blur" }
-        ],
-        content: [
-          { required: true, message: "提交内容不能为空", trigger: "blur" }
-        ],
-        status: [
-          { required: true, message: "提交状态不能为空", trigger: "blur" }
-        ],
         returnContent: [
-          { required: true, message: "回复内容不能为空", trigger: "blur" }
-        ],
-        returnTime: [
-          { required: true, message: "回复时间不能为空", trigger: "blur" }
+          { required: true, message: "解决方案不能为空", trigger: "blur" }
         ],
-        type: [
-          {
-            required: true,
-            message: "状态/1投诉/2报修不能为空",
-            trigger: "blur"
-          }
-        ]
+      },
+      formModel: {
+        id:"",
+        returnContent:"",
       },
       showDialog: true,
       loading: false,
       submitting: false,
-      formModel: {}
     };
   },
   methods: {
@@ -122,7 +63,6 @@ export default {
         if (valid) {
           (function() {
             var id = self.formModel.id;
-
             if (id == null || id.length == 0) {
               return informationInfoApi.add(self.formModel);
             } else {
@@ -137,14 +77,14 @@ export default {
                 type: "success"
               });
 
-              this.$emit("close", true);
+              self.$emit("close", true);
             } else {
               self.$message({
                 message: jsonData.message + "",
                 type: "warning"
               });
 
-              this.$emit("close", false);
+              self.$emit("close", false);
             }
           });
         }
@@ -158,7 +98,7 @@ export default {
       if (self.businessKey.length == 0) {
         return informationInfoApi.create();
       } else {
-        return informationInfoApi.edit(self.menuId);
+        return informationInfoApi.edit(self.businessKey);
       }
     })()
       .then(response => {

src/views/base/informationInfo-warranty-list.vue

@@ -14,23 +14,23 @@
       要resetFields起作用，必须配置:model和prop
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-      <el-form-item label="报修人" prop="name">
+      <el-form-item label="报修人" prop="ownerName">
         <el-input type="text" size="mini" v-model="queryModel.ownerName"></el-input>
       </el-form-item>
-      <el-form-item label="提交时间" prop="createTime">
+      <el-form-item label="提交时间" prop="createTimeRanges">
         <el-date-picker
-          v-model="queryModel.createTime"
+          size="mini"
+          v-model="queryModel.createTimeRanges"
           type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
         ></el-date-picker>
       </el-form-item>
       <el-form-item label="报修状态" prop="status">
-        <el-select v-model="queryModel.status">
-          <el-option value="0">待解决</el-option>
-          <el-option value="1">已解决</el-option>
-          <el-option value="2">已结束</el-option>
+        <el-select v-model="queryModel.status" size="mini">
+          <el-option v-for="item in statusList" :key="item.value" :label="item.name" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -59,8 +59,8 @@
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column prop="owner.name" sort-by="name_" label="业主名称" width="100"></el-table-column>
-      <el-table-column prop="owner.tel" sort-by="tel_" label="手机号码" width="130"></el-table-column>
+      <el-table-column prop="name" sort-by="name_" label="业主名称" width="100"></el-table-column>
+      <el-table-column prop="phone" sort-by="phone" label="手机号码" width="130"></el-table-column>
       <el-table-column prop="community" sort-by="community_" label="报修人房号" width="120"></el-table-column>
       <el-table-column prop="content" sort-by="content_" label="报修内容" width="220"></el-table-column>
       <el-table-column prop="createTime" sort-by="create_time" label="提交时间" width="150"></el-table-column>
@@ -73,17 +73,14 @@
       </el-table-column>
       <el-table-column prop="returnContent" sort-by="return_content" label="解决方案" width="220"></el-table-column>
       <el-table-column prop="returnTime" sort-by="return_time" label="解决时间" width="150"></el-table-column>
-      <el-table-column label="操作" width="220">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status=='0'">
-            <el-button size="mini" type="success" disabled>提交解决方案</el-button>
-          </span>
-          &nbsp;
-          <span v-if="scope.row.status=='2'">
-            <el-button size="mini" type="success" disabled>已解决</el-button>
-          </span>
-          &nbsp;
-          <el-button size="mini" type="danger" disabled>结束</el-button>
+
+      <el-table-column label="操作" width="220" fixed="right">
+        <template slot-scope="{row}">
+          <el-button v-if="row.status=='2'" size="mini" type="success" disabled>已解决</el-button>
+          <el-button v-else-if="row.status=='1'" size="mini" type="success" @click="handleEdit(row)">已回复</el-button>
+          <el-button v-else size="mini" type="success" @click="handleEdit(row)">提交解决方案</el-button>
+          <el-button v-if="row.status=='2'" size="mini" type="danger" disabled>结束</el-button>
+          <el-button v-else size="mini" type="danger" @click="handleFinished(row)">结束</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -123,16 +120,31 @@ export default {
         updateBy: "",
         updateTime: "",
         delFlag: "",
-        ownerId: "",
+        ownerName: "",
         community: "",
         content: "",
         status: "",
         returnContent: "",
         returnTime: "",
-        type: "2"
+        type: "2",
+        createTimeRanges:[],
       },
       loading: false,
       tableData: [],
+      statusList:[
+        {
+        value:"0",
+        name:"待解决"
+        },
+        {        
+        value:"1",
+        name:"已解决"
+        },
+        {        
+        value:"2",
+        name:"已结束"
+        }
+      ],
       pageIndex: 1,
       pageSize: 10,
       totalPages: 0,
@@ -158,27 +170,13 @@ export default {
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
 
-      formData.append("id", self.queryModel.id);
-      formData.append("createBy", self.queryModel.createBy);
-      formData.append("createTime", self.queryModel.createTime);
-      formData.append("updateBy", self.queryModel.updateBy);
-      formData.append("updateTime", self.queryModel.updateTime);
-      formData.append("delFlag", self.queryModel.delFlag);
-      formData.append("ownerId", self.queryModel.ownerId);
-      formData.append("community", self.queryModel.community);
-      formData.append("content", self.queryModel.content);
-      formData.append("status", self.queryModel.status);
-      formData.append("returnContent", self.queryModel.returnContent);
-      formData.append("returnTime", self.queryModel.returnTime);
-      formData.append("type", self.queryModel.type);
-
-      if (this.field != null) {
-        formData.append("field", this.field);
-      }
-
-      if (this.direction != null) {
-        formData.append("direction", this.direction);
+      
+      formData.append("type", "2");
+      formData.append("name", self.queryModel.ownerName);
+      if(self.queryModel.createTimeRanges!=null&&self.queryModel.createTimeRanges!=""){
+        formData.append("createTimeRanges", self.queryModel.createTimeRanges.toString());
       }
+      formData.append("status", self.queryModel.status);
 
       informationInfoApi
         .pageList(formData)
@@ -221,6 +219,30 @@ export default {
       this.businessKey = record.id;
       this.showModal = true;
     },
+    handleFinished(record){
+      var self = this;
+      self
+        .$confirm("是否结束报修?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+          informationInfoApi.finished(record.id).then(function(response){
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "投诉已结束!"
+              });
+            }
+          })
+        })
+
+    },
     handleDelete(record) {
       var self = this;