From 2acdcb08a9d08a15cf93843c5f14f96b47ee638d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 27 Aug 2026 11:26:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?style(ui):=20=E7=BB=9F=E4=B8=80=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=8F=8A=E7=8B=AC=E7=AB=8B=E8=A1=A8=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=96=87=E6=A1=88=E5=92=8C=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将所有弹窗及独立表单页中的“返回”按钮文案统一改为“取消”
- 独立表单页footer的Avue提交与清空按钮去除内置图标，仅保留文字显示
- 更新相关页面和组件按钮文案，包括业务表单、支付表单、客户档案等
- 规范底部操作栏按钮顺序及样式，确保主次操作区分明显
- 修复部分组件页脚按钮文案，保持全站一致性
---
 .workbuddy/memory/2026-08-27.md               | 22 +++++++++++++++++++
 .workbuddy/memory/MEMORY.md                   | 14 +++++++-----
 .../components/business-crud-page.vue         | 12 +++++++---
 .../components/master-order-detail.vue        |  2 +-
 .../components/master-order-dispatch.vue      |  2 +-
 .../components/master-order-editor.vue        |  2 +-
 src/views/business/project-apply.vue          |  4 ++--
 .../payment/invoice-application-form.vue      |  2 +-
 src/views/payment/invoice-receipt-form.vue    |  2 +-
 .../payment/payment-application-form.vue      |  2 +-
 src/views/system/user.vue                     |  2 +-
 src/views/vehicle/customer-archive.vue        | 10 ++++-----
 12 files changed, 53 insertions(+), 23 deletions(-)
 create mode 100644 .workbuddy/memory/2026-08-27.md

diff --git a/.workbuddy/memory/2026-08-27.md b/.workbuddy/memory/2026-08-27.md
new file mode 100644
index 0000000..6a96cec
--- /dev/null
+++ b/.workbuddy/memory/2026-08-27.md
@@ -0,0 +1,22 @@
+# 2026-08-27 工作日志
+
+## 全站底部操作栏「返回」按钮统一改为「取消」
+- 起因：用户访问 `/vehicle/customer-archive/form` 独立表单页，指出底部「返回」按钮应全站统一为「取消」。
+- 改动文件（模板/逻辑中的「返回」→「取消」）：
+  - `src/views/vehicle/customer-archive.vue`：主表单页 footer 逻辑 `readonly ? '关闭' : isArchivePage ? '返回' : '取消'` → `readonly ? '关闭' : '取消'`；4 处子弹窗（contact/receipt/invoice/score）`>返回</el-button>` → `>取消</el-button>`（replace_all）。
+  - `src/views/payment/invoice-receipt-form.vue`、`payment-application-form.vue`、`payment/payment-application-form.vue`：`goBack` 返回按钮 →「取消」。
+  - `src/views/business/components/master-order-editor.vue`、`master-order-dispatch.vue`、`master-order-detail.vue`：`$emit('back')` 返回按钮 →「取消」。
+  - `src/views/business/components/business-crud-page.vue`：运输计划导入弹窗关闭按钮 →「取消」。
+  - `src/views/system/user.vue`：用户弹窗关闭按钮 →「取消」。
+  - `src/views/business/project-apply.vue`：独立表单页（isProjectFormPage）`closeProjectForm` 返回按钮 ×2 →「取消」。
+- 未改动：`src/lang/zh.js` 登录 i18n 段 `back: '返回'`（无 `$t('back')` 引用，属登录流程返回，非业务 footer 操作栏）。
+- 规范固化：更新 MEMORY.md「弹窗 / 独立表单页底栏按钮统一规则」，明确全站底部操作栏「返回」统一为「取消」，仅只读查看 / 纯关闭场景保留「关闭」。
+
+## 发货模板独立表单页（shipping-template/form）footer 缺「取消」+ 去图标
+- 起因：用户访问 `/business/shipping-template/form?mode=add`，指出底部按钮缺「取消」且不需要图标（统一只要文字）。
+- 该页极薄，仅 `<business-crud-page standalone-form-page>`，footer 由 `business-crud-page.vue` 的 `PageAvueForm` 渲染。
+- 改动（`src/views/business/components/business-crud-page.vue`）：
+  - `#menu-form-before` 次要按钮 `关闭` → `取消`（条件 `isStandaloneFormPage && !showTransportPlanCreateActions`），影响 `/waybill-manage/form`、`/transport-plan/form`、`/shipping-template/form` 三处独立表单页。
+  - `#menu-form` 的运输计划创建模式次要按钮 `关闭` → `取消`。
+  - 新增样式 `:global(.business-crud-form-page-dialog .avue-form__menu .el-icon){display:none}`：Avue 的 `avue-form` 提交/清空按钮内置图标（`submitIcon:'el-icon-check'`、`emptyIcon:'el-icon-delete'`），且 Avue 源码用 `||` 兜底无法通过 option 去除，故用 CSS 在独立表单页容器内统一隐藏图标，仅保留文字，不影响其它弹窗。
+- 规范固化：MEMORY.md「弹窗 / 独立表单页底栏按钮统一规则」补充「独立表单页 Avue 表单 footer 去图标（统一纯文字）」说明。
diff --git a/.workbuddy/memory/MEMORY.md b/.workbuddy/memory/MEMORY.md
index 1383f44..e510036 100644
--- a/.workbuddy/memory/MEMORY.md
+++ b/.workbuddy/memory/MEMORY.md
@@ -38,7 +38,7 @@
 
 ### 弹窗 / 独立表单页底栏按钮统一规则
 - **排序**：从左到右按次→主排（次要居左、主操作居右），主操作永远放最后。
