Commit d2f5fbe4 by yuzhenWang

修复bug2发布测试

parent 2fbd81ef
...@@ -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
})
}
...@@ -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 () => {
......
...@@ -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 {
......
...@@ -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