From 0cd010290bac7ba12e6163240b2fd34d8affb37c Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Thu, 21 Nov 2024 15:30:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AE=8C=E7=BB=93=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/aftersales/aftersalesWorkOrder.js | 9 +++++++ src/views/aftersales/aftersalesWorkOrder.vue | 25 ++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js index 2812bc3e..789ad03f 100644 --- a/src/api/aftersales/aftersalesWorkOrder.js +++ b/src/api/aftersales/aftersalesWorkOrder.js @@ -500,6 +500,15 @@ export const $_exportWorkOrder2 = (params) => { responseType: 'blob', }) } +// 完结导出 +export const $_exportWorkOrder4 = (params) => { + return request({ + url: '/api/logpm-aftersales/aftersalesWorkOrder/exportWorkOrder4', + method: 'get', + params, + responseType: 'blob', + }) +} // 处理完毕 export const $_exportWorkOrder3 = (params) => { return request({ diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index cd0e7143..d6f9470e 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -636,6 +636,7 @@ import { $_exportWorkOrder1, $_exportWorkOrder2, $_exportWorkOrder3, + $_exportWorkOrder4, } from '@/api/aftersales/aftersalesWorkOrder'; import { columnList, @@ -2830,6 +2831,10 @@ const exportReport = () => { // 理赔金额未出 ExportClaimAmount(dataID); break; + case 6: + // 完结 + CompleteExport(dataID); + break; default: ExportAll(dataID); break; @@ -2934,6 +2939,26 @@ const ExportClaimAmount = async dataID => { } finally { } }; +// 完结导出 +const CompleteExport = async dataID => { + try { + let res = await $_exportWorkOrder4(dataID); + 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')}`; + downloadXls(res.data, `导出工单数据${formattedDate}.xlsx`); + } catch (e) { + console.log(e); + } finally { + } +}; // 处理完毕导出 const ProcessedExported = async dataID => { try { From b5282bf03b7e5ef3d576a2b72f67044ddee4e45e Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 21 Nov 2024 15:55:42 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=8D=95?= =?UTF-8?q?=E5=BD=95=E5=8D=95=E5=B8=A6=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/distribution/inventory/CreateOrder.vue | 16 ++++++++++++++-- src/views/waybill/CreateZeroOrder.vue | 16 ++++++++++++++-- src/views/wel/index.vue | 2 +- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue index f8be7224..6fdcf795 100644 --- a/src/views/distribution/inventory/CreateOrder.vue +++ b/src/views/distribution/inventory/CreateOrder.vue @@ -228,7 +228,12 @@ @@ -253,7 +258,12 @@ @@ -327,6 +337,7 @@ @row-click=" (column, prop, order) => { handleChooseConsigner(column, prop, order); + handleFindPrice(); } " v-loading="details.loadingObj.consignerLoading" @@ -356,6 +367,7 @@ @row-click=" (column, prop, order) => { handleChooseConsigner(column, prop, order); + handleFindPrice(); } " v-loading="details.loadingObj.consignerLoading" diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue index a1e87bd9..b00ebbdb 100644 --- a/src/views/waybill/CreateZeroOrder.vue +++ b/src/views/waybill/CreateZeroOrder.vue @@ -196,7 +196,12 @@ @@ -221,7 +226,12 @@ @@ -295,6 +305,7 @@ @row-click=" (column, prop, order) => { handleChooseConsigner(column, prop, order); + handleFindPrice(); } " v-loading="details.loadingObj.consignerLoading" @@ -324,6 +335,7 @@ @row-click=" (column, prop, order) => { handleChooseConsigner(column, prop, order); + handleFindPrice(); } " v-loading="details.loadingObj.consignerLoading" diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue index a87db5ba..fce77d15 100644 --- a/src/views/wel/index.vue +++ b/src/views/wel/index.vue @@ -1029,7 +1029,7 @@ v-model="details.popUpShow.isShow" width="80%" :append-to-body="false" - :destroy-on-close="false" + :destroy-on-close="true" draggable > From 92ce4cf2d5a04046ea9438510c6936c642ce88f5 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Thu, 21 Nov 2024 19:15:48 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=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/api/reportforms/index.js | 36 ++ src/option/aftersales/vueTvemp.js | 2 +- .../reportforms/DeliveryDetailsReport.js | 365 +++++++++++++ .../reportforms/DeliveryStatisticsReport.js | 203 +++++++ src/router/views/index.js | 18 +- .../aftersales/aftersalesWorkOrderAdd.vue | 6 +- .../deliverylist/distributionDeliveryList.vue | 8 +- .../distributionDeliveryListdis.vue | 18 +- .../distributionDeliveryListmar.vue | 20 +- .../inventory/distrilbutionBillLadingList.vue | 18 + .../reportforms/DeliveryDetailsReport.vue | 361 +++++++++++++ .../reportforms/DeliveryStatisticsReport.vue | 505 ++++++++++++++++++ src/views/waybill/orderPackageList.vue | 46 +- 13 files changed, 1564 insertions(+), 42 deletions(-) create mode 100644 src/option/reportforms/DeliveryDetailsReport.js create mode 100644 src/option/reportforms/DeliveryStatisticsReport.js create mode 100644 src/views/reportforms/DeliveryDetailsReport.vue create mode 100644 src/views/reportforms/DeliveryStatisticsReport.vue diff --git a/src/api/reportforms/index.js b/src/api/reportforms/index.js index e223224b..61196de5 100644 --- a/src/api/reportforms/index.js +++ b/src/api/reportforms/index.js @@ -190,3 +190,39 @@ export const $_exportStockOrder = params => { responseType: 'blob', }); }; + +// 配送统计报表 +export const $_getDeliveryStatisticsReport = params => { + return request({ + url: '/api/logpm-report/qualityDispatch/number', + method: 'get', + params, + }); +}; +// 配送统计报表导出 +export const $_expDeliveryStatisticsReport = params => { + return request({ + url: '/api/logpm-report/qualityDispatch/exporNumber', + method: 'get', + params, + responseType: 'blob', + }); +}; +// 配送统计报表详情 +export const $_getDeliveryDetailsReport = params => { + return request({ + url: '/api/logpm-report/qualityDispatch/task', + method: 'get', + params, + }); +}; +// 配送统计报表详情导出 +export const $_expDeliveryDetailsReport = params => { + return request({ + url: '/api/logpm-report/qualityDispatch/exporTask', + method: 'get', + params, + responseType: 'blob', + }); +}; + diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js index 520ba6d2..5c95196c 100644 --- a/src/option/aftersales/vueTvemp.js +++ b/src/option/aftersales/vueTvemp.js @@ -473,7 +473,7 @@ export const columnList = [ { prop: 'ceator', label: '创建人', - type: 1, + type: 2, values: '', width: '150', checkarr: [], diff --git a/src/option/reportforms/DeliveryDetailsReport.js b/src/option/reportforms/DeliveryDetailsReport.js new file mode 100644 index 00000000..122301dd --- /dev/null +++ b/src/option/reportforms/DeliveryDetailsReport.js @@ -0,0 +1,365 @@ +export const columnList = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'warehouseName', + label: '仓库', + type: 1, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryType', + label: '配送类型', + type: 3, + values: '', + width: '150', + checkarr: [ + { + label: '商配', + value: '商配' + }, + { + label: '市配', + value: '市配' + } + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'reviewStatus', + label: '文员复核状态', + type: 3, + values: '', + width: '150', + checkarr: [ + { + label: '已复核', + value: '已复核' + }, + { + label: '未复核', + value: '未复核' + } + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'planReservationCode', + label: '预约单编号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'planTrainNumber', + label: '车次号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'mallName', + label: '商场/承运商', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'reservationConsignee', + label: '收货人', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'driverName', + label: '司机/提货人', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'vehicleName', + label: '车辆', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryTime', + label: '配送日期', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryCreateUserName', + label: '任务创建人', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'planNum', + label: '计划件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true,//开启统计 + }, + { + prop: 'loadNum', + label: '装车件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true,//开启统计 + }, + { + prop: 'signNum', + label: '签收件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true,//开启统计 + }, + { + prop: 'planStockNum', + label: '库存品计划数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true,//开启统计 + }, + { + prop: 'loadStockNum', + label: '库存品装车数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true,//开启统计 + }, + { + prop: 'signStockNum', + label: '库存品签收数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true,//开启统计 + }, +// { +// prop: 'signStatus', +// label: '签收状态', +// type: 1, +// values: '', +// width: '150', +// checkarr: [], +// fixed: false, +// sortable: true, +// head: false, +// }, + { + prop: 'signTime', + label: '签收时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'signUserName', + label: '签收人', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'reviewUserName', + label: '审核人', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'reviewTime', + label: '审核时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'exceptionLoadNum', + label: '异常装车数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true,//开启统计 + }, + { + prop: 'exceptionSignNum', + label: '异常签收数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true,//开启统计 + }, + { + prop: 'deliveryMode', + label: '送货方式', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'startCarTime', + label: '发车时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'arriveCarTime', + label: '到达时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'unLoadNum', + label: '卸车件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true,//开启统计 + }, + // { + // prop: 'createUserName', + // label: '操作', + // type: 6, + // values: '', + // width: '200', + // checkarr: [], + // fixed: 'right', + // sortable: false, + // }, +]; diff --git a/src/option/reportforms/DeliveryStatisticsReport.js b/src/option/reportforms/DeliveryStatisticsReport.js new file mode 100644 index 00000000..88aa230d --- /dev/null +++ b/src/option/reportforms/DeliveryStatisticsReport.js @@ -0,0 +1,203 @@ +export const columnList = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'warehouseName', + label: '仓库', + type: 1, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryType', + label: '配送类型', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: true, + }, + { + prop: 'planNum', + label: '预约总数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + + { + prop: 'loadNum', + label: '装车总数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'signNum', + label: '签收总数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + + { + prop: 'signRate', + label: '签收率', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'planStockNum', + label: '预约库存品数量', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'loadStockNum', + label: '库存品装车数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'signStockNum', + label: '库存品签收数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'signStockRate', + label: '库存品签收率', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'exceptionNum', + label: '异常数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'planAccuracy', + label: '计划准确率', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'customerCount', + label: '客户数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'reviewCustomerCount', + label: '已审核客户数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'reviewRate', + label: '审核率', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '200', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; diff --git a/src/router/views/index.js b/src/router/views/index.js index ec092d40..70e2a669 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1812,7 +1812,7 @@ export default [ }, path: '/distribution/checkInventoryTask/createTaskTemp', name: '盘点旧版', - component: () => import('@/views/distribution/checkInventoryTask/createTasktemp.vue'), + component: () => import('@/views/distribution/checkInventoryTask/createTaskTemp.vue'), }, ], }, @@ -1865,4 +1865,20 @@ export default [ }, ], }, + { + path: '/reportforms/DeliveryDetailsReport', + component: Layout, + redirect: '/reportforms/DeliveryDetailsReport', + children: [ + { + meta: { + i18n: 'dict', + keepAlive: true, + }, + path: '/reportforms/DeliveryDetailsReport', + name: '配送明细详情报表', + component: () => import('@/views/reportforms/DeliveryDetailsReport.vue'), + }, + ], + }, ]; diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index 85672ded..e25f8529 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -1010,11 +1010,15 @@ const DiscoveringNodesChange = async value => { typeServiceName: form.value.basis.typeServiceName, //合作模式 TabactiveName: form.value.basis.TabactiveName, //订单类型 }; + form.value.deliver = []; if (value == '3') { form.value.basis.processorEntityList = []; } else { delete form.value.basis.processorEntityList; } + if (value == '5' || value == '7') { + form.value.deliver = []; + } console.log(form.value.basis, 'form.value.basis'); // 公司占比重置 form.value.Proportion = 0; @@ -1385,7 +1389,7 @@ const ChangePackageInfo = async item => { console.log(form.value.Trainoptions, 'form.value.Trainoptions'); } // 配送环节车次号处理 - if (['5'].includes(form.value.basis.discoveryNode)) { + if (['5', '7'].includes(form.value.basis.discoveryNode)) { let addedTrainNumbers = []; // 临时变量存储已经添加过的车次号 res.data.data.forEach(item => { if (item.deliver && item.deliver.length) { diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue index 6c68e6cc..758da0a4 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryList.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue @@ -1058,13 +1058,17 @@ export default { // 获取当前日期 const currentDate = dayjs(); // 计算一个月前的日期 - const startDate = currentDate.subtract(1, 'month'); + // 获取当前月份的第一天 + const startDate = currentDate.startOf('month'); + // 获取当前月份的最后一天 + const endDate = currentDate.endOf('month'); // 格式化日期为 'YYYY-MM-DD' const formatDate = date => date.format('YYYY-MM-DD'); this.Deliverydate = []; this.Deliverydate[0] = formatDate(startDate); // 一个月前的日期 - this.Deliverydate[1] = formatDate(currentDate); // 当前日期 + this.Deliverydate[1] = formatDate(endDate); // 当前日期 }, + async onLoad(page, params = {}) { this.loading = true; if (this.currentdate) { diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue index 1dceea59..ceb727c3 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue @@ -338,7 +338,7 @@ export default { data() { return { height: 0, - currentdate:true, + currentdate: true, // 弹框标题 title: '', // 是否展示弹框 @@ -989,22 +989,24 @@ export default { Getcurrentdate() { // 获取当前日期 const currentDate = dayjs(); - // 计算一个月前的日期 - const startDate = currentDate.subtract(1, 'month'); + // 获取当前月份的第一天 + const startDate = currentDate.startOf('month'); + // 获取当前月份的最后一天 + const endDate = currentDate.endOf('month'); // 格式化日期为 'YYYY-MM-DD' const formatDate = date => date.format('YYYY-MM-DD'); this.query.taskTimeArr = []; this.query.taskTimeArr[0] = formatDate(startDate); // 一个月前的日期 - this.query.taskTimeArr[1] = formatDate(currentDate); // 当前日期 + this.query.taskTimeArr[1] = formatDate(endDate); // 当前日期 }, - async onLoad(page, params = {}) { + async onLoad(page, params = {}) { this.loading = true; this.query.type = '1'; - if(this.currentdate){ - await this.Getcurrentdate() + if (this.currentdate) { + await this.Getcurrentdate(); } - + const submitData = { ...params, ...this.query }; if (getObjType(this.query.taskTimeArr) === 'array') { diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue index 54e75fc9..c4453b08 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue @@ -249,7 +249,7 @@ export default { data() { return { height: 0, - currentdate:true, + currentdate: true, dydialogVisible: false, // 弹框标题 title: '', @@ -778,21 +778,23 @@ export default { Getcurrentdate() { // 获取当前日期 const currentDate = dayjs(); - // 计算一个月前的日期 - const startDate = currentDate.subtract(1, 'month'); + // 获取当前月份的第一天 + const startDate = currentDate.startOf('month'); + // 获取当前月份的最后一天 + const endDate = currentDate.endOf('month'); // 格式化日期为 'YYYY-MM-DD' const formatDate = date => date.format('YYYY-MM-DD'); this.query.taskTimeArr = []; this.query.taskTimeArr[0] = formatDate(startDate); // 一个月前的日期 - this.query.taskTimeArr[1] = formatDate(currentDate); // 当前日期 + this.query.taskTimeArr[1] = formatDate(endDate); // 当前日期 }, - async onLoad(page, params = {}) { + async onLoad(page, params = {}) { this.loading = true; this.query.type = '2'; - if(this.currentdate){ - await this.Getcurrentdate() + if (this.currentdate) { + await this.Getcurrentdate(); } - + const submitData = { ...params, ...this.query }; if (getObjType(this.query.taskTimeArr) === 'array') { @@ -829,7 +831,7 @@ export default { this.page.total = data.total || 0; this.data = data.records || []; this.loading = false; - this.currentdate=false; + this.currentdate = false; this.selectionClear(); }); getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue index f2c13a68..dcdf3fbe 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue @@ -271,6 +271,7 @@ export default { data() { return { Deliverytime: [], //提货时间 + currentdate: true, columnList: [ { prop: '', @@ -1129,9 +1130,25 @@ export default { let formattedDate = formatter.format(date); return formattedDate.replace(/\//g, '-'); }, + Getcurrentdate() { + // 获取当前日期 + const currentDate = dayjs(); + // 获取当前月份的第一天 + const startDate = currentDate.startOf('month'); + // 获取当前月份的最后一天 + const endDate = currentDate.endOf('month'); + // 格式化日期为 'YYYY-MM-DD' + const formatDate = date => date.format('YYYY-MM-DD'); + this.Deliverytime = []; + this.Deliverytime[0] = formatDate(startDate); // 一个月前的日期 + this.Deliverytime[1] = formatDate(endDate); // 当前日期 + }, async onLoad(page, params = {}) { try { this.loading = true; + if (this.currentdate) { + await this.Getcurrentdate(); + } if (this.stockupDate?.length) { let startDate = this.stockupDate[0]; let entDate = this.stockupDate[1]; @@ -1205,6 +1222,7 @@ export default { console.log('error :>> ', error); } finally { this.loading = false; + this.currentdate = false; } }, }, diff --git a/src/views/reportforms/DeliveryDetailsReport.vue b/src/views/reportforms/DeliveryDetailsReport.vue new file mode 100644 index 00000000..0b88b849 --- /dev/null +++ b/src/views/reportforms/DeliveryDetailsReport.vue @@ -0,0 +1,361 @@ + + + + + diff --git a/src/views/reportforms/DeliveryStatisticsReport.vue b/src/views/reportforms/DeliveryStatisticsReport.vue new file mode 100644 index 00000000..0fe8dd8c --- /dev/null +++ b/src/views/reportforms/DeliveryStatisticsReport.vue @@ -0,0 +1,505 @@ + + + + + diff --git a/src/views/waybill/orderPackageList.vue b/src/views/waybill/orderPackageList.vue index 23a61252..7e2954ea 100644 --- a/src/views/waybill/orderPackageList.vue +++ b/src/views/waybill/orderPackageList.vue @@ -13,16 +13,17 @@