From 8883186344727b0954e8f6b5acba0144518324a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 24 Aug 2026 20:15:14 +0800 Subject: [PATCH] =?UTF-8?q?style(business):=20=E7=BB=9F=E4=B8=80=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81=E6=A0=87=E7=AD=BE=E4=B8=BA=E6=96=87?= =?UTF-8?q?=E5=AD=97+=E9=A2=9C=E8=89=B2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增全局 `.status-text` 样式，去除 el-tag 背景和边框，仅保留彩色文字和跟随文字颜色的圆点 - 业务状态相关的 el-tag 标签全部加上 `class="status-text"`，覆盖调度状态、审批状态、运单状态等全站业务状态展示 - 统一发货模板查看弹窗的卡片样式，新增分区块样式与运费信息展示板块 - 调整发货模板弹窗详情 label 宽度，所有 el-descriptions 的 label 宽度统一为 140px 以保证视觉一致 - 表格列内嵌输入控件全宽默认样式生效，无需单独设置跨度，解决输入框显示不足问题 - 弹窗中的部分表单和导入区域使用 `section-card` 统一卡片风格 - 客商档案查看模式改为独立路由，实现查看与编辑隔离并调整对应操作按钮文案 - 相关样式调整及细节优化，包括运费单位颜色等辅助样式，保证界面细节统一规范 --- .workbuddy/memory/2026-08-24.md | 24 +++- .workbuddy/memory/MEMORY.md | 13 ++ src/option/business/shipping-template.js | 34 +++++ src/option/business/temporary-credit-limit.js | 4 +- src/styles/element-ui.scss | 50 ++++++++ .../components/business-crud-page.vue | 118 ++++++++++++++---- .../components/master-order-detail.vue | 4 +- .../components/master-order-dispatch.vue | 2 +- .../components/master-order-editor.vue | 33 ++++- src/views/business/loading-manage.vue | 3 +- src/views/business/master-order.vue | 2 +- src/views/business/process-config.vue | 6 +- src/views/business/voucher-manage.vue | 14 ++- .../formal-settlement-table-panel.vue | 2 +- .../components/pre-settlement-editor.vue | 41 +++--- src/views/settlement/pre-settlement.vue | 2 +- .../settlement/settlement-adjustment.vue | 2 +- .../vehicle/credit-score-quantification.vue | 4 +- src/views/vehicle/customer-archive.vue | 51 +++----- 19 files changed, 312 insertions(+), 97 deletions(-) diff --git a/.workbuddy/memory/2026-08-24.md b/.workbuddy/memory/2026-08-24.md index ace16c3..680b991 100644 --- a/.workbuddy/memory/2026-08-24.md +++ b/.workbuddy/memory/2026-08-24.md @@ -1,8 +1,20 @@ # 2026-08-24 -## project-apply.vue：弹窗改独立页（与新增项目管理一致） -- 将「重大项目补录 / 查看 / 项目变更」三种打开方式从 `el-dialog` 改为路由跳转独立页 `/business/project-apply/form?mode=...`，与已有的「新增 / 编辑」独立页统一。 -- `openProjectDialog` 全部 type 统一走 `$router.push`；`openProjectFormPage` 按 `route.query.mode`（add/edit/view/majorSupplement/change）加载详情或空表单。 -- 独立页标题改用全局 `archive-page-form__title`（自带 4px 主色竖条），删除原本地 `.project-apply-page__title` scoped 样式。 -- 仅改 1 个文件 `src/views/business/project-apply.vue`（约 +25 / -18 行）；路由、API、全局样式未动。footer 逻辑（保存/提交/返回）沿用既有 `isProjectFormPage` 分支，无需改。 -- 验证：dev localhost:2889 下分别点「重大项目补录 / 新增 / 编辑 / 查看 / 项目变更」应都进入独立页面，标题显示「重大项目补录 / 新增项目管理 / 编辑项目管理 / 查看项目管理 / 项目变更」。 +## 发货模板查看弹窗白底卡片统一化 +- 问题：shipping-template 查看弹窗仍走 Avue 默认 rowView，各板块无白底卡片分隔。 +- 改动： + - `src/option/business/shipping-template.js`：config 新增 `detailButton: true`、`detailButtonIgnoreDraftStatus: true`，并配置 `detailSections`（模板信息/基本信息/收发货信息），每板块两列 el-descriptions，备注与地址占整行。 + - `src/views/business/components/business-crud-page.vue`：在 detailBox 通用详情模板中，货物信息卡片后新增运费信息 section-card，区分公路（单价/数量合计/运费/运费合计/其他运费合计/币种）与非公路（运费/数量合计/其他运费合计/币种）展示。 +- 样式：`&__detail-content` 已统一 `gap: 12px`，section-card 间距即为 12px；新增 `&__freight-descriptions` 单位/币种辅助色。 +- 验证：`npm run build` 通过。 + +## 发货模板查看弹窗 label 宽度统一 +- 问题：详情弹窗各 section 的 el-descriptions 按内容自动列宽，导致「收发货信息」板块含 6 字标签（发货联系方式/收货联系方式）时 label 列比其他板块（4 字标签）更宽，视觉不一致。原 CSS `.el-descriptions__label{width:140px}` 在含 span 行的 fixed 布局下未能可靠等宽。 +- 改动：`src/views/business/components/business-crud-page.vue` 在通用详情描述（line ~3109）与运费信息两张描述表（road / 非 road）上加 `label-width="140px"`（Element Plus 原生机制，覆盖 auto 列宽与 span 行差异），使所有详情 label 列统一 140px。 +- 验证：`npm run build` 通过。 + +## 全站业务状态标签文字化（调度状态/审批状态） +- 新增全局 `.status-text` 工具类（`src/styles/element-ui.scss` 末尾）：去掉 `el-tag` 背景/边框，保留彩色文字 + `currentColor` 圆点。 +- 全站所有业务状态 `el-tag` 统一加 `class="status-text"`：business-crud-page（#status/#businessStatus/#approvalStatus 插槽 + 运输计划详情头 + 运单详情头 + 调度弹窗头）、master-order 系列 businessStatus、loading-manage 详情弹窗、结算三处 approvalStatus、process-config 流程状态。 +- 已通过 dev (localhost:2889) HMR 生效，刷新即可查看。调度状态（businessStatus）全站视觉已统一为"文字 + 颜色"。 +- `credit-score-quantification.vue` 状态列（#status 插槽，statusMap: 正常/停用/草稿）的 el-tag 也加 `.status-text` 统一。 diff --git a/.workbuddy/memory/MEMORY.md b/.workbuddy/memory/MEMORY.md index c5c320e..3205c80 100644 --- a/.workbuddy/memory/MEMORY.md +++ b/.workbuddy/memory/MEMORY.md @@ -33,6 +33,19 @@ - **master-order?mode=editor**：`master-order.vue` 把 `` 包进 ` @@ -2522,7 +2522,7 @@ | {{ detailRow.planNo || '-' }} - + {{ displayStatus(detailRow, 'businessStatus') }} @@ -2692,7 +2692,7 @@
运单详情 {{ detailRow.waybillNo || '-' }} - {{ displayStatus(detailRow, 'businessStatus') }} + {{ displayStatus(detailRow, 'businessStatus') }} {{ formatTransportPlanDetailTransportType(waybillTransportMode(detailRow)) }} @@ -3106,7 +3106,7 @@
- + + + + + + {{ shippingTemplateRoadFreightTotal }} + {{ shippingTemplateCurrencyLabel }} + + + {{ formatShippingTemplateFreightNumber(shippingTemplateFreight.otherFreightAmount) }} + {{ shippingTemplateCurrencyLabel }} + + + {{ currencyName(shippingTemplateFreight.currency) }} + + + + + {{ formatShippingTemplateFreightNumber(shippingTemplateFreight.freightAmount) }} + {{ shippingTemplateCurrencyLabel }} + + + {{ transportCargoQuantityTotal }} + + + {{ formatShippingTemplateFreightNumber(shippingTemplateFreight.otherFreightAmount) }} + {{ shippingTemplateCurrencyLabel }} + + + {{ currencyName(shippingTemplateFreight.currency) }} + + + {{ dispatchDialogNo || '-' }} - + {{ dispatchDialogStatusText }} @@ -5450,22 +5511,24 @@ class="business-crud-page__cargo-import-dialog" @closed="cargoImportRows = []" > -
- - 上传 - - - 点击下载模板 -
+ +
+ + 上传 + + + 点击下载模板 +
+ @@ -116,6 +117,7 @@ format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择" + style="width: 200px" /> @@ -428,7 +430,27 @@
-
上传点击下载模板
 + + +
