From 244a3826edcdf0b9ebb5570e9b402f0472cbbe3e Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 2 Dec 2024 11:26:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/login/aiqa.vue | 2 +- src/utils/LodopFuncs.js | 10 +++++----- .../warehouse/prewarehousing/Prewarehouseorder.vue | 4 ++-- src/views/waybill/TemporaryStorageList.vue | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/page/login/aiqa.vue b/src/page/login/aiqa.vue index de9d2cbb..bb83345e 100644 --- a/src/page/login/aiqa.vue +++ b/src/page/login/aiqa.vue @@ -289,7 +289,7 @@ const AiData = (value = '') => { lowercaseValue.includes('打印机驱动下载地址') ) { aiResponse = '打印机启动下载地址如下：'; - data.link = 'http://47.108.51.143:9000/logpm/other/CLodop_Setup_for_Win32NT.exe'; + data.link = 'http://8.137.19.41:9000/logpm/other/CLodop_Setup_for_Win32NT.exe'; } else if ( lowercaseValue.includes('扫描仪驱动') || lowercaseValue.includes('扫描仪驱动下载地址') diff --git a/src/utils/LodopFuncs.js b/src/utils/LodopFuncs.js index 1b8d7a15..95719fac 100644 --- a/src/utils/LodopFuncs.js +++ b/src/utils/LodopFuncs.js @@ -104,7 +104,7 @@ export function getLodop(oOBJECT, oEMBED) {

安装Web打印服务

-

第一步:请您下载并安装Web打印服务CLodop。点击下载

+

第一步:请您下载并安装Web打印服务CLodop。点击下载

打印机驱动下载

@@ -114,16 +114,16 @@ export function getLodop(oOBJECT, oEMBED) { 驱动地址 驱动版本 - Deli_2020.4_M-2点击下载 - 2020.4 + Deli_2020.4_M-2点击下载 + 2020.4
`; // var strCLodopInstallB = "
（若此前已安装过，可点这里直接再次启动）"; - var strCLodopInstallB = "
注意事项:"; + var strCLodopInstallB = "
注意事项:"; var strCLodopUpdate = - "
Web打印服务CLodop需升级!点击这里执行升级"; + "
Web打印服务CLodop需升级!点击这里执行升级"; var strLodop7FontTag = "
Web打印服务Lodop7"; var strLodop7HrefX86 = "点击这里下载安装(下载后解压，点击lodop文件开始执行)"; var strLodop7HrefARM = "点击这里下载安装(下载后解压，点击lodop文件开始执行)"; diff --git a/src/views/warehouse/prewarehousing/Prewarehouseorder.vue b/src/views/warehouse/prewarehousing/Prewarehouseorder.vue index be333d7b..4b816f0b 100644 --- a/src/views/warehouse/prewarehousing/Prewarehouseorder.vue +++ b/src/views/warehouse/prewarehousing/Prewarehouseorder.vue @@ -1158,8 +1158,8 @@ const handleClose = res => { const handleDownLoadFile = () => { const url = details.ouPaiChooseType === 1 - ? 'http://47.108.51.143:9000/bladex/upload/20240118/65c977fe6ac575ebb17803400a7abbc7.xlsx' - : 'http://8.137.14.82:9000/bladex/upload/20240612/%E6%97%A0%E5%8C%85%E6%9D%A1%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%EF%BC%88%E8%B4%A7%E6%97%A0%E5%BF%A7-%E7%94%9F%E6%88%90%E5%8C%85%E6%9D%A1%EF%BC%89.xlsx'; + ? 'http://8.137.19.41:9000/logpm/bladex/upload/20240118/65c977fe6ac575ebb17803400a7abbc7.xlsx' + : 'http://8.137.19.41:9000/logpm/bladex/upload/20240612/%E6%97%A0%E5%8C%85%E6%9D%A1%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%28%E8%B4%A7%E6%97%A0%E5%BF%A7-%E7%94%9F%E6%88%90%E5%8C%85%E6%9D%A1%29.xlsx'; const name = details.ouPaiChooseType === 1 ? '包条导入模版（货无忧-生成包条）.xlsx' diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue index a9440836..2b78fdbe 100644 --- a/src/views/waybill/TemporaryStorageList.vue +++ b/src/views/waybill/TemporaryStorageList.vue @@ -1477,8 +1477,8 @@ const handleOpenAddTagDlog = async () => { const handleDownLoadFile = () => { const url = details.ouPaiChooseType === 1 - ? 'http://47.108.51.143:9000/bladex/upload/20240118/65c977fe6ac575ebb17803400a7abbc7.xlsx' - : 'http://8.137.14.82:9000/bladex/upload/20240612/%E6%97%A0%E5%8C%85%E6%9D%A1%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%EF%BC%88%E8%B4%A7%E6%97%A0%E5%BF%A7-%E7%94%9F%E6%88%90%E5%8C%85%E6%9D%A1%EF%BC%89.xlsx'; + ? 'http://8.137.19.41:9000/logpm/bladex/upload/20240118/65c977fe6ac575ebb17803400a7abbc7.xlsx' + : 'http://8.137.19.41:9000/logpm/bladex/upload/20240612/%E6%97%A0%E5%8C%85%E6%9D%A1%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%28%E8%B4%A7%E6%97%A0%E5%BF%A7-%E7%94%9F%E6%88%90%E5%8C%85%E6%9D%A1%29.xlsx'; const name = details.ouPaiChooseType === 1 ? '包条导入模版（货无忧-生成包条）.xlsx' From 374f02d9a56e8197bb4ef9e674a883aaa1f68595 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 2 Dec 2024 18:05:09 +0800 Subject: [PATCH 2/2] =?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 | 50 +++++++++++++++---- .../deliverylist/distributionDeliveryList.vue | 4 +- .../distributionDeliveryListdis.vue | 4 +- .../distributionDeliveryListmar.vue | 5 +- .../inventory/distrilbutionBillLadingList.vue | 5 +- .../distribution/reservation/reservation.vue | 44 +++++++++++----- .../reportforms/DeliveryDetailsReport.vue | 6 ++- .../reportforms/DeliveryStatisticsReport.vue | 6 ++- 8 files changed, 90 insertions(+), 34 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 04641871..8073915f 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -1301,13 +1301,36 @@ const ResetTableSearch = async () => { PublicDataRequest(TabPermissions.value, true); }; //清空 +// const searchReset = () => { +// TopQuery.value = {}; +// let _Obj = MatchCurrentMenu(); +// _Obj.currentPage = 1; +// TabList.value.forEach(item => { +// item.query = {}; +// }); +// const TabcolumnList = [ +// columnList, +// columnList1, +// columnList2, +// columnList3, +// columnList4, +// columnList5, +// columnList6, +// columnList7, +// columnList8, +// columnList9, +// columnList10, +// ]; + +// TabcolumnList.forEach(item => { +// handleClearTableQuery(item); +// }); +// details.search = false; // 关闭搜索 +// updateMenuAndData(); //获取最新数据 +// autoscaling(); +// }; + const searchReset = () => { - TopQuery.value = {}; - let _Obj = MatchCurrentMenu(); - _Obj.currentPage = 1; - TabList.value.forEach(item => { - item.query = {}; - }); const TabcolumnList = [ columnList, columnList1, @@ -1321,14 +1344,19 @@ const searchReset = () => { columnList9, columnList10, ]; - - TabcolumnList.forEach(item => { - handleClearTableQuery(item); - }); + TopQuery.value = {}; + let _Obj = MatchCurrentMenu(); + _Obj.currentPage = 1; + const TabListLength = TabList.value.length; + for (let i = 0; i < TabListLength; i++) { + TabList.value[i].query = {}; + handleClearTableQuery(TabcolumnList[i]); + } details.search = false; // 关闭搜索 - updateMenuAndData(); //获取最新数据 + updateMenuAndData(); autoscaling(); }; + // 顶部搜索 const searchHide = () => { console.log(details); diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue index 4cae6cf8..b3b0608e 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryList.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue @@ -1059,9 +1059,9 @@ export default { const currentDate = dayjs(); // 计算一个月前的日期 // 获取当前月份的第一天 - const startDate = currentDate.startOf('month'); + const startDate = currentDate.subtract(23, 'day'); // 获取当前月份的最后一天 - const endDate = currentDate.endOf('month'); + const endDate = currentDate.add(7, 'day'); // 格式化日期为 'YYYY-MM-DD' const formatDate = date => date.format('YYYY-MM-DD'); this.Deliverydate = []; diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue index af075326..fc55f212 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue @@ -990,9 +990,9 @@ export default { // 获取当前日期 const currentDate = dayjs(); // 获取当前月份的第一天 - const startDate = currentDate.startOf('month'); + const startDate = currentDate.subtract(23, 'day'); // 获取当前月份的最后一天 - const endDate = currentDate.endOf('month'); + const endDate = currentDate.add(7, 'day'); // 格式化日期为 'YYYY-MM-DD' const formatDate = date => date.format('YYYY-MM-DD'); this.query.taskTimeArr = []; diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue index cbc39ac8..b129cfcc 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue @@ -779,9 +779,10 @@ export default { // 获取当前日期 const currentDate = dayjs(); // 获取当前月份的第一天 - const startDate = currentDate.startOf('month'); + const startDate = currentDate.subtract(23, 'day'); // 获取当前月份的最后一天 - const endDate = currentDate.endOf('month'); + const endDate = currentDate.add(7, 'day'); + // 格式化日期为 'YYYY-MM-DD' const formatDate = date => date.format('YYYY-MM-DD'); this.query.taskTimeArr = []; diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue index 7d71d603..2027bc57 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue @@ -1134,9 +1134,10 @@ export default { // 获取当前日期 const currentDate = dayjs(); // 获取当前月份的第一天 - const startDate = currentDate.startOf('month'); + const startDate = currentDate.subtract(23, 'day'); + // 获取当前月份的最后一天 - const endDate = currentDate.endOf('month'); + const endDate = currentDate.add(7, 'day'); // 格式化日期为 'YYYY-MM-DD' const formatDate = date => date.format('YYYY-MM-DD'); this.Deliverytime = []; diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue index 4b48b334..92d30b24 100644 --- a/src/views/distribution/reservation/reservation.vue +++ b/src/views/distribution/reservation/reservation.vue @@ -333,14 +333,16 @@ - - - - - -
- 取 消 - 确 定 +
+ + + + + +
+ 关 闭 + 确 定 +
@@ -387,6 +389,7 @@ export default { data() { return { // 弹出框是否显示 + dialogCancelReservationloading: false, dialogVisible: false, // 打印模版的html html: '', @@ -1100,6 +1103,7 @@ export default { this.$message.warning('请输入取消原因!!'); return; } + this.dialogCancelReservationloading = true; let data = {}; if (this.cancelReservationRow) { data = this.cancelReservationRow; @@ -1108,11 +1112,19 @@ export default { this.$message.error('请稍后再试!!'); return; } - cancelReservation(data).then(res => { - this.onLoad(this.page); - this.cancelReservationRow = {}; - this.dialogCancelReservation = false; - }); + cancelReservation(data) + .then(res => { + this.onLoad(this.page); + this.cancelReservationRow = {}; + this.dialogCancelReservation = false; + }) + .catch(err => { + console.log(err); + + }) + .finally(() => { + this.dialogCancelReservationloading = false; + }); }, ddd() { this.form.deliveryType === ''; @@ -1746,4 +1758,10 @@ export default { .avue-crud { height: 100%; } +.el_gCancelReservation{ + .el-form-item{ + width: 100%; + flex-direction: column; + } +} diff --git a/src/views/reportforms/DeliveryDetailsReport.vue b/src/views/reportforms/DeliveryDetailsReport.vue index dbe7644c..28bb4d04 100644 --- a/src/views/reportforms/DeliveryDetailsReport.vue +++ b/src/views/reportforms/DeliveryDetailsReport.vue @@ -283,9 +283,13 @@ function updateDictionary(targetArray, dictionaryType) { // 页面初始化 const onLoad = async () => { - console.log($route, '地址栏数据'); try { details.loadingObj.list = true; + if ($route.query.deliveryType) { + details.columnList.find(item => item.prop == 'deliveryType').type = 1; + } else { + details.columnList.find(item => item.prop == 'deliveryType').type = 3; + } let submit = { current: details.page.currentPage, size: details.page.pageSize, diff --git a/src/views/reportforms/DeliveryStatisticsReport.vue b/src/views/reportforms/DeliveryStatisticsReport.vue index 60c38f6d..400cadd9 100644 --- a/src/views/reportforms/DeliveryStatisticsReport.vue +++ b/src/views/reportforms/DeliveryStatisticsReport.vue @@ -182,7 +182,7 @@ const queryCarn = ref({}); const DeliveryTypeList = ref([ { label: '全部', - value: '商配,市配', + value: '商配,市配,自提', }, { label: '商配', @@ -192,6 +192,10 @@ const DeliveryTypeList = ref([ label: '市配', value: '市配', }, + { + label: '自提', + value: '自提', + }, ]); const TopQuery = ref({ warehouseNameRange: [],