From d324dee64522720cd8ad3cce137311e83a2ab40f Mon Sep 17 00:00:00 2001
From: admin <>
Date: Wed, 24 Jul 2024 16:41:19 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=88=86=E9=A1=B5=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=B8=BA100=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/PagesStatistics/billDetail.vue       |  2 +-
 src/pagesApp/customerMgt.vue             |  3 +--
 src/pagesApp/incomeDetail.vue            |  2 +-
 src/pagesApp/paymentDetail.vue           |  2 +-
 src/pagesApp/receiveCl.vue               |  2 +-
 src/pagesApp/receiveDetail.vue           |  2 +-
 src/pagesApp/receiveProduct.vue          |  2 +-
 src/pagesApp/receiveType.vue             |  2 +-
 src/pagesApp/role.vue                    |  2 +-
 src/pagesApp/shipmentCl.vue              |  2 +-
 src/pagesApp/shipmentDetail.vue          |  2 +-
 src/pagesApp/shipmentProduct.vue         |  2 +-
 src/pagesApp/shipmentSpl.vue             | 14 +++++++++++++-
 src/pagesApp/shipmentType.vue            |  2 +-
 src/pagesApp/stockCard.vue               |  2 +-
 src/pagesApp/supplierMgt.vue             |  2 +-
 src/pagesApp/supplierType.vue            |  2 +-
 src/pagesApp/user.vue                    |  2 +-
 src/pagesLogin/message/index.vue         |  6 +++---
 src/pagesReceive/payList.vue             |  2 +-
 src/pagesReceive/payReview.vue           |  8 +++++---
 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/utils/enum.ts                        |  2 +-
 src/utils/index.ts                       |  2 +-
 29 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/src/PagesStatistics/billDetail.vue b/src/PagesStatistics/billDetail.vue
