From a1359a42243f0d6b43dc8b4f4747111c6a59e1d4 Mon Sep 17 00:00:00 2001 From: admin <> Date: Fri, 2 Aug 2024 15:18:11 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E7=BB=9F=E4=B8=80=E5=8F=82=E6=95=B0p?= =?UTF-8?q?ageNumber=20=E6=94=B9=E4=B8=BApageNum=20=20=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=92=8C=E6=94=B6=E8=B4=A7=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/PagesStatistics/billDetail.vue | 2 +- src/PagesStatistics/receivePanel.vue | 8 ++++---- src/PagesStatistics/shipmentPanel.vue | 12 ++++++------ src/pagesApp/incomeDetail.vue | 2 +- src/pagesApp/paymentDetail.vue | 2 +- src/pagesApp/receiveCl.vue | 2 +- src/pagesApp/receiveDetail.vue | 2 +- src/pagesApp/shipmentCl.vue | 2 +- src/pagesApp/shipmentDetail.vue | 2 +- src/pagesLogin/message/index.vue | 4 ++-- src/pagesReceive/payList.vue | 2 +- src/pagesReceive/payReview.vue | 2 +- src/pagesReceive/pricing.vue | 2 +- src/pagesShipment/grossWeight.vue | 2 +- src/pagesShipment/pendingPayment.vue | 2 +- src/pagesShipment/receivedPayment.vue | 2 +- src/pagesShipment/shipmentSettlement.vue | 2 +- src/pagesShipment/shipmenting.vue | 2 +- src/services/shipment.ts | 2 +- src/types/order.d.ts | 2 +- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/PagesStatistics/billDetail.vue b/src/PagesStatistics/billDetail.vue index ed5a387..751fbf1 100644 --- a/src/PagesStatistics/billDetail.vue +++ b/src/PagesStatistics/billDetail.vue @@ -76,7 +76,7 @@ const getList = (v?: boolean) => { pageList.isLoading = true; let params: any = { pageSize: pageList.pageSize, - pageNumber: pageList.pageNum, + pageNum: pageList.pageNum, scaleStatus: ScaleStatus.ToBePay, }; if (state.id) { diff --git a/src/PagesStatistics/receivePanel.vue b/src/PagesStatistics/receivePanel.vue index a705943..f8424cb 100644 --- a/src/PagesStatistics/receivePanel.vue +++ b/src/PagesStatistics/receivePanel.vue @@ -27,7 +27,7 @@ {{ formatMoney(state.summary.totalAmount, 2) }} - 收货总量/kg + 收货总净重/kg @@ -54,7 +54,7 @@ {{ formatMoney(state.summary.totalPayment,2) }} - 结算金额/元 + 实际总付款/元 @@ -147,10 +147,10 @@ const tableTitleList = reactive([ name: "收货产品", }, { - name: "收货总量/kg", + name: "收货总净重/kg", }, { - name: "总金额", + name: "收货总付款", }, { name: "收货单数", diff --git a/src/PagesStatistics/shipmentPanel.vue b/src/PagesStatistics/shipmentPanel.vue index ee89c88..15766af 100644 --- a/src/PagesStatistics/shipmentPanel.vue +++ b/src/PagesStatistics/shipmentPanel.vue @@ -27,7 +27,7 @@ {{ formatMoney(state.summary.totalAmount, 2) }} - 出货总量/kg + 出货总净重/kg @@ -56,7 +56,7 @@ {{ formatMoney(state.summary.totalCollection, 2) }} - 结算金额/元 + 出货总收款/元 @@ -64,7 +64,7 @@ {{ formatMoney(state.summary.totalPayCollection, 2) }} - 实收金额 + 已收/元 @@ -72,7 +72,7 @@ {{ formatMoney(state.summary.totalUnPayCollection, 2) }} - 应收金额 + 未收/元 @@ -149,10 +149,10 @@ const tableTitleList = reactive([ name: "客户", }, { - name: "结算重量/kg", + name: "出货总净重/kg", }, { - name: "结算金额", + name: "实际收款", }, { name: "实收款", diff --git a/src/pagesApp/incomeDetail.vue b/src/pagesApp/incomeDetail.vue index bfaac4a..a5e8545 100644 --- a/src/pagesApp/incomeDetail.vue +++ b/src/pagesApp/incomeDetail.vue @@ -241,7 +241,7 @@ const getList = (v?: boolean) => { } let params: any = { pageSize: pageList.pageSize, - pageNumber: pageList.pageNum, + pageNum: pageList.pageNum, startTime: formatStartAndEndTime(state.startTime, 's'), endTime: formatStartAndEndTime(state.endTime, 'e'), oddNumbers: keyword.value, diff --git a/src/pagesApp/paymentDetail.vue b/src/pagesApp/paymentDetail.vue index 1bfbf63..8674c87 100644 --- a/src/pagesApp/paymentDetail.vue +++ b/src/pagesApp/paymentDetail.vue @@ -241,7 +241,7 @@ const getList = (v?: boolean) => { } let params: any = { pageSize: pageList.pageSize, - pageNumber: pageList.pageNum, + pageNum: pageList.pageNum, startTime: formatStartAndEndTime(state.startTime, 's'), endTime: formatStartAndEndTime(state.endTime, 'e'), oddNumbers: keyword.value, diff --git a/src/pagesApp/receiveCl.vue b/src/pagesApp/receiveCl.vue index a724861..e066129 100644 --- a/src/pagesApp/receiveCl.vue +++ b/src/pagesApp/receiveCl.vue @@ -180,7 +180,7 @@ const getList = (v?: boolean) => { pageList.isLoading = true; ReceiveApi.getOrderPage({ pageSize: pageList.pageSize, - pageNumber: pageList.pageNum, + pageNum: pageList.pageNum, userName: keyword.value, isDeleted: true, }).then((res) => { diff --git a/src/pagesApp/receiveDetail.vue b/src/pagesApp/receiveDetail.vue index cf18c9d..f2dfcc3 100644 --- a/src/pagesApp/receiveDetail.vue +++ b/src/pagesApp/receiveDetail.vue @@ -375,7 +375,7 @@ const getList = (v?: boolean) => { } let params: any = { pageSize: pageList.pageSize, - pageNumber: pageList.pageNum, + pageNum: pageList.pageNum, startTime: formatStartAndEndTime(state.startTime, 's'), endTime: formatStartAndEndTime(state.endTime, 'e'), }; diff --git a/src/pagesApp/shipmentCl.vue b/src/pagesApp/shipmentCl.vue index 3210e18..b0f2797 100644 --- a/src/pagesApp/shipmentCl.vue +++ b/src/pagesApp/shipmentCl.vue @@ -208,7 +208,7 @@ const getList = (v?: boolean) => { pageList.isLoading = true; ShipmentApi.getOrderPage({ pageSize: pageList.pageSize, - pageNumber: pageList.pageNum, + pageNum: pageList.pageNum, userName: keyword.value, isDeleted: true, }).then((res: any) => { diff --git a/src/pagesApp/shipmentDetail.vue b/src/pagesApp/shipmentDetail.vue index a9cd8ae..00d3aa3 100644 --- a/src/pagesApp/shipmentDetail.vue +++ b/src/pagesApp/shipmentDetail.vue @@ -408,7 +408,7 @@ const getList = (v?: boolean) => { } let params: any = { pageSize: pageList.pageSize, - pageNumber: pageList.pageNum, + pageNum: pageList.pageNum, startTime: formatStartAndEndTime(state.startTime, 's'), endTime: formatStartAndEndTime(state.endTime, 'e'), }; diff --git a/src/pagesLogin/message/index.vue b/src/pagesLogin/message/index.vue index bb882e9..41ef886 100644 --- a/src/pagesLogin/message/index.vue +++ b/src/pagesLogin/message/index.vue @@ -115,7 +115,7 @@ const handleItem = (item: any) => { ) { ReceiveApi.getOrderPage({ pageSize: 100, - pageNumber: 1, + pageNum: 1, receiptNumber: item.business, }).then((res) => { if (res.code === 200) { @@ -156,7 +156,7 @@ const handleItem = (item: any) => { ) { ShipmentApi.getOrderPage({ pageSize: 100, - pageNumber: 1, + pageNum: 1, orderNumber: item.business, }).then((res) => { if (res.code === 200) { diff --git a/src/pagesReceive/payList.vue b/src/pagesReceive/payList.vue index 9a0074c..8343d4d 100644 --- a/src/pagesReceive/payList.vue +++ b/src/pagesReceive/payList.vue @@ -115,7 +115,7 @@ const getList = (v?: boolean) => { pageList.isLoading = true; ReceiveApi.getOrderPage({ pageSize: pageList.pageSize, - pageNumber: pageList.pageNum, + pageNum: pageList.pageNum, scaleStatus: ScaleStatus.Paid, userName: keyword.value, startTime: formatStartAndEndTime(filterState.startTime, 's'), diff --git a/src/pagesReceive/payReview.vue b/src/pagesReceive/payReview.vue index bfd4113..ad36ebe 100644 --- a/src/pagesReceive/payReview.vue +++ b/src/pagesReceive/payReview.vue @@ -310,7 +310,7 @@ const getList = (v?: boolean) => { pageList.isLoading = true; ReceiveApi.getOrderPage({ pageSize: pageList.pageSize, - pageNumber: pageList.pageNum, + pageNum: pageList.pageNum, scaleStatus: currentTab.value, userName: keyword.value, startTime: filterState.startTime ? `${filterState.startTime}` : '', diff --git a/src/pagesReceive/pricing.vue b/src/pagesReceive/pricing.vue index d956482..8f7f5fb 100644 --- a/src/pagesReceive/pricing.vue +++ b/src/pagesReceive/pricing.vue @@ -203,7 +203,7 @@ const getList = (v?: boolean) => { } let params: any = { pageSize: pageList.pageSize, - pageNumber: pageList.pageNum, + pageNum: pageList.pageNum, scaleStatus: state.scaleStatus, userName: stateNew.keywoard }; diff --git a/src/pagesShipment/grossWeight.vue b/src/pagesShipment/grossWeight.vue index da25ebd..ca8795d 100644 --- a/src/pagesShipment/grossWeight.vue +++ b/src/pagesShipment/grossWeight.vue @@ -106,7 +106,7 @@ const getList = (v?: boolean) => { } let params: any = { pageSize: pageList.pageSize, - pageNumber: pageList.pageNum, + pageNum: pageList.pageNum, scaleStatus: 1, }; pageList.isLoading = true; diff --git a/src/pagesShipment/pendingPayment.vue b/src/pagesShipment/pendingPayment.vue index a04cabb..5f58d5c 100644 --- a/src/pagesShipment/pendingPayment.vue +++ b/src/pagesShipment/pendingPayment.vue @@ -288,7 +288,7 @@ const getList = (v?: boolean) => { pageList.isLoading = true; ShipmentApi.getOrderPage({ pageSize: pageList.pageSize, - pageNumber: pageList.pageNum, + pageNum: pageList.pageNum, scaleStatus: ScaleStatus.ToBeShipmentPay, userName: keyword.value, startTime: filterState.startTime ? `${filterState.startTime} 00:00:00` : "", diff --git a/src/pagesShipment/receivedPayment.vue b/src/pagesShipment/receivedPayment.vue index 5f51090..84ccb08 100644 --- a/src/pagesShipment/receivedPayment.vue +++ b/src/pagesShipment/receivedPayment.vue @@ -113,7 +113,7 @@ const getList = (v?: boolean) => { pageList.isLoading = true; ShipmentApi.getOrderPage({ pageSize: pageList.pageSize, - pageNumber: pageList.pageNum, + pageNum: pageList.pageNum, scaleStatus: ScaleStatus.ShipmentPaid, userName: keyword.value, startTime: formatStartAndEndTime(filterState.startTime, 's'), diff --git a/src/pagesShipment/shipmentSettlement.vue b/src/pagesShipment/shipmentSettlement.vue index 20a9f21..560a2f0 100644 --- a/src/pagesShipment/shipmentSettlement.vue +++ b/src/pagesShipment/shipmentSettlement.vue @@ -289,7 +289,7 @@ const getList = (v?: boolean) => { pageList.isLoading = true; ShipmentApi.getOrderPage({ pageSize: pageList.pageSize, - pageNumber: pageList.pageNum, + pageNum: pageList.pageNum, scaleStatus: ScaleStatus.ToBeShipmentReview, userName: keyword.value, startTime: formatStartAndEndTime(filterState.startTime, 's'), diff --git a/src/pagesShipment/shipmenting.vue b/src/pagesShipment/shipmenting.vue index ad90ecf..f6931be 100644 --- a/src/pagesShipment/shipmenting.vue +++ b/src/pagesShipment/shipmenting.vue @@ -199,7 +199,7 @@ const getList = (v?: boolean) => { let params: any = { pageSize: pageList.pageSize, - pageNumber: pageList.pageNum, + pageNum: pageList.pageNum, scaleStatus: state.scaleStatus, userName: stateNew.keywoard, }; diff --git a/src/services/shipment.ts b/src/services/shipment.ts index 78c4bad..6327e61 100644 --- a/src/services/shipment.ts +++ b/src/services/shipment.ts @@ -31,7 +31,7 @@ type PageParams = { deviceId?:number; scaleStatus?: number; // 磅单状态：0：待出货1:待过毛2：待审核3：已审未付4：已审已付 flag?: boolean; // true 皮重 false 毛重 - pageNumber: number; + pageNum: number; pageSize: number; startTime?: string; // 开始时间 endTime?: string; // 结束时间 diff --git a/src/types/order.d.ts b/src/types/order.d.ts index 5e12cc3..1dadec3 100644 --- a/src/types/order.d.ts +++ b/src/types/order.d.ts @@ -91,7 +91,7 @@ interface ReceiveSummary { } type PageParams = { - pageNumber: number; + pageNum: number; pageSize: number; pricingUserId?: string; // 定价人 userId?: string; // 供应商id