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

# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue

src/components/student/OnlineClassModelStudent.vue

@@ -339,7 +339,7 @@ const exportStudy = async () => {
     return message.warning('暂无可导出的学习记录')
   }
   exportDisabled.value = true;
-  await downLoadXlsx(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=4&&thirdType=8&pid=${searchParams.value.pid}`,'在线课学员学习记录');
+  await downLoadXlsx(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=13&&thirdType=8&pid=${searchParams.value.pid}`,'在线课学员学习记录');
   exportDisabled.value = false;
 }
 defineExpose({

src/views/lecturer/LecturerFee.vue

@@ -371,8 +371,8 @@
             <a-col :span="12">
               <a-form-item name="score">
                 <template v-slot:label>
-                  <img style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  <!-- <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" /> -->
                   评分
                 </template>
                 <a-input-number :disabled="formParam.createFrom == 0" class="draitem" v-model:value="formParam.score"
@@ -1580,7 +1580,7 @@ export default {
       teachingDate: [{ required: true, message: '', log: '授课日期不能为空' }],
       teachingTime: [{ required: true, message: '', log: ' 授课时长不能为空' }],
       studys: [{ required: true, message: '', log: ' 参训人数不能为空' }],
-      score: [{ required: true, message: '', log: ' 评分不能为空' }],
+      // score: [{ required: true, message: '', log: ' 评分不能为空' }],
       levelPay: [{ required: true, message: '', log: '课酬基准不能为空' }],
       expense: [{ required: true, message: '', log: '计划费用不能为空' }],
       // payableExpense: [{ required: true, message: '',log:'应发费用不能为空' }],

src/views/lecturer/Organization.vue

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

src/views/lecturer/OrganizationApproval.vue

@@ -619,7 +619,9 @@ export default {
 
     onMounted(() => {
       //初始化时
-      state.searchParam.status = 2
+      state.searchParam.status = 2;
+      console.log("onMounted status 变化",state.searchParam)
+      getTableDate();
     });
 
 
@@ -756,15 +758,15 @@ export default {
     //列表数据
     const tableData = ref([]);
     //  List接口数据
-    const getTableDate = (obj) => {
+    const getTableDate = (status) => {
       console.log("执行 gx getTableDate 111111111111111111111")
       state.tableLoading = true;
       let objA = { 
-        ...state.searchParam ,
+        status: status?status:state.searchParam.status,
         //TODO GX03 
         //审批未通过意外的数据
         approvalType:1,
-        moduleType:1
+        moduleType:1,
       };
       console.log("执行 gx getTableDate objA",objA);
       queryTrainOrg(objA).then((res) => {
@@ -773,7 +775,7 @@ export default {
         state.tableLoading = false;
       });
     };
-    getTableDate();
+   
     // 搜索
     const searchSubmit = () => {
       state.searchParam.pageNo = 1;