diff --git a/dist.tar.gz b/dist.tar.gz index 879a9032..61ebe0ac 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/combogoods/combogoods.ts b/src/api/combogoods/combogoods.ts index 646ebd4e..633dad7b 100644 --- a/src/api/combogoods/combogoods.ts +++ b/src/api/combogoods/combogoods.ts @@ -46,6 +46,7 @@ export type ComboGoodsCreateParams = { combo_code: string combo_name: string warehouse_id?: number + store_id?: number remark?: string custom_code?: string items: ComboGoodsCreateItem[] @@ -62,6 +63,7 @@ export type ComboGoodsUpdateParams = { id: number combo_name?: string warehouse_id?: number + store_id?: number | null remark?: string custom_code?: string | null status?: number diff --git a/src/lang/zh-CN.ts b/src/lang/zh-CN.ts index 3e99fbef..ec72499c 100644 --- a/src/lang/zh-CN.ts +++ b/src/lang/zh-CN.ts @@ -70,6 +70,7 @@ export default { 'shipperSigning':'货主签约', 'Productflow':'商品流水', 'Externalwarehouse':'外部仓库', + 'StoreReport':'门店报告', }, "login": { "title": "登录", diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index ec779fb8..b88b8255 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -1,3 +1,12 @@ +/** 订单管理页面配置 */ +export const ORDER_PAGE_CONFIG = { + /** + * 单页模式:开启后不显示标签切换区域, + * 直接展示默认页签(待处理订单)的内容 + */ + singlePage: false +} + // 通用翻译映射 export const COMMON_TRANSLATIONS: Record> = { is_urgency: { @@ -937,7 +946,7 @@ export const orderItemCompactColumns: OrderItemColumnConfig[] = [ { prop: 'actual_price', label: '实付单价', width: 120, align: 'right', amount: true }, { prop: 'retail_price', label: '零售单价', width: 120, align: 'right', amount: true }, { prop: 'inventory_type', label: '库存类型', width: 100, align: 'center' }, - { prop: 'stock_id', label: '库存ID', width: 100, align: 'center' } + { prop: 'stock_id', label: 'SKU', width: 100, align: 'center' } ] /** 商品明细显示全部:对齐 data.json items 返回字段 */ @@ -949,7 +958,7 @@ export const orderItemFullColumns: OrderItemColumnConfig[] = [ { prop: 'item_code', label: '商品编码', minWidth: 140, showOverflowTooltip: true }, { prop: 'item_name', label: '商品名称', minWidth: 180, showOverflowTooltip: true }, { prop: 'item_id', label: '商品ID', width: 100, align: 'center' }, - { prop: 'stock_id', label: '库存ID', width: 100, align: 'center' }, + { prop: 'stock_id', label: 'SKU', width: 100, align: 'center' }, { prop: 'plan_qty', label: '计划数量', width: 100, align: 'center' }, { prop: 'actual_price', label: '实付单价', width: 120, align: 'right', amount: true }, { prop: 'retail_price', label: '零售单价', width: 120, align: 'right', amount: true }, diff --git a/src/views/order/orderManagement/index.vue b/src/views/order/orderManagement/index.vue index 32479ed0..bfca388c 100644 --- a/src/views/order/orderManagement/index.vue +++ b/src/views/order/orderManagement/index.vue @@ -1,39 +1,45 @@