-  - 顺序模板：`[可选辅助工具(如同步/导入)][返回/取消][保存草稿][提交/确认]`
+  - 顺序模板：`[可选辅助工具(如同步/导入)][取消][保存草稿][提交/确认]`
 - **容器布局**：`display:flex; justify-content:flex-end; gap:12px;`。弹窗关闭按钮继承 Element Plus 自带 `.el-dialog__footer` 全局规则（见上条），独立页用 `.archive-form__footer` 配 `.archive-page-form & { position:fixed; right:0; left:230px; bottom:0; z-index:10; margin:0; padding:12px 24px; border-top:1px solid #eff1f7; background:#fff; box-shadow:0 -2px 8px rgba(0,0,0,.06); }`。
 - **⚠️ 浮动底部必须用 `position:fixed`，不能用 `position:sticky`**：本项目布局 `.app-main` / `.basic-container` 祖先带 `overflow:hidden`，会导致 `sticky` 永不触发（footer 不吸底）。固定写法照搬 customer-archive：
   ```scss
@@ -53,7 +53,8 @@
 - **颜色层级 3 档**：
   | 语义 | type | 备注 |
   | --- | --- | --- |
-  | 次要（返回 / 取消 / 关闭） | 不写 type（默认） | 灰描边 |
+  | 次要（取消 / 关闭） | 不写 type（默认） | 灰描边 |
+  - **全站底部操作栏「返回」已统一改为「取消」**：独立表单页返回列表、弹窗关闭、主从编辑器返回等场景一律写「取消」；仅只读查看 / 纯关闭场景保留「关闭」。
   | 中间步骤（保存草稿 / 按匹配结果更新） | `type="primary" plain` | 蓝描边 |
   | 主操作（提交 / 完成对账 / 复评确认） | `type="primary"` | 蓝实心 |
 - **禁区**：
@@ -62,11 +63,11 @@
 - **生效页面（已按规则统一）**：
   - `business/project-apply.vue`（footer + 变更 footer）
   - `vehicle/customer-archive.vue` 全部 5 处 footer（`archive-form__footer` 主表单页 + `contact-dialog`/`receipt-dialog`/`invoice-dialog` 子弹窗 + `score-detail-dialog` 含总分合计）
-  - `business/components/business-crud-page.vue` 的 PageAvueForm 独立表单页（`#menu-form-before` slot 新增 `关闭` 按钮，shipping-template 模式验证通过）
-  - `business/components/master-order-editor.vue` 主 `<footer>`（返回 default + 暂存/确认创建 plain + 创建并调度 primary；`position:fixed` 浮动，含 `avue--collapse`/`avue-layout--horizontal` 左偏移）
+  - `business/components/business-crud-page.vue` 的 PageAvueForm 独立表单页（`#menu-form-before` slot 新增 `取消` 按钮，shipping-template 模式验证通过；影响 `/business/waybill-manage/form`、`/business/transport-plan/form`、`/business/shipping-template/form` 三处独立表单页）
+  - `business/components/master-order-editor.vue` 主 `<footer>`（取消 default + 暂存/确认创建 plain + 创建并调度 primary；`position:fixed` 浮动，含 `avue--collapse`/`avue-layout--horizontal` 左偏移）
   - **payment 模块**表单页（`__actions` 均 `flex-end` + `position:fixed` 浮动，含 `avue--collapse`/`avue-layout--horizontal` 左偏移）：
-    - `payment-application-form.vue`（`[返回][保存 plain][提交]`）
-    - `invoice-application-form.vue` / `invoice-receipt-form.vue`（`[返回][同步 plain][保存 plain][提交]`）
+    - `payment-application-form.vue`（`[取消][保存 plain][提交]`）
+    - `invoice-application-form.vue` / `invoice-receipt-form.vue`（`[取消][同步 plain][保存 plain][提交]`）
     - `bill-ledger-form.vue`（`[取消][确认 primary]`）
     - `bill-payment-form.vue`（`[取消][保存 plain][提交]`）
     - `receipt-flow-form.vue`（`[取消][确认 primary]`）
