From b9fe3f4808bd3f755cd5846b319e6e3abd368422 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 26 Sep 2024 09:25:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/finance/ReconciliationDepositSlip.js | 12 + .../finance/ReconciliationDepositSlip.js | 749 ++++++++++++++---- src/utils/util.js | 1 + .../distribution/reservation/reservation.vue | 28 +- .../finance/ReconciliationDepositSlip.vue | 216 ++++- 5 files changed, 822 insertions(+), 184 deletions(-) diff --git a/src/api/finance/ReconciliationDepositSlip.js b/src/api/finance/ReconciliationDepositSlip.js index 2850a1f5..b6ce2ace 100644 --- a/src/api/finance/ReconciliationDepositSlip.js +++ b/src/api/finance/ReconciliationDepositSlip.js @@ -13,6 +13,18 @@ export const postPageList = data => { }); }; +/** + * 导出 + */ +export const postOrderInfoListExport = data => { + return request({ + url: '/api/logpm-statisticsdata/merchantStatistics/orderInfoListExport', + method: 'post', + data, + responseType: 'blob' + }); +} + /** * 确认结算 * @param {*} data diff --git a/src/option/finance/ReconciliationDepositSlip.js b/src/option/finance/ReconciliationDepositSlip.js index 2c4a12dd..b0dcb1d7 100644 --- a/src/option/finance/ReconciliationDepositSlip.js +++ b/src/option/finance/ReconciliationDepositSlip.js @@ -1,4 +1,5 @@ -export const columnList = [ +// toB +export const columnListByToB = [ { prop: '', label: '复选框', @@ -26,9 +27,9 @@ export const columnList = [ head: false, }, { - prop: 'waybillNo', - label: '运单号', - type: 2, + prop: 'orderCode', + label: '订单编号', + type: 1, values: '', width: '150', checkarr: [], @@ -37,9 +38,9 @@ export const columnList = [ head: false, }, { - prop: 'orderCode', - label: '订单编号', - type: 1, + prop: 'waybillNo', + label: '运单号', + type: 2, values: '', width: '150', checkarr: [], @@ -48,7 +49,7 @@ export const columnList = [ head: false, }, { - prop: 'createTime', + prop: 'shipper', label: '发货单位', type: 1, values: '', @@ -59,7 +60,7 @@ export const columnList = [ head: false, }, { - prop: 'userName', + prop: 'consignee', label: '收货单位', type: 1, values: '', @@ -70,8 +71,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '运单类型', + prop: 'destinationWarehouseName', + label: '目的仓', type: 1, values: '', width: '150', @@ -81,8 +82,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '服务类型', + prop: 'departureWarehouseName', + label: '发站仓', type: 1, values: '', width: '150', @@ -92,8 +93,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '运单状态', + prop: 'signStatusName', + label: '签收状态', type: 1, values: '', width: '150', @@ -103,8 +104,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '运单标识', + prop: 'typeServiceName', + label: '订单类型', type: 1, values: '', width: '150', @@ -114,7 +115,7 @@ export const columnList = [ head: false, }, { - prop: 'templateType', + prop: 'openTime', label: '开单时间', type: 1, values: '', @@ -125,7 +126,7 @@ export const columnList = [ head: false, }, { - prop: 'templateType', + prop: 'goodsName', label: '货物品类', type: 1, values: '', @@ -136,8 +137,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '品类件数', + prop: 'totalNum', + label: '总件数', type: 1, values: '', width: '150', @@ -147,8 +148,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '品类数', + prop: 'totalWeight', + label: '总重量', type: 1, values: '', width: '150', @@ -158,8 +159,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '总件数', + prop: 'totalVolume', + label: '总体积', type: 1, values: '', width: '150', @@ -169,8 +170,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '总重量', + prop: 'systemTotalFee', + label: '订单开单价', type: 1, values: '', width: '150', @@ -180,8 +181,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '总体积', + prop: 'totalFee', + label: '实际费用', type: 1, values: '', width: '150', @@ -191,8 +192,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '开单总费用', + prop: 'systemFreightPrice', + label: '开单运费', type: 1, values: '', width: '150', @@ -202,8 +203,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '预对账总金额', + prop: 'freightPrice', + label: '实际运费', type: 1, values: '', width: '150', @@ -213,8 +214,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '干线品类单价', + prop: 'systemPickupPrice', + label: '开单提货费', type: 1, values: '', width: '150', @@ -224,8 +225,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '仓储品类单价', + prop: 'pickupPrice', + label: '实际提货费', type: 1, values: '', width: '150', @@ -235,8 +236,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '配送品类单价', + prop: 'warehouseServiceFee', + label: '仓储服务费合计', type: 1, values: '', width: '150', @@ -246,8 +247,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '提货费', + prop: 'warehouseFee', + label: '仓储费', type: 1, values: '', width: '150', @@ -257,8 +258,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '干线费', + prop: 'warehouseManagementFee', + label: '仓储管理费', type: 1, values: '', width: '150', @@ -268,8 +269,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '在库周期', + prop: 'warehouseSortingFee', + label: '仓储分拣费', type: 1, values: '', width: '150', @@ -279,8 +280,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '仓储计费区间', + prop: 'warehouseOprationFee', + label: '仓储操作费', type: 1, values: '', width: '150', @@ -290,8 +291,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '仓储服务费合计', + prop: 'deliveryServiceFee', + label: '配送费服务费合计', type: 1, values: '', width: '150', @@ -301,8 +302,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '仓储费', + prop: 'systemDeliveryFee', + label: '开单配送费', type: 1, values: '', width: '150', @@ -312,8 +313,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '仓储管理费', + prop: 'deliveryFee', + label: '实际配送费', type: 1, values: '', width: '150', @@ -323,8 +324,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '仓储分拣费', + prop: 'deliveryHandlingFee', + label: '配送装卸费', type: 1, values: '', width: '150', @@ -334,8 +335,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '仓储操作费', + prop: 'deliverySortingFee', + label: '配送分货费', type: 1, values: '', width: '150', @@ -345,8 +346,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '配送费服务费合计', + prop: 'deliveryUpfloorFee', + label: '配送上楼费', type: 1, values: '', width: '150', @@ -356,8 +357,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '配送费', + prop: 'deliveryMoveFee', + label: '配送平移费', type: 1, values: '', width: '150', @@ -367,8 +368,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '配送装卸费', + prop: 'deliveryOtherFee', + label: '配送其它费', type: 1, values: '', width: '150', @@ -378,8 +379,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '配送分货费', + prop: 'deliveryLineFee', + label: '超区公里费', type: 1, values: '', width: '150', @@ -389,8 +390,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '配送上楼费', + prop: 'installFee', + label: '安装费', type: 1, values: '', width: '150', @@ -400,8 +401,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '配送平移费', + prop: 'otherFee', + label: '其他费用', type: 1, values: '', width: '150', @@ -411,8 +412,30 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '配送公里数', + prop: 'shipperName', + label: '发货人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'shipperMobile', + label: '发货人手机号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'shipperAddress', + label: '发货地址', type: 1, values: '', width: '150', @@ -422,8 +445,41 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '安装费', + prop: 'destination', + label: '到站', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'consigneeName', + label: '收货人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'consigneeMobile', + label: '收货人手机号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'consigneeAddress', + label: '收货地址', type: 1, values: '', width: '150', @@ -433,8 +489,56 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '保价费', + prop: 'customerTrain', + label: '客户车次', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'cleanObjTypeName', + label: '结算方', + type: 3, + values: '', + width: '150', + checkarr: [ + { label: '工厂', value: 1 }, + { label: '商场', value: 2 }, + { label: '商家个人', value: 3 }, + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'payTypeName', + label: '支付方式', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'payWayName', + label: '付款方式', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'signNum', + label: '已签收件数', type: 1, values: '', width: '150', @@ -444,8 +548,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '申明价值', + prop: 'signTime', + label: '签收时间', type: 1, values: '', width: '150', @@ -455,8 +559,103 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '其他费用', + prop: 'syncFeeStatus', + label: '是否计算价格', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'syncFeeDate', + label: '计算价格时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: '', + label: '操作', + type: 6, + values: '', + width: '120', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; + +// toC +export const columnListByToC = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'brand', + label: '品牌', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单编号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'waybillNo', + label: '运单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'shipper', + label: '发货单位', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'consignee', + label: '收货单位', type: 1, values: '', width: '150', @@ -466,8 +665,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '回扣', + prop: 'destinationWarehouseName', + label: '目的仓', type: 1, values: '', width: '150', @@ -477,8 +676,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '三方操作费', + prop: 'departureWarehouseName', + label: '发站仓', type: 1, values: '', width: '150', @@ -488,8 +687,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '发货人', + prop: 'signStatusName', + label: '签收状态', type: 1, values: '', width: '150', @@ -499,8 +698,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '发货手机号', + prop: 'typeServiceName', + label: '订单类型', type: 1, values: '', width: '150', @@ -510,8 +709,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '发货地址', + prop: 'openTime', + label: '开单时间', type: 1, values: '', width: '150', @@ -521,8 +720,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '到站', + prop: 'goodsName', + label: '货物品类', type: 1, values: '', width: '150', @@ -532,8 +731,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '目的仓', + prop: 'totalNum', + label: '总件数', type: 1, values: '', width: '150', @@ -543,8 +742,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '发站仓', + prop: 'totalWeight', + label: '总重量', type: 1, values: '', width: '150', @@ -554,8 +753,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '收货人', + prop: 'totalVolume', + label: '总体积', type: 1, values: '', width: '150', @@ -565,8 +764,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '收货人手机号', + prop: 'systemTotalFee', + label: '订单开单价', type: 1, values: '', width: '150', @@ -576,8 +775,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '收货地址', + prop: 'totalFee', + label: '实际费用', type: 1, values: '', width: '150', @@ -587,8 +786,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '进货方式', + prop: 'systemFreightPrice', + label: '开单运费', type: 1, values: '', width: '150', @@ -598,8 +797,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '客户车次', + prop: 'freightPrice', + label: '实际运费', type: 1, values: '', width: '150', @@ -609,8 +808,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '回单状态', + prop: 'systemPickupPrice', + label: '开单提货费', type: 1, values: '', width: '150', @@ -620,8 +819,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '运单备注', + prop: 'pickupPrice', + label: '实际提货费', type: 1, values: '', width: '150', @@ -631,8 +830,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '结算方', + prop: 'warehouseServiceFee', + label: '仓储服务费合计', type: 1, values: '', width: '150', @@ -642,8 +841,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '支付方式', + prop: 'warehouseFee', + label: '仓储费', type: 1, values: '', width: '150', @@ -653,8 +852,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '付款方式', + prop: 'warehouseManagementFee', + label: '仓储管理费', type: 1, values: '', width: '150', @@ -664,8 +863,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '现付', + prop: 'warehouseSortingFee', + label: '仓储分拣费', type: 1, values: '', width: '150', @@ -675,8 +874,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '到付', + prop: 'warehouseOprationFee', + label: '仓储操作费', type: 1, values: '', width: '150', @@ -686,8 +885,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '回付', + prop: 'deliveryServiceFee', + label: '配送费服务费合计', type: 1, values: '', width: '150', @@ -697,8 +896,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '月结', + prop: 'systemDeliveryFee', + label: '开单配送费', type: 1, values: '', width: '150', @@ -708,8 +907,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '是否售后', + prop: 'deliveryFee', + label: '实际配送费', type: 1, values: '', width: '150', @@ -719,8 +918,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '售后价格', + prop: 'deliveryHandlingFee', + label: '配送装卸费', type: 1, values: '', width: '150', @@ -730,8 +929,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '预存单状态', + prop: 'deliverySortingFee', + label: '配送分货费', type: 1, values: '', width: '150', @@ -741,8 +940,8 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '预存单确认人', + prop: 'deliveryUpfloorFee', + label: '配送上楼费', type: 1, values: '', width: '150', @@ -752,8 +951,221 @@ export const columnList = [ head: false, }, { - prop: 'templateType', - label: '预存单确认时间', + prop: 'deliveryMoveFee', + label: '配送平移费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryOtherFee', + label: '配送其它费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryLineFee', + label: '超区公里费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'installFee', + label: '安装费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'otherFee', + label: '其他费用', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'shipperName', + label: '发货人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'shipperMobile', + label: '发货人手机号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'shipperAddress', + label: '发货地址', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'destination', + label: '到站', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'consigneeName', + label: '收货人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'consigneeMobile', + label: '收货人手机号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'consigneeAddress', + label: '收货地址', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'customerTrain', + label: '客户车次', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'cleanObjTypeName', + label: '结算方', + type: 3, + values: '', + width: '150', + checkarr: [ + { label: '工厂', value: 1 }, + { label: '商场', value: 2 }, + { label: '商家个人', value: 3 }, + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'payTypeName', + label: '支付方式', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'payWayName', + label: '付款方式', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'signNum', + label: '已签收件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'signTime', + label: '签收时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'syncFeeStatus', + label: '是否计算价格', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'syncFeeDate', + label: '计算价格时间', type: 1, values: '', width: '150', @@ -774,4 +1186,73 @@ export const columnList = [ }, ]; -export default columnList; +/** 生成对账单 */ +export const confirmColumnList = [ + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: false, + }, + { + prop: 'orderCode', + label: '订单号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'totalNum', + label: '件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, + }, + { + prop: 'totalVolume', + label: '方数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, + }, + { + prop: 'totalWeight', + label: '重量', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, + }, + { + prop: 'totalFee', + label: '金额', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, + }, +]; \ No newline at end of file diff --git a/src/utils/util.js b/src/utils/util.js index fd53c818..94f83a45 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -495,6 +495,7 @@ export const getWinHeight = () => { */ export const setNodeHeight = async (_node, _height = '', isDelayed = false) => { const _fn = async (_node, _height) => { + console.log('123123 :>> ', 123123); await nextTick(); const _defaultHeight = getWinHeight(); // 判断是否传入的是数组 diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue index 1e6d8832..205673e7 100644 --- a/src/views/distribution/reservation/reservation.vue +++ b/src/views/distribution/reservation/reservation.vue @@ -1496,20 +1496,20 @@ export default { item.periodOfTime = d.dictValue; } }); - let pa = []; - if (item.serveType.length > 1) { - pa = item.serveType.split(','); - } else { - pa.push(item.serveType); - } - this.addvalueServeTypeData.forEach(f => { - pa.forEach((p, index) => { - if (p === f.dictKey) { - pa[index] = f.dictValue; - } - }); - }); - item.serveType = pa.join(','); + // let pa = []; + // if (item.serveType.length > 1) { + // pa = item.serveType.split(','); + // } else { + // pa.push(item.serveType); + // } + // this.addvalueServeTypeData.forEach(f => { + // pa.forEach((p, index) => { + // if (p === f.dictKey) { + // pa[index] = f.dictValue; + // } + // }); + // }); + // item.serveType = pa.join(','); }); } this.page.total = data.total; diff --git a/src/views/finance/ReconciliationDepositSlip.vue b/src/views/finance/ReconciliationDepositSlip.vue index b0ca97fb..350eda2b 100644 --- a/src/views/finance/ReconciliationDepositSlip.vue +++ b/src/views/finance/ReconciliationDepositSlip.vue @@ -26,16 +26,13 @@ 生成对账单 - - 计算费用 - 导 出
- +
@@ -46,14 +43,14 @@ :columnList="item.columnList" :tableData="details.data" :loading="details.loadingObj.list" - @inputTxt="inputsc" + @inputTxt="(val, col)=> inputsc(val, col, item)" @timeCheck="timesc" - @selectCheck="selectsc" + @selectCheck="(val, col)=> selectsc(val, col, item)" @selection="selectionChange" > @@ -77,12 +74,72 @@ + + + + + + + + +
+ + 取 消 + + + + + 提 交 + +
+ @@ -95,7 +152,7 @@ import dayjs from 'dayjs'; import { mapGetters } from 'vuex'; /** 获取字典 */ import { getDictionaryBiz } from '@/api/system/dict'; -import { postPageList, postCheckBalance, postReal } from '@/api/finance/ReconciliationDepositSlip'; +import { postPageList, postCheckBalance, postReal,postOrderInfoListExport } from '@/api/finance/ReconciliationDepositSlip'; import { downloadXls, setNodeHeight, @@ -104,8 +161,9 @@ import { handleInputQuery, handleSelectQuery, handleTranslationDataSeclect, + getObjType } from '@/utils/util'; -import { columnList } from '@/option/finance/ReconciliationDepositSlip'; +import { columnListByToB, columnListByToC,confirmColumnList } from '@/option/finance/ReconciliationDepositSlip'; import { useRouter } from 'vue-router'; import { deepClone } from '@/utils/util'; import { ElMessage, ElMessageBox } from 'element-plus'; @@ -118,14 +176,14 @@ const details = reactive({ search: true, pageInfo: [ { - title: 'toB运单对账', - columnList: deepClone(columnList), + title: 'toB', + columnList: deepClone(columnListByToB), query: {}, name: 1 }, { - title: 'toC订单对账', - columnList: deepClone(columnList), + title: 'toC', + columnList: deepClone(columnListByToC), query: {}, name: 2 } @@ -161,7 +219,6 @@ const details = reactive({ }, }, ], - /** 列表 */ /** 列表数据 */ data: [], /** 页面loading */ @@ -170,10 +227,20 @@ const details = reactive({ list: false, pageLoading: false, }, + /** 全屏 */ + fullscreenObj: { + /** 开标签 */ + confirmVisited: false, + }, + /** 弹出层显示 */ + popUpShow: { + /** 新增标签 */ + confirmVisited: false, + }, /** 列表复选框选中的数据 */ selectionList: [], - /** 是否显示设置表格 */ - drawerShow: false, + /** 生成对账单表头 */ + confirmColumnList: deepClone(confirmColumnList), /** 分页参数 */ page: { pageNum: 1, @@ -202,12 +269,14 @@ onMounted(async () => { }); /** 请求页面数据 */ -const onLoad = async (params = {}) => { +const onLoad = async () => { try { // 开启列表loading动画 details.loadingObj.list = true; - const submitData = { ...details.query, ...params, ...details.page }; + const {query, columnList} = ( details.pageStatus === 1 ?details.pageInfo[0]: details.pageInfo[1]) + + const submitData = { query, ...details.page }; // listType 1 -- toB ; 2 -- toC submitData.listType = details.pageStatus; @@ -220,7 +289,7 @@ const onLoad = async (params = {}) => { details.page.total = data.total; handleTranslationDataSeclect( details.data, - details.pageStatus === 1 ? details.columnList1 : details.columnList2 + columnList ); return res.data; @@ -231,10 +300,10 @@ const onLoad = async (params = {}) => { } }; -const initOnLoad = (params = {}) => { +const initOnLoad = () => { details.page.pageNum = 1; details.page.total = 0; - onLoad(params); + onLoad(); }; initOnLoad(); @@ -254,7 +323,7 @@ const searchReset = () => { }; /** 展开列表控件 */ -const showdrawer = (_flag?: boolean, item) => { +const showdrawer = ( item:any, _flag?: boolean) => { item.drawerShow = _flag; }; @@ -268,8 +337,8 @@ const searchHide = () => { }; /** 表格表头输入框搜索 */ -const inputsc = (index, col) => { - handleInputQuery(index, col, details.pageStatus === 1 ? details.query1 : details.query2); +const inputsc = (index, col, item) => { + handleInputQuery(index, col, item.query); initOnLoad(); }; @@ -287,8 +356,8 @@ const timesc = (index, row) => { }; /** 表格表头下拉框选择 */ -const selectsc = (index, colors) => { - handleSelectQuery(index, colors, details.pageStatus === 1 ? details.query1 : details.query2); +const selectsc = (index, colors, item) => { + handleSelectQuery(index, colors, item.query); initOnLoad(); }; @@ -321,8 +390,34 @@ const handleClickTab = async e => { initOnLoad(); }; -/** 批量对账单确认 */ -const handleConfirm = () => { +/** + * 是否开启全屏 + * @params(_type) 开启或关闭 + */ +const handleFullScrean = (_type: 'open' | 'close', _name: string) => { + let _node: any = ''; + if (_name) _node = document.querySelector(`.${_name} .maboxhi`); + + switch (_name) { + case 'confirmVisited': + details.fullscreenObj.confirmVisited = + !details.fullscreenObj.confirmVisited; + + if (_type === 'close') { + if (_node) setNodeHeight(_node, '500px', true); + } else { + if (_node) setNodeHeight(_node,'', true); + } + break; + + default: + details.fullscreenObj[_name] = !details.fullscreenObj[_name]; + break; + } +}; + +/** 生成对账单 */ +const handleConfirm = async () => { if (details.selectionList.length === 0) return ElMessage.warning('请选择需要确认的数据'); const _errorArr = []; @@ -337,6 +432,14 @@ const handleConfirm = () => { if (_errorArr.length > 0) return ElMessage.warning(`订单【 ${_errorArr.join('、')} 】-- 已确认，请勿重复确认`); + + details.popUpShow.confirmVisited = true + await nextTick() + const _node = document.querySelector(`.confirmVisited .maboxhi`); + setNodeHeight(_node, details.popUpShow.confirmVisited ? '' : '500px', true); +}; + +const handleSubmitConfrim= ()=>{ ElMessageBox.confirm('是否确认对账单?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -346,7 +449,7 @@ const handleConfirm = () => { details.loadingObj.pageLoading = true; const submitData = { - orderInfoIds: _arr, + orderInfoIds: details.selectionList.map(val => val.orderInfoId), }; const res = await postCheckBalance(submitData); @@ -361,7 +464,7 @@ const handleConfirm = () => { details.loadingObj.pageLoading = false; } }); -}; +} /** 计算仓储&配送费用 */ const handleComputedPrice = ({ row }) => { @@ -393,11 +496,43 @@ const handleExport = () => { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', - }).then(() => { - ElMessage({ - type: 'success', - message: '导出成功!', - }); + }).then(async() => { + try { + details.loadingObj.pageLoading = true + + const submitData=details.pageStatus === 1 ? + { ...details.pageInfo[0].query } : + { ...details.pageInfo[1].query } + + submitData.listType = details.pageStatus; + + if (getObjType(submitData.createTimeArr) === 'array' && submitData.createTimeArr.length > 0){ + submitData.createTimeStartStr = submitData.createTimeArr[0] + submitData.createTimeEndStr = submitData.createTimeArr[1] + } + + if (getObjType(submitData.checkTimeArr) === 'array' && submitData.checkTimeArr.length > 0){ + submitData.checkTimeStartStr = submitData.checkTimeArr[0] + submitData.checkTimeEndStr = submitData.checkTimeArr[1] + } + + delete submitData.createTimeArr + delete submitData.checkTimeArr + + const res = await postOrderInfoListExport(submitData) + + const {status, data} = res + if (status !== 200) return + downloadXls(data, details.pageStatus === 1 ? '对账预存单toB.xlsx': '对账预存单toC.xlsx') + + ElMessage.success('导出成功!'); + } catch (error) { + console.log('error :>> ', error); + }finally{ + details.loadingObj.pageLoading = false + } + + }); }; @@ -412,4 +547,13 @@ const handleExport = () => { :deep(.el-range-editor.el-input__wrapper) { height: 100% !important; } + +// 弹窗 +:deep(.el-overlay) { + position: absolute; +} + +:deep(.el-overlay-dialog) { + position: absolute; +}