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 5a6ff13..a044c56 100644
--- a/epmet-oper-web/src/views/modules/customer/feedback/FeedbackList.vue
+++ b/epmet-oper-web/src/views/modules/customer/feedback/FeedbackList.vue
@@ -41,29 +41,6 @@
                                     @handleClear="handleAgencyClear">
               </c-tree-dialog-single>
             </el-form-item>
-
-            <el-form-item label="开始时间"
-                          :label-width="labelWidth">
-              <el-date-picker v-model="tableParams.startTime"
-                              style="width:150px;margin-left:10px"
-                              type="datetime"
-                              format="yyyy-MM-dd hh:mm:ss"
-                              value-format="yyyy-MM-dd hh:mm:ss"
-                              placeholder="开始时间"></el-date-picker>
-            </el-form-item>
-
-            <el-form-item label="结束时间"
-                          :label-width="labelWidth">
-              <el-date-picker v-model="tableParams.endTime"
-                              style="width:150px;margin-left:10px"
-                              type="datetime"
-                              format="yyyy-MM-dd hh:mm:ss"
-                              value-format="yyyy-MM-dd hh:mm:ss"
-                              placeholder="结束时间"></el-date-picker>
-            </el-form-item>
-          </div>
-
-          <div>
             <el-form-item label="问题分类"
                           :label-width="labelWidth">
               <el-select v-model="tableParams.adviceType"
@@ -76,6 +53,10 @@
                 </el-option>
               </el-select>
             </el-form-item>
+
+          </div>
+
+          <div>
             <el-form-item label="回复状态"
                           :label-width="labelWidth">
               <el-select v-model="tableParams.isReply"
@@ -88,6 +69,22 @@
                 </el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="开始时间"
+                          :label-width="labelWidth">
+              <el-date-picker v-model="tableParams.startTime"
+                              style="width:200px;"
+                              type="datetime"
+                              placeholder="开始时间"></el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="结束时间"
+                          :label-width="labelWidth">
+              <el-date-picker v-model="tableParams.endTime"
+                              style="width:200px;"
+                              type="datetime"
+                              placeholder="结束时间"></el-date-picker>
+            </el-form-item>
+
             <el-form-item style="margin-left:10px">
               <el-button @click="loadData()"
                          type="primary">查询</el-button>
@@ -96,17 +93,68 @@
 
         </el-form>
 
-        <c-table column-type=""
-                 ref="table"
-                 :url="tableUrl"
-                 :params="tableParams"
-                 keyword="FeedbackList"
-                 :operations="operations"
-                 :tableHeight="tableHeight"
-                 :operationWidth="60"
-                 :buttonAlign="'center'"
-                 @detail="detail">
-        </c-table>
+        <el-table ref="table"
+                  v-loading="dataListLoading"
+                  :height="tableHeight"
+                  :data="tableData"
+                  border
+                  style="width: 100%;">
+          <el-table-column prop="customerName"
+                           label="客户名称"
+                           :min-width="80"
+                           align="center"></el-table-column>
+
+          <el-table-column prop="gridName"
+                           label="网格名字"
+                           :min-width="80"
+                           align="center"></el-table-column>
+          <el-table-column prop="adviceType"
+                           label="建议分类"
+                           :min-width="100"
+                           align="center">
+            <template slot-scope="scope">
+              <p style="text-align:center"
+                 v-for="(item,index) in scope.row.adviceTypeArray"
+                 :key="index">{{item}}</p>
+
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="phone"
+                           label="联系电话"
+                           :min-width="100"
+                           align="center"></el-table-column>
+
+          <el-table-column prop="adviceTime"
+                           label="建议时间"
+                           :min-width="100"
+                           align="center"></el-table-column>
+
+          <el-table-column prop="adviceContent"
+                           label="建议内容"
+                           :min-width="150"
+                           align="center"></el-table-column>
+          <el-table-column label="操作"
+                           fixed="right"
+                           align="center"
+                           width="150">
+            <template slot-scope="scope">
+              <el-button type="text"
+                         size="small"
+                         @click="detail(scope.row)">详情</el-button>
+
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination :current-page="pageNo"
+                       :page-sizes="[10, 15, 20]"
+                       :page-size="pageSize"
+                       :total="total"
+                       layout="total, sizes, prev, pager, next, jumper"
+                       @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange">
+        </el-pagination>
+
       </div>
     </el-card>
     <detail-form ref="ref_edit_form"
@@ -133,6 +181,8 @@ export default {
       tableUrl: '/epmetuser/useradvice/advicelist',
       // tableUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/epmetuser/useradvice/advicelist',
       tableParams: {
+        pageNo: 1,
+        pageSize: 10,
         customerId: '',//客户id 不填查询所有
         agencyId: '',//组织id 不填查询所有
         isReply: '',//是否被回复,0未回复，1回复, 传空查询所有
@@ -140,21 +190,11 @@ export default {
         startTime: '',//开始时间 可不填
         endTime: '',//结束时间 可不填
       },
-      // 列表操作栏的操作项数组
-      operations: [
-        {
-          lable: '详情', // 按钮显示名称
-          size: 'mini',
-          style: 'margin: 0 6px;',
-          type: 'text',
-          slot: '',
-          plain: false,
-          methodName: 'detail', // 回调方法名称
-          isShow: (row) => {
-            return true
-          }
-        }
-      ],
+      //分页
+      pageNo: 1,
+      pageSize: 10,
+      total: 0,
+      dataListLoading: false,
 
       // 列表数据
       tableData: [],
@@ -306,17 +346,77 @@ export default {
       })
     },
 
-    // 获取列表数据
+    //加载列表数据
     async loadData () {
-      this.$refs.table.loadData()
+      this.dataListLoading = true
+      this.tableParams.appId = this.resiAppid
+
+      const { data, code, msg, internalMsg } = await requestPost(this.tableUrl, this.tableParams)
+      if (code === 0) {
+        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)
+
+        this.tableData.forEach(element => {
+          element.adviceTypeArray = element.adviceType.split("&&")
+
+        })
+
+
+      } else {
+        // this.$message.error(msg + "：" + internalMsg)
+      }
+      this.dataListLoading = false
+    },
+
+    handleSizeChange (pageSize) {
+      this.tableParams.pageSize = pageSize
+      this.tableParams.pageNo = 1
+      this.$nextTick(() => {
+        this.loadData()
+      })
+    },
+    // 改变当前页
+    handleCurrentChange (pageNo) {
+      this.tableParams.pageNo = pageNo
+      this.$nextTick(() => {
+        this.loadData()
+      })
     },
+
     // 修改
     detail (row) {
       this.$refs['ref_edit_form'].initData(row)
     },
 
-
-
     // 开启加载动画
     startLoading () {
       loading = Loading.service({