From f433f725cd42428f6437f303ade0f1a89a386fd1 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Tue, 21 May 2024 16:13:03 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pagesShipment/form/settlementForm.vue | 27 ++++++++++++++++++-----
 src/types/order.d.ts                      |  8 +++----
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/pagesShipment/form/settlementForm.vue b/src/pagesShipment/form/settlementForm.vue
index f556a7b..df96c71 100644
--- a/src/pagesShipment/form/settlementForm.vue
+++ b/src/pagesShipment/form/settlementForm.vue
@@ -108,9 +108,9 @@ import {
 } from "@/utils/enum";
 import valid from "@/utils/validate";
 import { onLoad } from "@dcloudio/uni-app";
-const handleClear = (item:any) => {
-  (model1.order as any)[item.key] = '';
-}
+const handleClear = (item: any) => {
+  (model1.order as any)[item.key] = "";
+};
 const isShowFormItem = (item: any) => {
   if (model1.scaleStatusBtnType === ScaleStatusBtnType.ShipmentPay) {
     return true;
@@ -175,6 +175,8 @@ const model1 = reactive<{
     unitPrice: 0,
     estimatePrice: 0,
     subtractNum: 0,
+    grossWeight: 0, //毛重
+    tare: 0, //皮重
   },
 });
 const rules = reactive({
@@ -559,14 +561,29 @@ const save = () => {
       }
     }
   }
+
   check().then((res) => {
     if (res) {
-      if (!model1.order.paymentMethodName && model1.scaleStatusBtnType === ScaleStatusBtnType.ShipmentPay) {
+      if (
+        !model1.order.paymentMethodName &&
+        model1.scaleStatusBtnType === ScaleStatusBtnType.ShipmentPay
+      ) {
         uni.showToast({
           title: "请选择结算方式",
           icon: "none",
         });
-        return
+        return;
+      }
+      
+      if (
+        parseFloat(model1.order.settlementTare.toString()) >
+        parseFloat(model1.order.settlementGross.toString())
+      ) {
+        uni.showToast({
+          title: `毛重需大于皮重`,
+          icon: "none",
+        });
+        return;
       }
       startSave();
     }
diff --git a/src/types/order.d.ts b/src/types/order.d.ts
index 2e93878..ad2c086 100644
--- a/src/types/order.d.ts
+++ b/src/types/order.d.ts
@@ -113,9 +113,9 @@ interface Shipment {
   carNumber?: string; //车牌号
   scaleStatus?: number; //出库单状态
   orderNumber?: string; //订单编号
-  grossWeight?: number; //毛重
+  grossWeight: number; //毛重
   grossTime?: string; //过毛时间
-  tare?: number; //皮重
+  tare: number; //皮重
   tareTime?: string; //过皮时间
   netWeight?: number; //净重
   number?: number; //数量
@@ -144,8 +144,8 @@ interface Shipment {
   updateTime?: string; //undefined
   isDeleted?: string; //删除标识true删除，false未删除
   settlementWeight?: number; // 结算重量
-  settlementGross?: number; // 结算毛重
-  settlementTare?: number; // 结算皮重
+  settlementGross: number; // 结算毛重
+  settlementTare: number; // 结算皮重
   settlementNet?: number; // 结算净重
   signTime?: string; // 签收时间
   paymentMethod?: string; //支付方式：0:未支付,1:现金支付，2：银行卡支付，3：线上支付（微信）4：支付宝