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

2024-08-02 15:18:11 +08:00 · 2024-08-02 15:18:11 +08:00 · a1359a4224
parent 54c4e399b6
commit a1359a4224
20 changed files with 29 additions and 29 deletions
--- 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) {
--- a/src/PagesStatistics/receivePanel.vue
+++ b/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: "收货单数",
--- a/src/PagesStatistics/shipmentPanel.vue
+++ b/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: "实收款",
--- 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,
--- 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,
--- 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) => {
--- 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'),
  };
--- 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) => {
--- 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'),
  };
--- 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) {
--- 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'),
--- 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}` : '',
--- 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
  };
--- 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;
--- 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` : "",
--- 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'),
--- 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'),
--- 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,
  };
--- 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; // 结束时间
--- 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