From 60a7db40857185bf98569b243230e5468a6673a6 Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Thu, 19 Nov 2026 18:00:54 +0800 Subject: [PATCH] =?UTF-8?q?refactor(frontend):=20=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=BB=9F=E4=B8=80=E4=B8=BA=20task-panel=20?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=EF=BC=8C=E7=BB=9F=E4=B8=80=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=A1=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增统一弹窗外壳与样式: - 新增 TaskPanelDialog.vue(自绘标题+副标题 / 可滚动内容区 / 底部提示+操作区), 默认点遮罩不关闭,内容区 max-height 内部滚动 - 新增 styles/task-panel.css 并在 main.ts 引入:section 分组、栅格字段行 (88px 标签 + 控件)、提示条、表格区、底部按钮区(small / gap 6) - 新增 ReasonPromptDialog.vue:替换 ElMessageBox.prompt,用于作废 / 取消 / 手工标记推送失败等需填原因的操作,支持必填校验、多行、按钮类型与提示 页面改造(el-dialog / el-drawer → TaskPanelDialog + task-panel 栅格): - 订单、发货单、状态面板、订单同步、入库单(列表/新建)、出库单(列表/新建)、 库存单据、导出任务、导出按钮、商品查询、单据选择、商品(新增/编辑/批量导入, 抽屉改弹窗)、店铺、店铺商品、组合商品、自定义快递、外接 API、 外接打印平台/快递接口、组织(集团设置/下属公司)、权限角色组、主体、主体用户、 商品属性、用户资料 交互与样式统一: - ElMessageBox.confirm 统一挂 customClass="app-confirm-box"(App.vue 中定义按钮 高度/内边距/间距),状态面板封装 ElMessageBox 别名统一注入 - 侧边栏 BasicLayout:加 contain: layout、菜单内部 overflow 滚动、 关闭子菜单折叠过渡,避免展开时逐帧重排扩散到主内容区 --- frontend/src/App.vue | 14 + frontend/src/components/ExportButton.vue | 73 +- frontend/src/components/ProductSelect.vue | 50 +- .../src/components/ReasonPromptDialog.vue | 151 ++++ .../src/components/RecordPickerDialog.vue | 53 +- frontend/src/components/TaskPanelDialog.vue | 115 +++ frontend/src/layouts/BasicLayout.vue | 17 + frontend/src/main.ts | 1 + frontend/src/styles/task-panel.css | 310 +++++++ frontend/src/views/ComboProduct/Index.vue | 286 +++--- frontend/src/views/CustomExpress/Index.vue | 144 ++- frontend/src/views/ExportTask/Index.vue | 70 +- frontend/src/views/ExternalApi/Index.vue | 407 ++++++--- .../ExpressInterfaceDialog.vue | 155 ++-- .../src/views/ExternalPrintPlatform/Index.vue | 236 +++-- frontend/src/views/InboundOrder/Create.vue | 421 +++++---- frontend/src/views/InboundOrder/Index.vue | 230 +++-- frontend/src/views/Order/Index.vue | 834 +++++++++++------ frontend/src/views/Order/OrderFormDialog.vue | 840 ++++++++++-------- frontend/src/views/Order/OrderSyncDialog.vue | 268 +++--- frontend/src/views/Order/StatusPanel.vue | 387 +++++--- .../src/views/Organization/GroupSettings.vue | 158 ++-- .../src/views/Organization/Subsidiaries.vue | 123 ++- frontend/src/views/OutboundOrder/Create.vue | 514 ++++++----- frontend/src/views/OutboundOrder/Index.vue | 317 ++++--- frontend/src/views/Permission/RoleGroups.vue | 146 +-- frontend/src/views/Principal/Create.vue | 99 ++- frontend/src/views/PrincipalUser/Index.vue | 429 +++++---- frontend/src/views/Product/Index.vue | 604 ++++++++----- .../ProductAttributePanel.vue | 128 ++- frontend/src/views/Shop/Index.vue | 823 ++++++++++------- frontend/src/views/ShopProduct/Index.vue | 94 +- frontend/src/views/StockOrder/Index.vue | 282 ++++-- frontend/src/views/User/Profile.vue | 259 ++++-- 34 files changed, 5815 insertions(+), 3223 deletions(-) create mode 100644 frontend/src/components/ReasonPromptDialog.vue create mode 100644 frontend/src/components/TaskPanelDialog.vue create mode 100644 frontend/src/styles/task-panel.css 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() {