diff --git a/jero-web/src/views/demo/profile/basic/Index.vue b/jero-web/src/views/demo/profile/basic/Index.vue
index 4d65a021..29753735 100644
--- a/jero-web/src/views/demo/profile/basic/Index.vue
+++ b/jero-web/src/views/demo/profile/basic/Index.vue
@@ -20,16 +20,18 @@
退货商品
+ :data-source="goodsData">
退货进度
+ :data-source="scheduleData">
{
- 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
- })
- },
+ goodsData: [],
+ schedulePagination: {},
scheduleColumns: [
{
title: '时间',
@@ -168,60 +126,121 @@ export default {
key: 'cost'
}
],
- 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 => {
- return res
+ scheduleData: []
+ }
+ },
+ created () {
+ this.initPageData()
+ },
+ methods: {
+ // 初始化页面数据
+ initPageData () {
+ this.loadGoodsData()
+ this.loadScheduleData()
+ },
+ // 加载退货商品表格
+ 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 => {
+ 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: {