From 7e11192a057633836d4b3c099982e5388f4441b8 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 25 Nov 2020 19:00:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/customer/feedback/DetailForm.vue  |  2 +-
 .../customer/feedback/FeedbackList.vue        | 91 +++++++++++--------
 2 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/customer/feedback/DetailForm.vue b/epmet-oper-web/src/views/modules/customer/feedback/DetailForm.vue
index b712d7f..446d1f6 100644
--- a/epmet-oper-web/src/views/modules/customer/feedback/DetailForm.vue
+++ b/epmet-oper-web/src/views/modules/customer/feedback/DetailForm.vue
@@ -106,7 +106,7 @@
             <el-col :span="spanThree">
               <el-row :gutter="gutterCon">
                 <el-col :span="spanTitle">
-                  <div class="form-title">{{'提出时间'}}</div>
+                  <div class="form-title">{{'联系方式'}}</div>
                 </el-col>
                 <el-col :span="spanCon">
                   <div class="form-content">{{adviceData.phone}}</div>
diff --git a/epmet-oper-web/src/views/modules/customer/feedback/FeedbackList.vue b/epmet-oper-web/src/views/modules/customer/feedback/FeedbackList.vue
index a044c56..7cedfe3 100644
--- a/epmet-oper-web/src/views/modules/customer/feedback/FeedbackList.vue
+++ b/epmet-oper-web/src/views/modules/customer/feedback/FeedbackList.vue
@@ -12,7 +12,7 @@
               <el-select v-model="tableParams.customerId"
                          placeholder="客户"
                          clear
-                         @change="customerChange()"
+                         @change="customerChange"
                          clearable>
                 <el-option v-for="item in form.data['customerId']"
                            :key="item.value"
@@ -74,6 +74,9 @@
               <el-date-picker v-model="tableParams.startTime"
                               style="width:200px;"
                               type="datetime"
+                              :picker-options="startPickerTime"
+                              @change="startTimeChange"
+                              value-format="yyyy-MM-dd HH:mm:ss"
                               placeholder="开始时间"></el-date-picker>
             </el-form-item>
 
@@ -82,6 +85,8 @@
               <el-date-picker v-model="tableParams.endTime"
                               style="width:200px;"
                               type="datetime"
+                              :picker-options="endPickerTime"
+                              value-format="yyyy-MM-dd HH:mm:ss"
                               placeholder="结束时间"></el-date-picker>
             </el-form-item>
 
@@ -122,12 +127,12 @@
 
           <el-table-column prop="phone"
                            label="联系电话"
-                           :min-width="100"
+                           :min-width="80"
                            align="center"></el-table-column>
 
           <el-table-column prop="adviceTime"
                            label="建议时间"
-                           :min-width="100"
+                           :min-width="110"
                            align="center"></el-table-column>
 
           <el-table-column prop="adviceContent"
@@ -137,7 +142,7 @@
           <el-table-column label="操作"
                            fixed="right"
                            align="center"
-                           width="150">
+                           width="80">
             <template slot-scope="scope">
               <el-button type="text"
                          size="small"
@@ -177,6 +182,19 @@ export default {
     return {
       //查询条件标题宽度
       labelWidth: '70px',
+
+      startPickerTime: {
+        disabledDate (time) {
+
+          return time.getTime() > new Date();
+        },
+      },
+      endPickerTime: {
+        disabledDate (time) {
+          return time.getTime() > new Date();
+        }
+      },
+
       // 列表相关
       tableUrl: '/epmetuser/useradvice/advicelist',
       // tableUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/epmetuser/useradvice/advicelist',
@@ -209,7 +227,6 @@ export default {
         customerId: ''
       },
 
-
       // 查询栏下拉框数据
       form: {
         dataUrl: [], // 下拉框/单选框/复选框等获取数据的url
@@ -256,6 +273,7 @@ export default {
     tableHeight () {
       return this.clientHeight - 60 - 80 - 80 - 100
     },
+
     ...mapGetters(['clientHeight', 'env'])
   },
   methods: {
@@ -300,8 +318,11 @@ export default {
 
     //客户下拉框改变
     async customerChange (value) {
+
       this.treeParams.customerId = this.tableParams.customerId
       if (this.tableParams.customerId === '') {
+        this.tableParams.agencyId = ""
+        this.$refs['agencyCTreeDialog'].setInputValue("")
         this.selBtnDisabled = true
         this.treeParams.customerId = ''
       } else {
@@ -332,12 +353,27 @@ export default {
     },
 
 
+    //开始时间改变，使开始时间小于结束时间，并且所选时间早于当前时间
+    startTimeChange (time) {
+      //因为date1和date2格式为 年-月-日， 所以这里先把date1和date2转换为时间戳再进行比较
+      let date1 = new Date(time).getTime()
+
+      console.log(date1)
+      this.endPickerTime = {
+        disabledDate: (time) => {
+          return time.getTime() < date1 || time.getTime() > Date.now();
+        }
+      }
+    },
+
+
     handleAgencyOk (data) {//查询界面——组织弹出树的【确认】
 
       this.tableParams.agencyId = data.id
       console.log(this.tableParams.agencyId)
 
     },
+
     handleAgencyClear () {//查询界面——组织弹出树的【清空】
       this.tableParams.agencyId = ""
       this.$nextTick(() => {
@@ -353,40 +389,23 @@ export default {
 
       const { data, code, msg, internalMsg } = await requestPost(this.tableUrl, this.tableParams)
       if (code === 0) {
+        this.total = data.total
         this.tableData = data.list
-        let obj1 = {
-          "customerName": "灵山卫街道党工委",
-          "gridName": "市北区第二网格",
-          "adviceType": "政府业务建议&&软件功能及体验问题",
-          "phone": "15959999999",
-          "adviceTime": "2019-08-23 10:10:10",
-          "adviceContent": "我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议",
-          "id": "53815"
-        }
-        let obj2 = {
-          "customerName": "灵山卫街道党工委",
-          "gridName": "市北区第二网格",
-          "adviceType": "政府业务建议",
-          "phone": "15959999999",
-          "adviceTime": "2019-08-23 10:10:10",
-          "adviceContent": "我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议",
-          "id": "53815"
-        }
-        let obj3 = {
-          "customerName": "灵山卫街道党工委",
-          "gridName": "市北区第二网格",
-          "adviceType": "*",
-          "phone": "15959999999",
-          "adviceTime": "2019-08-23 10:10:10",
-          "adviceContent": "我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议",
-          "id": "53815"
-        }
-        this.tableData.push(obj1)
-        this.tableData.push(obj2)
-        this.tableData.push(obj3)
+        // let obj1 = {
+        //   "customerName": "灵山卫街道党工委",
+        //   "gridName": "市北区第二网格",
+        //   "adviceType": "政府业务建议&&软件功能及体验问题",
+        //   "phone": "15959999999",
+        //   "adviceTime": "2019-08-23 10:10:10",
+        //   "adviceContent": "我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议我建议",
+        //   "id": "53815"
+        // }
+
+        // this.tableData.push(obj1)
+
 
         this.tableData.forEach(element => {
-          element.adviceTypeArray = element.adviceType.split("&&")
+          element.adviceTypeArray = element.adviceType.split("\\n")
 
         })