fix: 修复匹配详情提示及公积金可选路径问题

修复匹配详情中“用户自填未经核验”等来源说明，清理未参与项的橙色注意提示，修正贷款统计口径文案；补充公积金完整可选路径提取逻辑，确保明确无额外时长要求的公积金分支可正确识别并通过。
2026-10-19 16:11:59 +08:00
parent c95482a0f3
commit e5406c23a6
75 changed files with 31813 additions and 107 deletions
@@ -13,8 +13,7 @@
 					<view class="form-row"><text class="field-label">{{ assessmentType == 'enterprise' ? '联系人' : '姓名' }}</text><input v-model="form.name" class="field-input" placeholder="请输入姓名" /></view>
 					<view v-if="assessmentType == 'personal'" class="form-row"><text class="field-label">身份证号</text><input v-model="form.idCard" class="field-input" maxlength="18" placeholder="请输入身份证号" /></view>
 					<view class="form-row"><text class="field-label">手机号</text><input v-model="form.phone" class="field-input" type="number" maxlength="11" placeholder="请输入手机号" /></view>
-					<AssessmentSelect label="所在城市" :modelValue="form.city" @update:modelValue="cityChanged" :options="['深圳市', '广州市', '北京市', '上海市', '杭州市', '其他城市']" />
-					<view v-if="form.city == '其他城市' || customCity.length > 0" class="form-row"><text class="field-label">城市名称</text><input v-model="customCity" class="field-input" placeholder="请输入所在城市" /></view>
+					<AssessmentProvinceSelect v-model="form.city" />
 					<AssessmentSelect v-if="assessmentType == 'personal'" label="婚姻状况" v-model="form.maritalStatus" :options="['未婚', '已婚', '离异', '丧偶']" />
 				</view>
 				<view v-else-if="step == 1" class="form-list">
@@ -37,11 +36,14 @@
 				</view>
 				<view v-else-if="step == 2" class="form-list">
 					<text class="asset-section-title">贷款信息</text>
-					<view class="form-row"><text class="field-label">信用贷款笔数</text><input v-model="form.creditLoanCount" class="field-input" type="number" maxlength="4" placeholder="无则填 0" /><text class="field-unit">笔</text></view>
+					<view class="form-row"><text class="field-label">贷款笔数</text><input v-model="form.creditLoanCount" class="field-input" type="number" maxlength="4" placeholder="无则填 0" /><text class="field-unit">笔</text></view>
+					<text class="local-note">统计信用贷款、房贷、车贷等全部当前未结清贷款。无贷款填 0，下面两项金额可留空；已填写的金额会保留。</text>
+					<view v-if="form.loanCountScope != 'all_loans' && form.creditLoanCount.length > 0"><text class="local-note">旧资料仅统计信用贷款，请按上述全部贷款口径检查并确认笔数；原笔数和金额均已保留。</text><text class="consent-link" @click="confirmLoanCountScope">已按全部贷款口径确认笔数</text></view>
 					<view class="form-row"><text class="field-label">欠款总余额</text><input v-model="form.totalDebtBalance" class="field-input" type="digit" maxlength="15" placeholder="请输入金额" /><text class="field-unit">万元</text></view>
 					<view class="form-row"><text class="field-label">贷款月还款金额</text><input v-model="form.monthlyLoanPayment" class="field-input" type="digit" maxlength="15" placeholder="请输入金额" /><text class="field-unit">万元</text></view>
 					<text class="asset-section-title">信用卡信息</text>
 					<view class="form-row"><text class="field-label">银行信用卡张数</text><input v-model="form.creditCardCount" class="field-input" type="number" maxlength="4" placeholder="无则填 0" /><text class="field-unit">张</text></view>
+					<text class="local-note">无信用卡填 0，总额度和已使用总额度可留空；已填写的金额会保留。</text>
 					<view class="form-row"><text class="field-label">总额度</text><input v-model="form.creditCardTotalLimit" class="field-input" type="digit" maxlength="15" placeholder="请输入金额" /><text class="field-unit">万元</text></view>
 					<view class="form-row"><text class="field-label">已使用总额度</text><input v-model="form.creditCardUsedLimit" class="field-input" type="digit" maxlength="15" placeholder="请输入金额" /><text class="field-unit">万元</text></view>
 					<text class="asset-section-title">房车信息</text>
