diff --git a/src/views/order/orderManagement/component/TransferByOrdersDialog.vue b/src/views/order/orderManagement/component/TransferByOrdersDialog.vue index c69ad787..517346b8 100644 --- a/src/views/order/orderManagement/component/TransferByOrdersDialog.vue +++ b/src/views/order/orderManagement/component/TransferByOrdersDialog.vue @@ -1,157 +1,205 @@ @@ -365,97 +413,198 @@ async function copyIds(list: Array<{ order_id?: number | string }>, label: strin + + diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index 2f83b864..5951169b 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -221,47 +221,87 @@ - - - - - - - - - - + +
+
+
+

选择运单号打印

+

勾选需要打印的运单号

+
+ +
+ +
+

+ {{ subWaybillSelectErrorMessage }} +

+
+
+ 已选运单 + {{ subWaybillSelectedWaybills.length }} 个 +
+ +
+ 运单号列表 +
+ + + + + + + + +
+
+
+ +

+ 仅打印已勾选的运单号,主单与子单可分别选择。 +

+
+ + +
+ + diff --git a/src/views/order/orderManagement/exceptionOrder.vue b/src/views/order/orderManagement/exceptionOrder.vue index a066082b..e30d2e22 100644 --- a/src/views/order/orderManagement/exceptionOrder.vue +++ b/src/views/order/orderManagement/exceptionOrder.vue @@ -317,32 +317,59 @@ - - - - {{ resolveExceptionOrderIds.length }} 条 - - -
{{ resolveExceptionOrderIds.join(', ') }}
-
-
- +
+
+
+

异常订单处理

+

将异常订单恢复为正常待处理状态

+
+ +
+ +
+
+
+ 已选订单数 + {{ resolveExceptionOrderIds.length }} 条 +
+
+ 订单 ID +
{{ resolveExceptionOrderIds.join(', ') || '—' }}
+
+
+

+ 该操作会将异常订单恢复为正常待处理状态(step: 3 → 2)。 +

+
+ +
+ 提交前请确认已选订单 +
+ 取消 + + 确认处理 + +
+
+
+ + diff --git a/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue b/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue index 7c3847be..dd875fb7 100644 --- a/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue +++ b/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue @@ -1,41 +1,76 @@ @@ -109,12 +144,182 @@ function handleClosed() { } - + + diff --git a/src/views/order/orderManagement/form/BatchQuickRecheckForm.vue b/src/views/order/orderManagement/form/BatchQuickRecheckForm.vue index f89b4897..965020e5 100644 --- a/src/views/order/orderManagement/form/BatchQuickRecheckForm.vue +++ b/src/views/order/orderManagement/form/BatchQuickRecheckForm.vue @@ -1,97 +1,105 @@ @@ -274,23 +282,170 @@ async function handleSubmit() { + + diff --git a/src/views/order/orderManagement/form/CloneOrderForm.vue b/src/views/order/orderManagement/form/CloneOrderForm.vue index 9475d183..a98e2dda 100644 --- a/src/views/order/orderManagement/form/CloneOrderForm.vue +++ b/src/views/order/orderManagement/form/CloneOrderForm.vue @@ -1,26 +1,52 @@ @@ -39,13 +65,149 @@ const emit = defineEmits<{ }>() - + + diff --git a/src/views/order/orderManagement/form/ManualWaybillForm.vue b/src/views/order/orderManagement/form/ManualWaybillForm.vue index cc991b59..82ecef90 100644 --- a/src/views/order/orderManagement/form/ManualWaybillForm.vue +++ b/src/views/order/orderManagement/form/ManualWaybillForm.vue @@ -1,48 +1,75 @@ @@ -115,16 +142,182 @@ function handleClosed() { } - + + diff --git a/src/views/order/orderManagement/form/UpdateAddressForm.vue b/src/views/order/orderManagement/form/UpdateAddressForm.vue index 485d2740..476dcbaf 100644 --- a/src/views/order/orderManagement/form/UpdateAddressForm.vue +++ b/src/views/order/orderManagement/form/UpdateAddressForm.vue @@ -1,121 +1,158 @@ @@ -207,13 +244,175 @@ function handleAreaChange(code: string) { + + diff --git a/src/views/order/orderManagement/form/UpdateOrderMetaForm.vue b/src/views/order/orderManagement/form/UpdateOrderMetaForm.vue index abe3a484..342f6a9a 100644 --- a/src/views/order/orderManagement/form/UpdateOrderMetaForm.vue +++ b/src/views/order/orderManagement/form/UpdateOrderMetaForm.vue @@ -1,40 +1,73 @@ @@ -63,3 +96,173 @@ const codeProxy = computed({ } }) + + + + diff --git a/src/views/order/orderManagement/form/UpdateRemarkForm.vue b/src/views/order/orderManagement/form/UpdateRemarkForm.vue index 5809849f..6ca9b160 100644 --- a/src/views/order/orderManagement/form/UpdateRemarkForm.vue +++ b/src/views/order/orderManagement/form/UpdateRemarkForm.vue @@ -1,42 +1,62 @@ @@ -64,7 +84,173 @@ const emit = defineEmits<{ + + diff --git a/src/views/order/orderManagement/pendingOrder.vue b/src/views/order/orderManagement/pendingOrder.vue index 92f6036d..7dedc2b3 100644 --- a/src/views/order/orderManagement/pendingOrder.vue +++ b/src/views/order/orderManagement/pendingOrder.vue @@ -313,32 +313,59 @@ - - - - {{ resolveExceptionOrderIds.length }} 条 - - -
{{ resolveExceptionOrderIds.join(', ') }}
-
-
- +
+
+
+

异常订单处理

+

将异常订单恢复为正常待处理状态

+
+ +
+ +
+
+
+ 已选订单数 + {{ resolveExceptionOrderIds.length }} 条 +
+
+ 订单 ID +
{{ resolveExceptionOrderIds.join(', ') || '—' }}
+
+
+

+ 该操作会将异常订单恢复为正常待处理状态 +

+
+ +
+ 提交前请确认已选订单 +
+ 取消 + + 确认处理 + +
+
+
+ + diff --git a/src/views/order/waveOrder/component/ConfirmWavePrintDialog.vue b/src/views/order/waveOrder/component/ConfirmWavePrintDialog.vue index 7476ce64..382ed2f3 100644 --- a/src/views/order/waveOrder/component/ConfirmWavePrintDialog.vue +++ b/src/views/order/waveOrder/component/ConfirmWavePrintDialog.vue @@ -1,55 +1,78 @@ @@ -148,67 +171,186 @@ async function handleSubmit() { + + diff --git a/src/views/storage/receiving/component/Product.vue b/src/views/storage/receiving/component/Product.vue index 821f39b0..48661f23 100644 --- a/src/views/storage/receiving/component/Product.vue +++ b/src/views/storage/receiving/component/Product.vue @@ -309,43 +309,109 @@ - -
-
- - - - 已按收货单货主过滤:{{ boundStoreName || ('ID ' + boundStoreId) }} - 当前收货单未绑定货主,查询不过滤货主 + + +
+
+
+

查询系统商品

+ +
+ +
+ +
+
+
+ + + 查询 + +
+ + + + +
+ +
+ +
+ +
+
-
- -
+
+ +
+ + 取消 + 使用选中商品 +
+
-
@@ -384,75 +450,148 @@ - -
- - 选择Excel - 下载模板 - 清除数据 - 只重试失败 - 导入 - 已选文件:{{ batchImportFileName || '未选择' }} -
+ + +
+
+
+

批量导入商品

+ +
+ +
-
- - - - - - -
+
-
- 已生成基础新增数组:{{ batchImportAddItems.length }} 条 -
+
+ +
+ + + + + + +
+
+
- +
+
+ + 关闭 +
+
+
@@ -972,6 +1111,24 @@ const systemProductAllResults = ref([]) const systemProductSelection = ref([]) const systemProductPagination = reactive({ page: 1, pageSize: 10, total: 0 }) +/** 条码列多值折叠取值:只显示首个条码 + `+N` 展开全部(UpperTable copyAction 内置能力) */ +const getSystemProductBarcodes = (row: any): unknown[] => + Array.isArray(row?.barcodes) ? row.barcodes : [] + +/** 批量导入条码列多值折叠取值:支持数组 / 逗号、竖线、分号分隔的多个条码 */ +const getBatchImportBarcodes = (row: any): string[] => { + const raw = row?.barcode + if (Array.isArray(raw)) { + return raw.map((item) => String(item ?? '').trim()).filter(Boolean) + } + const text = String(raw ?? '').trim() + if (!text) return [] + return text + .split(/[|,,;;]/) + .map((item) => item.trim()) + .filter(Boolean) +} + const spacePickerVisible = ref(false) const spaceLoading = ref(false) const spaceKeyword = ref('') @@ -986,6 +1143,20 @@ const batchImportSourceFile = ref(null) const batchImportFileName = ref('') const batchImportPreviewRows = ref([]) const batchImportAddItems = ref([]) +const batchImportPage = ref(1) +const batchImportPageSize = ref(200) +const batchImportPagedRows = computed(() => { + const start = (batchImportPage.value - 1) * batchImportPageSize.value + return batchImportPreviewRows.value.slice(start, start + batchImportPageSize.value) +}) + +/** 每页条数或数据变化后,把当前页收敛到有效范围,避免出现空白页 */ +watch([batchImportPageSize, () => batchImportPreviewRows.value.length], () => { + const maxPage = Math.max(1, Math.ceil(batchImportPreviewRows.value.length / batchImportPageSize.value)) + if (batchImportPage.value > maxPage) { + batchImportPage.value = maxPage + } +}) const batchImportEditingRow = ref(null) const batchImportPickerMode = ref<'space' | 'sku' | ''>('') const batchRetryFailedLoading = ref(false) @@ -1735,6 +1906,7 @@ const generateBatchImportList = async () => { }) batchImportPreviewRows.value = previewRows + batchImportPage.value = 1 addItems.push(...previewRows.map((r) => ({ item: { ...(r.item_payload || {}) } }))) batchImportAddItems.value = addItems ElMessage.success(`已生成 ${addItems.length} 条基础新增数据`) @@ -1749,6 +1921,7 @@ const generateBatchImportList = async () => { const clearBatchImportData = () => { batchImportPreviewRows.value = [] batchImportAddItems.value = [] + batchImportPage.value = 1 batchImportSourceFile.value = null batchImportFileName.value = '' } @@ -2759,23 +2932,266 @@ onUnmounted(() => { flex-wrap: wrap; } -.batch-import-toolbar { +/* 批量导入商品面板:结构 / 尺寸对齐手工录入运单号(TaskProgressPanel) */ +.task-panel { display: flex; - align-items: center; - gap: 10px; - flex-wrap: wrap; - margin-bottom: 10px; + flex-direction: column; + max-height: calc(100vh - 96px); + background: #fff; + color: #303133; + + &__head { + display: flex; + align-items: flex-start; + gap: 12px; + padding: 16px 16px 8px; + flex-shrink: 0; + } + + &__titles { + flex: 1; + min-width: 0; + + h2 { + margin: 0; + font-size: 18px; + line-height: 24px; + font-weight: 400; + color: #303133; + } + + p { + margin: 4px 0 0; + font-size: 12px; + line-height: 18px; + color: #909399; + } + } + + &__close { + width: 24px; + height: 24px; + flex: none; + display: inline-flex; + align-items: center; + justify-content: center; + border: none; + border-radius: 4px; + background: transparent; + color: #909399; + cursor: pointer; + transition: color 0.2s; + + svg { + width: 12px; + height: 12px; + } + + &:hover { + color: #409eff; + } + } + + &__body { + flex: 1; + min-height: 0; + padding: 6px 16px 0; + display: flex; + flex-direction: column; + overflow-y: auto; + } + + /* 工具栏:按钮间距 6px,与 OrderToolbarButtonGroup 一致 */ + &__toolbar { + display: flex; + align-items: center; + gap: 12px; + flex-shrink: 0; + } + + &__toolbar-main { + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 6px; + min-width: 0; + + :deep(.el-button) { + margin-left: 0; + margin-right: 0; + } + + /* 禁用态:保持字体颜色可读,与 toolbar 按钮一致 */ + :deep(.el-button.is-disabled), + :deep(.el-button.is-disabled:hover), + :deep(.el-button.is-disabled:focus), + :deep(.el-button.is-disabled:active) { + color: #606266; + background-color: #fafbfc; + border-color: #ebeef5; + } + + :deep(.el-button--primary.is-disabled), + :deep(.el-button--primary.is-disabled:hover), + :deep(.el-button--primary.is-disabled:focus), + :deep(.el-button--primary.is-disabled:active) { + color: #409eff; + background-color: #f5faff; + border-color: #e4efff; + } + + :deep(.el-button--primary.is-plain.is-disabled), + :deep(.el-button--primary.is-plain.is-disabled:hover), + :deep(.el-button--primary.is-plain.is-disabled:focus), + :deep(.el-button--primary.is-plain.is-disabled:active) { + color: #409eff; + background-color: #fff; + border-color: #409eff; + } + + :deep(.el-button--danger.is-disabled), + :deep(.el-button--danger.is-disabled:hover), + :deep(.el-button--danger.is-disabled:focus), + :deep(.el-button--danger.is-disabled:active) { + color: #f56c6c; + background-color: #fff; + border-color: #f56c6c; + } + } + + &__file-hint { + margin-left: auto; + min-width: 0; + max-width: 40%; + font-size: 12px; + line-height: 20px; + color: #909399; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + &__section { + display: flex; + flex-direction: column; + gap: 6px; + margin-top: 10px; + flex-shrink: 0; + } + + &__section-head { + display: flex; + align-items: center; + justify-content: space-between; + gap: 8px; + } + + &__section-title { + font-size: 12px; + line-height: 20px; + color: #606266; + padding-left: 2px; + flex-shrink: 0; + } + + &__section-meta { + font-size: 12px; + line-height: 20px; + color: #909399; + } + + &__table-wrap { + border-radius: 4px; + overflow: hidden; + } + + &__form-tip { + margin: 8px 0 0; + padding: 8px 12px; + border-radius: 4px; + background: #f4f4f5; + font-size: 12px; + line-height: 18px; + color: #909399; + } + + &__foot { + display: flex; + align-items: center; + justify-content: flex-end; + gap: 12px; + padding: 12px 16px 16px; + flex-shrink: 0; + } + + &__hint { + margin-right: auto; + font-size: 12px; + color: #909399; + } + + &__actions { + display: flex; + align-items: center; + gap: 8px; + + :deep(.el-button) { + margin-left: 0; + margin-right: 0; + } + } } -.batch-import-summary { - margin-top: 10px; - color: #606266; +/* 分页位于页脚「关闭」按钮左侧,始终展示;尺寸 / 选择器宽度对齐 UpperTable 默认分页 */ +.batch-import-pagination, +.system-product-pagination { + flex: none; + margin-right: 4px; + + :deep(.el-pagination) { + flex-wrap: wrap; + justify-content: flex-end; + --el-pagination-button-width: 28px; + --el-pagination-button-height: 28px; + } + + :deep(.el-pagination__total), + :deep(.el-pagination__sizes) { + display: inline-flex !important; + margin-right: 8px; + } + + :deep(.el-select--small) { + width: 80px; + } + + :deep(.el-input__wrapper) { + padding: 0 4px; + } +} + +/* 收货单货主过滤说明:与查询行同行、靠右,纯文字无容器背景 */ +.system-product-filter-hint { + margin-left: auto; + min-width: 0; + max-width: 45%; font-size: 12px; + line-height: 20px; + color: #909399; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +/* 查询系统商品:表格需要确定高度才能内部滚动 */ +.system-product-dialog-table { + height: 400px; } .batch-cell-action { display: flex; align-items: center; + justify-content: center; gap: 6px; } @@ -2788,6 +3204,13 @@ onUnmounted(() => { height: 440px; } +/* 表格固定高度:数据少也保持同样大小,超出容器时表格内部滚动(短屏自适应) */ +.batch-import-table { + height: min(450px, calc(100vh - 280px)); + border-radius: 4px; + overflow: hidden; +} + .product-window { position: fixed; z-index: 2000; @@ -3134,4 +3557,19 @@ onUnmounted(() => { .ut-status-text--warning { color: var(--el-color-warning); } .ut-status-text--info { color: var(--el-color-info); } .ut-status-text--danger { color: var(--el-color-danger); } + +/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板(同手工录入运单号) */ +.el-dialog.batch-import-dialog, +.el-dialog.system-product-dialog { + padding: 0; + overflow: hidden; + + .el-dialog__header { + display: none; + } + + .el-dialog__body { + padding: 0; + } +} diff --git a/src/views/storage/receiving/index.vue b/src/views/storage/receiving/index.vue index f3d3c279..542048d5 100644 --- a/src/views/storage/receiving/index.vue +++ b/src/views/storage/receiving/index.vue @@ -196,111 +196,181 @@ - - - - - - - - - - + +
+
+
+

批量驳回收货单

+

驳回已勾选的收货单并记录理由

+
+ +
+ +
+
+
+ 已选收货单 + {{ selectionRows.length }} 条 +
+
+ 驳回理由 + +
+
+ +
+ +
+ 提交前请确认已选收货单 +
+ 取消 + + 确认驳回 + +
+
+
+
+ + + -
-
-
入库单列表
- - - - - - - - - -
-
-
- 明细对比 - - 收货单 {{ matchPutawayReceivingRow?.receiving_number || '—' }} - - - - {{ matchComparisonSummary.text }} - + +
+
+
+

匹配入库

+

选择入库单与收货单明细比对后确认匹配

- - - - - - - - - - - - - - - - - - - - + + {{ matchComparisonSummary.text }} + +
+
+ + + + + + + + + + + + + + + + + + + + +
+
+
- - + +
@@ -1739,46 +1809,217 @@ async function handleExportAll() { flex-shrink: 0; display: flex; flex-direction: column; + gap: 6px; min-height: 0; - - :deep(.el-table) { height: 100%; } } .match-right-panel { flex: 1; display: flex; flex-direction: column; + gap: 6px; min-width: 0; + min-height: 0; } -.match-right-panel > .el-table { - flex: 1; -} - -.match-panel-title { - font-size: 13px; - font-weight: 600; - color: #303133; - margin-bottom: 6px; +.match-panel-head { + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 8px; flex-shrink: 0; } -.match-putaway-dialog .match-hint { - margin: 0 0 8px; - font-size: 13px; - color: #606266; -} - -.match-putaway-footer { - display: flex; - justify-content: space-between; - align-items: center; - width: 100%; -} - -.match-selection-tip { +.match-panel-meta { font-size: 12px; + line-height: 20px; color: #909399; + min-width: 0; +} + +.match-panel-summary { + margin-left: auto; +} + +/* 面板结构 / 尺寸对齐手工录入运单号(TaskProgressPanel):驳回 / 匹配入库共用 */ +.task-panel { + display: flex; + flex-direction: column; + max-height: calc(100vh - 96px); + background: #fff; + color: #303133; + + &__head { + display: flex; + align-items: flex-start; + gap: 12px; + padding: 16px; + flex-shrink: 0; + } + + &__titles { + flex: 1; + min-width: 0; + + h2 { + margin: 0; + font-size: 18px; + line-height: 24px; + font-weight: 400; + color: #303133; + } + + p { + margin: 4px 0 0; + font-size: 12px; + line-height: 18px; + color: #909399; + } + } + + &__close { + width: 24px; + height: 24px; + flex: none; + display: inline-flex; + align-items: center; + justify-content: center; + border: none; + border-radius: 4px; + background: transparent; + color: #909399; + cursor: pointer; + transition: color 0.2s; + + svg { + width: 12px; + height: 12px; + } + + &:hover { + color: #409eff; + } + } + + &__body { + flex: 1; + min-height: 0; + padding: 12px 16px 0; + display: flex; + flex-direction: column; + } + + &__section-title { + font-size: 12px; + line-height: 20px; + color: #606266; + padding-left: 2px; + flex-shrink: 0; + } + + &__table-wrap { + flex: 1; + min-height: 0; + border-radius: 4px; + overflow: hidden; + + :deep(.el-table) { + height: 100%; + } + } + + &__form { + display: flex; + flex-direction: column; + gap: 8px; + } + + &__field { + display: flex; + align-items: center; + justify-content: space-between; + gap: 16px; + min-height: 40px; + padding: 8px 12px; + border: 1px solid #ebeef5; + border-radius: 4px; + background: #fafafa; + + /* 驳回理由输入行:不需要灰色容器,与上方静态信息行拉开层次 */ + &--input { + align-items: center; + min-height: 0; + /* 左 12px 与上方标签对齐;右 0 让输入框右边顶到灰色容器右边缘 */ + padding: 4px 0 0 12px; + border: none; + border-radius: 0; + background: transparent; + + .el-input, + .el-textarea { + flex: 1; + min-width: 0; + } + } + + &--textarea { + align-items: flex-start; + + .task-panel__field-label { + padding-top: 7px; + } + } + } + + &__field-label { + font-size: 12px; + line-height: 20px; + color: #606266; + flex-shrink: 0; + white-space: nowrap; + } + + &__field-value { + font-size: 13px; + font-weight: 500; + color: #303133; + text-align: right; + } + + &__form-tip { + margin: 8px 0 0; + padding: 8px 12px; + border-radius: 4px; + background: #f4f4f5; + font-size: 12px; + line-height: 18px; + color: #909399; + } + + &__foot { + display: flex; + align-items: center; + justify-content: space-between; + gap: 12px; + padding: 12px 16px 16px; + flex-shrink: 0; + } + + &__hint { + font-size: 12px; + color: #909399; + } + + &__actions { + display: flex; + align-items: center; + gap: 8px; + + :deep(.el-button) { + margin-left: 0; + margin-right: 0; + } + } } @@ -1794,4 +2035,19 @@ async function handleExportAll() { .ut-status-text--warning { color: var(--el-color-warning); } .ut-status-text--info { color: var(--el-color-info); } .ut-status-text--danger { color: var(--el-color-danger); } + +/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板(同手工录入运单号) */ +.el-dialog.reject-receiving-dialog, +.el-dialog.match-putaway-dialog-shell { + padding: 0; + overflow: hidden; + + .el-dialog__header { + display: none; + } + + .el-dialog__body { + padding: 0; + } +} \ No newline at end of file