diff --git a/src/views/emis/emisCustomerUser/monthlyShipmentDetail.vue b/src/views/emis/emisCustomerUser/monthlyShipmentDetail.vue index 788e400c..218232ea 100644 --- a/src/views/emis/emisCustomerUser/monthlyShipmentDetail.vue +++ b/src/views/emis/emisCustomerUser/monthlyShipmentDetail.vue @@ -24,7 +24,7 @@ >
- +
@@ -551,21 +551,16 @@ export default { this.openForm = false; }, - /** 导出按钮操作 */ - handleExport() { + /** 导出按钮操作 */ + handleExport() { const loadingInstance = this.$loading({ text: '正在导出...' }) - - if(this.selectList&&this.selectList.length>0){ - this.exportData(this.selectList,loadingInstance); + if(this.selectionList&&this.selectionList.length>0){ + this.exportData(this.selectionList,loadingInstance); } else{ - - let qExportParam={...this.queryParams}; - qExportParam.pageNum=1; - qExportParam.pageSize=20000; - queryPayBackRecordList(qExportParam).then(response => { + monthlyShipmentDetail(this.queryParams).then(response => { if (response.code === 200) { this.exportData(response.rows,loadingInstance); } @@ -582,7 +577,7 @@ export default { excel.export_json_to_excel({ header: tHeader, data, - filename: '收款明细', + filename: '月结客户出货统计明细', autoWidth: true }) loadingInstance.close() @@ -595,177 +590,80 @@ export default { if (j === 'index') { return ++index } - - if (j === 'waybillDetail.parcelQty') { - return v['waybillDetail']['parcelQty']; + if (j === 'kjlx') { + return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName']; } - - if (j === 'waybillDetail.billWeight') { - return v['waybillDetail']['billWeight']; + if (j === 'fjr') { + return v['sendName']+'--'+v['receiveName']; } - - 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 (j === 'custName') { + let paymentType=v['paymentType']; if(paymentType==2 || paymentType==4 || paymentType==5 ){ - return v['settleBillDetail']['custName']; + return v['custName']; }else{ return ""; } } - - - if (j === 'settlePayRecordDetail.payType') { - let payType=v['settlePayRecordDetail']['payType']; - + if (j === 'sendMobile') { + return ""; } - if (j === 'settleSubBill.openBillStatus') { - let openBillStatus=v['settleSubBill']['openBillStatus']; - if(openBillStatus== 0){ - return '未开票'; - } - else if(openBillStatus == 1){ - return '已开票'; - } - else if(openBillStatus == 2){ - return '部分开票'; - } - else if(openBillStatus == 3){ - return '不开票'; - } - else if(openBillStatus == 4){ - return '已完成'; - } - else{ - return ''; - } - } - if (j === 'settleSubBill.invoicedMoney') { - return v['settleSubBill']['invoicedMoney']; - } - if (j === 'settleSubBill.paymentStatus') { - let paymentStatus=v['settleSubBill']['paymentStatus']; - return this.selectDictLabel(this.dict.type.emis_payment_status,paymentStatus); + 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 === '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 === 'blUploadPic') { + if(v['goodsPics']!=null && v['goodsPics']!=''){ + 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/emisCustomerUser/monthlyShipmentStat.vue b/src/views/emis/emisCustomerUser/monthlyShipmentStat.vue index 7bbfc5f5..64d14bcc 100644 --- a/src/views/emis/emisCustomerUser/monthlyShipmentStat.vue +++ b/src/views/emis/emisCustomerUser/monthlyShipmentStat.vue @@ -2,9 +2,12 @@
- + + @@ -17,18 +20,18 @@ import MonthlyShipmentStatQuery from '@/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue'; - +import monthlyShipmentStatReceiveCountryQuery from '@/views/emis/emisCustomerUser/monthlyShipmentStatReceiveCountryQuery.vue'; export default { name: "MonthlyShipmentStat", components: { MonthlyShipmentStatQuery, - + monthlyShipmentStatReceiveCountryQuery, }, dicts: [ ], data() { return { - activeTab:'payback', + activeTab:'shipment', queryInfo:null, queryType:null, showDtlList:false, diff --git a/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue b/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue index d3a00c98..05182f47 100644 --- a/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue +++ b/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue @@ -118,6 +118,14 @@ + + + + + +
@@ -341,7 +349,7 @@ export default { return prev; } }, 0); - sums[index] = sums[index].toFixed(2); + sums[index] = sums[index].toFixed(0); } else if ( @@ -374,7 +382,7 @@ export default { return prev; } }, 0); - sums[index] = sums[index].toFixed(2); + sums[index] = sums[index].toFixed(0); } else if ( @@ -390,8 +398,20 @@ export default { } }, 0); sums[index] = sums[index].toFixed(2); - } - else if( + } else if ( + column.property === 'airTickets' + ){ + const values = data.map(item => Number(item.airTickets)); + 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); + } else if( column.property === 'airWeight' ){ const values = data.map(item => Number(item.airWeight)); @@ -403,7 +423,7 @@ export default { return prev; } }, 0); - sums[index] = sums[index].toFixed(0); + sums[index] = sums[index].toFixed(2); }else if( column.property === 'landTickets' ){ @@ -416,7 +436,7 @@ export default { return prev; } }, 0); - sums[index] = sums[index].toFixed(2); + sums[index] = sums[index].toFixed(0); }else if( column.property === 'landWeight' ){ @@ -429,7 +449,7 @@ export default { return prev; } }, 0); - sums[index] = sums[index].toFixed(0); + sums[index] = sums[index].toFixed(2); }else if( column.property === 'importTickets' ){ @@ -442,7 +462,7 @@ export default { return prev; } }, 0); - sums[index] = sums[index].toFixed(2); + sums[index] = sums[index].toFixed(0); }else if( column.property === 'importWeight' ){ @@ -455,10 +475,61 @@ export default { return prev; } }, 0); + sums[index] = sums[index].toFixed(2); + }else if( + column.property === 'seaTickets' + ){ + const values = data.map(item => Number(item.seaTickets)); + 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); + }else if( + column.property === 'seaWeight' + ){ + const values = data.map(item => Number(item.seaWeight)); + 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); + }else if( + column.property === 'otherTickets' + ){ + const values = data.map(item => Number(item.otherTickets)); + 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); + }else if( + column.property === 'otherWeight' + ){ + const values = data.map(item => Number(item.otherWeight)); + 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); } }); - console.log(sums); return sums }, handleExportDtl(){ diff --git a/src/views/emis/emisCustomerUser/monthlyShipmentStatReceiveCountryQuery.vue b/src/views/emis/emisCustomerUser/monthlyShipmentStatReceiveCountryQuery.vue new file mode 100644 index 00000000..c5cb8109 --- /dev/null +++ b/src/views/emis/emisCustomerUser/monthlyShipmentStatReceiveCountryQuery.vue @@ -0,0 +1,644 @@ + + + + +