fix(purchase): 修复采购订单相关组件中的空值处理和样式问题

- 统一处理 purchaseOrderVO.orderDealer 可能为空的情况，避免运行时错误
- 修复多个组件中颜色样式结尾多余的分号导致的渲染异常
- 调整 OrderCost 组件中 selected 状态的判断逻辑，确保 count 大于 0 才选中
- 优化 PurchasePreview 组件中空箱使用明细的条件渲染，仅在有数据时显示
- 完善成本校验逻辑，在没有启用的"我方"费用项时标记为有效
- 修正 WorkerAdvanceSection 中费用类型的初始值设置错误
- 更新市场报价计算逻辑，根据是否包含包装费标志位决定计算方式
- 加强 SupplierWeightCalculator 中数值计算的空值防护，防止 NaN问题
- 移除冗余的控制台日志输出，清理调试代码- 调整部分组件结构和类名，提升代码可读性和一致性

packages/app-client/config/prod.ts

@@ -22,6 +22,10 @@ export default {
       process.env.TARO_ENV === "h5"
         ? '"/api"'
         : '"https://api.erp.qilincloud168.com"',
+    "process.env.TARO_POSTER_DOMAIN":
+      process.env.TARO_ENV === "h5"
+        ? '""'
+        : '"https://poster.qilincloud168.com"',
   },
   mini: {
     miniCssExtractPluginOption: {

packages/app-client/src/components/dealer/DealerPicker.tsx

@@ -1,9 +1,9 @@
 import {
+  Dialog,
+  Input,
   Popup,
   SafeArea,
   SearchBar,
-  Dialog,
-  Input,
 } from "@nutui/nutui-react-taro";
 import { Icon } from "@/components";
 import { ScrollView, View } from "@tarojs/components";
@@ -64,6 +64,10 @@ export default function DealerPicker(props: IDealerPickerProps) {
   return (
     <>
       <View
+        className={"flex flex-1 flex-row items-center justify-between px-5"}
+        style={{
+          color: "var(--nutui-color-title, #1a1a1a)",
+        }}
         onClick={(event) => {
           setVisible(true);
           event.stopPropagation();

packages/app-client/src/components/purchase/module/MelonFarmer.tsx

@@ -1,12 +1,12 @@
 import { Text, View } from "@tarojs/components";
 import {
   Button,
+  Dialog,
   Input,
   Radio,
   Toast,
   Uploader,
   UploaderFileItem,
-  Dialog,
 } from "@nutui/nutui-react-taro";
 import { Icon, SupplierPicker } from "@/components";
 import { forwardRef, useEffect, useImperativeHandle, useState } from "react";
@@ -47,7 +47,6 @@ export default forwardRef<MelonFarmerRef, IMelonFarmerProps>(
     } = props;
 
     const [supplierVO, setSupplierVO] = useState<SupplierVO>();
-    console.log("supplierVO", supplierVO);
 
     // 初始化数据
     useEffect(() => {

packages/app-client/src/components/purchase/module/OrderPackage.tsx

@@ -623,7 +623,7 @@ export default forwardRef<OrderPackageRef, IOrderPackageProps>(
 
       return (
         <View
-          className="relative mb-2.5 overflow-hidden rounded-xl border border-gray-200 bg-white p-2.5 shadow-sm"
+          className="mb-2.5 overflow-hidden rounded-xl border border-gray-200 bg-white p-2.5 shadow-sm"
           key={item.id}
         >
           {/* 品牌背景水印 */}
@@ -785,8 +785,6 @@ export default forwardRef<OrderPackageRef, IOrderPackageProps>(
                   <View className="flex w-fit flex-row gap-2.5">
                     {boxBrandList
                       ?.filter((item) => {
-                        console.log("item: ", item);
-                        console.log("boxType: ", boxType);
                         if (boxType === "OWN") {
                           return item.boxBrandType === "FARMER_BOX";
                         } else {
@@ -817,7 +815,8 @@ export default forwardRef<OrderPackageRef, IOrderPackageProps>(
                           >
                             <Image
                               src={boxBrand.boxBrandImage}
-                              mode={"aspectFill"}
+                              className="h-full w-full"
+                              mode="aspectFit"
                               alt={boxBrand.boxBrandImage}
                             />
                           </View>

packages/app-client/src/components/purchase/module/OrderVehicle.tsx

@@ -25,6 +25,7 @@ interface IOrderVehicleProps {
   setOrderDealer: (orderDealer: BusinessAPI.OrderDealer) => void;
   orderCostList: CostItem[];
   setOrderCostList: (orderCostList: CostItem[]) => void;
+  costItemVOList: BusinessAPI.CostItemVO[];
 }
 
 export interface OrderVehicleRef {
@@ -40,6 +41,7 @@ export default forwardRef<OrderVehicleRef, IOrderVehicleProps>(
       orderDealer,
       orderCostList,
       setOrderCostList,
+      costItemVOList,
     } = props;
 
     const [dealerVO, setDealerVO] = useState<BusinessAPI.DealerVO>();
@@ -66,28 +68,6 @@ export default forwardRef<OrderVehicleRef, IOrderVehicleProps>(
     const startDate = new Date(currentYear, 0, 1); // 当年第一天
     const endDate = new Date(); // 今天
 
-    // 费用项目列表
-    const [costItems, setCostItems] = useState<BusinessAPI.CostItemVO[]>([]);
-
-    // 获取费用项目列表
-    useEffect(() => {
-      const fetchCostItems = async () => {
-        try {
-          const { data } = await business.costItem.listCostItem({
-            costItemListQry: {
-              status: true,
-              showInEntry: true,
-            },
-          });
-          setCostItems(data.data || []);
-        } catch (error) {
-          console.error("获取费用项目列表失败:", error);
-        }
-      };
-
-      fetchCostItems();
-    }, []);
-
     // 当desc改变时更新车辆信息中的时间
     useEffect(() => {
       if (desc) {
@@ -427,7 +407,7 @@ export default forwardRef<OrderVehicleRef, IOrderVehicleProps>(
     };
 
     const getCostItemByName = (name: string): BusinessAPI.CostItemVO => {
-      return costItems?.find(
+      return costItemVOList?.find(
         (item) => item.name === name && item.costType === "PRODUCTION_ADVANCE",
       )!;
     };
@@ -743,27 +723,23 @@ export default forwardRef<OrderVehicleRef, IOrderVehicleProps>(
               目的地
             </View>
             <View className={"flex flex-row gap-2.5"}>
-              <View>
+              <View className={"flex-1"}>
                 <View
                   id={"target2"}
-                  className={`relative flex h-10 w-full items-center rounded-md ${dealerNameError ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
+                  className={`flex h-10 w-full flex-1 items-center rounded-md ${dealerNameError ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
                 >
                   <DealerPicker
                     onFinish={setDealerVO}
                     enableManualInput
                     trigger={
-                      <Input
+                      <>
-                        type="text"
+                        <View className={"text-sm"}>
-                        placeholder="选择经销商"
+                          {orderVehicle?.dealerName || "选择经销商"}
-                        value={orderVehicle?.dealerName}
+                        </View>
-                        disabled
+                        <Icon name={"chevron-down"} />
-                      />
+                      </>
                     }
                   />
-                  <Icon
-                    name={"chevron-down"}
-                    className={"absolute -right-1 mr-4"}
-                  />
                 </View>
                 {dealerNameError && (
                   <View className="mt-1 text-xs text-red-500">
@@ -771,7 +747,7 @@ export default forwardRef<OrderVehicleRef, IOrderVehicleProps>(
                   </View>
                 )}
               </View>
-              <View>
+              <View className={"flex-1"}>
                 <View
                   className={`flex h-10 w-full items-center rounded-md ${destinationError ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
                 >
@@ -902,17 +878,22 @@ export default forwardRef<OrderVehicleRef, IOrderVehicleProps>(
             <View
               className={`flex h-10 w-full items-center rounded-md ${deliveryTimeError ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
             >
-              <Input
+              <View
-                type="text"
+                className={
-                placeholder="请选择发货时间"
+                  "flex flex-1 flex-row items-center justify-between px-5"
-                value={
-                  orderVehicle?.deliveryTime
-                    ? dayjs(orderVehicle?.deliveryTime).format("YYYY年MM月DD日")
-                    : "请选择发货时间"
                 }
-                disabled
+                style={{
+                  color: "var(--nutui-color-title, #1a1a1a)",
+                }}
                 onClick={() => setShow(true)}
-              />
+              >
+                <View className={"text-sm"}>
+                  {orderVehicle?.deliveryTime
+                    ? dayjs(orderVehicle?.deliveryTime).format("YYYY年MM月DD日")
+                    : "请选择发货时间"}
+                </View>
+                <Icon name={"chevron-down"} />
+              </View>
             </View>
             {deliveryTimeError && (
               <View className="mt-1 text-xs text-red-500">请选择发货时间</View>

packages/app-client/src/components/purchase/module/PurchasePreview.tsx

@@ -265,6 +265,60 @@ export default function PurchasePreview(props: IPurchasePreviewProps) {
             <View>{formatCurrency(totalBoxWeight)} 斤</View>
           </View>
         </View>
+      </View>
+
+      {purchaseOrder.orderPackageList.length > 0 && (
+        <>
+          <View className="text-sm font-bold">空箱使用明细</View>
+          <View className="flex flex-col gap-2.5">
+            <View className="rounded-lg bg-white p-2.5 shadow-sm">
+              {/* 根据boxBrandName对packageInfoList进行分组显示 */}
+              {(() => {
+                const groupedPackageInfo = groupBy(
+                  purchaseOrder.orderPackageList || [],
+                  (item) => item.boxBrandName,
+                );
+
+                return Object.entries(groupedPackageInfo).map(
+                  ([brandName, packageInfos]) => (
+                    <View key={brandName} className="mb-2.5">
+                      <View className="text-primary mb-2.5 text-base font-bold">
+                        纸箱品牌：{brandName}
+                      </View>
+                      <View className={"overflow-x-auto"}>
+                        <Table columns={columns} data={packageInfos} />
+                      </View>
+                    </View>
+                  ),
+                );
+              })()}
+            </View>
+            <View className="rounded-lg bg-white p-2.5 shadow-md">
+              <View className="flex items-center justify-between text-sm font-bold">
+                <View>总箱数</View>
+                <View>
+                  {purchaseOrder.orderPackageList.reduce(
+                    (sum, item) => sum + item.boxCount,
+                    0,
+                  )}
+                  箱
+                </View>
+              </View>
+              <View className="mt-2 flex items-center justify-between text-sm font-bold">
+                <View>总箱重</View>
+                <View>
+                  {purchaseOrder.orderPackageList.reduce(
+                    (sum, item) => sum + item.boxProductWeight * item.boxCount,
+                    0,
+                  )}
+                  斤
+                </View>
+              </View>
+            </View>
+          </View>
+        </>
+      )}
+
       {purchaseOrder.orderCostList?.filter(
         (costItem: CostItem) => costItem.costType === "PACKAGING_MATERIALS",
       ).length > 0 && (
@@ -352,6 +406,5 @@ export default function PurchasePreview(props: IPurchasePreviewProps) {
         </>
       )}
     </View>
-    </View>
   );
 }

packages/app-client/src/components/purchase/section/CostDifferenceSection.tsx

@@ -17,22 +17,22 @@ export default function CostDifferenceSection(props: {
 
   // 主状态，用于页面显示
   const [costDifference, setCostDifference] = useState<number>(
-    purchaseOrderVO.orderDealer.costDifference || 0,
+    purchaseOrderVO.orderDealer?.costDifference || 0,
   );
 
   // 弹窗内的临时状态
   const [tempCostDifference, setTempCostDifference] = useState<number>(
-    purchaseOrderVO.orderDealer.costDifference || 0,
+    purchaseOrderVO.orderDealer?.costDifference || 0,
   );
 
   const profitSharing =
     calculator.getDefaultNetProfit() ||
-    purchaseOrderVO.orderDealer.profitSharing ||
+    purchaseOrderVO.orderDealer?.profitSharing ||
     0;
 
   // 当dealerVO变化时，自动计算分成
   useEffect(() => {
-    if (!purchaseOrderVO.orderDealer.costDifference) {
+    if (!purchaseOrderVO.orderDealer?.costDifference) {
       const defaultCostDifference = calculator.getCostDifference();
       setCostDifference(defaultCostDifference);
       setTempCostDifference(defaultCostDifference);
@@ -113,7 +113,7 @@ export default function CostDifferenceSection(props: {
               <Text className="text-sm text-gray-500">分成利润</Text>
             </View>
             <View className="flex items-center justify-between">
-              <Text className="text-primary text-2xl font-bold">
+              <Text className="text-primary text-2xl font-bold text-nowrap">
                 ￥ {profitSharing}
               </Text>
             </View>

packages/app-client/src/components/purchase/section/DealerInfoSection.tsx

@@ -29,9 +29,7 @@ export default function (props: {
   }, [purchaseOrderVO]);
 
   // 处理经销商选择完成事件
-  const handleDealerSelect = (
+  const handleDealerSelect = (dealerVO: BusinessAPI.DealerVO) => {
-    dealerVO: BusinessAPI.DealerVO,
-  ) => {
     if (readOnly) return;
 
     const newOrderDealer: BusinessAPI.OrderDealer = {
@@ -99,25 +97,25 @@ export default function (props: {
           </View>
 
           {!readOnly && (
-            <View className="flex justify-center">
             <DealerPicker
               onFinish={(dealer) => {
                 handleDealerSelect(dealer);
               }}
               trigger={
+                <View
+                  className={"flex flex-1 flex-row items-center justify-center"}
+                >
                   <Button size="small" type="primary" fill="outline">
                     重新选择经销商
                   </Button>
+                </View>
               }
             />
-            </View>
           )}
         </View>
       ) : readOnly ? (
         <View className="flex flex-col items-center justify-center rounded-lg border border-dashed border-gray-300 p-2.5">
-          <View className="text-neutral-darker text-sm">
+          <View className="text-neutral-darker text-sm">无经销商信息</View>
-            无经销商信息
-          </View>
         </View>
       ) : (
         <View className="flex flex-col items-center justify-center rounded-lg border border-dashed border-gray-300 p-2.5">
@@ -147,4 +145,4 @@ export default function (props: {
       )}
     </View>
   );
-};
+}

packages/app-client/src/components/purchase/section/EmptyBoxInfoSection.tsx

@@ -1,57 +1,17 @@
-import { Table } from "@nutui/nutui-react-taro";
+import { formatCurrency, validatePrice } from "@/utils/format";
-import { formatCurrency } from "@/utils/format";
+import { useEffect, useState } from "react";
+import { Button, Input, Popup, SafeArea, Table } from "@nutui/nutui-react-taro";
+import { Icon } from "@/components";
+import { View } from "@tarojs/components";
 
-export default function EmptyBoxInfoSection(_props: {
+export default function EmptyBoxInfoSection(props: {
   purchaseOrderVO: BusinessAPI.PurchaseOrderVO;
+  onChange?: (purchaseOrderVO: BusinessAPI.PurchaseOrderVO) => void;
   readOnly?: boolean;
 }) {
-  // 将所有空箱信息合并并按品牌、型号、规格分组
+  const { purchaseOrderVO, onChange, readOnly } = props;
-  // const groupedEmptyBoxData = purchaseOrderVO.orderSupplierList?.reduce(
-  //   (acc, supplier) => {
-  //     supplier.orderPackageList?.forEach((pkg) => {
-  //       // 生成分组键
-  //       const key = `${pkg.boxBrandName}-${pkg.boxProductName}-${pkg.boxCategoryId}`;
-  //
-  //       // 转换规格字段
-  //       const boxCategoryName =
-  //         pkg.boxCategoryId === "FOUR_GRADE"
-  //           ? "4粒"
-  //           : pkg.boxCategoryId === "TWO_GRADE"
-  //             ? "2粒"
-  //             : "其他";
-  //
-  //       if (!acc[key]) {
-  //         acc[key] = {
-  //           boxBrandName: pkg.boxBrandName,
-  //           boxProductName: pkg.boxProductName,
-  //           boxCategoryName,
-  //           boxProductCount: 0,
-  //           boxProductPrice: pkg.boxSalePrice,
-  //           boxProductWeight: pkg.boxProductWeight,
-  //           boxProductCostPrice: pkg.boxCostPrice,
-  //         };
-  //       }
-  //
-  //       // 累加数量
-  //       acc[key].boxProductCount += pkg.boxCount || 0;
-  //     });
-  //
-  //     return acc;
-  //   },
-  //   {} as Record<string, any>,
-  // );
-  //
-  // // 转换为数组格式并计算销售金额
-  // const emptyBoxData = Object.values(groupedEmptyBoxData || {}).map(item => ({
-  //   ...item,
-  //   boxProductPayment: (item.boxProductCount || 0) * (item.boxProductPrice || 0)
-  // }));
 
-  const emptyBoxData = [];
+  const defaultColumns = [
-
-  return (
-    <Table
-      columns={[
     {
       title: "品牌",
       key: "boxBrandName",
@@ -59,7 +19,7 @@ export default function EmptyBoxInfoSection(_props: {
     },
     {
       title: "规格",
-          key: "boxCategoryName",
+      key: "boxSpecName",
     },
     {
       title: "纸箱型号",
@@ -71,25 +31,641 @@ export default function EmptyBoxInfoSection(_props: {
     },
     {
       title: "销售单价（元/斤）",
-          key: "boxProductPrice",
+      key: "boxSalePrice",
-          render: (value: any) => formatCurrency(value.boxProductPrice),
+      render: (
+        value: BusinessAPI.OrderPackage & {
+          orderPackageId?: string;
+          isTotalRow?: boolean;
+        },
+      ) => {
+        // 合计行不显示编辑按钮
+        if (value.isTotalRow) {
+          return formatCurrency(value.boxSalePrice as number);
+        }
+
+        return (
+          <View
+            className="flex w-full items-center justify-between"
+            onClick={(e) => {
+              if (!readOnly) {
+                e.stopPropagation();
+                // 设置临时编辑值为当前值
+                setTempEditValues((prev) => ({
+                  ...prev,
+                  [value.orderPackageId || ""]:
+                    editValues[value.orderPackageId || ""],
+                }));
+                setVisiblePopup((prev) => ({
+                  ...prev,
+                  [value.orderPackageId || ""]: true,
+                }));
+              }
+            }}
+          >
+            <View className={!readOnly ? "cursor-pointer underline" : ""}>
+              {formatCurrency(value.boxSalePrice as number)}
+            </View>
+            {!readOnly && (
+              <View className="-m-2 ml-2 flex items-center justify-center p-2">
+                <Icon name={"pen-to-square"} size={16} color={"#1a73e8"} />
+              </View>
+            )}
+          </View>
+        );
+      },
     },
     {
       title: "销售金额（元）",
-          key: "boxProductPayment",
+      key: "boxSalePayment",
-          render: (value: any) => formatCurrency(value.boxProductPayment),
+      render: (
+        value: BusinessAPI.OrderPackage & {
+          boxProductCount: number;
+          isTotalRow?: boolean;
+        },
+      ) =>
+        formatCurrency(
+          Number((value?.boxSalePrice || 0) * value.boxProductCount) as number,
+        ),
     },
     {
       title: "箱重（斤）",
       key: "boxProductWeight",
+      render: (
+        value: BusinessAPI.OrderPackage & {
+          orderPackageId?: string;
+          isTotalRow?: boolean;
+        },
+      ) => {
+        // 合计行不显示编辑按钮
+        if (value.isTotalRow) {
+          return formatCurrency(value.boxProductWeight);
+        }
+
+        return (
+          <View
+            className="flex w-full items-center justify-between"
+            onClick={(e) => {
+              if (!readOnly) {
+                e.stopPropagation();
+                // 设置临时编辑值为当前值
+                setTempEditValues((prev) => ({
+                  ...prev,
+                  [value.orderPackageId || ""]:
+                    editValues[value.orderPackageId || ""],
+                }));
+                setVisiblePopup((prev) => ({
+                  ...prev,
+                  [value.orderPackageId || ""]: true,
+                }));
+              }
+            }}
+          >
+            <View className={!readOnly ? "cursor-pointer underline" : ""}>
+              {formatCurrency(value.boxProductWeight)}
+            </View>
+            {!readOnly && (
+              <View className="-m-2 ml-2 flex items-center justify-center p-2">
+                <Icon name={"pen-to-square"} size={16} color={"#1a73e8"} />
+              </View>
+            )}
+          </View>
+        );
+      },
     },
     {
-          title: "成本单价（元/斤）",
+      title: "成本单价（元）",
-          key: "boxProductCostPrice",
+      key: "boxCostPrice",
-          render: (value: any) => formatCurrency(value.boxProductCostPrice),
+      render: (
+        value: BusinessAPI.OrderPackage & {
+          orderPackageId?: string;
+          isTotalRow?: boolean;
         },
-      ]}
+      ) => {
-      data={emptyBoxData || []}
+        // 合计行不显示编辑按钮
+        if (value.isTotalRow) {
+          return formatCurrency(value.boxCostPrice as number);
+        }
+
+        return (
+          <View
+            className="flex w-full items-center justify-between"
+            onClick={(e) => {
+              if (!readOnly) {
+                e.stopPropagation();
+                // 设置临时编辑值为当前值
+                setTempEditValues((prev) => ({
+                  ...prev,
+                  [value.orderPackageId || ""]:
+                    editValues[value.orderPackageId || ""],
+                }));
+                setVisiblePopup((prev) => ({
+                  ...prev,
+                  [value.orderPackageId || ""]: true,
+                }));
+              }
+            }}
+          >
+            <View className={!readOnly ? "cursor-pointer underline" : ""}>
+              {formatCurrency(value.boxCostPrice as number)}
+            </View>
+            {!readOnly && (
+              <View className="-m-2 ml-2 flex items-center justify-center p-2">
+                <Icon name={"pen-to-square"} size={16} color={"#1a73e8"} />
+              </View>
+            )}
+          </View>
+        );
+      },
+    },
+  ];
+  const [columns, setColumns] = useState<any[]>(defaultColumns);
+
+  useEffect(() => {
+    if (!readOnly) {
+      setColumns([...defaultColumns]);
+    }
+  }, [readOnly]);
+
+  // 弹窗可见状态
+  const [visiblePopup, setVisiblePopup] = useState<{ [key: string]: boolean }>(
+    {},
+  );
+
+  // 编辑值的状态
+  const [editValues, setEditValues] = useState<{
+    [key: string]: {
+      boxCostPrice?: number;
+      boxSalePrice?: number;
+      boxProductWeight?: number;
+    };
+  }>({});
+
+  // 临时编辑值的状态（用于在保存前暂存编辑的值）
+  const [tempEditValues, setTempEditValues] = useState<{
+    [key: string]: {
+      boxCostPrice?: number;
+      boxSalePrice?: number;
+      boxProductWeight?: number;
+    };
+  }>({});
+
+  // 初始化编辑值
+  const initEditValues = (
+    pkgId: string,
+    boxCostPrice?: number,
+    boxSalePrice?: number,
+    boxProductWeight?: number,
+  ) => {
+    const updates: {
+      editValuesUpdate?: {
+        boxCostPrice?: number;
+        boxSalePrice?: number;
+        boxProductWeight?: number;
+      };
+      tempEditValuesUpdate?: {
+        boxCostPrice?: number;
+        boxSalePrice?: number;
+        boxProductWeight?: number;
+      };
+    } = {};
+
+    if (!editValues[pkgId]) {
+      updates.editValuesUpdate = {
+        boxCostPrice,
+        boxSalePrice,
+        boxProductWeight,
+      };
+    }
+
+    // 同时初始化临时编辑值
+    if (!tempEditValues[pkgId]) {
+      updates.tempEditValuesUpdate = {
+        boxCostPrice,
+        boxSalePrice,
+        boxProductWeight,
+      };
+    }
+
+    return updates;
+  };
+
+  // 将所有包装信息合并并按品牌、型号、规格分组
+  const groupedPackageData = purchaseOrderVO.orderPackageList?.reduce(
+    (acc, orderPackage) => {
+      // 生成分组键
+      const key = `${orderPackage.boxBrandName}-${orderPackage.boxProductName}-${orderPackage.boxSpecId}`;
+
+      // 转换规格字段
+      const boxSpecId = orderPackage.boxSpecId;
+      const boxSpecName = orderPackage.boxSpecName;
+
+      if (!acc[key]) {
+        acc[key] = {
+          ...orderPackage,
+          boxSpecId,
+          boxSpecName,
+          boxProductCount: 0,
+        };
+      }
+
+      // 累加数量
+      acc[key].boxProductCount += orderPackage.boxCount || 0;
+
+      return acc;
+    },
+    {} as Record<string, any>,
+  );
+
+  // 转换为数组格式
+  const packageData = Object.values(groupedPackageData || {});
+
+  // 计算合计数据
+  const calculateTotals = () => {
+    if (!packageData || packageData.length === 0) {
+      return {};
+    }
+
+    // 计算各项合计
+    let totalBoxProductCount = 0;
+    let totalBoxSalePayment = 0;
+    let totalBoxCostPayment = 0;
+    let totalBoxProductWeight = 0;
+
+    packageData.forEach((pkg: any) => {
+      totalBoxProductCount += pkg.boxProductCount || 0;
+      totalBoxSalePayment +=
+        Number((pkg?.boxSalePrice || 0) * pkg.boxProductCount) || 0;
+      totalBoxCostPayment +=
+        Number((pkg?.boxCostPrice || 0) * pkg.boxProductCount) || 0;
+      totalBoxProductWeight +=
+        Number((pkg?.boxProductWeight || 0) * pkg.boxProductCount) || 0;
+    });
+
+    return {
+      boxBrandName: "合计",
+      boxProductCount: totalBoxProductCount,
+      boxSalePayment: totalBoxSalePayment,
+      boxProductWeight: totalBoxProductWeight,
+      boxCostPrice: totalBoxCostPayment,
+      isTotalRow: true, // 标记这是合计行
+    };
+  };
+
+  const totalsData = calculateTotals();
+
+  // 初始化所有包装项的编辑值
+  useEffect(() => {
+    const newEditValues = { ...editValues };
+    const newTempEditValues = { ...tempEditValues };
+    let hasEditValuesChanged = false;
+    let hasTempEditValuesChanged = false;
+
+    packageData.forEach((pkg: BusinessAPI.OrderPackage) => {
+      const pkgId = pkg.orderPackageId || "";
+      const updates = initEditValues(
+        pkgId,
+        pkg.boxCostPrice,
+        pkg.boxSalePrice,
+        pkg.boxProductWeight,
+      );
+
+      if (updates.editValuesUpdate) {
+        newEditValues[pkgId] = updates.editValuesUpdate;
+        hasEditValuesChanged = true;
+      }
+
+      if (updates.tempEditValuesUpdate) {
+        newTempEditValues[pkgId] = updates.tempEditValuesUpdate;
+        hasTempEditValuesChanged = true;
+      }
+    });
+
+    if (hasEditValuesChanged) {
+      setEditValues(newEditValues);
+    }
+
+    if (hasTempEditValuesChanged) {
+      setTempEditValues(newTempEditValues);
+    }
+  }, [packageData]);
+
+  // 当editValues发生变化时，更新purchaseOrderVO
+  useEffect(() => {
+    // 只有当onChange存在时才更新
+    if (onChange) {
+      // 创建新的purchaseOrderVO对象
+      const newPurchaseOrderVO = { ...purchaseOrderVO };
+
+      // 更新供应商列表中的包装信息
+      if (newPurchaseOrderVO.orderPackageList) {
+        newPurchaseOrderVO.orderPackageList =
+          newPurchaseOrderVO.orderPackageList.map((pkg) => {
+            const editValue = editValues[pkg.orderPackageId || ""];
+            if (editValue) {
+              return {
+                ...pkg,
+                boxCostPrice:
+                  editValue.boxCostPrice !== undefined
+                    ? editValue.boxCostPrice
+                    : pkg.boxCostPrice,
+                boxSalePrice:
+                  editValue.boxSalePrice !== undefined
+                    ? editValue.boxSalePrice
+                    : pkg.boxSalePrice,
+                boxProductWeight:
+                  editValue.boxProductWeight !== undefined
+                    ? editValue.boxProductWeight
+                    : pkg.boxProductWeight,
+              };
+            }
+            return pkg;
+          });
+      }
+
+      // 调用onChange回调
+      onChange(newPurchaseOrderVO);
+    }
+  }, [editValues]);
+
+  // 自定义合计行渲染
+  const renderTableWithTotals = () => {
+    // 创建包含合计行的数据
+    const dataWithTotals = [...packageData];
+    if (Object.keys(totalsData).length > 0) {
+      dataWithTotals.push(totalsData);
+    }
+
+    // 自定义列配置，对合计行特殊处理
+    const columnsWithTotalsRender = columns.map((column) => {
+      if (column.key === "boxBrandName") {
+        // 品牌列显示"合计"
+        return {
+          ...column,
+          render: (rowData: any) => {
+            if (rowData.isTotalRow) {
+              return (
+                <span style={{ fontWeight: "bold" }}>
+                  {rowData.boxBrandName}
+                </span>
+              );
+            }
+            return rowData.boxBrandName;
+          },
+        };
+      } else if (column.key === "boxProductCount") {
+        // 个数列显示合计
+        return {
+          ...column,
+          render: (rowData: any) => {
+            if (rowData.isTotalRow) {
+              return (
+                <span style={{ fontWeight: "bold" }}>
+                  {rowData.boxProductCount}
+                </span>
+              );
+            }
+            return rowData.boxProductCount;
+          },
+        };
+      } else if (column.key === "boxSalePrice") {
+        // 销售单价列合计行处理
+        return {
+          ...column,
+          render: (rowData: any) => {
+            if (rowData.isTotalRow) {
+              return (
+                <span style={{ fontWeight: "bold" }}>
+                  {formatCurrency(rowData.boxSalePrice as number)}
+                </span>
+              );
+            }
+            return column.render(rowData, rowData);
+          },
+        };
+      } else if (column.key === "boxSalePayment") {
+        // 销售金额列显示合计
+        return {
+          ...column,
+          render: (rowData: any) => {
+            if (rowData.isTotalRow) {
+              return (
+                <span style={{ fontWeight: "bold" }}>
+                  {formatCurrency(rowData.boxSalePayment)}
+                </span>
+              );
+            }
+            return formatCurrency(
+              Number(
+                (rowData?.boxSalePrice || 0) * rowData.boxProductCount,
+              ) as number,
+            );
+          },
+        };
+      } else if (column.key === "boxProductWeight") {
+        // 重量列合计行处理
+        return {
+          ...column,
+          render: (rowData: any) => {
+            if (rowData.isTotalRow) {
+              return (
+                <span style={{ fontWeight: "bold" }}>
+                  {formatCurrency(rowData.boxProductWeight)}
+                </span>
+              );
+            }
+            return column.render(rowData, rowData);
+          },
+        };
+      } else if (column.key === "boxCostPrice") {
+        // 成本单价列合计行处理
+        return {
+          ...column,
+          render: (rowData: any) => {
+            if (rowData.isTotalRow) {
+              return (
+                <span style={{ fontWeight: "bold" }}>
+                  {formatCurrency(rowData.boxCostPrice as number)}
+                </span>
+              );
+            }
+            return column.render(rowData, rowData);
+          },
+        };
+      }
+
+      // 其他列保持原有render函数或者默认显示
+      return column;
+    });
+
+    return (
+      <Table
+        className={"table-sum"}
+        columns={columnsWithTotalsRender}
+        data={dataWithTotals}
+        striped
       />
     );
+  };
+
+  return (
+    <>
+      {renderTableWithTotals()}
+
+      {/* 纸箱价格编辑弹窗 */}
+      {packageData.map((pkg: BusinessAPI.OrderPackage) => (
+        <Popup
+          key={pkg.orderPackageId}
+          visible={visiblePopup[pkg.orderPackageId || ""]}
+          position="bottom"
+          title="编辑纸箱信息"
+          onClose={() =>
+            setVisiblePopup((prev) => ({
+              ...prev,
+              [pkg.orderPackageId || ""]: false,
+            }))
+          }
+          onOverlayClick={() =>
+            setVisiblePopup((prev) => ({
+              ...prev,
+              [pkg.orderPackageId || ""]: false,
+            }))
+          }
+          lockScroll
+        >
+          <View className="flex flex-col gap-3 p-2.5">
+            <View className="text-neutral-darkest text-sm font-medium">
+              销售单价
+            </View>
+            <View className="border-neutral-base flex flex-row items-center rounded-md border border-solid">
+              <Input
+                className="placeholder:text-neutral-dark"
+                placeholder="请输入销售单价"
+                type="digit"
+                value={
+                  tempEditValues[
+                    pkg.orderPackageId || ""
+                  ]?.boxSalePrice?.toString() || ""
+                }
+                onChange={(value) => {
+                  const numValue = validatePrice(value);
+                  if (numValue !== undefined) {
+                    setTempEditValues((prev) => ({
+                      ...prev,
+                      [pkg.orderPackageId || ""]: {
+                        ...prev[pkg.orderPackageId || ""],
+                        boxSalePrice: numValue as number,
+                      },
+                    }));
+                  }
+                }}
+              />
+              <View className="mr-2">元</View>
+            </View>
+
+            <View className="text-neutral-darkest text-sm font-medium">
+              成本单价
+            </View>
+            <View className="border-neutral-base flex flex-row items-center rounded-md border border-solid">
+              <Input
+                className="placeholder:text-neutral-dark"
+                placeholder="请输入成本单价"
+                type="digit"
+                value={
+                  tempEditValues[
+                    pkg.orderPackageId || ""
+                  ]?.boxCostPrice?.toString() || ""
+                }
+                onChange={(value) => {
+                  const numValue = validatePrice(value);
+                  if (numValue !== undefined) {
+                    setTempEditValues((prev) => ({
+                      ...prev,
+                      [pkg.orderPackageId || ""]: {
+                        ...prev[pkg.orderPackageId || ""],
+                        boxCostPrice: numValue as number,
+                      },
+                    }));
+                  }
+                }}
+              />
+              <View className="mr-2">元</View>
+            </View>
+
+            <View className="text-neutral-darkest text-sm font-medium">
+              箱重
+            </View>
+            <View className="border-neutral-base flex flex-row items-center rounded-md border border-solid">
+              <Input
+                className="placeholder:text-neutral-dark"
+                placeholder="请输入箱重"
+                type="digit"
+                value={
+                  tempEditValues[
+                    pkg.orderPackageId || ""
+                  ]?.boxProductWeight?.toString() || ""
+                }
+                onChange={(value) => {
+                  const numValue = validatePrice(value);
+                  if (numValue !== undefined) {
+                    setTempEditValues((prev) => ({
+                      ...prev,
+                      [pkg.orderPackageId || ""]: {
+                        ...prev[pkg.orderPackageId || ""],
+                        boxProductWeight: numValue as number,
+                      },
+                    }));
+                  }
+                }}
+              />
+              <View className="mr-2">斤</View>
+            </View>
+          </View>
+          <View className="flex w-full flex-col bg-white">
+            <View className="flex flex-row gap-2 p-3">
+              <View className="flex-1">
+                <Button
+                  size="large"
+                  block
+                  type="default"
+                  onClick={() =>
+                    setVisiblePopup((prev) => ({
+                      ...prev,
+                      [pkg.orderPackageId || ""]: false,
+                    }))
+                  }
+                >
+                  取消
+                </Button>
+              </View>
+              <View className="flex-1">
+                <Button
+                  size="large"
+                  block
+                  type="primary"
+                  onClick={() => {
+                    // 保存时才更新editValues状态
+                    setEditValues((prev) => ({
+                      ...prev,
+                      [pkg.orderPackageId || ""]: {
+                        ...tempEditValues[pkg.orderPackageId || ""],
+                      },
+                    }));
+
+                    // 关闭弹窗
+                    setVisiblePopup((prev) => ({
+                      ...prev,
+                      [pkg.orderPackageId || ""]: false,
+                    }));
+                  }}
+                >
+                  保存
+                </Button>
+              </View>
+            </View>
+          </View>
+          <SafeArea position="bottom" />
+        </Popup>
+      ))}
+    </>
+  );
 }

packages/app-client/src/components/purchase/section/LaborInfoSection.tsx

@@ -8,16 +8,16 @@ import {
 } from "@nutui/nutui-react-taro";
 import { useEffect, useState } from "react";
 import { Icon } from "@/components";
-import { business } from "@/services";
 import { formatCurrency, validatePrice } from "@/utils/format";
 import { generateShortId } from "@/utils/generateShortId";
 
 export default function LaborInfoSection(props: {
   purchaseOrderVO: BusinessAPI.PurchaseOrderVO;
+  costItemVOList: BusinessAPI.CostItemVO[];
   onChange?: (purchaseOrderVO: BusinessAPI.PurchaseOrderVO) => void;
   readOnly?: boolean;
 }) {
-  const { purchaseOrderVO, onChange, readOnly } = props;
+  const { purchaseOrderVO, onChange, readOnly, costItemVOList } = props;
 
   // 弹窗相关状态
   const [visiblePopup, setVisiblePopup] = useState<{ [key: string]: boolean }>(
@@ -41,17 +41,12 @@ export default function LaborInfoSection(props: {
     requireQuantityAndPrice: false,
   });
 
-  console.log("newCostData", newCostData);
-
   // Picker可见状态
   const [pickerVisible, setPickerVisible] = useState({
     costType: false, // 费用类型Picker
     costItem: false, // 费用项目Picker
   });
 
-  // 费用项目列表
-  const [costItems, setCostItems] = useState<BusinessAPI.CostItemVO[]>([]);
-
   // 编辑值的状态
   const [editValues, setEditValues] = useState<{
     [key: string]: {
@@ -108,25 +103,6 @@ export default function LaborInfoSection(props: {
     },
   ];
 
-  // 获取费用项目列表
-  useEffect(() => {
-    const fetchCostItems = async () => {
-      try {
-        const { data } = await business.costItem.listCostItem({
-          costItemListQry: {
-            status: true,
-            showInEntry: true,
-          },
-        });
-        setCostItems(data.data || []);
-      } catch (error) {
-        console.error("获取费用项目列表失败:", error);
-      }
-    };
-
-    fetchCostItems();
-  }, []);
-
   // 人工费
   const humanCosts =
     purchaseOrderVO.orderCostList?.filter(
@@ -368,28 +344,30 @@ export default function LaborInfoSection(props: {
                 <View className="text-neutral-darkest text-sm font-medium">
                   垫付项目
                 </View>
+                <View className="border-neutral-base relative flex h-10 w-full items-center rounded-md border border-solid">
                   <View
-                  className="border-neutral-base relative flex h-10 w-full items-center rounded-md border border-solid"
+                    className={
-                  onClick={() =>
+                      "flex flex-1 flex-row items-center justify-between px-5"
-                    setPickerVisible((prev) => ({ ...prev, costItem: true }))
                     }
+                    style={{
+                      color: "var(--nutui-color-title, #1a1a1a)",
+                    }}
+                    onClick={(event) => {
+                      setPickerVisible((prev) => ({ ...prev, costItem: true }));
+                      event.stopPropagation();
+                    }}
                   >
-                  <Input
+                    <View className={"text-sm"}>
-                    type="text"
+                      {newCostData.name || "请选择垫付项目"}
-                    placeholder="请选择垫付项目"
+                    </View>
-                    value={newCostData.name || ""}
+                    <Icon name={"chevron-down"} />
-                    disabled
+                  </View>
-                  />
-                  <Icon
-                    name="chevron-down"
-                    className="absolute -right-1 mr-4"
-                  />
                 </View>
                 <Picker
                   title="请选择垫付项目"
                   visible={pickerVisible.costItem}
                   options={[
-                    costItems
+                    costItemVOList
                       .filter((item) => item.costType === newCostData.costType)
                       .filter((item) => {
                         if (newCostData.costType === "PRODUCTION_ADVANCE") {
@@ -410,7 +388,7 @@ export default function LaborInfoSection(props: {
                   ]}
                   onConfirm={(_, values) => {
                     const selectedValue = values[0] as string;
-                    const selectedItem = costItems.find(
+                    const selectedItem = costItemVOList.find(
                       (item) => item.itemId === selectedValue,
                     );
                     if (selectedItem) {
@@ -651,7 +629,9 @@ export default function LaborInfoSection(props: {
       {/* 产地垫付 */}
       {productionAdvanceCosts.map((item) => {
         // 获取费用项目的 requireQuantityAndPrice 属性
-        const costItem = costItems.find((cost) => cost.itemId === item.itemId);
+        const costItem = costItemVOList.find(
+          (cost) => cost.itemId === item.itemId,
+        );
         const requireQuantityAndPrice =
           costItem?.requireQuantityAndPrice ?? false;
 
@@ -862,7 +842,9 @@ export default function LaborInfoSection(props: {
       {/* 工头垫付 */}
       {workerAdvanceCosts.map((item) => {
         // 获取费用项目的 requireQuantityAndPrice 属性
-        const costItem = costItems.find((cost) => cost.itemId === item.itemId);
+        const costItem = costItemVOList.find(
+          (cost) => cost.itemId === item.itemId,
+        );
         const requireQuantityAndPrice =
           costItem?.requireQuantityAndPrice ?? false;
 

packages/app-client/src/components/purchase/section/MarketPriceSection.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 import { Text, View } from "@tarojs/components";
 import { Button, Input, Popup, Radio, SafeArea } from "@nutui/nutui-react-taro";
-import { formatCurrency, validatePrice } from "@/utils/format";
+import { validatePrice } from "@/utils/format";
 import { PurchaseOrderCalculator } from "@/utils/PurchaseOrderCalculator";
 
 export default function MarketPriceSection(props: {
@@ -134,7 +134,6 @@ export default function MarketPriceSection(props: {
   const saleAmount = calculator.getSalesAmount();
 
   const totalAmount = calculator.getTotalAmount();
-  console.log("totalAmount", totalAmount)
   // 计算平均单价（所有供应商单价的平均值）
   const averagePurchasePrice = calculator.getAveragePurchasePrice();
 
@@ -272,7 +271,7 @@ export default function MarketPriceSection(props: {
           销售金额
         </View>
         <View className="text-neutral-darkest text-sm font-medium">
-          {pricingMethod ? `${formatCurrency(saleAmount)} 元` : "-"}
+          {pricingMethod ? `${saleAmount} 元` : "-"}
         </View>
       </View>
       <View className="flex !h-8 flex-row items-center justify-between">
@@ -280,17 +279,19 @@ export default function MarketPriceSection(props: {
           平均单价
         </View>
         <View className="text-neutral-darkest text-sm font-medium">
-          {pricingMethod
+          {pricingMethod ? `${averagePurchasePrice} 元/斤` : "-"}
-            ? `${formatCurrency(averagePurchasePrice)} 元/斤`
-            : "-"}
         </View>
       </View>
       <View className="flex !h-8 flex-row items-center justify-between bg-yellow-200">
         <View className="text-neutral-dark flex-shrink-0 text-sm">
-          市场报价（ 销售金额 + 包装费）
+          市场报价（
+          {purchaseOrderVO.orderDealer?.includePackingFlag
+            ? "销售金额 + 包装费"
+            : "销售金额"}
+          ）
         </View>
         <View className="text-neutral-darkest text-sm font-medium">
-          {pricingMethod ? `${formatCurrency(totalAmount)} 元` : "-"}
+          {pricingMethod ? `${totalAmount} 元` : "-"}
         </View>
       </View>
 
@@ -327,14 +328,11 @@ export default function MarketPriceSection(props: {
                 value={
                   tempEditValues[
                     supplier.orderSupplierId || ""
-                  ]?.salePrice?.toString() ||
+                  ]?.salePrice?.toString() || ""
-                  editValues[
-                    supplier.orderSupplierId || ""
-                  ]?.salePrice?.toString() ||
-                  ""
                 }
                 onChange={(value) => {
                   const numValue = validatePrice(value);
+                  console.log("num", numValue);
                   if (numValue !== undefined) {
                     setTempEditValues((prev) => ({
                       ...prev,

packages/app-client/src/components/purchase/section/MaterialCostSection.tsx

@@ -9,15 +9,15 @@ import {
 import { useEffect, useState } from "react";
 import { validatePrice } from "@/utils/format";
 import { generateShortId } from "@/utils/generateShortId";
-import { business } from "@/services";
 import { Icon } from "@/components";
 
 export default function MaterialCostSection(props: {
   purchaseOrderVO: BusinessAPI.PurchaseOrderVO;
+  costItemVOList: BusinessAPI.CostItemVO[];
   onChange?: (purchaseOrderVO: BusinessAPI.PurchaseOrderVO) => void;
   readOnly?: boolean;
 }) {
-  const { purchaseOrderVO, onChange, readOnly } = props;
+  const { purchaseOrderVO, onChange, readOnly, costItemVOList } = props;
 
   // 弹窗相关状态
   const [visiblePopup, setVisiblePopup] = useState<{ [key: string]: boolean }>(
@@ -43,9 +43,6 @@ export default function MaterialCostSection(props: {
     costItem: false, // 费用项目Picker
   });
 
-  // 费用项目列表
-  const [costItems, setCostItems] = useState<BusinessAPI.CostItemVO[]>([]);
-
   // 编辑值的状态
   const [editValues, setEditValues] = useState<{
     [key: string]: {
@@ -112,26 +109,6 @@ export default function MaterialCostSection(props: {
     return updates;
   };
 
-  // 获取费用项目列表
-  useEffect(() => {
-    const fetchCostItems = async () => {
-      try {
-        const { data } = await business.costItem.listCostItem({
-          costItemListQry: {
-            status: true,
-            showInEntry: true,
-            costType: "PACKAGING_MATERIALS", // 只获取辅料费用项目
-          },
-        });
-        setCostItems(data.data || []);
-      } catch (error) {
-        console.error("获取费用项目列表失败:", error);
-      }
-    };
-
-    fetchCostItems();
-  }, []);
-
   // 辅料费（商标费和网套费）
   const packagingMaterials =
     purchaseOrderVO.orderCostList?.filter(
@@ -346,25 +323,31 @@ export default function MaterialCostSection(props: {
           <View className="text-neutral-darkest text-sm font-medium">
             辅料项目
           </View>
+          <View className="border-neutral-base relative flex h-10 w-full items-center rounded-md border border-solid">
             <View
-            className="border-neutral-base relative flex h-10 w-full items-center rounded-md border border-solid"
+              className={
-            onClick={() =>
+                "flex flex-1 flex-row items-center justify-between px-5"
-              setPickerVisible((prev) => ({ ...prev, costItem: true }))
               }
+              style={{
+                color: "var(--nutui-color-title, #1a1a1a)",
+              }}
+              onClick={(event) => {
+                setPickerVisible((prev) => ({ ...prev, costItem: true }));
+                event.stopPropagation();
+              }}
             >
-            <Input
+              <View className={"text-sm"}>
-              type="text"
+                {newCostData.name || "请选择辅料项目"}
-              placeholder="请选择辅料项目"
+              </View>
-              value={newCostData.name || ""}
+              <Icon name={"chevron-down"} />
-              disabled
+            </View>
-            />
-            <Icon name="chevron-down" className="absolute -right-1 mr-4" />
           </View>
           <Picker
             title="请选择辅料项目"
             visible={pickerVisible.costItem}
             options={[
-              costItems
+              costItemVOList
+                .filter((item) => item.costType === "PACKAGING_MATERIALS")
                 .filter((item) => {
                   // 检查该项目是否已经被选择
                   return !packagingMaterials.some(
@@ -378,7 +361,7 @@ export default function MaterialCostSection(props: {
             ]}
             onConfirm={(_, values) => {
               const selectedValue = values[0] as string;
-              const selectedItem = costItems.find(
+              const selectedItem = costItemVOList.find(
                 (item) => item.itemId === selectedValue,
               );
               if (selectedItem) {
@@ -608,7 +591,9 @@ export default function MaterialCostSection(props: {
       {/* 辅料费编辑弹窗 */}
       {packagingMaterials.map((item) => {
         // 获取费用项目的 requireQuantityAndPrice 属性
-        const costItem = costItems.find((cost) => cost.itemId === item.itemId);
+        const costItem = costItemVOList.find(
+          (cost) => cost.itemId === item.itemId,
+        );
         const requireQuantityAndPrice =
           costItem?.requireQuantityAndPrice ?? false;
 

packages/app-client/src/components/purchase/section/PackagingCostSection.tsx

@@ -13,10 +13,11 @@ import { generateShortId } from "@/utils/generateShortId";
 
 export default function PackagingCostSection(props: {
   purchaseOrderVO: BusinessAPI.PurchaseOrderVO;
+  costItemVOList: BusinessAPI.CostItemVO[];
   onChange?: (purchaseOrderVO: BusinessAPI.PurchaseOrderVO) => void;
   readOnly?: boolean;
 }) {
-  const { purchaseOrderVO, onChange, readOnly } = props;
+  const { purchaseOrderVO, onChange, readOnly, costItemVOList } = props;
 
   // 弹窗相关状态
   const [visiblePopup, setVisiblePopup] = useState<{ [key: string]: boolean }>(
@@ -28,15 +29,16 @@ export default function PackagingCostSection(props: {
 
   // 新增包装费表单数据
   const [newCostData, setNewCostData] = useState({
-    costType: "", // 费用类型
+    costType: "FIXED_COST", // 费用类型
     itemId: "", // 费用项目ID
     name: "", // 费用名称
-    payee: "", // 收款人
+    quantity: 0, // 数量（人数）
-    quantity: "", // 数量（包数或人数）
+    unit: "", // 单位
     unitPrice: "", // 单价
-    amount: "", // 金额（固定费用和其他费用使用）
+    amount: "", // 金额
-    payerType: "", // 费用承担方，默认我方
+    payerType: "US", // 费用承担方，默认我方
     principal: "", // 工头姓名
+    requireQuantityAndPrice: false,
   });
 
   // Picker可见状态
@@ -99,13 +101,6 @@ export default function PackagingCostSection(props: {
     { label: "其他费用", value: "OTHER_COST" },
   ];
 
-  // 固定费用选项
-  const fixedCostOptions = [
-    { label: "计提费", value: "accrual" },
-    { label: "王超费用", value: "wangchao" },
-    { label: "收代办费", value: "agency" },
-  ];
-
   // 固定费用
   const fixedCosts =
     purchaseOrderVO.orderCostList?.filter(
@@ -122,12 +117,16 @@ export default function PackagingCostSection(props: {
   useEffect(() => {
     if (onChange) {
       // 检查是否已存在计提费
+      const accrualFeeItem = costItemVOList.find(
+        (item) => item.name === "计提费" && item.costType === "FIXED_COST",
+      );
+
       const hasAccrualFee = fixedCosts.some((item) => item.name === "计提费");
 
-      if (!hasAccrualFee) {
+      if (!hasAccrualFee && accrualFeeItem) {
         // 创建默认计提费
         const defaultAccrualFee: BusinessAPI.OrderCost = {
-          itemId: generateShortId(),
+          itemId: accrualFeeItem.itemId,
           orderCostId: generateShortId(),
           name: "计提费",
           costType: "FIXED_COST",
@@ -207,7 +206,9 @@ export default function PackagingCostSection(props: {
     <>
       <View className="flex flex-col gap-2.5">
         {/* 固定费用 */}
-        {fixedCosts.map((item, index) => {
+        {fixedCosts
+          .filter((item) => item.name !== "纸箱费" && item.name !== "空箱费")
+          .map((item, index) => {
             // 初始化编辑值
             initEditValues(item.orderCostId, item.count, item.price);
 
@@ -234,7 +235,11 @@ export default function PackagingCostSection(props: {
                   )}
                   {!readOnly && (
                     <View className="ml-1 text-gray-500">
-                    <Icon name={"pen-to-square"} size={16} color={"#1a73e8"} />
+                      <Icon
+                        name={"pen-to-square"}
+                        size={16}
+                        color={"#1a73e8"}
+                      />
                     </View>
                   )}
                 </View>
@@ -326,11 +331,12 @@ export default function PackagingCostSection(props: {
                       ...prev,
                       costType: option.value,
                       itemId: "",
-                      name: "",
+                      name: "", // 费用名称
-                      payee: "",
+                      quantity: 0, // 数量
-                      quantity: "",
+                      unit: "", // 单位
-                      unitPrice: "",
+                      unitPrice: "", // 单价
-                      amount: "",
+                      amount: "", // 金额
+                      requireQuantityAndPrice: false,
                     }));
                   }}
                 >
@@ -351,37 +357,62 @@ export default function PackagingCostSection(props: {
                     setPickerVisible((prev) => ({ ...prev, fixedCost: true }))
                   }
                 >
-                  <Input
+                  <View
-                    type="text"
+                    className={
-                    placeholder="请选择固定费用类型"
+                      "flex flex-1 flex-row items-center justify-between px-5"
-                    value={newCostData.name || ""}
+                    }
-                    disabled
+                    style={{
-                  />
+                      color: "var(--nutui-color-title, #1a1a1a)",
-                  <Icon
+                    }}
-                    name="chevron-down"
+                    onClick={(event) => {
-                    className="absolute -right-1 mr-4"
+                      setPickerVisible((prev) => ({ ...prev, costItem: true }));
-                  />
+                      event.stopPropagation();
+                    }}
+                  >
+                    <View className={"text-sm"}>
+                      {newCostData.name || "请选择固定费用类型"}
                     </View>
+                    <Icon name={"chevron-down"} />
+                  </View>
+                </View>
+
                 <Picker
-                  title="请选择固定费用类型"
+                  title="请选择垫付项目"
                   visible={pickerVisible.fixedCost}
                   options={[
-                    fixedCostOptions.filter((option) => {
+                    costItemVOList
-                      // 检查该固定费用类型是否已存在于fixedCosts中
+                      .filter((item) => item.costType === newCostData.costType)
+                      .filter((item) => {
+                        // 检查该项目是否已经被选择
                         return !fixedCosts.some(
-                        (cost) => cost.name === option.label,
+                          (hc) => hc.itemId === item.itemId,
                         );
-                    }),
+                      })
+                      .map((item) => ({
+                        label: item.name,
+                        value: item.itemId,
+                      })),
                   ]}
                   onConfirm={(_, values) => {
                     const selectedValue = values[0] as string;
-                    const selectedItem = fixedCostOptions.find(
+                    const selectedItem = costItemVOList.find(
-                      (option) => option.value === selectedValue,
+                      (item) => item.itemId === selectedValue,
                     );
                     if (selectedItem) {
                       setNewCostData((prev) => ({
                         ...prev,
-                        name: selectedItem.label,
+                        itemId: selectedValue,
+                        name: selectedItem.name,
+                        payerType: "US",
+                        quantity: selectedItem.requireQuantityAndPrice ? 0 : 1,
+                        unit: selectedItem.requireQuantityAndPrice
+                          ? selectedItem.unit
+                          : "元", // 单位
+                        unitPrice: "", // 单价
+                        amount: "", // 金额
+                        principal: "", // 工头姓名
+                        requireQuantityAndPrice:
+                          selectedItem.requireQuantityAndPrice,
                       }));
                     }
                     setPickerVisible((prev) => ({ ...prev, fixedCost: false }));
@@ -423,7 +454,7 @@ export default function PackagingCostSection(props: {
                   <Input
                     className="placeholder:text-neutral-dark flex-1"
                     placeholder="请输入收款人姓名"
-                    value={newCostData.payee}
+                    value={newCostData.principal}
                     onChange={(value) => {
                       setNewCostData((prev) => ({
                         ...prev,
@@ -474,15 +505,16 @@ export default function PackagingCostSection(props: {
                     setShowAddCostPopup(false);
                     // 重置表单
                     setNewCostData({
+                      itemId: generateShortId(),
+                      costType: "",
                       payerType: "",
                       principal: "",
-                      costType: "",
+                      name: "", // 费用名称
-                      itemId: generateShortId(),
+                      quantity: 0, // 数量
-                      name: "",
+                      unit: "", // 单位
-                      payee: "",
+                      unitPrice: "", // 单价
-                      quantity: "",
+                      amount: "", // 金额
-                      unitPrice: "",
+                      requireQuantityAndPrice: false,
-                      amount: "",
                     });
                   }}
                 >
@@ -503,7 +535,7 @@ export default function PackagingCostSection(props: {
 
                     if (
                       newCostData.costType === "OTHER_COST" &&
-                      (!newCostData.name || !newCostData.payee)
+                      (!newCostData.name || !newCostData.principal)
                     ) {
                       console.log("请填写费用名称和收款人姓名");
                       return;
@@ -569,15 +601,16 @@ export default function PackagingCostSection(props: {
                     setShowAddCostPopup(false);
                     // 重置表单
                     setNewCostData({
+                      itemId: generateShortId(),
+                      costType: "",
                       payerType: "",
                       principal: "",
-                      costType: "",
+                      name: "", // 费用名称
-                      itemId: generateShortId(),
+                      quantity: 0, // 数量
-                      name: "",
+                      unit: "", // 单位
-                      payee: "",
+                      unitPrice: "", // 单价
-                      quantity: "",
+                      amount: "", // 金额
-                      unitPrice: "",
+                      requireQuantityAndPrice: false,
-                      amount: "",
                     });
                   }}
                 >

packages/app-client/src/components/purchase/section/ProductionAdvanceSection.tsx

@@ -8,16 +8,16 @@ import {
 } from "@nutui/nutui-react-taro";
 import { useEffect, useState } from "react";
 import { Icon } from "@/components";
-import { business } from "@/services";
 import { formatCurrency, validatePrice } from "@/utils/format";
 import { generateShortId } from "@/utils/generateShortId";
 
 export default function ProductionAdvanceSection(props: {
   purchaseOrderVO: BusinessAPI.PurchaseOrderVO;
+  costItemVOList: BusinessAPI.CostItemVO[];
   onChange?: (purchaseOrderVO: BusinessAPI.PurchaseOrderVO) => void;
   readOnly?: boolean;
 }) {
-  const { purchaseOrderVO, onChange, readOnly } = props;
+  const { purchaseOrderVO, onChange, readOnly, costItemVOList } = props;
 
   // 弹窗相关状态
   const [visiblePopup, setVisiblePopup] = useState<{ [key: string]: boolean }>(
@@ -41,17 +41,12 @@ export default function ProductionAdvanceSection(props: {
     requireQuantityAndPrice: false,
   });
 
-  console.log("newCostData", newCostData);
-
   // Picker可见状态
   const [pickerVisible, setPickerVisible] = useState({
     costType: false, // 费用类型Picker
     costItem: false, // 费用项目Picker
   });
 
-  // 费用项目列表
-  const [costItems, setCostItems] = useState<BusinessAPI.CostItemVO[]>([]);
-
   // 编辑值的状态
   const [editValues, setEditValues] = useState<{
     [key: string]: {
@@ -99,25 +94,6 @@ export default function ProductionAdvanceSection(props: {
     }
   };
 
-  // 获取费用项目列表
-  useEffect(() => {
-    const fetchCostItems = async () => {
-      try {
-        const { data } = await business.costItem.listCostItem({
-          costItemListQry: {
-            status: true,
-            showInEntry: true,
-          },
-        });
-        setCostItems(data.data || []);
-      } catch (error) {
-        console.error("获取费用项目列表失败:", error);
-      }
-    };
-
-    fetchCostItems();
-  }, []);
-
   // 产地垫付
   const productionAdvanceCosts =
     purchaseOrderVO.orderCostList?.filter(
@@ -176,6 +152,7 @@ export default function ProductionAdvanceSection(props: {
   return (
     <>
       <View className={"flex flex-col gap-2.5 divide-y divide-[#eaeaea]"}>
+        {productionAdvanceCosts && productionAdvanceCosts.length > 0 && (
           <View className="flex flex-col gap-2.5">
             <View className={"text-sm font-bold"}>
               产地负责人：{purchaseOrderVO.originPrincipal}
@@ -228,6 +205,7 @@ export default function ProductionAdvanceSection(props: {
               );
             })}
           </View>
+        )}
 
         {!readOnly && (
           <Button
@@ -258,28 +236,30 @@ export default function ProductionAdvanceSection(props: {
                 <View className="text-neutral-darkest text-sm font-medium">
                   垫付项目
                 </View>
+                <View className="border-neutral-base relative flex h-10 w-full items-center rounded-md border border-solid">
                   <View
-                  className="border-neutral-base relative flex h-10 w-full items-center rounded-md border border-solid"
+                    className={
-                  onClick={() =>
+                      "flex flex-1 flex-row items-center justify-between px-5"
-                    setPickerVisible((prev) => ({ ...prev, costItem: true }))
                     }
+                    style={{
+                      color: "var(--nutui-color-title, #1a1a1a)",
+                    }}
+                    onClick={(event) => {
+                      setPickerVisible((prev) => ({ ...prev, costItem: true }));
+                      event.stopPropagation();
+                    }}
                   >
-                  <Input
+                    <View className={"text-sm"}>
-                    type="text"
+                      {newCostData.name || "请选择垫付项目"}
-                    placeholder="请选择垫付项目"
+                    </View>
-                    value={newCostData.name || ""}
+                    <Icon name={"chevron-down"} />
-                    disabled
+                  </View>
-                  />
-                  <Icon
-                    name="chevron-down"
-                    className="absolute -right-1 mr-4"
-                  />
                 </View>
                 <Picker
                   title="请选择垫付项目"
                   visible={pickerVisible.costItem}
                   options={[
-                    costItems
+                    costItemVOList
                       .filter((item) => item.costType === newCostData.costType)
                       .filter((item) => {
                         // 检查该项目是否已经被选择
@@ -294,7 +274,7 @@ export default function ProductionAdvanceSection(props: {
                   ]}
                   onConfirm={(_, values) => {
                     const selectedValue = values[0] as string;
-                    const selectedItem = costItems.find(
+                    const selectedItem = costItemVOList.find(
                       (item) => item.itemId === selectedValue,
                     );
                     if (selectedItem) {

packages/app-client/src/components/purchase/section/RebateCalcSection.tsx

@@ -25,7 +25,7 @@ export default function RebateCalcSection(props: {
     const { data } =
       await business.dealerRebateCustomer.showDealerRebateCustomer({
         dealerRebateCustomerShowQry: {
-          dealerId: purchaseOrderVO.orderDealer.dealerId,
+          dealerId: purchaseOrderVO.orderDealer?.dealerId,
           status: true,
         },
       });

packages/app-client/src/components/purchase/section/TaxProvisionSection.tsx

@@ -16,12 +16,12 @@ export default function TaxProvisionSection(props: {
   const [visible, setVisible] = useState(false);
 
   const [taxProvision, setTaxProvision] = useState<number>(
-    purchaseOrderVO.orderDealer.taxProvision || 0,
+    purchaseOrderVO.orderDealer?.taxProvision || 0,
   );
 
   // 当dealerVO变化时，自动计算计提税金
   useEffect(() => {
-    if (!purchaseOrderVO.orderDealer.taxProvision) {
+    if (!purchaseOrderVO.orderDealer?.taxProvision) {
       const defaultValue = calculator.getDefaultTaxProvision();
       setTaxProvision(defaultValue);
       // 更新父组件的状态

packages/app-client/src/components/purchase/section/TaxSubsidySection.tsx

@@ -16,12 +16,12 @@ export default function TaxSubsidySection(props: {
   const [visible, setVisible] = useState(false);
 
   const [taxSubsidy, setTaxSubsidy] = useState<number>(
-    purchaseOrderVO.orderDealer.taxSubsidy || 0,
+    purchaseOrderVO.orderDealer?.taxSubsidy || 0,
   );
 
   // 当dealerVO变化时，自动计算税费补贴
   useEffect(() => {
-    if (!purchaseOrderVO.orderDealer.taxSubsidy) {
+    if (!purchaseOrderVO.orderDealer?.taxSubsidy) {
       const defaultValue = calculator.getDefaultTaxSubsidy();
       setTaxSubsidy(defaultValue);
       // 更新父组件的状态

packages/app-client/src/components/purchase/section/WorkerAdvanceSection.tsx

@@ -8,16 +8,16 @@ import {
 } from "@nutui/nutui-react-taro";
 import { useEffect, useState } from "react";
 import { Icon } from "@/components";
-import { business } from "@/services";
 import { formatCurrency, validatePrice } from "@/utils/format";
 import { generateShortId } from "@/utils/generateShortId";
 
 export default function WorkerAdvanceSection(props: {
   purchaseOrderVO: BusinessAPI.PurchaseOrderVO;
+  costItemVOList: BusinessAPI.CostItemVO[];
   onChange?: (purchaseOrderVO: BusinessAPI.PurchaseOrderVO) => void;
   readOnly?: boolean;
 }) {
-  const { purchaseOrderVO, onChange, readOnly } = props;
+  const { purchaseOrderVO, onChange, readOnly, costItemVOList } = props;
 
   // 弹窗相关状态
   const [visiblePopup, setVisiblePopup] = useState<{ [key: string]: boolean }>(
@@ -41,17 +41,12 @@ export default function WorkerAdvanceSection(props: {
     requireQuantityAndPrice: false,
   });
 
-  console.log("newCostData", newCostData);
-
   // Picker可见状态
   const [pickerVisible, setPickerVisible] = useState({
     costType: false, // 费用类型Picker
     costItem: false, // 费用项目Picker
   });
 
-  // 费用项目列表
-  const [costItems, setCostItems] = useState<BusinessAPI.CostItemVO[]>([]);
-
   // 编辑值的状态
   const [editValues, setEditValues] = useState<{
     [key: string]: {
@@ -99,25 +94,6 @@ export default function WorkerAdvanceSection(props: {
     }
   };
 
-  // 获取费用项目列表
-  useEffect(() => {
-    const fetchCostItems = async () => {
-      try {
-        const { data } = await business.costItem.listCostItem({
-          costItemListQry: {
-            status: true,
-            showInEntry: true,
-          },
-        });
-        setCostItems(data.data || []);
-      } catch (error) {
-        console.error("获取费用项目列表失败:", error);
-      }
-    };
-
-    fetchCostItems();
-  }, []);
-
   // 人工费
   const humanCosts =
     purchaseOrderVO.orderCostList?.filter(
@@ -186,6 +162,7 @@ export default function WorkerAdvanceSection(props: {
     <>
       <View className={"flex flex-col gap-2.5 divide-y divide-[#eaeaea]"}>
         <View className="flex flex-col gap-2.5">
+          {humanCosts && humanCosts.length > 0 && (
             <View className={"flex flex-col gap-2.5"}>
               <View className={"text-sm font-bold"}>
                 工头：{humanCosts?.[0].principal}
@@ -202,6 +179,8 @@ export default function WorkerAdvanceSection(props: {
                 })}
               </View>
             </View>
+          )}
+
           {/* 工头垫付 */}
           {workerAdvanceCosts.map((item, index) => {
             // 初始化编辑值，包括费用承担方和工头姓名
@@ -250,7 +229,6 @@ export default function WorkerAdvanceSection(props: {
             );
           })}
         </View>
-
         {!readOnly && (
           <Button
             type={"primary"}
@@ -280,28 +258,30 @@ export default function WorkerAdvanceSection(props: {
                 <View className="text-neutral-darkest text-sm font-medium">
                   垫付项目
                 </View>
+                <View className="border-neutral-base relative flex h-10 w-full items-center rounded-md border border-solid">
                   <View
-                  className="border-neutral-base relative flex h-10 w-full items-center rounded-md border border-solid"
+                    className={
-                  onClick={() =>
+                      "flex flex-1 flex-row items-center justify-between px-5"
-                    setPickerVisible((prev) => ({ ...prev, costItem: true }))
                     }
+                    style={{
+                      color: "var(--nutui-color-title, #1a1a1a)",
+                    }}
+                    onClick={(event) => {
+                      setPickerVisible((prev) => ({ ...prev, costItem: true }));
+                      event.stopPropagation();
+                    }}
                   >
-                  <Input
+                    <View className={"text-sm"}>
-                    type="text"
+                      {newCostData.name || "请选择垫付项目"}
-                    placeholder="请选择垫付项目"
+                    </View>
-                    value={newCostData.name || ""}
+                    <Icon name={"chevron-down"} />
-                    disabled
+                  </View>
-                  />
-                  <Icon
-                    name="chevron-down"
-                    className="absolute -right-1 mr-4"
-                  />
                 </View>
                 <Picker
                   title="请选择垫付项目"
                   visible={pickerVisible.costItem}
                   options={[
-                    costItems
+                    costItemVOList
                       .filter((item) => item.costType === newCostData.costType)
                       .filter((item) => {
                         return !workerAdvanceCosts.some(
@@ -315,7 +295,7 @@ export default function WorkerAdvanceSection(props: {
                   ]}
                   onConfirm={(_, values) => {
                     const selectedValue = values[0] as string;
-                    const selectedItem = costItems.find(
+                    const selectedItem = costItemVOList.find(
                       (item) => item.itemId === selectedValue,
                     );
                     if (selectedItem) {
@@ -530,7 +510,7 @@ export default function WorkerAdvanceSection(props: {
                     setShowAddCostPopup(false);
                     // 重置表单
                     setNewCostData({
-                      costType: "PRODUCTION_ADVANCE", // 费用类型
+                      costType: "WORKER_ADVANCE", // 费用类型
                       itemId: "",
                       name: "", // 费用名称
                       quantity: 0, // 数量（人数）

packages/app-client/src/pages/delivery/document/delivery.tsx

@@ -19,6 +19,7 @@ import classNames from "classnames";
 import { business, poster } from "@/services";
 import dayjs from "dayjs";
 import buildUrl from "@/utils/buildUrl";
+import { Icon } from "@/components";
 
 // 特殊处理：其他费用要实时获取费用项目
 const updateOtherFeesModule = async (
@@ -432,37 +433,24 @@ export default hocAuth(function Page(props: CommonComponent) {
               <View
                 className={`flex h-10 w-full items-center rounded-md ${formErrors.estimatedArrivalDate ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
               >
-                <Input
+                <View
-                  value={
+                  className={
-                    shipOrderVO?.estimatedArrivalDate
+                    "flex flex-1 flex-row items-center justify-between px-5"
+                  }
+                  style={{
+                    color: "var(--nutui-color-title, #1a1a1a)",
+                  }}
+                  onClick={() => setShow(true)}
+                >
+                  <View className={"text-sm"}>
+                    {shipOrderVO?.estimatedArrivalDate
                       ? dayjs(shipOrderVO?.estimatedArrivalDate).format(
                           "YYYY年MM月DD日",
                         )
-                      : ""
+                      : column.fieldProps?.placeholder || `请${column.title}`}
-                  }
+                  </View>
-                  placeholder={
+                  <Icon name={"chevron-down"} />
-                    column.fieldProps?.placeholder || `请${column.title}`
+                </View>
-                  }
-                  type="text"
-                  className="flex-1"
-                  disabled
-                  onClick={() => setShow(true)}
-                  onBlur={() => {
-                    // 失焦时校验
-                    if (!shipOrderVO?.estimatedArrivalDate) {
-                      setFormErrors((prev) => ({
-                        ...prev,
-                        estimatedArrivalDate: true,
-                      }));
-                      Toast.show("toast", {
-                        icon: "fail",
-                        title:
-                          column.fieldProps?.placeholder ||
-                          `请选择${column.title}`,
-                      });
-                    }
-                  }}
-                />
                 <DatePicker
                   title="发货时间选择"
                   type="date"

packages/app-client/src/pages/delivery/document/purchase.tsx

@@ -19,6 +19,7 @@ import classNames from "classnames";
 import { business } from "@/services";
 import dayjs from "dayjs";
 import buildUrl from "@/utils/buildUrl";
+import { Icon } from "@/components";
 
 export default hocAuth(function Page(props: CommonComponent) {
   const { router, setLoading } = props;
@@ -360,37 +361,24 @@ export default hocAuth(function Page(props: CommonComponent) {
               <View
                 className={`flex h-10 w-full items-center rounded-md ${formErrors.estimatedArrivalDate ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
               >
-                <Input
+                <View
-                  value={
+                  className={
-                    shipOrderVO?.estimatedArrivalDate
+                    "flex flex-1 flex-row items-center justify-between px-5"
+                  }
+                  style={{
+                    color: "var(--nutui-color-title, #1a1a1a)",
+                  }}
+                  onClick={() => setShow(true)}
+                >
+                  <View className={"text-sm"}>
+                    {shipOrderVO?.estimatedArrivalDate
                       ? dayjs(shipOrderVO?.estimatedArrivalDate).format(
                           "YYYY年MM月DD日",
                         )
-                      : ""
+                      : column.fieldProps?.placeholder || `请${column.title}`}
-                  }
+                  </View>
-                  placeholder={
+                  <Icon name={"chevron-down"} />
-                    column.fieldProps?.placeholder || `请${column.title}`
+                </View>
-                  }
-                  type="text"
-                  className="flex-1"
-                  disabled
-                  onClick={() => setShow(true)}
-                  onBlur={() => {
-                    // 失焦时校验
-                    if (!shipOrderVO?.estimatedArrivalDate) {
-                      setFormErrors((prev) => ({
-                        ...prev,
-                        estimatedArrivalDate: true,
-                      }));
-                      Toast.show("toast", {
-                        icon: "fail",
-                        title:
-                          column.fieldProps?.placeholder ||
-                          `请选择${column.title}`,
-                      });
-                    }
-                  }}
-                />
                 <DatePicker
                   title="发货时间选择"
                   type="date"

packages/app-client/src/pages/purchase/approver/approve.tsx

@@ -97,7 +97,7 @@ export default hocAuth(function Page(props: CommonComponent) {
                 ￥{formatCurrency(calculator.getSupplierPurchaseCost())}
               </View>
             </View>
-            {purchaseOrderVO.orderDealer.freightCostFlag && (
+            {purchaseOrderVO.orderDealer?.freightCostFlag && (
               <View className="cost-item flex flex-col px-3 py-2">
                 <View className="text-sm text-gray-500">运输费</View>
                 <View className="font-medium">
@@ -143,13 +143,13 @@ export default hocAuth(function Page(props: CommonComponent) {
             <View className="cost-item flex flex-col px-3 py-2">
               <View className="text-sm text-gray-500">果多美返点</View>
               <View className="font-medium">
-                ￥{purchaseOrderVO.orderDealer.taxSubsidy}
+                ￥{purchaseOrderVO.orderDealer?.taxSubsidy}
               </View>
             </View>
             <View className="cost-item flex flex-col px-3 py-2">
               <View className="text-sm text-gray-500">计提税金</View>
               <View className="font-medium">
-                ￥{purchaseOrderVO.orderDealer.taxSubsidy}
+                ￥{purchaseOrderVO.orderDealer?.taxSubsidy}
               </View>
             </View>
             <View className="cost-total col-span-2 grid grid-cols-2 bg-yellow-50 px-3 py-2">

packages/app-client/src/pages/purchase/purchaser/create.tsx

@@ -30,6 +30,7 @@ import { generateShortId } from "@/utils/generateShortId";
 import Taro from "@tarojs/taro";
 import buildUrl from "@/utils/buildUrl";
 import { SupplierWeightCalculator } from "@/utils/SupplierWeightCalculator";
+import { PurchaseOrderCalculator } from "@/utils/PurchaseOrderCalculator";
 
 const defaultSupplierList: SupplierVO[] = [
   {
@@ -113,6 +114,33 @@ export default hocAuth(function Page(props: CommonComponent) {
   const [orderSupplierList, setOrderSupplierList] =
     useState<SupplierVO[]>(defaultSupplierList);
   const [orderCostList, setOrderCostList] = useState<CostItem[]>([]);
+  const [orderPackageList, setOrderPackageList] = useState<
+    BusinessAPI.OrderPackage[]
+  >([]);
+
+  // 费用项目列表
+  const [costItemVOList, setCostItemVOList] = useState<
+    BusinessAPI.CostItemVO[]
+  >([]);
+
+  // 获取费用项目列表
+  useEffect(() => {
+    const fetchCostItems = async () => {
+      try {
+        const { data } = await business.costItem.listCostItem({
+          costItemListQry: {
+            status: true,
+            showInEntry: true,
+          },
+        });
+        setCostItemVOList(data.data || []);
+      } catch (error) {
+        console.error("获取费用项目列表失败:", error);
+      }
+    };
+
+    fetchCostItems();
+  }, []);
 
   useEffect(() => {
     if (orderId) {
@@ -138,11 +166,6 @@ export default hocAuth(function Page(props: CommonComponent) {
             setPurchaseOrder(purchaseOrder);
             setOrderVehicle(purchaseOrder.orderVehicle);
             const orderSupplierList1 = purchaseOrder.orderSupplierList as any;
-            console.log(
-              "orderSupplierList1",
-              orderSupplierList1,
-              defaultSupplierId,
-            );
             if (defaultSupplierId) {
               const index = orderSupplierList1.findIndex(
                 (item: any) => item.supplierId === defaultSupplierId,
@@ -171,6 +194,8 @@ export default hocAuth(function Page(props: CommonComponent) {
               }),
             ) as any;
             setOrderCostList(orderCostList1);
+
+            setOrderPackageList(purchaseOrder.orderPackageList);
           }
         })
         .catch((err) => {
@@ -223,6 +248,13 @@ export default hocAuth(function Page(props: CommonComponent) {
     }));
   }, [orderCostList]);
 
+  useEffect(() => {
+    setPurchaseOrder((prev) => ({
+      ...prev!,
+      orderPackageList: orderPackageList || [],
+    }));
+  }, [orderPackageList]);
+
   if (step === undefined) {
     return;
   }
@@ -385,6 +417,7 @@ export default hocAuth(function Page(props: CommonComponent) {
         orderCostList: purchaseOrder.orderCostList.filter(
           (item: CostItem) => item.selected,
         ),
+        orderPackageList: purchaseOrder.orderPackageList,
       });
 
       if (data.success) {
@@ -551,13 +584,18 @@ export default hocAuth(function Page(props: CommonComponent) {
           <OrderVehicle
             ref={vehicleRef}
             orderVehicle={orderVehicle!}
-            setOrderVehicle={setOrderVehicle}
+            setOrderVehicle={(orderVehicle) => {
+              setOrderVehicle(orderVehicle);
+            }}
             orderDealer={orderDealer!}
-            setOrderDealer={setOrderDealer}
+            setOrderDealer={(orderDealer) => {
+              setOrderDealer(orderDealer);
+            }}
             orderCostList={orderCostList}
             setOrderCostList={(costItemList: CostItem[]) => {
               setOrderCostList(costItemList);
             }}
+            costItemVOList={costItemVOList}
           />
         )}
 
@@ -624,6 +662,7 @@ export default hocAuth(function Page(props: CommonComponent) {
                 onChange={(supplierVO: SupplierVO) => {
                   orderSupplierList[index] = { ...item, ...supplierVO };
                   setOrderSupplierList([...orderSupplierList]);
+                  console.log("supplierVO", supplierVO);
                 }}
                 isLast={index === orderSupplierList.length - 1}
                 selectedSupplierIds={selectedSupplierIds}
@@ -659,11 +698,12 @@ export default hocAuth(function Page(props: CommonComponent) {
                       return item;
                     }),
                   ]);
-                  setPurchaseOrder((prev) => {
+                  setOrderCostList((prev) => {
                     const costItemVOList = productVO.costItemVOList;
 
+                    console.log("prev", prev);
                     // 将 orderCostList 中 不存在与 costItemVOList 的项 删除，剩余项保留
-                    const orderCostList = prev?.orderCostList.filter((item) => {
+                    const orderCostList = prev?.filter((item) => {
                       return (
                         (item.costType === "WORKER_ADVANCE" ||
                           item.costType === "PRODUCTION_ADVANCE" ||
@@ -693,14 +733,13 @@ export default hocAuth(function Page(props: CommonComponent) {
                           principal: "",
                           costType: item.costType,
                           requireQuantityAndPrice: item.requireQuantityAndPrice,
+                          selected: true,
                         });
                       }
                     });
 
-                    return {
+                    return [
-                      ...prev!,
+                      ...(prev?.filter((item) => {
-                      orderCostList: [
-                        ...(prev?.orderCostList?.filter((item) => {
                         return (
                           item.costType !== "WORKER_ADVANCE" &&
                           item.costType !== "PRODUCTION_ADVANCE" &&
@@ -708,8 +747,7 @@ export default hocAuth(function Page(props: CommonComponent) {
                         );
                       }) || []),
                       ...(orderCostList || []),
-                      ],
+                    ];
-                    };
                   });
                 }}
                 isFirst={index === 0}
@@ -749,6 +787,59 @@ export default hocAuth(function Page(props: CommonComponent) {
                 onChange={(supplierVO: SupplierVO) => {
                   orderSupplierList[index] = { ...item, ...supplierVO };
                   setOrderSupplierList([...orderSupplierList]);
+
+                  setOrderCostList((prev) => {
+                    console.log("prev", prev);
+                    // 检查是否已存在纸箱费项目
+                    const hasBoxFee = prev?.some(
+                      (item) =>
+                        item.name === "纸箱费" &&
+                        item.costType === "FIXED_COST",
+                    );
+                    const boxCostItem = costItemVOList.find(
+                      (item) =>
+                        item.name === "纸箱费" &&
+                        item.costType === "FIXED_COST",
+                    );
+
+                    const calculator = new PurchaseOrderCalculator(
+                      purchaseOrder as any,
+                    );
+
+                    // 如果不存在空箱费项目，则添加
+                    if (!hasBoxFee) {
+                      const boxFeeItem: CostItem = {
+                        orderCostId: generateShortId(),
+                        itemId: boxCostItem?.itemId || "",
+                        name: "纸箱费",
+                        price: calculator.getBoxSale(),
+                        unit: "项",
+                        selected: true,
+                        count: 1,
+                        payerType: "US",
+                        principal: "",
+                        costType: "FIXED_COST",
+                        requireQuantityAndPrice: false,
+                      };
+
+                      return [...prev, boxFeeItem];
+                    } else {
+                      // 如果已存在空箱费项目，更新其数量
+                      return prev.map((item) => {
+                        if (
+                          item.name === "纸箱费" &&
+                          item.costType === "FIXED_COST"
+                        ) {
+                          return {
+                            ...item,
+                            price: calculator.getBoxSale(),
+                            count: 1,
+                          };
+                        }
+                        return item;
+                      });
+                    }
+                  });
                 }}
               />
             );
@@ -780,9 +871,15 @@ export default hocAuth(function Page(props: CommonComponent) {
             }}
             ref={orderCostRef}
             value={orderCostList}
-            onChange={(costItemList: CostItem[]) =>
+            onChange={(costItemList: CostItem[]) => {
-              setOrderCostList(costItemList)
+              // 修改标识将在useEffect中自动更新
-            }
+              setOrderCostList(costItemList);
+            }}
+            emptyBoxList={orderPackageList}
+            onEmptyBoxChange={(emptyBoxList: BusinessAPI.OrderPackage[]) => {
+              setOrderPackageList(emptyBoxList);
+            }}
+            costItemVOList={costItemVOList}
           />
         )}
       </View>

packages/app-client/src/pages/purchase/reviewer/audit.tsx

@@ -121,6 +121,29 @@ export default hocAuth(function Page(props: CommonComponent) {
   const orderId = router.params
     .orderId as BusinessAPI.PurchaseOrderVO["orderId"];
 
+  // 费用项目列表
+  const [costItemVOList, setCostItemVOList] = useState<
+    BusinessAPI.CostItemVO[]
+  >([]);
+
+  // 获取费用项目列表
+  useEffect(() => {
+    const fetchCostItems = async () => {
+      try {
+        const { data } = await business.costItem.listCostItem({
+          costItemListQry: {
+            status: true,
+          },
+        });
+        setCostItemVOList(data.data || []);
+      } catch (error) {
+        console.error("获取费用项目列表失败:", error);
+      }
+    };
+
+    fetchCostItems();
+  }, []);
+
   const [purchaseOrderVO, setPurchaseOrderVO] =
     useState<BusinessAPI.PurchaseOrderVO>();
 
@@ -436,6 +459,7 @@ export default hocAuth(function Page(props: CommonComponent) {
                     dealerVO={dealerVO}
                     purchaseOrderVO={purchaseOrderVO}
                     onChange={setPurchaseOrderVO}
+                    costItemVOList={costItemVOList}
                   />
                 </View>
               </>

packages/app-client/src/services/business/typings.d.ts

@@ -2576,7 +2576,7 @@ declare namespace BusinessAPI {
     /** 销售单价(元/个) */
     boxSalePrice?: number;
     /** 箱子类型:1_本次使用；2_额外运输；3_已使用额外运输；4_车上剩余； */
-    boxType: "USED" | "EXTRA" | "EXTRA_USED" | "REMAIN" | "OWN";
+    boxType: "USED" | "EXTRA" | "EXTRA_USED" | "REMAIN" | "OWN" | "EMPTY";
   };
 
   type OrderRebate = {
@@ -3362,6 +3362,8 @@ declare namespace BusinessAPI {
     orderSupplierList: OrderSupplier[];
     /** 采购订单费用信息 */
     orderCostList: OrderCost[];
+    /** 采购订单空箱费用 */
+    orderPackageList: OrderPackage[];
   };
 
   type PurchaseOrderDestroyCmd = {
@@ -3467,6 +3469,8 @@ declare namespace BusinessAPI {
     active?: number;
     /** 采购订单费用信息 */
     orderCostList: OrderCost[];
+    /** 采购订单空箱费用 */
+    orderPackageList: OrderPackage[];
   };
 
   type PurchaseOrderSubmitReviewCmd = {
@@ -3552,6 +3556,8 @@ declare namespace BusinessAPI {
     orderSupplierList: OrderSupplier[];
     /** 采购订单费用信息 */
     orderCostList: OrderCost[];
+    /** 采购订单空箱费用 */
+    orderPackageList: OrderPackage[];
   };
 
   type PurchaseOrderWithdrawReviewCmd = {

packages/app-client/src/types/typings.ts

@@ -36,7 +36,7 @@ export interface BoxBrand {
   boxBrandName: string;
   boxBrandImage: string;
   boxBrandType: "OUR_BOX" | "FARMER_BOX" | "THIRD_PARTY_BOX" | "GIFT_BOX";
-  boxType: "USED" | "EXTRA" | "EXTRA_USED" | "REMAIN" | "OWN" | "DEFAULT";
+  boxType: "USED" | "EXTRA" | "EXTRA_USED" | "REMAIN" | "OWN" | "EMPTY";
   boxSpecList: BoxSpec[];
 }
 

packages/app-client/src/utils/PurchaseOrderCalculator.ts

@@ -258,24 +258,23 @@ export class PurchaseOrderCalculator {
    * 分成后净利润(CXZY)
    */
   getNetProfit(): number {
-    if (this.purchaseOrderVO.orderDealer.profitSharing) {
+    if (this.purchaseOrderVO.orderDealer?.profitSharing) {
-      return this.purchaseOrderVO.orderDealer.profitSharing;
+      return this.purchaseOrderVO.orderDealer?.profitSharing;
     }
 
     return this.getDefaultNetProfit();
   }
 
-
   /**
    * 默认分成后净利润(CXZY)
    */
   getDefaultNetProfit(): number {
-    if (!this.purchaseOrderVO.orderDealer.enableShare) {
+    if (!this.purchaseOrderVO.orderDealer?.enableShare) {
       return 0;
     }
 
     return new Decimal(this.getMelonNetProfit())
-      .mul(new Decimal(this.purchaseOrderVO.orderDealer.shareRatio || 0))
+      .mul(new Decimal(this.purchaseOrderVO.orderDealer?.shareRatio || 0))
       .div(100)
       .toNumber();
   }
@@ -322,7 +321,7 @@ export class PurchaseOrderCalculator {
    * 成本差异(调诚信志远分成）
    */
   getCostDifference(): number {
-    return this.purchaseOrderVO.orderDealer.costDifference || 0;
+    return this.purchaseOrderVO.orderDealer?.costDifference || 0;
   }
 
   /**
@@ -336,14 +335,14 @@ export class PurchaseOrderCalculator {
    * 计提税金
    */
   getTaxProvision(): number {
-    return this.purchaseOrderVO.orderDealer.taxProvision || 0;
+    return this.purchaseOrderVO.orderDealer?.taxProvision || 0;
   }
 
   /**
    * 税费补贴（公司返利）
    */
   getTaxSubsidy(): number {
-    return this.purchaseOrderVO.orderDealer.taxSubsidy || 0;
+    return this.purchaseOrderVO.orderDealer?.taxSubsidy || 0;
   }
 
   /**
@@ -385,11 +384,19 @@ export class PurchaseOrderCalculator {
    * 计算市场报价（销售金额 + 包装费）
    */
   getTotalAmount(): number {
-    return new Decimal(this.getSalesAmount())
+    const decimal = new Decimal(this.getSalesAmount());
-      .add(this.getTotalPackagingCost())
+
+    const includePackingFlag =
+      this.purchaseOrderVO.orderDealer?.includePackingFlag;
+    if (includePackingFlag) {
+      return decimal
+        .plus(this.getTotalPackagingCost())
         .toNumber();
     }
 
+    return decimal.toNumber();
+  }
+
   /**
    * 获取商标费
    */

packages/app-client/src/utils/SupplierWeightCalculator.ts

@@ -34,7 +34,7 @@ export class SupplierWeightCalculator {
     }
 
     // 使用第一个瓜农的空磅重量作为初始空磅重量
-    const initialEmptyWeight = this.suppliers[0].emptyWeight;
+    const initialEmptyWeight = this.suppliers[0].emptyWeight || 0;
     let previousTotalWeight = initialEmptyWeight; // 上一个农户的总磅重量(kg)
 
     for (let i = 0; i < this.suppliers.length; i++) {
@@ -46,7 +46,7 @@ export class SupplierWeightCalculator {
       if (isFirstSupplier) {
         // 第一个农户的空磅重量已经是正确的
       } else {
-        supplier.emptyWeight = this.suppliers[i - 1].totalWeight;
+        supplier.emptyWeight = this.suppliers[i - 1].totalWeight || 0;
       }
 
       // 计算本次使用纸箱的总重量（斤）
@@ -69,19 +69,19 @@ export class SupplierWeightCalculator {
 
       if (!supplier.isPaper) {
         // 如果不是纸箱包装，直接使用原始重量（kg转斤）
-        supplier.grossWeight = new Decimal(supplier.totalWeight)
+        supplier.grossWeight = new Decimal(supplier.totalWeight || 0)
-          .sub(supplier.emptyWeight)
+          .sub(supplier.emptyWeight || 0)
           .mul(2)
           .toNumber();
 
-        supplier.netWeight = new Decimal(supplier.grossWeight)
+        supplier.netWeight = new Decimal(supplier.grossWeight || 0)
           .sub(usedBoxesWeight)
           .sub(extraUsedBoxesWeight)
           .toNumber();
 
         previousTotalWeight = supplier.totalWeight;
-        supplier.invoiceAmount = new Decimal(supplier.netWeight)
+        supplier.invoiceAmount = new Decimal(supplier.netWeight || 0)
-          .mul(supplier.purchasePrice)
+          .mul(supplier.purchasePrice || 0)
           .toNumber();
         continue;
       }
@@ -101,58 +101,58 @@ export class SupplierWeightCalculator {
       if (isFirstSupplier && isLastSupplier) {
         // 既是第一个也是最后一个瓜农（单个瓜农情况）- 优先使用最后一个瓜农算法
         // 净重 = (总磅 - 空磅) * 2 + 剩余空箱子重量 - 已使用额外纸箱重量
-        supplier.netWeight = new Decimal(supplier.totalWeight)
+        supplier.netWeight = new Decimal(supplier.totalWeight || 0)
           .sub(initialEmptyWeight)
           .mul(2)
           .add(remainingBoxesWeight)
           .sub(extraUsedBoxesWeight)
           .toNumber();
         // 毛重 = 净重 + 本次使用纸箱重量
-        supplier.grossWeight = new Decimal(supplier.netWeight)
+        supplier.grossWeight = new Decimal(supplier.netWeight || 0)
           .add(usedBoxesWeight)
           .toNumber();
       } else if (isLastSupplier) {
         // 最后一个农户（根据isLast标识判断）
         // 净重 = (总磅 - 前一个总磅) * 2 + 剩余空箱子重量 - 额外纸箱重量
-        supplier.netWeight = new Decimal(supplier.totalWeight)
+        supplier.netWeight = new Decimal(supplier.totalWeight || 0)
           .sub(previousTotalWeight)
           .mul(2)
           .add(remainingBoxesWeight)
           .sub(extraBoxesWeight)
           .toNumber();
         // 毛重 = 净重 + 本次使用纸箱重量
-        supplier.grossWeight = new Decimal(supplier.netWeight)
+        supplier.grossWeight = new Decimal(supplier.netWeight || 0)
           .add(usedBoxesWeight)
           .toNumber();
       } else if (isFirstSupplier) {
         // 第一个农户（但不是最后一个）
         // 净重 = (总磅 - 空磅) * 2 - 额外纸箱重量
-        supplier.netWeight = new Decimal(supplier.totalWeight)
+        supplier.netWeight = new Decimal(supplier.totalWeight || 0)
           .sub(initialEmptyWeight)
           .mul(2)
           .sub(extraBoxesWeight)
           .toNumber();
         // 毛重 = 净重 + 本次使用纸箱重量
-        supplier.grossWeight = new Decimal(supplier.netWeight)
+        supplier.grossWeight = new Decimal(supplier.netWeight || 0)
           .add(usedBoxesWeight)
           .toNumber();
       } else {
         // 中间农户
         // 净重 = (总磅 - 前一个总磅) * 2 - 额外纸箱重量
-        supplier.netWeight = new Decimal(supplier.totalWeight)
+        supplier.netWeight = new Decimal(supplier.totalWeight || 0)
           .sub(previousTotalWeight)
           .mul(2)
           .sub(extraBoxesWeight)
           .toNumber();
         // 毛重 = 净重 + 本次使用纸箱重量
-        supplier.grossWeight = new Decimal(supplier.netWeight)
+        supplier.grossWeight = new Decimal(supplier.netWeight || 0)
           .add(usedBoxesWeight)
           .toNumber();
       }
 
-      previousTotalWeight = supplier.totalWeight;
+      previousTotalWeight = supplier.totalWeight || 0;
-      supplier.invoiceAmount = new Decimal(supplier.netWeight)
+      supplier.invoiceAmount = new Decimal(supplier.netWeight || 0)
-        .mul(supplier.purchasePrice)
+        .mul(supplier.purchasePrice || 0)
         .toNumber();
     }