diff --git a/packages/app-client/src/app.config.ts b/packages/app-client/src/app.config.ts index a1f3479..a2d34d8 100644 --- a/packages/app-client/src/app.config.ts +++ b/packages/app-client/src/app.config.ts @@ -14,36 +14,31 @@ config = { root: "pages/public", pages: ["login/index", "camera/index", "camera/ocr", "agreement/index"], }, - // 采购单 + // 采购单（市场/产地） { root: "pages/purchase", pages: [ - // 全部采购 - "all", - // 创建采购单 - "create", - // 预览采购单 - "preview", - // 采购单草稿箱 - "drafts", - // 采购单提审结果页面 - "result", - ], - }, - // 调货单 - { - root: "pages/transfer", - pages: [ - // 全部调货 - "all", - // 创建调货单 - "create", - // 预览调货单 - "preview", - // 调货单草稿箱 - "drafts", - // 调货单提审结果页面 - "result", + // 全部产地采购 + "made/all", + // 创建产地采购单 + "made/create", + // 预览产地采购单 + "made/preview", + // 产地采购单草稿箱 + "made/drafts", + // 产地采购单提审结果页面 + "made/result", + + // 全部市场采购单 + "market/all", + // 创建市场采购单 + "market/create", + // 预览市场采购单 + "market/preview", + // 市场采购单草稿箱 + "market/drafts", + // 市场采购单提审结果页面 + "market/result", ], }, // 审核 diff --git a/packages/app-client/src/components/purchase/PurchaseOrderItem.tsx b/packages/app-client/src/components/purchase/PurchaseOrderItem.tsx index 49bb85c..1444484 100644 --- a/packages/app-client/src/components/purchase/PurchaseOrderItem.tsx +++ b/packages/app-client/src/components/purchase/PurchaseOrderItem.tsx @@ -6,6 +6,7 @@ import purchaseOrder from "@/constant/purchaseOrder"; import dayjs from "dayjs"; import { Button, Dialog, Toast } from "@nutui/nutui-react-taro"; import { business } from "@/services"; +import { purchase } from "@/constant"; interface IPurchaseOrderItemProps { purchaseOrderVO: BusinessAPI.PurchaseOrderVO; @@ -67,9 +68,9 @@ export default function PurchaseOrderItem(props: IPurchaseOrderItemProps) { { - if (purchaseOrderVO.active === 7) { + if (purchase.isPreview(purchaseOrderVO)) { Taro.navigateTo({ - url: buildUrl("/pages/purchase/preview", { + url: buildUrl(purchase.path[purchaseOrderVO.type].preview, { orderId: purchaseOrderVO.orderId, }), }); @@ -138,7 +139,9 @@ export default function PurchaseOrderItem(props: IPurchaseOrderItemProps) { - + {purchaseOrderVO.orderSupplierList .map((item) => item.name) @@ -182,7 +185,7 @@ export default function PurchaseOrderItem(props: IPurchaseOrderItemProps) { size={"small"} onClick={(e) => { Taro.navigateTo({ - url: buildUrl("/pages/purchase/create", { + url: buildUrl(purchase.path[purchaseOrderVO.type].create, { orderId: purchaseOrderVO.orderId, }), }); @@ -191,15 +194,18 @@ export default function PurchaseOrderItem(props: IPurchaseOrderItemProps) { > 编辑 - {purchaseOrderVO.active === 7 && ( + {purchase.isPreview(purchaseOrderVO) && ( - {/* 联系司机 */} - {purchaseOrderVO.orderVehicle?.phone && ( - - )} - - {purchaseOrderVO.active === 7 && ( - - )} - - )} - {purchaseOrderVO.state === "WAITING_AUDIT" && ( - <> - { - actionRef.current?.reload(); - }} - /> - - )} - {purchaseOrderVO.state === "REJECTED" && ( - <> - - - )} - - - - ); -} diff --git a/packages/app-client/src/components/purchase/button/PurchaseOrderSubmitReview.tsx b/packages/app-client/src/components/purchase/button/PurchaseOrderSubmitReview.tsx index 7cd80c7..8b21ab9 100644 --- a/packages/app-client/src/components/purchase/button/PurchaseOrderSubmitReview.tsx +++ b/packages/app-client/src/components/purchase/button/PurchaseOrderSubmitReview.tsx @@ -2,6 +2,7 @@ import { Button, ButtonSize, Dialog, Toast } from "@nutui/nutui-react-taro"; import { business } from "@/services"; import Taro from "@tarojs/taro"; import { buildUrl } from "@/utils"; +import { purchase } from "@/constant"; interface IPurchaseOrderSubmitReviewProps { purchaseOrderVO: BusinessAPI.PurchaseOrderVO; @@ -83,12 +84,12 @@ export default function PurchaseOrderSubmitReview( ]; Dialog.open("dialog", { title: "提交审核提醒", - content: `这车货目前还在拼车状态。一旦确认车辆已满载，就需要在瓜农信息那里，把“${lastSupplier.name}”的这车货标记为“不需要拼车”。`, + content: `这车货目前还在拼车状态。一旦确认车辆已满载，就需要在${purchase.supplierSlug[purchaseOrderVO.type]}信息那里，把“${lastSupplier.name}”的这车货标记为“不需要拼车”。`, confirmText: "不需要拼车", cancelText: "去继续拼车", onConfirm: async () => { Taro.redirectTo({ - url: buildUrl("/pages/purchase/create", { + url: buildUrl(purchase.path[purchaseOrderVO.type].create, { orderId: purchaseOrderVO.orderId, orderSupplierId: lastSupplier.orderSupplierId, step: "2", @@ -98,7 +99,7 @@ export default function PurchaseOrderSubmitReview( }, onCancel: () => { Taro.redirectTo({ - url: buildUrl("/pages/purchase/create", { + url: buildUrl(purchase.path[purchaseOrderVO.type].create, { orderId: purchaseOrderVO.orderId, step: "6", }), @@ -110,36 +111,37 @@ export default function PurchaseOrderSubmitReview( return; } - // 检查是否存在合同未上传的瓜农 - const hasNoUpdateContractSupplier = - purchaseOrderVO.orderSupplierList?.find( - (supplier) => !supplier.contractUpload, - ); + // 产地采购单需要判断瓜农是否上传合同 + if (purchaseOrderVO.type === "PRODUCTION_PURCHASE") { + // 检查是否存在合同未上传的瓜农 + const hasNoUpdateContractSupplier = + purchaseOrderVO.orderSupplierList?.find( + (supplier) => !supplier.contractUpload, + ); - console.log("hasNoUpdateContractSupplier", hasNoUpdateContractSupplier); - - if (hasNoUpdateContractSupplier) { - Dialog.open("dialog", { - title: "提交审核提醒", - content: `检测到瓜农“${hasNoUpdateContractSupplier.name}”未上传合同。请返回票证上传步骤上传合同？`, - confirmText: "去票证上传", - cancelText: "取消", - onConfirm: async () => { - Taro.redirectTo({ - url: buildUrl("/pages/purchase/create", { - orderId: purchaseOrderVO.orderId, - supplierId: hasNoUpdateContractSupplier.supplierId, - step: "5", - }), - }); - Dialog.close("dialog"); - }, - onCancel: () => { - Dialog.close("dialog"); - }, - }); - e.stopPropagation(); - return; + if (hasNoUpdateContractSupplier) { + Dialog.open("dialog", { + title: "提交审核提醒", + content: `检测到瓜农“${hasNoUpdateContractSupplier.name}”未上传合同。请返回票证上传步骤上传合同？`, + confirmText: "去票证上传", + cancelText: "取消", + onConfirm: async () => { + Taro.redirectTo({ + url: buildUrl(purchase.path[purchaseOrderVO.type].create, { + orderId: purchaseOrderVO.orderId, + supplierId: hasNoUpdateContractSupplier.supplierId, + step: "5", + }), + }); + Dialog.close("dialog"); + }, + onCancel: () => { + Dialog.close("dialog"); + }, + }); + e.stopPropagation(); + return; + } } Dialog.open("dialog", { diff --git a/packages/app-client/src/components/purchase/button/TransferOrderSubmitReview.tsx b/packages/app-client/src/components/purchase/button/TransferOrderSubmitReview.tsx deleted file mode 100644 index c9f45c9..0000000 --- a/packages/app-client/src/components/purchase/button/TransferOrderSubmitReview.tsx +++ /dev/null @@ -1,132 +0,0 @@ -import { Button, ButtonSize, Dialog, Toast } from "@nutui/nutui-react-taro"; -import { business } from "@/services"; -import Taro from "@tarojs/taro"; -import { buildUrl } from "@/utils"; - -interface ITransferOrderSubmitReviewProps { - purchaseOrderVO: BusinessAPI.PurchaseOrderVO; - size?: ButtonSize; - onFinish?: () => void; -} - -export default function TransferOrderSubmitReview( - props: ITransferOrderSubmitReviewProps, -) { - const { purchaseOrderVO, size = "normal", onFinish } = props; - - const onSubmit = async () => { - if (!purchaseOrderVO || !purchaseOrderVO.orderId) { - Toast.show("toast", { - icon: "warn", - title: "提示", - content: "提交失败", - }); - return; - } - - let success = false; - let errMessage = ""; - try { - // 更新成功后再提交审核 - const { data } = await business.purchaseOrder.submitReviewPurchaseOrder({ - orderId: purchaseOrderVO.orderId, - }); - - if (data.success) { - success = data.success; - } else { - errMessage = data?.errMessage || ""; - } - - if (success) { - Toast.show("toast", { - icon: "success", - title: "提示", - content: "提交成功", - }); - // 可以在这里添加跳转逻辑，例如返回列表页 - onFinish?.(); - } else { - Toast.show("toast", { - icon: "warn", - title: "提示", - content: "提交失败", - }); - console.error("提交调货订单失败:", errMessage); - } - } catch (error) { - Toast.show("toast", { - icon: "fail", - title: "提示", - content: "提交失败", - }); - console.error("提交调货订单失败:", error); - } - }; - - return ( - - ); -} diff --git a/packages/app-client/src/components/purchase/index.ts b/packages/app-client/src/components/purchase/index.ts index 3b29526..04a97b1 100644 --- a/packages/app-client/src/components/purchase/index.ts +++ b/packages/app-client/src/components/purchase/index.ts @@ -20,18 +20,17 @@ export type { OrderCostItemRef } from "./module/OrderCostItem"; export { default as OrderPackage } from "./module/OrderPackage"; export { default as SupplierList } from "./module/SupplierList"; export { default as StallList } from "./module/StallList"; -export { default as PurchasePreview } from "./module/PurchasePreview"; -export { default as TransferPreview } from "./module/TransferPreview"; -export { default as PurchaseOption } from "./module/PurchaseOption"; -export type { PurchaseOptionRef } from "./module/PurchaseOption"; -export { default as TransferOption } from "./module/TransferOption"; -export type { TransferOptionRef } from "./module/TransferOption"; +export { default as PurchasePreview } from "./module/MadePreview"; +export { default as MarketPreview } from "./module/MarketPreview"; +export { default as MadeOption } from "./module/MadeOption"; +export type { MadeOptionRef } from "./module/MadeOption"; +export { default as MarketOption } from "./module/MarketOption"; +export type { MarketOptionRef } from "./module/MarketOption"; export { default as PurchaseOrderRejectApprove } from "./button/PurchaseOrderRejectApprove"; export { default as PurchaseOrderRejectFinal } from "./button/PurchaseOrderRejectFinal"; export { default as PurchaseOrderSubmitReview } from "./button/PurchaseOrderSubmitReview"; export { default as PurchaseOrderWithdrawReview } from "./button/PurchaseOrderWithdrawReview"; -export { default as TransferOrderSubmitReview } from "./button/TransferOrderSubmitReview"; export { default as PurchaseOrderFinalApprove } from "./button/PurchaseOrderFinalApprove"; export { default as CompanyInfoSection } from "./section/CompanyInfoSection"; @@ -60,7 +59,6 @@ export type { Step1FormRef as PurchaseStep1FormRef } from "./document/Step1Form" export { default as PurchaseStep2Preview } from "./document/Step2Preview"; export { default as PurchaseStep3Success } from "./document/Step3Success"; -export { default as TransferOrderItem } from "./TransferOrderItem"; export { default as PurchaseOrderItem } from "./PurchaseOrderItem"; export { default as PurchaseOrderList } from "./PurchaseOrderList"; export { default as PurchaseOrderAuditList } from "./PurchaseOrderAuditList"; diff --git a/packages/app-client/src/components/purchase/module/MadeOption.tsx b/packages/app-client/src/components/purchase/module/MadeOption.tsx new file mode 100644 index 0000000..4d7b914 --- /dev/null +++ b/packages/app-client/src/components/purchase/module/MadeOption.tsx @@ -0,0 +1,502 @@ +import { View } from "@tarojs/components"; +import { purchase } from "@/constant"; +import { Button, Dialog, SafeArea, Toast } from "@nutui/nutui-react-taro"; +import React, { forwardRef, useImperativeHandle } from "react"; +import { globalStore } from "@/store/global-store"; +import Taro from "@tarojs/taro"; +import { buildUrl, generateShortId } from "@/utils"; +import { business } from "@/services"; + +// 定义ref暴露的方法接口 +export interface MadeOptionRef { + onAdd: () => void; +} + +interface IMadeOptionProps { + value: BusinessAPI.PurchaseOrderVO; + onChange: (purchaseOrderVO: BusinessAPI.PurchaseOrderVO) => void; + + vehicleRef: React.MutableRefObject; + supplierInfoRefs: React.MutableRefObject; + supplierWeighRefs: React.MutableRefObject; + supplierPackageRefs: React.MutableRefObject; + orderCostRef: React.MutableRefObject; + orderCostItemRef: React.MutableRefObject; +} + +export default forwardRef(function MadeOption( + props: IMadeOptionProps, + ref, +) { + const { + value, + onChange, + + vehicleRef, + supplierInfoRefs, + supplierWeighRefs, + supplierPackageRefs, + orderCostRef, + orderCostItemRef, + } = props; + + const { setLoading } = globalStore((state: any) => state); + const { orderSupplierList } = value; + + const active = Number(value.active); + + const setActive = (active: number) => { + onChange({ + ...value, + active, + }); + }; + + // 车辆信息和经销商信息的保存 + const saveVehicleAndDealerInfo = async () => { + if (!value) { + Toast.show("toast", { + icon: "warn", + title: "提示", + content: "保存失败", + }); + return false; + } + + try { + let tempOrderId = value.orderId; + if (tempOrderId) { + const { data } = await business.purchaseOrder.savePurchaseOrderStep1({ + orderId: tempOrderId, + active: active, + type: "PRODUCTION_PURCHASE", + orderVehicle: value.orderVehicle, + orderDealer: value.orderDealer, + }); + + if (data.success) { + return true; + } else { + Toast.show("toast", { + icon: "warn", + title: "提示", + content: data?.errMessage || "保存失败", + }); + return false; + } + } else { + const { data } = await business.purchaseOrder.savePurchaseOrderStep1({ + active: active, + type: "PRODUCTION_PURCHASE", + orderVehicle: value.orderVehicle, + orderDealer: value.orderDealer, + }); + + if (data.success) { + onChange({ + ...value, + orderId: data.data?.orderId!, + }); + return true; + } else { + Toast.show("toast", { + icon: "warn", + title: "提示", + content: data?.errMessage || "保存失败", + }); + return false; + } + } + } catch (error) { + Toast.show("toast", { + icon: "fail", + title: "提示", + content: "保存失败", + }); + console.error("保存车辆和经销商信息失败:", error); + return false; + } + }; + + // 供应商信息的保存（基础信息，称重信息，包材信息） + const saveSupplierInfo = async () => { + if (!value || !value.orderId) { + Toast.show("toast", { + icon: "warn", + title: "提示", + content: "保存失败", + }); + return false; + } + + try { + const { data } = await business.purchaseOrder.savePurchaseOrderStep2({ + orderId: value.orderId, + active: active, + type: "PRODUCTION_PURCHASE", + orderSupplierList: value.orderSupplierList, + }); + + if (data.success) { + return true; + } else { + Toast.show("toast", { + icon: "warn", + title: "提示", + content: data?.errMessage || "保存失败", + }); + return false; + } + } catch (error) { + Toast.show("toast", { + icon: "fail", + title: "提示", + content: "保存失败", + }); + console.error("保存供应商信息失败:", error); + return false; + } + }; + + // 人工和辅料等保存 + const saveCostInfo = async () => { + if (!value || !value.orderId) { + Toast.show("toast", { + icon: "warn", + title: "提示", + content: "保存失败", + }); + return false; + } + + const { data } = await business.purchaseOrder.savePurchaseOrderStep3({ + orderId: value.orderId, + active: Number(active + 1), + foreman: value.foreman, + type: "PRODUCTION_PURCHASE", + // 空箱 + orderPackageList: value.orderPackageList, + // 费用 + orderCostList: value.orderCostList.filter((item) => { + if (item.type === "PRODUCTION_TYPE") { + return item.selected; + } + + if (item.type === "ARTIFICIAL_TYPE" || item.type === "MATERIAL_TYPE") { + return ( + value.orderCostItemList.filter( + (orderCostItem) => + item.costItemIds?.includes(orderCostItem.costItemId!) && + orderCostItem.selected, + ).length > 0 + ); + } + + return false; + }), + orderCostItemList: value.orderCostItemList.filter( + (item) => item.selected, + ), + }); + + if (data.success) { + return true; + } else { + Toast.show("toast", { + icon: "warn", + title: "提示", + content: data?.errMessage || "保存失败", + }); + return false; + } + }; + + const onFinish = async () => { + // 只保存第六步的人工和辅料信息 + const costSuccess = await saveCostInfo(); + if (!costSuccess) { + Dialog.close("dialog"); + return; + } + + // 跳转到预览页面 + Taro.redirectTo({ + url: buildUrl("/pages/purchase/made/preview", { + orderId: value.orderId, + }), + }); + }; + + const onAdd = () => { + saveSupplierInfo(); + const orderSupplierList = value?.orderSupplierList; + // 获取当前选中的供应商 + const selectedIndex = orderSupplierList?.findIndex( + (supplier) => supplier.selected, + ); + if (active === 2 && !supplierInfoRefs.current[selectedIndex]?.validate()) { + return; + } + // 在第三步（称重信息）时进行校验 + else if ( + active === 3 && + !supplierWeighRefs.current[selectedIndex]?.validate() + ) { + return; + } // 在第四步（包装信息）时进行校验 + else if ( + active === 4 && + !supplierPackageRefs.current[selectedIndex]?.validate() + ) { + return; + } + + onChange({ + ...value, + active: 2, + orderSupplierList: [ + ...orderSupplierList.map((supplierVO: BusinessAPI.OrderSupplier) => { + supplierVO.selected = false; + return supplierVO; + }), + { + orderSupplierId: generateShortId(), + supplierId: "", + name: "瓜农" + (orderSupplierList.length + 1), + idCard: "", + bankCard: "", + phone: "", + selected: true, + isPaper: orderSupplierList[selectedIndex].isPaper, + orderPackageList: [], + productId: orderSupplierList[selectedIndex]?.productId, + productName: orderSupplierList[selectedIndex]?.productName, + costTemplate: orderSupplierList[selectedIndex]?.costTemplate, + } as any, + ], + }); + }; + + // 将校验方法暴露给父组件 + useImperativeHandle(ref, () => ({ + onAdd, + })); + + async function saveDraft() { + Dialog.open("dialog", { + title: "暂存确认", + content: "确定要暂存当前采购订单吗？", + confirmText: "确认暂存", + cancelText: "取消", + onConfirm: async () => { + // 按步骤调用保存接口进行暂存 + let success = true; + + // 保存第一步车辆和经销商信息 + if (active == 1) { + success = await saveVehicleAndDealerInfo(); + } + + // 保存第二到第五步的供应商信息 + if (success && active >= 2 && active <= 5) { + success = await saveSupplierInfo(); + } + + // 保存第六步的人工和辅料信息 + if (success && active >= 6 && active <= 7) { + success = await saveCostInfo(); + } + + Dialog.close("dialog"); + + if (success) { + Toast.show("toast", { + icon: "success", + title: "提示", + content: "当前采购订单已暂存成功", + }); + Taro.redirectTo({ + url: "/pages/purchase/made/drafts", + }); + } + }, + onCancel: () => { + Dialog.close("dialog"); + }, + }); + } + + if (!active) { + return; + } + + return ( + + + {active > 1 && active <= purchase.madeSteps.length - 1 && ( + + + + )} + + {active >= 1 && active <= purchase.madeSteps.length - 1 && ( + + + + )} + + {active < purchase.madeSteps.length - 1 && ( + + + + )} + {active == purchase.madeSteps.length - 1 && ( + <> + + + + + )} + + + + ); +}); diff --git a/packages/app-client/src/components/purchase/module/PurchasePreview.tsx b/packages/app-client/src/components/purchase/module/MadePreview.tsx similarity index 99% rename from packages/app-client/src/components/purchase/module/PurchasePreview.tsx rename to packages/app-client/src/components/purchase/module/MadePreview.tsx index c03558d..7225ad4 100644 --- a/packages/app-client/src/components/purchase/module/PurchasePreview.tsx +++ b/packages/app-client/src/components/purchase/module/MadePreview.tsx @@ -27,7 +27,7 @@ const groupBy = ( ); }; -export default function PurchasePreview(props: IPurchasePreviewProps) { +export default function MadePreview(props: IPurchasePreviewProps) { const { purchaseOrder } = props; const [orderSupplierList, setOrderSupplierList] = useState< BusinessAPI.OrderSupplier[] diff --git a/packages/app-client/src/components/purchase/module/TransferOption.tsx b/packages/app-client/src/components/purchase/module/MarketOption.tsx similarity index 93% rename from packages/app-client/src/components/purchase/module/TransferOption.tsx rename to packages/app-client/src/components/purchase/module/MarketOption.tsx index 080fe65..707dc55 100644 --- a/packages/app-client/src/components/purchase/module/TransferOption.tsx +++ b/packages/app-client/src/components/purchase/module/MarketOption.tsx @@ -5,32 +5,32 @@ import { globalStore } from "@/store/global-store"; import Taro from "@tarojs/taro"; import { buildUrl, generateShortId } from "@/utils"; import { business } from "@/services"; -import transfer from "@/constant/transfer"; +import purchase from "@/constant/purchase"; // 定义ref暴露的方法接口 -export interface TransferOptionRef { +export interface MarketOptionRef { onAdd: () => void; } -interface ITransferOptionProps { +interface IMarketOptionProps { value: BusinessAPI.PurchaseOrderVO; onChange: (purchaseOrderVO: BusinessAPI.PurchaseOrderVO) => void; vehicleRef: React.MutableRefObject; - melonStallRefs: React.MutableRefObject; - staffWeighRefs: React.MutableRefObject; + stallInfoRefs: React.MutableRefObject; + stallWeighRefs: React.MutableRefObject; stallPackageRefs: React.MutableRefObject; } -export default forwardRef( - function TransferOption(props: ITransferOptionProps, ref) { +export default forwardRef( + function MarketOption(props: IMarketOptionProps, ref) { const { value, onChange, vehicleRef, - melonStallRefs, - staffWeighRefs, + stallInfoRefs, + stallWeighRefs, stallPackageRefs, } = props; @@ -218,7 +218,7 @@ export default forwardRef( // 跳转到预览页面 Taro.redirectTo({ - url: buildUrl("/pages/transfer/preview", { + url: buildUrl("/pages/purchase/market/preview", { orderId: value.orderId, }), }); @@ -231,13 +231,13 @@ export default forwardRef( const selectedIndex = orderSupplierList?.findIndex( (supplier) => supplier.selected, ); - if (active === 2 && !melonStallRefs.current[selectedIndex]?.validate()) { + if (active === 2 && !stallInfoRefs.current[selectedIndex]?.validate()) { return; } // 在第三步（称重信息）时进行校验 else if ( active === 3 && - !staffWeighRefs.current[selectedIndex]?.validate() + !stallWeighRefs.current[selectedIndex]?.validate() ) { return; } // 在第四步（包装信息）时进行校验 @@ -313,7 +313,7 @@ export default forwardRef( content: "当前采购订单已暂存成功", }); Taro.redirectTo({ - url: "/pages/purchase/drafts", + url: "/pages/purchase/made/drafts", }); } }, @@ -330,7 +330,7 @@ export default forwardRef( return ( - {active > 1 && active <= transfer.steps.length - 1 && ( + {active > 1 && active <= purchase.marketSteps.length - 1 && ( )} - {active == transfer.steps.length - 1 && ( + {active == purchase.marketSteps.length - 1 && ( <> - - )} - - {active >= 1 && active <= purchase.steps.length - 1 && ( - - - - )} - - {active < purchase.steps.length - 1 && ( - - - - )} - {active == purchase.steps.length - 1 && ( - <> - - - - - )} - - - - ); - }, -); diff --git a/packages/app-client/src/components/purchase/module/StallInfo.tsx b/packages/app-client/src/components/purchase/module/StallInfo.tsx index 0dc5133..1700378 100644 --- a/packages/app-client/src/components/purchase/module/StallInfo.tsx +++ b/packages/app-client/src/components/purchase/module/StallInfo.tsx @@ -32,24 +32,13 @@ export default forwardRef( bankCard: "", type: "", selected: true, + isPaper: false, orderPackageList: [], packageUsage: [ { boxType: "USED", isUsed: 0, }, - { - boxType: "EXTRA_USED", - isUsed: 0, - }, - { - boxType: "EXTRA", - isUsed: 0, - }, - { - boxType: "REMAIN", - isUsed: 0, - }, ], } as any, ]); @@ -526,13 +515,16 @@ export default forwardRef( }`} onClick={() => { // 自家档口需要选择供应商 - if (supplierVO.type === "OTHER_STALL") { - setSupplierVO({ - ...supplierVO, - type: "STALL", - }); - setShowSupplierPicker(true); - } + setSupplierVO({ + ...supplierVO, + supplierId: "", + name: "", + payeeName: "", + bankCard: "", + wechatQr: undefined, + type: "STALL", + }); + setShowSupplierPicker(true); }} > ( checked={supplierVO.type === "STALL"} onChange={() => { // 自家档口需要选择供应商 - if (supplierVO.type === "OTHER_STALL") { - setSupplierVO({ - ...supplierVO, - type: "STALL", - }); - setShowSupplierPicker(true); - } + setSupplierVO({ + ...supplierVO, + supplierId: "", + name: "", + payeeName: "", + bankCard: "", + wechatQr: undefined, + type: "STALL", + }); + setShowSupplierPicker(true); }} /> @@ -567,7 +562,23 @@ export default forwardRef( }`} onClick={() => { // 其他家档口需要清空供应商ID - if (supplierVO.type === "STALL") { + setSupplierVO({ + ...supplierVO, + supplierId: "", + name: "", + payeeName: "", + bankCard: "", + wechatQr: undefined, + type: "OTHER_STALL", + }); + }} + > + { + // 其他家档口需要清空供应商ID setSupplierVO({ ...supplierVO, supplierId: "", @@ -577,26 +588,6 @@ export default forwardRef( wechatQr: undefined, type: "OTHER_STALL", }); - } - }} - > - { - // 其他家档口需要清空供应商ID - if (supplierVO.type === "STALL") { - setSupplierVO({ - ...supplierVO, - supplierId: "", - name: "", - payeeName: "", - bankCard: "", - wechatQr: undefined, - type: "OTHER_STALL", - }); - } }} /> @@ -661,7 +652,7 @@ export default forwardRef( {/* 根据档口类型显示不同的表单内容 */} - {supplierVO.type === "STALL" ? ( + {supplierVO.type === "STALL" && ( // 自家档口：显示档口选择器 <> @@ -749,7 +740,8 @@ export default forwardRef( )} - ) : ( + )} + {supplierVO.type === "OTHER_STALL" && ( // 其他家档口：显示完整的表单 <> diff --git a/packages/app-client/src/components/purchase/module/StallWeigh.tsx b/packages/app-client/src/components/purchase/module/StallWeigh.tsx index 0b21152..327cb1e 100644 --- a/packages/app-client/src/components/purchase/module/StallWeigh.tsx +++ b/packages/app-client/src/components/purchase/module/StallWeigh.tsx @@ -31,8 +31,6 @@ export default forwardRef( const { orderSupplierList } = value; const { setLoading } = globalStore((state: any) => state); - const isFirst = index === 0; - const setOrderSupplierList = ( orderSupplierList: BusinessAPI.OrderSupplier[], ) => { @@ -42,18 +40,6 @@ export default forwardRef( }); }; - const changeProduct = (productVO: BusinessAPI.ProductVO) => { - setOrderSupplierList([ - ...orderSupplierList.map((item: BusinessAPI.OrderSupplier) => { - item.productId = productVO.productId; - item.productName = productVO.name; - item.costIds = productVO.costIds; - item.costTemplate = productVO.costTemplate; - return item; - }), - ]); - }; - const setSupplierVO = (orderSupplierVO: BusinessAPI.OrderSupplier) => { setOrderSupplierList([ ...orderSupplierList.map((item: BusinessAPI.OrderSupplier) => { @@ -147,6 +133,10 @@ export default forwardRef( return false; } + setGrossWeightError((prev) => ({ + ...prev, + [supplierVO.orderSupplierId]: false, + })); return true; }; @@ -199,7 +189,7 @@ export default forwardRef( })); const isValid = - (isPurchasePriceValid && isProductIdValid) || isGrossWeightValid; + isPurchasePriceValid && isProductIdValid && isGrossWeightValid; if (!isValid) { Toast.show("toast", { @@ -314,14 +304,6 @@ export default forwardRef( ? customProduct : productObj.name, }); - - changeProduct({ - ...productObj, - name: - selectedProduct === "其他（请注明）" - ? customProduct - : productObj.name, - }); } setProductPopupVisible(false); @@ -338,72 +320,62 @@ export default forwardRef( - {isFirst && ( - <> - {productList.length > 0 && ( - - - - 装的西瓜品种是？ - - { - // 清除错误状态 - setProductIdError((prev) => ({ - ...prev, - [supplierVO.orderSupplierId]: false, - })); + {productList.length > 0 && ( + + + + 装的西瓜品种是？ + + { + // 清除错误状态 + setProductIdError((prev) => ({ + ...prev, + [supplierVO.orderSupplierId]: false, + })); - if (value === "other") { - // 点击"其他"时打开弹窗 - setProductPopupVisible(true); - } else { - // 根据用户选择设置西瓜品种 - const productId = value as string; - const productVO = productList.find( - (p) => p.productId === productId, - ); + if (value === "other") { + // 点击"其他"时打开弹窗 + setProductPopupVisible(true); + } else { + // 根据用户选择设置西瓜品种 + const productId = value as string; + const productVO = productList.find( + (p) => p.productId === productId, + ); - console.log("productVO", productVO); - - if (productVO) { - setSupplierVO({ - ...supplierVO, - productId: productVO?.productId, - productName: productVO?.name, - loadingMode: - productVO?.name !== "硒砂瓜" - ? "BOX_WITH_TAPE" - : undefined, - }); - - changeProduct(productVO); - } - } - }} - > - - {supplierVO.productName || productList?.[0].name} - - 其他 - - - - {isProductIdError[supplierVO.orderSupplierId] && ( - - 请选择西瓜品种 - - )} + if (productVO) { + setSupplierVO({ + ...supplierVO, + productId: productVO?.productId, + productName: productVO?.name, + loadingMode: + productVO?.name !== "硒砂瓜" + ? "BOX_WITH_TAPE" + : undefined, + }); + } + } + }} + > + + {supplierVO.productName || productList?.[0].name} + + 其他 + - )} - + {isProductIdError[supplierVO.orderSupplierId] && ( + + 请选择西瓜品种 + + )} + + )} {/*/!* 瓜农包纸箱吗，包纸箱按照毛重报价，不包按照净重报价 *!/*/} diff --git a/packages/app-client/src/constant/app.ts b/packages/app-client/src/constant/app.ts index 7f63fe7..d30459c 100644 --- a/packages/app-client/src/constant/app.ts +++ b/packages/app-client/src/constant/app.ts @@ -1,2 +1,2 @@ // App 相关常量 -export const APP_VERSION = "v0.0.43"; +export const APP_VERSION = "v0.0.50"; diff --git a/packages/app-client/src/constant/purchase.ts b/packages/app-client/src/constant/purchase.ts index 78bb593..9b64032 100644 --- a/packages/app-client/src/constant/purchase.ts +++ b/packages/app-client/src/constant/purchase.ts @@ -1,4 +1,4 @@ -const steps = [ +const madeSteps = [ { value: 1, title: "步骤 1/{}: 车辆信息", @@ -29,4 +29,55 @@ const steps = [ }, ]; -export default { steps }; +const marketSteps = [ + { + value: 1, + title: "步骤 1/{}: 车辆信息", + }, + { + value: 2, + title: "步骤 2/{}: 档口信息", + }, + { + value: 3, + title: "步骤 3/{}: 重量信息", + }, + { + value: 4, + title: "步骤 4/{}: 包装信息", + }, + { + value: 5, + title: "信息确认", + }, +]; + +const path = { + PRODUCTION_PURCHASE: { + create: "/pages/purchase/made/create", + preview: "/pages/purchase/made/preview", + }, + MARKET_PURCHASE: { + create: "/pages/purchase/market/create", + preview: "/pages/purchase/market/preview", + }, +}; + +const supplierSlug = { + PRODUCTION_PURCHASE: "瓜农", + MARKET_PURCHASE: "档口", +}; + +const isPreview = (purchaseVO: BusinessAPI.PurchaseOrderVO) => { + if (purchaseVO.type === "PRODUCTION_PURCHASE") { + return purchaseVO.active === madeSteps.length; + } + + if (purchaseVO.type === "MARKET_PURCHASE") { + return purchaseVO.active === marketSteps.length; + } + + return false; +}; + +export default { madeSteps, marketSteps, path, supplierSlug, isPreview }; diff --git a/packages/app-client/src/constant/transfer.ts b/packages/app-client/src/constant/transfer.ts deleted file mode 100644 index b38bd22..0000000 --- a/packages/app-client/src/constant/transfer.ts +++ /dev/null @@ -1,24 +0,0 @@ -const steps = [ - { - value: 1, - title: "步骤 1/{}: 车辆信息", - }, - { - value: 2, - title: "步骤 2/{}: 档口信息", - }, - { - value: 3, - title: "步骤 3/{}: 重量信息", - }, - { - value: 4, - title: "步骤 4/{}: 包装信息", - }, - { - value: 5, - title: "信息确认", - }, -]; - -export default { steps }; diff --git a/packages/app-client/src/constant/workbench.ts b/packages/app-client/src/constant/workbench.ts index 839607a..256514c 100644 --- a/packages/app-client/src/constant/workbench.ts +++ b/packages/app-client/src/constant/workbench.ts @@ -118,7 +118,7 @@ const quickActionMap = { icon: "folder", iconColor: "var(--color-blue-600)", bgColorClass: "bg-blue-100", - path: "/pages/purchase/drafts", + path: "/pages/purchase/made/drafts", }, { id: "history", @@ -126,7 +126,7 @@ const quickActionMap = { icon: "clipboard-list", iconColor: "var(--color-green-600)", bgColorClass: "bg-green-100", - path: "/pages/purchase/all", + path: "/pages/purchase/made/all", }, { id: "invoiceUpload", @@ -148,19 +148,19 @@ const quickActionMap = { "market-buyer": [ { id: "myDraft", - title: "待提交的调货单", + title: "待提交的采购单", icon: "folder", iconColor: "var(--color-blue-600)", bgColorClass: "bg-blue-100", - path: "/pages/transfer/drafts", + path: "/pages/purchase/market/drafts", }, { id: "history", - title: "我的调货单", + title: "我的采购单", icon: "clipboard-list", iconColor: "var(--color-green-600)", bgColorClass: "bg-green-100", - path: "/pages/transfer/all", + path: "/pages/purchase/market/all", }, { id: "supplierManage", @@ -186,7 +186,7 @@ const quickActionMap = { icon: "clipboard-list", iconColor: "var(--color-green-600)", bgColorClass: "bg-green-100", - path: "/pages/purchase/all", + path: "/pages/purchase/made/all", }, { id: "shipOrder", @@ -241,7 +241,7 @@ const quickActionMap = { icon: "clipboard-list", iconColor: "var(--color-green-600)", bgColorClass: "bg-green-100", - path: "/pages/purchase/all", + path: "/pages/purchase/made/all", }, { id: "shipOrder", diff --git a/packages/app-client/src/pages/main/index/index.tsx b/packages/app-client/src/pages/main/index/index.tsx index b15ec31..4da0af6 100644 --- a/packages/app-client/src/pages/main/index/index.tsx +++ b/packages/app-client/src/pages/main/index/index.tsx @@ -64,7 +64,7 @@ export default hocAuth(function Page(props: CommonComponent) { className="bg-primary flex w-full flex-col items-center justify-center space-y-2 rounded-xl py-2.5 text-white" onClick={() => { Taro.navigateTo({ - url: buildUrl("/pages/purchase/create"), + url: buildUrl("/pages/purchase/made/create"), }); }} > @@ -85,7 +85,7 @@ export default hocAuth(function Page(props: CommonComponent) { className="bg-primary flex w-full flex-col items-center justify-center space-y-2 rounded-xl py-2.5 text-white" onClick={() => { Taro.navigateTo({ - url: buildUrl("/pages/transfer/create"), + url: buildUrl("/pages/purchase/market/create"), }); }} > @@ -96,7 +96,7 @@ export default hocAuth(function Page(props: CommonComponent) { > - 新建调货单 + 新建采购单 )} diff --git a/packages/app-client/src/pages/purchase/all.config.ts b/packages/app-client/src/pages/purchase/made/all.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/all.config.ts rename to packages/app-client/src/pages/purchase/made/all.config.ts diff --git a/packages/app-client/src/pages/purchase/all.tsx b/packages/app-client/src/pages/purchase/made/all.tsx similarity index 100% rename from packages/app-client/src/pages/purchase/all.tsx rename to packages/app-client/src/pages/purchase/made/all.tsx diff --git a/packages/app-client/src/pages/purchase/create.config.ts b/packages/app-client/src/pages/purchase/made/create.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/create.config.ts rename to packages/app-client/src/pages/purchase/made/create.config.ts diff --git a/packages/app-client/src/pages/purchase/create.tsx b/packages/app-client/src/pages/purchase/made/create.tsx similarity index 94% rename from packages/app-client/src/pages/purchase/create.tsx rename to packages/app-client/src/pages/purchase/made/create.tsx index d18196d..85aa65b 100644 --- a/packages/app-client/src/pages/purchase/create.tsx +++ b/packages/app-client/src/pages/purchase/made/create.tsx @@ -5,14 +5,14 @@ import { purchase } from "@/constant"; import { useEffect, useRef, useState } from "react"; import { Icon, + MadeOption, + MadeOptionRef, OrderCost, OrderCostItem, OrderCostItemRef, OrderCostRef, OrderVehicle, OrderVehicleRef, - PurchaseOption, - PurchaseOptionRef, SupplierInfo, SupplierInfoRef, SupplierList, @@ -84,10 +84,10 @@ export default hocAuth(function Page(props: CommonComponent) { const defaultSupplierId = router.params.supplierId as string; const defaultOrderSupplierId = router.params.orderSupplierId as string; - const orderOptionRef = useRef(null); + const orderOptionRef = useRef(null); const vehicleRef = useRef(null); // 创建MelonFarmer组件的ref数组 - const melonFarmerRefs = useRef([]); + const supplierInfoRefs = useRef([]); // 创建Weigh组件的ref数组 const supplierWeighRefs = useRef([]); // 创建OrderCost组件的ref @@ -123,7 +123,7 @@ export default hocAuth(function Page(props: CommonComponent) { ) { if (userRoleVO.slug === "origin-entry") { Taro.redirectTo({ - url: buildUrl("/pages/purchase/preview", { + url: buildUrl("/pages/purchase/made/preview", { orderId: purchaseOrder.orderId, }), }); @@ -174,7 +174,7 @@ export default hocAuth(function Page(props: CommonComponent) { active = defaultStep; } else { active = purchaseOrder.active || 1; - if (active < 1 || active > purchase.steps.length - 1) { + if (active < 1 || active > purchase.madeSteps.length - 1) { active = 1; } } @@ -184,8 +184,8 @@ export default hocAuth(function Page(props: CommonComponent) { setPurchaseOrder({ ...purchaseOrder, active: - active > purchase.steps.length - 1 - ? purchase.steps.length - 1 + active > purchase.madeSteps.length - 1 + ? purchase.madeSteps.length - 1 : active, orderSupplierList: orderSupplierList1, orderCostList: purchaseOrder.orderCostList?.map((item) => { @@ -222,7 +222,7 @@ export default hocAuth(function Page(props: CommonComponent) { }, [orderId]); useEffect(() => { - setStep(purchase.steps[purchaseOrder?.active! - 1]); + setStep(purchase.madeSteps[purchaseOrder?.active! - 1]); }, [purchaseOrder?.active]); const setOrderSupplierList = ( @@ -267,16 +267,16 @@ export default hocAuth(function Page(props: CommonComponent) { return ( <> - {step.value < purchase.steps.length && ( + {step.value < purchase.madeSteps.length && ( - {step.title.replace("{}", purchase.steps.length - 1)} + {step.title.replace("{}", purchase.madeSteps.length - 1)} )} @@ -287,7 +287,7 @@ export default hocAuth(function Page(props: CommonComponent) { onChange={(purchaseOrder: BusinessAPI.PurchaseOrderVO) => { setPurchaseOrder(purchaseOrder); }} - melonFarmerRefs={melonFarmerRefs} + melonFarmerRefs={supplierInfoRefs} weighRefs={supplierWeighRefs} orderPackageRefs={supplierPackageRefs} /> @@ -320,8 +320,8 @@ export default hocAuth(function Page(props: CommonComponent) { if (step.value === 2) { // 确保ref数组足够长 - while (melonFarmerRefs.current.length <= index) { - melonFarmerRefs.current.push({ + while (supplierInfoRefs.current.length <= index) { + supplierInfoRefs.current.push({ validate: () => true, // 默认验证方法 } as SupplierInfoRef); } @@ -345,7 +345,7 @@ export default hocAuth(function Page(props: CommonComponent) { }} ref={(ref) => { if (ref) { - melonFarmerRefs.current[index] = ref; + supplierInfoRefs.current[index] = ref; } }} /> @@ -503,7 +503,7 @@ export default hocAuth(function Page(props: CommonComponent) { {/* 按钮操作 */} - @@ -515,7 +515,7 @@ export default hocAuth(function Page(props: CommonComponent) { }) } vehicleRef={vehicleRef} - melonFarmerRefs={melonFarmerRefs} + supplierInfoRefs={supplierInfoRefs} supplierWeighRefs={supplierWeighRefs} supplierPackageRefs={supplierPackageRefs} orderCostRef={orderCostRef} diff --git a/packages/app-client/src/pages/purchase/drafts.config.ts b/packages/app-client/src/pages/purchase/made/drafts.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/drafts.config.ts rename to packages/app-client/src/pages/purchase/made/drafts.config.ts diff --git a/packages/app-client/src/pages/purchase/drafts.tsx b/packages/app-client/src/pages/purchase/made/drafts.tsx similarity index 100% rename from packages/app-client/src/pages/purchase/drafts.tsx rename to packages/app-client/src/pages/purchase/made/drafts.tsx diff --git a/packages/app-client/src/pages/purchase/preview.config.ts b/packages/app-client/src/pages/purchase/made/preview.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/preview.config.ts rename to packages/app-client/src/pages/purchase/made/preview.config.ts diff --git a/packages/app-client/src/pages/purchase/preview.tsx b/packages/app-client/src/pages/purchase/made/preview.tsx similarity index 93% rename from packages/app-client/src/pages/purchase/preview.tsx rename to packages/app-client/src/pages/purchase/made/preview.tsx index cb72cb6..7d13673 100644 --- a/packages/app-client/src/pages/purchase/preview.tsx +++ b/packages/app-client/src/pages/purchase/made/preview.tsx @@ -11,6 +11,7 @@ import { import { business } from "@/services"; import Taro from "@tarojs/taro"; import { buildUrl } from "@/utils"; +import { purchase } from "@/constant"; export default hocAuth(function Page(props: CommonComponent) { const { router } = props; @@ -65,9 +66,9 @@ export default hocAuth(function Page(props: CommonComponent) { className="flex-1 bg-gray-200 text-gray-700" onClick={() => { Taro.redirectTo({ - url: buildUrl("/pages/purchase/create", { + url: buildUrl("/pages/purchase/made/create", { orderId: purchaseOrder.orderId, - active: 6, + active: purchase.madeSteps.length - 1, }), }); }} @@ -81,7 +82,7 @@ export default hocAuth(function Page(props: CommonComponent) { size={"xlarge"} onFinish={() => { Taro.switchTab({ - url: buildUrl("/pages/purchase/result", { + url: buildUrl("/pages/purchase/made/result", { orderId: purchaseOrder.orderId, }), }); diff --git a/packages/app-client/src/pages/purchase/result.config.ts b/packages/app-client/src/pages/purchase/made/result.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/result.config.ts rename to packages/app-client/src/pages/purchase/made/result.config.ts diff --git a/packages/app-client/src/pages/purchase/result.tsx b/packages/app-client/src/pages/purchase/made/result.tsx similarity index 98% rename from packages/app-client/src/pages/purchase/result.tsx rename to packages/app-client/src/pages/purchase/made/result.tsx index 08c490b..4f15f2c 100644 --- a/packages/app-client/src/pages/purchase/result.tsx +++ b/packages/app-client/src/pages/purchase/made/result.tsx @@ -50,7 +50,7 @@ export default hocAuth(function Page(props: CommonComponent) { const viewPurchaseOrderDetail = () => { if (purchaseOrder?.orderId) { Taro.navigateTo({ - url: buildUrl("/pages/purchase/preview", { + url: buildUrl("/pages/purchase/made/preview", { orderId: purchaseOrder.orderId, }), }); diff --git a/packages/app-client/src/pages/transfer/all.config.ts b/packages/app-client/src/pages/purchase/market/all.config.ts similarity index 63% rename from packages/app-client/src/pages/transfer/all.config.ts rename to packages/app-client/src/pages/purchase/market/all.config.ts index 8c6b469..df947b1 100644 --- a/packages/app-client/src/pages/transfer/all.config.ts +++ b/packages/app-client/src/pages/purchase/market/all.config.ts @@ -1,4 +1,4 @@ export default definePageConfig({ - navigationBarTitleText: "全部调货单", + navigationBarTitleText: "全部采购单", navigationBarBackgroundColor: "#fff", }); diff --git a/packages/app-client/src/pages/transfer/all.tsx b/packages/app-client/src/pages/purchase/market/all.tsx similarity index 100% rename from packages/app-client/src/pages/transfer/all.tsx rename to packages/app-client/src/pages/purchase/market/all.tsx diff --git a/packages/app-client/src/pages/transfer/create.config.ts b/packages/app-client/src/pages/purchase/market/create.config.ts similarity index 63% rename from packages/app-client/src/pages/transfer/create.config.ts rename to packages/app-client/src/pages/purchase/market/create.config.ts index 80e10b8..e61fbbe 100644 --- a/packages/app-client/src/pages/transfer/create.config.ts +++ b/packages/app-client/src/pages/purchase/market/create.config.ts @@ -1,4 +1,4 @@ export default definePageConfig({ navigationBarBackgroundColor: "#fff", - navigationBarTitleText: "新建调货单", + navigationBarTitleText: "新建采购单", }); diff --git a/packages/app-client/src/pages/transfer/create.tsx b/packages/app-client/src/pages/purchase/market/create.tsx similarity index 89% rename from packages/app-client/src/pages/transfer/create.tsx rename to packages/app-client/src/pages/purchase/market/create.tsx index 16c3b7c..4be62f1 100644 --- a/packages/app-client/src/pages/transfer/create.tsx +++ b/packages/app-client/src/pages/purchase/market/create.tsx @@ -4,9 +4,10 @@ import { View } from "@tarojs/components"; import { useEffect, useRef, useState } from "react"; import { Icon, + MadeOptionRef, + MarketOption, OrderVehicle, OrderVehicleRef, - PurchaseOptionRef, StallInfo, StallInfoRef, StallList, @@ -15,14 +16,13 @@ import { StallWeigh, StallWeighRef, SupplierPackageRef, - TransferOption } from "@/components"; import { business } from "@/services"; import { buildUrl, generateShortId } from "@/utils"; import Taro from "@tarojs/taro"; import { Button } from "@nutui/nutui-react-taro"; import { WeightCalculationService } from "@/utils/classes/calculators"; -import transfer from "@/constant/transfer"; +import { purchase } from "@/constant"; const defaultSupplierList: Partial[] = [ { @@ -38,7 +38,7 @@ const defaultSupplierList: Partial[] = [ isLast: undefined, // 空磅是否包含纸箱 - isPaper: true, + isPaper: false, // 默认按照毛重报价 pricingMethod: "BY_GROSS_WEIGHT", // 空磅重量 @@ -57,18 +57,6 @@ const defaultSupplierList: Partial[] = [ boxType: "USED", isUsed: 0, }, - { - boxType: "EXTRA_USED", - isUsed: 0, - }, - { - boxType: "EXTRA", - isUsed: 0, - }, - { - boxType: "REMAIN", - isUsed: 0, - }, ], }, ]; @@ -82,12 +70,12 @@ export default hocAuth(function Page(props: CommonComponent) { const defaultSupplierId = router.params.supplierId as string; const defaultOrderSupplierId = router.params.orderSupplierId as string; - const orderOptionRef = useRef(null); + const orderOptionRef = useRef(null); const vehicleRef = useRef(null); // 创建MelonStall组件的ref数组 - const melonStallRefs = useRef([]); + const stallInfoRefs = useRef([]); // 创建Weigh组件的ref数组 - const staffWeighRefs = useRef([]); + const stallWeighRefs = useRef([]); // 创建OrderPackage组件的ref const stallPackageRefs = useRef([]); @@ -117,7 +105,7 @@ export default hocAuth(function Page(props: CommonComponent) { ) { if (userRoleVO.slug === "market-buyer") { Taro.redirectTo({ - url: buildUrl("/pages/transfer/preview", { + url: buildUrl("/pages/purchase/market/preview", { orderId: purchaseOrder.orderId, }), }); @@ -169,7 +157,7 @@ export default hocAuth(function Page(props: CommonComponent) { active = defaultStep; } else { active = purchaseOrder.active || 1; - if (active < 1 || active > transfer.steps.length - 1) { + if (active < 1 || active > purchase.marketSteps.length - 1) { active = 1; } } @@ -177,8 +165,8 @@ export default hocAuth(function Page(props: CommonComponent) { setPurchaseOrder({ ...purchaseOrder, active: - active > transfer.steps.length - 1 - ? transfer.steps.length - 1 + active > purchase.marketSteps.length - 1 + ? purchase.marketSteps.length - 1 : active, orderSupplierList: orderSupplierList1, orderCostList: purchaseOrder.orderCostList?.map((item) => { @@ -215,7 +203,7 @@ export default hocAuth(function Page(props: CommonComponent) { }, [orderId]); useEffect(() => { - setStep(transfer.steps[purchaseOrder?.active! - 1]); + setStep(purchase.marketSteps[purchaseOrder?.active! - 1]); }, [purchaseOrder?.active]); const setOrderSupplierList = ( @@ -260,16 +248,16 @@ export default hocAuth(function Page(props: CommonComponent) { return ( <> - {step.value < transfer.steps.length && ( + {step.value < purchase.marketSteps.length && ( - {step.title.replace("{}", transfer.steps.length - 1)} + {step.title.replace("{}", purchase.marketSteps.length - 1)} )} @@ -280,8 +268,8 @@ export default hocAuth(function Page(props: CommonComponent) { onChange={(purchaseOrder: BusinessAPI.PurchaseOrderVO) => { setPurchaseOrder(purchaseOrder); }} - melonStallRefs={melonStallRefs} - weighRefs={staffWeighRefs} + melonStallRefs={stallInfoRefs} + weighRefs={stallWeighRefs} orderPackageRefs={stallPackageRefs} /> )} @@ -313,8 +301,8 @@ export default hocAuth(function Page(props: CommonComponent) { if (step.value === 2) { // 确保ref数组足够长 - while (melonStallRefs.current.length <= index) { - melonStallRefs.current.push({ + while (stallInfoRefs.current.length <= index) { + stallInfoRefs.current.push({ validate: () => true, // 默认验证方法 } as StallInfoRef); } @@ -338,7 +326,7 @@ export default hocAuth(function Page(props: CommonComponent) { }} ref={(ref) => { if (ref) { - melonStallRefs.current[index] = ref; + stallInfoRefs.current[index] = ref; } }} /> @@ -348,8 +336,8 @@ export default hocAuth(function Page(props: CommonComponent) { // 称重信息 if (step.value === 3) { // 确保ref数组足够长 - while (staffWeighRefs.current.length <= index) { - staffWeighRefs.current.push({ + while (stallWeighRefs.current.length <= index) { + stallWeighRefs.current.push({ validate: () => true, // 默认验证方法 } as StallWeighRef); } @@ -373,7 +361,7 @@ export default hocAuth(function Page(props: CommonComponent) { }} ref={(ref) => { if (ref) { - staffWeighRefs.current[index] = ref; + stallWeighRefs.current[index] = ref; } }} /> @@ -442,7 +430,7 @@ export default hocAuth(function Page(props: CommonComponent) { )} {/* 按钮操作 */} - @@ -454,8 +442,8 @@ export default hocAuth(function Page(props: CommonComponent) { }) } vehicleRef={vehicleRef} - melonStallRefs={melonStallRefs} - staffWeighRefs={staffWeighRefs} + stallInfoRefs={stallInfoRefs} + stallWeighRefs={stallWeighRefs} stallPackageRefs={stallPackageRefs} /> diff --git a/packages/app-client/src/pages/transfer/drafts.config.ts b/packages/app-client/src/pages/purchase/market/drafts.config.ts similarity index 100% rename from packages/app-client/src/pages/transfer/drafts.config.ts rename to packages/app-client/src/pages/purchase/market/drafts.config.ts diff --git a/packages/app-client/src/pages/transfer/drafts.tsx b/packages/app-client/src/pages/purchase/market/drafts.tsx similarity index 100% rename from packages/app-client/src/pages/transfer/drafts.tsx rename to packages/app-client/src/pages/purchase/market/drafts.tsx diff --git a/packages/app-client/src/pages/transfer/preview.config.ts b/packages/app-client/src/pages/purchase/market/preview.config.ts similarity index 63% rename from packages/app-client/src/pages/transfer/preview.config.ts rename to packages/app-client/src/pages/purchase/market/preview.config.ts index 5dac1eb..6f4c316 100644 --- a/packages/app-client/src/pages/transfer/preview.config.ts +++ b/packages/app-client/src/pages/purchase/market/preview.config.ts @@ -1,4 +1,4 @@ export default definePageConfig({ - navigationBarTitleText: "预览调货单", + navigationBarTitleText: "预览采购单", navigationBarBackgroundColor: "#fff", }); diff --git a/packages/app-client/src/pages/transfer/preview.tsx b/packages/app-client/src/pages/purchase/market/preview.tsx similarity index 88% rename from packages/app-client/src/pages/transfer/preview.tsx rename to packages/app-client/src/pages/purchase/market/preview.tsx index d58a942..6991058 100644 --- a/packages/app-client/src/pages/transfer/preview.tsx +++ b/packages/app-client/src/pages/purchase/market/preview.tsx @@ -3,14 +3,11 @@ import { CommonComponent } from "@/types/typings"; import { View } from "@tarojs/components"; import { Button, SafeArea } from "@nutui/nutui-react-taro"; import { useEffect, useState } from "react"; -import { - PurchaseOrderWithdrawReview, - TransferOrderSubmitReview, - TransferPreview, -} from "@/components"; +import { MarketPreview, PurchaseOrderWithdrawReview } from "@/components"; import { business } from "@/services"; import Taro from "@tarojs/taro"; import { buildUrl } from "@/utils"; +import { purchase } from "@/constant"; export default hocAuth(function Page(props: CommonComponent) { const { router } = props; @@ -49,7 +46,7 @@ export default hocAuth(function Page(props: CommonComponent) { <> {/* 采购预览 */} - + {/* 按钮操作 */} @@ -65,9 +62,9 @@ export default hocAuth(function Page(props: CommonComponent) { className="flex-1 bg-gray-200 text-gray-700" onClick={() => { Taro.redirectTo({ - url: buildUrl("/pages/transfer/create", { + url: buildUrl("/pages/purchase/market/create", { orderId: purchaseOrder.orderId, - active: 4, + active: purchase.marketSteps.length - 1, }), }); }} @@ -76,12 +73,12 @@ export default hocAuth(function Page(props: CommonComponent) { - { Taro.switchTab({ - url: buildUrl("/pages/transfer/result", { + url: buildUrl("/pages/purchase/market/result", { orderId: purchaseOrder.orderId, }), }); diff --git a/packages/app-client/src/pages/transfer/result.config.ts b/packages/app-client/src/pages/purchase/market/result.config.ts similarity index 100% rename from packages/app-client/src/pages/transfer/result.config.ts rename to packages/app-client/src/pages/purchase/market/result.config.ts diff --git a/packages/app-client/src/pages/transfer/result.tsx b/packages/app-client/src/pages/purchase/market/result.tsx similarity index 93% rename from packages/app-client/src/pages/transfer/result.tsx rename to packages/app-client/src/pages/purchase/market/result.tsx index 1bf0d5f..186eba7 100644 --- a/packages/app-client/src/pages/transfer/result.tsx +++ b/packages/app-client/src/pages/purchase/market/result.tsx @@ -18,7 +18,7 @@ export default hocAuth(function Page(props: CommonComponent) { const init = async (orderId: string) => { setLoading(true); try { - // 获取调货单信息 + // 获取采购单信息 const { data: purchaseData } = await business.purchaseOrder.showPurchaseOrder({ purchaseOrderShowQry: { @@ -33,7 +33,7 @@ export default hocAuth(function Page(props: CommonComponent) { Toast.show("toast", { icon: "fail", title: "提示", - content: "获取调货单信息失败", + content: "获取采购单信息失败", }); } finally { setLoading(false); @@ -46,11 +46,11 @@ export default hocAuth(function Page(props: CommonComponent) { } }, [orderId]); - // 查看调货单详情 + // 查看采购单详情 const viewPurchaseOrderDetail = () => { if (purchaseOrder?.orderId) { Taro.navigateTo({ - url: buildUrl("/pages/transfer/preview", { + url: buildUrl("/pages/purchase/market/preview", { orderId: purchaseOrder.orderId, }), }); @@ -65,7 +65,7 @@ export default hocAuth(function Page(props: CommonComponent) { - 调货单已提交审核 + 采购单已提交审核 等待报价审核员处理 @@ -81,7 +81,7 @@ export default hocAuth(function Page(props: CommonComponent) { - 调货单号: + 采购单号: {purchaseOrder?.orderSn || "-"} @@ -116,7 +116,7 @@ export default hocAuth(function Page(props: CommonComponent) { block onClick={viewPurchaseOrderDetail} > - 查看调货单详情 + 查看采购单详情 diff --git a/packages/app-client/src/pages/stall/all.tsx b/packages/app-client/src/pages/stall/all.tsx index 2783a67..64cd754 100644 --- a/packages/app-client/src/pages/stall/all.tsx +++ b/packages/app-client/src/pages/stall/all.tsx @@ -143,13 +143,13 @@ export default hocAuth(function Page(props: CommonComponent) { type={"default"} onClick={() => { Taro.navigateTo({ - url: buildUrl("/pages/transfer/create", { + url: buildUrl("/pages/purchase/market/create", { supplierId: supplierVO.supplierId, }), }); }} > - 新建调货 + 新建采购 diff --git a/packages/app-client/src/pages/supplier/all.tsx b/packages/app-client/src/pages/supplier/all.tsx index a8b97c3..76b104c 100644 --- a/packages/app-client/src/pages/supplier/all.tsx +++ b/packages/app-client/src/pages/supplier/all.tsx @@ -165,7 +165,7 @@ export default hocAuth(function Page(props: CommonComponent) { type={"default"} onClick={() => { Taro.navigateTo({ - url: buildUrl("/pages/purchase/create", { + url: buildUrl("/pages/purchase/made/create", { supplierId: supplierVO.supplierId, }), }); diff --git a/packages/app-client/src/services/business/typings.d.ts b/packages/app-client/src/services/business/typings.d.ts index 8fae0ae..15521c2 100644 --- a/packages/app-client/src/services/business/typings.d.ts +++ b/packages/app-client/src/services/business/typings.d.ts @@ -4589,7 +4589,7 @@ declare namespace BusinessAPI { | "QUOTE_REJECTED" | "BOSS_REJECTED"; /** 采购类型：1_产地采购；2_市场采购； */ - type?: "PRODUCTION_PURCHASE" | "MARKET_PURCHASE"; + type: "PRODUCTION_PURCHASE" | "MARKET_PURCHASE"; /** 备注 */ remark?: string; /** 创建人ID */ diff --git a/packages/app-client/src/utils/classes/calculators/modules/SupplierWeightCalculator.ts b/packages/app-client/src/utils/classes/calculators/modules/SupplierWeightCalculator.ts index dd2b61c..0dfeaa7 100644 --- a/packages/app-client/src/utils/classes/calculators/modules/SupplierWeightCalculator.ts +++ b/packages/app-client/src/utils/classes/calculators/modules/SupplierWeightCalculator.ts @@ -46,7 +46,7 @@ export class SupplierWeightCalculator { const weights = this.calculateAllBoxWeights(supplier.orderPackageList || []); if (!supplier.isPaper) { - // 非纸箱包装的简化计算 + // 不带纸箱包装的简化计算 this.calculateNonPaperSupplier(supplier, weights.used); } else { // 纸箱包装的复杂计算