diff --git a/packages/app-client/src/app.config.ts b/packages/app-client/src/app.config.ts index 3b8b970..fd203e3 100644 --- a/packages/app-client/src/app.config.ts +++ b/packages/app-client/src/app.config.ts @@ -19,41 +19,15 @@ config = { root: "pages/purchase", pages: [ // 全部采购 - "enter/all", + "all", // 创建采购单 - "enter/create", + "create", // 预览采购单 - "enter/preview", + "preview", // 采购单草稿箱 - "enter/drafts", + "drafts", // 采购单提审结果页面 - "enter/result", - - // 审核相关 - // 采购单审核 - "audit/audit", - // 采购单待审核 - "audit/pending", - // 采购单审核中 - "audit/reviewing", - // 采购单审核结果页面 - "audit/result", - // 采购单审核拒绝 - "audit/rejected", - // 全部采购单审核 - "audit/all", - // 采购单审批 - "approval/audit", - // 采购单待审批 - "approval/pending", - // 采购单审批中 - "approval/reviewing", - // 采购单审批结果页面 - "approval/result", - // 采购单审批拒绝 - "approval/rejected", - // 全部采购单审批 - "approval/all", + "result", ], }, // 调货单 @@ -61,15 +35,51 @@ config = { root: "pages/transfer", pages: [ // 全部调货 - "enter/all", + "all", // 创建调货单 - "enter/create", + "create", // 预览调货单 - "enter/preview", + "preview", // 调货单草稿箱 - "enter/drafts", + "drafts", // 调货单提审结果页面 - "enter/result", + "result", + ], + }, + // 审核 + { + root: "pages/audit", + pages: [ + // 采购单审核 + "audit", + // 采购单待审核 + "pending", + // 采购单审核中 + "reviewing", + // 采购单审核结果页面 + "result", + // 采购单审核拒绝 + "rejected", + // 全部采购单审核 + "all", + ], + }, + // 审批 + { + root: "pages/approval", + pages: [ + // 采购单审批 + "audit", + // 采购单待审批 + "pending", + // 采购单审批中 + "reviewing", + // 采购单审批结果页面 + "result", + // 采购单审批拒绝 + "rejected", + // 全部采购单审批 + "all", ], }, // 发货单 diff --git a/packages/app-client/src/components/purchase/PurchaseOrderApprovalList.tsx b/packages/app-client/src/components/purchase/PurchaseOrderApprovalList.tsx index 24e7991..752c92f 100644 --- a/packages/app-client/src/components/purchase/PurchaseOrderApprovalList.tsx +++ b/packages/app-client/src/components/purchase/PurchaseOrderApprovalList.tsx @@ -222,7 +222,7 @@ export default function PurchaseOrderApprovalList( block onClick={(e) => { Taro.navigateTo({ - url: buildUrl("/pages/purchase/approval/audit", { + url: buildUrl("/pages/approval/audit", { orderId: purchaseOrderVO.orderId, }), }); diff --git a/packages/app-client/src/components/purchase/PurchaseOrderAuditList.tsx b/packages/app-client/src/components/purchase/PurchaseOrderAuditList.tsx index 5a0ca2c..c294193 100644 --- a/packages/app-client/src/components/purchase/PurchaseOrderAuditList.tsx +++ b/packages/app-client/src/components/purchase/PurchaseOrderAuditList.tsx @@ -222,7 +222,7 @@ export default function PurchaseOrderAuditList( block onClick={(e) => { Taro.navigateTo({ - url: buildUrl("/pages/purchase/audit/audit", { + url: buildUrl("/pages/audit/audit", { orderId: purchaseOrderVO.orderId, }), }); diff --git a/packages/app-client/src/components/purchase/PurchaseOrderItem.tsx b/packages/app-client/src/components/purchase/PurchaseOrderItem.tsx index af83b28..49bb85c 100644 --- a/packages/app-client/src/components/purchase/PurchaseOrderItem.tsx +++ b/packages/app-client/src/components/purchase/PurchaseOrderItem.tsx @@ -69,7 +69,7 @@ export default function PurchaseOrderItem(props: IPurchaseOrderItemProps) { onClick={(event) => { if (purchaseOrderVO.active === 7) { Taro.navigateTo({ - url: buildUrl("/pages/purchase/enter/preview", { + url: buildUrl("/pages/purchase/preview", { orderId: purchaseOrderVO.orderId, }), }); @@ -182,7 +182,7 @@ export default function PurchaseOrderItem(props: IPurchaseOrderItemProps) { size={"small"} onClick={(e) => { Taro.navigateTo({ - url: buildUrl("/pages/purchase/enter/create", { + url: buildUrl("/pages/purchase/create", { orderId: purchaseOrderVO.orderId, }), }); @@ -197,7 +197,7 @@ export default function PurchaseOrderItem(props: IPurchaseOrderItemProps) { size={"small"} onClick={(e) => { Taro.navigateTo({ - url: buildUrl("/pages/purchase/enter/preview", { + url: buildUrl("/pages/purchase/preview", { orderId: purchaseOrderVO.orderId, }), }); @@ -227,7 +227,7 @@ export default function PurchaseOrderItem(props: IPurchaseOrderItemProps) { size={"small"} onClick={(e) => { Taro.navigateTo({ - url: buildUrl("/pages/purchase/enter/create", { + url: buildUrl("/pages/purchase/create", { orderId: purchaseOrderVO.orderId, }), }); diff --git a/packages/app-client/src/components/purchase/PurchaseOrderList.tsx b/packages/app-client/src/components/purchase/PurchaseOrderList.tsx index d04e1ca..4f22f7f 100644 --- a/packages/app-client/src/components/purchase/PurchaseOrderList.tsx +++ b/packages/app-client/src/components/purchase/PurchaseOrderList.tsx @@ -123,7 +123,7 @@ export default function PurchaseOrderList(props: IPurchaseOrderListProps) { 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/enter/create"), + url: buildUrl("/pages/purchase/create"), }); }} > @@ -137,7 +137,7 @@ export default function PurchaseOrderList(props: IPurchaseOrderListProps) { 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/enter/create"), + url: buildUrl("/pages/transfer/create"), }); }} > diff --git a/packages/app-client/src/components/purchase/TransferOrderItem.tsx b/packages/app-client/src/components/purchase/TransferOrderItem.tsx index a1a9bf4..585db17 100644 --- a/packages/app-client/src/components/purchase/TransferOrderItem.tsx +++ b/packages/app-client/src/components/purchase/TransferOrderItem.tsx @@ -69,7 +69,7 @@ export default function PurchaseOrderItem(props: IPurchaseOrderItemProps) { onClick={(event) => { if (purchaseOrderVO.active === 5) { Taro.navigateTo({ - url: buildUrl("/pages/transfer/enter/preview", { + url: buildUrl("/pages/transfer/preview", { orderId: purchaseOrderVO.orderId, }), }); @@ -182,7 +182,7 @@ export default function PurchaseOrderItem(props: IPurchaseOrderItemProps) { size={"small"} onClick={(e) => { Taro.navigateTo({ - url: buildUrl("/pages/transfer/enter/create", { + url: buildUrl("/pages/transfer/create", { orderId: purchaseOrderVO.orderId, }), }); @@ -197,7 +197,7 @@ export default function PurchaseOrderItem(props: IPurchaseOrderItemProps) { size={"small"} onClick={(e) => { Taro.navigateTo({ - url: buildUrl("/pages/transfer/enter/preview", { + url: buildUrl("/pages/transfer/preview", { orderId: purchaseOrderVO.orderId, }), }); @@ -227,7 +227,7 @@ export default function PurchaseOrderItem(props: IPurchaseOrderItemProps) { size={"small"} onClick={(e) => { Taro.navigateTo({ - url: buildUrl("/pages/transfer/enter/create", { + url: buildUrl("/pages/transfer/create", { orderId: purchaseOrderVO.orderId, }), }); diff --git a/packages/app-client/src/components/purchase/button/PurchaseOrderSubmitReview.tsx b/packages/app-client/src/components/purchase/button/PurchaseOrderSubmitReview.tsx index 0c1f328..7cd80c7 100644 --- a/packages/app-client/src/components/purchase/button/PurchaseOrderSubmitReview.tsx +++ b/packages/app-client/src/components/purchase/button/PurchaseOrderSubmitReview.tsx @@ -88,7 +88,7 @@ export default function PurchaseOrderSubmitReview( cancelText: "去继续拼车", onConfirm: async () => { Taro.redirectTo({ - url: buildUrl("/pages/purchase/enter/create", { + url: buildUrl("/pages/purchase/create", { orderId: purchaseOrderVO.orderId, orderSupplierId: lastSupplier.orderSupplierId, step: "2", @@ -98,7 +98,7 @@ export default function PurchaseOrderSubmitReview( }, onCancel: () => { Taro.redirectTo({ - url: buildUrl("/pages/purchase/enter/create", { + url: buildUrl("/pages/purchase/create", { orderId: purchaseOrderVO.orderId, step: "6", }), @@ -126,7 +126,7 @@ export default function PurchaseOrderSubmitReview( cancelText: "取消", onConfirm: async () => { Taro.redirectTo({ - url: buildUrl("/pages/purchase/enter/create", { + url: buildUrl("/pages/purchase/create", { orderId: purchaseOrderVO.orderId, supplierId: hasNoUpdateContractSupplier.supplierId, step: "5", diff --git a/packages/app-client/src/components/purchase/button/TransferOrderSubmitReview.tsx b/packages/app-client/src/components/purchase/button/TransferOrderSubmitReview.tsx index 265628c..c9f45c9 100644 --- a/packages/app-client/src/components/purchase/button/TransferOrderSubmitReview.tsx +++ b/packages/app-client/src/components/purchase/button/TransferOrderSubmitReview.tsx @@ -88,7 +88,7 @@ export default function TransferOrderSubmitReview( cancelText: "去继续拼车", onConfirm: async () => { Taro.redirectTo({ - url: buildUrl("/pages/transfer/enter/create", { + url: buildUrl("/pages/transfer/create", { orderId: purchaseOrderVO.orderId, orderSupplierId: lastSupplier.orderSupplierId, step: "2", @@ -98,7 +98,7 @@ export default function TransferOrderSubmitReview( }, onCancel: () => { Taro.redirectTo({ - url: buildUrl("/pages/transfer/enter/create", { + url: buildUrl("/pages/transfer/create", { orderId: purchaseOrderVO.orderId, step: "6", }), diff --git a/packages/app-client/src/components/purchase/module/PurchaseOption.tsx b/packages/app-client/src/components/purchase/module/PurchaseOption.tsx index 8dbf044..036830e 100644 --- a/packages/app-client/src/components/purchase/module/PurchaseOption.tsx +++ b/packages/app-client/src/components/purchase/module/PurchaseOption.tsx @@ -222,7 +222,7 @@ export default forwardRef( // 跳转到预览页面 Taro.redirectTo({ - url: buildUrl("/pages/purchase/enter/preview", { + url: buildUrl("/pages/purchase/preview", { orderId: value.orderId, }), }); @@ -317,7 +317,7 @@ export default forwardRef( content: "当前采购订单已暂存成功", }); Taro.redirectTo({ - url: "/pages/purchase/enter/drafts", + url: "/pages/purchase/drafts", }); } }, diff --git a/packages/app-client/src/components/purchase/module/TransferOption.tsx b/packages/app-client/src/components/purchase/module/TransferOption.tsx index afca42e..3cec5ae 100644 --- a/packages/app-client/src/components/purchase/module/TransferOption.tsx +++ b/packages/app-client/src/components/purchase/module/TransferOption.tsx @@ -218,7 +218,7 @@ export default forwardRef( // 跳转到预览页面 Taro.redirectTo({ - url: buildUrl("/pages/transfer/enter/preview", { + url: buildUrl("/pages/transfer/preview", { orderId: value.orderId, }), }); @@ -313,7 +313,7 @@ export default forwardRef( content: "当前采购订单已暂存成功", }); Taro.redirectTo({ - url: "/pages/purchase/enter/drafts", + url: "/pages/purchase/drafts", }); } }, diff --git a/packages/app-client/src/constant/workbench.ts b/packages/app-client/src/constant/workbench.ts index ed0b5b4..839607a 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/enter/drafts", + path: "/pages/purchase/drafts", }, { id: "history", @@ -126,7 +126,7 @@ const quickActionMap = { icon: "clipboard-list", iconColor: "var(--color-green-600)", bgColorClass: "bg-green-100", - path: "/pages/purchase/enter/all", + path: "/pages/purchase/all", }, { id: "invoiceUpload", @@ -152,7 +152,7 @@ const quickActionMap = { icon: "folder", iconColor: "var(--color-blue-600)", bgColorClass: "bg-blue-100", - path: "/pages/purchase/enter/drafts", + path: "/pages/transfer/drafts", }, { id: "history", @@ -160,7 +160,7 @@ const quickActionMap = { icon: "clipboard-list", iconColor: "var(--color-green-600)", bgColorClass: "bg-green-100", - path: "/pages/purchase/enter/all", + path: "/pages/transfer/all", }, { id: "supplierManage", @@ -178,7 +178,7 @@ const quickActionMap = { icon: "file-signature", iconColor: "var(--color-primary)", bgColorClass: "bg-primary/10", - path: "/pages/purchase/audit/pending", + path: "/pages/audit/pending", }, { id: "history", @@ -186,7 +186,7 @@ const quickActionMap = { icon: "clipboard-list", iconColor: "var(--color-green-600)", bgColorClass: "bg-green-100", - path: "/pages/purchase/enter/all", + path: "/pages/purchase/all", }, { id: "shipOrder", @@ -233,7 +233,7 @@ const quickActionMap = { icon: "file-signature", iconColor: "var(--color-primary)", bgColorClass: "bg-primary/10", - path: "/pages/purchase/approval/pending", + path: "/pages/approval/pending", }, { id: "history", @@ -241,7 +241,7 @@ const quickActionMap = { icon: "clipboard-list", iconColor: "var(--color-green-600)", bgColorClass: "bg-green-100", - path: "/pages/purchase/enter/all", + path: "/pages/purchase/all", }, { id: "shipOrder", diff --git a/packages/app-client/src/pages/purchase/approval/all.config.ts b/packages/app-client/src/pages/approval/all.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/approval/all.config.ts rename to packages/app-client/src/pages/approval/all.config.ts diff --git a/packages/app-client/src/pages/purchase/approval/all.tsx b/packages/app-client/src/pages/approval/all.tsx similarity index 100% rename from packages/app-client/src/pages/purchase/approval/all.tsx rename to packages/app-client/src/pages/approval/all.tsx diff --git a/packages/app-client/src/pages/purchase/approval/audit.config.ts b/packages/app-client/src/pages/approval/audit.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/approval/audit.config.ts rename to packages/app-client/src/pages/approval/audit.config.ts diff --git a/packages/app-client/src/pages/purchase/approval/audit.tsx b/packages/app-client/src/pages/approval/audit.tsx similarity index 98% rename from packages/app-client/src/pages/purchase/approval/audit.tsx rename to packages/app-client/src/pages/approval/audit.tsx index 2c417f3..b85702e 100644 --- a/packages/app-client/src/pages/purchase/approval/audit.tsx +++ b/packages/app-client/src/pages/approval/audit.tsx @@ -215,7 +215,7 @@ export default hocAuth(function Page(props: CommonComponent) { onFinish={() => { // 返回首页 Taro.redirectTo({ - url: "/pages/purchase/approval/pending", + url: "/pages/approval/pending", }); }} /> @@ -227,7 +227,7 @@ export default hocAuth(function Page(props: CommonComponent) { onFinish={() => { // 关闭当前页面并跳转到采购单审核通过页面 Taro.redirectTo({ - url: buildUrl(`/pages/purchase/approval/result`, { + url: buildUrl(`/pages/approval/result`, { orderId: purchaseOrderVO?.orderId, }), }); diff --git a/packages/app-client/src/pages/purchase/approval/pending.config.ts b/packages/app-client/src/pages/approval/pending.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/approval/pending.config.ts rename to packages/app-client/src/pages/approval/pending.config.ts diff --git a/packages/app-client/src/pages/purchase/approval/pending.tsx b/packages/app-client/src/pages/approval/pending.tsx similarity index 100% rename from packages/app-client/src/pages/purchase/approval/pending.tsx rename to packages/app-client/src/pages/approval/pending.tsx diff --git a/packages/app-client/src/pages/purchase/approval/rejected.config.ts b/packages/app-client/src/pages/approval/rejected.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/approval/rejected.config.ts rename to packages/app-client/src/pages/approval/rejected.config.ts diff --git a/packages/app-client/src/pages/purchase/approval/rejected.tsx b/packages/app-client/src/pages/approval/rejected.tsx similarity index 100% rename from packages/app-client/src/pages/purchase/approval/rejected.tsx rename to packages/app-client/src/pages/approval/rejected.tsx diff --git a/packages/app-client/src/pages/purchase/approval/result.config.ts b/packages/app-client/src/pages/approval/result.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/approval/result.config.ts rename to packages/app-client/src/pages/approval/result.config.ts diff --git a/packages/app-client/src/pages/purchase/approval/result.tsx b/packages/app-client/src/pages/approval/result.tsx similarity index 100% rename from packages/app-client/src/pages/purchase/approval/result.tsx rename to packages/app-client/src/pages/approval/result.tsx diff --git a/packages/app-client/src/pages/purchase/approval/reviewing.config.ts b/packages/app-client/src/pages/approval/reviewing.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/approval/reviewing.config.ts rename to packages/app-client/src/pages/approval/reviewing.config.ts diff --git a/packages/app-client/src/pages/purchase/approval/reviewing.tsx b/packages/app-client/src/pages/approval/reviewing.tsx similarity index 100% rename from packages/app-client/src/pages/purchase/approval/reviewing.tsx rename to packages/app-client/src/pages/approval/reviewing.tsx diff --git a/packages/app-client/src/pages/purchase/audit/all.config.ts b/packages/app-client/src/pages/audit/all.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/audit/all.config.ts rename to packages/app-client/src/pages/audit/all.config.ts diff --git a/packages/app-client/src/pages/purchase/audit/all.tsx b/packages/app-client/src/pages/audit/all.tsx similarity index 100% rename from packages/app-client/src/pages/purchase/audit/all.tsx rename to packages/app-client/src/pages/audit/all.tsx diff --git a/packages/app-client/src/pages/purchase/audit/audit.config.ts b/packages/app-client/src/pages/audit/audit.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/audit/audit.config.ts rename to packages/app-client/src/pages/audit/audit.config.ts diff --git a/packages/app-client/src/pages/purchase/audit/audit.tsx b/packages/app-client/src/pages/audit/audit.tsx similarity index 99% rename from packages/app-client/src/pages/purchase/audit/audit.tsx rename to packages/app-client/src/pages/audit/audit.tsx index be4cf99..a515ec5 100644 --- a/packages/app-client/src/pages/purchase/audit/audit.tsx +++ b/packages/app-client/src/pages/audit/audit.tsx @@ -321,7 +321,7 @@ export default hocAuth(function Page(props: CommonComponent) { setTimeout(() => { Taro.redirectTo({ - url: buildUrl("/pages/purchase/audit/pending"), + url: buildUrl("/pages/audit/pending"), }); }, 1000); @@ -391,7 +391,7 @@ export default hocAuth(function Page(props: CommonComponent) { content: "暂存成功", }); // 返回采购单页面 - Taro.redirectTo({ url: "/pages/purchase/audit/pending" }); + Taro.redirectTo({ url: "/pages/audit/pending" }); } }; @@ -449,7 +449,7 @@ export default hocAuth(function Page(props: CommonComponent) { }); // 跳转到提交结果页面 Taro.redirectTo({ - url: buildUrl("/pages/purchase/audit/result", { + url: buildUrl("/pages/audit/result", { orderId: purchaseOrderVO!.orderId, }), }); diff --git a/packages/app-client/src/pages/purchase/audit/pending.config.ts b/packages/app-client/src/pages/audit/pending.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/audit/pending.config.ts rename to packages/app-client/src/pages/audit/pending.config.ts diff --git a/packages/app-client/src/pages/purchase/audit/pending.tsx b/packages/app-client/src/pages/audit/pending.tsx similarity index 100% rename from packages/app-client/src/pages/purchase/audit/pending.tsx rename to packages/app-client/src/pages/audit/pending.tsx diff --git a/packages/app-client/src/pages/purchase/audit/rejected.config.ts b/packages/app-client/src/pages/audit/rejected.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/audit/rejected.config.ts rename to packages/app-client/src/pages/audit/rejected.config.ts diff --git a/packages/app-client/src/pages/purchase/audit/rejected.tsx b/packages/app-client/src/pages/audit/rejected.tsx similarity index 100% rename from packages/app-client/src/pages/purchase/audit/rejected.tsx rename to packages/app-client/src/pages/audit/rejected.tsx diff --git a/packages/app-client/src/pages/purchase/audit/result.config.ts b/packages/app-client/src/pages/audit/result.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/audit/result.config.ts rename to packages/app-client/src/pages/audit/result.config.ts diff --git a/packages/app-client/src/pages/purchase/audit/result.tsx b/packages/app-client/src/pages/audit/result.tsx similarity index 98% rename from packages/app-client/src/pages/purchase/audit/result.tsx rename to packages/app-client/src/pages/audit/result.tsx index 9d4107f..8ca2e1a 100644 --- a/packages/app-client/src/pages/purchase/audit/result.tsx +++ b/packages/app-client/src/pages/audit/result.tsx @@ -50,7 +50,7 @@ export default hocAuth(function Page(props: CommonComponent) { const viewPurchaseOrderDetail = () => { if (purchaseOrder?.orderId) { Taro.navigateTo({ - url: buildUrl("/pages/purchase/audit/audit", { + url: buildUrl("/pages/audit/audit", { orderId: purchaseOrder.orderId, }), }); diff --git a/packages/app-client/src/pages/purchase/audit/reviewing.config.ts b/packages/app-client/src/pages/audit/reviewing.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/audit/reviewing.config.ts rename to packages/app-client/src/pages/audit/reviewing.config.ts diff --git a/packages/app-client/src/pages/purchase/audit/reviewing.tsx b/packages/app-client/src/pages/audit/reviewing.tsx similarity index 100% rename from packages/app-client/src/pages/purchase/audit/reviewing.tsx rename to packages/app-client/src/pages/audit/reviewing.tsx diff --git a/packages/app-client/src/pages/main/index/index.tsx b/packages/app-client/src/pages/main/index/index.tsx index d63d216..b15ec31 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/enter/create"), + url: buildUrl("/pages/purchase/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/enter/create"), + url: buildUrl("/pages/transfer/create"), }); }} > diff --git a/packages/app-client/src/pages/purchase/enter/all.config.ts b/packages/app-client/src/pages/purchase/all.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/enter/all.config.ts rename to packages/app-client/src/pages/purchase/all.config.ts diff --git a/packages/app-client/src/pages/purchase/enter/all.tsx b/packages/app-client/src/pages/purchase/all.tsx similarity index 100% rename from packages/app-client/src/pages/purchase/enter/all.tsx rename to packages/app-client/src/pages/purchase/all.tsx diff --git a/packages/app-client/src/pages/purchase/enter/create.config.ts b/packages/app-client/src/pages/purchase/create.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/enter/create.config.ts rename to packages/app-client/src/pages/purchase/create.config.ts diff --git a/packages/app-client/src/pages/purchase/enter/create.tsx b/packages/app-client/src/pages/purchase/create.tsx similarity index 98% rename from packages/app-client/src/pages/purchase/enter/create.tsx rename to packages/app-client/src/pages/purchase/create.tsx index 1b2e276..2bb86b2 100644 --- a/packages/app-client/src/pages/purchase/enter/create.tsx +++ b/packages/app-client/src/pages/purchase/create.tsx @@ -123,7 +123,7 @@ export default hocAuth(function Page(props: CommonComponent) { ) { if (userRoleVO.slug === "origin-entry") { Taro.redirectTo({ - url: buildUrl("/pages/purchase/enter/preview", { + url: buildUrl("/pages/purchase/preview", { orderId: purchaseOrder.orderId, }), }); @@ -131,7 +131,7 @@ export default hocAuth(function Page(props: CommonComponent) { } if (userRoleVO.slug === "reviewer") { Taro.redirectTo({ - url: buildUrl("/pages/purchase/audit/audit", { + url: buildUrl("/pages/audit/audit", { orderId: purchaseOrder.orderId, }), }); @@ -139,7 +139,7 @@ export default hocAuth(function Page(props: CommonComponent) { } if (userRoleVO.slug === "boss") { Taro.redirectTo({ - url: buildUrl("/pages/purchase/approval/audit", { + url: buildUrl("/pages/approval/audit", { orderId: purchaseOrder.orderId, }), }); diff --git a/packages/app-client/src/pages/purchase/enter/drafts.config.ts b/packages/app-client/src/pages/purchase/drafts.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/enter/drafts.config.ts rename to packages/app-client/src/pages/purchase/drafts.config.ts diff --git a/packages/app-client/src/pages/purchase/enter/drafts.tsx b/packages/app-client/src/pages/purchase/drafts.tsx similarity index 100% rename from packages/app-client/src/pages/purchase/enter/drafts.tsx rename to packages/app-client/src/pages/purchase/drafts.tsx diff --git a/packages/app-client/src/pages/purchase/enter/preview.config.ts b/packages/app-client/src/pages/purchase/preview.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/enter/preview.config.ts rename to packages/app-client/src/pages/purchase/preview.config.ts diff --git a/packages/app-client/src/pages/purchase/enter/preview.tsx b/packages/app-client/src/pages/purchase/preview.tsx similarity index 96% rename from packages/app-client/src/pages/purchase/enter/preview.tsx rename to packages/app-client/src/pages/purchase/preview.tsx index 2a4df62..cb72cb6 100644 --- a/packages/app-client/src/pages/purchase/enter/preview.tsx +++ b/packages/app-client/src/pages/purchase/preview.tsx @@ -65,7 +65,7 @@ export default hocAuth(function Page(props: CommonComponent) { className="flex-1 bg-gray-200 text-gray-700" onClick={() => { Taro.redirectTo({ - url: buildUrl("/pages/purchase/enter/create", { + url: buildUrl("/pages/purchase/create", { orderId: purchaseOrder.orderId, active: 6, }), @@ -81,7 +81,7 @@ export default hocAuth(function Page(props: CommonComponent) { size={"xlarge"} onFinish={() => { Taro.switchTab({ - url: buildUrl("/pages/purchase/enter/result", { + url: buildUrl("/pages/purchase/result", { orderId: purchaseOrder.orderId, }), }); diff --git a/packages/app-client/src/pages/purchase/enter/result.config.ts b/packages/app-client/src/pages/purchase/result.config.ts similarity index 100% rename from packages/app-client/src/pages/purchase/enter/result.config.ts rename to packages/app-client/src/pages/purchase/result.config.ts diff --git a/packages/app-client/src/pages/purchase/enter/result.tsx b/packages/app-client/src/pages/purchase/result.tsx similarity index 98% rename from packages/app-client/src/pages/purchase/enter/result.tsx rename to packages/app-client/src/pages/purchase/result.tsx index c015484..08c490b 100644 --- a/packages/app-client/src/pages/purchase/enter/result.tsx +++ b/packages/app-client/src/pages/purchase/result.tsx @@ -50,7 +50,7 @@ export default hocAuth(function Page(props: CommonComponent) { const viewPurchaseOrderDetail = () => { if (purchaseOrder?.orderId) { Taro.navigateTo({ - url: buildUrl("/pages/purchase/enter/preview", { + url: buildUrl("/pages/purchase/preview", { orderId: purchaseOrder.orderId, }), }); diff --git a/packages/app-client/src/pages/stall/all.tsx b/packages/app-client/src/pages/stall/all.tsx index 997cabd..2783a67 100644 --- a/packages/app-client/src/pages/stall/all.tsx +++ b/packages/app-client/src/pages/stall/all.tsx @@ -1,4 +1,4 @@ -import { ActionType, Icon, PageList, Phone, ToolBar } from "@/components"; +import { ActionType, Icon, PageList, ToolBar } from "@/components"; import Taro, { useShareAppMessage } from "@tarojs/taro"; import { useRef } from "react"; import { business } from "@/services"; @@ -86,7 +86,7 @@ export default hocAuth(function Page(props: CommonComponent) { icon={} onClick={() => { Taro.navigateTo({ - url: buildUrl("/pages/supplier/create", { + url: buildUrl("/pages/stall/create", { supplierId: supplierVO.supplierId, }), }); @@ -102,7 +102,7 @@ export default hocAuth(function Page(props: CommonComponent) { } > {dayjs(supplierVO.createdAt).format("MM-DD HH:mm")} @@ -114,15 +114,11 @@ export default hocAuth(function Page(props: CommonComponent) { } > - - - + + {supplierVO.payeeName} + - - 已开票 12 张 | 待开票 2 张 - + + {supplierVO.bankCard} + - {/* 联系 */} - {/* 新建采购 */} - {/* 协助开票 */} - diff --git a/packages/app-client/src/pages/supplier/all.tsx b/packages/app-client/src/pages/supplier/all.tsx index 033f736..a8b97c3 100644 --- a/packages/app-client/src/pages/supplier/all.tsx +++ b/packages/app-client/src/pages/supplier/all.tsx @@ -102,7 +102,7 @@ export default hocAuth(function Page(props: CommonComponent) { } > {dayjs(supplierVO.createdAt).format("MM-DD HH:mm")} @@ -121,7 +121,7 @@ export default hocAuth(function Page(props: CommonComponent) { "flex flex-1 flex-row items-center justify-end gap-1" } > - + {supplierVO.phone && } {/* 联系 */} - + {supplierVO.phone && ( + + )} {/* 新建采购 */}