@@ -77,6 +78,7 @@
     - `settlement/receivable-payable-detail.vue`（生成费用弹窗「上一步」改 `plain`）
 - **已合规未动**：`settlement/components/transport-reconciliation-editor.vue`（`[取消][保存草稿 plain][按匹配结果更新账单 plain][完成对账 primary]`）、`settlement/components/settlement-adjustment-editor.vue`（弹窗 `[取消][保存 primary]`）、`business/temporary-credit-limit.vue`。
 - **Avue-form footer 结构注意**：`#menu-form-before` slot 内容在 Avue 内置按钮之**左**；`#menu-form` slot 在 Avue 内置按钮之**右**。要实现 `[次要][Avue 主操作]` 顺序，把次要按钮放进 `#menu-form-before`，主操作保留 Avue 内置即可。
+- **Avue 表单 footer 按钮去图标（统一纯文字）**：Avue 的 `avue-form` 提交/清空按钮内置图标（`submitIcon: 'el-icon-check'`、`emptyIcon: 'el-icon-delete'`），且 Avue 源码用 `|| 'el-icon-xxx'` 兜底，无法通过 option 配置去掉。已在 `business-crud-page.vue` 样式里用 `:global(.business-crud-form-page-dialog .avue-form__menu .el-icon){display:none}` 统一隐藏，仅作用于独立表单页（PageAvueForm 容器），不影响其它弹窗。新增/编辑弹窗内的 Avue 表单若也要去图标，复用此选择器即可。
 - **复杂 footer 例外**：当 footer 需要在按钮组左侧展示「总分合计 / 数量统计」等聚合信息时，块用 `flex:1` 推自己到最左，按钮组按上述规则排在右半边（参考 `score-detail-dialog`）。
 
 ## 关键文件
diff --git a/src/views/business/components/business-crud-page.vue b/src/views/business/components/business-crud-page.vue
index ec6da36..d3d4bb4 100644
--- a/src/views/business/components/business-crud-page.vue
+++ b/src/views/business/components/business-crud-page.vue
@@ -2076,7 +2076,7 @@
           v-if="isStandaloneFormPage && !showTransportPlanCreateActions"
           @click="closeCrudDialog"
         >
-          关闭
+          取消
         </el-button>
         <el-button
           v-if="config.enableDraftSave && !dialogReadonly"
@@ -2092,7 +2092,7 @@
       <template #menu-form>
         <div v-if="showTransportPlanCreateActions" class="business-crud-page__create-actions">
           <el-button :disabled="Boolean(transportPlanCreateActionLoading)" @click="closeCrudDialog">
-            关闭
+            取消
           </el-button>
           <el-button
             type="primary"
@@ -3208,7 +3208,7 @@
           @click="submitTransportPlanImport"
           >提交</el-button
         >
-        <el-button @click="transportPlanImportBox = false">返回</el-button>
+        <el-button @click="transportPlanImportBox = false">取消</el-button>
       </template>
     </el-dialog>
 
@@ -15343,6 +15343,12 @@ export default {
   left: 0;
 }
 
