hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-11 03:46:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '250213-prod-master_1202-gx' into test20250220

Browse Source
This commit is contained in:
gengxin
2025-02-21 16:04:44 +08:00
parent 8b2dbceaf2 cda14423ac
commit fc9ea46973
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.env.test
View File

@@ -1,2 +1,3 @@
NODE_ENV=test NODE_ENV=test
VUE_APP_BOE_API_URL=//u-pre.boe.com VUE_APP_BOE_API_URL=//u-pre.boe.com
VUE_APP_BASE_API=/manageApi

5
src/components/lecturer/ImportWork.vue
View File

@@ -328,6 +328,7 @@ export default {
} }
}; };
function downTemplate() { function downTemplate() {
console.log("downTemplate gx")
// window.open(`${process.env.VUE_APP_BOE_API_URL}/upload/template/${props.template}`); // window.open(`${process.env.VUE_APP_BOE_API_URL}/upload/template/${props.template}`);
exportTeacherExpense({}) exportTeacherExpense({})
.then((res) => { .then((res) => {
@@ -336,10 +337,6 @@ export default {
.catch((err) => { .catch((err) => {
console.error("downTemplate err", err); console.error("downTemplate err", err);
}); });
window.open(
`${process.env.VUE_APP_BOE_API_URL}/admin/export/exportExpenseTemplate`
);
} }
return { return {

1
src/views/lecturer/InsideTeaching.vue
View File

@@ -511,6 +511,7 @@
</div> </div>
</a-modal> </a-modal>
</div> </div>
<!-- 导入01 -->
<ImportWork v-model:showWork="showWork" :template="'内部讲师授课记录导入模版-20250115.xlsx'" :url="'/admin/export/importInTeacherRecord'" :title="title"></ImportWork> <ImportWork v-model:showWork="showWork" :template="'内部讲师授课记录导入模版-20250115.xlsx'" :url="'/admin/export/importInTeacherRecord'" :title="title"></ImportWork>
<!-- <div> <Upload/> </div> --> <!-- <div> <Upload/> </div> -->
</div> </div>

1
src/views/lecturer/LecturerFee.vue
View File

@@ -545,6 +545,7 @@
</div> --> </div> -->
</div> </div>
</a-drawer> </a-drawer>
<!-- TODO dr01 -->
<ImportWork v-model:showWork="showWork" :template="'讲师费导入模版-20250115.xlsx'" <ImportWork v-model:showWork="showWork" :template="'讲师费导入模版-20250115.xlsx'"
:url="'/admin/export/importTeacherExpense'" :fileName="uploadFile" :title="title"></ImportWork> :url="'/admin/export/importTeacherExpense'" :fileName="uploadFile" :title="title"></ImportWork>
</div> </div>