From 0421ee55eb5a2f29fd80366ea4dadabd01aca81a Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 1 Nov 2024 15:43:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4tob=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/finance/ReconciliationDepositSlip.vue | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/views/finance/ReconciliationDepositSlip.vue b/src/views/finance/ReconciliationDepositSlip.vue index f5bc428c..75875c7e 100644 --- a/src/views/finance/ReconciliationDepositSlip.vue +++ b/src/views/finance/ReconciliationDepositSlip.vue @@ -235,7 +235,11 @@ import { handleTranslationDataSeclect, getObjType, } from '@/utils/util'; -import { columnList, confirmColumnList,columnListB } from '@/option/finance/ReconciliationDepositSlip'; +import { + columnList, + confirmColumnList, + columnListB, +} from '@/option/finance/ReconciliationDepositSlip'; import { useRouter } from 'vue-router'; import { deepClone } from '@/utils/util'; import { ElMessage, ElMessageBox } from 'element-plus'; @@ -460,9 +464,9 @@ const searchChange = () => { /** 清空表单 */ const searchReset = () => { // details.query = {}; - console.log(details,'details'); - - details.pageStatus == 1 ? (details.pageInfo[0].query={}) : (details.pageInfo[1].query={}); + console.log(details, 'details'); + + details.pageStatus == 1 ? (details.pageInfo[0].query = {}) : (details.pageInfo[1].query = {}); details.page.pageNum = 1; handleClearTableQuery(details.pageStatus === 1 ? details.columnList1 : details.columnList2); initOnLoad(); @@ -563,6 +567,7 @@ const handleFullScrean = (_type: 'open' | 'close', _name: string) => { /** 生成对账单 */ const handleConfirm = async () => { + await nextTick(); if (details.selectionList.length === 0) return ElMessage.warning('请选择需要确认的数据'); const _errorArr = []; @@ -583,7 +588,8 @@ const handleConfirm = async () => { return ElMessage.warning(`收货单位不一致，请移除不一致数据`); if (value.destinationWarehouseName !== _destinationWarehouseName) return ElMessage.warning(`目的仓不一致，请移除不一致数据`); - if (Number(value.signStatus) !== 2) return ElMessage.warning(`存在未签收完成的数据`); + if (details.pageStatus === 2 && Number(value.signStatus) !== 2) + return ElMessage.warning(`存在未签收完成的数据`); } details.popUpShow.confirmVisited = true; From 2b4f09895443d77d58bb473f327f5b615065e9e7 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 1 Nov 2024 16:56:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=92=8C=E6=96=B0=E5=A2=9E=E9=85=8D=E8=BD=BD=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=92=8C=E4=BC=98=E5=8C=96=E5=BC=80=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E5=BD=95=E5=8D=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/views/index.js | 2 + src/utils/print.js | 4 +- .../artery/TripartiteTransfer.vue | 1 + .../artery/TripartiteTransferDetails.vue | 8 +- .../artery/VehicleArrivalManagement.vue | 1 + .../distribution/artery/VehicleStowage.vue | 2 + .../artery/VehicleStowageDetails.vue | 29 +- .../distribution/inventory/CreateOrder.vue | 351 +++++++++--------- src/views/waybill/CreateZeroOrder.vue | 272 +++++++------- 9 files changed, 345 insertions(+), 325 deletions(-) diff --git a/src/router/views/index.js b/src/router/views/index.js index 0aa94b1a..c9ec91a4 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -251,6 +251,7 @@ export default [ name: '中转详情', meta: { i18n: 'data', + keepAlive: true, }, component: () => import( @@ -262,6 +263,7 @@ export default [ name: '配载详情', meta: { i18n: 'data', + keepAlive: true, }, component: () => import( diff --git a/src/utils/print.js b/src/utils/print.js index 14048981..31c3fead 100644 --- a/src/utils/print.js +++ b/src/utils/print.js @@ -25,7 +25,7 @@ const handleDeliveryPrint = (LODOP, templateData) => { // LODOP.SET_PRINT_STYLE('FontColor', '#000000'); // // 设置打印整宽且不变形 LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '100%'); - LODOP.SET_PRINT_PAGESIZE(1, 2160, 1396.5, ''); + LODOP.SET_PRINT_PAGESIZE(1, '216.0mm', '139.7mm', ''); // LODOP.SET_PRINT_PAGESIZE(1, 240 + 'mm', 139.7 + 'mm', ''); // // 设置打印后自动关闭 LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1); @@ -56,7 +56,7 @@ const print = (nodeList, type = 'deliveryPrint') => { if (type === 'titlePrint') handleTitlePrint(LODOP, templateData); else handleDeliveryPrint(LODOP, templateData); - // LODOP.NewPage() + // LODOP.NewPage(); LODOP.PRINT(); //直接打印 // LODOP.PRINT_DESIGN(); }); diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue index 6a0fd774..04f09f7b 100644 --- a/src/views/distribution/artery/TripartiteTransfer.vue +++ b/src/views/distribution/artery/TripartiteTransfer.vue @@ -1231,6 +1231,7 @@ const handleCancelStartCar = () => { /** 查看详情 */ const handleGoDetils = ({ row }) => { + $store.commit('DEL_ONCE_TAG', '/distribution/artery/TripartiteTransferDetails'); $router.push({ path: '/distribution/artery/TripartiteTransferDetails', query: { diff --git a/src/views/distribution/artery/TripartiteTransferDetails.vue b/src/views/distribution/artery/TripartiteTransferDetails.vue index 8265a1d5..c74b04d3 100644 --- a/src/views/distribution/artery/TripartiteTransferDetails.vue +++ b/src/views/distribution/artery/TripartiteTransferDetails.vue @@ -825,10 +825,10 @@ const handleGoWayBillDetail = ({ row }) => { }); }; -watch($route, () => { - if ($route.path !== '/distribution/artery/TripartiteTransferDetails') return; - onLoad(); -}); +// watch($route, () => { +// if ($route.path !== '/distribution/artery/TripartiteTransferDetails') return; +// }); +onLoad();