|
@@ -74,7 +74,7 @@
|
|
<script>
|
|
<script>
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
import getDate from '../../libs/getDate.js'
|
|
import getDate from '../../libs/getDate.js'
|
|
- import { orderCenterList } from '../../api/order.js'
|
|
|
|
|
|
+ import { orderCenterList, itemList } from '../../api/order.js'
|
|
import moment from 'moment'
|
|
import moment from 'moment'
|
|
export default {
|
|
export default {
|
|
components: {
|
|
components: {
|
|
@@ -177,7 +177,7 @@
|
|
],
|
|
],
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
- return orderCenterList({
|
|
|
|
|
|
+ /* return orderCenterList({
|
|
pageNo:this.pageNo,
|
|
pageNo:this.pageNo,
|
|
pageSize:this.pageSize}).then(res=>{
|
|
pageSize:this.pageSize}).then(res=>{
|
|
console.log(res,'--------------')
|
|
console.log(res,'--------------')
|
|
@@ -188,23 +188,23 @@
|
|
// }
|
|
// }
|
|
return res.data.list
|
|
return res.data.list
|
|
}
|
|
}
|
|
- })
|
|
|
|
|
|
+ }) */
|
|
|
|
|
|
|
|
|
|
- // this.searchForm.beginDate == null ? this.searchForm.beginDate = getDate.getToday().starttime : null
|
|
|
|
- // this.searchForm.endDate == null ? this.searchForm.endDate = getDate.getToday().endtime : null
|
|
|
|
- // return orderCenterList(Object.assign(parameter, this.searchForm)).then(res => {
|
|
|
|
- // console.log(res,'0000000000000000000')
|
|
|
|
- // if (res.status == 200) {
|
|
|
|
- // // const no = (res.data.pageNo - 1) * res.data.pageSize
|
|
|
|
- // // for (let i = 0; i < res.data.list.length; i++) {
|
|
|
|
- // // const _item = res.data.list[i]
|
|
|
|
- // // _item.no = no + i + 1
|
|
|
|
- // // _item.status = _item.status + '' === '1'
|
|
|
|
- // // }
|
|
|
|
- // return res.data.list
|
|
|
|
- // }
|
|
|
|
- // })
|
|
|
|
|
|
+ this.searchForm.beginDate == null ? this.searchForm.beginDate = getDate.getToday().starttime : null
|
|
|
|
+ this.searchForm.endDate == null ? this.searchForm.endDate = getDate.getToday().endtime : null
|
|
|
|
+ return orderCenterList(Object.assign(parameter, this.searchForm)).then(res => {
|
|
|
|
+ console.log(res,'0000000000000000000')
|
|
|
|
+ if (res.status == 200) {
|
|
|
|
+ // const no = (res.data.pageNo - 1) * res.data.pageSize
|
|
|
|
+ // for (let i = 0; i < res.data.list.length; i++) {
|
|
|
|
+ // const _item = res.data.list[i]
|
|
|
|
+ // _item.no = no + i + 1
|
|
|
|
+ // _item.status = _item.status + '' === '1'
|
|
|
|
+ // }
|
|
|
|
+ return res.data.list
|
|
|
|
+ }
|
|
|
|
+ })
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -218,6 +218,7 @@
|
|
}
|
|
}
|
|
console.log(this.searchForm.beginDate, this.searchForm.endDate)
|
|
console.log(this.searchForm.beginDate, this.searchForm.endDate)
|
|
},
|
|
},
|
|
|
|
+ //
|
|
// 合计
|
|
// 合计
|
|
getTotal(){},
|
|
getTotal(){},
|
|
// 查看详情--跳转到对应的详情页
|
|
// 查看详情--跳转到对应的详情页
|