diff --git a/packages/app-client/src/components/dealer/DealerPicker.tsx b/packages/app-client/src/components/dealer/DealerPicker.tsx
index 3c80349..19fa398 100644
--- a/packages/app-client/src/components/dealer/DealerPicker.tsx
+++ b/packages/app-client/src/components/dealer/DealerPicker.tsx
@@ -158,6 +158,7 @@ export default function DealerPicker(props: IDealerPickerProps) {
className={`flex h-10 w-full items-center rounded-md border-4 border-gray-300`}
>
((props, ref) => {
className={`flex h-10 w-full items-center rounded-md ${formErrors.watermelonGrade ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
>
{
@@ -159,6 +160,7 @@ const Step1Form = forwardRef((props, ref) => {
className={`flex h-10 w-full items-center rounded-md ${formErrors.shippingAddress ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
>
{
@@ -351,14 +353,15 @@ const Step1Form = forwardRef((props, ref) => {
key={orderShipItem.orderShipItemId}
className={"flex flex-row gap-2.5"}
>
-
+
单价:{orderShipItem.unitPrice} 元/斤
{
diff --git a/packages/app-client/src/components/expenses/ExpenseCostCreate.tsx b/packages/app-client/src/components/expenses/ExpenseCostCreate.tsx
index 9030b03..51b8aeb 100644
--- a/packages/app-client/src/components/expenses/ExpenseCostCreate.tsx
+++ b/packages/app-client/src/components/expenses/ExpenseCostCreate.tsx
@@ -186,6 +186,7 @@ export default function ExpenseCostCreate(props: IExpenseCostCreateProps) {
className={`border-neutral-base flex flex-row items-center rounded-md ${formErrors.expenseAmount ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
>
((props, ref) => {
((props, ref) => {
((props, ref) => {
((props, ref) => {
((props, ref) => {
(
className={`flex h-12 w-full shrink items-center border-4 ${countError[orderCostId] && selected ? "border-red-500" : "border-gray-200"} bg-white`}
>
(
className={`flex h-12 w-full shrink items-center border-4 border-gray-200`}
>
(
className={`flex h-12 w-full shrink items-center border-4 ${countError[orderCostItemId] && selected ? "border-red-500" : "border-gray-200"} bg-white`}
>
(
className={`flex h-12 items-center rounded-md ${foremanError ? "border-2 border-red-500 bg-red-100" : "border-2 border-gray-300 bg-white"}`}
>
(
className={`flex h-10 w-full items-center rounded-md ${plateError ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
>
(
className={`flex h-10 w-full items-center rounded-md ${driverError ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
>
(
className={`flex h-10 w-full items-center rounded-md ${phoneError ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
>
(
className={`flex h-10 w-full items-center rounded-md ${originError ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
>
(
className={`flex h-10 w-full items-center rounded-md ${destinationError ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
>
(
className={`flex h-10 w-full items-center rounded-md ${priceError ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
>
(
className={`flex h-10 w-full items-center rounded-md ${strawCurtainPriceError ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
>
(
>
(
>
(
className="mx-2"
/>
(
className="mx-2"
/>
(
>
(
className={`flex h-10 w-full items-center rounded-md ${selectedProduct === "其他(请注明)" && customProduct ? "border-primary border-4" : "border-4 border-gray-300"}`}
>
(
className={`flex h-10 w-full items-center rounded-md ${priceError[supplierVO.orderSupplierId] ? "border-4 border-red-500" : "border-4 border-yellow-300"}`}
>
(
className={`flex h-10 w-full items-center rounded-md ${grossWeightError[supplierVO.orderSupplierId] ? "border-4 border-red-500" : "border-4 border-blue-300"}`}
>
(
>
(
>
(
>
(
className="mx-2"
/>
(
>
(
className={`flex h-10 w-full items-center rounded-md ${selectedProduct === "其他(请注明)" && customProduct ? "border-primary border-4" : "border-4 border-gray-300"}`}
>
(
className={`flex h-10 w-full items-center rounded-md ${depositError[supplierVO.orderSupplierId] ? "border-4 border-red-500" : "border-4 border-gray-300"}`}
>
(
className={`flex h-10 w-full items-center rounded-md ${priceError[supplierVO.orderSupplierId] ? "border-4 border-red-500" : "border-4 border-yellow-300"}`}
>
(
className={`flex h-10 w-full items-center rounded-md ${emptyWeightError[supplierVO.orderSupplierId] ? "border-4 border-red-500" : "border-4 border-blue-300"}`}
>
(
className={`flex h-10 w-full items-center rounded-md ${totalWeightError[supplierVO.orderSupplierId] ? "border-4 border-red-500" : "border-4 border-green-300"}`}
>
)}
+ {supplier.type === "STALL" && (
+
+ 采购报价
+
+ {supplier.pricingMethod === "BY_GROSS_WEIGHT"
+ ? "毛重"
+ : "净重"}
+
+
+ )}
+
+ 采购成本
+
+ {supplier.invoiceAmount} 元
+
+
采购单价
diff --git a/packages/app-client/src/components/purchase/section/PurchaseCostInfoSection.tsx b/packages/app-client/src/components/purchase/section/PurchaseCostInfoSection.tsx
index bed2165..b866994 100644
--- a/packages/app-client/src/components/purchase/section/PurchaseCostInfoSection.tsx
+++ b/packages/app-client/src/components/purchase/section/PurchaseCostInfoSection.tsx
@@ -351,6 +351,7 @@ export default function PurchaseCostInfoSection(props: {
pkg.boxType === boxType)
+ ? packages.filter((pkg) => pkg.boxType === boxType)
: packages;
return filteredPackages.reduce((total, pkg) => {
const weight = DecimalUtils.multiply(
pkg.boxCount || 0,
- pkg.boxProductWeight || 0
+ pkg.boxProductWeight || 0,
);
return DecimalUtils.add(total, weight);
}, 0);
@@ -186,7 +220,7 @@ export class StallWeightCalculator {
* 获取指定供应商的净重
*/
getSupplierNetWeight(supplierId: string | number): number {
- const supplier = this.suppliers.find(s => s.supplierId === supplierId);
+ const supplier = this.suppliers.find((s) => s.supplierId === supplierId);
return supplier?.netWeight || 0;
}
@@ -194,7 +228,7 @@ export class StallWeightCalculator {
* 获取指定供应商的毛重
*/
getSupplierGrossWeight(supplierId: string | number): number {
- const supplier = this.suppliers.find(s => s.supplierId === supplierId);
+ const supplier = this.suppliers.find((s) => s.supplierId === supplierId);
return supplier?.grossWeight || 0;
}
@@ -245,7 +279,7 @@ export class StallWeightCalculator {
return {
isValid: errors.length === 0,
- errors
+ errors,
};
}
}