From 20c708245a40d6fca5c3fbf0ce600e685969aa44 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 19 Nov 2024 17:49:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../finance/ReconciliationDepositSlip.js | 456 +++++++++--------- 1 file changed, 228 insertions(+), 228 deletions(-) diff --git a/src/option/finance/ReconciliationDepositSlip.js b/src/option/finance/ReconciliationDepositSlip.js index 81c299bb..73e111b4 100644 --- a/src/option/finance/ReconciliationDepositSlip.js +++ b/src/option/finance/ReconciliationDepositSlip.js @@ -186,39 +186,39 @@ export const columnList = [ head: false, isshowSummary: true, }, - { - prop: 'totalNum', - label: '货物品类', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'totalNum', - label: '品类件数', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'totalNum', - label: '干线品类单价', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, + // { + // prop: 'totalNum', + // label: '货物品类', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'totalNum', + // label: '品类件数', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'totalNum', + // label: '干线品类单价', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { prop: 'totalWeight', label: '总重量', @@ -482,18 +482,18 @@ export const columnList = [ head: false, isshowSummary: true, }, - { - prop: 'deliveryCrossingFee', - label: '配送专车费', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - head: false, - isshowSummary: true, - }, + // { + // prop: 'deliveryCrossingFee', + // label: '配送专车费', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // isshowSummary: true, + // }, { prop: 'installFee', label: '安装费', @@ -518,42 +518,42 @@ export const columnList = [ head: false, isshowSummary: true, }, - { - prop: 'deliveryCrossingFee', - label: '回扣', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - head: false, - isshowSummary: true, - }, - { - prop: 'deliveryCrossingFee', - label: '申明价值', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - head: false, - isshowSummary: true, - }, - { - prop: 'deliveryCrossingFee', - label: '保价费', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - head: false, - isshowSummary: true, - }, + // { + // prop: 'deliveryCrossingFee', + // label: '回扣', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // isshowSummary: true, + // }, + // { + // prop: 'deliveryCrossingFee', + // label: '申明价值', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // isshowSummary: true, + // }, + // { + // prop: 'deliveryCrossingFee', + // label: '保价费', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // isshowSummary: true, + // }, { prop: 'shipperPerson', label: '发货人', @@ -690,17 +690,17 @@ export const columnList = [ sortable: true, head: false, }, - { - prop: 'signNum', - label: '送货时间', - type: 1, - 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: '签收时间', @@ -712,28 +712,28 @@ export const columnList = [ sortable: true, head: false, }, - { - prop: 'signNum', - label: '签收人', - type: 1, - 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: 'signNum', + // label: '签收人', + // type: 1, + // 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: 'syncFeeStatus', label: '是否计算价格', @@ -958,39 +958,39 @@ export const columnListB = [ head: false, isshowSummary: true, }, - { - prop: 'totalNum', - label: '货物品类', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'totalNum', - label: '品类件数', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'totalNum', - label: '干线品类单价', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, + // { + // prop: 'totalNum', + // label: '货物品类', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'totalNum', + // label: '品类件数', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'totalNum', + // label: '干线品类单价', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { prop: 'totalWeight', label: '总重量', @@ -1255,18 +1255,18 @@ export const columnListB = [ head: false, isshowSummary: true, }, - { - prop: 'deliveryCrossingFee', - label: '配送专车费', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - head: false, - isshowSummary: true, - }, + // { + // prop: 'deliveryCrossingFee', + // label: '配送专车费', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // isshowSummary: true, + // }, { prop: 'installFee', label: '安装费', @@ -1291,42 +1291,42 @@ export const columnListB = [ head: false, isshowSummary: true, }, - { - prop: 'deliveryCrossingFee', - label: '回扣', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - head: false, - isshowSummary: true, - }, - { - prop: 'deliveryCrossingFee', - label: '申明价值', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - head: false, - isshowSummary: true, - }, - { - prop: 'deliveryCrossingFee', - label: '保价费', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - head: false, - isshowSummary: true, - }, + // { + // prop: 'deliveryCrossingFee', + // label: '回扣', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // isshowSummary: true, + // }, + // { + // prop: 'deliveryCrossingFee', + // label: '申明价值', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // isshowSummary: true, + // }, + // { + // prop: 'deliveryCrossingFee', + // label: '保价费', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // isshowSummary: true, + // }, { prop: 'shipperPerson', label: '发货人', @@ -1463,17 +1463,17 @@ export const columnListB = [ sortable: true, head: false, }, - { - prop: 'signNum', - label: '送货时间', - type: 1, - 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: '签收时间', @@ -1485,28 +1485,28 @@ export const columnListB = [ sortable: true, head: false, }, - { - prop: 'signNum', - label: '签收人', - type: 1, - 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: 'signNum', + // label: '签收人', + // type: 1, + // 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: 'syncFeeStatus', label: '是否计算价格', From e6df2a4aad0c545edc888a52bfb0659ab9d813b5 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 19 Nov 2024 18:01:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/distribution/VehicleStowage.js | 11 +++++++++++ src/views/distribution/artery/truckLoadingDetails.vue | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/option/distribution/VehicleStowage.js b/src/option/distribution/VehicleStowage.js index 9271bfab..2144dfaa 100644 --- a/src/option/distribution/VehicleStowage.js +++ b/src/option/distribution/VehicleStowage.js @@ -730,6 +730,17 @@ export const orderDetailColumnList = [ sortable: false, head: false, }, + { + prop: 'trainNumber', + label: '客户车次号', + width: '130', + type: 1, + values: '', + checkarr: [], + fixed: true, + sortable: false, + head: false, + }, { prop: 'waybillNo', label: '运单号', diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue index 3f6b728c..c7e24127 100644 --- a/src/views/distribution/artery/truckLoadingDetails.vue +++ b/src/views/distribution/artery/truckLoadingDetails.vue @@ -130,7 +130,9 @@ From 3cf9a43ed5eb7a6987c500307020dd3d0d773863 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 19 Nov 2024 18:10:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9A=82=E5=AD=98?= =?UTF-8?q?=E5=8D=95=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/waybill/FreezeOrder.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/views/waybill/FreezeOrder.vue b/src/views/waybill/FreezeOrder.vue index 45f0f08c..7349e860 100644 --- a/src/views/waybill/FreezeOrder.vue +++ b/src/views/waybill/FreezeOrder.vue @@ -115,7 +115,7 @@ import { } from '@/api/waybill/TemporaryStorageList'; import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; import { downloadXls, setNodeHeight, getHtmls, handleClearTableQuery } from '@/utils/util'; -import { columnList, packageListColumnList } from '@/option/waybill/FreezeOrder'; +import { columnList } from '@/option/waybill/TemporaryStorageList'; import { useRouter } from 'vue-router'; import print from '@/utils/print'; import { deepClone } from '@/utils/util'; @@ -164,10 +164,6 @@ const details = reactive({ /** 列表数据 */ haveDataData: [], notHaveDataData: [], - /** 包明细表头 */ - packageListColumnList: deepClone(packageListColumnList), - /** 包明细数据 */ - packageListData: [], /** 页面loading */ loadingObj: { /** 列表加载loading */