diff --git a/src/api/HidePage/index.js b/src/api/HidePage/index.js new file mode 100644 index 00000000..c5d7704f --- /dev/null +++ b/src/api/HidePage/index.js @@ -0,0 +1,9 @@ +import request from '@/axios'; +// 数据修复 +export const $_syncUnloadData = data => { + return request({ + url: '/api/logpm-trunkline/carsLoad/syncUnloadData', + method: 'POST', + data, + }); +}; diff --git a/src/router/views/index.js b/src/router/views/index.js index 0aa94b1a..43945738 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( @@ -1857,4 +1859,21 @@ export default [ }, ], }, + // 数据修复(进入页面自动执行) + { + path: '/HidePage/DataRecovery', + component: Layout, + redirect: '/HidePage/DataRecovery', + children: [ + { + meta: { + i18n: 'dict', + keepAlive: false, + }, + path: '/HidePage/DataRecovery', + name: '数据修复', + component: () => import('@/views/HidePage/DataRecovery.vue'), + }, + ], + }, ]; 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/HidePage/DataRecovery.vue b/src/views/HidePage/DataRecovery.vue new file mode 100644 index 00000000..a68feea2 --- /dev/null +++ b/src/views/HidePage/DataRecovery.vue @@ -0,0 +1,28 @@ + + + + + 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();