+ + 上传 + + + 点击下载模板 +
+ + +
@@ -1966,6 +1988,15 @@ export default { margin-top: 8px; color: #606266; } +.cargo-import { + display: flex; + flex-direction: column; + gap: 16px; + .el-upload__tip { + margin-top: 8px; + line-height: 1.5; + } +} @media screen and (max-width: 1440px) { .route-node-form { grid-template-columns: repeat(2, minmax(320px, 1fr)); diff --git a/src/views/business/loading-manage.vue b/src/views/business/loading-manage.vue index 94036e3..4df86b8 100644 --- a/src/views/business/loading-manage.vue +++ b/src/views/business/loading-manage.vue @@ -395,7 +395,7 @@
配载单详情
{{ dialogForm.loadingNo || '-' }}
-
{{ statusText(dialogForm) }}
+
{{ statusText(dialogForm) }}
{{ transportTypeLabel(dialogForm.transportType) }}
@@ -2357,6 +2357,7 @@ export default { diff --git a/src/views/settlement/components/formal-settlement-table-panel.vue b/src/views/settlement/components/formal-settlement-table-panel.vue index 04042e2..f685981 100644 --- a/src/views/settlement/components/formal-settlement-table-panel.vue +++ b/src/views/settlement/components/formal-settlement-table-panel.vue @@ -64,7 +64,7 @@ {{ row[column.prop] }} - {{ + {{ displayValue(row[column.prop]) }} {{ formatMoney(row[column.prop], row.currency) }} diff --git a/src/views/settlement/components/pre-settlement-editor.vue b/src/views/settlement/components/pre-settlement-editor.vue index 4bc11b0..9b3655e 100644 --- a/src/views/settlement/components/pre-settlement-editor.vue +++ b/src/views/settlement/components/pre-settlement-editor.vue @@ -411,26 +411,27 @@ destroy-on-close class="pre-settlement-candidate-dialog" > -
选择结算明细
- - - - - - - - - 查询 - 重置 - - + + + + + + + + + + 查询 + 重置 + + + {{ row[column.prop] }} - + {{ row[column.prop] || '-' }} diff --git a/src/views/settlement/settlement-adjustment.vue b/src/views/settlement/settlement-adjustment.vue index 0ca5353..28c889b 100644 --- a/src/views/settlement/settlement-adjustment.vue +++ b/src/views/settlement/settlement-adjustment.vue @@ -71,7 +71,7 @@ type="primary" @click="openView(row)" >{{ row[column.prop] }}{{ + >{{ row[column.prop] || '-' }}{{ formatMoney(row[column.prop]) }} @@ -119,7 +119,7 @@ - + diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue index 779d39e..f3e8e5e 100644 --- a/src/views/vehicle/customer-archive.vue +++ b/src/views/vehicle/customer-archive.vue @@ -43,7 +43,7 @@ @@ -80,7 +80,7 @@ 查看 @@ -794,12 +794,12 @@
- - {{ readonly ? '关闭' : '取消' }} + + {{ isArchivePage ? '返回' : readonly ? '关闭' : '取消' }} 保存 提交 - 返回 + 返回
@@ -1809,7 +1809,11 @@ export default { this.initBusinessDictionaries(); this.initScoreQuantificationOptions(); if (this.isArchivePage) { - this.openArchive(this.$route.query.id ? { id: this.$route.query.id } : null); + const readonly = this.$route.query.view === '1' || this.$route.query.view === 'true'; + this.openArchive( + this.$route.query.id ? { id: this.$route.query.id } : null, + readonly + ); } }, computed: { @@ -1827,24 +1831,10 @@ export default { return this.$route.path === '/vehicle/customer-archive/form'; }, archiveContainer() { - return this.isArchivePage ? 'div' : 'el-dialog'; + return 'div'; }, archiveContainerProps() { - if (this.isArchivePage) { - return { class: 'archive-page-form' }; - } - return { - title: this.dialogTitle, - appendToBody: true, - modelValue: this.archiveBox, - width: '92%', - top: '4vh', - modal: true, - showClose: true, - closeOnClickModal: true, - closeOnPressEscape: true, - class: 'archive-dialog', - }; + return { class: 'archive-page-form' }; }, regionCascaderProps() { return { @@ -3588,12 +3578,14 @@ export default { query: isEdit ? { id: row.id, name: '编辑客商档案' } : { name: '新增客商档案' }, }); }, + viewArchive(row) { + this.$router.push({ + path: '/vehicle/customer-archive/form', + query: { id: row.id, name: '查看客商档案', view: '1' }, + }); + }, closeArchive() { - if (this.isArchivePage) { - this.$router.push('/vehicle/customer-archive'); - return; - } - this.archiveBox = false; + this.$router.push('/vehicle/customer-archive'); }, openArchive(row, readonly = false) { this.readonly = readonly; @@ -4858,11 +4850,6 @@ export default { font-size: 14px; } -:deep(.archive-dialog .el-dialog__body) { - max-height: 72vh; - overflow: auto; -} - .archive-page-form { min-height: 100%; margin-bottom: 60px;