diff --git a/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue b/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue
index 75dbce92..21c72fd7 100644
--- a/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue
+++ b/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue
@@ -10,7 +10,7 @@
ref="refTable"
- storageName="paybackrecord_query_main_250502"
+ storageName="paybackrecord_query_main_25050208"
:data="emisSettleBillList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
@@ -43,21 +43,17 @@
产品类型 -->
-
-
-
-
-
-
- {{ scope.row.settleBillDetail.custName }}
-
-
-
-
-
+
+
+
+
+ 收款
+ 退款
-
+
+
+
微信支付
支付宝支付
@@ -66,6 +62,19 @@
其他
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.settleBillDetail.custName }}
+
+
未开票
@@ -75,7 +84,6 @@
已完成
-
未收款
@@ -89,14 +97,16 @@
-
-
-
-
+
+
-
+
+
+
+
+
@@ -223,9 +233,8 @@ export default {
});
},
-
- //指定列求和
- getSummaries(param) {
+ //指定列求和
+ getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
@@ -233,96 +242,147 @@ export default {
sums[index] = '合计';
return;
}
- if (
- column.property === 'sendPieceSum'
- ) {
- const values = data.map(item => Number(item.sendPieceSum));
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr);
- if (!isNaN(value)) {
- return prev + curr;
- } else {
- return prev;
- }
- }, 0);
- sums[index] = sums[index].toFixed(0); //保留0位小数
- }
+ // if (
+ // column.property === 'settleSubBill.invoicedMoney'
+ // ) {
+ // const values = data.map(item => Number(item['settleSubBill']['invoicedMoney']));
+ // sums[index] = values.reduce((prev, curr) => {
+ // const value = Number(curr);
+ // if (!isNaN(value)) {
+ // return prev + curr;
+ // } else {
+ // return prev;
+ // }
+ // }, 0);
+ // sums[index] = sums[index].toFixed(2); //保留0位小数
+ // }
+ // else if (
+ // column.property === 'settleBillDetail.recMoney'
+ // ) {
+ // const values = data.map(item => Number(item['settleBillDetail']['recMoney']));
+ // sums[index] = values.reduce((prev, curr) => {
+ // const value = Number(curr);
+ // if (!isNaN(value)) {
+ // return prev + curr;
+ // } else {
+ // return prev;
+ // }
+ // }, 0);
+ // sums[index] = sums[index].toFixed(2); //保留2位小数
+ // }
+ // else if (
+ // column.property === 'waybillDetail.parcelQty'
+ // ) {
+ // const values = data.map(item => Number(item['waybillDetail']['parcelQty']));
+ // sums[index] = values.reduce((prev, curr) => {
+ // const value = Number(curr);
+ // if (!isNaN(value)) {
+ // return prev + curr;
+ // } else {
+ // return prev;
+ // }
+ // }, 0);
+ // sums[index] = sums[index].toFixed(0); //保留0位小数
+ // }
+ // else if (
+ // column.property === 'waybillDetail.billWeight'
+ // ) {
+ // const values = data.map(item => Number(item['waybillDetail']['billWeight']));
+ // sums[index] = values.reduce((prev, curr) => {
+ // const value = Number(curr);
+ // if (!isNaN(value)) {
+ // return prev + curr;
+ // } else {
+ // return prev;
+ // }
+ // }, 0);
+ // sums[index] = sums[index].toFixed(2); //保留2位小数
+ // }
+ // else if (
+ // column.property === 'waybillDetail.billWeight'
+ // ) {
+ // const values = data.map(item => Number(item['waybillDetail']['billWeight']));
+ // sums[index] = values.reduce((prev, curr) => {
+ // const value = Number(curr);
+ // if (!isNaN(value)) {
+ // return prev + curr;
+ // } else {
+ // return prev;
+ // }
+ // }, 0);
+ // sums[index] = sums[index].toFixed(2); //保留2位小数
+ // }
+ // else if (
+ // column.property === 'waybillDetail.totalVolume'
+ // ) {
+ // const values = data.map(item => Number(item['waybillDetail']['totalVolume']));
+ // sums[index] = values.reduce((prev, curr) => {
+ // const value = Number(curr);
+ // if (!isNaN(value)) {
+ // return prev + curr;
+ // } else {
+ // return prev;
+ // }
+ // }, 0);
+ // sums[index] = sums[index].toFixed(2); //保留2位小数
+ // }
+ // else if (
+ // column.property === 'waybillDetail.volumeWeight'
+ // ) {
+ // const values = data.map(item => Number(item['waybillDetail']['volumeWeight']));
+ // sums[index] = values.reduce((prev, curr) => {
+ // const value = Number(curr);
+ // if (!isNaN(value)) {
+ // return prev + curr;
+ // } else {
+ // return prev;
+ // }
+ // }, 0);
+ // sums[index] = sums[index].toFixed(2); //保留2位小数
+ // }
+ // else if (
+ // column.property === 'waybillDetail.settlementWeight'
+ // ) {
+ // const values = data.map(item => Number(item['waybillDetail']['settlementWeight']));
+ // sums[index] = values.reduce((prev, curr) => {
+ // const value = Number(curr);
+ // if (!isNaN(value)) {
+ // return prev + curr;
+ // } else {
+ // return prev;
+ // }
+ // }, 0);
+ // sums[index] = sums[index].toFixed(2); //保留2位小数
+ // }
+ // else if (
+ // column.property === 'waybillDetail.freight'
+ // ) {
+ // const values = data.map(item => Number(item['waybillDetail']['freight']));
+ // sums[index] = values.reduce((prev, curr) => {
+ // const value = Number(curr);
+ // if (!isNaN(value)) {
+ // return prev + curr;
+ // } else {
+ // return prev;
+ // }
+ // }, 0);
+ // sums[index] = sums[index].toFixed(2); //保留2位小数
+ // }
+ if(
+ column.property === 'payMoney'
+ ){
+ const values = data.map(item => Number(item.payMoney));
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr);
+ if (!isNaN(value)) {
+ return prev + curr;
+ } else {
+ return prev;
+ }
+ }, 0);
+ sums[index] = sums[index].toFixed(2); //保留2位小数
+ }
- else if (
- column.property === 'pieceNumber'
-
- ) {
- const values = data.map(item => Number(item.pieceNumber));
-
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr);
- if (!isNaN(value)) {
- return prev + curr;
- } else {
- return prev;
- }
- }, 0);
- sums[index] = sums[index].toFixed(0); //保留0位小数
- }
- else if (
- column.property === 'feeWeight'
-
- ) {
- const values = data.map(item => Number(item.feeWeight));
-
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr);
- if (!isNaN(value)) {
- return prev + curr;
- } else {
- return prev;
- }
- }, 0);
- sums[index] = sums[index].toFixed(2); //保留2位小数
- }
-
- else if (
- column.property === 'recMoney'
- ) {
- const values = data.map(item => Number(item.recMoney));
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr);
- if (!isNaN(value)) {
- return prev + curr;
- } else {
- return prev;
- }
- }, 0);
- sums[index] = sums[index].toFixed(2); //保留2位小数
- }
- else if(
- column.property === 'recedMoney'
- ){
- const values = data.map(item => Number(item.recedMoney));
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr);
- if (!isNaN(value)) {
- return prev + curr;
- } else {
- return prev;
- }
- }, 0);
- sums[index] = sums[index].toFixed(2); //保留2位小数
- }
- else if(
- column.property === 'refundMoney'
- ){
- const values = data.map(item => Number(item.refundMoney));
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr);
- if (!isNaN(value)) {
- return prev + curr;
- } else {
- return prev;
- }
- }, 0);
- sums[index] = sums[index].toFixed(2); //保留2位小数
- }
});
console.log(sums);
return sums
@@ -380,9 +440,6 @@ export default {
let qExportParam={...this.queryParams};
qExportParam.pageNum=1;
qExportParam.pageSize=20000;
-
- // qExportParam.settleBillNo=this.queryInfo.settleBillNo;
-
queryPayBackRecordList(qExportParam).then(response => {
if (response.code === 200) {
this.exportData(response.rows,loadingInstance);
@@ -400,7 +457,7 @@ export default {
excel.export_json_to_excel({
header: tHeader,
data,
- filename: '账单列表',
+ filename: '收款明细',
autoWidth: true
})
loadingInstance.close()
@@ -413,70 +470,196 @@ export default {
if (j === 'index') {
return ++index
}
- if (j === 'kjlx') {
- return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
+
+
+
+ if (j === 'waybillDetail.parcelQty') {
+ return v['waybillDetail']['parcelQty'];
}
- if (j === 'fjr') {
- return v['sendName']+'--'+v['receiveName'];
+
+ if (j === 'waybillDetail.billWeight') {
+ return v['waybillDetail']['billWeight'];
}
- if (j === 'custName') {
- let paymentType=v['paymentType'];
+
+ if (j === 'waybillDetail.totalVolume') {
+ return v['waybillDetail']['totalVolume'];
+ }
+
+ if (j === 'waybillDetail.volumeWeight') {
+ return v['waybillDetail']['volumeWeight'];
+ }
+
+ if (j === 'waybillDetail.settlementWeight') {
+ return v['waybillDetail']['settlementWeight'];
+ }
+
+ if (j === 'waybillDetail.freight') {
+ return v['waybillDetail']['freight'];
+ }
+
+
+ if (j === 'waybillDetail.productTypeName') {
+ return v['waybillDetail']['productTypeName']+'('+v['waybillDetail']['timeType']+')';
+ }
+
+
+ if (j === 'waybillDetail.transLineTypeName') {
+ return v['waybillDetail']['transLineTypeName'];
+ }
+
+ if (j === 'waybillDetail.sendCompany') {
+ return v['waybillDetail']['sendCompany'];
+ }
+
+ if (j === 'waybillDetail.paymentType') {
+ let paymentType=v['waybillDetail']['paymentType'];
+ return this.selectDictLabel(this.dict.type.emis_payment_type,paymentType);
+ }
+
+
+
+ if (j === 'settleBillDetail.payee') {
+ return v['settleBillDetail']['payee'];
+ }
+
+ if (j === 'settleBillDetail.salesmen') {
+ return v['settleBillDetail']['salesmen'];
+ }
+
+ if (j === 'settleBillDetail.recMoney') {
+ return v['settleBillDetail']['recMoney'];
+ }
+
+ if (j === 'settleBillDetail.recMoney') {
+ return v['settleBillDetail']['recMoney'];
+ }
+
+ if (j === 'settleBillDetail.refundMoney') {
+ return v['settleBillDetail']['refundMoney'];
+ }
+
+ if (j === 'settleBillDetail.satisfyMoney') {
+ return v['settleBillDetail']['satisfyMoney'];
+ }
+
+
+ if (j === 'settleBillDetail.allowanceMoney') {
+ return v['settleBillDetail']['allowanceMoney'];
+ }
+
+ if (j === 'settleBillDetail.deductionMoney') {
+ return v['settleBillDetail']['deductionMoney'];
+ }
+
+ if (j === 'settleBillDetail.otherMoney') {
+ return v['settleBillDetail']['otherMoney'];
+ }
+
+ if (j === 'settlePayRecordDetail.remark') {
+ return v['settlePayRecordDetail']['remark'];
+ }
+
+ if (j === 'settlePayRecordDetail.tradeDate') {
+ return v['settlePayRecordDetail']['tradeDate'];
+ }
+
+ if (j === 'settleBillDetail.paymentDueDate') {
+ return v['settleBillDetail']['paymentDueDate'];
+ }
+
+ if (j === 'settlePayRecordDetail.payId') {
+ return v['settlePayRecordDetail']['payId'];
+ }
+
+ if (j === 'settlePayRecordDetail.recType') {
+ let recType=v['settlePayRecordDetail']['recType'];
+ if(recType == 1){
+ return '收款';
+ }
+ else if(recType == 2){
+ return '退款';
+ }
+ }
+ if (j === 'settlePayRecordDetail.createByName') {
+ return v['settlePayRecordDetail']['createByName'];
+ }
+ if (j === 'settlePayRecordDetail.createTime') {
+ return v['settlePayRecordDetail']['createTime'];
+ }
+
+ if (j === 'settleBillDetail.settleBillName') {
+ return v['settleBillDetail']['settleBillName'];
+ }
+ if (j === 'settleBillDetail.billMonth') {
+ return v['settleBillDetail']['billMonth'];
+ }
+ if (j === 'settleBillDetail.creditPeriod') {
+ return v['settleBillDetail']['creditPeriod'];
+ }
+ if (j === 'settleBillDetail.custName') {
+ return v['settleBillDetail']['custName'];
+ }
+ if (j === 'settleBillDetail.custName') {
+ let paymentType=v['waybillDetail']['paymentType'];
if(paymentType==2 || paymentType==4 || paymentType==5 ){
- return v['custName'];
+ return v['settleBillDetail']['custName'];
}else{
return "";
}
}
- if (j === 'sendMobile') {
- return "";
- }
- if (j === 'paymentStatus') {
- return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]);
- }
- if (j === 'pickupMethod') {
- return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]);
+
+ if (j === 'settlePayRecordDetail.payType') {
+ let payType=v['settlePayRecordDetail']['payType'];
+ if(payType == 1){
+ return '微信支付';
+ }
+ else if(payType == 2){
+ return '支付宝支付';
+ }
+ else if(payType == 3){
+ return '企业微信收款';
+ }
+ else if(payType == 4){
+ return '对公付款';
+ }
+ else if(payType == 5){
+ return '其他';
+ }
+ else{
+ return '';
+ }
}
- if (j === 'customsEclaration') {
- return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]);
- }
- if (j === 'customsClear') {
- return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]);
- }
- if (j === 'packType') {
- return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]);
- }
- if (j === 'openBillStatus') {
- if(v[j] == 0){
+ if (j === 'settleSubBill.openBillStatus') {
+ let openBillStatus=v['settleSubBill']['openBillStatus'];
+ if(openBillStatus== 0){
return '未开票';
}
- else if(v[j] == 1){
+ else if(openBillStatus == 1){
return '已开票';
}
- else if(v[j] == 2){
+ else if(openBillStatus == 2){
return '部分开票';
}
- else if(v[j] == 3){
+ else if(openBillStatus == 3){
return '不开票';
}
- else if(v[j] == 4){
+ else if(openBillStatus == 4){
return '已完成';
}
else{
- return '/';
+ return '';
}
}
- if (j === 'chargeStatus') {
- if(v[j] == 0){
- return '未核销';
- }else{
- return '已核销';
- }
+ if (j === 'settleSubBill.invoicedMoney') {
+ return v['settleSubBill']['invoicedMoney'];
}
- if (j === 'paymentType') {
- return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
+ if (j === 'settleSubBill.paymentStatus') {
+ let paymentStatus=v['settleSubBill']['paymentStatus'];
+ return this.selectDictLabel(this.dict.type.emis_payment_status,paymentStatus);
}
+
return v[j]
}))
},
diff --git a/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue b/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue
index dcd4f6ee..8956e216 100644
--- a/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue
+++ b/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue
@@ -60,7 +60,7 @@
border
size="mini"
- storageName="PayBackStatList_main_2505_02"
+ storageName="PayBackStatList_main_2505_03"
:data="emisStatList"
:showSearch.sync="showSearch"
@@ -107,7 +107,7 @@
-
+
现金
月结
@@ -470,7 +470,7 @@ export default {
excel.export_json_to_excel({
header: tHeader,
data,
- filename: '统计',
+ filename: '收款统计',
autoWidth: true
})
loadingInstance.close()
@@ -503,63 +503,16 @@ export default {
return '/';
}
}
- // if (j === 'kjlx') {
- // return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
- // }
- // if (j === 'fjr') {
- // return v['sendName']+'--'+v['receiveName'];
- // }
- // if (j === 'sendMobile') {
- // return "";
- // }
- // if (j === 'paymentStatus') {
- // return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]);
- // }
+ if (j === 'settleType') {
+ if(v[j] == 1){
+ return '现金';
+ }
+ else if(v[j] == 2){
+ return '月结';
+ }
- // if (j === 'pickupMethod') {
- // return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]);
- // }
- // if (j === 'customsEclaration') {
- // return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]);
- // }
- // if (j === 'customsClear') {
- // return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]);
- // }
- // if (j === 'packType') {
- // return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]);
- // }
+ }
- // if (j === 'dispatchMethod') {
- // if(v[j] == 1){
- // return '派送';
- // }else{
- // return '自提';
- // }
- // }
- // if (j === 'blMessage') {
- // if(v[j] == 1){
- // return '发送';
- // }else{
- // return '不发送';
- // }
- // }
- // if (j === 'blAcceptMessage') {
- // if(v[j] == 1){
- // return '发送';
- // }else{
- // return '不发送';
- // }
- // }
- // if (j === 'blSign') {
- // if(v[j] == 1){
- // return '已签收';
- // }else{
- // return '未签收';
- // }
- // }
- // if (j === 'paymentType') {
- // return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
- // }
return v[j]
}))
},
diff --git a/src/views/emis/emisSettlePayRecord/index.vue b/src/views/emis/emisSettlePayRecord/index.vue
index 7ccf5386..3b988200 100644
--- a/src/views/emis/emisSettlePayRecord/index.vue
+++ b/src/views/emis/emisSettlePayRecord/index.vue
@@ -83,7 +83,7 @@
border
size="mini"
- storageName="emisSettlePayRecordList_main_s"
+ storageName="emisSettlePayRecordList_main_s01"
:data="emisSettlePayRecordList"
:showSearch.sync="showSearch"