Merge branch 'master' of http://106.55.241.82:3000/lzf/zhbsq-vue-web

src/views/LEAVEMESSAGE/index.vue

@@ -57,15 +57,15 @@
     <el-table v-loading="loading" :data="LEAVEMESSAGEList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="创建人" align="center" prop="createBy"/>
-      <el-table-column label="ansName" align="center" prop="ansName" />
-      <el-table-column label="创建时间" align="center" prop="createTime" >
+      <el-table-column label="留言人姓名" align="center" prop="ansName" />
+      <el-table-column label="留言标题" align="center" prop="question" :show-overflow-tooltip="true" />
+      <el-table-column label="留言详情" align="center" prop="questionDetail" :show-overflow-tooltip="true" />
+      <el-table-column label="状态" align="center" prop="type" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}-{h}:{i}') }}</span>
+          <span>{{ scope.row.type == 1 ? '未回复' : '已回复' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="留言标题" align="center" prop="question" />
-      <el-table-column label="留言详情" align="center" prop="questionDetail" />
-      <el-table-column label="questionTime" align="center" prop="questionTime" >
+      <el-table-column label="留言时间" align="center" prop="questionTime" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.questionTime, '{y}-{m}-{d}-{h}:{i}') }}</span>
         </template>
@@ -241,21 +241,11 @@ export default {
         ansName: null
       },
       // 表单参数
-      form: {},
+      form: {
+        replyContent: null
+      },
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "主键id不能为空", trigger: "blur" }
-        ],
-        userId: [
-          { required: true, message: "用户id不能为空", trigger: "blur" }
-        ],
-        delFlag: [
-          { required: true, message: "删除标记不能为空", trigger: "blur" }
-        ],
-        deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" }
-        ],
         question: [
           { required: true, message: "留言标题不能为空", trigger: "blur" }
         ],
@@ -267,6 +257,9 @@ export default {
         ],
         ansName: [
           { required: true, message: "留言人姓名不能为空", trigger: "blur" }
+        ],
+        replyContent:[
+          { required: true, message: "回复内容不能为空", trigger: "blur" }
         ]
       }
     };
@@ -299,7 +292,8 @@ export default {
         question: null,
         questionDetail: null,
         questionTime: null,
-        ansName: null
+        ansName: null,
+        replyContent: null
       };
       this.resetForm("form");
     },
@@ -340,6 +334,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
+            this.form.type = 0;
             updateLEAVEMESSAGE(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;