From 8a5f20793928cd34e83828f27c0d92dc0c053465 Mon Sep 17 00:00:00 2001 From: shawnzhang Date: Mon, 21 Dec 2020 13:31:00 +0800 Subject: [PATCH] =?UTF-8?q?21=E5=8F=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 21号修改 --- src/api/InstallmentList.js | 8 ++++++++ src/lang/zh.js | 8 +++++++- src/views/InstallmentList/index.vue | 29 +++++++++++++++++++---------- src/views/OverdueList/index.vue | 13 ++++++++++--- 4 files changed, 44 insertions(+), 14 deletions(-) diff --git a/src/api/InstallmentList.js b/src/api/InstallmentList.js index 5a818810..f3db6645 100644 --- a/src/api/InstallmentList.js +++ b/src/api/InstallmentList.js @@ -48,6 +48,14 @@ export function installmentlist(query) { if (query.address !== '' && query.address !== null && query.address !== undefined) { params.append('address', query.address) // 你要传给后台的参数值 key/value } + + if (query.unPaid !== '' && query.unPaid !== null && query.unPaid !== undefined) { + params.append('unPaid', query.unPaid) // 你要传给后台的参数值 key/value + } + + if (query.cancelPaid !== '' && query.cancelPaid !== null && query.cancelPaid !== undefined) { + params.append('cancelPaid', query.cancelPaid) // 你要传给后台的参数值 key/value + } params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value return request({ diff --git a/src/lang/zh.js b/src/lang/zh.js index baca3970..bf566b48 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -4572,6 +4572,12 @@ export default { tiaoshenhederenwu: '条待审批的单据', dengdaiweixiud: '您有0条待分配的维修订单', tiaodaifukuanjilu: '条待付款记录', - shoufuzhekou: '首付折扣' + shoufuzhekou: '首付折扣', + weihuanjine: '未还金额范围', + weihuanjineling: '未还金额=0', + weihuanjinedayueling: '未还金额>0', + hexiaojinefanwei: '核销金额范围', + hexiaojinedengyuling: '核销金额=0', + hexiaojinedayueling: '核销金额>0' } } diff --git a/src/views/InstallmentList/index.vue b/src/views/InstallmentList/index.vue index 95f400b3..f8ffba81 100644 --- a/src/views/InstallmentList/index.vue +++ b/src/views/InstallmentList/index.vue @@ -9,6 +9,15 @@ + + + + + + + + + { - const tHeader = ['供应商编号', '供应商名称', '供应商简称', '供应商类别', '所在区域', '采购员', '供应商优质级别', '建档人', '建档日期'] - const filterVal = ['id', 'InstallmentListName', 'InstallmentListShortName', 'typeName', 'regionName', 'buyerName', 'levelName', 'createName', 'createTime'] - const data = this.formatJson(filterVal, this.list) - excel.export_json_to_excel({ - header: tHeader, - data, - filename: '经销商资料表' - }) - this.downloadLoading = false + import('@/vendor/Export2Excel').then(excel => { + const tHeader = ['编号', '门店', '客户姓名', '客户电话', '地址', '商品编号', '颜色', '商品名称', '出库时间', '分期期数', '已还期数', '是否改期', '改期后的期数', '未还金额', '已还金额', '奖励', '分期金额', '核销金额', '还款状态'] + const filterVal = ['orderNumber', 'repositoryName', 'customerName', 'customerPhone', 'address', 'productCode', 'color', 'productName', 'outDate', 'count', 'paidCount', 'isChange', 'afterCount', 'afterRate', 'leftAllmoney', 'paidMoney', 'reward', 'totalMoney', 'cancelMoney', 'stat'] + const data = this.formatJson(filterVal, this.list) + excel.export_json_to_excel({ + header: tHeader, + data: this.list, + filename: '分期列表' }) + this.downloadLoading = false + }) }, formatJson(filterVal, jsonData) { return jsonData.map(v => filterVal.map(j => { diff --git a/src/views/OverdueList/index.vue b/src/views/OverdueList/index.vue index 51ca11ca..013563df 100644 --- a/src/views/OverdueList/index.vue +++ b/src/views/OverdueList/index.vue @@ -793,15 +793,22 @@ export default { }, // 导出 handleExport() { + for (const i in this.list) { + if (this.list[i].collectstatus === 1) { + this.list[i].collectstatusFilter = 'partial payment' + } else if (this.list[i].collectstatus === 2) { + this.list[i].collectstatusFilter = 'not pay' + } + } this.downloadLoading = true import('@/vendor/Export2Excel').then(excel => { - const tHeader = ['供应商编号', '供应商名称', '供应商简称', '供应商类别', '所在区域', '采购员', '供应商优质级别', '建档人', '建档日期'] - const filterVal = ['id', 'InstallmentListName', 'InstallmentListShortName', 'typeName', 'regionName', 'buyerName', 'levelName', 'createName', 'createTime'] + const tHeader = ['编号', '客户姓名', '客户电话', '地址', '担保姓名', '商品编号', '商品名称', '逾期金额', '逾期次数', '收款人', '收款状态', '门店'] + const filterVal = ['orderNumber', 'customerName', 'customerPhone', 'address', 'suretyName', 'productCode', 'productName', 'overdueMoney', 'overCount', 'collectperson', 'collectstatusFilter', 'repositoryName'] const data = this.formatJson(filterVal, this.list) excel.export_json_to_excel({ header: tHeader, data, - filename: '经销商资料表' + filename: '逾期列表' }) this.downloadLoading = false })