diff --git a/src/views/order/orderManagement/archiveOrder.vue b/src/views/order/orderManagement/archiveOrder.vue index 2305af2c..e3a5fe51 100644 --- a/src/views/order/orderManagement/archiveOrder.vue +++ b/src/views/order/orderManagement/archiveOrder.vue @@ -26,9 +26,10 @@ /> -
+ +
@@ -179,7 +180,6 @@ const hasSelection = ref(false) const selectedOrderId = ref(null) const detailVisible = ref(true) -const quickSearch = ref('') const toolbarButtons = archiveOrderToolbarButtons const selectedRow = computed(() => { @@ -268,22 +268,7 @@ async function loadData() { } function buildWhere() { - let where = buildOrderWhereConditions(scanBox.value?.getConditions?.() || {}) - if (quickSearch.value) { - const q = quickSearch.value.trim() - if (/^\d+$/.test(q)) { - where.id = { - operator: 'eq', - value: Number(q), - type: 'text' - } - } - where.delivery_order_code = { - operator: 'like', - value: q, - type: 'text' - } - } + const where = buildOrderWhereConditions(scanBox.value?.getConditions?.() || {}) return sanitizeArchiveListWhere(where) } @@ -366,11 +351,6 @@ function handlePageSizeChange(size: number) { loadData() } -function onQuickSearch() { - pagination.currentPage = 1 - loadData() -} - function openColumnConfigPanel() { upperTable.value?.openColumnConfig?.() } diff --git a/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue b/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue index 49d8684b..92f86d93 100644 --- a/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue +++ b/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue @@ -8,13 +8,13 @@ @close="handleClose" @closed="resetForm" > - + /> --> diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 1614b0b6..aff86ceb 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -1095,6 +1095,8 @@ export const orderIdScanField = scanBasicField({ label: '订单ID', value: 'id', export const orderFlagScanField = scanBasicField({ label: '订单标记', value: 'order_flag', type: 'text', operators: ['like', 'notlike'], defaultOperator: 'like' }) export const waveNoScanField = scanBasicField({ label: '波次号', value: 'wave_no', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'eq' }) export const deliveryOrderCodeScanField = scanBasicField({ label: '发货单号', value: 'delivery_order_code', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'eq' }) +/** ScanBox:搜索订单号(模糊匹配发货单号,替代表格右上角快捷搜索) */ +export const orderQuickSearchScanField = scanBasicField({ label: '搜索订单号', value: 'delivery_order_code', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'like' }) export const sourceOrderCodesScanField = scanBasicField({ label: '平台交易单号', value: 'source_order_codes', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'eq' }) export const pendingOrderCodeScanField = scanBasicField({ label: '发货单号', value: 'order_code', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'eq' }) export const exceptionOrderCodeScanField = scanBasicField({ label: '发货单号', value: 'order_code', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'eq' }) @@ -1146,6 +1148,17 @@ export const waveAssignmentScanField = scanBasicField({ ] }) +/** ScanBox:储位分配(合并 unassigned/assigning/error 为「未分配」) */ +export const storageAssignScanField = scanWorkflowField({ + label: '储位分配', + value: 'storage_status', + type: 'select', + options: [ + { label: '未分配', value: '__storage_assign_unassigned__', operator: 'in', conditionValue: ['unassigned', 'assigning', 'error'] }, + { label: '已完成', value: '__storage_assign_completed__', operator: 'eq', conditionValue: 'completed' } + ] +}) + /** ScanBox:快递公司(快递编码),选项由 index.getExpressList + fillExpressCompanyScanFieldOptions 注入 */ export const expressCompanyScanField = scanBasicField({ label: '快递公司', @@ -1225,7 +1238,8 @@ export const deliveryAvailableFields = [ // 基础信息 storeScanField, orderIdScanField, - deliveryOrderCodeScanField, + orderQuickSearchScanField, + // deliveryOrderCodeScanField, sourceOrderCodesScanField, orderFlagScanField, waveAssignmentScanField, @@ -1441,7 +1455,8 @@ export const reviewAvailableFields = [ // 基础信息 storeScanField, orderIdScanField, - deliveryOrderCodeScanField, + orderQuickSearchScanField, + // deliveryOrderCodeScanField, sourceOrderCodesScanField, waveAssignmentScanField, waveNoScanField, @@ -1588,7 +1603,8 @@ export const pendingAvailableFields = [ // 基础信息 storeScanField, orderIdScanField, - pendingOrderCodeScanField, + orderQuickSearchScanField, + // pendingOrderCodeScanField, sourceOrderCodesScanField, orderFlagScanField, waveAssignmentScanField, @@ -1612,7 +1628,8 @@ export const pendingAvailableFields = [ orderStatusScanField(pendingOrderStatusFilterOptions), syncStatusScanField, recheckStatusScanField, - storageStatusScanField, + storageAssignScanField, + // storageStatusScanField, postStatusScanField, pickStatusScanField, packStatusScanField, @@ -1913,8 +1930,9 @@ export const expectionOrderAvailableFields = [ // 基础信息 storeScanField, orderIdScanField, - exceptionOrderCodeScanField, - deliveryOrderCodeScanField, + orderQuickSearchScanField, + // exceptionOrderCodeScanField, + // deliveryOrderCodeScanField, sourceOrderCodesScanField, orderFlagScanField, waveAssignmentScanField, @@ -1930,7 +1948,8 @@ export const expectionOrderAvailableFields = [ orderStatusScanField(exceptionOrderStatusFilterOptions), syncStatusScanField, recheckStatusScanField, - storageStatusScanField, + storageAssignScanField, + // storageStatusScanField, postStatusScanField, pickStatusScanField, packStatusScanField, @@ -2025,8 +2044,9 @@ export const archiveAvailableFields = [ // 基础信息 storeScanField, orderIdScanField, - exceptionOrderCodeScanField, - deliveryOrderCodeScanField, + orderQuickSearchScanField, + // exceptionOrderCodeScanField, + // deliveryOrderCodeScanField, sourceOrderCodesScanField, waveAssignmentScanField, waveNoScanField, diff --git a/src/views/order/orderManagement/deliveryException.vue b/src/views/order/orderManagement/deliveryException.vue index 1c0316c2..3ac553ed 100644 --- a/src/views/order/orderManagement/deliveryException.vue +++ b/src/views/order/orderManagement/deliveryException.vue @@ -26,9 +26,10 @@ />
-
+ +
@@ -174,7 +175,6 @@ const hasSelection = ref(false) const selectedOrderId = ref(null) const detailVisible = ref(true) -const quickSearch = ref('') const toolbarButtons = deliveryExceptionToolbarButtons const selectedRow = computed(() => { @@ -263,22 +263,7 @@ async function loadData() { } function buildWhere() { - let where = buildOrderWhereConditions(scanBox.value?.getConditions?.() || {}) - if (quickSearch.value) { - const q = quickSearch.value.trim() - if (/^\d+$/.test(q)) { - where.id = { - operator: 'eq', - value: Number(q), - type: 'text' - } - } - where.delivery_order_code = { - operator: 'like', - value: q, - type: 'text' - } - } + const where = buildOrderWhereConditions(scanBox.value?.getConditions?.() || {}) return sanitizeDeliveryExpectionListWhere(where) } @@ -361,11 +346,6 @@ function handlePageSizeChange(size: number) { loadData() } -function onQuickSearch() { - pagination.currentPage = 1 - loadData() -} - function openColumnConfigPanel() { upperTable.value?.openColumnConfig?.() } diff --git a/src/views/order/orderManagement/entrustWarehouse.vue b/src/views/order/orderManagement/entrustWarehouse.vue index 138ae7be..643523df 100644 --- a/src/views/order/orderManagement/entrustWarehouse.vue +++ b/src/views/order/orderManagement/entrustWarehouse.vue @@ -26,9 +26,10 @@ />
-
+ +
@@ -174,7 +175,6 @@ const hasSelection = ref(false) const selectedOrderId = ref(null) const detailVisible = ref(true) -const quickSearch = ref('') const toolbarButtons = entrustWarehouseToolbarButtons const selectedRow = computed(() => { @@ -263,22 +263,7 @@ async function loadData() { } function buildWhere() { - let where = buildOrderWhereConditions(scanBox.value?.getConditions?.() || {}) - if (quickSearch.value) { - const q = quickSearch.value.trim() - if (/^\d+$/.test(q)) { - where.id = { - operator: 'eq', - value: Number(q), - type: 'text' - } - } - where.delivery_order_code = { - operator: 'like', - value: q, - type: 'text' - } - } + const where = buildOrderWhereConditions(scanBox.value?.getConditions?.() || {}) return sanitizeEntrustListWhere(where) } @@ -361,11 +346,6 @@ function handlePageSizeChange(size: number) { loadData() } -function onQuickSearch() { - pagination.currentPage = 1 - loadData() -} - function openColumnConfigPanel() { upperTable.value?.openColumnConfig?.() } diff --git a/src/views/order/orderManagement/exceptionOrder.vue b/src/views/order/orderManagement/exceptionOrder.vue index 58a1fd93..d37a7857 100644 --- a/src/views/order/orderManagement/exceptionOrder.vue +++ b/src/views/order/orderManagement/exceptionOrder.vue @@ -24,7 +24,8 @@ :layout-key="toolbarLayoutKey" @action="handleToolbarButtonClick" /> - +