From 84291ca149b3f70ebd5aa36426463c498ad52a72 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 9 Jul 2026 03:33:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=81=A2=E5=A4=8D=E7=AD=BE=E7=BA=A6?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=20ScanBox=20=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=EF=BC=9B=E4=BB=93=E5=BA=93=E9=A1=B5=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E5=8F=91=E8=B5=B7=E7=AD=BE=E7=BA=A6=E3=80=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=A5=87=E9=97=A8=E9=85=8D=E7=BD=AE=E5=8F=AA=E8=AF=BB?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=EF=BC=9B=E6=96=B0=E5=BB=BA=E5=A4=96=E4=BB=93?= =?UTF-8?q?=E5=95=86=E5=93=81=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - warehouses: 恢复 ScanBox,移除预览签约,新增奇门配置查看(支持复制货主/仓库编码) - stores: 恢复 ScanBox,移除发起签约按钮及弹窗(签约已统一由货主方发起) - storeWarehouse API: 新增 storeWarehouseList 导出 - 新建 stock/external_stock 外仓商品页面 --- .../storeWarehouse.store/storeWarehouse.ts | 39 +- src/router/map.ts | 1 + src/views/stock/external_stock/index.vue | 350 ++++++++++++++++++ src/views/store/stores/index.vue | 230 +++--------- src/views/store/stores/store-config.ts | 25 +- src/views/warehouses/index.vue | 337 +++++++++++++++-- 6 files changed, 766 insertions(+), 216 deletions(-) create mode 100644 src/views/stock/external_stock/index.vue diff --git a/src/api/storeWarehouse.store/storeWarehouse.ts b/src/api/storeWarehouse.store/storeWarehouse.ts index ddc07430..4f9c283d 100644 --- a/src/api/storeWarehouse.store/storeWarehouse.ts +++ b/src/api/storeWarehouse.store/storeWarehouse.ts @@ -1,7 +1,26 @@ import request from '@/utils/request' const v = "1.0"; -/** 查询当前主体可见的仓库-货主签约列表 */ +/** 查询当前主体可见的货主列表 */ +export function storeList(data: { + keyword?: string + page?: number + page_size?: number +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storeWarehouse.store.list', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** 货主侧查询签约关系列表 */ export function storeWarehouseList(data: { keyword?: string page?: number @@ -20,6 +39,24 @@ export function storeWarehouseList(data: { } as any) } +/** 查询当前主体可见的仓库列表 */ +export function warehouseList(data: { + keyword?: string + page?: number + page_size?: number +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storeWarehouse.warehouse.list', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} /** * 发起签约 / 预览签约信息 * - 不带 action:提交签约申请(返回 mode: initiate | already_exists | already_confirmed) diff --git a/src/router/map.ts b/src/router/map.ts index 3506fbeb..8979b84a 100644 --- a/src/router/map.ts +++ b/src/router/map.ts @@ -19,6 +19,7 @@ export const componentMap: Record = { /** 与后端菜单 component 字段兼容:商品管理入口 */ 'stock/index': () => import('@/views/stock/stockManagement/index.vue'), 'stock/storestock/index': () => import('@/views/stock/storestock/index.vue'), + 'stock/external_stock/index': () => import('@/views/stock/external_stock/index.vue'), /** 组合商品并入商品管理,保留旧路径兼容 */ // 'stock/combo_stock': () => import('@/views/stock/stockManagement/index.vue'), // 'stock/combo_stock/index': () => import('@/views/stock/stockManagement/index.vue'), diff --git a/src/views/stock/external_stock/index.vue b/src/views/stock/external_stock/index.vue new file mode 100644 index 00000000..2dc97665 --- /dev/null +++ b/src/views/stock/external_stock/index.vue @@ -0,0 +1,350 @@ + + + + + diff --git a/src/views/store/stores/index.vue b/src/views/store/stores/index.vue index 03e75027..7ba3568f 100644 --- a/src/views/store/stores/index.vue +++ b/src/views/store/stores/index.vue @@ -1,11 +1,19 @@