diff --git a/src/api/business/contract-change.js b/src/api/business/contract-change.js index 4f407ec..739be83 100644 --- a/src/api/business/contract-change.js +++ b/src/api/business/contract-change.js @@ -1,4 +1,5 @@ import { createCrudApi } from './common'; +import { APPROVE_TIMEOUT } from '@/api/common'; import request from '@/axios'; const baseUrl = '/blade-transport/contract-change'; @@ -35,8 +36,7 @@ export const approve = id => url: `${baseUrl}/approve`, method: 'post', params: { id }, - // 审批通过后同步推送合规(附件转传可达 20s+),覆盖全局 10s 超时 - timeout: 120000, + timeout: APPROVE_TIMEOUT, }); export const reject = id => diff --git a/src/api/business/contract-manage.js b/src/api/business/contract-manage.js index b7ce897..875839a 100644 --- a/src/api/business/contract-manage.js +++ b/src/api/business/contract-manage.js @@ -1,4 +1,5 @@ import { createCrudApi } from './common'; +import { APPROVE_TIMEOUT } from '@/api/common'; import request from '@/axios'; const baseUrl = '/blade-transport/contract-manage'; @@ -36,8 +37,7 @@ export const approve = id => url: `${baseUrl}/approve`, method: 'post', params: { id }, - // 审批通过后同步推送合规(附件转传可达 20s+),覆盖全局 10s 超时 - timeout: 120000, + timeout: APPROVE_TIMEOUT, }); export const reject = id => diff --git a/src/api/business/hcs.js b/src/api/business/hcs.js index 740b016..e81aad0 100644 --- a/src/api/business/hcs.js +++ b/src/api/business/hcs.js @@ -69,11 +69,11 @@ export const refreshMasterData = () => timeout: 60000, }); -export const getRisk = customerCode => +export const getRisk = (customerCode, creditCode, customerName) => request({ url: `${baseUrl}/risk`, method: 'get', - params: { customerCode }, + params: { customerCode, creditCode, customerName }, timeout: 30000, }); diff --git a/src/api/business/project-change.js b/src/api/business/project-change.js index f1de353..c369a5f 100644 --- a/src/api/business/project-change.js +++ b/src/api/business/project-change.js @@ -1,4 +1,5 @@ import { createCrudApi } from './common'; +import { APPROVE_TIMEOUT } from '@/api/common'; import request from '@/axios'; const baseUrl = '/blade-transport/project-change'; @@ -35,6 +36,7 @@ export const approve = id => url: `${baseUrl}/approve`, method: 'post', params: { id }, + timeout: APPROVE_TIMEOUT, }); export const reject = id => diff --git a/src/api/common.js b/src/api/common.js index 7e03551..884286c 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -2,7 +2,7 @@ import request from '@/axios'; import { ElLoading, ElMessage } from 'element-plus'; /** 审核按钮统一超时:审批通过后可能同步推送金蝶等耗时操作,覆盖全局 10s */ -export const APPROVE_TIMEOUT = 30000; +export const APPROVE_TIMEOUT = 60 * 1000; /** * 文件流返回 diff --git a/src/api/vehicle/customer-archive.js b/src/api/vehicle/customer-archive.js index 0814c2a..0637e27 100644 --- a/src/api/vehicle/customer-archive.js +++ b/src/api/vehicle/customer-archive.js @@ -163,6 +163,42 @@ export const queryKingdeeCustomer = creditCode => { }); }; +// 金蝶供应商编码查询(A901-1):新增客商填写信用代码后即时回显 +export const querySupplierCode = creditCode => { + return request({ + url: '/blade-transport/customer-archive/query-supplier-code', + method: 'get', + timeout: 30000, + params: { + creditCode, + }, + }); +}; + +// 金蝶开户行查询(A905-3):收款信息填写开户行失焦后精确匹配带出联行号 +export const queryKingdeeBank = bankName => { + return request({ + url: '/blade-transport/customer-archive/query-bank', + method: 'get', + timeout: 30000, + params: { + bankName, + }, + }); +}; + +// 金蝶联行号校验(A905-3):收款信息保存前按联行号精确匹配,查不到不允许保存 +export const queryKingdeeBankByNumber = cnapsCode => { + return request({ + url: '/blade-transport/customer-archive/query-bank-by-number', + method: 'get', + timeout: 30000, + params: { + cnapsCode, + }, + }); +}; + export const syncKingdee = id => { return request({ url: '/blade-transport/customer-archive/sync-kingdee', diff --git a/src/option/business/contract-manage.js b/src/option/business/contract-manage.js index 9efc345..ac5fac2 100644 --- a/src/option/business/contract-manage.js +++ b/src/option/business/contract-manage.js @@ -621,6 +621,15 @@ export const option = createCrudOption([ addDisplay: false, editDisplay: false, }, + { + label: '客商风险', + prop: 'customerRisk', + slot: true, + order: 189, + minWidth: 150, + addDisplay: false, + editDisplay: false, + }, { label: '金蝶合同ID', prop: 'kingdeeId', diff --git a/src/option/payment/paymentApplication.js b/src/option/payment/paymentApplication.js index 65494a3..9a74a22 100644 --- a/src/option/payment/paymentApplication.js +++ b/src/option/payment/paymentApplication.js @@ -169,7 +169,7 @@ export const paymentApplicationOption = ({ { label: '当前节点', prop: 'currentNode', minWidth: 120, formatter: textFormatter }, { label: '当前处理人', prop: 'currentProcessor', minWidth: 120, formatter: textFormatter }, { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 130, formatter: textFormatter }, - { label: '金蝶单据状态', prop: 'kingdeeStatusName', minWidth: 130, formatter: textFormatter }, + { label: '金蝶单据状态', prop: 'kingdeeStatusName', slot: true, minWidth: 130 }, { label: '金蝶锁状态', prop: 'kingdeeLockStatus', slot: true, minWidth: 150 }, { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100, formatter: textFormatter }, ], diff --git a/src/option/settlement/formalSettlement.js b/src/option/settlement/formalSettlement.js index e9523be..b425c42 100644 --- a/src/option/settlement/formalSettlement.js +++ b/src/option/settlement/formalSettlement.js @@ -99,7 +99,8 @@ const buildTableColumns = () => } // link / status 标记的列统一走单元格插槽 if (column.link || column.status) extra.slot = true; - if (!extra.formatter) extra.formatter = textFormatter; + // 插槽列不挂兜底 formatter:avue 中 formatter 会覆盖单元格插槽渲染 + if (!extra.slot && !extra.formatter) extra.formatter = textFormatter; return { ...column, ...extra }; }); diff --git a/src/utils/kingdee.js b/src/utils/kingdee.js new file mode 100644 index 0000000..b3f812c --- /dev/null +++ b/src/utils/kingdee.js @@ -0,0 +1,15 @@ +/** + * 金蝶单据状态公共映射 + */ + +/** 金蝶单据状态 → el-tag 颜色类型(failed 状态列表页悬浮展示失败原因) */ +export const KINGDEE_STATUS_TAG_TYPES = { + synced: 'success', + paid: 'success', + invoiced: 'success', + paying: 'warning', + failed: 'danger', +}; + +/** 金蝶单据状态 → el-tag 颜色类型,未映射状态返回 info */ +export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info'; diff --git a/src/utils/risk-display.js b/src/utils/risk-display.js new file mode 100644 index 0000000..224e92f --- /dev/null +++ b/src/utils/risk-display.js @@ -0,0 +1,28 @@ +/** + * 客商/合同风险标签公共展示逻辑(黑名单=金蝶黑名单 A801-5 命中,与后端 HcsCreditCheckSupport 口径一致): + * 等级与黑名单组合展示、等级在前;内部组织客商默认无风险 + */ + +/** 金蝶黑名单命中判定(客商档案行:失信类别/列入事由任一非空) */ +export function isKingdeeBlack(category, reason) { + return !!(category || reason); +} + +/** 合同行黑名单判定(推送链路按金蝶命中口径落库 kingdeeBlackStatus=yes) */ +export function isContractBlack(blackStatus) { + return String(blackStatus || '').toLowerCase() === 'yes'; +} + +/** 风险标签文案:riskLevel=C101-1 等级(0/1/2);isBlack=金蝶黑名单命中;customerKind=internal 显示"无风险" */ +export function resolveRiskTagName(riskLevel, isBlack, customerKind) { + const levelName = { 2: '高风险', 1: '中风险', 0: '低风险' }[riskLevel] || ''; + if (isBlack) return levelName ? `${levelName}、黑名单` : '黑名单'; + if (levelName) return levelName; + if (customerKind === 'internal') return '无风险'; + return ''; +} + +/** 是否红色风险标签(黑名单命中或高风险) */ +export function isRiskyTag(riskLevel, isBlack) { + return isBlack || riskLevel === '2'; +} diff --git a/src/views/business/components/hcs-contract-panel.vue b/src/views/business/components/hcs-contract-panel.vue index 2a3b1f3..0ffffbb 100644 --- a/src/views/business/components/hcs-contract-panel.vue +++ b/src/views/business/components/hcs-contract-panel.vue @@ -38,7 +38,7 @@ contract.hcsFdId || '-' }} -