+/* 独立表单页 footer 的 Avue 提交/清空按钮自带图标（el-icon-check / el-icon-delete），
+   Avue 源码用 `|| 'el-icon-xxx'` 兜底，无法通过 option 配置去除，统一用 CSS 隐藏只保留文字 */
+:global(.business-crud-form-page-dialog .avue-form__menu .el-icon) {
+  display: none;
+}
+
 :global(.contract-manage-form-dialog) {
   width: 100% !important;
   margin: 0 !important;
diff --git a/src/views/business/components/master-order-detail.vue b/src/views/business/components/master-order-detail.vue
index ed2fa55..4c92ab3 100644
--- a/src/views/business/components/master-order-detail.vue
+++ b/src/views/business/components/master-order-detail.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading" class="master-detail">
     <section v-if="master" class="detail-overview">
-      <div class="detail-heading"><div><h2>多联总单详情 <span>|</span> {{ master.masterNo }}</h2><el-tag :type="statusType(master.businessStatus)" class="status-text">{{ statusName(master.businessStatus) }}</el-tag><el-tag v-if="transportFlowLabel" type="info" class="transport-flow-tag">{{ transportFlowLabel }}</el-tag></div><el-button @click="$emit('back')">返回</el-button></div>
+      <div class="detail-heading"><div><h2>多联总单详情 <span>|</span> {{ master.masterNo }}</h2><el-tag :type="statusType(master.businessStatus)" class="status-text">{{ statusName(master.businessStatus) }}</el-tag><el-tag v-if="transportFlowLabel" type="info" class="transport-flow-tag">{{ transportFlowLabel }}</el-tag></div><el-button @click="$emit('back')">取消</el-button></div>
       <dl class="detail-meta"><div><dt>客户</dt><dd>{{ master.customerName || '-' }}</dd></div><div><dt>合同编号</dt><dd>{{ master.contractNo || '-' }}</dd></div><div><dt>项目</dt><dd>{{ master.projectName || '-' }}</dd></div><div class="detail-meta__attachments"><dt>附件</dt><dd><template v-if="attachments.length"><el-link v-for="file in attachments" :key="file.url || file.link || file.name || file.originalName" type="primary" @click="previewAttachment(file)">{{ attachmentName(file) }}</el-link></template><span v-else>-</span></dd></div></dl>
       <div class="route-map"><template v-for="(route, index) in segments" :key="route.segmentNo"><div class="route-map__node"><span :class="['route-badge', index ? 'middle' : 'start']">{{ index ? '经' : '起' }}</span><strong>{{ route.departureName || '-' }}</strong><small>{{ route.departureAddress || '-' }}</small><small class="route-map__progress">{{ index ? `已到达 ${quantity(segments[index - 1].arrivedQuantity)}/${quantity(master.totalQuantity)}` : `已调度 ${quantity(route.dispatchedQuantity)}/${quantity(master.totalQuantity)}` }}</small><small v-if="index" class="route-map__progress">已调度 {{ quantity(route.dispatchedQuantity) }}/{{ quantity(master.totalQuantity) }}</small></div><div class="route-map__line"></div><div v-if="index === segments.length - 1" class="route-map__node"><span class="route-badge end">终</span><strong>{{ route.arrivalName || '-' }}</strong><small>{{ route.arrivalAddress || '-' }}</small><small class="route-map__progress">已到达 {{ quantity(route.arrivedQuantity) }}/{{ quantity(master.totalQuantity) }}</small></div></template></div>
     </section>
diff --git a/src/views/business/components/master-order-dispatch.vue b/src/views/business/components/master-order-dispatch.vue
index 1a6ae21..2c766f9 100644
--- a/src/views/business/components/master-order-dispatch.vue
+++ b/src/views/business/components/master-order-dispatch.vue
@@ -175,7 +175,7 @@
             <strong>待提交 <em>{{ pending.length }}</em> 条 <span class="pending-summary-text">（{{ pendingSegmentSummary }}）</span></strong>
             <el-link type="primary" @click="pendingExpanded = !pendingExpanded">{{ pendingExpanded ? '收起待调度列表' : '展开待调度列表' }}</el-link>
           </div>
-          <div class="pending-actions"><el-button @click="$emit('back')">返回</el-button><el-button type="primary" :loading="submitting" @click="submit">确认调度</el-button></div>
+          <div class="pending-actions"><el-button @click="$emit('back')">取消</el-button><el-button type="primary" :loading="submitting" @click="submit">确认调度</el-button></div>
         </div>
         <div v-show="pendingExpanded" class="pending-list">
           <template v-for="(items, segmentNo) in pendingGroups" :key="segmentNo">
diff --git a/src/views/business/components/master-order-editor.vue b/src/views/business/components/master-order-editor.vue
index fd90902..049a170 100644
--- a/src/views/business/components/master-order-editor.vue
+++ b/src/views/business/components/master-order-editor.vue
@@ -532,7 +532,7 @@
       </template>
     </el-dialog>
     <footer>
-      <el-button @click="$emit('back')">返回</el-button>
+      <el-button @click="$emit('back')">取消</el-button>
       <el-button type="primary" plain @click="saveDraft">暂存</el-button>
       <el-button type="primary" plain @click="confirmCreate">确认创建</el-button>
       <el-button type="primary" @click="createAndDispatch">创建并调度</el-button>
diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue
index ba56ee6..fe92d54 100644
--- a/src/views/business/project-apply.vue
+++ b/src/views/business/project-apply.vue
@@ -620,7 +620,7 @@
       >
           <template v-if="isChangeDialog">
             <el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
-            <el-button v-if="isProjectFormPage" @click="closeProjectForm">返回</el-button>
+            <el-button v-if="isProjectFormPage" @click="closeProjectForm">取消</el-button>
             <el-button type="primary" plain :loading="submitLoading" @click="saveChangeProject">
               保存
             </el-button>
@@ -630,7 +630,7 @@
           </template>
           <template v-else>
             <el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
-            <el-button v-if="isProjectFormPage" @click="closeProjectForm">返回</el-button>
+            <el-button v-if="isProjectFormPage" @click="closeProjectForm">取消</el-button>
             <el-button
               v-if="!dialogReadonly"
               type="primary"
diff --git a/src/views/payment/invoice-application-form.vue b/src/views/payment/invoice-application-form.vue
index 4b27c35..e7185a1 100644
--- a/src/views/payment/invoice-application-form.vue
+++ b/src/views/payment/invoice-application-form.vue
@@ -417,7 +417,7 @@
       </section-card>
 
       <div class="invoice-form-page__actions">
-        <el-button @click="goBack">返回</el-button>
+        <el-button @click="goBack">取消</el-button>
         <el-button v-if="!readonly" type="primary" plain @click="syncReferenceData">同步</el-button>
         <el-button
           v-if="!readonly && canSave"
diff --git a/src/views/payment/invoice-receipt-form.vue b/src/views/payment/invoice-receipt-form.vue
index e1b86ac..8bfd906 100644
--- a/src/views/payment/invoice-receipt-form.vue
+++ b/src/views/payment/invoice-receipt-form.vue
@@ -240,7 +240,7 @@
       </section-card>
 
       <div class="receipt-form-page__actions">
-        <el-button @click="goBack">返回</el-button>
+        <el-button @click="goBack">取消</el-button>
         <el-button v-if="!readonly" type="primary" plain @click="syncReferenceData">同步</el-button>
         <el-button
           v-if="!readonly && canSave"
diff --git a/src/views/payment/payment-application-form.vue b/src/views/payment/payment-application-form.vue
index 3accf0c..b0f9759 100644
--- a/src/views/payment/payment-application-form.vue
+++ b/src/views/payment/payment-application-form.vue
@@ -328,7 +328,7 @@
         </div>
       </section-card>
       <div class="payment-form-page__actions">
-        <el-button @click="goBack">返回</el-button>
+        <el-button @click="goBack">取消</el-button>
         <el-button v-if="!readonly && canSave" type="primary" plain @click="saveDraft(false)">保存</el-button>
         <el-button
           v-if="!readonly && canSave && hasPermission('payment_application_submit')"
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 304f3f0..ed9ffe0 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -221,7 +221,7 @@
               <el-table ref="customerTable" :data="customerList" border @selection-change="handleCustomerSelection"><el-table-column type="selection" width="55" /><el-table-column prop="customerCode" label="客商编码" /><el-table-column prop="fullName" label="客商名称" /></el-table>
             </el-tab-pane>
           </el-tabs>
-          <template #footer><span class="dialog-footer"><el-button type="primary" @click="submitUserForm">保存</el-button><el-button @click="userDialog = false">返回</el-button><el-button v-if="userDialogMode === 'edit'" @click="resetDialogPassword">重置密码</el-button><el-button @click="handleAddRole">添加角色</el-button></span></template>
+          <template #footer><span class="dialog-footer"><el-button type="primary" @click="submitUserForm">保存</el-button><el-button @click="userDialog = false">取消</el-button><el-button v-if="userDialogMode === 'edit'" @click="resetDialogPassword">重置密码</el-button><el-button @click="handleAddRole">添加角色</el-button></span></template>
         </el-dialog>
 
         <!-- 用户角色配置 -->
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 7eea91e..5c14df7 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -802,7 +802,7 @@
       <div class="archive-form__footer">
         <!-- 次要：独立页返回 / 只读关闭 / 弹窗取消 -->
         <el-button @click="closeArchive">{{
-          readonly ? '关闭' : isArchivePage ? '返回' : '取消'
+          readonly ? '关闭' : '取消'
         }}</el-button>
         <el-button type="primary" plain v-if="!readonly" @click="saveArchive">保存</el-button>
         <el-button type="primary" v-if="!readonly" @click="saveAndSubmitArchive">提交</el-button>
@@ -866,7 +866,7 @@
       </section-card>
       <template #footer>
         <div class="contact-dialog__footer-actions">
-          <el-button @click="contactBox = false">返回</el-button>
+          <el-button @click="contactBox = false">取消</el-button>
           <el-button type="primary" plain @click="saveContact">保存</el-button>
         </div>
       </template>
@@ -964,7 +964,7 @@
       </section-card>
       <template #footer>
         <div class="receipt-dialog__footer-actions">
-          <el-button @click="receiptBox = false">返回</el-button>
+          <el-button @click="receiptBox = false">取消</el-button>
           <el-button type="primary" plain @click="saveReceipt">保存</el-button>
         </div>
       </template>
@@ -1084,7 +1084,7 @@
       </el-form>
       <template #footer>
         <div class="invoice-dialog__footer-actions">
-          <el-button @click="invoiceBox = false">返回</el-button>
+          <el-button @click="invoiceBox = false">取消</el-button>
           <el-button type="primary" plain @click="saveInvoice">保存</el-button>
         </div>
       </template>
@@ -1347,7 +1347,7 @@
             <span>自评：{{ formatScoreValue(currentScore.selfScore) }}分</span>
             <span>复评：{{ formatScoreValue(currentScore.reviewScore) }}分</span>
           </div>
-          <el-button @click="scoreBox = false">返回</el-button>
+          <el-button @click="scoreBox = false">取消</el-button>
           <el-button type="primary" plain v-if="!readonly" @click="saveScoreDetail">保存</el-button>
           <el-button
             v-if="!readonly && hasPermission('customer_type_re_cert')"

From c9f673342aea7486f0ed520e0419f67ed797db54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 27 Aug 2026 11:39:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?style(ui):=20=E7=BB=9F=E4=B8=80=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8=E6=93=8D=E4=BD=9C=E6=A0=8F=E6=8C=89=E9=92=AE=E9=97=B4?=
 =?UTF-8?q?=E8=B7=9D=EF=BC=8C=E5=8F=96=E6=B6=88=E6=89=80=E6=9C=89gap?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除各底部操作栏（footer/__actions/page-actions）内所有gap属性
- 按钮间距统一采用 Element Plus 全局默认的相邻按钮12px margin-left规则
- 修改 .el-dialog__footer 内.el-button间距由8px调整为12px，保持全站一致
- 确认 Avue 表单底部按钮无自带间距，去gap后间距由 Element Plus 提供
- 涉及模块覆盖 vehicle、payment、business、settlement，移除了相关组件样式中gap属性
- MEMORY.md规范更新，补充底栏按钮间距统一为无gap纯文字规则
---
 .workbuddy/memory/2026-08-27.md                           | 8 ++++++++
 .workbuddy/memory/MEMORY.md                               | 2 +-
 src/styles/element-ui.scss                                | 2 +-
 src/views/business/components/business-crud-page.vue      | 1 -
 src/views/business/components/master-order-dispatch.vue   | 4 ++--
 src/views/business/components/master-order-editor.vue     | 1 -
 src/views/business/project-apply.vue                      | 1 -
 src/views/payment/bill-ledger-form.vue                    | 1 -
 src/views/payment/bill-payment-form.vue                   | 1 -
 src/views/payment/invoice-application-form.vue            | 1 -
 src/views/payment/invoice-receipt-form.vue                | 1 -
 src/views/payment/payment-application-form.vue            | 1 -
 src/views/payment/receipt-claim-record-form.vue           | 1 -
 src/views/payment/receipt-flow-form.vue                   | 1 -
 .../settlement/components/formal-settlement-editor.vue    | 1 -
 src/views/settlement/components/pre-settlement-editor.vue | 1 -
 src/views/settlement/receivable-payable-detail.vue        | 1 -
 src/views/vehicle/customer-archive.vue                    | 1 -
 18 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/.workbuddy/memory/2026-08-27.md b/.workbuddy/memory/2026-08-27.md
index 6a96cec..223e37b 100644
--- a/.workbuddy/memory/2026-08-27.md
+++ b/.workbuddy/memory/2026-08-27.md
@@ -20,3 +20,11 @@
   - `#menu-form` 的运输计划创建模式次要按钮 `关闭` → `取消`。
   - 新增样式 `:global(.business-crud-form-page-dialog .avue-form__menu .el-icon){display:none}`：Avue 的 `avue-form` 提交/清空按钮内置图标（`submitIcon:'el-icon-check'`、`emptyIcon:'el-icon-delete'`），且 Avue 源码用 `||` 兜底无法通过 option 去除，故用 CSS 在独立表单页容器内统一隐藏图标，仅保留文字，不影响其它弹窗。
 - 规范固化：MEMORY.md「弹窗 / 独立表单页底栏按钮统一规则」补充「独立表单页 Avue 表单 footer 去图标（统一纯文字）」说明。
+
+## 底部操作栏按钮间距统一去 gap
+- 起因：用户指出这些底部按钮间距不一致，要求统一，并把用了 `gap` 的全部去掉。
+- 方案：所有底部操作栏（footer / `__actions` / `page-actions`）**移除 `gap`**，间距统一回落到 Element Plus 全局默认的相邻按钮 `.el-button+.el-button{margin-left:12px}`（恒为 12px），不再散落 `gap:8/12/16px`。
+- 全局对齐：`.el-dialog__footer .el-button + .el-button` 由 `margin-left:8px` 改为 `12px`（`src/styles/element-ui.scss`），使弹窗 footer 也与之一致。
+- 已去 gap 的 footer 容器：`vehicle/customer-archive.vue`(`.archive-form__footer`)、`business/components/master-order-editor.vue`(`footer`)、`business/components/master-order-dispatch.vue`(`.segment-actions`/`.pending-actions`)、`business/project-apply.vue`(`.project-apply-dialog__footer`)、`business/components/business-crud-page.vue`(`.business-crud-form-page-dialog .avue-form__menu`)、payment 6 个表单页(`*__actions`)、`settlement/components/pre-settlement-editor.vue`(`&__page-actions`)、`settlement/components/formal-settlement-editor.vue`(`.formal-editor__page-actions`)、`settlement/receivable-payable-detail.vue`(`.settlement-detail-page__actions`)。
+- 风控：确认 Avue 的 `.avue-form__menu`/`.avue-dialog__footer` 自身不带按钮间距，去掉 gap 后由 EP 默认 12px margin 接管（不会贴死）。
+- 范围说明：本次聚焦近几轮在统一的模块（vehicle/payment/business/settlement）。若要把 loading-manage、contract-manage、transit 等其它模块的底部栏也纳入，需再处理。
diff --git a/.workbuddy/memory/MEMORY.md b/.workbuddy/memory/MEMORY.md
index e510036..ce2389b 100644
--- a/.workbuddy/memory/MEMORY.md
+++ b/.workbuddy/memory/MEMORY.md
@@ -39,7 +39,7 @@
 ### 弹窗 / 独立表单页底栏按钮统一规则
 - **排序**：从左到右按次→主排（次要居左、主操作居右），主操作永远放最后。
   - 顺序模板：`[可选辅助工具(如同步/导入)][取消][保存草稿][提交/确认]`
-- **容器布局**：`display:flex; justify-content:flex-end; gap:12px;`。弹窗关闭按钮继承 Element Plus 自带 `.el-dialog__footer` 全局规则（见上条），独立页用 `.archive-form__footer` 配 `.archive-page-form & { position:fixed; right:0; left:230px; bottom:0; z-index:10; margin:0; padding:12px 24px; border-top:1px solid #eff1f7; background:#fff; box-shadow:0 -2px 8px rgba(0,0,0,.06); }`。
+- **容器布局（2026-08-27 改为「去 gap」）**：`display:flex; justify-content:flex-end;`（**不写 `gap`**）。按钮间距统一由 Element Plus 全局默认的相邻按钮 `.el-button+.el-button{margin-left:12px}` 提供，全站恒为 12px。原各 footer 写死的 `gap:8/12px` 已全部移除。`src/styles/element-ui.scss` 里 `.el-dialog__footer .el-button + .el-button` 也已从 `8px` 改 `12px`，与之一致。弹窗关闭按钮继承 Element Plus 自带 `.el-dialog__footer` 全局规则（见上条），独立页用 `.archive-form__footer` 配 `.archive-page-form & { position:fixed; right:0; left:230px; bottom:0; z-index:10; margin:0; padding:12px 24px; border-top:1px solid #eff1f7; background:#fff; box-shadow:0 -2px 8px rgba(0,0,0,.06); }`。
 - **⚠️ 浮动底部必须用 `position:fixed`，不能用 `position:sticky`**：本项目布局 `.app-main` / `.basic-container` 祖先带 `overflow:hidden`，会导致 `sticky` 永不触发（footer 不吸底）。固定写法照搬 customer-archive：
   ```scss
   .xxx-actions {
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 07724ed..e47a785 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -194,7 +194,7 @@
   border-radius: 0 0 var(--el-dialog-border-radius, 4px);
 
   .el-button + .el-button {
-    margin-left: 8px;
+    margin-left: 12px;
   }
 }
 
diff --git a/src/views/business/components/business-crud-page.vue b/src/views/business/components/business-crud-page.vue
index d3d4bb4..0303bd9 100644
--- a/src/views/business/components/business-crud-page.vue
+++ b/src/views/business/components/business-crud-page.vue
@@ -15311,7 +15311,6 @@ export default {
   display: flex;
   align-items: center;
   justify-content: flex-end;
-  gap: 8px;
   min-height: 64px;
   box-sizing: border-box;
   padding: 12px 24px;
diff --git a/src/views/business/components/master-order-dispatch.vue b/src/views/business/components/master-order-dispatch.vue
index 2c766f9..a042586 100644
--- a/src/views/business/components/master-order-dispatch.vue
+++ b/src/views/business/components/master-order-dispatch.vue
@@ -705,7 +705,7 @@ export default {
 .freight-form { :deep(.freight-unit-select) { width: 92px; flex: 0 0 92px; min-width: 0; } }
 .carrier-type-form { margin-top: 16px; }
 .carrier-form { padding-top: 8px; }
-.segment-actions { display: flex; justify-content: flex-end; gap: 12px; padding-top: 4px; }
+.segment-actions { display: flex; justify-content: flex-end; padding-top: 4px; }
 .dispatch-bottom { position: fixed; z-index: 10; bottom: 0; left: $sidebar_width; width: calc(100% - #{$sidebar_width}); border-top: 1px solid #eff1f7; background: #fff; box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.04); }
 :global(.avue--collapse) .dispatch-bottom { left: $sidebar_collapse; width: calc(100% - #{$sidebar_collapse}); }
 :global(.avue-layout--horizontal) .dispatch-bottom { left: 0; width: 100%; }
@@ -714,7 +714,7 @@ export default {
 .pending-summary, .pending-actions { display: flex; align-items: center; }
 .pending-summary { gap: 16px; }
 .pending-summary-text { color: #606266; font-weight: 400; }
-.pending-actions { gap: 12px; margin-left: auto; }
+.pending-actions { margin-left: auto; }
 .pending-list { max-height: min(420px, calc(100vh - 130px)); padding: 0 32px 16px; overflow: auto; h3 { margin: 14px 0 10px; font-size: 14px; } }
 .table-actions { display: flex; flex-wrap: wrap; gap: 8px; }
 @media screen and (max-width: 1200px) { .overview-content { grid-template-columns: 1fr; } .route-overview { justify-content: flex-start; } }
diff --git a/src/views/business/components/master-order-editor.vue b/src/views/business/components/master-order-editor.vue
index 049a170..79ef026 100644
--- a/src/views/business/components/master-order-editor.vue
+++ b/src/views/business/components/master-order-editor.vue
@@ -2050,7 +2050,6 @@ export default {
 footer {
   display: flex;
   justify-content: flex-end;
-  gap: 12px;
   padding: 12px 24px;
   position: fixed;
   right: 0;
diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue
index fe92d54..e08cfc1 100644
--- a/src/views/business/project-apply.vue
+++ b/src/views/business/project-apply.vue
@@ -2281,7 +2281,6 @@ export default {
 .project-apply-dialog__footer {
   display: flex;
   justify-content: flex-end;
-  gap: 8px;
 
   .project-apply-page-form & {
     position: fixed;
diff --git a/src/views/payment/bill-ledger-form.vue b/src/views/payment/bill-ledger-form.vue
index f728435..717c52d 100644
--- a/src/views/payment/bill-ledger-form.vue
+++ b/src/views/payment/bill-ledger-form.vue
@@ -592,7 +592,6 @@ export default {
 .bill-ledger-form-page__actions {
   display: flex;
   justify-content: flex-end;
-  gap: 12px;
   padding: 12px 24px;
   position: fixed;
   right: 0;
diff --git a/src/views/payment/bill-payment-form.vue b/src/views/payment/bill-payment-form.vue
index 3b867ec..98d4544 100644
--- a/src/views/payment/bill-payment-form.vue
+++ b/src/views/payment/bill-payment-form.vue
@@ -399,7 +399,6 @@ export default {
 .bill-payment-form-page__actions {
   display: flex;
   justify-content: flex-end;
-  gap: 12px;
   padding: 12px 24px;
   position: fixed;
   right: 0;
diff --git a/src/views/payment/invoice-application-form.vue b/src/views/payment/invoice-application-form.vue
index e7185a1..686cd3d 100644
--- a/src/views/payment/invoice-application-form.vue
+++ b/src/views/payment/invoice-application-form.vue
@@ -980,7 +980,6 @@ export default {
 .invoice-form-page__actions {
   display: flex;
   justify-content: flex-end;
-  gap: 12px;
   padding: 12px 24px;
   position: fixed;
   right: 0;
diff --git a/src/views/payment/invoice-receipt-form.vue b/src/views/payment/invoice-receipt-form.vue
index 8bfd906..c0b58eb 100644
--- a/src/views/payment/invoice-receipt-form.vue
+++ b/src/views/payment/invoice-receipt-form.vue
@@ -777,7 +777,6 @@ export default {
 .receipt-form-page__actions {
   display: flex;
   justify-content: flex-end;
-  gap: 12px;
   padding: 12px 24px;
   position: fixed;
   right: 0;
diff --git a/src/views/payment/payment-application-form.vue b/src/views/payment/payment-application-form.vue
index b0f9759..de71c7b 100644
--- a/src/views/payment/payment-application-form.vue
+++ b/src/views/payment/payment-application-form.vue
@@ -1283,7 +1283,6 @@ export default {
 .payment-form-page__actions {
   display: flex;
   justify-content: flex-end;
-  gap: 12px;
   padding: 12px 24px;
   position: fixed;
   right: 0;
diff --git a/src/views/payment/receipt-claim-record-form.vue b/src/views/payment/receipt-claim-record-form.vue
index 4356540..045748a 100644
--- a/src/views/payment/receipt-claim-record-form.vue
+++ b/src/views/payment/receipt-claim-record-form.vue
@@ -313,7 +313,6 @@ export default {
 .claim-record-form-page__actions {
   display: flex;
   justify-content: flex-end;
-  gap: 12px;
   padding: 12px 24px;
   position: fixed;
   right: 0;
diff --git a/src/views/payment/receipt-flow-form.vue b/src/views/payment/receipt-flow-form.vue
index 1a9081e..38ce66a 100644
--- a/src/views/payment/receipt-flow-form.vue
+++ b/src/views/payment/receipt-flow-form.vue
@@ -472,7 +472,6 @@ export default {
 .receipt-claim-form-page__actions {
   display: flex;
   justify-content: flex-end;
-  gap: 12px;
   padding: 12px 24px;
   position: fixed;
   right: 0;
diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue
index 1a82dd2..b7c123c 100644
--- a/src/views/settlement/components/formal-settlement-editor.vue
+++ b/src/views/settlement/components/formal-settlement-editor.vue
@@ -1548,7 +1548,6 @@ export default {
   justify-content: flex-end;
   padding: 12px 24px;
   border-top: 1px solid #eff1f7;
-  gap: 12px;
   position: fixed;
   right: 0;
   left: 230px;
diff --git a/src/views/settlement/components/pre-settlement-editor.vue b/src/views/settlement/components/pre-settlement-editor.vue
index 74cb6b7..b7963a3 100644
--- a/src/views/settlement/components/pre-settlement-editor.vue
+++ b/src/views/settlement/components/pre-settlement-editor.vue
@@ -1531,7 +1531,6 @@ export default {
     justify-content: flex-end;
     padding: 12px 24px;
     border-top: 1px solid #eff1f7;
-    gap: 12px;
     position: fixed;
     right: 0;
     left: 230px;
diff --git a/src/views/settlement/receivable-payable-detail.vue b/src/views/settlement/receivable-payable-detail.vue
index c6efc5c..e5ee539 100644
--- a/src/views/settlement/receivable-payable-detail.vue
+++ b/src/views/settlement/receivable-payable-detail.vue
@@ -1841,7 +1841,6 @@ export default {
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
-  gap: 8px;
 }
 
 .settlement-detail-page__pagination {
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 5c14df7..ba5b0d4 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -5063,7 +5063,6 @@ export default {
 .archive-form__footer {
   display: flex;
   justify-content: flex-end;
-  gap: 12px;
   .archive-page-form & {
     position: fixed;
     right: 0;