@@ -167,7 +167,7 @@
+ :data-source="tableDataExamineTwo" :loading="tableDataExamineLoading" @expand="expandTable" :pagination="false">
@@ -242,7 +242,7 @@
} from '@ant-design/icons-vue';
import ProjectManager from "@/components/project/ProjectManagerNew";
import {expenseBillList,queryById,queryExpnseByBillId ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,isConfirm} from "../../api/lecturerFeeManagement";
- import { getTeacherSystemList } from "../../api/Lecturer";
+ import { getTeacherSystemList,getApprovalResultByBusinessIdList } from "../../api/Lecturer";
// lecturerFeeManagement
// import {getProjSt} from "../../api/indexProjStu";
// import AddTeacher from "../../components/drawers/project/AddTeacher"
@@ -270,6 +270,8 @@
})
const router = useRouter()
const state = reactive({
+ tableDataExamineLoading: false,
+ tableDataExamineTwo: [],
tableDataParams:{
pageNo: 1,
pageSize: 10,
@@ -632,11 +634,54 @@
}
//表格内查看数据操作
const handleLook = (record) => {
+ state.activeKey = '1'
state.teachingdialog = true;
state.id= record.id
TeacherSystem()
gettableDataExamine()
}
+ const params = reactive({
+ pageNo: 1,
+ pageSize: 10,
+ total: 0,
+ businessType: 1,
+ businessId: '366'
+ })
+ const paginations = computed(() => ({
+ total: params.total,
+ showSizeChanger: true,
+ showQuickJumper:true,
+ current: params.pageNo,
+ pageSize: params.pageSize,
+ onChange: paginationChanges,
+ }));
+ const paginationChanges = (e,pageSize) => {
+ params.pageNo = e;
+ params.pageSize = pageSize
+ // getListData()
+ };
+ const tabsChange = (val) => {
+ if(val == 2){
+ getListData()
+ }
+ }
+ const getListData = () => {
+ state.tableDataExamineLoading = true
+ getApprovalResultByBusinessIdList({
+ businessType: 1,
+ businessId: state.id
+ }).then(res=>{
+ if(res.data.code == 200){
+ state.tableDataExamineTwo = res.data.data
+ // params.total = res.data.data.total
+ }
+ state.tableDataExamineLoading = false
+ }).catch(err=>{
+ message.destroy()
+ state.tableDataExamineLoading = false
+ message.error(err.data.msg)
+ })
+ }
const submit = (record) => {
console.log(record,'record')
dialog({
@@ -712,7 +757,6 @@
}
}
const tableDataExamine = ref([])
- const tableDataExamineTwo = ref([])
const gettableDataExamine = () => {
state.examinetableLoading = true
queryExpnseByBillId({
@@ -747,51 +791,66 @@
const columnsExamineTwo = ref([
{
title: '审批层级 ',
- dataIndex: 'name',
- key: 'name',
+ dataIndex: 'levelName',
+ key: 'levelName',
ellipsis: true,
align: "center",
width: 120,
},
{
title: '层级审批人 ',
- dataIndex: 'name',
- key: 'name',
+ dataIndex: 'employeeNames',
+ key: 'employeeNames',
ellipsis: true,
align: "center",
width: 120,
},
{
title: '操作 ',
- dataIndex: 'name',
- key: 'name',
+ dataIndex: 'approvalStatus',
+ key: 'approvalStatus',
ellipsis: true,
align: "center",
width: 120,
+ customRender: ({text})=>{
+ switch (text) {
+ case -1:
+ return 未处理;
+ case 3:
+ return 通过;
+ case 4:
+ return 拒绝;
+ default:
+ return -;
+ }
+ }
},
{
title: '审批人 ',
- dataIndex: 'name',
- key: 'name',
+ dataIndex: 'employeeName',
+ key: 'employeeName',
ellipsis: true,
align: "center",
width: 120,
},
{
title: '审批时间 ',
- dataIndex: 'name',
- key: 'name',
+ dataIndex: 'approvalTime',
+ key: 'approvalTime',
ellipsis: true,
align: "center",
width: 120,
},
{
title: '审批建议 ',
- dataIndex: 'name',
- key: 'name',
+ dataIndex: 'approvalMsg',
+ key: 'approvalMsg',
ellipsis: true,
align: "center",
width: 120,
+ customRender: ({text}) => {
+ return text||'-'
+ }
},
])
//二级页面
@@ -978,13 +1037,14 @@
columnsExamineTwo,
tableData,
tableDataExamine,
- tableDataExamineTwo,
seeDateChange,
changePagination,
addTeacher,
cancelTeachingDialog,
handleLook,
submit,
+ getListData,
+ tabsChange,
withdraw,
goDdit,
cancel,
@@ -1000,6 +1060,8 @@
paginationChange,
searchTeacherFeeApprovalList,
resetSearch,
+ paginations,
+ paginationChanges,
}
},
};
@@ -1322,10 +1384,11 @@
.line {
float: left;
width: 3px;
- height: 25px;
+ height: 17px;
background: #4ea6ff;
border-radius: 30%;
margin-right: 5px;
+ margin-top: 3px;
}
//抽屉功能
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 01b9a5dc..d6cb93b0 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -701,38 +701,61 @@ getAllLevelList().then((res) => {
const columnSee = ref([
{
title: '审批层级',
- dataIndex: 'name',
- key: 'name',
+ dataIndex: 'levelName',
+ key: 'levelName',
ellipsis: true,
align: "center",
},
{
title: '审批人 ',
- dataIndex: 'name',
- key: 'name',
+ dataIndex: 'employeeNames',
+ key: 'employeeNames',
ellipsis: true,
align: "center",
},
{
title: '审批状态 ',
- dataIndex: 'name',
- key: 'name',
+ dataIndex: 'approvalStatus',
+ key: 'approvalStatus',
ellipsis: true,
align: "center",
+ customRender: ({text})=>{
+ switch (text) {
+ case 0:
+ return 待提交;
+ case 1:
+ return 待审核;
+ case 2:
+ return 审核中;
+ case 3:
+ return 审核通过;
+ case 4:
+ return 拒绝;
+ case 5:
+ return 撤销中;
+ case 6:
+ return 已撤销;
+ default:
+ return -;
+ }
+ }
},
{
title: '审批时间 ',
- dataIndex: 'name',
- key: 'name',
+ dataIndex: 'approvalTime',
+ key: 'approvalTime',
ellipsis: true,
align: "center",
},
{
title: '备注 ',
- dataIndex: 'name',
- key: 'name',
+ dataIndex: 'approvalMsg',
+ key: 'approvalMsg',
ellipsis: true,
align: "center",
+ customRender:({text})=>{
+ return text||'-'
+ }
},
])
const columns = ref([