From 0742491943411bbfe3f22942dc09e5379752b0df Mon Sep 17 00:00:00 2001
From: shenyifei <m809745357@gmail.com>
Date: Tue, 13 Jan 2026 16:52:18 +0800
Subject: [PATCH] =?UTF-8?q?refactor(order):=20=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=A1=A8=E5=8D=95=E5=92=8C=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在供应商信息中添加类型字段区分农民和其他摊位
- 移除产地采购单合同上传检查逻辑
- 修复车牌号分割时的空白字符处理
- 为输入框添加空值默认显示避免undefined
- 更新应用版本号从v0.0.70到v0.0.73
- 优化订单金额计算逻辑和供应商名称显示
---
 .../src/components/delivery/Step1Form.tsx     |  2 +-
 .../order/button/OrderSubmitReview.tsx        | 60 +++++++++----------
 .../components/order/module/MadeOption.tsx    |  1 +
 .../components/order/module/MarketOption.tsx  |  1 +
 .../components/order/module/OrderVehicle.tsx  | 16 ++---
 .../src/components/order/module/StallInfo.tsx |  2 +-
 .../components/order/module/SupplierInfo.tsx  |  1 +
 packages/app-client/src/constant/app.ts       |  2 +-
 .../src/pages/purchase/made/create.tsx        |  1 +
 .../src/pages/purchase/market/create.tsx      |  1 +
 .../utils/converters/orderShipConverter.ts    | 10 +++-
 11 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/packages/app-client/src/components/delivery/Step1Form.tsx b/packages/app-client/src/components/delivery/Step1Form.tsx
