Commit 57b57fe6 by yuzhenWang

应收发布测试

parent 5210e4fc
......@@ -510,8 +510,8 @@ export function newQueryCommissionExpectedByPage(data) {
// 应收款管理修改应收记录状态
export function CommissionExpectedChangeStatus(data) {
return request({
url: 'csf/api/CommissionExpected/change_status',
method: 'post',
url: 'csf/api/CommissionExpected/edit/status',
method: 'put',
data: data
})
}
......@@ -188,22 +188,29 @@
:width="item.width"
:formatter="item.formatter"
/>
<!-- <el-table-column fixed="right" label="操作" min-width="120">
<el-table-column fixed="right" label="操作" min-width="120">
<template #default="{ row }">
<el-popover placement="right" :width="200" trigger="click">
<el-popover placement="right" :width="200" trigger="click" v-if="row.type == '1'">
<template #reference>
<el-icon>
<MoreFilled />
</el-icon>
</template>
<el-menu @select="handleSelect($event, row)" popper-class="custom-menu">
<el-menu-item :index="item.value" v-for="item in dropdownItems" :key="item.value">
<!-- <el-menu-item :index="item.value" v-for="item in dropdownItems" :key="item.value">
{{ item.label }}
</el-menu-item>
</el-menu-item> -->
<el-menu-item
:index="item.value"
v-for="item in getOperateItems(row)"
:key="item.value"
>{{ item.label }}</el-menu-item
>
</el-menu>
</el-popover>
</template>
</el-table-column> -->
</el-table-column>
</el-table>
<el-pagination
v-model:current-page="detailPageInfo.currentPage"
......@@ -366,10 +373,11 @@ const addReceivablesFormConfig = [
visible: formData => formData.commissionBizType === 'R',
rules: [{ pattern: /^\d+$/, message: '只能输入正整数', trigger: 'blur' }]
},
// 等待key
{
type: 'date',
type: 'month',
prop: 'commissionDate',
label: '入账(估)',
label: '入账(估)',
placeholder: '请选择'
},
// {
......@@ -418,7 +426,7 @@ const addReceivablesFormConfig = [
},
{
type: 'select',
prop: 'reconciliationCompanyBizId',
prop: 'reconciliationCompany',
label: '对账公司',
api: '/insurance/base/api/insuranceReconciliationCompany/page',
keywordField: 'name',
......@@ -438,7 +446,7 @@ const addReceivablesFormConfig = [
},
{
type: 'input',
prop: 'remark',
prop: 'manualRemark',
label: '备注'
}
]
......@@ -472,6 +480,7 @@ const handleConfirmAddReceivables = async () => {
ElMessage.success('应收款修改成功')
addReceivablesDialogVisible.value = false
resetAddReceivablesForm()
receivedFortuneListData()
loadTableData() // 重新加载表格
} else {
ElMessage.error(res.msg || '应收款修改失败')
......@@ -619,6 +628,21 @@ const dropdownItems = [
{ label: '设置状态', value: 'setStatus' },
{ label: '更新数据', value: 'updateData' }
]
// 动态生成操作菜单项(根据行数据)
const getOperateItems = row => {
const items = []
// 条件:isPart == 1 时不显示分期出账(使用宽松相等,兼容字符串 '1')
if (row.type == 1) {
items.push({ label: '设置状态', value: 'setStatus' })
items.push({ label: '更新数据', value: 'updateData' })
}
// 始终显示的菜单项(保持原始顺序)
// items.push({ label: '设置出账年月(实)', value: 'settingBillYearMonth' })
return items
}
// 弹窗状态
const entryRecordDialogTableVisible = ref(false)
......@@ -869,6 +893,7 @@ const handleConfirmSetStatus = () => {
if (res.code === 200) {
ElMessage.success('状态修改成功')
setStatusDialogTableVisible.value = false
receivedFortuneListData()
loadTableData() // 重新加载表格
} else {
ElMessage.error(res.msg || '状态修改失败')
......@@ -1131,7 +1156,6 @@ const receivableReportItemTableColumns = ref([
width: '120',
formatter: row => row.realAmount || '-'
},
//还不确定字段
{
prop: 'realReconciliationYearMonth',
label: '检核年月',
......@@ -1181,7 +1205,6 @@ const receivableReportItemTableColumns = ref([
width: '120',
formatter: row => row.productName || '-'
},
//还不确定字段
{
prop: 'issueNumber',
label: '年期',
......@@ -1204,11 +1227,18 @@ const receivableReportItemTableColumns = ref([
formatter: row => formatCurrency(row.premium || 0)
},
{
prop: 'realRemark',
prop: 'manualRemark',
label: '人工备注',
sortable: true,
width: '120',
formatter: row => row.manualRemark || '-'
},
{
prop: 'remark',
label: '备注',
sortable: true,
width: '120',
formatter: row => row.realRemark || '-'
formatter: row => row.remark || '-'
},
{
prop: 'realUpdaterName',
......
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