@@ -74,6 +76,8 @@
 	import AppHeader from '@/components/AppHeader.uvue'
 	import AppIcon from '@/components/AppIcon.uvue'
 	import AssessmentSelect from '@/packages/finance/components/AssessmentSelect.uvue'
+	import AssessmentProvinceSelect from '@/packages/finance/components/AssessmentProvinceSelect.uvue'
+	import { provinceForCity, provinceCodeForName } from '@/services/cities.uts'
 	import { AssessmentForm, SelectedDocument, DataAuthorization, emptyAssessmentForm, activeAssessmentType, getAssessmentInput, formFromInput, documentsFromInput, setAssessmentInput, showAgreementNotice, assetValidationMessage, contributionValidationMessage, clearAssessmentFlow } from '@/services/assessment.uts'
 	import { contributionOptions as contributionChoices, contributionBaseVisible as baseVisible } from '@/services/contribution.uts'
 	import { uploadDocument, downloadDocument, deleteDocument, releaseDocumentTemp, documentCategory, fetchOwnedDocuments } from '@/services/documents.uts'
@@ -88,8 +92,6 @@
 	const form = ref<AssessmentForm>(emptyAssessmentForm())
 	let ownerToken = ''; let goingToConfirm = false; let goingToAgreement = false; let visible = false; let accountTimer = 0
 	const sameOwner = (): boolean => { const session = getSession(); return session != null && session['token'] == ownerToken }
-	const customCity = ref('')
-	const cityChanged = (city: string) => { form.value.city = city; if (city != '其他城市') customCity.value = '' }
 	const documentConsent = ref(false)
 	const dataConsent = ref(false)
 	const documents = ref<SelectedDocument[]>([])
@@ -110,7 +112,7 @@
        const session = getSession()
        ownerToken = session?.getString('token') ?? ''
        editGeneration++; invalidateDocuments(); documentConsentId = ''; consentKey = ''; pendingAgreement = emptyAgreement(); documentMessage.value = ''; initialized = false; stopAccountTimer(); clearAssessmentFlow()
-        form.value = emptyAssessmentForm(); documents.value = []; customCity.value = ''; step.value = 0
+        form.value = emptyAssessmentForm(); documents.value = []; step.value = 0
        documentConsent.value = false; dataConsent.value = false; authorizations.value.forEach((item) => { item.selected = false })
        baseRevisionId = ''; editLoading.value = false; editError.value = '账户已变化，请返回重新填写。'
        if (session == null) uni.redirectTo({ url: '/packages/account/login/login' })
@@ -126,13 +128,13 @@
 	const rememberInput = () => {
 		if (!initialized || !sameOwner()) return
 		const source = form.value
-		const currentForm: AssessmentForm = { name: source.name, idCard: source.idCard, phone: source.phone, city: source.city, maritalStatus: source.maritalStatus, occupation: source.occupation, company: source.company, monthlyIncome: source.monthlyIncome, socialSecurity: source.socialSecurity, housingFund: source.housingFund, socialSecurityBase: source.socialSecurityBase, housingFundBase: source.housingFundBase, house: source.house, car: source.car, savings: source.savings, creditCard: source.creditCard, otherAssets: source.otherAssets, creditLoanCount: source.creditLoanCount, totalDebtBalance: source.totalDebtBalance, monthlyLoanPayment: source.monthlyLoanPayment, creditCardCount: source.creditCardCount, creditCardTotalLimit: source.creditCardTotalLimit, creditCardUsedLimit: source.creditCardUsedLimit, enterpriseName: source.enterpriseName, businessCode: source.businessCode, annualRevenue: source.annualRevenue, operatingYears: source.operatingYears, operatingMonths: source.operatingMonths }
-		if (currentForm.city == '其他城市' && customCity.value.trim().length > 0) currentForm.city = customCity.value.trim()
+		const currentForm: AssessmentForm = { name: source.name, idCard: source.idCard, phone: source.phone, city: source.city, maritalStatus: source.maritalStatus, occupation: source.occupation, company: source.company, monthlyIncome: source.monthlyIncome, socialSecurity: source.socialSecurity, housingFund: source.housingFund, socialSecurityBase: source.socialSecurityBase, housingFundBase: source.housingFundBase, house: source.house, car: source.car, savings: source.savings, creditCard: source.creditCard, otherAssets: source.otherAssets, creditLoanCount: source.creditLoanCount, loanCountScope: source.loanCountScope, totalDebtBalance: source.totalDebtBalance, monthlyLoanPayment: source.monthlyLoanPayment, creditCardCount: source.creditCardCount, creditCardTotalLimit: source.creditCardTotalLimit, creditCardUsedLimit: source.creditCardUsedLimit, enterpriseName: source.enterpriseName, businessCode: source.businessCode, annualRevenue: source.annualRevenue, operatingYears: source.operatingYears, operatingMonths: source.operatingMonths }
 		setAssessmentInput(assessmentType.value, step.value, currentForm, documents.value, authorizations.value, documentConsent.value, dataConsent.value, editId.value, baseRevisionId)
 	}
