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

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

Browse Source 
# Conflicts:
#	src/views/lecturer/Organization.vue
This commit is contained in:
joshen
2025-03-19 17:23:40 +08:00
parent 76423e95a9 01734506c7
commit 46d60937b1
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/courselibrary/CoursewareManage.vue
View File

@@ -3941,7 +3941,7 @@ function onFocusEnd(){
state.changeName = true state.changeName = true
state.xjkkinputV3 = [moment().format('YYYY-MM-DD HH:mm'),''] state.xjkkinputV3 = [moment().format('YYYY-MM-DD HH:mm'),'']
//清除缓存 //清除缓存
this.examInfo = {}; state.examInfo = {};
state.cstm_hs = true; state.cstm_hs = true;
}; };
const handleCancelStu = () => { const handleCancelStu = () => {

4
src/views/lecturer/Organization.vue
View File

@@ -51,8 +51,8 @@ export default {
console.log("organizationApprovalRef setTimeout",organizationApprovalRef) console.log("organizationApprovalRef setTimeout",organizationApprovalRef)
state.activeKey = '2'; state.activeKey = '2';
console.log("激活获取值") console.log("激活获取值")
organizationApprovalRef.value.getTableDate() organizationApprovalRef.value.getTableDate(state.activeKey)
}, 3000); }, 5000);
} }

3
src/views/lecturer/OrganizationApproval.vue
View File

@@ -762,8 +762,7 @@ export default {
console.log("执行 gx getTableDate 111111111111111111111") console.log("执行 gx getTableDate 111111111111111111111")
state.tableLoading = true; state.tableLoading = true;
let objA = { let objA = {
status, status: status?status:state.searchParam.status,
...state.searchParam ,
//TODO GX03 //TODO GX03
//审批未通过意外的数据 //审批未通过意外的数据
approvalType:1, approvalType:1,