diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 792e6d6..3c37606 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -68,6 +68,20 @@ body, padding: 0; } +/* 业务弹窗确认框:按钮尺寸/间距对齐表单面板底部(small / gap 6) */ +.app-confirm-box .el-message-box__btns { + gap: 6px; +} +.app-confirm-box .el-message-box__btns .el-button { + height: 24px; + padding: 5px 11px; + font-size: 12px; + border-radius: 4px; +} +.app-confirm-box .el-message-box__btns .el-button + .el-button { + margin-left: 0; +} + /* 表格:单元格上下与左右内边距 */ .el-table .cell { padding: 0 8px; diff --git a/frontend/src/components/ExportButton.vue b/frontend/src/components/ExportButton.vue index 49e9ca7..2c781b6 100644 --- a/frontend/src/components/ExportButton.vue +++ b/frontend/src/components/ExportButton.vue @@ -2,6 +2,7 @@ import { computed, ref } from 'vue' import { ElMessage } from 'element-plus' import { useExportTasks } from '@/composables/useExportTasks' +import TaskPanelDialog from '@/components/TaskPanelDialog.vue' import type { ExportFilters, ExportType } from '@/api/exportTask' /** @@ -85,36 +86,56 @@ async function confirmOrderExport() { {{ text }} - - - - - - 导出选中({{ selectedCount }} 条) - - 按条件全部 - - - - - 订单行(不含明细) - 订单含明细(每商品一行) - - - - 单次最多导出 {{ MAX_SELECTED }} 条选中订单,超出部分请分批导出 - - - diff --git a/frontend/src/components/ProductSelect.vue b/frontend/src/components/ProductSelect.vue index d7c849f..3dd0ad9 100644 --- a/frontend/src/components/ProductSelect.vue +++ b/frontend/src/components/ProductSelect.vue @@ -2,6 +2,7 @@ import { computed, ref, watch } from 'vue' import { DEFAULT_PAGE_SIZE } from '@/composables/useListPage' import { mediaUrl } from '@/utils/media' +import TaskPanelDialog from '@/components/TaskPanelDialog.vue' import { getProducts, searchProducts, @@ -191,9 +192,15 @@ function pickProduct(row: ProductItem) { 查询 - - - + +
+ +

+ 仅显示当前所选店铺同货主(所属公司)的商品。 +

- +
+ + + +
diff --git a/frontend/src/components/ReasonPromptDialog.vue b/frontend/src/components/ReasonPromptDialog.vue new file mode 100644 index 0000000..ef3602d --- /dev/null +++ b/frontend/src/components/ReasonPromptDialog.vue @@ -0,0 +1,151 @@ + + + diff --git a/frontend/src/components/RecordPickerDialog.vue b/frontend/src/components/RecordPickerDialog.vue index 425d4da..b5eff34 100644 --- a/frontend/src/components/RecordPickerDialog.vue +++ b/frontend/src/components/RecordPickerDialog.vue @@ -8,6 +8,7 @@ */ import { computed, ref, watch } from 'vue' import DataTable from '@/components/DataTable.vue' +import TaskPanelDialog from '@/components/TaskPanelDialog.vue' export interface PickerColumn { prop: string @@ -59,6 +60,14 @@ const filtered = computed(() => { ) }) +/** 已选中行的展示文案(取第一列) */ +const selectedLabel = computed(() => { + if (selected.value == null) return '未选择' + const row = props.options.find(item => item[props.valueKey] === selected.value) + const key = props.columns[0]?.prop + return row && key ? String(row[key] ?? selected.value) : String(selected.value) +}) + watch( () => props.modelValue, (open) => { @@ -86,24 +95,26 @@ function confirm() {