From 64f36ce3a2e6b0a8a50b7c16b70a63c2147f8f6c Mon Sep 17 00:00:00 2001 From: zm2000 <18386612143@163.com> Date: Tue, 26 May 2026 17:59:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=86=E6=9E=B6=E5=92=8C?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E9=85=8D=E7=BD=AE=EF=BC=88=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=A4=9A=E9=A1=B5=E9=9D=A2=EF=BC=89=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A4=8D=E6=A0=B8=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/order.ts | 32 ++ src/components/order-review-one/index.vue | 448 --------------- src/components/top-nav.vue | 384 +++++++++++++ src/pages.json | 14 + src/pages/index/index.vue | 310 +---------- src/pages/login/login.vue | 4 +- src/pages/order/index.vue | 641 +++++++++++++++++++++- src/pages/returns/index.vue | 34 ++ src/pages/weighing/index.vue | 34 ++ src/views/order/index.vue | 6 +- 10 files changed, 1148 insertions(+), 759 deletions(-) delete mode 100644 src/components/order-review-one/index.vue create mode 100644 src/components/top-nav.vue create mode 100644 src/pages/returns/index.vue create mode 100644 src/pages/weighing/index.vue diff --git a/src/api/order.ts b/src/api/order.ts index d2c8cf2..973e661 100644 --- a/src/api/order.ts +++ b/src/api/order.ts @@ -29,3 +29,35 @@ export function searchOrdersForReview( export function fetchCurrentWavePendingOrders(options?: RequestOptions) { return request('order.review.currentWave', { ...workerPayload }, options) } + +type OrderListPagination = { + page?: number + pageSize?: number + currentPage?: number + page_size?: number + size?: number +} + +type OrderListSort = { + sortField?: string + sortOrder?: 'asc' | 'desc' | 'ASC' | 'DESC' +} + +type OrderListWhere = Record + +type OrderListParams = { + pagination?: OrderListPagination + where?: OrderListWhere + sort?: OrderListSort +} + +/** + * 订单工作台总列表 + * 查询当前登录用户仓库上下文下订单总列表,支持 pagination / where / sort + */ +export function fetchOrderList(params: OrderListParams = {}, options?: RequestOptions) { + return request('order.list', { + ...workerPayload, + ...params, + }, options) +} diff --git a/src/components/order-review-one/index.vue b/src/components/order-review-one/index.vue deleted file mode 100644 index 1b8c319..0000000 --- a/src/components/order-review-one/index.vue +++ /dev/null @@ -1,448 +0,0 @@ - - - - - diff --git a/src/components/top-nav.vue b/src/components/top-nav.vue new file mode 100644 index 0000000..cd31ee9 --- /dev/null +++ b/src/components/top-nav.vue @@ -0,0 +1,384 @@ + + + + + diff --git a/src/pages.json b/src/pages.json index bc453bf..631ad04 100644 --- a/src/pages.json +++ b/src/pages.json @@ -18,6 +18,20 @@ "titleNView": false, "navigationBarTitleText": "订单复核1" } + }, + { + "path": "pages/weighing/index", + "style": { + "titleNView": false, + "navigationBarTitleText": "称重" + } + }, + { + "path": "pages/returns/index", + "style": { + "titleNView": false, + "navigationBarTitleText": "退件" + } } ], "globalStyle": { diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index cb96ac1..58bd67e 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,41 +1,11 @@