index e002722..ed5a387 100644
--- a/src/PagesStatistics/billDetail.vue
+++ b/src/PagesStatistics/billDetail.vue
@@ -50,7 +50,7 @@ const pageList: PageResult<Order> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const state = reactive({
   id: "",
diff --git a/src/pagesApp/customerMgt.vue b/src/pagesApp/customerMgt.vue
index ae9f932..4b0df89 100644
--- a/src/pagesApp/customerMgt.vue
+++ b/src/pagesApp/customerMgt.vue
@@ -56,7 +56,6 @@
 </template>
 <script setup lang="ts">
 import { CustomerApi } from "@/services";
-import { UsersType } from "@/utils/enum";
 import PageView from "@/components/PageView/index.vue";
 import type { Customer } from "@/types/user";
 import SmallModal from "@/components/Modal/smallModal.vue";
@@ -77,7 +76,7 @@ const pageList: PageResult<Customer> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
diff --git a/src/pagesApp/incomeDetail.vue b/src/pagesApp/incomeDetail.vue
index 804d299..05b41c6 100644
--- a/src/pagesApp/incomeDetail.vue
+++ b/src/pagesApp/incomeDetail.vue
@@ -187,7 +187,7 @@ const pageList: PageResult<any> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
diff --git a/src/pagesApp/paymentDetail.vue b/src/pagesApp/paymentDetail.vue
index 19b0f00..eb197cc 100644
--- a/src/pagesApp/paymentDetail.vue
+++ b/src/pagesApp/paymentDetail.vue
@@ -187,7 +187,7 @@ const pageList: PageResult<any> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
diff --git a/src/pagesApp/receiveCl.vue b/src/pagesApp/receiveCl.vue
index 8d4f956..04996c4 100644
--- a/src/pagesApp/receiveCl.vue
+++ b/src/pagesApp/receiveCl.vue
@@ -153,7 +153,7 @@ const pageList: PageResult<Order> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
diff --git a/src/pagesApp/receiveDetail.vue b/src/pagesApp/receiveDetail.vue
index 740738e..cf18c9d 100644
--- a/src/pagesApp/receiveDetail.vue
+++ b/src/pagesApp/receiveDetail.vue
@@ -343,7 +343,7 @@ const pageList: PageResult<Order> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 
 const resetPageList = () => {
diff --git a/src/pagesApp/receiveProduct.vue b/src/pagesApp/receiveProduct.vue
index 6a8b127..092fb27 100644
--- a/src/pagesApp/receiveProduct.vue
+++ b/src/pagesApp/receiveProduct.vue
@@ -83,7 +83,7 @@ const pageList: PageResult<{
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
diff --git a/src/pagesApp/receiveType.vue b/src/pagesApp/receiveType.vue
index 007f031..6d9a717 100644
--- a/src/pagesApp/receiveType.vue
+++ b/src/pagesApp/receiveType.vue
@@ -75,7 +75,7 @@ const pageList: PageResult<{ reCategoryName: string; id: number }> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
diff --git a/src/pagesApp/role.vue b/src/pagesApp/role.vue
index f6c8314..efb2927 100644
--- a/src/pagesApp/role.vue
+++ b/src/pagesApp/role.vue
@@ -80,7 +80,7 @@ const pageList: PageResult<{
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
diff --git a/src/pagesApp/shipmentCl.vue b/src/pagesApp/shipmentCl.vue
index a533f8f..c6e4a48 100644
--- a/src/pagesApp/shipmentCl.vue
+++ b/src/pagesApp/shipmentCl.vue
@@ -181,7 +181,7 @@ const pageList: PageResult<Order> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
diff --git a/src/pagesApp/shipmentDetail.vue b/src/pagesApp/shipmentDetail.vue
index f59da72..a9cd8ae 100644
--- a/src/pagesApp/shipmentDetail.vue
+++ b/src/pagesApp/shipmentDetail.vue
@@ -376,7 +376,7 @@ const pageList: PageResult<Order> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 
 const resetPageList = () => {
diff --git a/src/pagesApp/shipmentProduct.vue b/src/pagesApp/shipmentProduct.vue
index 62bfe44..7e70130 100644
--- a/src/pagesApp/shipmentProduct.vue
+++ b/src/pagesApp/shipmentProduct.vue
@@ -86,7 +86,7 @@ const pageList: PageResult<{
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
diff --git a/src/pagesApp/shipmentSpl.vue b/src/pagesApp/shipmentSpl.vue
index 45c08bd..1ddb0ed 100644
--- a/src/pagesApp/shipmentSpl.vue
+++ b/src/pagesApp/shipmentSpl.vue
@@ -37,7 +37,7 @@
               ? '#ffffff'
               : '#f5f7fa'
           "
-          @change="(e:any) => {handleInput(e, item)}"
+          @blur="(e:any) => {handleInput(e, item)}"
           @clear="handleClear(item)"
         >
           <template #suffix>
@@ -191,6 +191,18 @@ const handleInput = (e: any, item: any) => {
       model1.order[item.key] = temp;
     }, 10);
   }
+
+  if (item.key === "phone") {
+    const temp = e?.replace(valid.valid_number, "");
+    if (!valid.mobile.pattern.test(model1.order.phone)) {
+      uni.showToast({ icon: "none", title: "请输入正确的手机号" });
+      return;
+    }
+
+    setTimeout(() => {
+      model1.order[item.key] = temp;
+    }, 10);
+  }
 };
 
 const model1 = reactive<any>({
diff --git a/src/pagesApp/shipmentType.vue b/src/pagesApp/shipmentType.vue
index 44f0236..09ffc9c 100644
--- a/src/pagesApp/shipmentType.vue
+++ b/src/pagesApp/shipmentType.vue
@@ -85,7 +85,7 @@ const pageList: PageResult<{
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
diff --git a/src/pagesApp/stockCard.vue b/src/pagesApp/stockCard.vue
index 59c218b..a8b5e5b 100644
--- a/src/pagesApp/stockCard.vue
+++ b/src/pagesApp/stockCard.vue
@@ -84,7 +84,7 @@ const pageList: PageResult<StockCard> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   const obj = {
diff --git a/src/pagesApp/supplierMgt.vue b/src/pagesApp/supplierMgt.vue
index 9dd2b26..98266d0 100644
--- a/src/pagesApp/supplierMgt.vue
+++ b/src/pagesApp/supplierMgt.vue
@@ -90,7 +90,7 @@ const pageList: PageResult<Supplier> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
diff --git a/src/pagesApp/supplierType.vue b/src/pagesApp/supplierType.vue
index 4dcae47..9011a78 100644
--- a/src/pagesApp/supplierType.vue
+++ b/src/pagesApp/supplierType.vue
@@ -73,7 +73,7 @@ const pageList: PageResult<SupplierType> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
diff --git a/src/pagesApp/user.vue b/src/pagesApp/user.vue
index cbec52f..0005eb1 100644
--- a/src/pagesApp/user.vue
+++ b/src/pagesApp/user.vue
@@ -81,7 +81,7 @@ const pageList: PageResult<User> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const add = () => {
   uni.navigateTo({
diff --git a/src/pagesLogin/message/index.vue b/src/pagesLogin/message/index.vue
index 781071b..bb882e9 100644
--- a/src/pagesLogin/message/index.vue
+++ b/src/pagesLogin/message/index.vue
@@ -62,7 +62,7 @@ const pageList: PageResult<any> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
@@ -114,7 +114,7 @@ const handleItem = (item: any) => {
     MsgType.ToBeReview === item.msgType
   ) {
     ReceiveApi.getOrderPage({
-      pageSize: 10,
+      pageSize: 100,
       pageNumber: 1,
       receiptNumber: item.business,
     }).then((res) => {
@@ -155,7 +155,7 @@ const handleItem = (item: any) => {
     MsgType.ToBeShipmentReview === item.msgType
   ) {
     ShipmentApi.getOrderPage({
-      pageSize: 10,
+      pageSize: 100,
       pageNumber: 1,
       orderNumber: item.business,
     }).then((res) => {
diff --git a/src/pagesReceive/payList.vue b/src/pagesReceive/payList.vue
index 9c427a3..9a0074c 100644
--- a/src/pagesReceive/payList.vue
+++ b/src/pagesReceive/payList.vue
@@ -86,7 +86,7 @@ const pageList: PageResult<Order> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const keyword = ref("");
 
diff --git a/src/pagesReceive/payReview.vue b/src/pagesReceive/payReview.vue
index 5bbf4b1..2da418f 100644
--- a/src/pagesReceive/payReview.vue
+++ b/src/pagesReceive/payReview.vue
@@ -42,12 +42,13 @@
       "
       :noMoreData="pageList.noMoreData"
       :list="pageList.list"
-      :height="ScaleStatus.Paid === currentTab ? 160 : 240"
+      :height="ScaleStatus.Paid === currentTab ? 160 : 200"
       :isLoading="pageList.isLoading"
     >
       <block v-for="(item, index) in pageList.list" :key="index">
         <view class="c-layout">
           <view style="min-width: 20px">
+            <!-- {{ index }}-{{ item.id }} -->
             <checkbox
               v-if="
                 ScaleStatus.ToBeReview === currentTab ||
@@ -57,7 +58,7 @@
               :color="'#00D2E3'"
               :checked="item.isChecked"
               style="transform: scale(0.7)"
-              @click="item.isChecked = !item.isChecked"
+              @click="item.isChecked = !item.isChecked;"
           /></view>
           <view class="inner-box">
             <view class="top-flex-box">
@@ -208,7 +209,7 @@ const pageList: PageResult<Order> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const keyword = ref("");
 const state = reactive<{
@@ -286,6 +287,7 @@ const updateStatus = (status: number, key: number) => {
       return { ...item, paymentMethod: key };
     });
   }
+  uni.showToast({ icon: "none", title: "当前选中" + paramsList.length });
   ReceiveApi.updateOrderIn({ orderInPos: paramsList }).then((res) => {
     if (res.code === 200) {
       resetPageList();
diff --git a/src/pagesReceive/pricing.vue b/src/pagesReceive/pricing.vue
index 89a7b7a..d956482 100644
--- a/src/pagesReceive/pricing.vue
+++ b/src/pagesReceive/pricing.vue
@@ -152,7 +152,7 @@ const pageList: PageResult<Order> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
diff --git a/src/pagesShipment/grossWeight.vue b/src/pagesShipment/grossWeight.vue
index 583bdf0..da25ebd 100644
--- a/src/pagesShipment/grossWeight.vue
+++ b/src/pagesShipment/grossWeight.vue
@@ -58,7 +58,7 @@ const pageList: PageResult<Order> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
diff --git a/src/pagesShipment/pendingPayment.vue b/src/pagesShipment/pendingPayment.vue
index 76ec31a..a04cabb 100644
--- a/src/pagesShipment/pendingPayment.vue
+++ b/src/pagesShipment/pendingPayment.vue
@@ -197,7 +197,7 @@ const pageList: PageResult<Shipment> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const keyword = ref("");
 const state = reactive<{
diff --git a/src/pagesShipment/receivedPayment.vue b/src/pagesShipment/receivedPayment.vue
index a59c10b..9c536d7 100644
--- a/src/pagesShipment/receivedPayment.vue
+++ b/src/pagesShipment/receivedPayment.vue
@@ -86,7 +86,7 @@ const pageList: PageResult<Shipment> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const keyword = ref("");
 
diff --git a/src/pagesShipment/shipmentSettlement.vue b/src/pagesShipment/shipmentSettlement.vue
index be13699..20a9f21 100644
--- a/src/pagesShipment/shipmentSettlement.vue
+++ b/src/pagesShipment/shipmentSettlement.vue
@@ -198,7 +198,7 @@ const pageList: PageResult<Shipment> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const keyword = ref("");
 const state = reactive<{
diff --git a/src/pagesShipment/shipmenting.vue b/src/pagesShipment/shipmenting.vue
index 5f6d869..ad90ecf 100644
--- a/src/pagesShipment/shipmenting.vue
+++ b/src/pagesShipment/shipmenting.vue
@@ -147,7 +147,7 @@ const pageList: PageResult<Shipment> = reactive({
   total: 0,
   list: [],
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 100,
 });
 const resetPageList = () => {
   pageList.noMoreData = false;
diff --git a/src/utils/enum.ts b/src/utils/enum.ts
index 47b5b8f..74ccd0a 100644
--- a/src/utils/enum.ts
+++ b/src/utils/enum.ts
@@ -55,7 +55,7 @@ export enum PaymentMethod {
   NoPay = 0,
   Cash = 1,
   BankCard = 2,
-  WeChat = 2,
+  WeChat = 3,
   Alipay = 4
 }
 //用户类型0：刷脸1：刷卡
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 64e8afa..4ff9a6e 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -164,7 +164,7 @@ export function pageListInit() {
     total: 0,
     list: [],
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 100,
   };
 }
 // 过滤掉属性值为null的