update: 统一参数pageNumber 改为pageNum 出货汇总和收货汇总名称更新

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) {

src/PagesStatistics/receivePanel.vue

@@ -27,7 +27,7 @@
             <view class="num highlight">{{
               formatMoney(state.summary.totalAmount, 2)
             }}</view>
-            <view>收货总量/kg</view>
+            <view>收货总净重/kg</view>
           </view>
         </up-col>
         <up-col span="4">
@@ -54,7 +54,7 @@
             <view class="num highlight">{{
               formatMoney(state.summary.totalPayment,2)
             }}</view>
-            <view>结算金额/元</view>
+            <view>实际总付款/元</view>
           </view>
         </up-col>
         <up-col span="4">
@@ -147,10 +147,10 @@ const tableTitleList = reactive([
     name: "收货产品",
   },
   {
-    name: "收货总量/kg",
+    name: "收货总净重/kg",
   },
   {
-    name: "总金额",
+    name: "收货总付款",
   },
   {
     name: "收货单数",

src/PagesStatistics/shipmentPanel.vue

@@ -27,7 +27,7 @@
             <view class="num highlight">{{
               formatMoney(state.summary.totalAmount, 2)
             }}</view>
-            <view>出货总量/kg</view>
+            <view>出货总净重/kg</view>
           </view>
         </up-col>
         <up-col span="4">
@@ -56,7 +56,7 @@
             <view class="num highlight">{{
               formatMoney(state.summary.totalCollection, 2)
             }}</view>
-            <view>结算金额/元</view>
+            <view>出货总收款/元</view>
           </view>
         </up-col>
         <up-col span="4">
@@ -64,7 +64,7 @@
             <view class="num">{{
               formatMoney(state.summary.totalPayCollection, 2)
             }}</view>
-            <view>实收金额</view>
+            <view>已收/元</view>
           </view>
         </up-col>
         <up-col span="4">
@@ -72,7 +72,7 @@
             <view class="num">{{
               formatMoney(state.summary.totalUnPayCollection, 2)
             }}</view>
-            <view>应收金额</view>
+            <view>未收/元</view>
           </view>
         </up-col>
       </up-row>
@@ -149,10 +149,10 @@ const tableTitleList = reactive([
     name: "客户",
   },
   {
-    name: "结算重量/kg",
+    name: "出货总净重/kg",
   },
   {
-    name: "结算金额",
+    name: "实际收款",
   },
   {
     name: "实收款",

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,

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,

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) => {

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'),
   };

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) => {

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'),
   };

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) {

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'),

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}` : '',

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
   };

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;

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` : "",

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'),

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'),

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,
   };

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; // 结束时间

src/types/order.d.ts

@@ -91,7 +91,7 @@ interface ReceiveSummary {
 }
 
 type PageParams = {
-  pageNumber: number;
+  pageNum: number;
   pageSize: number;
   pricingUserId?: string; // 定价人
   userId?: string; // 供应商id