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

# Conflicts:
#	src/views/lecturer/Organization.vue

src/views/courselibrary/CoursewareManage.vue

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

src/views/lecturer/Organization.vue

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

src/views/lecturer/OrganizationApproval.vue

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