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

src/api/Teaching.js

@@ -3,11 +3,11 @@ import {getCookieForName} from "@/api/method";
 //列表查询授课记录
 export const getNewInTeacherCourseList = (obj) => http.get('/admin/teacherRecord/list', {params: obj})
 //新增授课记录
-export const insertInTeacherCourse = (obj) => http.post('/admin/teacherRecord/addTeacherRecord', obj)
+export const insertInTeacherCourse = (obj) => http.post('/admin/teacher/addTeacherRecord', obj)
 //删除讲师授课记录
 export const deleteInTeacherCourse= (obj) => http.post(`/admin/teacherRecord/delById?id=${obj}`)
 //修改讲师授课记录
-export const updateInTeacherCourse = (obj) => http.post('/admin/teacherRecord/editTeacher', obj)
+export const updateInTeacherCourse = (obj) => http.post('/admin/teacherRecord/editTeacherRecord', obj)
 //讲师授课记录详情
 export const getTeacherCourseList = (obj) => http.get('/admin/teacherRecord/queryById', {params: obj})
 //获取培训组织

src/views/lecturer/ExternalTeaching.vue

@@ -9,7 +9,7 @@
           <!-- <a-input v-model:value="searchParam.userNo" style="width: 276px; height: 40px; border-radius: 8px"
             placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
           </a-input> -->
-          <a-input style="width: 276px; height: 40px; border-radius: 8px" placeholder="请输入工号/讲师姓名进行检索" showSearch
+          <a-input style="width: 276px; height: 40px; border-radius: 8px" placeholder="请输入讲师姓名/手机号进行检索" showSearch
             allowClear v-model:value="searchParam.name"></a-input>
         </a-form-item>
         <a-form-item class="select">
@@ -60,7 +60,7 @@
           </a-tree-select>
         </a-form-item>
         <a-form-item class="select" v-if="moreid == 2">
-          <a-select style="width: 230px" v-model:value="searchParam.status" placeholder="开课状态"
+          <a-select style="width: 230px" v-model:value="searchParam.courseStatus" placeholder="开课状态"
             :options="AuthenticationStatusList" allowClear>
           </a-select>
         </a-form-item>
@@ -139,17 +139,17 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <!-- 课程名称：name  开课状态 status-->
+        <!-- 课程名称：name  开课状态 courseStatus-->
         <a-row :gutter="16">
           <a-col :span="12">
-            <a-form-item label="课程名称" name="coursename">
-              <a-input class="draitem" v-model:value="formParam.coursename" placeholder="请输入后搜索面授课" allowClear showSearch>
+            <a-form-item label="课程名称" name="courseName">
+              <a-input class="draitem" v-model:value="formParam.courseName" placeholder="请输入后搜索面授课" allowClear showSearch>
               </a-input>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="开课状态">
-              <a-radio-group v-model:value="formParam.status" class="draitem">
+              <a-radio-group v-model:value="formParam.courseStatus" class="draitem">
                 <a-radio :value="0">未开课</a-radio>
                 <a-radio :value="1">已开课</a-radio>
               </a-radio-group>
@@ -226,8 +226,8 @@
         <a-descriptions-item label="手机号码">{{ formParam.mobile }}</a-descriptions-item>
         <a-descriptions-item label="课程类型">{{ formParam.type == 1 ? '在线课' : formParam.type == 0 ? '面授课' : ''
         }}</a-descriptions-item>
