diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js index 29236cb1..d9884135 100644 --- a/src/api/Lecturer.js +++ b/src/api/Lecturer.js @@ -74,7 +74,9 @@ export const getListByStatus = (obj) => http.get(`/admin/teacherExpense/getListB //根据发生组织查询汇总的数据(一键确认弹框使用) export const getListByAffiliation = (obj) => http.get(`/admin/teacherExpense/getListByAffiliation?ids=${obj.ids}&beginTime=${obj.beginTime}&endTime=${obj.endTime}&name=${obj.name}&`) //确认/一键确认 -export const teacherExpenseConfirm = (obj) => http.post('/admin/teacherExpense/confirm',obj) +export const teacherExpenseConfirm = (obj) => http.post('/admin/expenseBill/createSummary',obj) +//确认审批 +export const submitApproval = (obj) => http.post('/admin/expenseBill/submitApproval',obj) //提交/撤回 export const isConfirm = (obj) => http.post('/admin/expenseBill/isConfirm',obj) //培训发生组织根节点列表 diff --git a/src/components/project/AddApprover.vue b/src/components/project/AddApprover.vue index 4fb2321a..83f40419 100644 --- a/src/components/project/AddApprover.vue +++ b/src/components/project/AddApprover.vue @@ -1,6 +1,6 @@ @@ -130,7 +130,7 @@ {{formParam?.summaryDate}} {{formParam?.summaryTime}} {{formParam?.summaryTotal}} - {{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'审核通过', 4:'审核拒绝'}[formParam?.status]}} + {{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'审核通过', 4:'拒绝',5:'撤回'}[formParam?.status]}} @@ -463,6 +463,8 @@ return "审核通过" case 4: return "审核拒绝" + case 5: + return "撤回" default: return "-" } @@ -612,10 +614,16 @@ ok: () => { isConfirm({ id: record.id, - status: 1 + status: 2 }).then(res=>{ - message.success('提交成功') - getTableDate(); + if(res.data.code == 200){ + message.success('提交成功') + getTableDate(); + + } + }).catch(err=>{ + message.destroy() + message.error(err.data.msg) }) } }) @@ -627,10 +635,16 @@ ok: () => { isConfirm({ id: record.id, - status: 0 + status: 1 }).then(res=>{ - message.success('撤回成功') - getTableDate(); + if(res.data.code == 200){ + message.success('撤回成功') + getTableDate(); + + } + }).catch(err=>{ + message.destroy() + message.error(err.data.msg) }) } }) @@ -670,7 +684,7 @@ const tableDataExamine = ref([]) const gettableDataExamine = () => { queryExpnseByBillId({ - id : state.id, + billld : state.id, pageNo: state.tableDataParams.pageNo, pageSize: state.tableDataParams.pageSize, name: state.userNoOrName, diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index efcb5d8b..74c50832 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -17,8 +17,8 @@ - @@ -118,7 +118,7 @@ 查看 - 编辑 + 编辑 @@ -162,7 +162,7 @@ - @@ -361,30 +361,45 @@ - -讲师费用详情 - + :closable="false" width="60%" :title="false"> +
+
查看讲师费用
+ +
+ + 讲师费用详情 + {{formParam.name}} {{formParam.userNo}} - {{formParam.orgName}} {{formParam.tsystemName}} {{formParam.tlevelName }} - {{formParam?.payrollPlace || '-'}} - {{{1:'在线',2:'面授',3:'课程'}[formParam?.courseType]}} + {{formParam.orgName}} + {{formParam?.payrollPlace || '-'}} + {{{1:'面授',2:'课程开发',3:'作业员入模培训',4:'其他'}[formParam?.courseType]}} {{formParam.courseType==1?'项目开课' :formParam.courseType==2 ?'路径开课':formParam.courseType==3 ?'面授开课':'-'}} {{formParam.courseName || '-'}} {{formParam.teachingTime || '-'}} - {{formParam.teachingDate || '-'}} + {{formParam.teachingDate || '-'}} {{formParam.studys || '-'}} {{formParam.score || '-'}} {{formParam.levelPay || '-'}} {{formParam.expense || '-'}} {{formParam.payableExpense || '-'}} - {{formParam.payableExpenseTime || '-'}} + {{formParam.status=="0"?'待确认' :formParam.status=="1"?'待提交':formParam.status== "2" ?'审核中':formParam.status== "3"?'审核通过':'-'}} {{formParam.remark || '-'}} +
+ + 讲师费审批 +
+
+ +
- 取消 - 返回 + 提交 + 取消
@@ -407,7 +422,7 @@ - +