feat(contract-manage): 将付款比例设置提示改为tooltip展示
- 付款比例设置区块标题后添加问号图标悬浮提示,替换原红色文字说明 - 编辑弹窗、详情弹窗、合同变更页统一使用el-tooltip + el-icon-question-filled组件 - 移除contract-manage.vue中原有.red tip提示及相应样式 feat(temporary-credit-limit): 优化临时额度申请界面及校验规则 - 增加新增/编辑/查看临时额度申请标题,覆盖默认菜单注入标题 - 所有表单字段统一设置placeholder为“请输入/请选择”无字段名 - 搜索栏占位符统一为“请输入/请选择”,与其他模块一致 - 临时额度申请有效期至字段增加“必须晚于当前日期”日期校验规则 - 增添futureDateRule通用校验规则,支持多种日期格式即时触发验证 feat(project-apply): 新增资金使用风险快速筛选及风险提示 - 项目申请列表增加资金使用风险列,显示高风险/中风险标签 - 新增资金使用风险快速筛选区,可点击标签筛选项目风险等级 - 提供资金使用风险阈值配置,支持中风险≥80%、高风险≥90% - 调整页面样式及交互,优化风险筛选体验 - 新增后端接口getFundRiskStats,用于获取风险统计数据并实时刷新
This commit is contained in:
@@ -9,6 +9,14 @@ export const getDetail = api.getDetail;
|
||||
export const submit = api.submit;
|
||||
export const remove = api.remove;
|
||||
|
||||
// 项目资金使用风险统计(高风险 / 中风险数量),供列表头部快速筛选标签使用
|
||||
export const getFundRiskStats = params =>
|
||||
request({
|
||||
url: `${baseUrl}/fund-risk-stats`,
|
||||
method: 'get',
|
||||
params,
|
||||
});
|
||||
|
||||
export const saveDraft = row =>
|
||||
request({
|
||||
url: `${baseUrl}/save-draft`,
|
||||
|
||||
@@ -169,6 +169,32 @@ export const nonNegativeRule = label => ({
|
||||
trigger: 'blur',
|
||||
});
|
||||
|
||||
// 日期必须晚于当前日期(当天不可选):选择后立即校验,trigger 固定为 change
|
||||
// 取值支持 YYYY-MM-DD / YYYY-MM-DD HH:mm:ss / 时间戳
|
||||
export const futureDateRule = label => ({
|
||||
validator: (rule, value, callback) => {
|
||||
if (value === undefined || value === null || value === '') {
|
||||
callback();
|
||||
return;
|
||||
}
|
||||
const raw = String(value).trim().replace(/-/g, '/');
|
||||
const selected = new Date(raw);
|
||||
if (Number.isNaN(selected.getTime())) {
|
||||
callback();
|
||||
return;
|
||||
}
|
||||
const today = new Date();
|
||||
today.setHours(0, 0, 0, 0);
|
||||
selected.setHours(0, 0, 0, 0);
|
||||
if (selected.getTime() <= today.getTime()) {
|
||||
callback(new Error(`${label}必须晚于当前日期`));
|
||||
return;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
trigger: ['change', 'blur'],
|
||||
});
|
||||
|
||||
export const phoneRule = label => ({
|
||||
pattern: /^1[3-9]\d{9}$/,
|
||||
message: `${label}格式不正确`,
|
||||
|
||||
@@ -16,6 +16,18 @@ const projectEffectiveTypeOptions = [
|
||||
{ label: '正式', value: 'formal' },
|
||||
];
|
||||
|
||||
export const fundUseRiskOptions = [
|
||||
{ label: '高风险', value: 'high' },
|
||||
{ label: '中风险', value: 'medium' },
|
||||
{ label: '正常', value: 'none' },
|
||||
];
|
||||
|
||||
// 项目资金额度使用率阈值:中风险 ≥ 80%,高风险 ≥ 90%
|
||||
export const fundUseRiskThreshold = {
|
||||
high: 90,
|
||||
medium: 80,
|
||||
};
|
||||
|
||||
const amountRules = label => [
|
||||
{ required: true, message: `请输入${label}`, trigger: 'blur' },
|
||||
nonNegativeRule(label),
|
||||
@@ -402,5 +414,14 @@ export const option = createCrudOption([
|
||||
span: 24,
|
||||
hide: true,
|
||||
},
|
||||
{
|
||||
label: '资金使用风险',
|
||||
prop: 'fundUseRisk',
|
||||
slot: true,
|
||||
minWidth: 130,
|
||||
addDisplay: false,
|
||||
editDisplay: false,
|
||||
hide: false,
|
||||
},
|
||||
...auditColumns.map(column => ({ ...column, hide: true })),
|
||||
]);
|
||||
|
||||
@@ -2,8 +2,10 @@ import {
|
||||
approvalStatusOptions,
|
||||
auditColumns,
|
||||
createCrudOption,
|
||||
futureDateRule,
|
||||
nonNegativeRule,
|
||||
textRule,
|
||||
withSearchPlaceholders,
|
||||
} from './common';
|
||||
|
||||
const listDicFormatter = res => {
|
||||
@@ -118,7 +120,10 @@ export const config = {
|
||||
|
||||
export const option = {
|
||||
dialogCustomClass: 'temporary-credit-limit-dialog',
|
||||
...createCrudOption([
|
||||
addTitle: '新增临时额度申请',
|
||||
editTitle: '编辑临时额度申请',
|
||||
viewTitle: '查看临时额度申请',
|
||||
...createCrudOption(withSearchPlaceholders([
|
||||
{
|
||||
label: '申请单号',
|
||||
prop: 'applicationNo',
|
||||
@@ -158,6 +163,7 @@ export const option = {
|
||||
prop: 'projectCode',
|
||||
hide: true,
|
||||
disabled: true,
|
||||
placeholder: '请输入',
|
||||
span: 6,
|
||||
minWidth: 150,
|
||||
rules: textRule('项目编号', 50),
|
||||
@@ -167,6 +173,7 @@ export const option = {
|
||||
prop: 'undertakeDeptName',
|
||||
hide: true,
|
||||
disabled: true,
|
||||
placeholder: '请输入',
|
||||
span: 6,
|
||||
minWidth: 150,
|
||||
rules: textRule('承办部门', 50, true),
|
||||
@@ -176,6 +183,7 @@ export const option = {
|
||||
prop: 'projectFundLimit',
|
||||
hide: true,
|
||||
disabled: true,
|
||||
placeholder: '请输入',
|
||||
span: 6,
|
||||
minWidth: 200,
|
||||
rules: [nonNegativeRule('项目资金使用额度')],
|
||||
@@ -185,6 +193,7 @@ export const option = {
|
||||
prop: 'usedFundLimit',
|
||||
hide: true,
|
||||
disabled: true,
|
||||
placeholder: '请输入',
|
||||
span: 6,
|
||||
minWidth: 220,
|
||||
value: 0,
|
||||
@@ -195,6 +204,7 @@ export const option = {
|
||||
prop: 'remainingFundLimit',
|
||||
hide: true,
|
||||
disabled: true,
|
||||
placeholder: '请输入',
|
||||
span: 6,
|
||||
minWidth: 230,
|
||||
value: 0,
|
||||
@@ -217,9 +227,13 @@ export const option = {
|
||||
type: 'date',
|
||||
format: 'YYYY-MM-DD',
|
||||
valueFormat: 'YYYY-MM-DD',
|
||||
placeholder: '请选择',
|
||||
span: 6,
|
||||
minWidth: 140,
|
||||
rules: [{ required: true, message: '请选择申请有效期至', trigger: 'change' }],
|
||||
rules: [
|
||||
{ required: true, message: '请选择申请有效期至', trigger: 'change' },
|
||||
futureDateRule('申请有效期至'),
|
||||
],
|
||||
},
|
||||
{
|
||||
label: '申请部门',
|
||||
@@ -285,15 +299,16 @@ export const option = {
|
||||
editDisplay: false,
|
||||
},
|
||||
{
|
||||
label: '备注',
|
||||
label: '临时额度信息',
|
||||
prop: 'remark',
|
||||
type: 'textarea',
|
||||
span: 24,
|
||||
minRows: 2,
|
||||
hide: true,
|
||||
placeholder: '请输入',
|
||||
maxlength: 200,
|
||||
showWordLimit: true,
|
||||
rules: textRule('备注', 200),
|
||||
rules: textRule('临时额度信息', 200),
|
||||
},
|
||||
{
|
||||
label: '附件',
|
||||
@@ -303,7 +318,7 @@ export const option = {
|
||||
hide: true,
|
||||
},
|
||||
...auditColumns.map(column => ({ ...column, hide: true })),
|
||||
]),
|
||||
])),
|
||||
dialogWidth: '96%',
|
||||
menuFixed: 'right',
|
||||
menuWidth: 320,
|
||||
|
||||
@@ -63,7 +63,12 @@
|
||||
</section>
|
||||
|
||||
<section class="change-section">
|
||||
<div class="dialog-section-title">付款比例设置</div>
|
||||
<div class="dialog-section-title">
|
||||
付款比例设置
|
||||
<el-tooltip content="非必填;配置付款比例时,合计必须等于100%。" placement="top">
|
||||
<el-icon style="margin-left: 4px; color: #909399; cursor: pointer"><el-icon-question-filled /></el-icon>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
<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" />
|
||||
|
||||
@@ -425,10 +425,14 @@
|
||||
|
||||
<section class="contract-manage-form__section contract-manage-form__section--panel">
|
||||
<div class="contract-manage-form__section-head">
|
||||
<div class="dialog-section-title">付款比例设置</div>
|
||||
<div class="dialog-section-title">
|
||||
付款比例设置
|
||||
<el-tooltip content="非必填;配置付款比例时,合计必须等于100%。" placement="top">
|
||||
<el-icon style="margin-left: 4px; color: #909399; cursor: pointer"><el-icon-question-filled /></el-icon>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
<el-button type="primary" plain @click="addPaymentRatio">添加</el-button>
|
||||
</div>
|
||||
<p class="contract-manage-form__tip">非必填;配置付款比例时,合计必须等于100%。</p>
|
||||
<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" />
|
||||
@@ -740,7 +744,12 @@
|
||||
</section>
|
||||
|
||||
<section class="contract-manage-form__section contract-manage-form__section--panel">
|
||||
<div class="dialog-section-title">付款比例设置</div>
|
||||
<div class="dialog-section-title">
|
||||
付款比例设置
|
||||
<el-tooltip content="非必填;配置付款比例时,合计必须等于100%。" placement="top">
|
||||
<el-icon style="margin-left: 4px; color: #909399; cursor: pointer"><el-icon-question-filled /></el-icon>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
<el-table :data="detailPaymentRatioRows" border>
|
||||
<el-table-column type="index" label="序号" width="80" align="center" />
|
||||
<el-table-column prop="paymentTerm" label="付款笔数" min-width="180" align="center" />
|
||||
@@ -2892,8 +2901,4 @@ export default {
|
||||
white-space: normal;
|
||||
line-height: 1.2;
|
||||
}
|
||||
.contract-manage-form__tip {
|
||||
color: #ff0000 !important;
|
||||
font-size: 12px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -58,6 +58,40 @@
|
||||
{{ displayStatus(row, 'approvalStatus') }}
|
||||
</template>
|
||||
|
||||
<template #header>
|
||||
<div class="project-apply-page__risk-search">
|
||||
<span class="project-apply-page__risk-label">
|
||||
资金使用风险
|
||||
<el-tooltip placement="top" effect="dark">
|
||||
<template #content>
|
||||
<div>中风险:项目资金额度使用率 ≥ 80%</div>
|
||||
<div>高风险:项目资金额度使用率 ≥ 90%</div>
|
||||
<div>使用率 = 已使用资金 / 项目资金使用额度 × 100%</div>
|
||||
</template>
|
||||
<i class="el-icon-question project-apply-page__risk-help" />
|
||||
</el-tooltip>
|
||||
</span>
|
||||
<el-check-tag
|
||||
v-for="item in fundRiskTagOptions"
|
||||
:key="item.value"
|
||||
:checked="fundRiskScope === item.value"
|
||||
@change="changeFundRiskScope(item.value)"
|
||||
>
|
||||
{{ item.label }}({{ fundRiskStats[item.statKey] || 0 }})
|
||||
</el-check-tag>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template #fundUseRisk="{ row }">
|
||||
<el-tag v-if="row.fundUseRisk === 'high'" type="danger">
|
||||
{{ row.fundUseRiskName || '高风险' }}
|
||||
</el-tag>
|
||||
<el-tag v-else-if="row.fundUseRisk === 'medium'" type="warning">
|
||||
{{ row.fundUseRiskName || '中风险' }}
|
||||
</el-tag>
|
||||
<span v-else class="project-apply-page__risk-none">-</span>
|
||||
</template>
|
||||
|
||||
<template #menu="{ row, index }">
|
||||
<el-link
|
||||
type="primary"
|
||||
@@ -975,6 +1009,12 @@ export default {
|
||||
data: [],
|
||||
query: {},
|
||||
allDept: 0,
|
||||
fundRiskScope: '',
|
||||
fundRiskStats: { high: 0, medium: 0, none: 0 },
|
||||
fundRiskTagOptions: [
|
||||
{ label: '高风险', value: 'high', statKey: 'high' },
|
||||
{ label: '中风险', value: 'medium', statKey: 'medium' },
|
||||
],
|
||||
page: {
|
||||
pageSize: 10,
|
||||
pageSizes: [10, 20, 50, 100],
|
||||
@@ -1342,12 +1382,14 @@ export default {
|
||||
...params,
|
||||
...this.query,
|
||||
allDept: this.allDept,
|
||||
...(this.fundRiskScope ? { fundUseRisk: this.fundRiskScope } : {}),
|
||||
})
|
||||
.then(res => {
|
||||
const result = res.data.data || {};
|
||||
this.page.total = result.total || 0;
|
||||
this.data = result.records || [];
|
||||
this.selectionClear();
|
||||
this.refreshFundRiskStats({ ...params, ...this.query, allDept: this.allDept });
|
||||
})
|
||||
.finally(() => {
|
||||
this.loading = false;
|
||||
@@ -1355,6 +1397,7 @@ export default {
|
||||
},
|
||||
searchReset() {
|
||||
this.query = {};
|
||||
this.fundRiskScope = '';
|
||||
this.page.currentPage = 1;
|
||||
this.onLoad(this.page);
|
||||
},
|
||||
@@ -1364,6 +1407,18 @@ export default {
|
||||
this.onLoad(this.page, params);
|
||||
done();
|
||||
},
|
||||
// 切换「资金使用风险」快速筛选:再次点击已选中项则取消筛选
|
||||
changeFundRiskScope(value) {
|
||||
this.fundRiskScope = this.fundRiskScope === value ? '' : value;
|
||||
this.page.currentPage = 1;
|
||||
this.onLoad(this.page, this.query);
|
||||
},
|
||||
refreshFundRiskStats(params) {
|
||||
this.api.getFundRiskStats(params).then(res => {
|
||||
const stats = res.data?.data || {};
|
||||
this.fundRiskStats = { ...this.fundRiskStats, ...stats };
|
||||
});
|
||||
},
|
||||
selectionChange(list) {
|
||||
this.selectionList = list;
|
||||
},
|
||||
@@ -2474,8 +2529,40 @@ export default {
|
||||
.project-apply-page-form {
|
||||
min-height: 100%;
|
||||
margin-bottom: 60px;
|
||||
//padding: 20px 24px 92px;
|
||||
//background: #f5f6fa;
|
||||
}
|
||||
|
||||
.project-apply-page {
|
||||
&__risk-search {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
margin-top: 8px;
|
||||
margin-bottom: 16px;
|
||||
|
||||
:deep(.el-check-tag) {
|
||||
font-weight: 500;
|
||||
}
|
||||
}
|
||||
|
||||
&__risk-label {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
color: #606266;
|
||||
font-weight: 600;
|
||||
margin-right: 4px;
|
||||
}
|
||||
|
||||
&__risk-help {
|
||||
margin-left: 4px;
|
||||
color: #a8abb2;
|
||||
cursor: help;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
&__risk-none {
|
||||
color: #c0c4cc;
|
||||
}
|
||||
}
|
||||
|
||||
.project-apply-dialog__footer {
|
||||
|
||||
@@ -50,11 +50,13 @@
|
||||
</el-tag>
|
||||
</template>
|
||||
|
||||
<template #projectName-label>项目额度信息</template>
|
||||
|
||||
<template #projectName-form>
|
||||
<el-select
|
||||
v-model="selectedProjectId"
|
||||
class="temporary-credit-limit-page__field"
|
||||
placeholder="请选择项目"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
clearable
|
||||
:loading="projectLoading"
|
||||
@@ -75,7 +77,7 @@
|
||||
<el-input
|
||||
v-model="form.applyLimit"
|
||||
class="temporary-credit-limit-page__field"
|
||||
placeholder="请输入申请临时额度"
|
||||
placeholder="请输入"
|
||||
:disabled="dialogReadonly"
|
||||
@input="handleAmountInput"
|
||||
/>
|
||||
@@ -822,7 +824,7 @@ export default {
|
||||
.el-form-item__label {
|
||||
height: auto !important;
|
||||
line-height: 18px;
|
||||
padding-top: 7px; // 视觉补偿:让单行 label 仍接近 input 中线
|
||||
//padding-top: 7px; // 视觉补偿:让单行 label 仍接近 input 中线
|
||||
}
|
||||
|
||||
// 强制必填星号垂直居中于行盒,与第一行汉字字符中心同基线(关键)
|
||||
@@ -841,4 +843,8 @@ export default {
|
||||
.el-form-item--default .el-form-item__label {
|
||||
height: auto !important;
|
||||
}
|
||||
.el-dialog .avue-form{
|
||||
padding: 16px 16px 4px !important;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user