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

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

src/api/Teaching.js

@@ -17,7 +17,7 @@ export const insertInTeacherCourse = (obj) => http.post('/admin/teacher/insertIn
 //修改内部讲师授课记录
 export const updateInTeacherCourse = (obj) => http.post('/admin/teacher/updateInTeacherCourse', obj)
 //删除讲师授课记录
-export const deleteInTeacherCourse= (obj) => http.post(`/admin/teacher/deleteInTeacherCourse?offcourseId=${obj}`)
+export const deleteInTeacherCourse= (obj) => http.post('/admin/teacher/deleteInTeacherCourse' ,obj)
 //外部讲师授课记录 
 export const getOuterTeacherCourseList = (obj) => http.post('/admin/teacher/getOuterTeacherCourseList', obj)
 //获取外部授课记录详情

src/views/lecturer/ExternalTeaching.vue

@@ -281,7 +281,7 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
 import ProjectManagerOutTeacher from "@/components/project/ProjectManagerOutTeacher";
 import dayjs from "dayjs";
 import { updateInTeacher, getTeacherExpertise } from "../../api/Lecturer";
-import { getOuterTeacherCourseList, getAddress, updateInTeacherCourse, deleteInTeacherCourse, insertOutTeaherCourse,getOuterTeacherCourseDetail } from "../../api/Teaching";
+import { getOuterTeacherCourseList, getAddress, updateInTeacherCourse, deleteInTeacherCourse, insertInTeacherCourse,getOuterTeacherCourseDetail } from "../../api/Teaching";
 // import {getProjSt} from "../../api/indexProjStu";
 // import AddTeacher from "../../components/drawers/project/AddTeacher"
 export default {
@@ -600,6 +600,7 @@ export default {
       state.teacherdialog = true;
       state.teacherdialogtitle = '修改授课记录'
       state.lookTeacherId = record.teacherId
+      state.formParam.teacherType='1'
       state.vf = false
       TeacherSystem()
     }
@@ -611,7 +612,7 @@ export default {
         });
       }
       else {
-        insertOutTeaherCourse(state.formParam)
+        insertInTeacherCourse(state.formParam)
           .then((res) => {
             message.success("保存成功");
           }).catch((err) => {
@@ -631,7 +632,11 @@ export default {
     //确认删除
     const closeDeleteTeacher = () => {
       //调用删除接口
-      deleteInTeacherCourse(state.delTeacherId).then((res) => {
+      let obj ={
+        offcourseId :state.delTeacherId,
+        teacherType:'1'
+      }
+      deleteInTeacherCourse(obj).then((res) => {
         if (res.data.code == 200) {
           message.success("删除成功");
           state.deleteTeacherdialog = false

src/views/lecturer/InsideLecturer.vue

@@ -177,10 +177,11 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="讲师级别" name="tlevelId">
+            <a-form-item label="讲师级别" name="tlevelId"  ><div @click="handlesel">
               <a-select class="draitem" v-model:value="formParam.tlevelId" placeholder="请选择讲师级别" allowClear
-                :disabled="getLevelList.length !== 0 ? false : true" :options="getLevelList">
+                :disabled="getLevelList.length !== 0 ? false : true" :options="getLevelList" >
               </a-select>
+            </div>
             </a-form-item>
           </a-col>
         </a-row>
@@ -1137,7 +1138,7 @@ export default {
         state.log = true
         message.warning( '讲师不能为空')
       }
-      if (state.formParam.newdepartId==null){
+      if (state.formParam.departId==null){
         state.log = true
         message.warning( '组织不能为空')
       }
@@ -1197,6 +1198,12 @@ export default {
     // const customPreview =(e)=>{
     //   e.stopPropagation()
     // }
+    const handlesel=()=>{
+      console.log( '请下选择讲师体系')
+      if (state.formParam.tsystemId == undefimed) {
+        message.warning( '请下选择讲师体系')
+      }
+    }
     //导出功能
     const handleExport = () => {
       window.open (
@@ -1217,6 +1224,7 @@ export default {
       ...toRefs(state),
       rules,
       rule,
+      handlesel,
       // customPreview,
       clearNonNumber,
       // managerChange,

src/views/lecturer/LookInsideLecturer.vue

@@ -32,7 +32,12 @@
     <!-- 二层 -->
     <a-descriptions-item label="讲师级别">{{formParam.tlevelName
  }}</a-descriptions-item>
-    <a-descriptions-item label="认证状态">{{ formParam.certStatus==0?'未认证' :formParam.certStatus==1 ?'已认证':''}}</a-descriptions-item>
+    <a-descriptions-item label="认证状态">{{ formParam.certStatus==0?'未认证' :formParam.certStatus==1 ?'已认证':''}} 
+      <span>
+                  <a-button type="text" class="moreidbtn" v-if="formParam.certStatus == 1"
+                    @click="handleup">查看认证资料</a-button>
+                </span>
+    </a-descriptions-item>
     <a-descriptions-item label="授课时长"> <span v-if="formParam.defaultTeachingTime!= null" >{{ (formParam.defaultTeachingTime /60 ).toFixed(2)}}小时</span>
            </a-descriptions-item>
     <a-descriptions-item label="发薪地  ">{{formParam.payrollPlaceName}}</a-descriptions-item>
@@ -353,7 +358,7 @@ export default{
     const goback = ()=>{
       router.back()
     }
-    // const store = useStore();
+    const store = useStore();
     //  // 内容分类
     //  const sysTypeOptions = computed(() => {return store.state.content_type;});
     //     //内容分类
@@ -364,11 +369,16 @@ export default{
     // }
     // getSysTypeMap()
 
-    // getpromotionrecordstableData()
+const handleup = ()=>{
+  window.open (
+        `${process.env.VUE_APP_BASE_API}/teacherUpload/teacherDownload?teacherId= ${state.id}`
+      );
+}
         return{
             ...toRefs(state),
             router,
             goback,
+            handleup,
             // getSysTypeMap,
             // sysTypeOptions,
             TeacherSystem,
@@ -444,4 +454,9 @@ export default{
           font-size: 14px;
         }
       }
+      .moreidbtn {
+  border: none;
+  color: #4ea6ff;
+  width: 80px
+}
 </style>