From bbb532c2cb5c99b31f4b34ce9d97b214b4e80fec Mon Sep 17 00:00:00 2001
From: admin <>
Date: Mon, 15 Apr 2024 10:33:02 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pagesLogin/message/index.vue | 92 +++++++++++++++++++++++++-------
 src/services/shipment.ts         |  1 +
 src/types/order.d.ts             |  1 +
 3 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/src/pagesLogin/message/index.vue b/src/pagesLogin/message/index.vue
index 60af04c..76c4288 100644
--- a/src/pagesLogin/message/index.vue
+++ b/src/pagesLogin/message/index.vue
@@ -36,8 +36,8 @@
 </template>
 <script setup lang="ts">
 import PageView from "@/components/PageView/index.vue";
-import { MessageApi } from "@/services";
-import { MsgType } from "@/utils/enum";
+import { MessageApi, ReceiveApi, ShipmentApi } from "@/services";
+import { MsgType, ScaleStatus } from "@/utils/enum";
 const pageList: PageResult<any> = reactive({
   isLoading: false,
   noMoreData: false,
@@ -91,23 +91,77 @@ const handleItem = (item: any) => {
       }
     });
   }
-  if (MsgType.ToBePriced === item.msgType) {
-      uni.navigateTo({
-        url: "/pagesReceive/pricing?scaleStatus=0", // 要跳转到的页面路径
-      });
-    } else if (MsgType.ToBeReview === item.msgType) {
-      uni.navigateTo({
-        url: "/pagesReceive/payReview?scaleStatus=2", // 要跳转到的页面路径
-      });
-    } else if (MsgType.ToBeShipment === item.msgType) {
-      uni.navigateTo({
-        url: "/pagesShipment/shipmenting?scaleStatus=0", // 要跳转到的页面路径
-      });
-    } else if (MsgType.ToBeShipmentReview === item.msgType) {
-      uni.navigateTo({
-        url: "/pagesShipment/shipmentSettlement?scaleStatus=2", // 要跳转到的页面路径
-      });
-    }
+  if (
+    MsgType.ToBePriced === item.msgType ||
+    MsgType.ToBeReview === item.msgType
+  ) {
+    ReceiveApi.getOrderPage({
+      pageSize: 10,
+      pageNumber: 1,
+      receiptNumber: item.business,
+    }).then((res) => {
+      if (res.code === 200) {
+        if (res.data.list.length === 0) {
+          uni.showToast({
+            icon: "none",
+            title: "该订单已处理",
+          });
+          return;
+        } else {
+          if (res.data.list[0].scaleStatus === ScaleStatus.ToBePriced &&  MsgType.ToBePriced === item.msgType) {
+            uni.navigateTo({
+              url: "/pagesReceive/pricing?scaleStatus=0", // 要跳转到的页面路径
+            });
+          } else if (res.data.list[0].scaleStatus === ScaleStatus.ToBeReview && MsgType.ToBeReview === item.msgType) {
+            uni.navigateTo({
+              url: "/pagesReceive/payReview?scaleStatus=2", // 要跳转到的页面路径
+            });
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "该订单已处理",
+            });
+            return;
+          }
+        }
+      }
+    });
+  } else if (
+    MsgType.ToBeShipment === item.msgType ||
+    MsgType.ToBeShipmentReview === item.msgType
+  ) {
+    ShipmentApi.getOrderPage({
+      pageSize: 10,
+      pageNumber: 1,
+      orderNumber: item.business,
+    }).then((res) => {
+      if (res.code === 200) {
+        if (res.data.list.length === 0) {
+          uni.showToast({
+            title: "该订单已处理",
+          });
+          return;
+        } else {
+          if (res.data.list[0].scaleStatus === ScaleStatus.ToBeShipment && MsgType.ToBeShipment === item.msgType) {
+            uni.navigateTo({
+              url: "/pagesShipment/shipmenting?scaleStatus=0", // 要跳转到的页面路径
+            });
+          } else if (
+            res.data.list[0].scaleStatus === ScaleStatus.ToBeShipmentReview && MsgType.ToBeShipmentReview === item.msgType
+          ) {
+            uni.navigateTo({
+              url: "/pagesShipment/shipmentSettlement?scaleStatus=2", // 要跳转到的页面路径
+            });
+          } else {
+            uni.showToast({
+              title: "该订单已处理",
+            });
+            return;
+          }
+        }
+      }
+    });
+  }
 };
 onMounted(() => {
   getList();
diff --git a/src/services/shipment.ts b/src/services/shipment.ts
index f15d063..51faeea 100644
--- a/src/services/shipment.ts
+++ b/src/services/shipment.ts
@@ -37,6 +37,7 @@ type PageParams = {
   endTime?: string; // 结束时间
   isDeleted?: boolean;
   userName?: string;
+  orderNumber?: string;
   
 };
 // 根据条件获取出库单，并且进行分页
diff --git a/src/types/order.d.ts b/src/types/order.d.ts
index 59b9dc3..71fdbff 100644
--- a/src/types/order.d.ts
+++ b/src/types/order.d.ts
@@ -100,6 +100,7 @@ type PageParams = {
   scaleStatus?: number; // 磅单状态:0：待定价1：待过皮2：待审核3：已审核待支付4：已支付
   isDeleted?: boolean;
   userName?: string; // 供应商名称
+  receiptNumber?: string;
 };
 
 interface Shipment {