|
@@ -19,6 +19,9 @@
|
|
|
<template #status="{ row }">
|
|
|
<el-tag :type="statusList[row.status].color">{{ statusList[row.status].text }}</el-tag>
|
|
|
</template>
|
|
|
+ <template #branchStatus="{ row }">
|
|
|
+ <el-tag :type="statusList[row.branchStatus].color">{{ statusList[row.branchStatus].text }}</el-tag>
|
|
|
+ </template>
|
|
|
<template #dataType="{row}">
|
|
|
{{ row.dataType === 1 ? '手工数据' : '系统数据' }}
|
|
|
</template>
|
|
@@ -66,7 +69,8 @@ export default {
|
|
|
current: 1,
|
|
|
size: 50
|
|
|
},
|
|
|
- orders: []
|
|
|
+ orders: [],
|
|
|
+ organizationCategory: null
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
@@ -75,10 +79,11 @@ export default {
|
|
|
{ label: '月份', prop: 'month' },
|
|
|
{ label: '机构名称', prop: 'organizationName', width: 150 },
|
|
|
{ label: '员工姓名', prop: 'employeeName', width: 80, align: 'center' },
|
|
|
- { label: '分配状态', prop: 'status', align: 'center', width: 100 },
|
|
|
+ { label: '分配状态', prop: this.organizationCategory === '支行' ? 'branchStatus' : 'status', align: 'center', width: 100 },
|
|
|
{ label: '员工岗位', prop: 'employeeCategory', align: 'center' },
|
|
|
{ label: '可分配绩效薪资', prop: 'assignablePerformanceSalary', align: 'center', width: 150 },
|
|
|
- { label: '领导分配绩效薪资', prop: 'allocationPerformanceSalary', align: 'center', width: 150 },
|
|
|
+ { label: '直属机构分配绩效薪资', prop: 'allocationPerformanceSalary', align: 'center', width: 160 },
|
|
|
+ { label: '支行分配绩效薪资', prop: 'branchAllocationPerformanceSalary', align: 'center', width: 150 },
|
|
|
{ label: '基础绩效薪资', prop: 'basicPerformanceSalary', align: 'center', width: 120 },
|
|
|
{ label: '总绩效薪资', prop: 'performanceSalary', align: 'center', minWidth: 120 },
|
|
|
{ label: '数据来源', prop: 'dataType', align: 'center' },
|
|
@@ -98,6 +103,7 @@ export default {
|
|
|
}
|
|
|
this.loading = true
|
|
|
const { organizationCategory, ...query } = searchValues
|
|
|
+ this.organizationCategory = organizationCategory
|
|
|
try {
|
|
|
const { data } = await getAllocationPage({
|
|
|
page: {
|