+	const confirmLoanCountScope = () => { if (!ensureOwner()) return; form.value.loanCountScope = 'all_loans'; rememberInput() }
 	const showAgreement = (title: string) => { if (!ensureOwner()) return; rememberInput(); goingToAgreement = true; showAgreementNotice(title) }
 	const restore = (type: string) => {
-		assessmentType.value = type; step.value = 0; form.value = emptyAssessmentForm(); customCity.value = ''; documents.value = []; documentConsent.value = false; dataConsent.value = false
+		assessmentType.value = type; step.value = 0; form.value = emptyAssessmentForm(); documents.value = []; documentConsent.value = false; dataConsent.value = false
 		authorizations.value.forEach((item) => { item.selected = false })
 		const saved = getAssessmentInput(type)
 		if (saved != null) {
@@ -141,7 +143,7 @@
 			documentConsent.value = saved['documentConsent'] == true; dataConsent.value = saved['dataConsent'] == true
 			const grants = saved['authorizations'] as string[] | null
 			if (grants != null) authorizations.value.forEach((item) => { item.selected = grants.includes(item.key) })
-			if (form.value.city.length > 0 && !['深圳市', '广州市', '北京市', '上海市', '杭州市', '其他城市'].includes(form.value.city)) { customCity.value = form.value.city; form.value.city = '其他城市' }
+			if (form.value.city.length > 0) form.value.city = provinceForCity(form.value.city)
 		}
 		initialized = true
 		rememberInput()
@@ -221,7 +223,7 @@
            editGeneration++; if (editId.value.length > 0) editError.value = '已离开修改流程，请返回档案重新进入。'
            // 离页清空资料但不切换步骤，避免卸载时又挂载另一组原生输入组件。
            clearAssessmentFlow(); form.value = emptyAssessmentForm(); documents.value = []
-            customCity.value = ''; documentConsent.value = false; dataConsent.value = false
+            documentConsent.value = false; dataConsent.value = false
            authorizations.value.forEach((item) => { item.selected = false })
        }
    })
@@ -358,7 +360,7 @@
 			else if (form.value.name.trim().length < 2) message = '请输入正确姓名'
 			else if (assessmentType.value == 'personal' && !/(^[0-9]{15}$)|(^[0-9]{17}[0-9Xx]$)/.test(form.value.idCard.trim())) message = '请输入正确身份证号'
 			else if (!/^1[3-9][0-9]{9}$/.test(form.value.phone)) message = '请输入正确手机号'
-			else if (form.value.city.length == 0 || (form.value.city == '其他城市' && customCity.value.trim().length == 0)) message = '请选择或填写所在城市'
+			else if (provinceCodeForName(form.value.city) == null) message = '请选择所在省份'
 		}
 		if (step.value == 1) {
 			const amount = assessmentType.value == 'enterprise' ? form.value.annualRevenue : form.value.monthlyIncome