Merge remote-tracking branch 'origin/zcwy_0712' into zcwy_0827_pingcode817

src/views/courselibrary/CoursewareManage.vue

@@ -2001,16 +2001,17 @@ const columns6 = [
     align: "center",
     ellipsis: true,
     customRender: ({ record }) => {
-      const teachers = record.offteachers;
-      return teachers.map((teacher, index) => {
-        // 如果需要显示为列表形式
-        return (
-          <div key={index}>
-            {teacher.teacherName}
-            {index !== teachers.length - 1 && ', '}
-          </div>
-        );
-      });
+      // const teachers = record.offteachers;
+      // return teachers.map((teacher, index) => {
+      //   // 如果需要显示为列表形式
+      //   return (
+      //     <div key={index}>
+      //       {teacher.teacherName}
+      //       {index !== teachers.length - 1 && ', '}
+      //     </div>
+      //   );
+      // });
+      return record.offteachers.map(item=>item.teacherName).join(',')
     }
   },
 
@@ -2277,6 +2278,7 @@ export default defineComponent({
     const durationText = computed(() => state.xjkkinputV3?.length?dayjs(state.xjkkinputV3[1]).diff(dayjs(state.xjkkinputV3[0]),'minute'):'请输入持续时间');
     
     const state = reactive({
+      tableCoursePlanLoading: false,
       permissions:null,
       createId:null,
       workInfo: {},
@@ -3581,6 +3583,7 @@ function onFocusEnd(){
     // 渲染开课操作
     const getTableDate3 = async (type) => {
       state.tableLoading = true;
+      state.tableCoursePlanLoading = true
       // let datas = state.tableData6;
       let beginTime = "";
       let endTime = "";
@@ -3635,6 +3638,7 @@ function onFocusEnd(){
         itm.pageNo = pageNo;
       });
       state.tableData6 = datas;
+      state.tableCoursePlanLoading = false
       console.log("state.tableData6", state.tableData6);
     };