diff --git a/src/api/lecturerFeeManagement.js b/src/api/lecturerFeeManagement.js
index 457f5644..a4d17758 100644
--- a/src/api/lecturerFeeManagement.js
+++ b/src/api/lecturerFeeManagement.js
@@ -19,6 +19,10 @@ export const expenseBillList= (obj) => http.get('/admin/expenseBill/list',{param
export const queryById= (obj) => http.get('/admin/expenseBill/queryById',{params: obj})
//移除讲师费
export const withdrawRecord= (obj) => http.post('/admin/expenseBill/withdrawRecord',obj)
+//确认讲师费
+export const confirm= (obj) => http.post('/admin/teacherExpense/confirm',obj)
+
+
//获取培训发生组织列表
export const getTrainOrg= (obj) => http.post('/teacher/fee/getTrainOrg',obj)
diff --git a/src/components/lecturer/ImportWork.vue b/src/components/lecturer/ImportWork.vue
index 074f6a3b..2f211812 100644
--- a/src/components/lecturer/ImportWork.vue
+++ b/src/components/lecturer/ImportWork.vue
@@ -274,7 +274,22 @@ import {getCookieForName} from "@/api/method";
}
};
function downTemplate() {
- window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportHomeWorkTemplate?taskId=${props.id || ''}&type=${props.type || ''}&pid=${props.pid || ''}&thirdType=3`);
+ if (props.url=='/admin/export/importInTeacherRecord'){
+ window.open(
+ `${process.env.VUE_APP_BASE_API}/admin/export/importInTeacherRecord?
+ &name=${props.name||''}`
+ );}
+ else if(props.url=='/admin/export/importOutTeacherRecord'){
+ window.open(
+ `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacherRecord?
+ &name=${props.name||''}`
+ );
+ }else {
+ window.open(
+ `${process.env.VUE_APP_BASE_API}/admin/export/importTeacherExpense?
+ &name=${props.name||''}`
+ );
+ }
}
return {
diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index 7debd25a..6ade8544 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -647,7 +647,7 @@ export default {
//导出功能
const handleExport = () => {
window.open(
- `${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${state.searchParam.pageNo
+ `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacher?pageNo=${state.searchParam.pageNo
}&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}`
);
// this.download('lesson_records/export', {
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 7f25e043..ca32dcfd 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -10,7 +10,7 @@
placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
-->
+ allowClear v-model:name="searchParam.name">
-
@@ -270,7 +270,7 @@
-
+