b2894lxlx/tms-erp-web
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'websoft/master'

Browse Source
This commit is contained in:
b2894lxlx
2026-08-25 13:44:24 +08:00
parent f3c29ef2bf 2bd9d8c047
commit e309987199
53 changed files with 340 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.workbuddy/memory/2026-08-25.md
+40
View File
@@ -0,0 +1,40 @@
# 2026-08-25
## 全站操作列按钮居中统一
- 根因：pre-settlement 等手写操作列用 `<div class="xxx__links">` 包裹 `el-link`，而全局 `element-ui.scss` 第 904 行原选择器为 `:has(> .el-link)`（仅命中直接子元素），导致包了一层 div 的操作列未被居中规则命中，按钮靠左。
- 修复：将 `.el-table .el-table__body .cell:not(.avue-crud__menu)` 相关的三处选择器 `:has(> .el-link)` 全部放宽为 `:has(.el-link)`（第 904 / 935 / 954 行），兼容"el-link 被 div 包裹"的手写操作列；`.avue-crud__menu`（Avue 内置操作列）原已居中不受影响。
- 另在 `pre-settlement.vue` 的 `.pre-settlement-page__links` 补 `justify-content:center` 兜底。
- 结论：全站所有基于 el-link 的操作列（无论是否包裹 div）统一居中，符合 AGENTS.md 操作列规范。
## 全站业务状态标签改为普通文字（无颜色圆点）
- 根因：用户反馈审批状态列显示为带彩色圆点的文字（如截图），要求改成"普通的文字不要颜色"。此前 `.status-text` 是"文字 + 彩色圆点"风格。
- 修复：修改 `src/styles/element-ui.scss` 中 `.el-tag.status-text` 全局规则，去掉 `&::before` 圆点，并将 `color` 强制设为 `var(--el-text-color-regular)`，`font-weight:normal`，`margin:0`，背景边框保持透明。所有带 `class="status-text"` 的 `el-tag` 自动生效，无需逐页改模板。
- 结论：全站业务状态（调度状态/运单状态/审批状态等）统一为普通文字，不再带彩色圆点。
## /payment 下全部表单页板块风格统一
- 需求：所有 /payment 表单页（invoice-receipt / invoice-application / payment-application / bill-ledger / bill-payment / receipt-claim-record / receipt-flow）统一为"页面标题无蓝标 + 每个蓝标板块用白底卡片包裹 + 板块间距 12px"，参考 business/project-apply/form。
- 实现：页面标题改用全局 `archive-page-form__title`（蓝标已注释，无竖条）；各 `<section class="X-form-page__section"><div class="X-form-page__section-title">标题</div>` 整体改为全局组件 `<section-card title="标题">`（白底卡片 + 4px 主色竖条 + 卡间 12px，由 `src/styles/element-ui.scss` 全局 `.section-card` 提供）；带按钮的板块（附件信息/开票内容）用 `<section-card title="..."><template #extra>按钮</template>`。
- 清理：删除各文件 scoped 中 `__title`/`__section` 相关的废弃 CSS（蓝标 ::before、板块间距、heading 等）；`payment-application` 的 `.payment-form-page__section-actions`（按钮行右对齐）属有效独立样式，清理时被误删，已补回。
- 校验：用 @vue/compiler-sfc 对 7 个文件做 template/script 编译，全部通过。
## /payment 板块表单控件统一 4 列（span=6）
- 需求：用户要求 /payment 下"板块表单控件都改成 4 列"。此前列数不一致：多数页用 `el-col :span="12"`（2 列），invoice-application 用 `:span="8"`（3 列），bill-payment / bill-ledger 是"两列各叠多个控件"的嵌套结构。
- 实现：
- 直接网格（每列一个控件）：payment-application、invoice-receipt、receipt-claim-record、receipt-flow 的 `:span="12"` → `:span="6"`；invoice-application 的 `:span="8"` → `:span="6"`（两处 el-row）。
- 嵌套网格：bill-payment、bill-ledger 拆成每个字段独立 `el-col :span="6"`（真 4 列），gutter 48→24；备注保留 `:span="24"` 整行。
- 媒体查询同步：`.el-col-12`/`.el-col-8` 窄屏折叠规则改成 `.el-col-6`（≤1024/1200/900/768px 折叠为整行）。
- 结论：全 /payment 表单页板块表单控件统一为 4 列网格，备注/长文本仍整行；pre-settlement-editor「结算基本信息」此前也已改 `:span="8"`→`span="6"`。
## 全站 el-tag 状态语义统一转纯文本（status-text）
- 需求：用户要求"全站看看还有哪些地方使用 el-tag 的？都要统一改一下"，保持与调度状态一致的纯文本风格。
- 范围确认：用 AskUserQuestion 确认采用"所有状态语义"——业务状态(审批/调度/运单/匹配/认领) + 启用停用 + 工作流激活挂起/完成 + 其它状态(statusName/是否封存/否是/认证/锁状态/合同阶段) 一律转 `.status-text` 纯文本；类型标签/版本号/分类名/值类(车牌颜色、锁类型、运输方式、categoryName、code、apiKey 等) 保留 tag。
- 改动文件（约 35 个，仅加 `class="status-text"`，不动逻辑/`:type` 绑定）：
- 启用/停用：base(railway-station/airport-master/currency/customer-type/fee-item/port-terminal)、system/dept、transportCapacity(vehicle/driver/ship)、authority(apikey/ratelimit)
- 业务状态遗漏补：settlement/formal-settlement、business/temporary-credit-limit、business/contract-manage(合同阶段+审批)、payment(invoice-application/bill-payment-table/receipt-flow/receipt-claim-record/invoice-receipt/payment-application)、settlement/components/transport-reconciliation-editor(匹配结果/状态/更新结果)、transit/risk-disposal(column.tag/field.tag)
- 工作流/其它：flow(manager/follow 激活挂起)、work(start 激活挂起/send 完成)、transportCapacity/vehicle 认证状态、system/authlock lockStatus、tool/codesetting、resource(sms/oss) statusName、vehicle/customer-archive(审批+启用停用)、system/dict+dictbiz 及 util/demo 各 dict 页 是否封存
- 校验：重新 grep `el-tag[^>]*:type=` 确认除 authlock lockType、vehicle-ledger plateColor 两个刻意保留的"类型标签"外，所有状态语义 el-tag 均已带 status-text。改动为纯属性添加，Vite HMR 自动生效。
## 业务状态文字化后字号/行高对齐单元格
- 根因：用户截图反馈 customer-archive 的"准入类型/审批状态/状态"列文字比其它列小/错位。`.el-tag` 默认 `font-size: var(--el-tag-font-size)`（12px）且 `height` 固定，即便 `.status-text` 去掉了背景边框，字号和盒模型仍与单元格普通文本不一致。
- 修复：在 `src/styles/element-ui.scss` 的 `.el-tag.status-text` 全局规则追加 `font-size: inherit !important; height: auto !important; vertical-align: baseline; line-height: inherit;`，强制继承父级字号与行高，高度随内容自适应，基线对齐与普通 inline 文本一致。
- 结论：所有使用 `.status-text` 的状态列（customer-archive 准入类型/审批状态/状态、transport-plan 调度状态、waybill 运单状态、payment 审批状态、启用停用等）自动与相邻普通文字列的字体字号/行高/基线完全统一，无需逐页修改。
.workbuddy/memory/MEMORY.md
+5 -5
View File
@@ -40,11 +40,11 @@
- 已覆盖：pre-settlement-editor「结算明细调整」弹窗（adjustDialog 列内 el-input-number/el-input 全宽）、transport-reconciliation-editor/formal-settlement-editor/settlement-adjustment-editor 同款结构。
### 业务状态标签文字化：全局 `.status-text` 工具类
- 需求：全站"调度状态/运单状态/审批状态"等用 `el-tag` 展示的字段，统一改为"纯文字 + 颜色"（不用 tag 背景/边框）。
- 实现：`element-ui.scss` 末尾新增 `.el-tag.status-text { background:transparent!important; border-color:transparent!important; padding:0; margin-left:8px; font-weight:500 }` + `&::before` 6px 圆点（`background:currentColor`，颜色随 el-tag 的 `:type`）。
- 用法：业务状态 `el-tag` 加 `class="status-text"`，颜色仍由现有 `statusTagType/statusType/waybillStatusType/detailStatusType` 返回的 success/warning/danger/info/primary 决定。
- 已覆盖：`business-crud-page.vue`（#status/#businessStatus/#approvalStatus 插槽 + 运输计划详情头 + 运单详情头 + 调度弹窗头）、`master-order.vue`/`master-order-detail.vue`/`master-order-dispatch.vue` 的 businessStatus、`loading-manage.vue` 详情弹窗、结算三处 approvalStatus、`process-config.vue` 流程状态、`credit-score-quantification.vue` 状态列。
- 例外：`loading-manage.vue` 列表状态列本就用 `<span class="loading-manage-page__status is-${status}">` 文字化（先例），不动；"类型标签"（transport-flow-tag、transportTypeName 等 `type="primary"`）非状态语义，保持 tag 样式。
- 需求：全站"调度状态/运单状态/审批状态"等用 `el-tag` 展示的字段，统一改为**普通文字，不带颜色、不显示 tag 背景/边框/圆点**。
- 实现：`element-ui.scss` 末尾 `.el-tag.status-text { background:transparent!important; border-color:transparent!important; color:var(--el-text-color-regular)!important; padding:0; margin:0; font-weight:normal!important; font-size:inherit!important; height:auto!important; vertical-align:baseline; line-height:inherit }`，并隐藏 `&::before` 圆点。`el-tag` 的 `:type` 继续保留在模板中（无需改动），但颜色/字号/行高已被全局 CSS 强制覆盖为与单元格普通文本一致。
- 用法：业务状态 `el-tag` 加 `class="status-text"`。
- **全站统一完成（2026-08-25）**：所有"状态语义"的 el-tag 均已加 `class="status-text"` 转纯文本，含：business-crud-page（#status/#businessStatus/#approvalStatus + 调度弹窗头）、master-order 系列、loading-manage 详情、结算（settlement-adjustment/pre-settlement/formal-settlement/formal-settlement-table-panel/transport-reconciliation-editor 匹配结果·状态）、payment（invoice-application/bill-payment-table/receipt-flow/receipt-claim-record/invoice-receipt/payment-application 审批·认领状态）、contract-manage（合同阶段 + 审批）、temporary-credit-limit、process-config、credit-score-quantification、flow（manager/follow 激活·挂起）、work（start 激活·挂起 / send 完成）、transportCapacity（vehicle 启用·认证 / driver / ship 启用）、base（railway-station/airport-master/currency/customer-type/fee-item/port-terminal 启用停用）、system（dept/authority apikey·ratelimit 启用禁用 / authlock lockStatus / dict·dictbiz 是否封存 / codesetting 否是）、resource（sms/oss statusName）、customer-archive（审批 + 启用停用）、transit/risk-disposal（column.tag/field.tag）。
- 例外（刻意保留 tag 样式，非状态语义）：`loading-manage.vue` 列表状态列用 `<span class="loading-manage-page__status is-${status}">`（先例）；"类型标签"——transport-flow-tag、transportTypeName、business-crud-page:3252 运输方式、loading-manage:399 运输方式 warning、authlock lockType（锁类型）、vehicle-ledger plateColor/businessRelation、cron-editor、以及 categoryName/version/code/tenantId/roleName/deptName/apiKey/remoteIp/env/tableName/method/recordLevel/pattern/modelTable/fileSize/node.tags 等"值/标签/提示"类。注：customer-archive 准入类型原在例外中，2026-08-25 用户要求也转纯文本（已加 status-text）。
## 关键文件
- 分组白卡：`src/components/section-card/main.vue`。
src/styles/element-ui.scss
+15 -17
View File
@@ -898,7 +898,10 @@
}
// 全站统一：手写表格操作列中的文字链接保持间距并支持自动换行
.el-table .el-table__body .cell:not(.avue-crud__menu):has(> .el-link) {
// 用后代选择器 :has(.el-link) 而非直接子元素 :has(> .el-link)，
// 以兼容「el-link 被 div 包裹」的手写操作列（如 pre-settlement 的 .pre-settlement-page__links），
// 让无论是否包了一层 div 的操作列按钮都统一居中。
.el-table .el-table__body .cell:not(.avue-crud__menu):has(.el-link) {
display: flex;
flex-wrap: wrap;
align-items: center;
@@ -929,7 +932,7 @@
// 全站统一：去除操作列 el-link 默认 margin，避免与 8px gap 叠加导致文字间距过宽
.avue-crud .avue-crud__menu .el-link,
.el-table .el-table__body .cell:not(.avue-crud__menu):has(> .el-link) .el-link {
.el-table .el-table__body .cell:not(.avue-crud__menu):has(.el-link) .el-link {
margin: 0;
}
@@ -948,7 +951,7 @@
// 操作列单元格会被加上 .el-tooltip 类并写死宽度，导致内部 el-link 换行后被裁切。
// 此处豁免操作列单元格：让 Avue 行菜单与手写表格操作列保持原有 flex 自动换行，不被固定宽度裁切。
.el-table .cell.avue-crud__menu,
.el-table .el-table__body .cell.el-tooltip:has(> .el-link) {
.el-table .el-table__body .cell.el-tooltip:has(.el-link) {
width: auto !important;
overflow: visible;
text-overflow: clip;
@@ -1027,27 +1030,22 @@
// margin-bottom: 15px !important;
//}
// ============ 业务状态标签：全站统一为「文字 + 颜色」样式 ============
// 去掉 el-tag 默认背景与边框，仅保留彩色文字，并前置一个状态圆点（颜色同文字）。
// ============ 业务状态标签：全站统一为普通文字 ============
// 去掉 el-tag 默认背景、边框、颜色圆点，仅保留文本本身，颜色与正文一致。
// 适用于所有业务状态展示：调度状态 / 运单状态 / 审批状态等。
.el-tag.status-text {
background-color: transparent !important;
border-color: transparent !important;
color: var(--el-text-color-regular) !important;
padding: 0;
margin-left: 8px;
font-weight: 500;
margin: 0;
font-weight: normal !important;
font-size: inherit !important;
line-height: inherit;
height: auto !important;
vertical-align: baseline;
&::before {
content: '';
display: inline-block;
width: 6px;
height: 6px;
border-radius: 50%;
background-color: currentColor;
margin-right: 6px;
vertical-align: middle;
position: relative;
top: -1px;
display: none;
}
}
src/views/authority/apikey.vue
+1 -1
View File
@@ -30,7 +30,7 @@
</el-button>
</template>
<template #status="{ row }">
<el-tag :type="row.status === 1 ? 'success' : 'danger'">
<el-tag :type="row.status === 1 ? 'success' : 'danger'" class="status-text">
{{ row.status === 1 ? '启用' : '禁用' }}
</el-tag>
</template>
src/views/authority/ratelimit.vue
+1 -1
View File
@@ -47,7 +47,7 @@
{{ row.limitCount }} 次 / {{ row.limitPeriod }} {{ timeUnitLabel(row.timeUnit) }}
</template>
<template #status="{ row }">
<el-tag :type="row.status === 1 ? 'success' : 'danger'">
<el-tag :type="row.status === 1 ? 'success' : 'danger'" class="status-text">
{{ row.status === 1 ? '启用' : '禁用' }}
</el-tag>
</template>
src/views/base/airport-master.vue
+1 -1
View File
@@ -55,7 +55,7 @@
</el-button>
</template>
<template #status="{ row }">
<el-tag :type="row.status === 1 ? 'primary' : 'info'">
<el-tag :type="row.status === 1 ? 'primary' : 'info'" class="status-text">
{{ row.status === 1 ? '启用' : '停用' }}
</el-tag>
</template>
src/views/base/currency.vue
+1 -1
View File
@@ -63,7 +63,7 @@
</el-autocomplete>
</template>
<template #status="{ row }">
<el-tag :type="row.status === 1 ? 'primary' : 'info'">
<el-tag :type="row.status === 1 ? 'primary' : 'info'" class="status-text">
{{ row.status === 1 ? '启用' : '停用' }}
</el-tag>
</template>
src/views/base/customer-type.vue
+1 -1
View File
@@ -31,7 +31,7 @@
</el-button>
</template>
<template #status="{ row }">
<el-tag :type="row.status === 1 ? 'primary' : 'info'">
<el-tag :type="row.status === 1 ? 'primary' : 'info'" class="status-text">
{{ row.status === 1 ? '启用' : '停用' }}
</el-tag>
</template>
src/views/base/fee-item.vue
+2 -2
View File
@@ -32,7 +32,7 @@
</el-button>
</template>
<template #status="{ row }">
<el-tag :type="row.status === 1 ? 'primary' : 'info'">
<el-tag :type="row.status === 1 ? 'primary' : 'info'" class="status-text">
{{ row.status === 1 ? '启用' : '停用' }}
</el-tag>
</template>
@@ -255,7 +255,7 @@ export default {
addDisplay: false,
editDisplay: false,
value: 1,
minWidth: 100,
minWidth: 110,
},
],
},
src/views/base/port-terminal.vue
+1 -1
View File
@@ -64,7 +64,7 @@
<span>港口/码头</span>
</template>
<template #status="{ row }">
<el-tag :type="row.status === 1 ? 'primary' : 'info'">
<el-tag :type="row.status === 1 ? 'primary' : 'info'" class="status-text">
{{ row.status === 1 ? '启用' : '停用' }}
</el-tag>
</template>
src/views/base/railway-station.vue
+1 -1
View File
@@ -55,7 +55,7 @@
</el-button>
</template>
<template #status="{ row }">
<el-tag :type="row.status === 1 ? 'primary' : 'info'">
<el-tag :type="row.status === 1 ? 'primary' : 'info'" class="status-text">
{{ row.status === 1 ? '启用' : '停用' }}
</el-tag>
</template>
src/views/business/components/business-crud-page.vue
+12 -12
View File
@@ -96,19 +96,19 @@
</template>
<template #status="{ row }">
<el-tag :type="statusTagType(row.status)">
<el-tag :type="statusTagType(row.status)" class="status-text">
{{ displayStatus(row, 'status') }}
</el-tag>
</template>
<template #businessStatus="{ row }">
<el-tag :type="statusTagType(row.businessStatus)">
<el-tag :type="statusTagType(row.businessStatus)" class="status-text">
{{ displayStatus(row, 'businessStatus') }}
</el-tag>
</template>
<template #approvalStatus="{ row }">
<el-tag :type="statusTagType(row.approvalStatus)">
<el-tag :type="statusTagType(row.approvalStatus)" class="status-text">
{{ displayStatus(row, 'approvalStatus') }}
</el-tag>
</template>
@@ -2177,15 +2177,15 @@
<span>|</span>
{{ detailRow.planNo || '-' }}
</h2>
<el-tag class="is-dispatching" effect="light">
<span class="detail-status-text is-dispatching">
{{ displayStatus(detailRow, 'businessStatus') }}
</el-tag>
<el-tag type="primary" effect="light">
</span>
<span class="detail-status-text detail-transport-type">
{{
detailRow.transportTypeName ||
formatTransportPlanDetailTransportType(detailRow.transportType)
}}
</el-tag>
</span>
</div>
<div class="business-crud-page__transport-plan-detail-overview">
<div class="business-crud-page__transport-plan-detail-fields">
@@ -2347,10 +2347,10 @@
<div class="business-crud-page__waybill-heading">
<strong>运单详情</strong>
<span>{{ detailRow.waybillNo || '-' }}</span>
<el-tag type="success">{{ displayStatus(detailRow, 'businessStatus') }}</el-tag>
<el-tag type="primary">
<span class="detail-status-text status-text-success">{{ displayStatus(detailRow, 'businessStatus') }}</span>
<span class="detail-status-text detail-transport-type">
{{ formatTransportPlanDetailTransportType(waybillTransportMode(detailRow)) }}
</el-tag>
</span>
<el-link
v-if="detailRow.id"
class="business-crud-page__waybill-route-change-link"
@@ -3246,7 +3246,7 @@
<span class="business-crud-page__dispatch-heading-no">
{{ dispatchDialogNo || '-' }}
</span>
<el-tag :type="statusTagType(dispatchRow.businessStatus)" effect="light">
<el-tag :type="statusTagType(dispatchRow.businessStatus)" effect="light" class="status-text">
{{ dispatchDialogStatusText }}
</el-tag>
<el-tag type="primary" effect="light">
@@ -13125,7 +13125,7 @@ export default {
height: auto;
max-height: none;
line-height: 20px;
white-space: pre-line;
//white-space: pre-line;
word-break: break-word;
text-overflow: clip;
}
src/views/business/contract-manage.vue
+2 -2
View File
@@ -62,13 +62,13 @@
</template>
<template #contractStage="{ row }">
<el-tag :type="stageTagType(row.contractStage)">
<el-tag :type="stageTagType(row.contractStage)" class="status-text">
{{ displayStatus(row, 'contractStage') }}
</el-tag>
</template>
<template #approvalStatus="{ row }">
<el-tag :type="statusTagType(row.approvalStatus)">
<el-tag :type="statusTagType(row.approvalStatus)" class="status-text">
{{ displayStatus(row, 'approvalStatus') }}
</el-tag>
</template>
src/views/business/temporary-credit-limit.vue
+1 -1
View File
@@ -45,7 +45,7 @@
</template>
<template #approvalStatus="{ row }">
<el-tag :type="statusTagType(row.approvalStatus)">
<el-tag :type="statusTagType(row.approvalStatus)" class="status-text">
{{ displayStatus(row, 'approvalStatus') }}
</el-tag>
</template>
src/views/flow/follow.vue
+1 -1
View File
@@ -18,7 +18,7 @@
@on-load="onLoad"
>
<template #suspensionState="{ row }">
<el-tag>{{ row.suspensionState === 1 ? '激活' : '挂起' }}</el-tag>
<el-tag class="status-text">{{ row.suspensionState === 1 ? '激活' : '挂起' }}</el-tag>
</template>
</avue-crud>
<el-dialog
src/views/flow/manager.vue
+1 -1
View File
@@ -49,7 +49,7 @@
<el-tag>v{{ row.version }}</el-tag>
</template>
<template #suspensionState="{ row }">
<el-tag>{{ row.suspensionState === 1 ? '激活' : '挂起' }}</el-tag>
<el-tag class="status-text">{{ row.suspensionState === 1 ? '激活' : '挂起' }}</el-tag>
</template>
<template #category="{ row }">
<el-tag>{{ row.categoryName }}</el-tag>
src/views/payment/bill-ledger-form.vue
+39 -39
View File
@@ -1,6 +1,6 @@
<template>
<basic-container class="bill-ledger-form-page">
<div class="bill-ledger-form-page__title">
<div class="archive-page-form__title">
{{ recordId ? '编辑汇票台账' : '新增汇票台账' }}
</div>
<el-form
@@ -11,10 +11,9 @@
label-width="auto"
class="bill-ledger-form-page__form"
>
<section class="bill-ledger-form-page__section">
<div class="bill-ledger-form-page__section-title">基本信息</div>
<el-row :gutter="48">
<el-col :span="12">
<section-card title="基本信息">
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="票据号码" prop="billNo">
<el-input
v-model="form.billNo"
@@ -23,6 +22,8 @@
placeholder="请输入"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="出票单位" prop="issuerId">
<el-select
v-model="form.issuerId"
@@ -41,6 +42,8 @@
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="票面金额" prop="faceAmount">
<el-input-number
v-model="form.faceAmount"
@@ -50,6 +53,8 @@
placeholder="请输入"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="出票日期" prop="issueDate">
<el-date-picker
v-model="form.issueDate"
@@ -58,6 +63,8 @@
placeholder="请选择"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="可用部门" prop="availableDeptIds">
<el-tree-select
v-model="form.availableDeptIds"
@@ -72,6 +79,8 @@
@change="handleDeptChange"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="费用承担方" prop="feeBearerId">
<el-select
v-model="form.feeBearerId"
@@ -90,6 +99,8 @@
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="双方确认贴现率" prop="confirmedDiscountRate">
<el-input-number
v-model="form.confirmedDiscountRate"
@@ -103,7 +114,7 @@
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="汇票类型" prop="billType">
<el-select v-model="form.billType" placeholder="请选择">
<el-option
@@ -114,6 +125,8 @@
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="收票单位" prop="receiverName">
<el-select
v-model="form.receiverName"
@@ -130,9 +143,13 @@
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="可用余额">
<el-input :model-value="formatMoney(projectedAvailableBalance)" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="到期日期" prop="maturityDate">
<el-date-picker
v-model="form.maturityDate"
@@ -141,6 +158,8 @@
placeholder="请选择"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="出票行" prop="issuingBank">
<el-select
v-model="form.issuingBank"
@@ -152,6 +171,8 @@
<el-option v-for="item in bankOptions" :key="item" :label="item" :value="item" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="银行贴现参考率" prop="bankDiscountReferenceRate">
<el-input-number
v-model="form.bankDiscountReferenceRate"
@@ -164,15 +185,16 @@
<template #suffix>%</template>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="预计贴现费用">
<el-input :model-value="formatMoney(estimatedDiscountFee)" disabled />
</el-form-item>
</el-col>
</el-row>
</section>
</section-card>
<section class="bill-ledger-form-page__section">
<div class="bill-ledger-form-page__section-title">附件信息</div>
<section-card title="附件信息">
<el-table :data="form.attachments" border>
<el-table-column type="index" label="序号" width="64" align="center" />
<el-table-column label="文件名" min-width="220">
@@ -215,10 +237,9 @@
button-text="上传"
@change="normalizeAttachments"
/>
</section>
</section-card>
<section class="bill-ledger-form-page__section">
<div class="bill-ledger-form-page__section-title">备注</div>
<section-card title="备注">
<el-form-item prop="remark" class="bill-ledger-form-page__remark">
<el-input
v-model="form.remark"
@@ -229,10 +250,9 @@
placeholder="请输入"
/>
</el-form-item>
</section>
</section-card>
<section class="bill-ledger-form-page__section">
<div class="bill-ledger-form-page__section-title">使用记录</div>
<section-card title="使用记录">
<el-table :data="usageRecords" border>
<el-table-column type="index" label="序号" width="64" align="center" />
<el-table-column prop="applicationNo" label="申请单号" min-width="180" align="center" />
@@ -244,7 +264,7 @@
<template #default>已审核</template>
</el-table-column>
</el-table>
</section>
</section-card>
<div class="bill-ledger-form-page__actions">
<el-button type="primary" :loading="saving" @click="confirmSubmit">确认</el-button>
@@ -540,28 +560,8 @@ export default {
</script>
<style scoped lang="scss">
.bill-ledger-form-page__title,
.bill-ledger-form-page__section-title {
display: flex;
align-items: center;
margin-bottom: 16px;
font-size: 18px;
font-weight: 600;
}
.bill-ledger-form-page__title::before,
.bill-ledger-form-page__section-title::before {
width: 4px;
height: 20px;
margin-right: 8px;
background: #409eff;
content: '';
}
.bill-ledger-form-page__section {
margin-bottom: 24px;
}
.bill-ledger-form-page__section-title {
font-size: 16px;
}
.bill-ledger-form-page__form :deep(.el-form-item) {
margin-bottom: 16px;
}
@@ -591,7 +591,7 @@ export default {
background: #fafafa;
}
@media (max-width: 1024px) {
.bill-ledger-form-page :deep(.el-col-12) {
.bill-ledger-form-page :deep(.el-col-6) {
max-width: 100%;
flex: 0 0 100%;
}
src/views/payment/bill-payment-form.vue
+14 -27
View File
@@ -8,10 +8,9 @@
label-width="auto"
class="bill-payment-form-page__form"
>
<section class="bill-payment-form-page__section">
<div class="bill-payment-form-page__section-title">基本信息</div>
<el-row :gutter="48">
<el-col :span="12">
<section-card title="基本信息">
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="票据号码" prop="billLedgerId">
<el-input
v-model="form.billNo"
@@ -24,9 +23,13 @@
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="可用余额">
<el-input :model-value="formatMoney(form.availableBalance)" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="付款日期" prop="paymentDate">
<el-date-picker
v-model="form.paymentDate"
@@ -37,10 +40,12 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="票面金额">
<el-input :model-value="formatMoney(form.faceAmount)" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="本次使用" prop="usedAmount">
<el-input-number
v-model="form.usedAmount"
@@ -66,10 +71,9 @@
</el-form-item>
</el-col>
</el-row>
</section>
</section-card>
<section class="bill-payment-form-page__section">
<div class="bill-payment-form-page__section-title">附件信息</div>
<section-card title="附件信息">
<el-table :data="form.attachments" border>
<el-table-column type="index" label="序号" width="64" align="center" />
<el-table-column label="文件名" min-width="220">
@@ -115,7 +119,7 @@
button-text="上传"
@change="normalizeAttachments"
/>
</section>
</section-card>
<div class="bill-payment-form-page__actions">
<template v-if="!readonly">
@@ -373,23 +377,6 @@ export default {
</script>
<style scoped lang="scss">
.bill-payment-form-page__section {
margin-bottom: 24px;
}
.bill-payment-form-page__section-title {
display: flex;
align-items: center;
margin-bottom: 16px;
font-size: 18px;
font-weight: 600;
}
.bill-payment-form-page__section-title::before {
width: 4px;
height: 20px;
margin-right: 8px;
background: #409eff;
content: '';
}
.bill-payment-form-page__form :deep(.el-form-item) {
margin-bottom: 16px;
}
@@ -426,7 +413,7 @@ export default {
background: #fafafa;
}
@media (max-width: 1024px) {
.bill-payment-form-page :deep(.el-col-12) {
.bill-payment-form-page :deep(.el-col-6) {
max-width: 100%;
flex: 0 0 100%;
}
src/views/payment/components/bill-payment-table.vue
+1 -1
View File
@@ -15,7 +15,7 @@
show-overflow-tooltip
>
<template #default="{ row }">
<el-tag v-if="column.status" :type="statusType(row.approvalStatus)">
<el-tag v-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">
{{ row[column.prop] || '-' }}
</el-tag>
<span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
src/views/payment/invoice-application-form.vue
+35 -79
View File
@@ -1,6 +1,6 @@
<template>
<basic-container class="invoice-form-page">
<div class="invoice-form-page__title">
<div class="archive-page-form__title">
{{ readonly ? '查看开票申请' : recordId ? '编辑开票申请' : '新增开票申请' }}
</div>
@@ -12,10 +12,9 @@
label-width="auto"
class="invoice-form-page__form"
>
<section class="invoice-form-page__section">
<div class="invoice-form-page__section-title">开票基本信息</div>
<section-card title="开票基本信息">
<el-row :gutter="24">
<el-col :span="8">
<el-col :span="6">
<el-form-item label="结算单" prop="settlementIds">
<el-input :model-value="settlementLabel" readonly placeholder="请选择正式结算单">
<template v-if="!readonly" #append>
@@ -24,17 +23,17 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="所属项目">
<el-input v-model="form.projectName" disabled placeholder="根据结算单自动带出" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="开票单位">
<el-input v-model="form.issuerName" disabled placeholder="根据结算单自动带出" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="发票类型" prop="invoiceType">
<el-select
v-model="form.invoiceType"
@@ -50,7 +49,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="可开票金额">
<el-input
:model-value="form.settlements.length ? formatMoney(availableInvoiceAmount) : ''"
@@ -59,7 +58,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="本次开票金额">
<el-input
:model-value="invoiceAmount > 0 ? formatMoney(invoiceAmount) : ''"
@@ -68,17 +67,17 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="申请日期">
<el-input v-model="form.applicationDate" disabled placeholder="提交后自动显示" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="申请人">
<el-input v-model="form.applicantName" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="承办部门">
<el-input
v-model="form.undertakingDeptName"
@@ -87,7 +86,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="部门邮箱" prop="departmentEmails">
<el-select
v-model="form.departmentEmails"
@@ -108,12 +107,11 @@
</el-form-item>
</el-col>
</el-row>
</section>
</section-card>
<section class="invoice-form-page__section">
<div class="invoice-form-page__section-title">受票方信息</div>
<section-card title="受票方信息">
<el-row :gutter="24">
<el-col :span="8">
<el-col :span="6">
<el-form-item label="受票方单位" prop="receiverInvoiceInfoId">
<el-select
v-model="form.receiverInvoiceInfoId"
@@ -130,12 +128,12 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="纳税人识别号" prop="taxpayerNo">
<el-input v-model="form.taxpayerNo" disabled placeholder="选择受票方单位后自动带出" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="开户账号" prop="bankAccount">
<el-input
v-model="form.bankAccount"
@@ -144,12 +142,12 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="开户行" prop="bankName">
<el-input v-model="form.bankName" disabled placeholder="选择受票方单位后自动带出" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="注册地址" prop="registeredAddress">
<el-input
v-model="form.registeredAddress"
@@ -158,7 +156,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="联系人">
<el-select
v-model="form.contactName"
@@ -177,24 +175,20 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="联系电话" prop="contactPhone">
<el-input v-model="form.contactPhone" :disabled="readonly" maxlength="11" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" :disabled="readonly" maxlength="100" />
</el-form-item>
</el-col>
</el-row>
</section>
</section-card>
<section class="invoice-form-page__section">
<div class="invoice-form-page__section-heading">
<div class="invoice-form-page__section-title">开票内容</div>
<el-button v-if="!readonly" type="primary" @click="addSheet">添加</el-button>
</div>
<section-card title="开票内容"><template #extra><el-button v-if="!readonly" type="primary" @click="addSheet">添加</el-button></template>
<div v-for="(sheet, sheetIndex) in form.sheets" :key="sheet.localId" class="invoice-sheet">
<div class="invoice-sheet__header">
<span>第{{ sheetIndex + 1 }}张</span>
@@ -311,10 +305,9 @@
</el-table-column>
</el-table>
</div>
</section>
</section-card>
<section class="invoice-form-page__section">
<div class="invoice-form-page__section-title">结算信息</div>
<section-card title="结算信息">
<el-table :data="form.settlements" border>
<el-table-column type="index" label="序号" width="64" align="center" />
<el-table-column prop="formalSettlementNo" label="结算单号" min-width="170" />
@@ -337,10 +330,9 @@
</template>
</el-table-column>
</el-table>
</section>
</section-card>
<section class="invoice-form-page__section">
<div class="invoice-form-page__section-title">开票明细</div>
<section-card title="开票明细">
<el-table
ref="detailTable"
:data="detailRows"
@@ -371,10 +363,9 @@
</template>
</el-table-column>
</el-table>
</section>
</section-card>
<section class="invoice-form-page__section">
<div class="invoice-form-page__section-title">附件信息</div>
<section-card title="附件信息">
<vehicle-attachment-upload
v-model="form.attachments"
:readonly="readonly"
@@ -408,10 +399,9 @@
</template>
</el-table-column>
</el-table>
</section>
</section-card>
<section class="invoice-form-page__section">
<div class="invoice-form-page__section-title">备注</div>
<section-card title="备注">
<el-form-item class="invoice-form-page__remark">
<el-input
v-model="form.remark"
@@ -422,7 +412,7 @@
show-word-limit
/>
</el-form-item>
</section>
</section-card>
<div class="invoice-form-page__actions">
<el-button v-if="!readonly" type="primary" plain @click="syncReferenceData">同步</el-button>
@@ -950,40 +940,6 @@ export default {
</script>
<style scoped lang="scss">
.invoice-form-page__title,
.invoice-form-page__section-title {
display: flex;
align-items: center;
font-size: 18px;
font-weight: 600;
margin-bottom: 16px;
}
.invoice-form-page__title::before,
.invoice-form-page__section-title::before {
width: 4px;
height: 20px;
margin-right: 8px;
background: #409eff;
content: '';
}
.invoice-form-page__section {
margin-bottom: 24px;
}
.invoice-form-page__section-title {
font-size: 16px;
}
.invoice-form-page__section-heading,
.invoice-sheet__header {
display: flex;
align-items: center;
justify-content: space-between;
}
.invoice-form-page__section-heading .invoice-form-page__section-title {
margin-bottom: 0;
}
.invoice-form-page__form :deep(.el-form-item) {
margin-bottom: 16px;
}
.invoice-form-page__form :deep(.el-select),
.invoice-form-page__form :deep(.el-input-number) {
width: 100%;
@@ -1030,13 +986,13 @@ export default {
background: #fafafa;
}
@media (max-width: 1200px) {
.invoice-form-page__form :deep(.el-col-8) {
.invoice-form-page__form :deep(.el-col-6) {
max-width: 50%;
flex: 0 0 50%;
}
}
@media (max-width: 768px) {
.invoice-form-page__form :deep(.el-col-8) {
.invoice-form-page__form :deep(.el-col-6) {
max-width: 100%;
flex: 0 0 100%;
}
src/views/payment/invoice-application.vue
+1 -1
View File
@@ -89,7 +89,7 @@
<el-link v-if="column.link && row[column.prop]" type="primary" @click="openView(row)">
{{ row[column.prop] }}
</el-link>
<el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)">
<el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">
{{ displayValue(row[column.prop]) }}
</el-tag>
<span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
src/views/payment/invoice-receipt-form.vue
+27 -61
View File
@@ -1,6 +1,6 @@
<template>
<basic-container class="receipt-form-page">
<div class="receipt-form-page__title">
<div class="archive-page-form__title">
{{ readonly ? '查看收票登记' : recordId ? '编辑收票登记' : '新增收票登记' }}
</div>
@@ -12,10 +12,9 @@
label-width="auto"
class="receipt-form-page__form"
>
<section class="receipt-form-page__section">
<div class="receipt-form-page__section-title">收票基本信息</div>
<section-card title="收票基本信息">
<el-row :gutter="32">
<el-col :span="12">
<el-col :span="6">
<el-form-item label="发票号码" prop="invoiceNo">
<el-input v-model="form.invoiceNo" readonly placeholder="请选择金蝶票据池发票">
<template v-if="!readonly" #append>
@@ -26,17 +25,17 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="开票日期">
<el-input v-model="form.invoiceDate" disabled placeholder="从金蝶票据池带出" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="发票类型">
<el-input v-model="form.invoiceType" disabled placeholder="从金蝶票据池带出" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="税率">
<el-input
:model-value="formatRate(form.taxRate)"
@@ -45,7 +44,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="开票金额">
<el-input
:model-value="form.kingdeeInvoicePoolId ? formatMoney(form.invoiceAmount) : ''"
@@ -54,7 +53,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="税额">
<el-input
:model-value="form.kingdeeInvoicePoolId ? formatMoney(form.taxAmount) : ''"
@@ -63,17 +62,17 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="受票单位">
<el-input v-model="form.receiverName" disabled placeholder="从金蝶票据池带出" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="开票单位">
<el-input v-model="form.issuerName" disabled placeholder="从金蝶票据池带出" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="关联结算单" prop="settlementIds">
<el-input :model-value="settlementLabel" readonly placeholder="请选择应付正式结算单">
<template v-if="!readonly" #append>
@@ -84,27 +83,27 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="开户行">
<el-input v-model="form.bankName" disabled placeholder="从金蝶票据池带出" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="开户账号">
<el-input v-model="form.bankAccount" disabled placeholder="从金蝶票据池带出" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="开票行">
<el-input v-model="form.issuingBank" disabled placeholder="从金蝶票据池带出" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="电话">
<el-input v-model="form.phone" :disabled="readonly" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="客户邮箱" prop="customerEmails">
<el-select
v-model="form.customerEmails"
@@ -124,7 +123,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="部门邮箱" prop="departmentEmails">
<el-select
v-model="form.departmentEmails"
@@ -145,10 +144,9 @@
</el-form-item>
</el-col>
</el-row>
</section>
</section-card>
<section class="receipt-form-page__section">
<div class="receipt-form-page__section-title">结算信息</div>
<section-card title="结算信息">
<el-table :data="form.settlements" border>
<el-table-column type="index" label="序号" width="64" align="center" />
<el-table-column label="结算单号" min-width="180" align="center">
@@ -177,11 +175,10 @@
</template>
</el-table-column>
</el-table>
</section>
</section-card>
<section class="receipt-form-page__section">
<div class="receipt-form-page__section-heading">
<div class="receipt-form-page__section-title">附件信息</div>
<section-card title="附件信息">
<template #extra>
<el-button
v-if="form.attachments.length"
type="primary"
@@ -190,7 +187,7 @@
@click="downloadAttachments"
>批量下载</el-button
>
</div>
</template>
<el-table :data="form.attachments" border>
<el-table-column type="index" label="序号" width="64" align="center" />
<el-table-column label="文件名" min-width="220">
@@ -227,10 +224,9 @@
class="receipt-form-page__uploader"
@change="normalizeAttachments"
/>
</section>
</section-card>
<section class="receipt-form-page__section">
<div class="receipt-form-page__section-title">备注</div>
<section-card title="备注">
<el-form-item class="receipt-form-page__remark">
<el-input
v-model="form.remark"
@@ -241,7 +237,7 @@
show-word-limit
/>
</el-form-item>
</section>
</section-card>
<div class="receipt-form-page__actions">
<el-button v-if="!readonly" type="primary" plain @click="syncReferenceData">同步</el-button>
@@ -755,36 +751,6 @@ export default {
</script>
<style scoped lang="scss">
.receipt-form-page__title,
.receipt-form-page__section-title {
display: flex;
align-items: center;
font-size: 18px;
font-weight: 600;
margin-bottom: 16px;
}
.receipt-form-page__title::before,
.receipt-form-page__section-title::before {
width: 4px;
height: 20px;
margin-right: 8px;
background: #409eff;
content: '';
}
.receipt-form-page__section {
margin-bottom: 24px;
}
.receipt-form-page__section-title {
font-size: 16px;
}
.receipt-form-page__section-heading {
display: flex;
align-items: center;
justify-content: space-between;
}
.receipt-form-page__section-heading .receipt-form-page__section-title {
margin-bottom: 0;
}
.receipt-form-page__form :deep(.el-form-item) {
margin-bottom: 16px;
}
@@ -826,7 +792,7 @@ export default {
background: #fafafa;
}
@media (max-width: 900px) {
.receipt-form-page__form :deep(.el-col-12) {
.receipt-form-page__form :deep(.el-col-6) {
max-width: 100%;
flex: 0 0 100%;
}
src/views/payment/invoice-receipt.vue
+1 -1
View File
@@ -95,7 +95,7 @@
<el-link v-if="column.link && row[column.prop]" type="primary" @click="openView(row)">
{{ row[column.prop] }}
</el-link>
<el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)">
<el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">
{{ displayValue(row[column.prop]) }}
</el-tag>
<span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
src/views/payment/payment-application-form.vue
+33 -60
View File
@@ -1,6 +1,6 @@
<template>
<basic-container class="payment-form-page">
<div class="payment-form-page__title">
<div class="archive-page-form__title">
{{ readonly ? '查看付款申请' : recordId ? '编辑付款申请' : '新增付款申请' }}
</div>
<el-form
@@ -11,17 +11,16 @@
label-width="auto"
class="payment-form-page__form"
>
<section class="payment-form-page__section">
<div class="payment-form-page__section-title">付款基本信息</div>
<section-card title="付款基本信息">
<el-row :gutter="24">
<el-col :span="12"
<el-col :span="6"
><el-form-item label="单据号"
><el-input
v-model="form.paymentNo"
disabled
placeholder="系统自动生成" /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="付款类型" prop="paymentType"
><el-select v-model="form.paymentType" :disabled="readonly" @change="handleTypeChange"
><el-option
@@ -29,7 +28,7 @@
:key="item.value"
v-bind="item" /></el-select></el-form-item
></el-col>
<el-col v-if="form.paymentType !== 'project_advance'" :span="12"
<el-col v-if="form.paymentType !== 'project_advance'" :span="6"
><el-form-item label="结算单号" prop="referenceId"
><el-input
v-model="referenceLabel"
@@ -42,7 +41,7 @@
></el-form-item
></el-col
>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="所属项目"
><el-input v-model="form.projectName" disabled
><template v-if="form.paymentType === 'project_advance'" #append
@@ -51,23 +50,23 @@
></el-form-item
></el-col
>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="合同名称"
><el-input v-model="form.contractName" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="结算金额"
><el-input v-model="form.settlementAmount" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="可付款金额"
><el-input v-model="form.payableAmount" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="票款类型"
><el-input v-model="form.billType" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="付款比例" prop="paymentRatio"
><el-input-number
v-model="form.paymentRatio"
@@ -78,7 +77,7 @@
:controls="false"
style="width: 100%" /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="申请付款金额" prop="appliedAmount"
><el-input-number
v-model="form.appliedAmount"
@@ -88,7 +87,7 @@
:controls="false"
style="width: 100%" /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="付款方式" prop="paymentMethod"
><el-select
v-model="form.paymentMethod"
@@ -99,7 +98,7 @@
:key="item.value"
v-bind="item" /></el-select></el-form-item
></el-col>
<el-col v-if="billPayment" :span="12"
<el-col v-if="billPayment" :span="6"
><el-form-item label="汇票票据" prop="billLedgerId"
><el-select
v-model="form.billLedgerId"
@@ -119,23 +118,23 @@
}`"
:value="item.id" /></el-select></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="收款方"
><el-input v-model="form.payeeName" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="收款账号"
><el-input v-model="form.bankAccount" :disabled="readonly" /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="开户银行"
><el-input v-model="form.bankName" :disabled="readonly" /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="申请人"
><el-input v-model="form.applicantName" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="申请日期"
><el-input v-model="form.applyDate" disabled /></el-form-item
></el-col>
@@ -149,9 +148,8 @@
show-word-limit /></el-form-item
></el-col>
</el-row>
</section>
<section class="payment-form-page__section">
<div class="payment-form-page__section-title">结算信息</div>
</section-card>
<section-card title="结算信息">
<el-table :data="settlementRows" border
><el-table-column type="index" label="序号" width="70" /><el-table-column
prop="settlementNo"
@@ -170,9 +168,8 @@
label="付款金额"
min-width="130"
/></el-table>
</section>
<section class="payment-form-page__section">
<div class="payment-form-page__section-title">发票信息</div>
</section-card>
<section-card title="发票信息">
<div class="payment-form-page__section-actions">
<el-button type="primary" plain :disabled="readonly" @click="addInvoice"
>新增发票</el-button
@@ -229,9 +226,8 @@
></el-table-column
></el-table
>
</section>
<section class="payment-form-page__section">
<div class="payment-form-page__section-title">付款记录</div>
</section-card>
<section-card title="付款记录">
<el-table :data="paymentRecords" border
><el-table-column type="index" label="序号" width="70" /><el-table-column
prop="paidAmount"
@@ -247,9 +243,8 @@
label="付款凭证"
min-width="160"
/></el-table>
</section>
<section class="payment-form-page__section">
<div class="payment-form-page__section-title">附件</div>
</section-card>
<section-card title="附件">
<vehicle-attachment-upload
v-model="form.attachments"
:readonly="readonly"
@@ -296,7 +291,7 @@
></el-table-column
></el-table
>
</section>
</section-card>
<div class="payment-form-page__actions">
<el-button @click="goBack">返回</el-button
><el-button v-if="!readonly && canSave" @click="saveDraft">保存</el-button
@@ -803,33 +798,6 @@ export default {
</script>
<style scoped lang="scss">
.payment-form-page__title,
.payment-form-page__section-title {
display: flex;
align-items: center;
font-size: 18px;
font-weight: 600;
margin-bottom: 16px;
}
.payment-form-page__title::before,
.payment-form-page__section-title::before {
width: 4px;
height: 20px;
margin-right: 8px;
background: #409eff;
content: '';
}
.payment-form-page__section {
margin-bottom: 24px;
}
.payment-form-page__section-title {
font-size: 16px;
}
.payment-form-page__section-actions {
display: flex;
justify-content: flex-end;
margin-bottom: 8px;
}
.payment-form-page__actions {
display: flex;
justify-content: center;
@@ -837,6 +805,11 @@ export default {
padding: 24px 0;
border-top: 1px solid #eff1f7;
}
.payment-form-page__section-actions {
display: flex;
justify-content: flex-end;
margin-bottom: 8px;
}
.payment-form-page :deep(.el-form-item) {
margin-bottom: 16px;
}
src/views/payment/payment-application.vue
+1 -1
View File
@@ -114,7 +114,7 @@
<el-link v-if="column.link" type="primary" @click="openView(row)">{{
row[column.prop]
}}</el-link>
<el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)">{{
<el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">{{
row[column.prop] || '-'
}}</el-tag>
<span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
src/views/payment/receipt-claim-record-form.vue
+23 -59
View File
@@ -1,82 +1,80 @@
<template>
<basic-container class="claim-record-form-page">
<el-form :model="form" label-position="right" label-width="auto">
<section class="claim-record-form-page__section">
<div class="claim-record-form-page__section-title">收款信息</div>
<section-card title="收款信息">
<el-row :gutter="32">
<el-col :span="12">
<el-col :span="6">
<el-form-item label="认领通知单">
<el-input v-model="form.receiptNoticeNo" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="付款人"
><el-input v-model="form.payerName" disabled
/></el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="收款金额">
<el-input :model-value="formatMoney(form.receiptAmount)" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="交易时间">
<el-input v-model="form.transactionTime" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="对方户名">
<el-input v-model="form.counterpartyName" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="对方开户行">
<el-input v-model="form.counterpartyBank" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="对方账号">
<el-input v-model="form.counterpartyAccount" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="明细流水号">
<el-input v-model="form.detailSerialNo" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="已认领金额">
<el-input :model-value="formatMoney(form.claimAmount)" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="摘要"><el-input v-model="form.summary" disabled /></el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="关联结算单">
<el-input v-model="form.associatedSettlementNos" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="认领人">
<el-input v-model="form.claimerName" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="认领日期">
<el-input v-model="form.claimDate" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="认领人部门">
<el-input v-model="form.claimerDeptName" disabled />
</el-form-item>
</el-col>
</el-row>
</section>
</section-card>
<section class="claim-record-form-page__section">
<div class="claim-record-form-page__section-title">结算信息</div>
<section-card title="结算信息">
<el-table :data="form.settlements" border>
<el-table-column type="index" label="序号" width="64" align="center" />
<el-table-column label="结算单号" min-width="180" align="center">
@@ -96,19 +94,15 @@
<template #default="{ row }">{{ formatMoney(row.allocatedReceiptAmount) }}</template>
</el-table-column>
</el-table>
</section>
</section-card>
<section class="claim-record-form-page__section">
<div class="claim-record-form-page__section-heading">
<div class="claim-record-form-page__section-title">附件信息</div>
<el-button
<section-card title="附件信息"><template #extra><el-button
v-if="form.attachments.length"
type="primary"
:icon="Download"
@click="downloadAttachments"
>批量下载</el-button
>
</div>
></template>
<el-table :data="form.attachments" border>
<el-table-column type="index" label="序号" width="64" align="center" />
<el-table-column label="文件名" min-width="220">
@@ -148,12 +142,11 @@
class="claim-record-form-page__uploader"
@change="handleAttachmentChange"
/>
</section>
</section-card>
<section class="claim-record-form-page__section">
<div class="claim-record-form-page__section-title">备注</div>
<section-card title="备注">
<el-input v-model="form.remark" type="textarea" :rows="3" maxlength="200" disabled />
</section>
</section-card>
<div class="claim-record-form-page__actions">
<el-button @click="goBack">关闭</el-button>
@@ -317,35 +310,6 @@ export default {
</script>
<style scoped lang="scss">
.claim-record-form-page__section {
margin-bottom: 24px;
}
.claim-record-form-page__section-title {
display: flex;
align-items: center;
margin-bottom: 16px;
font-size: 16px;
font-weight: 600;
}
.claim-record-form-page__section-title::before {
width: 4px;
height: 20px;
margin-right: 8px;
background: #409eff;
content: '';
}
.claim-record-form-page__section-heading {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 16px;
}
.claim-record-form-page__section-heading .claim-record-form-page__section-title {
margin-bottom: 0;
}
.claim-record-form-page :deep(.el-form-item) {
margin-bottom: 16px;
}
.claim-record-form-page__actions {
display: flex;
justify-content: center;
src/views/payment/receipt-claim-record.vue
+1 -1
View File
@@ -93,7 +93,7 @@
<el-link v-if="column.link" type="primary" @click="openDetail(row)">
{{ displayValue(row[column.prop]) }}
</el-link>
<el-tag v-else-if="column.status" :type="statusType(row.claimStatus)">
<el-tag v-else-if="column.status" :type="statusType(row.claimStatus)" class="status-text">
{{ displayValue(row[column.prop]) }}
</el-tag>
<span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
src/views/payment/receipt-flow-form.vue
+24 -62
View File
@@ -8,49 +8,48 @@
label-width="auto"
class="receipt-claim-form-page__form"
>
<section class="receipt-claim-form-page__section">
<div class="receipt-claim-form-page__section-title">收款信息</div>
<section-card title="收款信息">
<el-row :gutter="32">
<el-col :span="12"
<el-col :span="6"
><el-form-item label="认领通知单"
><el-input v-model="form.receiptNoticeNo" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="付款人"
><el-input v-model="form.payerName" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="收款金额"
><el-input :model-value="formatMoney(form.receiptAmount)" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="交易时间"
><el-input v-model="form.transactionTime" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="对方户名"
><el-input v-model="form.counterpartyName" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="对方开户行"
><el-input v-model="form.counterpartyBank" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="对方账号"
><el-input v-model="form.counterpartyAccount" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="明细流水号"
><el-input v-model="form.detailSerialNo" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="已认领金额"
><el-input :model-value="formatMoney(form.claimedAmount)" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="摘要"><el-input v-model="form.summary" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="关联结算单" prop="settlementIds"
><el-input
:model-value="settlementLabel"
@@ -62,23 +61,22 @@
title="选择结算单"
@click="openSettlementDialog" /></template></el-input></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="认领人"
><el-input v-model="form.claimerName" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="认领日期"
><el-input v-model="form.claimDate" disabled /></el-form-item
></el-col>
<el-col :span="12"
<el-col :span="6"
><el-form-item label="认领人部门"
><el-input v-model="form.claimerDeptName" disabled /></el-form-item
></el-col>
</el-row>
</section>
</section-card>
<section class="receipt-claim-form-page__section">
<div class="receipt-claim-form-page__section-title">结算信息</div>
<section-card title="结算信息">
<el-table :data="form.settlements" border>
<el-table-column type="index" label="序号" width="64" align="center" />
<el-table-column label="结算单号" min-width="180" align="center"
@@ -108,20 +106,16 @@
:controls="false" /></template
></el-table-column>
</el-table>
</section>
</section-card>
<section class="receipt-claim-form-page__section">
<div class="receipt-claim-form-page__section-heading">
<div class="receipt-claim-form-page__section-title">附件信息</div>
<el-button
<section-card title="附件信息"><template #extra><el-button
v-if="form.attachments.length"
type="primary"
plain
:icon="Download"
@click="downloadAttachments"
>批量下载</el-button
>
</div>
></template>
<el-table :data="form.attachments" border>
<el-table-column type="index" label="序号" width="64" align="center" />
<el-table-column label="文件名" min-width="220"
@@ -158,10 +152,9 @@
class="receipt-claim-form-page__uploader"
@change="normalizeAttachments"
/>
</section>
</section-card>
<section class="receipt-claim-form-page__section">
<div class="receipt-claim-form-page__section-title">备注</div>
<section-card title="备注">
<el-form-item class="receipt-claim-form-page__remark"
><el-input
v-model="form.remark"
@@ -170,7 +163,7 @@
maxlength="200"
show-word-limit
/></el-form-item>
</section>
</section-card>
<div class="receipt-claim-form-page__actions">
<el-button type="primary" :loading="submitting" @click="submitClaim">确认</el-button
><el-button :disabled="submitting" @click="goBack">取消</el-button>
@@ -460,37 +453,6 @@ export default {
</script>
<style scoped lang="scss">
.receipt-claim-form-page__section-title {
display: flex;
align-items: center;
font-size: 18px;
font-weight: 600;
margin-bottom: 16px;
}
.receipt-claim-form-page__section-title::before {
width: 4px;
height: 20px;
margin-right: 8px;
background: #409eff;
content: '';
}
.receipt-claim-form-page__section {
margin-bottom: 24px;
}
.receipt-claim-form-page__section-title {
font-size: 16px;
}
.receipt-claim-form-page__section-heading {
display: flex;
align-items: center;
justify-content: space-between;
}
.receipt-claim-form-page__section-heading .receipt-claim-form-page__section-title {
margin-bottom: 0;
}
.receipt-claim-form-page__form :deep(.el-form-item) {
margin-bottom: 16px;
}
.receipt-claim-form-page__form :deep(.el-select),
.receipt-claim-form-page__form :deep(.el-input-number) {
width: 100%;
@@ -529,7 +491,7 @@ export default {
background: #fafafa;
}
@media (max-width: 900px) {
.receipt-claim-form-page__form :deep(.el-col-12) {
.receipt-claim-form-page__form :deep(.el-col-6) {
max-width: 100%;
flex: 0 0 100%;
}
src/views/payment/receipt-flow.vue
+1 -1
View File
@@ -76,7 +76,7 @@
{{ displayValue(row[column.prop]) }}
</el-link>
<span v-else-if="column.link">{{ displayValue(row[column.prop]) }}</span>
<el-tag v-else-if="column.status" :type="statusType(row.claimStatus)">
<el-tag v-else-if="column.status" :type="statusType(row.claimStatus)" class="status-text">
{{ displayValue(row[column.prop]) }}
</el-tag>
<span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
src/views/resource/oss.vue
+1 -1
View File
@@ -45,7 +45,7 @@
</el-link>
</template>
<template #status="{ row }">
<el-tag>{{ row.statusName }}</el-tag>
<el-tag class="status-text">{{ row.statusName }}</el-tag>
</template>
<template #category="{ row }">
<el-tag>{{ row.categoryName }}</el-tag>
src/views/resource/sms.vue
+1 -1
View File
@@ -45,7 +45,7 @@
</el-link>
</template>
<template #status="{ row }">
<el-tag>{{ row.statusName }}</el-tag>
<el-tag class="status-text">{{ row.statusName }}</el-tag>
</template>
<template #category="{ row }">
<el-tag>{{ row.categoryName }}</el-tag>
src/views/settlement/components/pre-settlement-editor.vue
+1 -1
View File
@@ -16,7 +16,7 @@
class="pre-settlement-editor__form"
>
<el-row :gutter="24">
<el-col v-for="field in formFields" :key="field.prop" :span="field.span || 8">
<el-col v-for="field in formFields" :key="field.prop" :span="field.span || 6">
<el-form-item :label="field.label" :prop="field.prop">
<el-select
v-if="field.type === 'contract'"
src/views/settlement/components/transport-reconciliation-editor.vue
+3 -2
View File
@@ -115,12 +115,13 @@
show-overflow-tooltip
>
<template #default="{ row }">
<el-tag v-if="column.prop === 'matchResult'" :type="matchTagType(row.matchResult)">{{
<el-tag v-if="column.prop === 'matchResult'" :type="matchTagType(row.matchResult)" class="status-text">{{
matchName(row.matchResult)
}}</el-tag>
<el-tag
v-else-if="column.prop === 'updateResult'"
:type="updateTagType(row.updateResult)"
class="status-text"
>{{ updateName(row.updateResult) }}</el-tag
>
<span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
@@ -182,7 +183,7 @@
show-overflow-tooltip
>
<template #default="{ row }">
<el-tag v-if="column.prop === 'matchStatus'" :type="matchTagType(row.matchStatus)">{{
<el-tag v-if="column.prop === 'matchStatus'" :type="matchTagType(row.matchStatus)" class="status-text">{{
matchName(row.matchStatus)
}}</el-tag>
<span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
src/views/settlement/formal-settlement.vue
+2 -2
View File
@@ -108,7 +108,7 @@
<el-link v-if="column.link && row[column.prop]" type="primary" @click="openView(row)">{{
row[column.prop]
}}</el-link>
<el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)">{{
<el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">{{
displayValue(row[column.prop])
}}</el-tag>
<span v-else-if="column.money">{{ formatMoney(row[column.prop], row.currency) }}</span>
@@ -121,7 +121,7 @@
<span v-else>{{ displayValue(row[column.prop]) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="120" fixed="right" align="center">
<el-table-column label="操作" width="180" fixed="right" align="center">
<template #default="{ row }"
><div class="formal-page__links">
<el-link
src/views/settlement/pre-settlement.vue
+5 -1
View File
@@ -130,7 +130,7 @@
<span v-else>{{ displayValue(row[column.prop]) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="130" fixed="right" align="center">
<el-table-column label="操作" width="180" fixed="right" align="center">
<template #default="{ row }">
<div class="pre-settlement-page__links">
<el-link
@@ -774,6 +774,10 @@ export default {
gap: 8px;
}
&__links {
justify-content: center;
}
&__pagination {
display: flex;
justify-content: flex-end;
src/views/system/authlock.vue
+1
View File
@@ -33,6 +33,7 @@
</template>
<template #lockStatus="{ row }">
<el-tag
class="status-text"
:type="row.expired ? 'info' : row.lockStatus === 'LOCKED' ? 'danger' : row.lockStatus === 'PRE_LOCKED' ? 'warning' : 'success'"
size="small"
>
src/views/system/dept.vue
+1 -1
View File
@@ -49,7 +49,7 @@
{{ getLeaderValue(row.leaderId, 'phone') }}
</template>
<template #status="{ row }">
<el-tag :type="Number(row.status) === 1 ? 'success' : 'info'">
<el-tag :type="Number(row.status) === 1 ? 'success' : 'info'" class="status-text">
{{ Number(row.status) === 1 ? '启用' : '停用' }}
</el-tag>
</template>
src/views/system/dict.vue
+2 -2
View File
@@ -43,7 +43,7 @@
<el-tag @click="handleRowClick(row)" style="cursor: pointer">{{ row.code }}</el-tag>
</template>
<template #isSealed="{ row }">
<el-tag>{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
<el-tag class="status-text">{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
</template>
</avue-crud>
<el-dialog :title="`[${dictValue}]字典配置`" append-to-body v-model="box" width="1000px">
@@ -86,7 +86,7 @@
</el-link>
</template>
<template #isSealed="{ row }">
<el-tag>{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
<el-tag class="status-text">{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
</template>
</avue-crud>
</el-dialog>
src/views/system/dictbiz.vue
+2 -2
View File
@@ -43,7 +43,7 @@
<el-tag @click="handleRowClick(row)" style="cursor: pointer">{{ row.code }}</el-tag>
</template>
<template #isSealed="{ row }">
<el-tag>{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
<el-tag class="status-text">{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
</template>
</avue-crud>
<el-dialog :title="`[${dictValue}]字典配置`" append-to-body v-model="box" width="1000px">
@@ -86,7 +86,7 @@
</el-link>
</template>
<template #isSealed="{ row }">
<el-tag>{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
<el-tag class="status-text">{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
</template>
</avue-crud>
</el-dialog>
src/views/tool/codesetting.vue
+1 -1
View File
@@ -34,7 +34,7 @@
</el-link>
</template>
<template #status="{ row }">
<el-tag>{{ row.status === 1 ? '否' : '是' }}</el-tag>
<el-tag class="status-text">{{ row.status === 1 ? '否' : '是' }}</el-tag>
</template>
</avue-crud>
</basic-container>
src/views/transit/risk-disposal.vue
+2 -2
View File
@@ -73,7 +73,7 @@
<el-link v-if="column.link && row[column.prop]" type="primary" @click="openWaybill(row)">
{{ row[column.prop] }}
</el-link>
<el-tag v-else-if="column.tag" :type="tagType(row, column.prop)" effect="plain">
<el-tag v-else-if="column.tag" :type="tagType(row, column.prop)" effect="plain" class="status-text">
{{ row[column.prop] || '-' }}
</el-tag>
<span v-else>{{ row[column.prop] || '-' }}</span>
@@ -126,7 +126,7 @@
<el-link v-if="field.link && detail[field.prop]" type="primary" @click="openWaybill(detail)">
{{ detail[field.prop] }}
</el-link>
<el-tag v-else-if="field.tag" :type="tagType(detail, field.prop)" effect="plain">
<el-tag v-else-if="field.tag" :type="tagType(detail, field.prop)" effect="plain" class="status-text">
{{ detail[field.prop] || '-' }}
</el-tag>
<span v-else>{{ detail[field.prop] || '-' }}</span>
src/views/transportCapacity/driver.vue
+1 -1
View File
@@ -63,7 +63,7 @@
{{ String(row.organizationName || '').replace(/^[\s\u3000]+/, '') }}
</template>
<template #status="{ row }">
<el-tag :type="row.status === 1 ? 'primary' : 'info'">
<el-tag :type="row.status === 1 ? 'primary' : 'info'" class="status-text">
{{ row.status === 1 ? '启用' : '停用' }}
</el-tag>
</template>
src/views/transportCapacity/ship.vue
+1 -1
View File
@@ -65,7 +65,7 @@
{{ String(row.organizationName || '').replace(/^[\s\u3000]+/, '') }}
</template>
<template #status="{ row }">
<el-tag :type="row.status === 1 ? 'primary' : 'info'">
<el-tag :type="row.status === 1 ? 'primary' : 'info'" class="status-text">
{{ row.status === 1 ? '启用' : '停用' }}
</el-tag>
</template>
src/views/transportCapacity/vehicle.vue
+2 -2
View File
@@ -62,7 +62,7 @@
{{ String(row.organizationName || '').replace(/^[\s\u3000]+/, '') }}
</template>
<template #status="{ row }">
<el-tag :type="row.status === 1 ? 'primary' : 'info'">
<el-tag :type="row.status === 1 ? 'primary' : 'info'" class="status-text">
{{ row.status === 1 ? '启用' : '停用' }}
</el-tag>
</template>
@@ -70,7 +70,7 @@
<span>-</span>
</template>
<template #certificationStatus="{ row }">
<el-tag :type="getCertificationStatus(row).type">
<el-tag :type="getCertificationStatus(row).type" class="status-text">
{{ getCertificationStatus(row).label }}
</el-tag>
</template>
src/views/util/demo/dict-classic.vue
+1 -1
View File
@@ -31,7 +31,7 @@
</el-button>
</template>
<template #isSealed="{ row }">
<el-tag>{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
<el-tag class="status-text">{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
</template>
<template #menu="scope">
<el-link
src/views/util/demo/dict-horizontal.vue
+2 -2
View File
@@ -35,7 +35,7 @@
</el-button>
</template>
<template #isSealed="{ row }">
<el-tag>{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
<el-tag class="status-text">{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
</template>
</avue-crud>
</el-col>
@@ -71,7 +71,7 @@
</el-button>
</template>
<template #isSealed="{ row }">
<el-tag>{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
<el-tag class="status-text">{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
</template>
</avue-crud>
</el-col>
src/views/util/demo/dict-vertical.vue
+2 -2
View File
@@ -35,7 +35,7 @@
</el-button>
</template>
<template #isSealed="{ row }">
<el-tag>{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
<el-tag class="status-text">{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
</template>
</avue-crud>
</el-col>
@@ -75,7 +75,7 @@
</el-button>
</template>
<template #isSealed="{ row }">
<el-tag>{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
<el-tag class="status-text">{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
</template>
</avue-crud>
</el-col>
src/views/util/demo/dict.vue
+2 -2
View File
@@ -41,7 +41,7 @@
</el-button>
</template>
<template #isSealed="{ row }">
<el-tag>{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
<el-tag class="status-text">{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
</template>
</avue-crud>
</div>
@@ -96,7 +96,7 @@
</el-link>
</template>
<template #isSealed="{ row }">
<el-tag>{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
<el-tag class="status-text">{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
</template>
</avue-crud>
</div>
src/views/util/demo/dictbiz.vue
+2 -2
View File
@@ -41,7 +41,7 @@
</el-button>
</template>
<template #isSealed="{ row }">
<el-tag>{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
<el-tag class="status-text">{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
</template>
</avue-crud>
</div>
@@ -96,7 +96,7 @@
</el-link>
</template>
<template #isSealed="{ row }">
<el-tag>{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
<el-tag class="status-text">{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
</template>
</avue-crud>
</div>
src/views/vehicle/customer-archive.vue
+3 -1
View File
@@ -49,6 +49,7 @@
</template>
<template #accessType="{ row }">
<el-tag
class="status-text"
:class="
row.accessType === 'formal' ? 'archive-tag--deep-blue' : 'archive-tag--light-blue'
"
@@ -58,6 +59,7 @@
</template>
<template #approvalStatus="{ row }">
<el-tag
class="status-text"
:class="{
'archive-tag--deep-blue': row.approvalStatus === 'approved',
'archive-tag--light-blue': row.approvalStatus === 'reviewing',
@@ -72,7 +74,7 @@
</el-tag>
</template>
<template #status="{ row }">
<el-tag :type="row.status === 1 ? 'primary' : 'info'">
<el-tag :type="row.status === 1 ? 'primary' : 'info'" class="status-text">
{{ row.status === 1 ? '启用' : '停用' }}
</el-tag>
</template>
src/views/work/send.vue
+1 -1
View File
@@ -33,7 +33,7 @@
<el-tag>v{{ row.processDefinitionVersion }}</el-tag>
</template>
<template #processIsFinished="{ row }">
<el-tag>{{ row.processIsFinished === 'finished' ? '已完成' : '未完成' }}</el-tag>
<el-tag class="status-text">{{ row.processIsFinished === 'finished' ? '已完成' : '未完成' }}</el-tag>
</template>
</avue-crud>
<flow-design
src/views/work/start.vue
+1 -1
View File
@@ -42,7 +42,7 @@
<el-tag>v{{ row.version }}</el-tag>
</template>
<template #suspensionState="{ row }">
<el-tag>{{ row.suspensionState === 1 ? '激活' : '挂起' }}</el-tag>
<el-tag class="status-text">{{ row.suspensionState === 1 ? '激活' : '挂起' }}</el-tag>
</template>
<template #category="{ row }">
<el-tag>{{ row.categoryName }}</el-tag>
vite.config.mjs
+13 -13
View File
@@ -50,26 +50,26 @@ export default ({
__VUE_I18N_LEGACY_API__: true,
__INTLIFY_PROD_DEVTOOLS__: false,
},
server: {
port: 2888,
proxy: {
'/api': {
target: 'http://localhost',
//target: 'https://saber3.bladex.cn/api',
changeOrigin: true,
rewrite: path => path.replace(/^\/api/, ''),
},
},
},
// server: {
// port: 2889,
// port: 2888,
// proxy: {
// '/api': {
// target: 'http://172.16.203.228:8000',
// target: 'http://localhost',
// //target: 'https://saber3.bladex.cn/api',
// changeOrigin: true,
// rewrite: path => path.replace(/^\/api/, ''),
// },
// },
// },
server: {
port: 2889,
proxy: {
'/api': {
target: 'http://172.16.203.228:8000',
changeOrigin: true,
},
},
},
resolve: {
alias: {
'~': resolve(__dirname, './'),