diff --git a/src/pages/fulfillment/OrderFulfillmentList.vue b/src/pages/fulfillment/OrderFulfillmentList.vue index f65f0cf..b125790 100644 --- a/src/pages/fulfillment/OrderFulfillmentList.vue +++ b/src/pages/fulfillment/OrderFulfillmentList.vue @@ -2,30 +2,38 @@
- - + +
- - - - - - - - -
+ +
+ +
+
@@ -34,26 +42,32 @@ diff --git a/src/pages/fulfillment/components/OrderFulfillmentListCell.vue b/src/pages/fulfillment/components/OrderFulfillmentListCell.vue new file mode 100644 index 0000000..d113d61 --- /dev/null +++ b/src/pages/fulfillment/components/OrderFulfillmentListCell.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/src/types/Fulfillment.ts b/src/types/Fulfillment.ts index 75a4362..651f4fc 100644 --- a/src/types/Fulfillment.ts +++ b/src/types/Fulfillment.ts @@ -1,4 +1,5 @@ import type { Attachment, Model, PageResult, User } from "timi-web-api"; +import type { Customer } from "@/types/Customer"; export type FulfillmentType = "PACKAGE_ENTITLEMENT" | "DIRECT_PRODUCT"; export type FulfillmentStatus = "WAITING_STOCK" | "PENDING" | "VERIFIED" | "REJECTED" | "CANCELLED" | "REVOKED"; @@ -28,6 +29,7 @@ export type OrderFulfillment = { status?: FulfillmentStatus; requestNo?: string; operatorUserId?: string; + customer?: Customer; deliveredAt?: number; verifierUserId?: string; verifiedAt?: number;