Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage

src/api/Teaching.js

@@ -3,7 +3,7 @@ import {getCookieForName} from "@/api/method";
 //列表查询授课记录
 export const getNewInTeacherCourseList = (obj) => http.get('/admin/teacherRecord/list', {params: obj})
 //新增授课记录
-export const insertInTeacherCourse = (obj) => http.post('/admin/teacher/addTeacherRecord', obj)
+export const insertInTeacherCourse = (obj) => http.post('/admin/teacherRecord/addTeacherRecord', obj)
 //删除讲师授课记录
 export const deleteInTeacherCourse= (obj) => http.post(`/admin/teacherRecord/delById?id=${obj}`)
 //修改讲师授课记录

src/views/lecturer/ExternalTeaching.vue

@@ -134,7 +134,8 @@
               }" allow-clear :getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
                 v-model:value="formParam.courseTypeId" show-search
                 :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择内容分类" tree-default-expand-all
-                :tree-data="sysTypeOptions">
+                :tree-data="sysTypeOptions"
+                @change="treetype">
               </a-tree-select>
             </a-form-item>
           </a-col>
@@ -385,6 +386,9 @@ export default {
 
     //获取内容分类
     const sysTypeOptions = computed(() => store.state.content_type);
+    const treetype =(val,lab)=>{
+      state.formParam.courseTypeName =lab.toString()
+    }
     const OnTheJobStatusList = ref([
       { value: 1, label: "项目开课" },
       { value: 2, label: "路径开课" },
@@ -806,6 +810,7 @@ export default {
     return {
       ...toRefs(state),
       rules,
+      treetype,
       clearscoreNumber,
       clearstudysNumber,
       validateField,

src/views/lecturer/InsideLecturer.vue

@@ -75,11 +75,11 @@
           @expand="expandTable" :pagination="false">
           <template #bodyCell="{ record, column }">
 
-            <!-- <template v-if="column.key === 'organizationName'">
+            <!-- <template v-if="column.key === 'orgName'">
               <a-space style="display:flex ;justify-content: space-around;  ">
                 <a-popover>
                   <template #content>
-                    <p>{{ record.organizationName }}</p>
+                    <p>{{ record.orgName }}</p>
                   </template>
                   <span>{{ record.neworganizationName }}</span>
                 </a-popover>
@@ -685,10 +685,10 @@ export default {
       },
       {
         title: '所属组织 ',
-        dataIndex: 'organizationName',
-        key: 'organizationName',
+        dataIndex: 'orgName',
+        key: 'orgName',
         elipsis: true, align: "center",
-        scopedSlots: { customRender: "organizationName" },
+        scopedSlots: { customRender: "orgName" },
         width: 400,
         //  customRender: (value, record) => {
         //   return (
@@ -847,8 +847,8 @@ export default {
           console.log(tableData.value,'tableData.value')
           // let objA = res.data.data.records
           // objA.map((item) => {
-          //   if (item.organizationName !== null) {
-          //     item.neworganizationName = item.organizationName.split('/')
+          //   if (item.orgName !== null) {
+          //     item.neworganizationName = item.orgName.split('/')
           //     item.neworganizationName = item.neworganizationName[item.neworganizationName.length - 1]
           //   }
           // })

src/views/lecturer/InsideTeaching.vue

@@ -204,7 +204,9 @@
 								:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
 								placeholder="请选择内容分类" 
 								tree-default-expand-all 
-								:tree-data="sysTypeOptions">
+								:tree-data="sysTypeOptions"
+                @change="treetype"
+                >
 							</a-tree-select>
             </a-form-item>
           </a-col>
@@ -498,7 +500,7 @@ export default {
         pageNo:1,
         pageSize:1000,
       }
-      getTeacherSystemList().then((res) => {
+      getTeacherSystemList(obj).then((res) => {
         if (res.data.code === 200) {
           let arr = res.data.data.records;
           let array = [];
@@ -518,6 +520,10 @@ export default {
     //获取内容分类
     const store = useStore();
     const sysTypeOptions = computed(() => store.state.content_type);
+    const treetype =(val,lab)=>{
+      console.log(lab)
+      state.formParam.courseTypeName =lab.toString()
+    }
     const OnTheJobStatusList = ref([
       { value: 1, label: "项目开课" },
       { value: 2, label: "路径开课" },
@@ -600,17 +606,17 @@ export default {
       },
       {
         title: '讲师体系 ',
-        dataIndex: 'systemName',
-        key: 'systemName',
+        dataIndex: 'tsystemName',
+        key: 'tsystemName',
         elipsis: true, align: "center",
         width: 120,
       },
       {
         title: '所属组织 ',
-        dataIndex: 'organizationName',
-        key: 'organizationName',
+        dataIndex: 'orgName',
+        key: 'orgName',
         elipsis: true, align: "center",
-        width: 120,
+        width: 400,
         //  customRender: (value, record) => {
         //   return (
         //     <div>
@@ -666,8 +672,8 @@ export default {
       },
       {
         title: '授课时间',
-        dataIndex: 'beginTime',
-        key: 'beginTime',
+        dataIndex: 'teachingDate',
+        key: 'teachingDate',
         elipsis: true, align: "center",
         width: 120,
       },
@@ -720,14 +726,14 @@ export default {
       },
       {
         title: '是否生成课时费 ',
-        dataIndex: 'feeCreated',
-        key: 'feeCreated',
+        dataIndex: 'createdFee',
+        key: 'createdFee',
         elipsis: true, align: "center",
         width: 150,
         customRender: (value) => {
           return (
             <div>
-              {value.record.feeCreated == 0 || value.record.feeCreated == 1
+              {value.record.createdFee == 0 || value.record.createdFee == 1
                 ? {
                   "0": "否",
                   "1": "是",
@@ -1198,6 +1204,7 @@ export default {
     return {
       ...toRefs(state),
       sysTypeOptions,
+      treetype,
       validateField,
       handleformlevel,
       // managerChange,

src/views/lecturer/LookExternalLecturer.vue

@@ -138,11 +138,21 @@ export default{
     };
         //授课记录列表
         const teacherrecordsColumns = ref([
+      // {
+      //   title: '课程编号',
+      //   dataIndex: 'offcourseId',
+      //   key: 'offcourseId',
+      //   elipsis: true, align: "center",
+      //   width: 120,
+      // },
       {
         title: '课程编号',
-        dataIndex: 'offcourseId',
-        key: 'offcourseId',
-        elipsis: true, align: "center",
+        dataIndex: 'courseId',
+        key: 'courseId',
+         align: "center",
+         customRender: ({text, index})=>{
+                return index+1;
+            },    
         width: 120,
       },
       {

src/views/lecturer/LookInsideLecturer.vue

@@ -191,7 +191,10 @@ export default{
         dataIndex: 'courseId',
         key: 'courseId',
          align: "center",
-        customRender: (text,record,index) => `${index+1}`,
+         customRender: ({text, index})=>{
+                return index+1;
+            },
+            
         width: 120,
       },
       {