Skip to content

Y
yd-csf-front
Commit 124358e9 by yuzhenWang
Options

Merge branch 'wyz' into 'test' 

修改出账检核新增和结算汇率

See merge request !117
parents 9bb9460c 35494bf9
Showing with 93 additions and 79 deletions
src/api/financial/commission.js
...@@ -360,7 +360,7 @@ export function updateCommissionRecord(data) { ...@@ -360,7 +360,7 @@ export function updateCommissionRecord(data) {
}) })
} }
// 新增出账检核记录 // 出账检核---新增出账检核记录
export function addCheckRecordaddBatch(data) { export function addCheckRecordaddBatch(data) {
return request({ return request({
url: '/csf/api/fortune/addBatch', url: '/csf/api/fortune/addBatch',
......
src/components/SearchForm/SearchForm.vue
...@@ -574,7 +574,7 @@ watch( ...@@ -574,7 +574,7 @@ watch(
// ✅ 在这里同步 modelValue（包括 extra 字段） // ✅ 在这里同步 modelValue（包括 extra 字段）
localModel.value = syncModelFromProps(props.modelValue, internalConfig.value) localModel.value = syncModelFromProps(props.modelValue, internalConfig.value)
console.log('子组件监测config变化', localModel.value) // console.log('子组件监测config变化', localModel.value)
}, },
{ immediate: true } { immediate: true }
) )
...@@ -587,7 +587,7 @@ watch( ...@@ -587,7 +587,7 @@ watch(
if (!newVal || !internalConfig.value) return if (!newVal || !internalConfig.value) return
// ✅ 同样使用 sync 函数 // ✅ 同样使用 sync 函数
localModel.value = syncModelFromProps(newVal, internalConfig.value) localModel.value = syncModelFromProps(newVal, internalConfig.value)
console.log('子组件监测 modelValue 变化:', localModel.value) // console.log('子组件监测 modelValue 变化:', localModel.value)
}, },
{ deep: true } { deep: true }
) )
...@@ -676,7 +676,7 @@ function syncModelFromProps(newModelValue, newConfig) { ...@@ -676,7 +676,7 @@ function syncModelFromProps(newModelValue, newConfig) {
synced[key] = newModelValue[key] synced[key] = newModelValue[key]
} }
} }
console.log('🚀 子组件 进行modelvalue处理:', synced) // console.log('🚀 子组件 进行modelvalue处理:', synced)
return synced return synced
} }
function getNestedValue(obj, path) { function getNestedValue(obj, path) {
......
src/utils/2.js
{ {
"paymentMethod": "CHECK", "id": 2,
"paymentAmount": "111", "fortuneBizId": "fortune_LCESmX7iy1TJRcaE",
"paymentCurrency": "HKD", "reconciliationYearMonth": null,
"paymentRel": "SBR", "fortuneBizType": "R",
"payer": "111", "isPart": 0,
"payingBank": "bank_1002", "expectedFortuneBizId": "expected_fortune_kVBKKtNB38QcFKI6",
"paymentAccount": "1111", "payableNo": "R-CSF26000001",
"currency": "", "policyNo": "111",
"paymentVoucherList": [ "policyCurrency": "美元",
{ "premium": 10000,
"fileName": "icon5.png", "productName": "来佣000",
"fileType": "png", "insuranceCompany": "友邦保險",
"fileUrl": "https://yd-ali-oss.oss-cn-shanghai-finance-1-pub.aliyuncs.com/png/2026/01/13/b4241a95a39d4655a79c706d7ec37f85.png", "commissionBizId": "commission_b9els2m9Lkocu4RB",
"url": "https://yd-ali-oss.oss-cn-shanghai-finance-1-pub.aliyuncs.com/png/2026/01/13/b4241a95a39d4655a79c706d7ec37f85.png" "commissionExpectedBizId": "commission_expected_mUlJXrNqmpioXbsY",
}, "commissionPaidAmount": 38981,
{ "commissionPaidRatio": 50,
"fileName": "cardSix1.png", "fortunePeriod": 1,
"fileType": "png", "fortuneTotalPeriod": 1,
"fileUrl": "https://yd-ali-oss.oss-cn-shanghai-finance-1-pub.aliyuncs.com/png/2026/01/13/41bd22390f6a4a69a5ed8d9c8758ef94.png", "broker": "张平",
"url": "https://yd-ali-oss.oss-cn-shanghai-finance-1-pub.aliyuncs.com/png/2026/01/13/41bd22390f6a4a69a5ed8d9c8758ef94.png" "brokerBizId": "client_user_mdeCtfYb9oRbYnAF",
} "team": "AGHS",
], "teamBizId": "dept_fgUS1281YFdsq3",
"accountVerificationList": [ "fortuneName": "销售佣金",
{ "fortuneType": "1",
"fileName": "icon6.png", "ruleAmount": -100,
"fileType": "png", "ruleCurrency": "HKD",
"fileUrl": "https://yd-ali-oss.oss-cn-shanghai-finance-1-pub.aliyuncs.com/png/2026/01/13/ce6f4781b8f3443f92eddbf13ecefe42.png", "exchangeRate": 1,
"url": "https://yd-ali-oss.oss-cn-shanghai-finance-1-pub.aliyuncs.com/png/2026/01/13/ce6f4781b8f3443f92eddbf13ecefe42.png" "originalCurrency": null,
}, "originalAmount": null,
{ "originalToHkdRate": null,
"fileName": "icon4.png", "payoutCurrency": null,
"fileType": "png", "payoutAmount": null,
"fileUrl": "https://yd-ali-oss.oss-cn-shanghai-finance-1-pub.aliyuncs.com/png/2026/01/13/24e9786aa52d48caba0bfc48e7f4f146.png", "hkdToPayoutRate": null,
"url": "https://yd-ali-oss.oss-cn-shanghai-finance-1-pub.aliyuncs.com/png/2026/01/13/24e9786aa52d48caba0bfc48e7f4f146.png" "hkdAmount": -100,
} "fortunePaidAmount": 0,
], "fortuneUnpaidAmount": -100,
"apiPremiumRemittanceFileDtoList": [ "currentPaymentAmount": -100,
{ "currentPaymentHkdAmount": -100,
"fileName": "icon5.png", "currentPaymentRatio": 0,
"fileType": "png", "fortuneUnpaidRatio": 100,
"fileUrl": "https://yd-ali-oss.oss-cn-shanghai-finance-1-pub.aliyuncs.com/png/2026/01/13/bca0400a90ae4c1da2373e3cf4de0fc7.png", "status": "0",
"url": "https://yd-ali-oss.oss-cn-shanghai-finance-1-pub.aliyuncs.com/png/2026/01/13/bca0400a90ae4c1da2373e3cf4de0fc7.png" "payoutDate": null,
}, "actualPayoutDate": null,
{ "isTax": 0,
"fileName": "homeSelect1.png", "taxAmount": null,
"fileType": "png", "netAmount": null,
"fileUrl": "https://yd-ali-oss.oss-cn-shanghai-finance-1-pub.aliyuncs.com/png/2026/01/13/138932043c6244cb8a006c2ab81b4bab.png", "salaryBizId": null,
"url": "https://yd-ali-oss.oss-cn-shanghai-finance-1-pub.aliyuncs.com/png/2026/01/13/138932043c6244cb8a006c2ab81b4bab.png" "baseRuleBizId": null,
} "settlementBizId": "1",
], "calculationFormula": null,
"id": 1768282536268 "remark": null,
"creatorId": null,
"reconciliationOperator": null,
"updaterId": null,
"createTime": "2026-04-17 15:47:21",
"updateTime": "2026-04-27 14:53:11"
} }
src/views/financialCenter/receivables.vue
...@@ -613,17 +613,17 @@ const searchConfig = ref([ ...@@ -613,17 +613,17 @@ const searchConfig = ref([
type: 'input', type: 'input',
prop: 'insured', prop: 'insured',
label: '受保人(中文/英文)' label: '受保人(中文/英文)'
},
{
type: 'input',
prop: 'signer',
label: '签单员'
},
{
type: 'input',
prop: 'brokerName',
label: '转介人(主)'
} }
// {
// type: 'input',
// prop: 'signer',
// label: '签单员'
// },
// {
// type: 'input',
// prop: 'brokerName',
// label: '转介人(主)'
// }
]) ])
// 分页相关 // 分页相关
......
src/views/sign/policyReceipts/premiumRecon.vue
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
ref="addCheckRecordFormRef" ref="addCheckRecordFormRef"
:config="addCheckRecordConfig" :config="addCheckRecordConfig"
v-model="addCheckRecordFormModel" v-model="addCheckRecordFormModel"
@select-change="onSelectChange" @select-change="(prop, value, item) => onSelectChange('addCheckRecord', prop, value, item)"
/> />
<div> <div>
<el-button type="primary" icon="plus" @click="addRemittance" style="margin-bottom: 10px" <el-button type="primary" icon="plus" @click="addRemittance" style="margin-bottom: 10px"
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
:config="remittanceConfig" :config="remittanceConfig"
v-model="remittanceFormModel" v-model="remittanceFormModel"
@uploadSuccess="handleUploadSuccess" @uploadSuccess="handleUploadSuccess"
@select-change="onSelectChange" @select-change="(prop, value, item) => onSelectChange('remittance', prop, value, item)"
/> />
<div <div
v-if="remittanceFormModel.apiPremiumRemittanceFileDtoList.length > 0" v-if="remittanceFormModel.apiPremiumRemittanceFileDtoList.length > 0"
...@@ -316,7 +316,7 @@ import useUserStore from '@/store/modules/user' ...@@ -316,7 +316,7 @@ import useUserStore from '@/store/modules/user'
import { loadDicts, getDictLabel } from '@/utils/useDict' import { loadDicts, getDictLabel } from '@/utils/useDict'
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import { getNowTime, formatToDate, formatToDateTime } from '@/utils/date' import { getNowTime, formatToDate, formatToDateTime } from '@/utils/date'
let tempPolicyNo = ref('')
const previewVisible = ref(false) const previewVisible = ref(false)
const currentFileUrl = ref('') const currentFileUrl = ref('')
const currentFileName = ref('') const currentFileName = ref('')
...@@ -849,19 +849,26 @@ const handleUploadSuccess = (prop, Model) => { ...@@ -849,19 +849,26 @@ const handleUploadSuccess = (prop, Model) => {
} }
} }
// 下拉框改变 // 下拉框改变
async function onSelectChange(prop, value, item) { async function onSelectChange(type, prop, value, item) {
console.log('【Select 变更】字段:', prop, '新值:', value, '配置:', item) console.log('【Select 变更】字段:', prop, '新值:', value, '配置:', item)
// 汇款弹窗
// 示例：你可以在这里做任何事 if (type == 'remittance') {
if (prop === 'policyNo') { // 示例：你可以在这里做任何事
checkPolicyNo(value) if (prop === 'policyNo') {
} else if (prop == 'paymentRel') { checkPolicyNo(value)
if (value !== 'TBR' && value !== 'SBR') { } else if (prop == 'paymentRel') {
await nextTick() // 等待 Vue 完成本轮 DOM 更新 if (value !== 'TBR' && value !== 'SBR') {
remittanceFormModel.value.payer = '' await nextTick() // 等待 Vue 完成本轮 DOM 更新
remittanceFormModel.value.payer = ''
}
if (value == 'TBR' || value == 'SBR') {
getPolicyInfo(tempPolicyNo.value, 'remittance', value)
}
} }
if (value == 'TBR' || value == 'SBR') { } else if (type == 'addCheckRecord') {
getPolicyInfo(currentRow.value.policyNo, 'remittance', value) //新增保费对账弹窗
if (prop === 'policyNo' && value) {
tempPolicyNo.value = value
} }
} }
} }
...@@ -1321,8 +1328,10 @@ const handleSelect = (command, row) => { ...@@ -1321,8 +1328,10 @@ const handleSelect = (command, row) => {
} else if (command === 'settingResult') { } else if (command === 'settingResult') {
affirmFormModel.value = {} affirmFormModel.value = {}
settingAffirmLoading.value = false settingAffirmLoading.value = false
showAffirm.value = true showAffirm.value = true
currentRow.value = JSON.parse(JSON.stringify(row)) currentRow.value = JSON.parse(JSON.stringify(row))
tempPolicyNo.value = currentRow.value.policyNo
getPolicyInfo(row.policyNo, 'affirm') getPolicyInfo(row.policyNo, 'affirm')
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment