【fix 66424】解决表格数据不显示

jero-web/src/views/demo/profile/basic/Index.vue

@@ -20,16 +20,18 @@
       <div class="title">退货商品</div>
       <a-table
         style="margin-bottom: 24px"
+        :pagination='goodsPagination'
         :columns="goodsColumns"
-        :data="loadGoodsData">
+        :data-source="goodsData">
 
       </a-table>
 
       <div class="title">退货进度</div>
       <a-table
         style="margin-bottom: 24px"
+        :pagination='schedulePagination'
         :columns="scheduleColumns"
-        :data="loadScheduleData">
+        :data-source="scheduleData">
 
         <template
           slot="status"
@@ -57,6 +59,7 @@ export default {
   },
   data () {
     return {
+      goodsPagination: {},
       goodsColumns: [
         {
           title: '商品编号',
@@ -92,54 +95,9 @@ export default {
           align: 'right'
         }
       ],
-      // 加载数据方法 必须为 Promise 对象
+      goodsData: [],
-      loadGoodsData: () => {
-        return new Promise(resolve => {
-          resolve({
-            data: [
-              {
-                id: '1234561',
-                name: '矿泉水 550ml',
-                barcode: '12421432143214321',
-                price: '2.00',
-                num: '1',
-                amount: '2.00'
-              },
-              {
-                id: '1234562',
-                name: '凉茶 300ml',
-                barcode: '12421432143214322',
-                price: '3.00',
-                num: '2',
-                amount: '6.00'
-              },
-              {
-                id: '1234563',
-                name: '好吃的薯片',
-                barcode: '12421432143214323',
-                price: '7.00',
-                num: '4',
-                amount: '28.00'
-              },
-              {
-                id: '1234564',
-                name: '特别好吃的蛋卷',
-                barcode: '12421432143214324',
-                price: '8.50',
-                num: '3',
-                amount: '25.50'
-              }
-            ],
-            pageSize: 10,
-            pageNo: 1,
-            totalPage: 1,
-            totalCount: 10
-          })
-        }).then(res => {
-          return res
-        })
-      },
 
+      schedulePagination: {},
       scheduleColumns: [
         {
           title: '时间',
@@ -168,60 +126,121 @@ export default {
           key: 'cost'
         }
       ],
-      loadScheduleData: () => {
+      scheduleData: []
-        return new Promise(resolve => {
+    }
-          resolve({
+  },
-            data: [
+  created () {
-              {
+    this.initPageData()
-                key: '1',
+  },
-                time: '2017-10-01 14:10',
+  methods: {
-                rate: '联系客户',
+    // 初始化页面数据
-                status: 'processing',
+    initPageData () {
-                operator: '取货员 ID1234',
+      this.loadGoodsData()
-                cost: '5mins'
+      this.loadScheduleData()
-              },
+    },
-              {
+    // 加载退货商品表格
-                key: '2',
+    loadGoodsData () {
-                time: '2017-10-01 14:05',
+      return new Promise(resolve => {
-                rate: '取货员出发',
+        resolve({
-                status: 'success',
+          data: [
-                operator: '取货员 ID1234',
+            {
-                cost: '1h'
+              id: '1234561',
-              },
+              name: '矿泉水 550ml',
-              {
+              barcode: '12421432143214321',
-                key: '3',
+              price: '2.00',
-                time: '2017-10-01 13:05',
+              num: '1',
-                rate: '取货员接单',
+              amount: '2.00'
-                status: 'success',
+            },
-                operator: '取货员 ID1234',
+            {
-                cost: '5mins'
+              id: '1234562',
-              },
+              name: '凉茶 300ml',
-              {
+              barcode: '12421432143214322',
-                key: '4',
+              price: '3.00',
-                time: '2017-10-01 13:00',
+              num: '2',
-                rate: '申请审批通过',
+              amount: '6.00'
-                status: 'success',
+            },
-                operator: '系统',
+            {
-                cost: '1h'
+              id: '1234563',
-              },
+              name: '好吃的薯片',
-              {
+              barcode: '12421432143214323',
-                key: '5',
+              price: '7.00',
-                time: '2017-10-01 12:00',
+              num: '4',
-                rate: '发起退货申请',
+              amount: '28.00'
-                status: 'success',
+            },
-                operator: '用户',
+            {
-                cost: '5mins'
+              id: '1234564',
-              }
+              name: '特别好吃的蛋卷',
-            ],
+              barcode: '12421432143214324',
-            pageSize: 10,
+              price: '8.50',
-            pageNo: 1,
+              num: '3',
-            totalPage: 1,
+              amount: '25.50'
-            totalCount: 10
+            }
-          })
+          ],
-        }).then(res => {
+          pageSize: 10,
-          return res
+          pageNo: 1,
+          totalPage: 1,
+          totalCount: 10
         })
-      }
+      }).then(res => {
+        this.goodsData = res.data
+        this.goodsPagination = { ...res, data: undefined }
+      })
+    },
+    // 加载退货进度表格
+    loadScheduleData () {
+      return new Promise(resolve => {
+        resolve({
+          data: [
+            {
+              key: '1',
+              time: '2017-10-01 14:10',
+              rate: '联系客户',
+              status: 'processing',
+              operator: '取货员 ID1234',
+              cost: '5mins'
+            },
+            {
+              key: '2',
+              time: '2017-10-01 14:05',
+              rate: '取货员出发',
+              status: 'success',
+              operator: '取货员 ID1234',
+              cost: '1h'
+            },
+            {
+              key: '3',
+              time: '2017-10-01 13:05',
+              rate: '取货员接单',
+              status: 'success',
+              operator: '取货员 ID1234',
+              cost: '5mins'
+            },
+            {
+              key: '4',
+              time: '2017-10-01 13:00',
+              rate: '申请审批通过',
+              status: 'success',
+              operator: '系统',
+              cost: '1h'
+            },
+            {
+              key: '5',
+              time: '2017-10-01 12:00',
+              rate: '发起退货申请',
+              status: 'success',
+              operator: '用户',
+              cost: '5mins'
+            }
+          ],
+          pageSize: 10,
+          pageNo: 1,
+          totalPage: 1,
+          totalCount: 10
+        })
+      }).then(res => {
+        this.scheduleData = res.data
+        this.schedulePagination = { ...res, data: undefined }
+      })
     }
   },
   filters: {