From e1f1f7c0ae6f418fcc6df6b1b6ded25813e026f1 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 6 Aug 2024 18:31:09 +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/option/finance/CustomerSettlement.js | 884 ++++++-------------- src/option/finance/MerchantDepositSlip.js | 960 ++++++---------------- src/views/finance/CustomerSettlement.vue | 2 +- 3 files changed, 504 insertions(+), 1342 deletions(-) diff --git a/src/option/finance/CustomerSettlement.js b/src/option/finance/CustomerSettlement.js index dfcf94d8..3ba34c41 100644 --- a/src/option/finance/CustomerSettlement.js +++ b/src/option/finance/CustomerSettlement.js @@ -47,42 +47,9 @@ export const columnList = [ 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', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - // { - // prop: 'templateType', - // label: '运单类型', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, // { - // prop: 'templateType', - // label: '服务类型', + // prop: 'shipper', + // label: '发货单位', // type: 1, // values: '', // width: '150', @@ -92,8 +59,8 @@ export const columnList = [ // head: false, // }, { - prop: 'waybillStatus', - label: '运单状态', + prop: 'consignee', + label: '收货单位', type: 1, values: '', width: '150', @@ -103,8 +70,8 @@ export const columnList = [ head: false, }, // { - // prop: 'templateType', - // label: '运单标识', + // prop: 'departureWarehouseName', + // label: '始发仓', // type: 1, // values: '', // width: '150', @@ -114,19 +81,8 @@ export const columnList = [ // head: false, // }, { - prop: 'openTime', - label: '开单时间', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'goodsName', - label: '货物品类', + prop: 'destinationWarehouseName', + label: '目的仓', type: 1, values: '', width: '150', @@ -135,31 +91,9 @@ export const columnList = [ sortable: true, head: false, }, - // { - // prop: 'templateType', - // label: '品类件数', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '品类数', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, { - prop: 'totalcount', - label: '总件数', + prop: 'waybillStatus', + label: '结算状态', type: 1, values: '', width: '150', @@ -169,8 +103,8 @@ export const columnList = [ head: false, }, { - prop: 'totalWeight', - label: '总重量', + prop: 'templateType', + label: '结算单总金额', type: 1, values: '', width: '150', @@ -180,8 +114,8 @@ export const columnList = [ head: false, }, { - prop: 'totalVolume', - label: '总体积', + prop: 'templateType', + label: '已结算金额', type: 1, values: '', width: '150', @@ -191,8 +125,8 @@ export const columnList = [ head: false, }, { - prop: 'openFee', - label: '开单总费用', + prop: 'templateType', + label: '待结算金额', type: 1, values: '', width: '150', @@ -202,8 +136,8 @@ export const columnList = [ head: false, }, // { - // prop: 'templateType', - // label: '预对账金额', + // prop: 'statementStatus', + // label: '对账状态', // type: 1, // values: '', // width: '150', @@ -213,8 +147,8 @@ export const columnList = [ // head: false, // }, // { - // prop: 'templateType', - // label: '干线品类单价', + // prop: 'totalStatementFee', + // label: '对账单金额', // type: 1, // values: '', // width: '150', @@ -224,8 +158,8 @@ export const columnList = [ // head: false, // }, // { - // prop: 'templateType', - // label: '仓储品类单价', + // prop: 'openTime', + // label: '开单时间', // type: 1, // values: '', // width: '150', @@ -235,8 +169,8 @@ export const columnList = [ // head: false, // }, // { - // prop: 'templateType', - // label: '配送品类单价', + // prop: 'goodsName', + // label: '货物品类', // type: 1, // values: '', // width: '150', @@ -246,8 +180,8 @@ export const columnList = [ // head: false, // }, { - prop: 'pickupFee', - label: '开单提货费', + prop: 'totalcount', + label: '总件数', type: 1, values: '', width: '150', @@ -257,8 +191,8 @@ export const columnList = [ head: false, }, { - prop: 'realPickupFee', - label: '实际提货费', + prop: 'totalWeight', + label: '总重量', type: 1, values: '', width: '150', @@ -268,8 +202,8 @@ export const columnList = [ head: false, }, { - prop: 'freightFee', - label: '开单运费', + prop: 'totalVolume', + label: '总体积', type: 1, values: '', width: '150', @@ -279,8 +213,8 @@ export const columnList = [ head: false, }, { - prop: 'realFreightFee', - label: '实际运费', + prop: 'openFee', + label: '订单开单总费用', type: 1, values: '', width: '150', @@ -290,8 +224,8 @@ export const columnList = [ head: false, }, { - prop: 'installFee', - label: '开单安装费', + prop: 'openFee', + label: '订单实际总费用', type: 1, values: '', width: '150', @@ -301,8 +235,8 @@ export const columnList = [ head: false, }, { - prop: 'realInstallFee', - label: '实际安装费', + prop: 'pickupFee', + label: '开单提货费', type: 1, values: '', width: '150', @@ -312,8 +246,8 @@ export const columnList = [ head: false, }, { - prop: 'quotationFee', - label: '开单保价费', + prop: 'realPickupFee', + label: '实际提货费', type: 1, values: '', width: '150', @@ -323,8 +257,8 @@ export const columnList = [ head: false, }, { - prop: 'realQuotationFee', - label: '实际保价费', + prop: 'freightFee', + label: '开单运费', type: 1, values: '', width: '150', @@ -334,8 +268,8 @@ export const columnList = [ head: false, }, { - prop: 'claimingValue', - label: '开单申明价值', + prop: 'realFreightFee', + label: '实际运费', type: 1, values: '', width: '150', @@ -345,8 +279,8 @@ export const columnList = [ head: false, }, { - prop: 'realClaimingValue', - label: '实际申明价值', + prop: 'realWarehouseServiceFee', + label: '仓储服务费', type: 1, values: '', width: '150', @@ -356,8 +290,8 @@ export const columnList = [ head: false, }, { - prop: 'otherFee', - label: '开单其它费', + prop: 'realWarehouseFee', + label: '仓储费', type: 1, values: '', width: '150', @@ -367,8 +301,8 @@ export const columnList = [ head: false, }, { - prop: 'realOtherFee', - label: '实际其他费', + prop: 'realWarehouseManageFee', + label: '仓储管理费', type: 1, values: '', width: '150', @@ -378,8 +312,8 @@ export const columnList = [ head: false, }, { - prop: 'returnFee', - label: '开单回扣', + prop: 'realWarehouseSortingFee', + label: '仓储分拣费', type: 1, values: '', width: '150', @@ -389,8 +323,8 @@ export const columnList = [ head: false, }, { - prop: 'realReturnFee', - label: '实际回扣', + prop: 'realWarehouseOperatingFee', + label: '仓储操作费', type: 1, values: '', width: '150', @@ -400,8 +334,8 @@ export const columnList = [ head: false, }, { - prop: 'thirdOprationFee', - label: '开单三方操作费', + prop: 'deliveryServiceFee', + label: '开单配送服务费', type: 1, values: '', width: '150', @@ -411,8 +345,8 @@ export const columnList = [ head: false, }, { - prop: 'realThirdOprationFee', - label: '实际三方操作费', + prop: 'realDeliveryServiceFee', + label: '实际配送服务费', type: 1, values: '', width: '150', @@ -422,8 +356,8 @@ export const columnList = [ head: false, }, { - prop: 'xPay', - label: '开单现付', + prop: 'deliveryFee', + label: '开单配送费', type: 1, values: '', width: '150', @@ -433,8 +367,8 @@ export const columnList = [ head: false, }, { - prop: 'realXPay', - label: '实际现付', + prop: 'realDeliveryFee', + label: '实际配送费', type: 1, values: '', width: '150', @@ -444,8 +378,8 @@ export const columnList = [ head: false, }, { - prop: 'dPay', - label: '开单到付', + prop: 'realDeliveryLoadingFee', + label: '配送操作装卸费', type: 1, values: '', width: '150', @@ -455,8 +389,8 @@ export const columnList = [ head: false, }, { - prop: 'realDPay', - label: '实际到付', + prop: 'realDeliverySortingFee', + label: '配送分货费', type: 1, values: '', width: '150', @@ -466,8 +400,8 @@ export const columnList = [ head: false, }, { - prop: 'hPay', - label: '开单回付', + prop: 'realDeliveryUpfloorFee', + label: '配送上楼费', type: 1, values: '', width: '150', @@ -477,8 +411,8 @@ export const columnList = [ head: false, }, { - prop: 'realHPay', - label: '实际回付', + prop: 'realDeliveryMoveFee', + label: '配送平移费', type: 1, values: '', width: '150', @@ -488,8 +422,8 @@ export const columnList = [ head: false, }, { - prop: 'yPay', - label: '开单月结', + prop: 'realDeliveryCrossingFee', + label: '配送超区费', type: 1, values: '', width: '150', @@ -499,8 +433,8 @@ export const columnList = [ head: false, }, { - prop: 'realYPay', - label: '实际月付', + prop: 'realInstallFee', + label: '安装费', type: 1, values: '', width: '150', @@ -510,8 +444,8 @@ export const columnList = [ head: false, }, { - prop: 'incomingTime', - label: '入库时间', + prop: 'realOtherFee', + label: '其他费', type: 1, values: '', width: '150', @@ -520,9 +454,119 @@ export const columnList = [ sortable: true, head: false, }, + // { + // prop: 'realQuotationFee', + // label: '保价费', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'realClaimingValue', + // label: '申明价值', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'realReturnFee', + // label: '回扣', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'realThirdOprationFee', + // label: '三方操作费', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'realDeliveryDistance', + // label: '实际配送公里数', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'realXPay', + // label: '现付', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'realDPay', + // label: '到付', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'realHPay', + // label: '实际回付', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'yPay', + // label: '开单月结', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'realYPay', + // label: '实际月付', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { - prop: 'outingTime', - label: '出库时间', + prop: 'totalStatementFee', + label: '是否售后', type: 1, values: '', width: '150', @@ -532,8 +576,8 @@ export const columnList = [ head: false, }, { - prop: 'warehouseServiceFee', - label: '开单仓库服务费', + prop: 'totalStatementFee', + label: '售后金额', type: 1, values: '', width: '150', @@ -543,19 +587,22 @@ export const columnList = [ head: false, }, { - prop: 'realWarehouseServiceFee', - label: '实际仓库服务费', + prop: 'isChangesName', + label: '是否异动', type: 1, values: '', width: '150', - checkarr: [], + checkarr: [ + { label: '是', value: 1 }, + { label: '否', value: 0 }, + ], fixed: false, sortable: true, head: false, }, { - prop: 'warehouseFee', - label: '开单仓储费', + prop: 'changesFee', + label: '异动金额', type: 1, values: '', width: '150', @@ -565,30 +612,36 @@ export const columnList = [ head: false, }, { - prop: 'realWarehouseFee', - label: '实际仓储费', + prop: 'changesItems', + label: '异动条目', type: 1, values: '', width: '150', - checkarr: [], + checkarr: [ + { label: '是', value: 1 }, + { label: '否', value: 0 }, + ], fixed: false, sortable: true, head: false, }, { - prop: 'warehouseManageFee', - label: '开单仓储管理费', + prop: 'changesRemark', + label: '异动备注', type: 1, values: '', width: '150', - checkarr: [], + checkarr: [ + { label: '是', value: 1 }, + { label: '否', value: 0 }, + ], fixed: false, sortable: true, head: false, }, { - prop: 'realWarehouseManageFee', - label: '实际仓储管理费', + prop: 'templateType', + label: '异动操作人', type: 1, values: '', width: '150', @@ -598,8 +651,8 @@ export const columnList = [ head: false, }, { - prop: 'warehouseSortingFee', - label: '开单仓储分拣费', + prop: 'statementCreateTime', + label: '对账确认时间', type: 1, values: '', width: '150', @@ -609,8 +662,8 @@ export const columnList = [ head: false, }, { - prop: 'realWarehouseSortingFee', - label: '实际仓储分拣费', + prop: 'statementCreateUser', + label: '对账确认人', type: 1, values: '', width: '150', @@ -620,8 +673,8 @@ export const columnList = [ head: false, }, { - prop: 'warehouseOperatingFee', - label: '开单仓储操作费', + prop: 'incomingTime', + label: '入库时间', type: 1, values: '', width: '150', @@ -631,8 +684,8 @@ export const columnList = [ head: false, }, { - prop: 'realWarehouseOperatingFee', - label: '实际仓储操作费', + prop: 'outingTime', + label: '出库时间', type: 1, values: '', width: '150', @@ -642,8 +695,8 @@ export const columnList = [ head: false, }, { - prop: 'deliveryServiceFee', - label: '开单配送服务费', + prop: 'templateType', + label: '出库周期', type: 1, values: '', width: '150', @@ -653,140 +706,8 @@ export const columnList = [ head: false, }, { - prop: 'realDeliveryServiceFee', - label: '实际配送服务费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliveryFee', - label: '开单配送费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realDeliveryFee', - label: '实际配送费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliveryLoadingFee', - label: '配送装卸费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realDeliveryLoadingFee', - label: '实际配送装卸费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliverySortingFee', - label: '配送分拣费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realDeliverySortingFee', - label: '实际配送分拣费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliveryUpfloorFee', - label: '开单配送上楼费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realDeliveryUpfloorFee', - label: '实际配送上楼费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliveryMoveFee', - label: '开单配送平移费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realDeliveryMoveFee', - label: '实际平移费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliveryDistance', - label: '开单配送公里数', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realDeliveryDistance', - label: '实际配送公里数', + prop: 'templateType', + label: '结算方', type: 1, values: '', width: '150', @@ -796,8 +717,8 @@ export const columnList = [ head: false, }, { - prop: 'deliveryCrossingFee', - label: '开单超区费', + prop: 'payWay', + label: '支付方式', type: 1, values: '', width: '150', @@ -807,8 +728,8 @@ export const columnList = [ head: false, }, { - prop: 'realDeliveryCrossingFee', - label: '实际超区费', + prop: 'templateType', + label: '付款方式', type: 1, values: '', width: '150', @@ -818,8 +739,8 @@ export const columnList = [ head: false, }, { - prop: 'totalStatementFee', - label: '对账总金额', + prop: 'templateType', + label: '服务号', type: 1, values: '', width: '150', @@ -828,50 +749,6 @@ export const columnList = [ sortable: true, head: false, }, - // { - // prop: 'templateType', - // label: '干线费', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '在库周期', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '仓储计费区间', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '仓储服务费合计', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, { prop: 'shipperPerson', label: '发货人', @@ -905,50 +782,6 @@ export const columnList = [ sortable: true, head: false, }, - { - prop: 'destination', - label: '到站', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'destinationWarehouseName', - label: '目的仓', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'departure', - label: '发站', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'departureWarehouseName', - label: '发站仓', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, { prop: 'consigneePerson', label: '收货人', @@ -971,238 +804,9 @@ export const columnList = [ sortable: true, head: false, }, - { - prop: 'consigneeAddress', - label: '收货地址', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - // { - // prop: 'templateType', - // label: '进货方式', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - { - prop: 'customerTrain', - label: '客户车次', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - // { - // prop: 'templateType', - // label: '回单状态', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - { - prop: 'waybillRemark', - label: '运单备注', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, { prop: 'templateType', - label: '结算方', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'payWay', - label: '支付方式', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'payType', - label: '支付类型', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'isChangesName', - label: '是否异动', - type: 1, - values: '', - width: '150', - checkarr: [ - { label: '是', value: 1 }, - { label: '否', value: 0 }, - ], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'changesFee', - label: '异动金额', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'changesItems', - label: '异动条目', - type: 1, - values: '', - width: '150', - checkarr: [ - { label: '是', value: 1 }, - { label: '否', value: 0 }, - ], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'changesRemark', - label: '异动备注', - type: 1, - values: '', - width: '150', - checkarr: [ - { label: '是', value: 1 }, - { label: '否', value: 0 }, - ], - fixed: false, - sortable: true, - head: false, - }, - // { - // prop: 'templateType', - // label: '付款方式', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '现付', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '到付', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '回付', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '月结', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '是否售后', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '售后价格', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - { - prop: 'totalStatementFee', - label: '对账单总金额', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'statementStatus', - label: '对账状态', + label: '收货人地址', type: 1, values: '', width: '150', @@ -1212,30 +816,8 @@ export const columnList = [ head: false, }, { - prop: 'hasStatementFee', - label: '已对账金额', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - // { - // prop: 'templateType', - // label: '未对账金额', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - { - prop: 'statementCreateUser', - label: '对账确认人', + prop: 'departure', + label: '发站', type: 1, values: '', width: '150', @@ -1245,8 +827,8 @@ export const columnList = [ head: false, }, { - prop: 'statementCreateTime', - label: '对账确认时间', + prop: 'destination', + label: '到站', type: 1, values: '', width: '150', diff --git a/src/option/finance/MerchantDepositSlip.js b/src/option/finance/MerchantDepositSlip.js index 22616768..9d859085 100644 --- a/src/option/finance/MerchantDepositSlip.js +++ b/src/option/finance/MerchantDepositSlip.js @@ -69,130 +69,9 @@ export const columnList = [ sortable: true, head: false, }, - // { - // prop: 'templateType', - // label: '运单类型', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '服务类型', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - { - prop: 'waybillStatusName', - label: '运单状态', - type: 1, - values: '', - width: '150', - checkarr: [ - { label: '未入库', value: '0' }, - { label: '部分入库', value: '10' }, - { label: '入库', value: '20' }, - { label: '部分中转', value: '30' }, - { label: '中转', value: '40' }, - { label: '目的仓部分到达', value: '60' }, - { label: '配送部分装车', value: '70' }, - { label: '配送装车', value: '80' }, - { label: '部分签收', value: '90' }, - { label: '已签收', value: '100' }, - ], - fixed: false, - sortable: true, - head: false, - }, - // { - // prop: 'templateType', - // label: '运单标识', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - { - prop: 'openTime', - label: '开单时间', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'goodsName', - label: '货物品类', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - // { - // prop: 'templateType', - // label: '品类件数', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '品类数', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - { - prop: 'totalcount', - label: '总件数', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'totalWeight', - label: '总重量', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, { - prop: 'totalVolume', - label: '总体积', + prop: 'departureWarehouseName', + label: '始发仓', type: 1, values: '', width: '150', @@ -202,8 +81,8 @@ export const columnList = [ head: false, }, { - prop: 'openFee', - label: '开单总费用', + prop: 'destinationWarehouseName', + label: '目的仓', type: 1, values: '', width: '150', @@ -213,14 +92,15 @@ export const columnList = [ head: false, }, { - prop: 'confirmStatisticsOrderName', - label: '对账单是否确认', + prop: 'signStatusName', + label: '订单状态', type: 1, values: '', width: '150', checkarr: [ - { label: '是', value: '1' }, - { label: '否', value: '0' }, + { label: '未签收', value: '0' }, + { label: '部分签收', value: '1' }, + { label: '已签收', value: '2' }, ], fixed: false, sortable: true, @@ -228,40 +108,7 @@ export const columnList = [ }, // { // prop: 'templateType', - // label: '预对账金额', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '干线品类单价', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '仓储品类单价', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '配送品类单价', + // label: '订单类型', // type: 1, // values: '', // width: '150', @@ -271,85 +118,38 @@ export const columnList = [ // head: false, // }, { - prop: 'pickupFee', - label: '开单提货费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realPickupFee', - label: '实际提货费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'freightFee', - label: '开单运费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realFreightFee', - 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: 'realInstallFee', - label: '实际安装费', + prop: 'typeService', + label: '服务类型', type: 1, values: '', width: '150', - checkarr: [], + checkarr: [ + { label: '商配', value: '1' }, + { label: '市配', value: '2' }, + { label: '自提', value: '3' }, + { label: '三方中转', value: '4' }, + ], fixed: false, sortable: true, head: false, }, { - prop: 'quotationFee', - label: '开单保价费', + prop: 'statementStatusName', + label: '对账状态', type: 1, values: '', width: '150', - checkarr: [], + checkarr: [ + { label: '未确认', value: '0' }, + { label: '已确认', value: '1' }, + ], fixed: false, sortable: true, head: false, }, { - prop: 'realQuotationFee', - label: '实际保价费', + prop: 'totalStatementFee', + label: '对账单金额', type: 1, values: '', width: '150', @@ -359,8 +159,8 @@ export const columnList = [ head: false, }, { - prop: 'claimingValue', - label: '开单申明价值', + prop: 'openTime', + label: '开单时间', type: 1, values: '', width: '150', @@ -370,8 +170,8 @@ export const columnList = [ head: false, }, { - prop: 'realClaimingValue', - label: '实际申明价值', + prop: 'goodsName', + label: '货物品类', type: 1, values: '', width: '150', @@ -381,8 +181,8 @@ export const columnList = [ head: false, }, { - prop: 'otherFee', - label: '开单其它费', + prop: 'totalcount', + label: '总件数', type: 1, values: '', width: '150', @@ -392,8 +192,8 @@ export const columnList = [ head: false, }, { - prop: 'realOtherFee', - label: '实际其他费', + prop: 'totalWeight', + label: '总重量', type: 1, values: '', width: '150', @@ -403,8 +203,8 @@ export const columnList = [ head: false, }, { - prop: 'returnFee', - label: '开单回扣', + prop: 'totalVolume', + label: '总体积', type: 1, values: '', width: '150', @@ -414,8 +214,8 @@ export const columnList = [ head: false, }, { - prop: 'realReturnFee', - label: '实际回扣', + prop: 'openFee', + label: '订单开单总费用', type: 1, values: '', width: '150', @@ -425,8 +225,8 @@ export const columnList = [ head: false, }, { - prop: 'thirdOprationFee', - label: '开单三方操作费', + prop: 'totalFee', + label: '订单实际总费用', type: 1, values: '', width: '150', @@ -436,8 +236,8 @@ export const columnList = [ head: false, }, { - prop: 'realThirdOprationFee', - label: '实际三方操作费', + prop: 'pickupFee', + label: '开单提货费', type: 1, values: '', width: '150', @@ -447,8 +247,8 @@ export const columnList = [ head: false, }, { - prop: 'xPay', - label: '开单现付', + prop: 'realPickupFee', + label: '实际提货费', type: 1, values: '', width: '150', @@ -458,8 +258,8 @@ export const columnList = [ head: false, }, { - prop: 'realXPay', - label: '实际现付', + prop: 'freightFee', + label: '开单运费', type: 1, values: '', width: '150', @@ -469,8 +269,8 @@ export const columnList = [ head: false, }, { - prop: 'dPay', - label: '开单到付', + prop: 'realFreightFee', + label: '实际运费', type: 1, values: '', width: '150', @@ -480,8 +280,8 @@ export const columnList = [ head: false, }, { - prop: 'realDPay', - label: '实际到付', + prop: 'realWarehouseServiceFee', + label: '仓储服务费', type: 1, values: '', width: '150', @@ -491,8 +291,8 @@ export const columnList = [ head: false, }, { - prop: 'hPay', - label: '开单回付', + prop: 'realWarehouseFee', + label: '仓储费', type: 1, values: '', width: '150', @@ -502,8 +302,8 @@ export const columnList = [ head: false, }, { - prop: 'realHPay', - label: '实际回付', + prop: 'realWarehouseManageFee', + label: '仓储管理费', type: 1, values: '', width: '150', @@ -513,8 +313,8 @@ export const columnList = [ head: false, }, { - prop: 'yPay', - label: '开单月结', + prop: 'realWarehouseSortingFee', + label: '仓储分拣费', type: 1, values: '', width: '150', @@ -524,8 +324,8 @@ export const columnList = [ head: false, }, { - prop: 'realYPay', - label: '实际月付', + prop: 'realWarehouseOperatingFee', + label: '仓储操作费', type: 1, values: '', width: '150', @@ -535,8 +335,8 @@ export const columnList = [ head: false, }, { - prop: 'incomingTime', - label: '入库时间', + prop: 'deliveryServiceFee', + label: '开单配送服务费', type: 1, values: '', width: '150', @@ -546,8 +346,8 @@ export const columnList = [ head: false, }, { - prop: 'outingTime', - label: '出库时间', + prop: 'realDeliveryServiceFee', + label: '实际配送服务费', type: 1, values: '', width: '150', @@ -557,8 +357,8 @@ export const columnList = [ head: false, }, { - prop: 'warehouseServiceFee', - label: '开单仓库服务费', + prop: 'deliveryFee', + label: '开单配送费', type: 1, values: '', width: '150', @@ -568,8 +368,8 @@ export const columnList = [ head: false, }, { - prop: 'realWarehouseServiceFee', - label: '实际仓库服务费', + prop: 'realDeliveryFee', + label: '实际配送费', type: 1, values: '', width: '150', @@ -579,8 +379,8 @@ export const columnList = [ head: false, }, { - prop: 'warehouseFee', - label: '开单仓储费', + prop: 'realDeliveryLoadingFee', + label: '配送操作装卸费', type: 1, values: '', width: '150', @@ -590,8 +390,8 @@ export const columnList = [ head: false, }, { - prop: 'realWarehouseFee', - label: '实际仓储费', + prop: 'realDeliverySortingFee', + label: '配送分货费', type: 1, values: '', width: '150', @@ -601,8 +401,8 @@ export const columnList = [ head: false, }, { - prop: 'warehouseManageFee', - label: '开单仓储管理费', + prop: 'realDeliveryUpfloorFee', + label: '配送上楼费', type: 1, values: '', width: '150', @@ -612,8 +412,8 @@ export const columnList = [ head: false, }, { - prop: 'realWarehouseManageFee', - label: '实际仓储管理费', + prop: 'realDeliveryMoveFee', + label: '配送平移费', type: 1, values: '', width: '150', @@ -623,8 +423,8 @@ export const columnList = [ head: false, }, { - prop: 'warehouseSortingFee', - label: '开单仓储分拣费', + prop: 'realDeliveryCrossingFee', + label: '配送超区费', type: 1, values: '', width: '150', @@ -634,8 +434,8 @@ export const columnList = [ head: false, }, { - prop: 'realWarehouseSortingFee', - label: '实际仓储分拣费', + prop: 'realInstallFee', + label: '安装费', type: 1, values: '', width: '150', @@ -645,206 +445,8 @@ export const columnList = [ head: false, }, { - prop: 'warehouseOperatingFee', - label: '开单仓储操作费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realWarehouseOperatingFee', - label: '实际仓储操作费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliveryServiceFee', - label: '开单配送服务费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realDeliveryServiceFee', - label: '实际配送服务费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliveryFee', - label: '开单配送费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realDeliveryFee', - label: '实际配送费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliveryLoadingFee', - label: '配送装卸费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realDeliveryLoadingFee', - label: '实际配送装卸费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliverySortingFee', - label: '配送分拣费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realDeliverySortingFee', - label: '实际配送分拣费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliveryUpfloorFee', - label: '开单配送上楼费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realDeliveryUpfloorFee', - label: '实际配送上楼费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliveryMoveFee', - label: '开单配送平移费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realDeliveryMoveFee', - label: '实际平移费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliveryDistance', - label: '开单配送公里数', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realDeliveryDistance', - label: '实际配送公里数', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliveryCrossingFee', - label: '开单超区费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'realDeliveryCrossingFee', - label: '实际超区费', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'totalStatementFee', - label: '对账总金额', + prop: 'realOtherFee', + label: '其他费', type: 1, values: '', width: '150', @@ -854,8 +456,8 @@ export const columnList = [ head: false, }, // { - // prop: 'templateType', - // label: '干线费', + // prop: 'realQuotationFee', + // label: '保价费', // type: 1, // values: '', // width: '150', @@ -865,8 +467,8 @@ export const columnList = [ // head: false, // }, // { - // prop: 'templateType', - // label: '在库周期', + // prop: 'realClaimingValue', + // label: '申明价值', // type: 1, // values: '', // width: '150', @@ -876,8 +478,8 @@ export const columnList = [ // head: false, // }, // { - // prop: 'templateType', - // label: '仓储计费区间', + // prop: 'realReturnFee', + // label: '回扣', // type: 1, // values: '', // width: '150', @@ -887,8 +489,99 @@ export const columnList = [ // head: false, // }, // { - // prop: 'templateType', - // label: '仓储服务费合计', + // prop: 'realThirdOprationFee', + // label: '三方操作费', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'realDeliveryDistance', + // label: '实际配送公里数', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'realXPay', + // label: '现付', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'realDPay', + // label: '到付', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'realHPay', + // label: '实际回付', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'yPay', + // label: '开单月结', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'realYPay', + // label: '实际月付', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'isAfterSaleName', + // label: '是否售后', + // type: 1, + // values: '', + // width: '150', + // checkarr: [ + // { label: '否', value: '0' }, + // { label: '是', value: '1' }, + // ], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'totalStatementFee', + // label: '售后金额', // type: 1, // values: '', // width: '150', @@ -898,52 +591,22 @@ export const columnList = [ // head: false, // }, { - prop: 'shipperPerson', - label: '发货人', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'shipperMobile', - label: '发货手机号', - type: 1, - 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: '到站', + prop: 'isChangesName', + label: '是否异动', type: 1, values: '', width: '150', - checkarr: [], + checkarr: [ + { label: '否', value: '0' }, + { label: '是', value: '1' }, + ], fixed: false, sortable: true, head: false, }, { - prop: 'destinationWarehouseName', - label: '目的仓', + prop: 'changesFee', + label: '异动金额', type: 1, values: '', width: '150', @@ -953,8 +616,8 @@ export const columnList = [ head: false, }, { - prop: 'departure', - label: '发站', + prop: 'changesItems', + label: '异动条目', type: 1, values: '', width: '150', @@ -964,8 +627,8 @@ export const columnList = [ head: false, }, { - prop: 'departureWarehouseName', - label: '发站仓', + prop: 'changesRemark', + label: '异动备注', type: 1, values: '', width: '150', @@ -974,9 +637,20 @@ export const columnList = [ sortable: true, head: false, }, + // { + // prop: 'templateType', + // label: '异动操作人', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { - prop: 'consigneePerson', - label: '收货人', + prop: 'confirmStatisticsTime', + label: '对账确认时间', type: 1, values: '', width: '150', @@ -986,8 +660,8 @@ export const columnList = [ head: false, }, { - prop: 'consigneeMobile', - label: '收货人手机号', + prop: 'confirmStatisticsUserName', + label: '对账确认人', type: 1, values: '', width: '150', @@ -997,8 +671,8 @@ export const columnList = [ head: false, }, { - prop: 'consigneeAddress', - label: '收货地址', + prop: 'incomingTime', + label: '入库时间', type: 1, values: '', width: '150', @@ -1007,20 +681,9 @@ export const columnList = [ sortable: true, head: false, }, - // { - // prop: 'templateType', - // label: '进货方式', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, { - prop: 'customerTrain', - label: '客户车次', + prop: 'outingTime', + label: '出库时间', type: 1, values: '', width: '150', @@ -1031,7 +694,7 @@ export const columnList = [ }, // { // prop: 'templateType', - // label: '回单状态', + // label: '出库周期', // type: 1, // values: '', // width: '150', @@ -1041,18 +704,7 @@ export const columnList = [ // head: false, // }, { - prop: 'waybillRemark', - label: '运单备注', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'templateType', + prop: 'statementCreateUser', label: '结算方', type: 1, values: '', @@ -1063,19 +715,44 @@ export const columnList = [ head: false, }, { - prop: 'payWay', + prop: 'payType', label: '支付方式', type: 1, values: '', width: '150', - checkarr: [], + checkarr: [ + { + value: '1', + label: '现金', + }, + { + value: '2', + label: '银行卡', + }, + { + value: '3', + label: '微信', + }, + { + value: '4', + label: '支付宝', + }, + { + value: '5', + label: '支票', + }, + { + value: '6', + label: '账本', + }, + ], fixed: false, sortable: true, head: false, }, { - prop: 'payType', - label: '支付类型', + prop: 'payWay', + label: '付款方式', type: 1, values: '', width: '150', @@ -1084,23 +761,20 @@ export const columnList = [ sortable: true, head: false, }, + // { + // prop: 'templateType', + // label: '服务号', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { - prop: 'isChangesName', - label: '是否异动', - type: 1, - values: '', - width: '150', - checkarr: [ - { label: '是', value: 1 }, - { label: '否', value: 0 }, - ], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'changesFee', - label: '异动金额', + prop: 'shipperPerson', + label: '发货人', type: 1, values: '', width: '150', @@ -1110,113 +784,30 @@ export const columnList = [ head: false, }, { - prop: 'changesItems', - label: '异动条目', + prop: 'shipperMobile', + label: '发货手机号', type: 1, values: '', width: '150', - checkarr: [ - { label: '是', value: 1 }, - { label: '否', value: 0 }, - ], + checkarr: [], fixed: false, sortable: true, head: false, }, { - prop: 'changesRemark', - label: '异动备注', + prop: 'shipperAddress', + label: '发货地址', type: 1, values: '', width: '150', - checkarr: [ - { label: '是', value: 1 }, - { label: '否', value: 0 }, - ], + checkarr: [], fixed: false, sortable: true, head: false, }, - // { - // prop: 'templateType', - // label: '付款方式', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '现付', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '到付', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '回付', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '月结', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '是否售后', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, - // { - // prop: 'templateType', - // label: '售后价格', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, { - prop: 'totalStatementFee', - label: '对账单总金额', + prop: 'consigneePerson', + label: '收货人', type: 1, values: '', width: '150', @@ -1226,8 +817,8 @@ export const columnList = [ head: false, }, { - prop: 'statementStatus', - label: '对账状态', + prop: 'consigneeMobile', + label: '收货人手机号', type: 1, values: '', width: '150', @@ -1237,8 +828,8 @@ export const columnList = [ head: false, }, { - prop: 'hasStatementFee', - label: '已对账金额', + prop: 'templateType', + label: '收货人地址', type: 1, values: '', width: '150', @@ -1247,20 +838,9 @@ export const columnList = [ sortable: true, head: false, }, - // { - // prop: 'templateType', - // label: '未对账金额', - // type: 1, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, { - prop: 'statementCreateUser', - label: '对账确认人', + prop: 'departure', + label: '发站', type: 1, values: '', width: '150', @@ -1270,8 +850,8 @@ export const columnList = [ head: false, }, { - prop: 'statementCreateTime', - label: '对账确认时间', + prop: 'destination', + label: '到站', type: 1, values: '', width: '150', diff --git a/src/views/finance/CustomerSettlement.vue b/src/views/finance/CustomerSettlement.vue index 094d59f6..88437bdf 100644 --- a/src/views/finance/CustomerSettlement.vue +++ b/src/views/finance/CustomerSettlement.vue @@ -68,7 +68,7 @@