From 87ccd632171007e9ecce24471050f3cec2cd4ab4 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 16 Oct 2024 22:38:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArteryPrintTemplate.vue | 131 +++++++++--------- src/utils/print.js | 13 +- .../artery/VehicleArrivalManagement.vue | 2 +- .../distribution/artery/VehicleStowage.vue | 2 +- src/views/waybill/TemporaryStorageList.vue | 2 +- vite.config.js | 2 +- 6 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue b/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue index a6bfb5ea..d3990bf4 100644 --- a/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue +++ b/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue @@ -1,132 +1,127 @@ diff --git a/src/utils/print.js b/src/utils/print.js index aee7c793..d36c064e 100644 --- a/src/utils/print.js +++ b/src/utils/print.js @@ -8,7 +8,9 @@ const handleTitlePrint = (LODOP, templateData) => { LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开 // LODOP.SET_PRINT_STYLE('FontColor', '#000000'); // // 设置打印整宽且不变形 - LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '95%'); + LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '100%'); + /**设定打印的带线啊哦 */ + LODOP.SET_PRINT_PAGESIZE(1,970, 720, ""); // // 设置打印后自动关闭 LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1); // // data就是一段html文本 @@ -22,12 +24,15 @@ const handleDeliveryPrint = (LODOP, templateData) => { LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开 // LODOP.SET_PRINT_STYLE('FontColor', '#000000'); // // 设置打印整宽且不变形 - LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '98%'); + LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '100%'); + LODOP.SET_PRINT_PAGESIZE(1,2160, 1400, ""); // // 设置打印后自动关闭 LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1); + - // // data就是一段html文本 - LODOP.ADD_PRINT_HTM('0', '0%', '100%%', '100%', templateData); + + // // data就是一段html文本 + LODOP.ADD_PRINT_HTM('0', '0%', '100%', '100%', templateData); }; /** diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue index 893c695f..d14244a8 100644 --- a/src/views/distribution/artery/VehicleArrivalManagement.vue +++ b/src/views/distribution/artery/VehicleArrivalManagement.vue @@ -1580,7 +1580,7 @@ const handleDirectGoMarketDetails = ({ row }) => { /** 配载打印 */ const handlePrint = () => { - const nodeList = document.querySelectorAll('.listOfLoadedWagonsPopUp table'); + const nodeList = document.querySelectorAll('.listOfLoadedWagonsPopUp .VehicleStowageTable'); print(nodeList); }; diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue index b1fa89b5..96697bf6 100644 --- a/src/views/distribution/artery/VehicleStowage.vue +++ b/src/views/distribution/artery/VehicleStowage.vue @@ -1496,7 +1496,7 @@ const handleShowListOfLoadedWagons = async () => { /** 配载打印 */ const handlePrint = () => { const nodeList = document.querySelectorAll('.listOfLoadedWagonsPopUp table'); - + console.log(nodeList, 123) print(nodeList); }; diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue index e42d5c6b..cadd760f 100644 --- a/src/views/waybill/TemporaryStorageList.vue +++ b/src/views/waybill/TemporaryStorageList.vue @@ -541,7 +541,7 @@ import { onActivated, onDeactivated, } from 'vue'; -import functions from '@/utils/functions.js'; + import dayjs from 'dayjs'; import { mapGetters } from 'vuex'; /** 获取字典 */ diff --git a/vite.config.js b/vite.config.js index ffe913d1..2ed105f3 100644 --- a/vite.config.js +++ b/vite.config.js @@ -40,7 +40,7 @@ export default ({ mode, command }) => { // target: 'http://192.168.3.16:13000', target: 'http://192.168.3.73:13000', //？ // target: 'http://h5uapi.huitongys.com', - target: 'http://test.api.huo5u.com', + // target: 'http://test.api.huo5u.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), }, From 0dad4aa3f5936462f948e47cf5ccfb234873f400 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 16 Oct 2024 22:39:34 +0800 Subject: [PATCH 2/4] -- --- vite.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vite.config.js b/vite.config.js index ffe913d1..e6a2ffc6 100644 --- a/vite.config.js +++ b/vite.config.js @@ -38,7 +38,7 @@ export default ({ mode, command }) => { // target: 'http://192.168.10.57:13000', // target: 'http://192.168.10.200:13000', // target: 'http://192.168.3.16:13000', - target: 'http://192.168.3.73:13000', //？ + // target: 'http://192.168.3.73:13000', // // target: 'http://h5uapi.huitongys.com', target: 'http://test.api.huo5u.com', changeOrigin: true, From 04a1bce31a1fb8f5b01437baa1de2e57fbc4ab39 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 16 Oct 2024 22:57:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A7=E4=BD=8D?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/goodsAllocation/BasicdataGoodsAllocation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue index d7fac011..0fd3dd95 100644 --- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue +++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue @@ -146,6 +146,7 @@ :html="details.html" :isShowExport="false" width="780px" + type="titlePrint" /> @@ -400,7 +401,6 @@ const timesc = (index, row) => { if (!index) { delete details.query[row.prop]; } - onLoad(); }; /** 表格表头下拉框选择 */ From 5bfc9ffa20e45ec25aae886698d2abeba4926a32 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Thu, 17 Oct 2024 10:01:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 61 ++++++++++--------- .../aftersales/aftersalesWorkOrderInfo.vue | 4 +- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 4fcb3800..8cfd556a 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -889,6 +889,7 @@ > { } else if (item.workOrderStatus == 60) { item.workOrderStatusNameS = columnList[10].checkarr[3].label; //超时未处理 } else if (item.workOrderStatus == 70) { - item.workOrderStatusNameS = columnList[10].checkarr[6].label; //完结 + item.workOrderStatusNameS = columnList[10].checkarr[6].label; //仲裁中 } else if (item.workOrderStatus == 80) { item.workOrderStatusNameS = columnList[10].checkarr[7].label; //完结 } else if (item.workOrderStatus == 90) { @@ -2047,7 +2051,7 @@ const InformationViewing = val => { }); $router.push({ path: workOrderInfoPath, query: queryParams }); console.log('申诉跳转'); - + return; } @@ -2156,11 +2160,11 @@ const view = val => { if (TabPermissions.value === 4) { console.log('当前菜单4'); - + const claimQueryParams = { ...baseQueryParams, appealID: val.row.id, - id:val.row.lawoId,//理赔金未出需要的ID + id: val.row.lawoId, //理赔金未出需要的ID ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', Routstate: '', AppealReview: val.row.typesOf ? (val.row.typesOf === '0' ? 'true' : 'false') : 'true', @@ -2186,7 +2190,7 @@ const view = val => { AppealReview: val.row.typesOf ? (val.row.typesOf === '0' ? 'true' : 'false') : 'true', }; console.log('默认跳转'); - + $router.push({ path: workOrderInfoPath, query: defaultQueryParams }); }; @@ -4221,34 +4225,34 @@ const exportReport = () => { type: 'warning', }) .then(() => { - let dataID = { workOrderStatus: details.query.workOrderStatus, }; if (details.selectionList.length) { dataID.ids = details.selectionList.map(item => item.id).join(','); } - pageLoad.value=true - $_exportAftersalesWorkOrder(dataID).then(res => { - const currentDate = new Date(); - const formattedDate = `${currentDate.getFullYear()}${(currentDate.getMonth() + 1) - .toString() - .padStart(2, '0')}${currentDate.getDate().toString().padStart(2, '0')}${currentDate - .getHours() - .toString() - .padStart(2, '0')}${currentDate.getMinutes().toString().padStart(2, '0')}${currentDate - .getSeconds() - .toString() - .padStart(2, '0')}`; - console.log(res, '导出'); - downloadXls(res.data, `导出工单数据${formattedDate}.xlsx`); - }).catch((e)=>{ - console.log(e,'error'); - - }).finally(()=>{ - pageLoad.value=false - }) - ; + pageLoad.value = true; + $_exportAftersalesWorkOrder(dataID) + .then(res => { + const currentDate = new Date(); + const formattedDate = `${currentDate.getFullYear()}${(currentDate.getMonth() + 1) + .toString() + .padStart(2, '0')}${currentDate.getDate().toString().padStart(2, '0')}${currentDate + .getHours() + .toString() + .padStart(2, '0')}${currentDate.getMinutes().toString().padStart(2, '0')}${currentDate + .getSeconds() + .toString() + .padStart(2, '0')}`; + console.log(res, '导出'); + downloadXls(res.data, `导出工单数据${formattedDate}.xlsx`); + }) + .catch(e => { + console.log(e, 'error'); + }) + .finally(() => { + pageLoad.value = false; + }); }) .catch(() => {}); }; @@ -4406,7 +4410,7 @@ const AssignSubmission = () => { .then(res => { console.log(res, '指派成功'); if (res.data.code == 200) { - ElMessageBox.confirm('提交成功是否关闭?', 'Warning', { + ElMessageBox.confirm('提交成功是否关闭?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', @@ -5025,6 +5029,7 @@ const AssignSubmission = () => { } } .el_Customer { +width: 440px; #bodys { height: 300px !important; } diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index f3116a97..2162c95e 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -1316,7 +1316,7 @@ const isHeadquarterCustomerServiceManager = userRole === '总部客服经理'; / const isWarehouseIdState = warehouseIdState.value; // 处理结果权限 const isProcessingResults = () => { - if (workOrderStatus == '10' || workOrderStatus === '20') { + if (workOrderStatus == '10' || workOrderStatus == '20') { return true; } }; @@ -1351,7 +1351,7 @@ const Resultreturned = () => { // 客服仲裁完结权限 const isApplyArbitration = () => { if (UserPermissions.value != '仓库客服') { - if (workOrderStatus === '70') { + if (workOrderStatus == '70') { return true; } }