From 05986c52289ef95d7bea4780762fe18515db4af8 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 12 Dec 2024 17:47:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/distribution/artery/VehicleNodeImgs.vue | 7 +++---- .../distribution/inventory/delivery/OrderInTransit.vue | 7 +++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/distribution/artery/VehicleNodeImgs.vue b/src/views/distribution/artery/VehicleNodeImgs.vue index 55c6c1a7..f6c6bbd6 100644 --- a/src/views/distribution/artery/VehicleNodeImgs.vue +++ b/src/views/distribution/artery/VehicleNodeImgs.vue @@ -495,10 +495,9 @@ const initImgList = async () => { _obj.nodeId = carsLoadLineEntity.nodeId; _obj.nowWarehouseId = nowWarehouseId; - if (details.myWarehouseId === _obj.nodeId) { - details.nowWarehoseIndex = i; - details.activeIndex = i; - } + if (details.myWarehouseId === _obj.nodeId) details.activeIndex = i; + + if (nowWarehouseId === _obj.nodeId) details.nowWarehoseIndex = i; } else { ElMessage.warning('存在异常节点信息'); return; diff --git a/src/views/distribution/inventory/delivery/OrderInTransit.vue b/src/views/distribution/inventory/delivery/OrderInTransit.vue index 26dbc7ba..e72f5a73 100644 --- a/src/views/distribution/inventory/delivery/OrderInTransit.vue +++ b/src/views/distribution/inventory/delivery/OrderInTransit.vue @@ -318,8 +318,11 @@ const initData = async () => { onLoad(false), ]); - await nextTick(); - handleTranslationDataSeclect(details.data, details.columnList); + const timer = setTimeout(() => { + handleTranslationDataSeclect(details.data, details.columnList); + clearTimeout(timer); + }, 100); + console.log('details.columnList :>> ', details.columnList); } catch (error) { console.log('error :>> ', error); From 78a71b4dc183f950ddfc0d33a9656b7eed370fda Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 12 Dec 2024 18:47:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=80=E5=8D=95?= =?UTF-8?q?=E5=AE=A1=E5=8D=95=E5=8F=8A=E6=97=B6=E7=8E=87=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reportforms/AuditTimelinessRatioReport.js | 19 + .../CreateOrderTimelinessRatioReport.js | 19 + .../reportforms/AuditTimelinessRatioReport.js | 133 +++++ .../CreateOrderTimelinessRatioReport.js | 193 +++++++ .../AuditTimelinessRatioReport.vue | 528 ++++++++++++++++++ src/views/reportforms/ConsigneeReport.vue | 2 +- .../CreateOrderTimelinessRatioReport.vue | 509 +++++++++++++++++ 7 files changed, 1402 insertions(+), 1 deletion(-) create mode 100644 src/api/reportforms/AuditTimelinessRatioReport.js create mode 100644 src/api/reportforms/CreateOrderTimelinessRatioReport.js create mode 100644 src/option/reportforms/AuditTimelinessRatioReport.js create mode 100644 src/option/reportforms/CreateOrderTimelinessRatioReport.js create mode 100644 src/views/reportforms/AuditTimelinessRatioReport.vue create mode 100644 src/views/reportforms/CreateOrderTimelinessRatioReport.vue diff --git a/src/api/reportforms/AuditTimelinessRatioReport.js b/src/api/reportforms/AuditTimelinessRatioReport.js new file mode 100644 index 00000000..b3fd3bea --- /dev/null +++ b/src/api/reportforms/AuditTimelinessRatioReport.js @@ -0,0 +1,19 @@ +import request from '@/axios'; +/** 报表列表 */ +export const postCheckWaybillTimePage = data => { + return request({ + url: '/api/logpm-report/reportTime/checkWaybillTimePage', + method: 'post', + data, + }); +}; + +/** 报表导出 */ +export const postCheckWaybillTimeExport = data => { + return request({ + url: '/api/logpm-report/reportTime/checkWaybillTimeExport', + method: 'post', + data, + responseType: 'blob', + }); +}; diff --git a/src/api/reportforms/CreateOrderTimelinessRatioReport.js b/src/api/reportforms/CreateOrderTimelinessRatioReport.js new file mode 100644 index 00000000..4d6959c6 --- /dev/null +++ b/src/api/reportforms/CreateOrderTimelinessRatioReport.js @@ -0,0 +1,19 @@ +import request from '@/axios'; +/** 报表列表 */ +export const postOpenTimePage = data => { + return request({ + url: '/api/logpm-report/reportTime/openTimePage', + method: 'post', + data, + }); +}; + +/** 报表导出 */ +export const postOpenTimeExport = data => { + return request({ + url: '/api/logpm-report/reportTime/openTimeExport', + method: 'post', + data, + responseType: 'blob', + }); +}; diff --git a/src/option/reportforms/AuditTimelinessRatioReport.js b/src/option/reportforms/AuditTimelinessRatioReport.js new file mode 100644 index 00000000..acf54d36 --- /dev/null +++ b/src/option/reportforms/AuditTimelinessRatioReport.js @@ -0,0 +1,133 @@ +export const columnList = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'businessLine', + label: '事业线', + type: 1, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'departureWarehouseName', + label: '发站仓', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'destinationWarehouseName', + label: '目的仓', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'brand', + label: '品牌', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'totalNum', + label: '总运单数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'hasCheckNum', + label: '已审单数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'hasCheckRate', + label: '审单率', + type: 6, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: false, //开启统计 + }, + { + prop: 'onTimeCheckNum', + label: '准时审单数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'onTimeCheckRate', + label: '审单准时率', + type: 6, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: false, //开启统计 + }, + { + prop: 'avgCheckTime', + label: '平均审单时效(小时)', + type: 1, + values: '', + width: '160', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: false, //开启统计 + }, +]; diff --git a/src/option/reportforms/CreateOrderTimelinessRatioReport.js b/src/option/reportforms/CreateOrderTimelinessRatioReport.js new file mode 100644 index 00000000..3cd2a909 --- /dev/null +++ b/src/option/reportforms/CreateOrderTimelinessRatioReport.js @@ -0,0 +1,193 @@ +export const columnList = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'businessLine', + label: '事业线', + type: 1, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'warehouseName', + label: '导入仓库', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'brand', + label: '品牌', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'totalNum', + label: '总单数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: false, //开启统计 + }, + { + prop: 'hasOpenNum', + label: '已开单数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: false, //开启统计 + }, + { + prop: 'noOpenNum', + label: '未开单数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: false, //开启统计 + }, + { + prop: 'noOpenRate', + label: '未开单占比', + type: 6, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'noOpenHasFreezeNum', + label: '未开单已冻结数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'noOpenHasFreezeRate', + label: '未开单已冻结占比', + type: 6, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: false, //开启统计 + }, + { + prop: 'noOpenNoFreezeNum', + label: '未开单未处理数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'noOpenNoFreezeRate', + label: '未处理占比', + type: 6, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: false, //开启统计 + }, + { + prop: 'onTimeNum', + label: '准时开单数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'overTimeNum', + label: '超期开单数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'onTimeRate', + label: '开单准时率', + type: 6, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'avgTime', + label: '平均开单时效(小时)', + type: 1, + values: '', + width: '160', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: false, //开启统计 + }, +]; diff --git a/src/views/reportforms/AuditTimelinessRatioReport.vue b/src/views/reportforms/AuditTimelinessRatioReport.vue new file mode 100644 index 00000000..9584eb34 --- /dev/null +++ b/src/views/reportforms/AuditTimelinessRatioReport.vue @@ -0,0 +1,528 @@ + + + + + diff --git a/src/views/reportforms/ConsigneeReport.vue b/src/views/reportforms/ConsigneeReport.vue index 14745f50..53299701 100644 --- a/src/views/reportforms/ConsigneeReport.vue +++ b/src/views/reportforms/ConsigneeReport.vue @@ -492,7 +492,7 @@ const ExportData = async () => { const { status, data } = res; if (status !== 200) return; const time = new Date().getTime(); - downloadXls(data, '营业部收入报表 -' + time + '.xlsx'); + downloadXls(data, '收货单位收入报表 -' + time + '.xlsx'); } catch (error) { console.log('error :>> ', error); } finally { diff --git a/src/views/reportforms/CreateOrderTimelinessRatioReport.vue b/src/views/reportforms/CreateOrderTimelinessRatioReport.vue new file mode 100644 index 00000000..3ad0d0b1 --- /dev/null +++ b/src/views/reportforms/CreateOrderTimelinessRatioReport.vue @@ -0,0 +1,509 @@ + + + + + From fd7ba23c8cdf550ee6d230c169a5415f88cbb6b5 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Thu, 12 Dec 2024 18:55:43 +0800 Subject: [PATCH 3/3] =?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 --- .../Financialreview.vue | 9 +++++-- .../ServiceProviderPrice.vue | 25 +++++++++++++++---- .../Traincostbreakdown.vue | 9 +------ .../WarehouseDeliveryCost.vue | 1 + .../WarehousePricingTemplate.vue | 20 ++++++++++----- 5 files changed, 43 insertions(+), 21 deletions(-) diff --git a/src/views/cost/Deliverycostmanagement/Financialreview.vue b/src/views/cost/Deliverycostmanagement/Financialreview.vue index f5266891..2e4682c2 100644 --- a/src/views/cost/Deliverycostmanagement/Financialreview.vue +++ b/src/views/cost/Deliverycostmanagement/Financialreview.vue @@ -164,8 +164,7 @@ import { $_expenseDispatchFinancialReview, } from '@/api/storagecost/index.js'; import { getDictionaryBiz } from '@/api/system/dict'; //字典 -import { processRowProperty, setNodeHeight } from '@/utils/util'; -import functions from '@/utils/functions.js'; +import { processRowProperty, setNodeHeight,handleClearTableQuery } from '@/utils/util'; import { ElMessageBox, ElMessage } from 'element-plus'; import { downloadXls } from '@/utils/util'; import { useStore } from 'vuex'; @@ -326,6 +325,12 @@ const currentChange = val => { const searchChangeS = () => { onLoad(); }; +// 清空 +const searchReset = () => { + details.query = {}; + handleClearTableQuery(details.columnList); + onLoad(); +}; // 顶部搜索 const searchHide = () => { console.log(details); diff --git a/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue b/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue index d9441f41..1dc0d539 100644 --- a/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue +++ b/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue @@ -163,8 +163,7 @@ import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue'; import { columnList } from '@/option/storagecost/ServiceProviderPrice.js'; import { getDictionaryBiz } from '@/api/system/dict'; //字典 -import { processRowProperty, setNodeHeight } from '@/utils/util'; -import functions from '@/utils/functions.js'; +import { processRowProperty, setNodeHeight,handleClearTableQuery } from '@/utils/util'; import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; //司机信息 import { $_getMyWarehouseList, @@ -333,8 +332,15 @@ const selectionChange = list => { }; // 网页顶部搜索按钮 const searchChange = () => { - details.search = false; //关闭搜索 + // details.search = false; //关闭搜索 + onLoad() }; +const searchReset=()=>{ + details.query={} + queryTop.value={} + handleClearTableQuery(details.columnList); + onLoad() +} // 每页多少条 const sizeChange = val => { details.page.pageSize = val; @@ -471,7 +477,13 @@ const PageOnload = async () => { await MyWarehouseList(); //获取仓库 onLoad(); }; - +const AddInfo=()=>{ + ElMessage({ + message: '功能维护', + type: 'warning', + }) + return +} //页面初始化方法 PageOnload(); // 价格配置提交 @@ -628,10 +640,13 @@ const deleteTemplate = row => { width: 100%; display: flex; justify-content: space-between; - .el-btn { + :deep(.el-btn) { margin-right: 0; width: 15%; align-items: flex-start; + .el-form-item__content{ + justify-content: flex-end; + } } } diff --git a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue index 9e6cab51..3a49124c 100644 --- a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue +++ b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue @@ -156,7 +156,7 @@ style="width: 100%" :rows="4" type="textarea" - placeholder="请填写结算备注(必填)" + placeholder="请填写结算备注" /> @@ -579,13 +579,6 @@ const confirmation = row => { }; // 结算确定 const SettlementconfirmationSubmit = async row => { - if (!Confirmsettlement.value.form.settlementNote) { - ElMessage({ - message: '请填写结算备注', - type: 'warning', - }); - return; - } try { Confirmsettlement.value.loading = true; let Submit = { diff --git a/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue b/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue index 48c05f19..d0fb49ad 100644 --- a/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue +++ b/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue @@ -413,6 +413,7 @@ const searchReset = () => { item.values = ''; }); details.query = {}; + queryTop.value={} onLoad(); }; // 结算时间跳转 diff --git a/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue b/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue index 555fae82..e1e6c2f5 100644 --- a/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue +++ b/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue @@ -7,7 +7,7 @@
- + - + { const searchChange = () => { onLoad(); }; +// 清空 +const searchReset=()=>{ + queryTop.value = {}; + details.query = {}; + handleClearTableQuery(details.columnList); + onLoad(); +} // 每页多少条 const sizeChange = val => { details.page.pageSize = val; @@ -426,10 +431,13 @@ const lyadded = () => { width: 100%; display: flex; justify-content: space-between; - .el-btn { + :deep(.el-btn) { margin-right: 0; width: 15%; align-items: flex-start; + .el-form-item__content{ + justify-content: flex-end; + } } }