-        <a-descriptions-item label="课程名称">{{ formParam.coursename }}</a-descriptions-item>
-        <a-descriptions-item label="开课状态">{{ formParam.status == 0 ? '未开课' : formParam.status == 1
+        <a-descriptions-item label="课程名称">{{ formParam.courseName }}</a-descriptions-item>
+        <a-descriptions-item label="开课状态">{{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1
           ? '已开课' : '' }}</a-descriptions-item>
         <a-descriptions-item label="内容分类  ">{{ formParam.courseTypeName }}</a-descriptions-item>
         <a-descriptions-item label="授课/课程日期  ">{{ formParam.teachingDate }}</a-descriptions-item>
@@ -340,7 +340,7 @@ export default {
       teachingDate: undefined, //选择时间
       tableDataTotal: -1,//table列表总条数
       formParam: {
-        status: 1,
+        courseStatus: 1,
         entryType: 1,
         teaching: null,
         teachingDate: null,
@@ -354,7 +354,7 @@ export default {
         teacherName: null,
         name: null,
         address: null,
-        status: null,
+        courseStatus: null,
         beginTime: null,
         endTime: null,
         entryType: null,
@@ -376,7 +376,7 @@ export default {
       name: [{ required: true, message: '', log: '讲师不能为空' }],
       courseTypeId: [{ required: true, message: '', log: '内容分类不能为空' }],
       courseName: [{ required: true, message: '', log: '课程名称不能为空' }],
-      status: [{ required: true, message: '', log: '讲开课状态不能为空' }],
+      courseStatus: [{ required: true, message: '', log: '讲开课状态不能为空' }],
       teaching: [{ required: true, message: '', log: '授课时长不能为空' }],
       teachingDate: [{ required: true, message: '', log: '授课日期不能为空' }],
 
@@ -442,8 +442,8 @@ export default {
       },
       {
         title: '课程名称 ',
-        dataIndex: 'name',
-        key: 'name',
+        dataIndex: 'courseName',
+        key: 'courseName',
         elipsis: true, align: "center",
         width: 120,
       },
@@ -468,8 +468,8 @@ export default {
       },
       {
         title: '授课时间 ',
-        dataIndex: 'beginTime',
-        key: 'beginTime',
+        dataIndex: 'teachingDate',
+        key: 'teachingDate',
         elipsis: true, align: "center",
         width: 120,
       },
@@ -482,18 +482,18 @@ export default {
       // },
       {
         title: '开课状态 ',
-        dataIndex: 'status',
-        key: 'status',
+        dataIndex: 'courseStatus',
+        key: 'courseStatus',
         elipsis: true, align: "center",
         width: 120,
         customRender: (value) => {
           return (
             <div>
-              {value.record.status == 0 || value.record.status == 1
+              {value.record.courseStatus == 0 || value.record.courseStatus == 1
                 ? {
                   "0": "未开课",
                   "1": "已开课",
-                }[value.record.status + ""] || ""
+                }[value.record.courseStatus + ""] || ""
                 : "-"}
             </div>
           )
@@ -589,7 +589,7 @@ export default {
           name: null,
           manager: null,
           entryType: null,
-          status: 1,
+          courseStatus: null,
           entryType: null,
           systemId: null,
           endTime: null,
@@ -720,7 +720,7 @@ export default {
     //清空数据
     const cancel = () => {
       state.formParam = {
-        status: 1,
+        courseStatus: 1,
         recordType: 2,
         teacherName: null,
         mobile: null,
@@ -741,7 +741,7 @@ export default {
       else if (state.moreid == 2) {
         state.moreid = 1
         state.searchParam.type = null
-        state.searchParam.status = null
+        state.searchParam.courseStatus = null
         state.searchParam.id = null
         state.searchParam.entryType = null
       }
@@ -794,7 +794,7 @@ export default {
         &beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}
         &endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}
         &courseTypeId=${state.searchParam.courseTypeId ? state.searchParam.courseTypeId : ""}
-        &status=${state.searchParam.status ? state.searchParam.status : ""}`
+        &courseStatus=${state.searchParam.courseStatus ? state.searchParam.courseStatus : ""}`
       );
     }
     const clearstudysNumber = () => {

src/views/lecturer/InsideLecturer.vue

@@ -1566,7 +1566,7 @@ display: flex;
 justify-content: right;
 }
 }
-.item_inp .i_upload_img[data-v-e369ffe0] {
+.item_inp .i_upload_img[data-v-6b882d01] {
   border-radius:50% 
 }
 </style >

src/views/lecturer/InsideTeaching.vue

@@ -227,8 +227,8 @@
           <a-col :span="12">
             <a-form-item label="开课状态">
               <a-radio-group v-model:value="formParam.courseStatus" class="draitem">
-                <a-radio value="1">未开课</a-radio>
-                <a-radio value="0">已开课</a-radio>
+                <a-radio :value="1">未开课</a-radio>
+                <a-radio :value="0">已开课</a-radio>
               </a-radio-group>
             </a-form-item>
           </a-col>
@@ -296,14 +296,13 @@
       <a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
         <a-descriptions-item label="讲师名称">{{ formParam.teacherName }}</a-descriptions-item>
         <a-descriptions-item label="讲师工号">{{ formParam.userNo }}</a-descriptions-item>
-        <a-descriptions-item label="讲师组织" :span="2">{{ formParam.organizationName }}</a-descriptions-item>
+        <a-descriptions-item label="讲师组织" :span="2">{{ formParam.orgName }}</a-descriptions-item>
         <a-descriptions-item label="讲师体系">{{ formParam.tsystemName }}</a-descriptions-item>
         <a-descriptions-item label="讲师级别">{{ formParam.tlevelName
  }}</a-descriptions-item>
         <a-descriptions-item label="录入方式">
           {{  formParam.createFrom == 0 ? '系统生成' : formParam.createFrom == 1 ? '手动录入' : '' }}</a-descriptions-item>
-        <a-descriptions-item label="课程类型">{{ formParam.type == 1 ? '项目开课' : formParam.type == 2 ? '路径开课' : formParam.type == 3
-          ? '面授开课' : '' }}</a-descriptions-item>
+        <a-descriptions-item label="课程类型">{{ formParam.type == 1 ? '在线课' : formParam.type == 0 ? '面授课' : '' }}</a-descriptions-item>
         <a-descriptions-item label="课程名称">{{ formParam.courseName }}</a-descriptions-item>
         <a-descriptions-item label="开课状态">{{ formParam.courseStatus == 1? '未开课' : formParam.courseStatus == 0
           ? '已开课' : '' }}</a-descriptions-item>
@@ -448,7 +447,7 @@ export default {
         levelVoList: []
       },
       formParam: {
-        courseStatus: '1',
+        courseStatus: 1,
         createFrom: 1,
         teaching: null,
         name:null,
@@ -525,8 +524,8 @@ export default {
       { value: 3, label: "面授开课" },
     ])
     const AuthenticationStatusList = ref([
-      { value: 0, label: "未开课" },
-      { value: 1, label: "已开课" },
+      { value: 1, label: "未开课" },
+      { value: 0, label: "已开课" },
     ])
     const entryTypeList = ref([
       { value: 0, label: "系统生成" },
@@ -806,7 +805,8 @@ export default {
         endTime: null,
         beginTime: null,
         studysranges: [],
-        score: null
+        score: null,
+        status:null,
       };
       getTableDate();
     };
@@ -936,7 +936,7 @@ export default {
     const cancel = () => {
       state.formParam = {
         recordType: 1,
-        courseStatus:'1',
+        courseStatus:1,
         teacher: null,
         orgName: null,
         tsystemName: null,