|
@@ -127,10 +127,12 @@
|
|
|
<a-table
|
|
|
bordered
|
|
|
:columns="fullrateColumns"
|
|
|
+ :pagination="pagination"
|
|
|
:data-source="fullrateData"
|
|
|
:loading="loading"
|
|
|
:row-key="record => record.id"
|
|
|
:scroll="{ x: 1500 }"
|
|
|
+ @change="handleTableChange"
|
|
|
>
|
|
|
<!-- 操作 -->
|
|
|
<span slot="operationSlot" slot-scope="text, record">
|
|
@@ -328,8 +330,10 @@ export default {
|
|
|
// 查询条件
|
|
|
queryParam: {
|
|
|
beginDate:moment(new Date()).startOf("month").format("YYYY-MM-DD"),
|
|
|
- endDate:moment(new Date()).endOf("month").format("YYYY-MM-DD")
|
|
|
+ endDate:moment(new Date()).endOf("month").format("YYYY-MM-DD"),
|
|
|
+ pageNo:''
|
|
|
},
|
|
|
+ pagination:{},
|
|
|
|
|
|
url: {
|
|
|
// syncUser: '/act/process/extActProcess/doSyncUser',
|
|
@@ -346,15 +350,23 @@ export default {
|
|
|
},
|
|
|
// html渲染出来后,操作dom
|
|
|
mounted() {
|
|
|
- this.loadingChart()
|
|
|
+ // this.loadingChart()
|
|
|
},
|
|
|
methods: {
|
|
|
moment,
|
|
|
getfullrateData(){
|
|
|
this.$nextTick(() => {
|
|
|
+ this.loading = true
|
|
|
+ this.queryParam.pageSize =3
|
|
|
fullRateList(this.queryParam).then(res => {
|
|
|
+ this.loading = false
|
|
|
if (res.success) {
|
|
|
this.fullrateData = res.result.records;
|
|
|
+ this.pagination = {
|
|
|
+ total: res.result.total,
|
|
|
+ current: res.result.current,
|
|
|
+ // pageSize: res.result.size
|
|
|
+ }
|
|
|
}else{
|
|
|
this.$message.error(res.message);
|
|
|
}
|
|
@@ -383,15 +395,11 @@ export default {
|
|
|
},
|
|
|
|
|
|
searchQuery() {
|
|
|
- console.log(this.queryParam)
|
|
|
- debugger
|
|
|
if(this.queryParam.beginDate == '' || !this.queryParam.beginDate){
|
|
|
- debugger
|
|
|
this.$message.error('请选择开始日期');
|
|
|
}else if(this.queryParam.endDate == '' || !this.queryParam.endDate){
|
|
|
this.$message.error('请选择结束日期');
|
|
|
}else{
|
|
|
- debugger
|
|
|
var separator = "-"; //日期分隔符
|
|
|
var beginDates = this.queryParam.beginDate.split(separator);
|
|
|
var endDates = this.queryParam.endDate.split(separator);
|
|
@@ -407,14 +415,16 @@ export default {
|
|
|
},
|
|
|
// 重置
|
|
|
searchReset() {
|
|
|
- this.queryParam = {}
|
|
|
+ this.queryParam = {
|
|
|
+ beginDate:moment(new Date()).startOf("month").format("YYYY-MM-DD"),
|
|
|
+ endDate:moment(new Date()).endOf("month").format("YYYY-MM-DD")
|
|
|
+ }
|
|
|
this.getfullrateData()
|
|
|
},
|
|
|
lineDetail(record){
|
|
|
var iSOsID = record.soIDsID.toString()
|
|
|
fullRateDestail({iSOsID}).then(res => {
|
|
|
if (res.success) {
|
|
|
- debugger
|
|
|
this.$refs.detail.detailModVis = true
|
|
|
res.result.map(item =>{item.deliveryDate = moment(item.deliveryDate).format("YYYY-MM-DD")})
|
|
|
this.$refs.detail.detailData = res.result
|
|
@@ -436,11 +446,11 @@ export default {
|
|
|
// this.selectedRows = rows
|
|
|
// },
|
|
|
// 分页、排序、筛选变化时触发
|
|
|
- // handleTableChange(pagination, filters, sorter) {
|
|
|
- // // console.log('当前页信息>>>>',pagination)
|
|
|
- // this.queryParam.pageNo = pagination.current
|
|
|
- // // this.getAnnList()
|
|
|
- // }
|
|
|
+ handleTableChange(pagination, filters, sorter) {
|
|
|
+ // console.log('当前页信息>>>>',pagination)
|
|
|
+ this.queryParam.pageNo = pagination.current
|
|
|
+ this.getfullrateData()
|
|
|
+ },
|
|
|
|
|
|
aa() {}
|
|
|
},
|