Skip to content

Y
yd-csf-front
Commit d2f5fbe4 by yuzhenWang
Options

修复bug2发布测试

parent 2fbd81ef
Showing with 201 additions and 75 deletions
src/api/financial/commission.js
...@@ -190,3 +190,27 @@ export function salaryStatistics(data) { ...@@ -190,3 +190,27 @@ export function salaryStatistics(data) {
data: data data: data
}) })
} }
// 薪资管理修订记录
export function salaryEditRecords(data) {
return request({
url: '/csf/api/fortune/editRecords/fortuneAccount',
method: 'post',
data: data
})
}
// 入账管理操作记录
export function incomeEditRecords(data) {
return request({
url: '/csf/api/commission/edit/records',
method: 'post',
data: data
})
}
// 入账管理比对记录列表
export function incomeCompareRecords(data) {
return request({
url: '/csf/api/commission/compare/records',
method: 'post',
data: data
})
}
src/views/financialCenter/financialBilling.vue
...@@ -305,8 +305,6 @@ const clearAllSelection = () => { ...@@ -305,8 +305,6 @@ const clearAllSelection = () => {
if (tableRef.value) { if (tableRef.value) {
tableRef.value.clearSelection() tableRef.value.clearSelection()
} }
console.log('allSelectedRows', allSelectedRows.value)
console.log('selectedRows', selectedRows.value)
} }
// 下载选中项 // 下载选中项
const downloadSelected = async () => { const downloadSelected = async () => {
......
src/views/financialCenter/financialIncome.vue
...@@ -118,6 +118,27 @@ ...@@ -118,6 +118,27 @@
></el-table-column ></el-table-column
>/> >/>
<el-table-column prop="policyNo" label="保单号" min-width="120" align="center" /> <el-table-column prop="policyNo" label="保单号" min-width="120" align="center" />
<el-table-column prop="expectedAmount" label="总金额" min-width="120" align="center" />
<el-table-column
prop="currentCommissionRatio"
label="当前来佣比例"
min-width="120"
align="center"
/>
<el-table-column
prop="periodPaidRatio"
label="已入账来佣比例"
min-width="120"
align="center"
/>
<el-table-column
prop="periodPendingRatio"
label="当期剩余来佣比例"
min-width="120"
align="center"
/>
<el-table-column prop="paidAmount" label="已入账金额" min-width="120" align="center" />
<el-table-column prop="pendingAmount" label="待入账金额" min-width="120" align="center" />
<el-table-column <el-table-column
prop="reconciliationCompany" prop="reconciliationCompany"
label="对账公司" label="对账公司"
...@@ -142,8 +163,8 @@ ...@@ -142,8 +163,8 @@
<el-table-column prop="status" label="比对状态" min-width="100" align="center"> <el-table-column prop="status" label="比对状态" min-width="100" align="center">
<template #default="scope"> <template #default="scope">
<span>{{ convertStatusToDict(scope.row.status) }}</span> <span>{{ convertStatusToDict(scope.row.status) }}</span>
</template> </el-table-column </template>
>> </el-table-column>
<el-table-column <el-table-column
prop="remark" prop="remark"
label="备注" label="备注"
...@@ -276,8 +297,13 @@ ...@@ -276,8 +297,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="结算汇率" prop="amount"> <el-form-item label="结算汇率" prop="exchangeRate">
<el-input v-model="incomeForm.amount" placeholder="请输入汇率" /> <el-input v-model="incomeForm.exchangeRate" placeholder="请输入汇率" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="保费" prop="premium">
<el-input v-model="incomeForm.premium" placeholder="请输入保费" />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -294,7 +320,7 @@ ...@@ -294,7 +320,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="修改人" prop="amount"> <el-form-item label="修改人" prop="amount">
<el-input v-model="incomeForm.amount" placeholder="请输入汇率" /> <el-input v-model="incomeForm.amount" placeholder="请输入汇率" />
</el-form-item> </el-form-item>
...@@ -318,7 +344,7 @@ ...@@ -318,7 +344,7 @@
placeholder="请输入备注信息" placeholder="请输入备注信息"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</template> </template>
<el-col :span="24"> <el-col :span="24">
...@@ -350,54 +376,34 @@ ...@@ -350,54 +376,34 @@
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="期数" prop="policyNo" align="center" width="100" fixed="left"> <el-table-column label="佣金期数" prop="commissionPeriod" align="center" fixed="left">
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="总期数" prop="totalPeriod" align="center"></el-table-column>
label="总期数" <el-table-column prop="status" label="比对状态" min-width="100" align="center">
prop="errorMsg" <template #default="scope">
align="center" <span>{{ convertStatusToDict(scope.row.status) }}</span>
width="100" </template>
></el-table-column> </el-table-column>
<el-table-column <el-table-column label="来佣币种" prop="currency" align="center"
label="比对状态" ><template #default="scope">
prop="errorMsg" <dict-tag :options="currencyTypeOptions" :value="scope.row.currency" /> </template
align="center"
width="100"
></el-table-column>
<el-table-column
label="结算汇率"
prop="errorMsg"
align="center"
width="100"
></el-table-column>
<el-table-column
label="入账金额"
prop="errorMsg"
align="center"
width="100"
></el-table-column>
<el-table-column
label="已入账金额"
prop="errorMsg"
align="center"
width="100"
></el-table-column>
<el-table-column
label="待入账金额"
prop="errorMsg"
align="center"
width="100"
></el-table-column> ></el-table-column>
<el-table-column label="总金额" prop="errorMsg" align="center"></el-table-column> <el-table-column label="入账金额" prop="amount" align="center"></el-table-column>
<el-table-column label="结算汇率" prop="exchangeRate" align="center"></el-table-column>
</el-table> </el-table>
<pagination <el-pagination
v-show="alignmentPages.total >= 0" v-show="alignmentPages.total >= 0"
:total="alignmentPages.total" :total="alignmentPages.total"
v-model:page="alignmentPages.pageNo" :current-page="alignmentPages.pageNo"
v-model:limit="alignmentPages.pageSize" :page-size="alignmentPages.pageSize"
@pagination="getAlignmentData" :page-sizes="[5, 10, 20, 50]"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleAlignmentSizeChange"
@current-change="handleAlignmentCurrentChange"
style="margin-top: 10px"
/> />
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click="closeDialog">关 闭</el-button> <el-button @click="closeDialog">关 闭</el-button>
...@@ -406,23 +412,35 @@ ...@@ -406,23 +412,35 @@
</el-dialog> </el-dialog>
<el-dialog title="操作记录" v-model="showOperationRecord" width="1000px" append-to-body> <el-dialog title="操作记录" v-model="showOperationRecord" width="1000px" append-to-body>
<el-table :data="operationList" border> <el-table :data="operationList" border>
<el-table-column prop="createTime" label="修改时间" align="center" width="150"> <el-table-column label="变更字段" prop="field" align="center" width="150"></el-table-column>
<el-table-column
label="变更前信息"
prop="beforeChange"
align="center"
width="200"
></el-table-column>
<el-table-column label="变更后信息" prop="afterChange" align="center" width="200">
</el-table-column>
<el-table-column label="变更人" prop="userName" align="center" width="150">
</el-table-column>
<el-table-column prop="createTime" label="变更时间" align="center">
<template #default="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="修改人" prop="policyNo" align="center" width="150" fixed="left">
</el-table-column>
<el-table-column label="修改内容" prop="errorMsg" align="center"></el-table-column>
</el-table> </el-table>
<pagination <el-pagination
v-show="operationPages.total >= 0" v-show="operationPages.total >= 0"
:total="operationPages.total" :total="operationPages.total"
v-model:page="operationPages.pageNo" :current-page="operationPages.pageNo"
v-model:limit="operationPages.pageSize" :page-size="operationPages.pageSize"
@pagination="getOperationData" :page-sizes="[5, 10, 20, 50]"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleOperationSizeChange"
@current-change="handleOperationCurrentChange"
style="margin-top: 10px"
/> />
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click="closeDialog">关 闭</el-button> <el-button @click="closeDialog">关 闭</el-button>
...@@ -442,7 +460,9 @@ import { ...@@ -442,7 +460,9 @@ import {
downloadPolicyFortune, downloadPolicyFortune,
generateCommissionRecord, generateCommissionRecord,
updatePolicyCommission, updatePolicyCommission,
incomeStatistics incomeStatistics,
incomeEditRecords,
incomeCompareRecords
} from '@/api/financial/commission' } from '@/api/financial/commission'
import FileUpload from '@/components/FileUpload/index' import FileUpload from '@/components/FileUpload/index'
...@@ -469,20 +489,82 @@ const showOperationRecord = ref(false) // 是否显示比对记录列表 ...@@ -469,20 +489,82 @@ const showOperationRecord = ref(false) // 是否显示比对记录列表
// 通过dictType=csf_commission_status获取比对状态字典值,获取对象中的dictItemList // 通过dictType=csf_commission_status获取比对状态字典值,获取对象中的dictItemList
const dictLists = ref([]) const dictLists = ref([])
const currencyTypeOptions = ref([]) const currencyTypeOptions = ref([])
const alignmentPages = ref({ const alignmentPages = reactive({
total: 0, total: 0,
pageNo: 1, pageNo: 1,
pageSize: 5 pageSize: 5
}) })
const operationPages = ref({ const operationPages = reactive({
total: 0, total: 0,
pageNo: 1, pageNo: 1,
pageSize: 5 pageSize: 5
}) })
const getAlignmentData = () => {} const operationTotal = ref(0)
const getOperationData = () => {} const currentRowOperation = ref({})
const isSearch = ref(false) const isSearch = ref(false)
const editStatus = ref('add') const editStatus = ref('add')
const getAlignmentData = () => {
let data = {
commissionBizId: currentRowOperation.value.commissionBizId,
pageNo: alignmentPages.pageNo,
pageSize: alignmentPages.pageSize
}
incomeCompareRecords(data).then(response => {
if (response.code == 200) {
operationList.value = response.data.records
alignmentPages.total = response.data.total
showAlignmentRecord.value = true
} else {
ElMessage.error(response.msg)
showAlignmentRecord.value = false
alignmentPages.total = 0
operationList.value = []
}
})
}
const getOperationData = () => {
let data = {
commissionBizId: currentRowOperation.value.commissionBizId,
pageNo: operationPages.pageNo,
pageSize: operationPages.pageSize
}
incomeEditRecords(data).then(response => {
if (response.code == 200) {
operationList.value = response.data.records
operationPages.total = response.data.total
showOperationRecord.value = true
} else {
ElMessage.error(response.msg)
showOperationRecord.value = false
operationPages.total = 0
operationList.value = []
}
})
}
// 比对记录分页事件
const handleAlignmentSizeChange = val => {
alignmentPages.pageSize = val
alignmentPages.pageNo = 1
getAlignmentData()
}
const handleAlignmentCurrentChange = val => {
alignmentPages.pageNo = val
getAlignmentData()
}
// 操作记录分页事件
const handleOperationSizeChange = val => {
operationPages.pageSize = val
operationPages.pageNo = 1
getOperationData()
}
const handleOperationCurrentChange = val => {
operationPages.pageNo = val
getOperationData()
}
const closeDialog = () => { const closeDialog = () => {
showAlignmentRecord.value = false showAlignmentRecord.value = false
alignmentList.value = [] alignmentList.value = []
...@@ -921,10 +1003,12 @@ const handleEdit = row => { ...@@ -921,10 +1003,12 @@ const handleEdit = row => {
incomeDialogVisible.value = true incomeDialogVisible.value = true
} }
const handleAlignment = row => { const handleAlignment = row => {
showAlignmentRecord.value = true currentRowOperation.value = row
getAlignmentData()
} }
const operationRecord = () => { const operationRecord = row => {
showOperationRecord.value = true currentRowOperation.value = row
getOperationData()
} }
// 提交入账表单（新增/编辑共用） // 提交入账表单（新增/编辑共用）
import { addPolicyCommission } from '@/api/financial/commission' import { addPolicyCommission } from '@/api/financial/commission'
......
src/views/financialCenter/financialSalary.vue
...@@ -176,15 +176,15 @@ ...@@ -176,15 +176,15 @@
</el-dialog> </el-dialog>
<el-dialog title="修订记录" v-model="showReviseRecord" width="1000px" append-to-body> <el-dialog title="修订记录" v-model="showReviseRecord" width="1000px" append-to-body>
<el-table :data="reviseList" border> <el-table :data="reviseList" border>
<el-table-column prop="createTime" label="修订时间" align="center" width="150"> <el-table-column prop="createTime" label="修订时间" align="center" width="180">
<template #default="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="修订人" prop="policyNo" align="center" width="150"> <el-table-column label="修订人" prop="userName" align="center" width="150">
</el-table-column> </el-table-column>
<el-table-column label="修订内容" prop="errorMsg" align="center"></el-table-column> <el-table-column label="修订内容" prop="editContent" align="center"></el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="revisePages.total >= 0" v-show="revisePages.total >= 0"
...@@ -209,7 +209,8 @@ import { SuccessFilled } from '@element-plus/icons-vue' ...@@ -209,7 +209,8 @@ import { SuccessFilled } from '@element-plus/icons-vue'
import { import {
getReferrerFortuneList, getReferrerFortuneList,
updatePolicyFortuneStatus, updatePolicyFortuneStatus,
salaryStatistics salaryStatistics,
salaryEditRecords
} from '@/api/financial/commission' } from '@/api/financial/commission'
// 添加表格引用 // 添加表格引用
...@@ -266,7 +267,26 @@ const referrerOptions = [ ...@@ -266,7 +267,26 @@ const referrerOptions = [
{ label: '王五', value: 'wangwu' }, { label: '王五', value: 'wangwu' },
{ label: '赵六', value: 'zhaoliu' } { label: '赵六', value: 'zhaoliu' }
] ]
const getReviseData = () => {} const currentRow = ref({})
const getReviseData = () => {
let data = {
pageNo: revisePages.pageNo,
pageSize: revisePages.pageSize,
fortuneAccountBizId: currentRow.value.fortuneAccountBizId
}
salaryEditRecords(data).then(response => {
if (response.code == 200) {
reviseList.value = response.data.records
revisePages.total = response.data.total
showReviseRecord.value = true
} else {
ElMessage.error(response.msg)
showReviseRecord.value = false
revisePages.total = 0
reviseList.value = []
}
})
}
// 设置当前页的选中状态 // 设置当前页的选中状态
const setCurrentPageSelection = () => { const setCurrentPageSelection = () => {
if (!tableRef.value) return if (!tableRef.value) return
...@@ -451,9 +471,9 @@ const handleEdit = row => { ...@@ -451,9 +471,9 @@ const handleEdit = row => {
ElMessage.info(`编辑转介人：${row.referrer}`) ElMessage.info(`编辑转介人：${row.referrer}`)
} }
const handleRevise = row => { const handleRevise = row => {
showReviseRecord.value = true currentRow.value = row
getReviseData()
} }
import { addPolicyFortuneAccount } from '@/api/financial/commission'
const deletePolicyFortuneO = async fortuneAccountBizId => { const deletePolicyFortuneO = async fortuneAccountBizId => {
try { try {
......
src/views/sign/underwritingMain/components/expectedCommission.vue
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
/> />
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="来佣比例" prop="ratio" align="center" width="120"> <el-table-column label="来佣比例" prop="commissionRatio" align="center" width="120">
<template #default="scope"> <template #default="scope">
<el-input <el-input
v-model="scope.row.ratio" v-model="scope.row.commissionRatio"
size="default" size="default"
type="number" type="number"
placeholder="请输入" placeholder="请输入"
......
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