diff --git a/src/lang/en-US.ts b/src/lang/en-US.ts index aa684691..a54f3146 100644 --- a/src/lang/en-US.ts +++ b/src/lang/en-US.ts @@ -167,5 +167,17 @@ export default { "type": "Type", "status": "Status", "address": "Address" + }, + "setting": { + "printTemplate": { + "list": { + "STOCK": "Stock Label", + "RECEIPT": "Receipt", + "PICKING": "Picking List", + "PICKIN": "Picking List", + "OUTBOUND": "Outbound Order", + "ENTRY_ORDER": "Entry Order" + } + } } } \ No newline at end of file diff --git a/src/lang/zh-CN.ts b/src/lang/zh-CN.ts index 553e635f..e1983ca0 100644 --- a/src/lang/zh-CN.ts +++ b/src/lang/zh-CN.ts @@ -168,5 +168,17 @@ export default { "type": "仓库类型", "status": "仓库状态", "address": "仓库地址" + }, + "setting": { + "printTemplate": { + "list": { + "STOCK": "商品标签", + "RECEIPT": "收货单", + "PICKING": "拣货单", + "PICKIN": "拣货单", + "OUTBOUND": "出库单", + "ENTRY_ORDER": "入库单" + } + } } } \ No newline at end of file diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 8e580bae..7f35f160 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -18,7 +18,7 @@ export const COMMON_TRANSLATIONS: Record> = { 'padding': '待同步', 'pedding': '待同步', 'pending': '待同步', - 'fin': '已完成', + 'fin': '已同步', 'error': '错误', 'none': '未同步' }, @@ -1655,8 +1655,7 @@ export const pendingAvailableFields = [ orderStatusScanField(pendingOrderStatusFilterOptions), syncStatusScanField, recheckStatusScanField, - storageAssignScanField, - // storageStatusScanField, + storageStatusScanField, postStatusScanField, pickStatusScanField, packStatusScanField, @@ -1882,8 +1881,10 @@ export const exceptionToolbarButtonKeys = [...pendingToolbarButtonKeys] export const exceptionToolbarButtons = pickToolbarButtons(exceptionToolbarButtonKeys) -// outboundOrder -export const outboundAvailableFields = pendingAvailableFields +// outboundOrder(保留储位分配筛选,与待处理订单的储位状态区分) +export const outboundAvailableFields = pendingAvailableFields.map((field: any) => + field.value === 'storage_status' ? storageAssignScanField : field +) export const outboundColumns = pendingCloums @@ -1977,8 +1978,7 @@ export const expectionOrderAvailableFields = [ orderStatusScanField(exceptionOrderStatusFilterOptions), syncStatusScanField, recheckStatusScanField, - storageAssignScanField, - // storageStatusScanField, + storageStatusScanField, postStatusScanField, pickStatusScanField, packStatusScanField, diff --git a/src/views/order/orderManagement/exceptionOrder.vue b/src/views/order/orderManagement/exceptionOrder.vue index d37a7857..eaaba028 100644 --- a/src/views/order/orderManagement/exceptionOrder.vue +++ b/src/views/order/orderManagement/exceptionOrder.vue @@ -24,18 +24,6 @@ :layout-key="toolbarLayoutKey" @action="handleToolbarButtonClick" /> - -