Commit 28b4ef95 by yuzhenWang

优化1

parent 4db4ef33
......@@ -18,7 +18,7 @@
<!-- 列表区域 -->
<template #table>
<!-- 制作薪资单管理列表 -->
<!-- 电子薪资单管理列表 -->
<el-table
:data="tableData"
height="400"
......@@ -532,6 +532,11 @@ const searchParams = ref({})
const searchConfig = ref([
{
type: 'input',
prop: 'salaryNo',
label: '发放编号'
},
{
type: 'input',
prop: 'brokerName',
label: '转介人'
},
......@@ -816,6 +821,13 @@ const formatStatus = (row, column) => {
const detailDialogVisible = ref(false)
const electronicSalaryTableColumns = ref([
{
prop: 'salaryNo',
label: '发放编号',
sortable: true,
width: '120',
formatter: row => row.salaryNo || '-'
},
{
prop: 'status',
label: '薪资单状态',
sortable: true,
......@@ -866,11 +878,11 @@ const electronicSalaryTableColumns = ref([
},
{
prop: 'creatorName',
prop: 'remark',
label: '备注',
sortable: true,
width: '150',
formatter: row => row.creatorName || '-'
formatter: row => row.remark || '-'
},
{
prop: 'creatorName',
......
......@@ -879,6 +879,11 @@ const searchParams = ref({})
const searchConfig = ref([
{
type: 'input',
prop: 'salaryNo',
label: '发放编号'
},
{
type: 'input',
prop: 'brokerName',
label: '转介人'
},
......@@ -910,13 +915,12 @@ const getOperateItems = row => {
const items = []
// 条件:isPart == 1 时不显示分期出账(使用宽松相等,兼容字符串 '1')
// if (row.type == 1) {
// items.push({ label: '设置状态', value: 'setStatus' })
// items.push({ label: '更新数据', value: 'updateData' })
// }
if (row.status != '3' && row.status != '5') {
items.push({ label: '修改薪资单', value: 'salaryEdit' })
}
// 始终显示的菜单项(保持原始顺序)
items.push({ label: '修改薪资单', value: 'salaryEdit' })
items.push({ label: '查看薪资单', value: 'salaryView' })
items.push({ label: '取消薪资单', value: 'salaryCancel' })
......@@ -996,7 +1000,7 @@ const handleSingleAdd = () => {
commonDialogTit.value = '增加薪资单'
commonDialogType.value = 'add'
personSaleryFormModel.value = { apiSalaryRemittanceFzDTO: {} }
salaryRemittanceDTOList.value = []
salaryRemittanceDTOList.value = [{}]
setSignleSalaryFormStatus()
detailDialogVisible.value = true
}
......@@ -1195,13 +1199,13 @@ const workSalaryTableColumns = ref([
fixed: 'left',
formatter: row => row.salaryNo || '-'
},
{
prop: 'salaryBizId',
label: '业务编号',
sortable: true,
width: '220',
formatter: row => row.salaryBizId || '-'
},
// {
// prop: 'salaryBizId',
// label: '业务编号',
// sortable: true,
// width: '220',
// formatter: row => row.salaryBizId || '-'
// },
{
prop: 'brokerName',
label: '转介人',
......
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