Compare commits

...
2 Commits
Author SHA1 Message Date
gxwebsoft 8883186344 style(business): 统一业务状态标签为文字+颜色样式
- 新增全局 `.status-text` 样式,去除 el-tag 背景和边框,仅保留彩色文字和跟随文字颜色的圆点
- 业务状态相关的 el-tag 标签全部加上 `class="status-text"`,覆盖调度状态、审批状态、运单状态等全站业务状态展示
- 统一发货模板查看弹窗的卡片样式,新增分区块样式与运费信息展示板块
- 调整发货模板弹窗详情 label 宽度,所有 el-descriptions 的 label 宽度统一为 140px 以保证视觉一致
- 表格列内嵌输入控件全宽默认样式生效,无需单独设置跨度,解决输入框显示不足问题
- 弹窗中的部分表单和导入区域使用 `section-card` 统一卡片风格
- 客商档案查看模式改为独立路由,实现查看与编辑隔离并调整对应操作按钮文案
- 相关样式调整及细节优化,包括运费单位颜色等辅助样式,保证界面细节统一规范
2026-08-24 20:15:14 +08:00
gxwebsoft 6bd8d18e20 fix(ui): 统一文本中单位和符号的全角格式
- 将“里程(km)”、“耗时(ms)”、“得分率(%)”等标签中的括号改为中文全角括号
- 统一调整“万元”、“天”、“份”等单位的显示格式,使用全角符号增强一致性
- 业务合同管理及项目申请相关表单中字段标签规范化全角字符
- 客户档案页面联系人和收款信息模块使用section-card组件包裹,提高界面一致性
- 部分表格列标签中的单位如“吨”、“方”、“元”使用全角括号修正
- 优化项目申请模块路由跳转逻辑,调整部分弹窗标题显示
- 引入section-card组件用于多个功能区块,加强结构层次感和视觉统一性
2026-08-24 17:30:18 +08:00
30 changed files with 534 additions and 309 deletions
+20
View File
@@ -0,0 +1,20 @@
# 2026-08-24
## 发货模板查看弹窗白底卡片统一化
- 问题: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` 统一。
+13
View File
@@ -33,6 +33,19 @@
- **master-order?mode=editor**:`master-order.vue` 把 `<master-order-editor>` 包进 `<template v-else-if="mode==='editor'">`,前置 `<div class="archive-page-form__title">{{ masterEditorTitle }}</div>`(computed `masterEditorTitle` = `routeId ? '编辑总单' : '新增总单'`)。
- 扩展原则:新增独立表单页要带此标题,要么并入 business-crud-page 的 `formPageTitle` 条件(business-crud-page 系列),要么在对应页面模板手写 `<div class="archive-page-form__title">`(loading-manage / master-order 模式)。
### 表格列内嵌输入控件:全宽(全局 CSS,不动手写 scoped)
- `element-ui.scss` 在 660-678 行加了一条全局规则:`.el-table .el-table__body td.el-table__cell .cell > .el-input-number/.el-input/.el-select/.el-date-editor/.el-cascader { width:100%; --el-*-width:100% }`(带对应 `--el-input-number-width` 等变量兜底)。
- 适用场景:可编辑 el-table 列、弹窗内编辑表格。原先容易踩坑的是 el-plus 的 el-input-number 默认根 width=150px,cell 给到 min-width=150 后输入框只占自然宽度、看着"显示不全"。**新增任何"el-table cell 内嵌 el-input-number/el-input/el-select"需求不用再写 scoped 宽度**——已全局兜底。
- 与"表单内 250px 全宽"互不冲突:本规则只命中 `.el-table .el-table__body td`,表单内 `.el-form-item__content >` 的 250px 规则仍生效。
- 已覆盖: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 样式。
## 关键文件
- 分组白卡:`src/components/section-card/main.vue`。
- 全局弹窗/section-card 样式:`src/styles/element-ui.scss`。
+6 -6
View File
@@ -80,8 +80,8 @@ export const config = {
['signDate', '签订日期'],
['contractFormat', '合同格式'],
['legalSealFlag', '是否需要加盖法人章'],
['copyCount', '一式'],
['paymentDays', '回款账期'],
['copyCount', '一式(份)'],
['paymentDays', '回款账期(天)'],
['remark', '备注', 2],
],
},
@@ -175,7 +175,7 @@ export const config = {
},
{
action: 'startChange',
label: '发起变更',
label: '变更',
statusProp: 'approvalStatus',
status: ['approved'],
stage: ['formal'],
@@ -184,7 +184,7 @@ export const config = {
},
{
action: 'startChange',
label: '再次发起变更',
label: '变更',
statusProp: 'approvalStatus',
status: ['change_approved'],
stage: ['formal'],
@@ -476,7 +476,7 @@ export const option = createCrudOption([
rules: selectRule('是否需要加盖法人章'),
},
{
label: '一式',
label: '一式(份)',
prop: 'copyCount',
labelWidth: '72px',
formslot: true,
@@ -485,7 +485,7 @@ export const option = createCrudOption([
minWidth: 110,
},
{
label: '回款账期',
label: '回款账期(天)',
prop: 'paymentDays',
formslot: true,
hide: true,
+7 -7
View File
@@ -219,7 +219,7 @@ export const option = createCrudOption([
minWidth: 120,
},
{
label: '项目资金使用额度(万元)',
label: '项目资金使用额度(万元)',
prop: 'fundLimit',
type: 'number',
precision: 2,
@@ -228,7 +228,7 @@ export const option = createCrudOption([
rules: amountRules('项目资金使用额度'),
},
{
label: '项目应收账款额度(万元)',
label: '项目应收账款额度(万元)',
prop: 'receivableLimit',
type: 'number',
precision: 2,
@@ -237,7 +237,7 @@ export const option = createCrudOption([
rules: amountRules('项目应收账款额度'),
},
{
label: '应收账款回款期限(天)',
label: '应收账款回款期限(天)',
prop: 'receivableDays',
type: 'number',
hide: true,
@@ -245,7 +245,7 @@ export const option = createCrudOption([
rules: [{ required: true, message: '请输入应收账款回款期限', trigger: 'blur' }],
},
{
label: '回款账期(天)',
label: '回款账期(天)',
prop: 'paymentDays',
type: 'number',
hide: true,
@@ -311,7 +311,7 @@ export const option = createCrudOption([
minWidth: 130,
},
{
label: '项目规模(万元)',
label: '项目规模(万元)',
prop: 'projectScale',
type: 'number',
precision: 2,
@@ -320,7 +320,7 @@ export const option = createCrudOption([
rules: [nonNegativeRule('项目规模')],
},
{
label: '预计利润(万元)',
label: '预计利润(万元)',
prop: 'estimatedProfit',
type: 'number',
precision: 2,
@@ -329,7 +329,7 @@ export const option = createCrudOption([
rules: [nonNegativeRule('预计利润')],
},
{
label: '资金需求(万元)',
label: '资金需求(万元)',
prop: 'fundDemand',
type: 'number',
precision: 2,
+34
View File
@@ -15,6 +15,40 @@ const templateTypeOptions = [
export const config = {
title: '发货模板',
permission: 'shipping_template',
detailButton: true,
detailButtonIgnoreDraftStatus: true,
detailSections: [
{
title: '模板信息',
fields: [
['templateCode', '模板编号'],
['templateName', '模板名称'],
['templateType', '模板类型'],
['transportType', '运输方式'],
['remark', '备注', 2],
],
},
{
title: '基本信息',
fields: [
['projectName', '项目'],
['contractName', '客户合同'],
['transportType', '运输方式'],
['basicRemark', '备注', 2],
],
},
{
title: '收发货信息',
fields: [
['departureAddress', '发货地址', 2],
['departureContact', '发货联系人'],
['departurePhone', '发货联系方式'],
['arrivalAddress', '收货地址', 2],
['arrivalContact', '收货联系人'],
['arrivalPhone', '收货联系方式'],
],
},
],
tableColumnOrder: [
'templateCode',
'templateName',
@@ -52,7 +52,7 @@ export const config = {
{
title: '申请信息',
fields: [
['applicationNo', '申请单号', 2],
['applicationNo', '申请单号', 1],
['projectName', '项目', 1],
['projectCode', '项目编号', 1],
['undertakeDeptName', '承办部门', 1],
@@ -62,7 +62,7 @@ export const config = {
['currentNode', '当前节点', 1],
['currentProcessor', '当前处理人', 1],
['validUntil', '申请有效期至', 1],
['remark', '备注', 2],
['remark', '备注', 1],
],
},
{
+1 -1
View File
@@ -578,7 +578,7 @@ export const option = {
viewDisplay: false,
},
{
label: '单价(计价单位)',
label: '单价(计价单位)',
prop: 'unitPrice',
formatter: row => formatUnitPrice(row),
minWidth: 140,
+6 -6
View File
@@ -8,11 +8,11 @@ export const timeExpressionTypeDic = [
value: 2,
},
{
label: '固定频率(毫秒)',
label: '固定频率(毫秒)',
value: 3,
},
{
label: '固定延迟(毫秒)',
label: '固定延迟(毫秒)',
value: 4,
},
{
@@ -428,14 +428,14 @@ export default {
value: 0,
},
{
label: '最低内存(GB)',
label: '最低内存(GB)',
labelTip: '可用内存小于该值的Worker 将不会执行该任务,0 代表无任何限制',
prop: 'minMemorySpace',
type: 'number',
value: 0,
},
{
label: '最低磁盘空间(GB)',
label: '最低磁盘空间(GB)',
labelTip: '可用磁盘空间小于该值的Worker 将不会执行该任务,0 代表无任何限制',
prop: 'minDiskSpace',
type: 'number',
@@ -475,14 +475,14 @@ export default {
value: 0,
},
{
label: '统计窗口(s)',
label: '统计窗口(s)',
labelTip: '统计的窗口长度(s),0代表不限制',
prop: 'statisticWindowLen',
type: 'number',
value: 0,
},
{
label: '沉默窗口(s)',
label: '沉默窗口(s)',
labelTip: '沉默时间窗口(s),0代表不限制',
prop: 'silenceWindowLen',
type: 'number',
@@ -71,7 +71,7 @@ export const option = {
align: 'center',
},
{
label: '核定载质量(KG)',
label: '核定载质量(KG)',
prop: 'approvedLoadKg',
minWidth: 140,
align: 'right',
@@ -154,7 +154,7 @@ export const option = {
],
},
{
label: '评定(复核)单位',
label: '评定(复核)单位',
prop: 'assessmentUnit',
minWidth: 160,
overHidden: true,
+50
View File
@@ -657,6 +657,26 @@
text-align: center;
}
// 全站统一:el-table 表格列内嵌控件默认拉满 cell(不撞表头)
// 适用场景:可编辑表、弹窗内表格(如 pre-settlement-editor 结算明细调整、transport-reconciliation/formal-settlement/settlement-adjustment editor 等)。
// 排除 .el-form-item__content 上下文,与表单内 250px 规则互不冲突。
.el-table .el-table__body td.el-table__cell .cell > .el-input-number,
.el-table .el-table__body td.el-table__cell .cell > .el-input,
.el-table .el-table__body td.el-table__cell .cell > .el-select,
.el-table .el-table__body td.el-table__cell .cell > .el-date-editor,
.el-table .el-table__body td.el-table__cell .cell > .el-cascader,
.el-table .el-table__body td.el-table__cell .cell > .el-input-number .el-input__wrapper,
.el-table .el-table__body td.el-table__cell .cell > .el-select .el-select__wrapper,
.el-table .el-table__body td.el-table__cell .cell > .el-date-editor.el-input,
.el-table .el-table__body td.el-table__cell .cell > .el-date-editor.el-input .el-input__wrapper {
width: 100%;
--el-input-number-width: 100%;
--el-input-width: 100%;
--el-select-width: 100%;
--el-date-editor-width: 100%;
--el-cascader-width: 100%;
}
// 统一 avue-crud 偶数行背景色
.avue-crud .el-table__body-wrapper tr.el-table__row:nth-child(even) td.el-table__cell,
.avue-crud .el-table__body-wrapper tr.el-table__row:nth-child(even) td.el-table-fixed-column--left,
@@ -985,6 +1005,11 @@
border-top: 0 !important;
margin-top: -30px !important;
}
// 查看弹窗(avue--detail)footer 不上移,避免遮住详情表格底部边框
.avue-crud__dialog .avue-form.avue--detail ~ .avue-dialog__footer {
margin-top: 0 !important;
}
.el-form-item__label {
margin-left: 12px !important;
}
@@ -1001,3 +1026,28 @@
//.el-form-item {
// margin-bottom: 15px !important;
//}
// ============ 业务状态标签:全站统一为「文字 + 颜色」样式 ============
// 去掉 el-tag 默认背景与边框,仅保留彩色文字,并前置一个状态圆点(颜色同文字)。
// 适用于所有业务状态展示:调度状态 / 运单状态 / 审批状态等。
.el-tag.status-text {
background-color: transparent !important;
border-color: transparent !important;
padding: 0;
margin-left: 8px;
font-weight: 500;
line-height: inherit;
&::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;
}
}
+1 -1
View File
@@ -512,7 +512,7 @@ export default {
{ label: '请求接口', prop: 'requestUri', search: true, slot: true },
{ label: '请求方法', prop: 'method', slot: true, width: 85 },
{ label: '调用IP', prop: 'remoteIp', search: true, width: 140 },
{ label: '耗时(ms)', prop: 'time', width: 85 },
{ label: '耗时(ms)', prop: 'time', width: 85 },
{ label: '日志时间', prop: 'createTime',
sortable: true, span: 24, width: 180 },
{ label: '用户代理', prop: 'userAgent', span: 24, hide: true },
@@ -98,19 +98,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>
@@ -892,7 +892,7 @@
</el-form-item>
<el-form-item
v-if="!isNonRoadTransport"
label="里程(km)"
label="里程(km)"
class="business-crud-page__task-span-1"
>
<el-input
@@ -1013,7 +1013,7 @@
:disabled="dialogReadonly"
/>
</el-form-item>
<el-form-item label="里程(km)" class="business-crud-page__task-span-1">
<el-form-item label="里程(km)" class="business-crud-page__task-span-1">
<el-input
v-model="form.mileage"
placeholder="请输入"
@@ -1474,7 +1474,7 @@
</template>
</el-input>
</el-form-item>
<el-form-item label="里程(km)">
<el-form-item label="里程(km)">
<el-input
v-model="form.mileage"
placeholder="请输入里程"
@@ -1951,7 +1951,7 @@
:disabled="dialogReadonly"
@input="value => handleIntegerInput('copyCount', value)"
/>
<span>份</span>
</div>
</template>
@@ -1963,7 +1963,7 @@
:disabled="dialogReadonly"
@input="value => handleIntegerInput('paymentDays', value)"
/>
<span>天</span>
</div>
</template>
@@ -2207,7 +2207,7 @@
<el-table :data="paymentRatioRows" border>
<el-table-column type="index" label="序号" width="80" align="center" />
<el-table-column prop="paymentTerm" label="付款笔数" min-width="180" align="center" />
<el-table-column label="付款比例上限" min-width="220" align="center">
<el-table-column label="付款比例上限(%)" min-width="220" align="center">
<template #default="{ row }">
<el-input-number
v-model="row.ratioLimit"
@@ -2217,7 +2217,7 @@
:disabled="dialogReadonly"
controls-position="right"
/>
<span class="business-crud-page__ratio-unit">%</span>
</template>
</el-table-column>
<el-table-column label="备注" min-width="220">
@@ -2237,7 +2237,7 @@
</template>
</el-table-column>
</el-table>
<el-button v-if="!dialogReadonly" type="primary" plain @click="addPaymentRatioRow">
<el-button v-if="!dialogReadonly" type="primary" plain @click="addPaymentRatioRow" style="margin-top: 12px">
添加
</el-button>
</div>
@@ -2522,7 +2522,7 @@
<span>|</span>
{{ detailRow.planNo || '-' }}
</h2>
<el-tag class="is-dispatching" effect="light">
<el-tag :type="statusTagType(detailRow.businessStatus)" class="status-text" effect="light">
{{ displayStatus(detailRow, 'businessStatus') }}
</el-tag>
<el-tag type="primary" effect="light">
@@ -2692,7 +2692,7 @@
<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="statusTagType(detailRow.businessStatus)" class="status-text">{{ displayStatus(detailRow, 'businessStatus') }}</el-tag>
<el-tag type="primary">
{{ formatTransportPlanDetailTransportType(waybillTransportMode(detailRow)) }}
</el-tag>
@@ -2858,7 +2858,7 @@
v-if="waybillIsRoadTransport(detailRow) && !waybillIsCarrier(detailRow)"
class="business-crud-page__waybill-detail-field"
>
<span>里程(km)</span><strong>{{ detailRow.mileage || '-' }}</strong>
<span>里程(km)</span><strong>{{ detailRow.mileage || '-' }}</strong>
</div>
<div
class="business-crud-page__waybill-detail-field business-crud-page__waybill-detail-field--remark"
@@ -3106,7 +3106,7 @@
</el-table-column>
</el-table>
</div>
<el-descriptions v-else :column="2" border>
<el-descriptions v-else :column="2" border label-width="140px">
<el-descriptions-item
v-for="field in section.fields"
:key="field[0]"
@@ -3133,6 +3133,67 @@
<el-table-column prop="remark" label="备注" min-width="160" />
</el-table>
</section-card>
<section-card
v-if="
config.enableShippingTemplateFreight && detailRow.templateType === '运单'
"
:title="`运费信息${transportMode === 'road' ? '(公路)' : ''}`"
>
<el-descriptions
v-if="transportMode === 'road'"
:column="2"
border
label-width="140px"
class="business-crud-page__freight-descriptions"
>
<template v-for="(item, index) in shippingTemplateFreight.freightItems" :key="index">
<el-descriptions-item :label="`单价${index + 1}`">
<template v-if="item.unitPrice || item.priceUnit">
{{ formatShippingTemplateFreightNumber(item.unitPrice) }}
<span v-if="item.priceUnit" class="business-crud-page__freight-unit">{{ item.priceUnit }}</span>
</template>
<template v-else>-</template>
</el-descriptions-item>
<el-descriptions-item :label="`数量合计${index + 1}`">
{{ shippingTemplateRoadFreightQuantity(index) }}
<span v-if="transportCargoRows[index]?.quantityUnit" class="business-crud-page__freight-unit">
{{ transportCargoRows[index].quantityUnit }}
</span>
</el-descriptions-item>
<el-descriptions-item :label="`运费${index + 1}`">
{{ shippingTemplateRoadFreightAmount(item, index) }}
<span class="business-crud-page__freight-currency">{{ shippingTemplateCurrencyLabel }}</span>
</el-descriptions-item>
</template>
<el-descriptions-item label="运费合计">
{{ shippingTemplateRoadFreightTotal }}
<span class="business-crud-page__freight-currency">{{ shippingTemplateCurrencyLabel }}</span>
</el-descriptions-item>
<el-descriptions-item label="其他运费合计">
{{ formatShippingTemplateFreightNumber(shippingTemplateFreight.otherFreightAmount) }}
<span class="business-crud-page__freight-currency">{{ shippingTemplateCurrencyLabel }}</span>
</el-descriptions-item>
<el-descriptions-item label="币种">
{{ currencyName(shippingTemplateFreight.currency) }}
</el-descriptions-item>
</el-descriptions>
<el-descriptions v-else :column="2" border label-width="140px" class="business-crud-page__freight-descriptions">
<el-descriptions-item label="运费">
{{ formatShippingTemplateFreightNumber(shippingTemplateFreight.freightAmount) }}
<span class="business-crud-page__freight-currency">{{ shippingTemplateCurrencyLabel }}</span>
</el-descriptions-item>
<el-descriptions-item label="数量合计">
{{ transportCargoQuantityTotal }}
</el-descriptions-item>
<el-descriptions-item label="其他运费合计">
{{ formatShippingTemplateFreightNumber(shippingTemplateFreight.otherFreightAmount) }}
<span class="business-crud-page__freight-currency">{{ shippingTemplateCurrencyLabel }}</span>
</el-descriptions-item>
<el-descriptions-item label="币种">
{{ currencyName(shippingTemplateFreight.currency) }}
</el-descriptions-item>
</el-descriptions>
</section-card>
<section-card
v-if="config.enableAttachmentTable"
:title="config.attachmentTitle || '附件'"
@@ -3702,7 +3763,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)" class="status-text" effect="light">
{{ dispatchDialogStatusText }}
</el-tag>
<el-tag type="primary" effect="light">
@@ -4347,7 +4408,7 @@
{{ dispatchItemForm.quantityUnit || '吨' }}
</div>
</el-form-item>
<el-form-item label="里程(公里)" :required="dispatchItemForm.carrierType !== '承运商'">
<el-form-item label="里程(公里)" :required="dispatchItemForm.carrierType !== '承运商'">
<el-input
v-model="dispatchItemForm.mileage"
placeholder="请输入"
@@ -4534,7 +4595,7 @@
</el-form-item>
<el-form-item
v-if="dispatchIsRoadTransport && dispatchItemForm.carrierType !== '承运商'"
label="里程(km)"
label="里程(km)"
required
>
<el-input
@@ -5450,22 +5511,24 @@
class="business-crud-page__cargo-import-dialog"
@closed="cargoImportRows = []"
>
<div class="business-crud-page__cargo-import">
<el-upload
action="#"
accept=".xls,.xlsx"
:auto-upload="false"
:show-file-list="false"
:disabled="cargoImportLoading"
:on-change="handleCargoImportFileChange"
>
<el-button type="primary" :loading="cargoImportLoading">上传</el-button>
<template #tip>
<div class="el-upload__tip">支持.xlsx、.xls的文件格式,单个文件大小限制50M</div>
</template>
</el-upload>
<el-button type="primary" @click="handleCargoImportTemplate">点击下载模板</el-button>
</div>
<section-card>
<div class="business-crud-page__cargo-import">
<el-upload
action="#"
accept=".xls,.xlsx"
:auto-upload="false"
:show-file-list="false"
:disabled="cargoImportLoading"
:on-change="handleCargoImportFileChange"
>
<el-button type="primary" :loading="cargoImportLoading">上传</el-button>
<template #tip>
<div class="el-upload__tip">支持.xlsx、.xls的文件格式,单个文件大小限制50M</div>
</template>
</el-upload>
<el-button type="primary" @click="handleCargoImportTemplate">点击下载模板</el-button>
</div>
</section-card>
<template #footer>
<el-button :disabled="cargoImportLoading" @click="closeCargoImportDialog">关闭</el-button>
<el-button
@@ -15461,6 +15524,15 @@ export default {
flex-direction: column;
gap: 12px;
.business-crud-page__freight-descriptions {
.business-crud-page__freight-unit,
.business-crud-page__freight-currency {
margin-left: 4px;
color: #909399;
font-size: 13px;
}
}
.section-card {
:deep(.el-descriptions__table) {
width: 100%;
@@ -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)">{{ 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>
@@ -17,7 +17,7 @@
<header @click="toggleSegment(route.segmentNo)"><h3><span class="segment-index">{{ segmentNumber(route, index) }}</span><span>{{ route.departureName || '-' }} → {{ route.arrivalName || '-' }}</span><span class="segment-detail__transport-type">{{ segmentTransportType(route) || '-' }}</span><span class="segment-detail__progress-bar"><span :style="{ width: `${segmentProgress(route)}%` }"></span></span><span class="segment-detail__progress">已调度 <em>{{ quantity(route.dispatchedQuantity) }}</em> / {{ quantity(plannedQuantity(route)) }} {{ plannedUnit(route) }}</span></h3><div class="segment-detail__header-right"><el-tooltip :content="isSegmentExpanded(route.segmentNo) ? '折叠' : '展开'" placement="top"><el-button circle :icon="isSegmentExpanded(route.segmentNo) ? ArrowUp : ArrowDown" @click.stop="toggleSegment(route.segmentNo)" /></el-tooltip></div></header>
<div v-show="isSegmentExpanded(route.segmentNo)" class="segment-execution">
<div class="segment-stats"><div><span>总量</span><strong>{{ quantity(master.totalQuantity) }}<small>吨</small></strong></div><div><span>已调度</span><strong class="dispatched">{{ quantity(route.dispatchedQuantity) }}<small>吨</small></strong></div><div><span>剩余</span><strong class="remaining">{{ quantity(remainingQuantity(route)) }}<small>吨</small></strong></div></div>
<el-table :data="route.waybills || []" border class="waybill-table"><el-table-column label="运单号" min-width="180"><template #default="{ row }"><el-link type="primary" @click="openWaybill(row)">{{ row.waybillNo }}</el-link></template></el-table-column><el-table-column prop="carrierName" label="承运商" min-width="190" /><el-table-column label="司机/车牌" min-width="180"><template #default="{ row }">{{ driverVehicle(row) }}</template></el-table-column><el-table-column prop="cargoType" label="货物类型" min-width="120" /><el-table-column label="数量(吨)" width="130"><template #default="{ row }">{{ quantity(row.quantity) }}</template></el-table-column><el-table-column label="状态" width="130"><template #default="{ row }"><el-tag :type="waybillStatusType(row.businessStatus)" size="small">{{ waybillStatusName(row.businessStatus) }}</el-tag></template></el-table-column><el-table-column prop="createTime" label="创建时间" min-width="180" /></el-table>
<el-table :data="route.waybills || []" border class="waybill-table"><el-table-column label="运单号" min-width="180"><template #default="{ row }"><el-link type="primary" @click="openWaybill(row)">{{ row.waybillNo }}</el-link></template></el-table-column><el-table-column prop="carrierName" label="承运商" min-width="190" /><el-table-column label="司机/车牌" min-width="180"><template #default="{ row }">{{ driverVehicle(row) }}</template></el-table-column><el-table-column prop="cargoType" label="货物类型" min-width="120" /><el-table-column label="数量(吨)" width="130"><template #default="{ row }">{{ quantity(row.quantity) }}</template></el-table-column><el-table-column label="状态" width="130"><template #default="{ row }"><el-tag :type="waybillStatusType(row.businessStatus)" size="small" class="status-text">{{ waybillStatusName(row.businessStatus) }}</el-tag></template></el-table-column><el-table-column prop="createTime" label="创建时间" min-width="180" /></el-table>
<el-empty v-if="!(route.waybills || []).length" description="暂无运单明细" :image-size="56" />
<div v-if="(route.transportPlans || []).length" class="transport-plan-detail"><h4>关联计划单</h4><el-table :data="route.transportPlans" border><el-table-column label="计划单号" min-width="160"><template #default="{ row }"><el-link type="primary" @click="openPlan(row)">{{ row.planNo }}</el-link></template></el-table-column><el-table-column prop="planName" label="计划名称" min-width="180" /><el-table-column prop="transportType" label="运输方式" width="130" /><el-table-column prop="planStartDate" label="计划开始日期" width="130" /><el-table-column prop="planEndDate" label="计划结束日期" width="130" /><el-table-column prop="businessStatus" label="状态" width="110" /></el-table></div>
</div>
@@ -30,15 +30,15 @@
<el-table-column prop="cargoName" label="货物名称" min-width="150" />
<el-table-column prop="cargoType" label="货物类型" min-width="130" />
<el-table-column prop="packageType" label="包装" min-width="120" />
<el-table-column label="重量(吨)" min-width="110"><template #default="{ row }">{{ row.weight ?? row.weightTon ?? (row.quantityUnit === '吨' ? row.quantity : '-') }}</template></el-table-column>
<el-table-column label="体积(方)" min-width="110"><template #default="{ row }">{{ row.volume ?? row.volumeCubic ?? '-' }}</template></el-table-column>
<el-table-column label="重量(吨)" min-width="110"><template #default="{ row }">{{ row.weight ?? row.weightTon ?? (row.quantityUnit === '吨' ? row.quantity : '-') }}</template></el-table-column>
<el-table-column label="体积(方)" min-width="110"><template #default="{ row }">{{ row.volume ?? row.volumeCubic ?? '-' }}</template></el-table-column>
<el-table-column label="数量" min-width="100"><template #default="{ row }">{{ row.quantity ?? '-' }}{{ row.quantityUnit ? ` ${row.quantityUnit}` : '' }}</template></el-table-column>
<el-table-column prop="materialCode" label="物料编码" min-width="130" />
<el-table-column prop="deviceCode" label="设备编码" min-width="130" />
<el-table-column prop="brand" label="品牌" min-width="120" />
<el-table-column label="规格型号" min-width="150"><template #default="{ row }">{{ [row.specification, row.model].filter(Boolean).join('/') || '-' }}</template></el-table-column>
<el-table-column prop="remark" label="备注" min-width="160" />
<el-table-column label="货物单价(元)" min-width="130"><template #default="{ row }">{{ row.unitPrice ?? '-' }}</template></el-table-column>
<el-table-column label="货物单价(元)" min-width="130"><template #default="{ row }">{{ row.unitPrice ?? '-' }}</template></el-table-column>
<el-table-column label="计划日期" min-width="130"><template #default="{ row }">{{ row.planDate || row.planStartDate || '-' }}</template></el-table-column>
</el-table>
<el-empty v-if="!(master.goods || []).length" description="暂无货物信息" :image-size="56" />
@@ -4,7 +4,7 @@
<div class="overview-heading">
<div>
<h2>多联总单调度 <span>|</span> {{ master.masterNo }}</h2>
<el-tag :type="statusType(master.businessStatus)">{{ statusName(master.businessStatus) }}</el-tag>
<el-tag :type="statusType(master.businessStatus)" class="status-text">{{ statusName(master.businessStatus) }}</el-tag>
</div>
</div>
<div class="overview-content">
@@ -159,7 +159,7 @@
<el-col :span="6"><el-form-item label="箱号" required><el-input v-model="route.containerNo" placeholder="请输入" /></el-form-item></el-col>
<el-col :span="6"><el-form-item label="舱位" required><el-input v-model="route.cabinNo" placeholder="请输入" /></el-form-item></el-col>
</template>
<el-col :span="6"><el-form-item label="里程(km)"><el-input :model-value="route.mileage" inputmode="numeric" maxlength="10" placeholder="请输入" @input="value => handleMileageInput(route, value)" /></el-form-item></el-col>
<el-col :span="6"><el-form-item label="里程(km)"><el-input :model-value="route.mileage" inputmode="numeric" maxlength="10" placeholder="请输入" @input="value => handleMileageInput(route, value)" /></el-form-item></el-col>
<el-col :span="6"><el-form-item label="备注"><el-input v-model="route.remark" maxlength="200" show-word-limit placeholder="请输入" /></el-form-item></el-col>
</el-row>
</el-form>
@@ -78,6 +78,7 @@
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="请选择"
style="width: 200px"
/></el-form-item>
</div>
</template>
@@ -116,6 +117,7 @@
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="请选择"
style="width: 200px"
/></el-form-item>
</div>
</template>
@@ -428,7 +430,27 @@
<div class="address-pagination"><el-pagination v-model:current-page="commonCargoPage.current" v-model:page-size="commonCargoPage.size" :page-sizes="[10, 20, 50]" layout="total, prev, pager, next, sizes" :total="commonCargoPage.total" @size-change="loadCommonCargoList" @current-change="loadCommonCargoList" /></div>
<template #footer><el-button @click="commonCargoVisible = false">关闭</el-button><el-button type="primary" :disabled="!commonCargoSelected.length" @click="confirmCommonCargoSelection">确定</el-button></template>
</el-dialog>
<el-dialog v-model="cargoImportVisible" title="导入货物" append-to-body width="560px"><div class="cargo-import"><el-upload action="#" accept=".xls,.xlsx" :auto-upload="false" :show-file-list="false" :disabled="cargoImportLoading" :on-change="handleCargoImport"><el-button type="primary" :loading="cargoImportLoading">上传</el-button><template #tip><div class="el-upload__tip">支持 .xlsx、.xls 文件,单个文件不超过 50M</div></template></el-upload><el-button type="primary" plain @click="downloadCargoTemplate">点击下载模板</el-button></div><template #footer><el-button @click="cargoImportVisible = false">关闭</el-button></template></el-dialog>
<el-dialog v-model="cargoImportVisible" title="导入货物" append-to-body width="560px">
<section-card>
<div class="cargo-import">
<el-upload
action="#"
accept=".xls,.xlsx"
:auto-upload="false"
:show-file-list="false"
:disabled="cargoImportLoading"
:on-change="handleCargoImport"
>
<el-button type="primary" :loading="cargoImportLoading">上传</el-button>
<template #tip>
<div class="el-upload__tip">支持 .xlsx、.xls 文件,单个文件不超过 50M</div>
</template>
</el-upload>
<el-button type="primary" plain @click="downloadCargoTemplate">点击下载模板</el-button>
</div>
</section-card>
<template #footer><el-button @click="cargoImportVisible = false">关闭</el-button></template>
</el-dialog>
<el-dialog v-model="routeDialogVisible" title="选择线路" width="1280px" @opened="loadRouteList">
<div class="route-dialog__search">
<el-form :model="routeQuery" label-position="right" label-width="86px">
@@ -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));
@@ -17,8 +17,8 @@
<el-col :span="6"><el-form-item label="合同格式"><el-select v-model="form.contractFormat"><el-option label="电子合同" value="电子合同" /><el-option label="纸质合同" value="纸质合同" /></el-select></el-form-item></el-col>
<el-col :span="6"><el-form-item label="结算方式"><el-input v-model="form.settlementMode" /></el-form-item></el-col>
<el-col :span="6"><el-form-item label="是否需要加盖法人章"><el-select v-model="form.legalSealFlag"><el-option label="是" :value="1" /><el-option label="否" :value="0" /></el-select></el-form-item></el-col>
<el-col :span="6"><el-form-item label="一式"><div class="inline-field"><el-input-number v-model="form.copyCount" :min="1" controls-position="right" /><span>份</span></div></el-form-item></el-col>
<el-col :span="6"><el-form-item label="回款账期"><el-input-number v-model="form.paymentDays" :min="0" controls-position="right" /><span class="unit">天</span></el-form-item></el-col>
<el-col :span="6"><el-form-item label="一式(份)"><div class="inline-field"><el-input-number v-model="form.copyCount" :min="1" controls-position="right" /></div></el-form-item></el-col>
<el-col :span="6"><el-form-item label="回款账期(天)"><el-input-number v-model="form.paymentDays" :min="0" controls-position="right" /></el-form-item></el-col>
<el-col :span="24"><el-form-item label="备注"><el-input v-model="form.remark" type="textarea" maxlength="2000" show-word-limit /></el-form-item></el-col>
</el-row>
</section>
@@ -56,7 +56,7 @@
<el-table :data="paymentRatioRows" border class="change-table">
<el-table-column type="index" label="序号" width="70" />
<el-table-column prop="paymentTerm" label="付款笔数" min-width="180" />
<el-table-column label="付款比例上限" min-width="220"><template #default="{ row }"><el-input-number v-model="row.ratioLimit" :min="0" :max="100" :precision="2" controls-position="right" /><span>%</span></template></el-table-column>
<el-table-column label="付款比例上限(%)" min-width="220"><template #default="{ row }"><el-input-number v-model="row.ratioLimit" :min="0" :max="100" :precision="2" controls-position="right" /></template></el-table-column>
<el-table-column label="备注" min-width="220"><template #default="{ row }"><el-input v-model="row.remark" maxlength="200" /></template></el-table-column>
<el-table-column label="操作" width="100"><template #default="{ $index }"><el-link type="danger" @click="paymentRatioRows.splice($index, 1)">删除</el-link></template></el-table-column>
</el-table>
+3 -2
View File
@@ -395,7 +395,7 @@
<div class="loading-detail__summary">
<div class="loading-detail__heading">配载单详情</div>
<div>{{ dialogForm.loadingNo || '-' }}</div>
<div><el-tag :type="detailStatusType">{{ statusText(dialogForm) }}</el-tag></div>
<div><el-tag :type="detailStatusType" class="status-text">{{ statusText(dialogForm) }}</el-tag></div>
<div><el-tag type="warning">{{ transportTypeLabel(dialogForm.transportType) }}</el-tag></div>
</div>
<div class="loading-detail__task-row">
@@ -868,7 +868,7 @@
<el-form-item v-if="dialogForm.carrierType !== '承运商'" label="押运人手机号">
<el-input v-model="dialogForm.escortPhone" clearable placeholder="请输入" />
</el-form-item>
<el-form-item label="里程(km)">
<el-form-item label="里程(km)">
<el-input
v-model="dialogForm.mileage"
clearable
@@ -2357,6 +2357,7 @@ export default {
<style lang="scss" scoped>
.loading-manage-page {
margin-bottom: 60px;
.loading-manage-page__search {
padding: 12px 12px 4px;
margin-bottom: 20px;
+1 -1
View File
@@ -62,7 +62,7 @@
<section class="card-info">
<div class="card-title-row">
<el-link type="primary" @click="goDetail(row.id)">{{ row.masterNo }}</el-link
><el-tag :type="statusType(row.businessStatus)" class="status-tag">{{
><el-tag :type="statusType(row.businessStatus)" class="status-tag status-text">{{
statusName(row.businessStatus)
}}</el-tag>
</div>
+4 -2
View File
@@ -44,7 +44,7 @@
</template>
<template #status="{ row }">
<el-tag :type="statusTagType(row.status)">
<el-tag :type="statusTagType(row.status)" class="status-text">
{{ row.statusName || displayStatus(row.status) }}
</el-tag>
</template>
@@ -1178,7 +1178,9 @@ export default {
&__timeline-line {
position: absolute;
top: 22px;
// 圆点中心位置 = padding-top(12) + dot 半径(7) = 19px;
// 线 height 3px,因此 top 需为 19 - 1.5 = 17.5px,使线视觉中心与圆点中心对齐
top: 17.5px;
right: 58px;
left: 58px;
height: 3px;
+26 -51
View File
@@ -96,7 +96,7 @@
@update:model-value="projectBox = $event"
@closed="resetProjectDialog"
>
<div v-if="isProjectFormPage" class="project-apply-page__title">
<div v-if="isProjectFormPage" class="archive-page-form__title">
{{ projectDialogTitle }}
</div>
<el-form
@@ -176,6 +176,7 @@
<el-form-item label="承办部门" prop="undertakeDeptId">
<el-cascader
v-model="form.undertakeDeptId"
style="width: 100%"
placeholder="请选择承办部门"
clearable
filterable
@@ -1084,17 +1085,26 @@ export default {
return this.isAdmin || this.validData(this.permission && this.permission[code], false);
},
openProjectFormPage() {
const type = this.$route.query.mode === 'edit' ? 'edit' : 'add';
const type = this.$route.query.mode || 'add';
const id = this.$route.query.id;
this.dialogType = type;
this.dialogReadonly = false;
this.dialogReadonly = type === 'view';
this.projectBox = true;
if (type === 'add') {
this.applyProjectDetail({ ...emptyForm(), projectType: '普通项目' });
if (['add', 'majorSupplement'].includes(type)) {
this.applyProjectDetail({
...emptyForm(),
projectType: type === 'majorSupplement' ? '重大项目' : '普通项目',
});
this.fillDefaultUsers();
return;
}
this.api.getDetail(id).then(res => this.applyProjectDetail(res.data.data || {}));
this.api.getDetail(id).then(res => {
const detail = res.data.data || {};
this.applyProjectDetail({
...detail,
changeType: type === 'change' ? this.resolveChangeType(detail) : detail.changeType,
});
});
},
closeProjectForm() {
if (this.isProjectFormPage) {
@@ -1294,34 +1304,16 @@ export default {
});
},
openProjectDialog(type, row = {}) {
if (['add', 'edit'].includes(type)) {
this.$router.push({
path: '/business/project-apply/form',
query:
type === 'edit'
? { mode: type, id: row.id, name: `编辑${this.config.title}` }
: { mode: type, name: `新增${this.config.title}` },
});
return;
const query = { mode: type };
if (['edit', 'view', 'change'].includes(type)) {
query.id = row.id;
}
this.dialogType = type;
this.dialogReadonly = type === 'view';
this.projectBox = true;
if (type === 'add' || type === 'majorSupplement') {
this.applyProjectDetail({
...emptyForm(),
projectType: type === 'majorSupplement' ? '重大项目' : '普通项目',
});
this.fillDefaultUsers();
return;
}
this.api.getDetail(row.id).then(res => {
const detail = res.data.data || {};
this.applyProjectDetail({
...detail,
changeType: type === 'change' ? this.resolveChangeType(detail) : detail.changeType,
});
});
if (type === 'add') query.name = `新增${this.config.title}`;
else if (type === 'edit') query.name = `编辑${this.config.title}`;
else if (type === 'view') query.name = `查看${this.config.title}`;
else if (type === 'majorSupplement') query.name = '重大项目补录';
else if (type === 'change') query.name = '项目变更';
this.$router.push({ path: '/business/project-apply/form', query });
},
resetProjectDialog() {
this.$refs.projectForm?.clearValidate();
@@ -2094,28 +2086,11 @@ export default {
.project-apply-page-form {
min-height: 100%;
margin-bottom: 60px;
//padding: 20px 24px 92px;
//background: #f5f6fa;
}
.project-apply-page__title {
display: flex;
align-items: center;
margin-bottom: 16px;
color: #303133;
font-size: 18px;
font-weight: 600;
&::before {
//width: 4px;
height: 18px;
margin-right: 8px;
//background: #409eff;
border-radius: 2px;
content: '';
}
}
.project-apply-dialog__footer {
display: flex;
justify-content: flex-end;
+13 -1
View File
@@ -146,7 +146,7 @@
<template #header>
<div class="voucher-manage-page__dialog-title">凭证详情</div>
</template>
<el-descriptions v-loading="detailLoading" :column="2" border>
<el-descriptions v-loading="detailLoading" :column="2" border class="voucher-manage-page__detail-desc">
<el-descriptions-item label="项目名称">
{{ detailValue(detailRow.projectName) }}
</el-descriptions-item>
@@ -1076,5 +1076,17 @@ load();
:deep(.el-table__body tr:nth-child(even) > td) {
background: #fafafa;
}
&__detail-desc {
:deep(.el-descriptions__table) {
table-layout: fixed;
th, td {
width: 50%;
}
.el-descriptions__label,
.el-descriptions__content {
width: 50%;
}
}
}
}
</style>
@@ -64,7 +64,7 @@
<el-link v-if="column.link && row[column.prop]" type="primary" @click="emitAction('view', 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>
@@ -411,26 +411,27 @@
destroy-on-close
class="pre-settlement-candidate-dialog"
>
<div class="dialog-section-title">选择结算明细</div>
<el-form :model="candidateQuery" inline label-position="right" label-width="auto">
<el-form-item label="批次号">
<el-input v-model="candidateQuery.batchNo" clearable placeholder="请输入" />
</el-form-item>
<el-form-item label="费用日期">
<el-date-picker
v-model="candidateQuery.feeDateRange"
type="daterange"
value-format="YYYY-MM-DD"
format="YYYY-MM-DD"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="loadCandidates">查询</el-button>
<el-button @click="resetCandidateQuery">重置</el-button>
</el-form-item>
</el-form>
<section-card title="选择结算明细">
<el-form :model="candidateQuery" inline label-position="right" label-width="auto">
<el-form-item label="批次号">
<el-input v-model="candidateQuery.batchNo" clearable placeholder="请输入" />
</el-form-item>
<el-form-item label="费用日期">
<el-date-picker
v-model="candidateQuery.feeDateRange"
type="daterange"
value-format="YYYY-MM-DD"
format="YYYY-MM-DD"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="loadCandidates">查询</el-button>
<el-button @click="resetCandidateQuery">重置</el-button>
</el-form-item>
</el-form>
</section-card>
<el-table
ref="candidateTableRef"
v-loading="candidateDialog.loading"
+1 -1
View File
@@ -118,7 +118,7 @@
>
{{ row[column.prop] }}
</el-link>
<el-tag v-else-if="column.status" :type="statusTagType(row.approvalStatus)">
<el-tag v-else-if="column.status" :type="statusTagType(row.approvalStatus)" class="status-text">
{{ row[column.prop] || '-' }}
</el-tag>
<span v-else-if="column.money">
@@ -71,7 +71,7 @@
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
@@ -25,11 +25,11 @@
<el-descriptions-item label="能源类型">{{
vehicleDetail.energyType || '-'
}}</el-descriptions-item>
<el-descriptions-item label="外廓尺寸(mm)">{{ dimensions }}</el-descriptions-item>
<el-descriptions-item label="核定载质量(KG)">{{
<el-descriptions-item label="外廓尺寸(mm)">{{ dimensions }}</el-descriptions-item>
<el-descriptions-item label="核定载质量(KG)">{{
vehicleDetail.approvedLoadKg ?? '-'
}}</el-descriptions-item>
<el-descriptions-item label="准牵引总质量(KG)">{{
<el-descriptions-item label="准牵引总质量(KG)">{{
vehicleDetail.tractionMassKg ?? '-'
}}</el-descriptions-item>
<el-descriptions-item label="行驶证档案编号">{{
+4 -4
View File
@@ -231,7 +231,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="外廓尺寸(毫米)">
<el-form-item label="外廓尺寸(毫米)">
<div class="dimension-group">
<div class="dimension-group__item">
<span class="dimension-group__label">长</span>
@@ -263,7 +263,7 @@
</el-row>
<el-row :gutter="18">
<el-col :span="8">
<el-form-item label="核定载质量(KG)" prop="approvedLoadKg">
<el-form-item label="核定载质量(KG)" prop="approvedLoadKg">
<el-input
v-model="vehicleForm.approvedLoadKg"
inputmode="numeric"
@@ -272,7 +272,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="准牵引总质量(KG)" prop="tractionMassKg">
<el-form-item label="准牵引总质量(KG)" prop="tractionMassKg">
<el-input
v-model="vehicleForm.tractionMassKg"
inputmode="numeric"
@@ -729,7 +729,7 @@ export default {
return [
['所属组织', 'organizationName'], ['车牌号', 'plateNo'], ['车牌颜色', 'plateColor'],
['车辆类型', 'vehicleType'], ['外廓长度(mm)', 'outerLength'], ['外廓宽度(mm)', 'outerWidth'],
['外廓高度(mm)', 'outerHeight'], ['核定载质量(KG)', 'approvedLoadKg'], ['准牵引总质量(KG)', 'tractionMassKg'],
['外廓高度(mm)', 'outerHeight'], ['核定载质量(KG)', 'approvedLoadKg'], ['准牵引总质量(KG)', 'tractionMassKg'],
['业务关系', 'businessRelation'], ['能源类型', 'energyType'], ['强制报废日期', 'compulsoryScrapDate'],
['海关备案号', 'customsRecordNo'], ['行驶证档案编号', 'drivingLicenseNo'], ['行驶证有效期起', 'drivingLicenseStartDate'],
['行驶证有效期止', 'drivingLicenseEndDate'], ['道路运输证号', 'roadTransportCertNo'], ['道路运输证有效期起', 'roadTransportCertStartDate'],
@@ -39,7 +39,7 @@
</el-button>
</template>
<template #status="{ row }">
<el-tag :type="statusMap[row.status].type">
<el-tag :type="statusMap[row.status].type" class="status-text">
{{ statusMap[row.status].label }}
</el-tag>
</template>
@@ -119,7 +119,7 @@
<el-table-column label="评分项目数" width="140" align="center">
<template #default="{ row }">{{ row.items.length }}</template>
</el-table-column>
<el-table-column label="操作" width="180" align="center">
<el-table-column label="操作" width="160" align="center">
<template #default="{ row }">
<el-link type="primary" @click="openCategory(row)">编辑</el-link>
</template>
@@ -287,8 +287,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="得分率(%)" required>
<div class="range-input standard-range-input">
<el-form-item label="得分率(%)" required>
<div class="range-input standard-range-input score-rate-range">
<el-input
v-model="standardForm.scoreRateLower"
inputmode="numeric"
@@ -316,22 +316,21 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="额度增加" required>
<el-col :span="8">
<el-form-item label="额度增加(万元)" required>
<el-input
v-model="standardForm.creditLimitIncrease"
inputmode="decimal"
@input="value => handleStandardNumberInput('creditLimitIncrease', value, 2)"
>
<template #suffix>万元</template>
</el-input>
class="credit-increase-input"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="最大资金使用额度(万元)" required>
<div class="range-input standard-range-input">
<el-form-item label="最大资金使用额度(万元)" required>
<div class="range-input standard-range-input credit-limit-range">
<el-input
v-model="standardForm.creditLimitLower"
inputmode="decimal"
@@ -1214,6 +1213,24 @@ export default {
}
}
.credit-limit-range {
width: 520px;
max-width: 100%;
:deep(.el-input) {
width: 250px;
flex: none;
}
}
.score-rate-range {
width: 250px;
max-width: 100%;
}
.credit-increase-input {
}
.score-unit {
margin-left: 8px;
color: #606266;
+138 -141
View File
@@ -43,7 +43,7 @@
</el-button>
</template>
<template #customerCode="{ row }">
<el-button type="primary" link @click="openArchive(row, true)">
<el-button type="primary" link @click="viewArchive(row)">
{{ row.customerCode }}
</el-button>
</template>
@@ -80,7 +80,7 @@
<el-link
type="primary"
v-if="hasPermission('customer_archive_view')"
@click="openArchive(row, true)"
@click="viewArchive(row)"
>
查看
</el-link>
@@ -354,7 +354,7 @@
<section-card title="财务/信用信息">
<el-row :gutter="18">
<el-col :span="6">
<el-form-item label="注册资金(万元)" prop="registeredCapital">
<el-form-item label="注册资金(万元)" prop="registeredCapital">
<el-input
v-model="archiveForm.registeredCapital"
maxlength="18"
@@ -363,7 +363,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="开票税点(%)" prop="invoiceTaxRate">
<el-form-item label="开票税点(%)" prop="invoiceTaxRate">
<el-input
v-model="archiveForm.invoiceTaxRate"
maxlength="5"
@@ -377,7 +377,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="最大资金使用额度(万元)" prop="maxCreditLimit">
<el-form-item label="最大资金使用额度(万元)" prop="maxCreditLimit">
<el-input
v-model="archiveForm.maxCreditLimit"
maxlength="18"
@@ -387,7 +387,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="申请总资金使用额度(万元)" prop="applyCreditLimit">
<el-form-item label="申请总资金使用额度(万元)" prop="applyCreditLimit">
<el-input v-model="archiveForm.applyCreditLimit" maxlength="18" disabled />
</el-form-item>
</el-col>
@@ -439,17 +439,17 @@
<span>{{ row.creditLevel }}</span>
</template>
</el-table-column>
<el-table-column min-width="185" align="center">
<el-table-column min-width="210" align="center">
<template #header>
<span>最大资金使用额度(万<br />元)</span>
<span>最大资金使用额度(万元)</span>
</template>
<template #default="{ row }">
<span>{{ formatScoreValue(row.maxCreditLimit) }}</span>
</template>
</el-table-column>
<el-table-column min-width="190" align="center">
<el-table-column min-width="220" align="center">
<template #header>
<span>拟申请总资金使用额<br />度(万元)</span>
<span>拟申请总资金使用额(万元)</span>
</template>
<template #default="{ row }">
<span>{{ formatScoreValue(row.applyCreditLimit) }}</span>
@@ -486,37 +486,40 @@
>新增联系人</el-button
>
</div>
<el-table :data="contactTableData" border class="contact-table">
<el-table-column label="序号" prop="__index" width="90" align="center" />
<el-table-column label="联系人姓名" prop="contactName" min-width="150" />
<el-table-column label="联系人电话" prop="contactPhone" min-width="150" />
<el-table-column label="邮箱" prop="email" min-width="180" />
<el-table-column label="联系地址" min-width="240">
<template #default="{ row }">
<span>{{ formatContactAddress(row) || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" min-width="180" />
<el-table-column label="所属分公司/事业部" min-width="170">
<template #default="{ row }">
<span>{{ row.branchName || archiveForm.deptName || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="130" align="center" v-if="!readonly">
<template #default="{ row }">
<el-link type="primary" @click="openContact(row.__raw, row.__rawIndex)">
修改
</el-link>
<el-link type="danger" @click="deleteContact(row.__rawIndex)">删除</el-link>
</template>
</el-table-column>
</el-table>
<empty-pagination
:page="contactPaginationPage"
always-show
@size-change="size => handleDetailSizeChange('contact', size)"
@current-change="page => handleDetailCurrentChange('contact', page)"
/>
<section-card>
<el-table :data="contactTableData" border class="contact-table">
<el-table-column label="序号" prop="__index" width="90" align="center" />
<el-table-column label="联系人姓名" prop="contactName" min-width="150" />
<el-table-column label="联系人电话" prop="contactPhone" min-width="150" />
<el-table-column label="邮箱" prop="email" min-width="180" />
<el-table-column label="联系地址" min-width="240">
<template #default="{ row }">
<span>{{ formatContactAddress(row) || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" min-width="180" />
<el-table-column label="所属分公司/事业部" min-width="170">
<template #default="{ row }">
<span>{{ row.branchName || archiveForm.deptName || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="130" align="center" v-if="!readonly">
<template #default="{ row }">
<el-link type="primary" @click="openContact(row.__raw, row.__rawIndex)">
修改
</el-link>
<el-link type="danger" @click="deleteContact(row.__rawIndex)">删除</el-link>
</template>
</el-table-column>
</el-table>
<empty-pagination
:page="contactPaginationPage"
always-show
@size-change="size => handleDetailSizeChange('contact', size)"
@current-change="page => handleDetailCurrentChange('contact', page)"
/>
</section-card>
</el-tab-pane>
<el-tab-pane label="收款信息" name="receiptAccounts">
<div class="tab-table-toolbar" v-if="!readonly">
@@ -791,12 +794,12 @@
</el-dialog>
<div class="archive-form__footer">
<el-button v-if="!isArchivePage" @click="closeArchive">
{{ readonly ? '关闭' : '取消' }}
<el-button v-if="!isArchivePage || readonly" @click="closeArchive">
{{ isArchivePage ? '返回' : readonly ? '关闭' : '取消' }}
</el-button>
<el-button type="primary" v-if="!readonly" @click="saveArchive">保存</el-button>
<el-button type="success" v-if="!readonly" @click="saveAndSubmitArchive">提交</el-button>
<el-button v-if="!readonly" @click="closeArchive">返回</el-button>
<el-button v-if="!readonly && !isArchivePage" @click="closeArchive">返回</el-button>
</div>
</component>
@@ -808,45 +811,47 @@
class="contact-dialog"
@closed="resetContact"
>
<el-form
ref="contactForm"
:model="contactForm"
:rules="contactRules"
label-position="right"
label-width="110px"
class="contact-form"
>
<el-form-item label="联系人姓名" prop="contactName" class="contact-form__compact-field">
<el-input v-model="contactForm.contactName" maxlength="30" />
</el-form-item>
<el-form-item label="手机号" prop="contactPhone" class="contact-form__compact-field">
<el-input v-model="contactForm.contactPhone" maxlength="11" />
</el-form-item>
<el-form-item label="邮箱" prop="email" class="contact-form__compact-field">
<el-input v-model="contactForm.email" maxlength="100" />
</el-form-item>
<el-form-item label="地址" prop="detailAddress">
<div class="contact-form__address">
<el-input
v-model="contactForm.regionName"
readonly
maxlength="100"
placeholder="行政区划自动带出"
/>
<el-input
v-model="contactForm.detailAddress"
readonly
maxlength="255"
placeholder="点击后弹出地图组件"
suffix-icon="el-icon-location"
@click="handleContactMapPick"
/>
</div>
</el-form-item>
<el-form-item label="备注" prop="remark" class="contact-form__compact-field">
<el-input v-model="contactForm.remark" maxlength="200" />
</el-form-item>
</el-form>
<section-card>
<el-form
ref="contactForm"
:model="contactForm"
:rules="contactRules"
label-position="right"
label-width="110px"
class="contact-form"
>
<el-form-item label="联系人姓名" prop="contactName" class="contact-form__compact-field">
<el-input v-model="contactForm.contactName" maxlength="30" />
</el-form-item>
<el-form-item label="手机号" prop="contactPhone" class="contact-form__compact-field">
<el-input v-model="contactForm.contactPhone" maxlength="11" />
</el-form-item>
<el-form-item label="邮箱" prop="email" class="contact-form__compact-field">
<el-input v-model="contactForm.email" maxlength="100" />
</el-form-item>
<el-form-item label="地址" prop="detailAddress">
<div class="contact-form__address">
<el-input
v-model="contactForm.regionName"
readonly
maxlength="100"
placeholder="行政区划自动带出"
/>
<el-input
v-model="contactForm.detailAddress"
readonly
maxlength="255"
placeholder="点击后弹出地图组件"
suffix-icon="el-icon-location"
@click="handleContactMapPick"
/>
</div>
</el-form-item>
<el-form-item label="备注" prop="remark" class="contact-form__compact-field">
<el-input v-model="contactForm.remark" maxlength="200" />
</el-form-item>
</el-form>
</section-card>
<template #footer>
<div class="contact-dialog__footer-actions">
<el-button type="primary" @click="saveContact">保存</el-button>
@@ -906,37 +911,39 @@
class="receipt-dialog"
@closed="resetReceipt"
>
<el-form
ref="receiptForm"
:model="receiptForm"
:rules="receiptRules"
label-position="right"
label-width="120px"
class="receipt-form"
>
<el-form-item label="收款单位名称" prop="accountName">
<el-input v-model="receiptForm.accountName" maxlength="100" />
</el-form-item>
<el-form-item label="开户人姓名" prop="accountHolderName">
<el-input v-model="receiptForm.accountHolderName" maxlength="50" />
</el-form-item>
<el-form-item label="开户行" prop="bankName">
<el-select v-model="receiptForm.bankName" filterable clearable>
<el-option
v-for="item in bankListOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="收款账号" prop="bankAccount">
<el-input v-model="receiptForm.bankAccount" maxlength="50" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="receiptForm.remark" maxlength="200" />
</el-form-item>
</el-form>
<section-card>
<el-form
ref="receiptForm"
:model="receiptForm"
:rules="receiptRules"
label-position="right"
label-width="120px"
class="receipt-form"
>
<el-form-item label="收款单位名称" prop="accountName">
<el-input v-model="receiptForm.accountName" maxlength="100" />
</el-form-item>
<el-form-item label="开户人姓名" prop="accountHolderName">
<el-input v-model="receiptForm.accountHolderName" maxlength="50" />
</el-form-item>
<el-form-item label="开户行" prop="bankName">
<el-select v-model="receiptForm.bankName" filterable clearable>
<el-option
v-for="item in bankListOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="收款账号" prop="bankAccount">
<el-input v-model="receiptForm.bankAccount" maxlength="50" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="receiptForm.remark" maxlength="200" />
</el-form-item>
</el-form>
</section-card>
<template #footer>
<div class="receipt-dialog__footer-actions">
<el-button type="primary" @click="saveReceipt">保存</el-button>
@@ -1367,6 +1374,7 @@ import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
import { mapGetters } from 'vuex';
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import SectionCard from '@/components/section-card/main.vue';
const createTimeRangeMap = {
createTimeRange: ['createTimeStart', 'createTimeEnd'],
@@ -1385,6 +1393,7 @@ const qualificationViewerPlugins = [
export default {
components: {
SectionCard,
ArrowRight,
Location,
ElImageViewer,
@@ -1800,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: {
@@ -1818,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 {
@@ -3579,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;
@@ -4849,13 +4850,9 @@ 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;
}
.archive-form__footer {
display: flex;