index a102b95..a04fd21 100644
--- a/packages/app-client/src/components/delivery/Step1Form.tsx
+++ b/packages/app-client/src/components/delivery/Step1Form.tsx
@@ -288,7 +288,7 @@ const Step1Form = forwardRef<Step1FormRef, Step1FormProps>((props, ref) => {
             </View>
             <View className="mb-2.5">
               <View
-                className={`flex h-10 w-full items-center rounded-md ${formErrors.remark ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
+                className={`flex w-full items-center rounded-md ${formErrors.remark ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
               >
                 <TextArea
                   disabled={readOnly}
diff --git a/packages/app-client/src/components/order/button/OrderSubmitReview.tsx b/packages/app-client/src/components/order/button/OrderSubmitReview.tsx
index 3b6c689..2b26d54 100644
--- a/packages/app-client/src/components/order/button/OrderSubmitReview.tsx
+++ b/packages/app-client/src/components/order/button/OrderSubmitReview.tsx
@@ -102,36 +102,36 @@ export default function OrderSubmitReview(props: IOrderSubmitReviewProps) {
         }
 
         // 产地采购单需要判断瓜农是否上传合同
-        if (orderVO.type === "PRODUCTION_PURCHASE") {
-          // 检查是否存在合同未上传的瓜农
-          const hasNoUpdateContractSupplier = orderVO.orderSupplierList?.find(
-            (supplier) => !supplier.contractUpload,
-          );
-
-          if (hasNoUpdateContractSupplier) {
-            Dialog.open("dialog", {
-              title: "提交审核提醒",
-              content: `检测到瓜农“${hasNoUpdateContractSupplier.name}”未上传合同。请返回票证上传步骤上传合同？`,
-              confirmText: "去票证上传",
-              cancelText: "取消",
-              onConfirm: async () => {
-                Taro.redirectTo({
-                  url: buildUrl(purchase.path[orderVO.type].create, {
-                    orderId: orderVO.orderId,
-                    supplierId: hasNoUpdateContractSupplier.supplierId,
-                    step: "5",
-                  }),
-                });
-                Dialog.close("dialog");
-              },
-              onCancel: () => {
-                Dialog.close("dialog");
-              },
-            });
-            e.stopPropagation();
-            return;
-          }
-        }
+        // if (orderVO.type === "PRODUCTION_PURCHASE") {
+        //   // 检查是否存在合同未上传的瓜农
+        //   const hasNoUpdateContractSupplier = orderVO.orderSupplierList?.find(
+        //     (supplier) => !supplier.contractUpload,
+        //   );
+        //
+        //   if (hasNoUpdateContractSupplier) {
+        //     Dialog.open("dialog", {
+        //       title: "提交审核提醒",
+        //       content: `检测到瓜农“${hasNoUpdateContractSupplier.name}”未上传合同。请返回票证上传步骤上传合同？`,
+        //       confirmText: "去票证上传",
+        //       cancelText: "取消",
+        //       onConfirm: async () => {
+        //         Taro.redirectTo({
+        //           url: buildUrl(purchase.path[orderVO.type].create, {
+        //             orderId: orderVO.orderId,
+        //             supplierId: hasNoUpdateContractSupplier.supplierId,
+        //             step: "5",
+        //           }),
+        //         });
+        //         Dialog.close("dialog");
+        //       },
+        //       onCancel: () => {
+        //         Dialog.close("dialog");
+        //       },
+        //     });
+        //     e.stopPropagation();
+        //     return;
+        //   }
+        // }
 
         Dialog.open("dialog", {
           title: "提交审核提醒",
diff --git a/packages/app-client/src/components/order/module/MadeOption.tsx b/packages/app-client/src/components/order/module/MadeOption.tsx
index d1989e4..54f65d8 100644
--- a/packages/app-client/src/components/order/module/MadeOption.tsx
+++ b/packages/app-client/src/components/order/module/MadeOption.tsx
@@ -274,6 +274,7 @@ export default forwardRef<MadeOptionRef, IMadeOptionProps>(function MadeOption(
           orderSupplierId: generateShortId(),
           supplierId: "",
           name: "瓜农" + (orderSupplierList.length + 1),
+          type: "FARMER",
           payeeName: "",
           idCard: "",
           bankName: "",
diff --git a/packages/app-client/src/components/order/module/MarketOption.tsx b/packages/app-client/src/components/order/module/MarketOption.tsx
index 8b7c497..fa7a2ae 100644
--- a/packages/app-client/src/components/order/module/MarketOption.tsx
+++ b/packages/app-client/src/components/order/module/MarketOption.tsx
@@ -214,6 +214,7 @@ export default forwardRef<MarketOptionRef, IMarketOptionProps>(
             orderSupplierId: generateShortId(),
             supplierId: "",
             name: "档口" + (orderSupplierList.length + 1),
+            type: "OTHER_STALL",
             payeeName: "",
             idCard: "",
             bankName: "",
diff --git a/packages/app-client/src/components/order/module/OrderVehicle.tsx b/packages/app-client/src/components/order/module/OrderVehicle.tsx
index dee08d8..103a07f 100644
--- a/packages/app-client/src/components/order/module/OrderVehicle.tsx
+++ b/packages/app-client/src/components/order/module/OrderVehicle.tsx
@@ -482,7 +482,7 @@ export default forwardRef<OrderVehicleRef, IOrderVehicleProps>(
           orderVehicle: {
             ...newVehicle,
             // 通过 - 分割
-            plate: newVehicle.plate?.split("-")[0]!,
+            plate: newVehicle.plate?.split("-")[0].trim()!,
             dealerId: newVehicle.dealerId || orderVehicle?.dealerId,
             dealerName: newVehicle.dealerName || orderVehicle?.dealerName,
             deliveryTime: dayjs().format("YYYY-MM-DD"),
@@ -609,7 +609,7 @@ export default forwardRef<OrderVehicleRef, IOrderVehicleProps>(
                   clearable
                   type="text"
                   placeholder="请输入车牌号"
-                  value={orderVehicle?.plate}
+                  value={orderVehicle?.plate || ""}
                   onChange={handlePlateChange}
                   onBlur={handlePlateBlur}
                 />
@@ -631,7 +631,7 @@ export default forwardRef<OrderVehicleRef, IOrderVehicleProps>(
                   clearable
                   type="text"
                   placeholder="请输入司机姓名"
-                  value={orderVehicle?.driver}
+                  value={orderVehicle?.driver || ""}
                   onChange={handleDriverChange}
                   onBlur={handleDriverBlur}
                 />
@@ -653,7 +653,7 @@ export default forwardRef<OrderVehicleRef, IOrderVehicleProps>(
                   clearable
                   type="tel"
                   placeholder="请输入联系电话"
-                  value={orderVehicle?.phone}
+                  value={orderVehicle?.phone || ""}
                   onChange={handlePhoneChange}
                   onBlur={handlePhoneBlur}
                 />
@@ -675,7 +675,7 @@ export default forwardRef<OrderVehicleRef, IOrderVehicleProps>(
                   clearable
                   type="text"
                   placeholder="请输入出发地"
-                  value={orderVehicle?.origin}
+                  value={orderVehicle?.origin || ""}
                   onChange={handleOriginChange}
                   onBlur={handleOriginBlur}
                 />
@@ -744,7 +744,7 @@ export default forwardRef<OrderVehicleRef, IOrderVehicleProps>(
                       clearable
                       type="text"
                       placeholder="请输入目的地"
-                      value={orderVehicle?.destination}
+                      value={orderVehicle?.destination || ""}
                       onChange={(value) => handleDestinationChange(value)}
                       onBlur={handleDestinationBlur}
                     />
@@ -768,7 +768,7 @@ export default forwardRef<OrderVehicleRef, IOrderVehicleProps>(
                   clearable
                   type="digit"
                   placeholder="请输入运费，可填0"
-                  value={orderVehicle?.price?.toString()}
+                  value={orderVehicle?.price?.toString() || ""}
                   onChange={handlePriceChange}
                   onBlur={handlePriceBlur}
                 />
@@ -818,7 +818,7 @@ export default forwardRef<OrderVehicleRef, IOrderVehicleProps>(
                     clearable
                     type="digit"
                     placeholder="请输入草帘费用"
-                    value={orderVehicle?.strawCurtainPrice?.toString()}
+                    value={orderVehicle?.strawCurtainPrice?.toString() || ""}
                     onChange={handleStrawCurtainPriceChange}
                     onBlur={handleStrawCurtainPriceBlur}
                   />
diff --git a/packages/app-client/src/components/order/module/StallInfo.tsx b/packages/app-client/src/components/order/module/StallInfo.tsx
index df384c0..7a00463 100644
--- a/packages/app-client/src/components/order/module/StallInfo.tsx
+++ b/packages/app-client/src/components/order/module/StallInfo.tsx
@@ -28,11 +28,11 @@ export default forwardRef<StallInfoRef, IStallInfoProps>(
             orderSupplierId: generateShortId(),
             supplierId: "", // 空的supplierId表示其他家档口
             name: "",
+            type: "OTHER_STALL",
             payeeName: "",
             bankName: "",
             bankCard: "",
             phone: "",
-            type: "",
             selected: true,
             isPaper: false,
             orderPackageList: [],
diff --git a/packages/app-client/src/components/order/module/SupplierInfo.tsx b/packages/app-client/src/components/order/module/SupplierInfo.tsx
index 8e1007e..d5a6506 100644
--- a/packages/app-client/src/components/order/module/SupplierInfo.tsx
+++ b/packages/app-client/src/components/order/module/SupplierInfo.tsx
@@ -28,6 +28,7 @@ export default forwardRef<SupplierInfoRef, ISupplierInfoProps>(
             supplierId: "",
             name: "瓜农1",
             payeeName: "",
+            type: "FARMER",
             idCard: "",
             bankName: "",
             bankCard: "",
diff --git a/packages/app-client/src/constant/app.ts b/packages/app-client/src/constant/app.ts
index 1c77fcc..5f89302 100644
--- a/packages/app-client/src/constant/app.ts
+++ b/packages/app-client/src/constant/app.ts
@@ -1,2 +1,2 @@
 // App 相关常量
-export const APP_VERSION = "v0.0.70";
+export const APP_VERSION = "v0.0.73";
diff --git a/packages/app-client/src/pages/purchase/made/create.tsx b/packages/app-client/src/pages/purchase/made/create.tsx
index b7d9d19..2ae3ff9 100644
--- a/packages/app-client/src/pages/purchase/made/create.tsx
+++ b/packages/app-client/src/pages/purchase/made/create.tsx
@@ -33,6 +33,7 @@ const defaultSupplierList: Partial<BusinessAPI.OrderSupplier>[] = [
     orderSupplierId: generateShortId(),
     supplierId: "",
     name: "瓜农1",
+    type: "FARMER",
     payeeName: "",
     idCard: "",
     bankCard: "",
diff --git a/packages/app-client/src/pages/purchase/market/create.tsx b/packages/app-client/src/pages/purchase/market/create.tsx
index db8d701..c6e7c50 100644
--- a/packages/app-client/src/pages/purchase/market/create.tsx
+++ b/packages/app-client/src/pages/purchase/market/create.tsx
@@ -29,6 +29,7 @@ const defaultSupplierList: Partial<BusinessAPI.OrderSupplier>[] = [
     orderSupplierId: generateShortId(),
     supplierId: "",
     name: "档口1",
+    type: "OTHER_STALL",
     payeeName: "",
     idCard: "",
     bankCard: "",
diff --git a/packages/app-client/src/utils/converters/orderShipConverter.ts b/packages/app-client/src/utils/converters/orderShipConverter.ts
index 79b8620..364303f 100644
--- a/packages/app-client/src/utils/converters/orderShipConverter.ts
+++ b/packages/app-client/src/utils/converters/orderShipConverter.ts
@@ -137,8 +137,14 @@ export const convertOrderShipVOToExamplesFormat = (
     },
     otherFees: {},
     totalAmount: {
-      amount: calculator.getSalesAmount(),
-      farmer: orderShip.farmerInfo || "",
+      amount: calculator.getMarketPrice(),
+      farmer:
+        orderShip.farmerInfo ||
+        orderVO.orderSupplierList
+          .map((item) => {
+            return item.name;
+          })
+          .join("、"),
     },
     otherInfo: {
       data: orderShip.orderShipItemList,