外部授课静态页细节修改

src/api/Teaching.js

@@ -8,19 +8,19 @@ export const getTeacherCourseList = (obj) => http.post(`/admin/teacher/getTeache
 export const getexport = (obj) => http.post('/lesson_records/export', obj)
 //授课记录导入
 export const importTeacherCourseRecord = (obj) => http.post('/importTeacherCourseRecord', obj)
-//外部讲师授课记录 
-export const getOuterTeacherCourseList = (obj) => http.post('/admin/teacher/getOuterTeacherCourseList', obj)
 //获取所属组织
 export const getOrganization = (obj) => http.post('/admin/teacher/getOrganization', obj)
 //获取开课场地
 export const getAddress = (obj) => http.post('/admin/teacher/getAddress', obj)
-//获取外部授课记录详情
-export const getOuterTeacherCourseDetail = (obj) => http.post(`/admin/teacher/getOuterTeacherCourseDetail?id=${obj}`)
-//删除讲师授课记录
-export const deleteInTeacherCourse= (obj) => http.post(`/admin/teacher/deleteInTeacherCourse?offcourseId=${obj}`)
 //新增内部授课记录
 export const insertInTeacherCourse = (obj) => http.post('/admin/teacher/insertInTeacherCourse', obj)
 //修改内部讲师授课记录
 export const updateInTeacherCourse = (obj) => http.post('/admin/teacher/updateInTeacherCourse', obj)
+//删除讲师授课记录
+export const deleteInTeacherCourse= (obj) => http.post(`/admin/teacher/deleteInTeacherCourse?offcourseId=${obj}`)
+//外部讲师授课记录 
+export const getOuterTeacherCourseList = (obj) => http.post('/admin/teacher/getOuterTeacherCourseList', obj)
+//获取外部授课记录详情
+export const getOuterTeacherCourseDetail = (obj) => http.post(`/admin/teacher/getOuterTeacherCourseDetail?id=${obj}`)
 //新增外部授课记录
 export const insertOutTeaherCourse = (obj) => http.post('/admin/teacher/insertOutTeaherCourse', obj)

src/views/lecturer/ExternalLecturer.vue

@@ -629,13 +629,13 @@ export default {
     const getteacherrecordstableData = () => {
       state.teacherrecordsLoading = true
       state.loading = true;
-      // let ids={id:  state.lookTeacherId  ,pageNo: "1", pageSize: "10" }
-      let ids =
-      {
-        id: "965341999643234304",
-        pageNo: "1",
-        pageSize: "10"
-      }
+      let ids={id:  state.lookTeacherId  ,pageNo: "1", pageSize: "10" }
+      // let ids =
+      // {
+      //   id: "965341999643234304",
+      //   pageNo: "1",
+      //   pageSize: "10"
+      // }
       // api接口
       getOuterTeacherCourseList(ids).then((res) => {
         teacherrecordstableData.value = res.data.data

src/views/lecturer/ExternalTeaching.vue

@@ -87,11 +87,13 @@
     </div>
     <!-- 弹窗组件 -->
     <a-modal :visible="teacherdialog" :title="teacherdialogtitle" @ok="closeModal2" :footer="null" :closable="false"
-      wrapClassName="doublepro" width="834px" height="476px">
+      wrapClassName="doublepro" width="900px" height="476px">
       <div style="cursor: pointer; margin-right: 32px;float: right; margin-top: -40px;" @click="cancelTeacherDialog">
         <img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
       </div>
       <div style="padding-bottom: 15px;">
+        
+        <!-- 边框 -->
         <div style="border: 1px rgb(177, 177, 177) solid; margin-left: 33px; margin-right: 33px; margin-bottom: 33px;">
           <div class="ExternalTeaching">
             <div class="filter">
@@ -151,7 +153,7 @@
                   </div>
                   <span style="display:inline-block ;width:115px ;text-align:center ">课程类型 :</span>
                   <a-select style="width: 200px" v-if="teacherdialog1 == 0" v-model:value="formParam.type"
-                    showSearch :option="OnTheJobStatusList" placeholder="课程类型 ">
+                    showSearch :options="OnTheJobStatusList" placeholder="课程类型 ">
                   </a-select>
                   <span v-if="teacherdialog1 == 1" class=display1>{{formParam.type==1 ?'项目开课':formParam.type==2?'路径开课' :formParam.type==3 ? '面授开课':''}}</span>
                 </div>
@@ -172,8 +174,8 @@
                     <img style="width: 5px; height: 5px" src="../../assets/images/basicinfo/asterisk.png" />
                   </div>
                   <span style="display:inline-block ;width:115px ;text-align:center ">内容分类 :</span>
-                  <a-select style="width: 200px" v-if="teacherdialog1 == 0" v-model:value="formParam.tsystemName"
-                    showSearch :option="getTeacherExpertiseList" placeholder=" ">
+                  <a-select style="width: 200px" v-if="teacherdialog1 == 0" v-model:value="formParam.defaultTeachingTime"
+                    showSearch :options="getTeacherExpertiseList" placeholder="">
                   </a-select>
                   <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.defaultTeachingTime }}</span>
                 </div>
@@ -246,7 +248,7 @@ import { reactive, toRefs, ref } from "vue";
 import { useRouter } from "vue-router";
 import { message } from "ant-design-vue";
 import { updateInTeacher, getTeacherExpertise } from "../../api/Lecturer";
-import { getOuterTeacherCourseList, getAddress,getOuterTeacherCourseDetail ,deleteInTeacherCourse,insertOutTeaherCourse} from "../../api/Teaching";
+import { getOuterTeacherCourseList, getAddress,updateInTeacherCourse ,deleteInTeacherCourse,insertOutTeaherCourse} from "../../api/Teaching";
 // import {getProjSt} from "../../api/indexProjStu";
 // import AddTeacher from "../../components/drawers/project/AddTeacher"
 export default {
@@ -287,7 +289,7 @@ export default {
       getAddress().then((res) => {
         if (res.data.code === 200) {
           let arr = res.data.data;
-          let array = AddressList.value;
+          let array =[];
           arr.map((value) => {
             let obj = {
               value: value.id,
@@ -487,7 +489,7 @@ export default {
       state.teacherdialog = true;
       state.teacherdialogtitle = '添加授课记录'
       getTeacherExpertiseLista()
-      AddressLista()
+      // AddressLista()
 
     }
     //修改讲师信息弹窗
@@ -540,7 +542,7 @@ export default {
       getTeacherExpertise().then((res) => {
         if (res.data.code === 200) {
           let arr = res.data.data;
-          let array = getTeacherExpertiseList.value;
+          let array = [];
           arr.map((value) => {
             let obj = {
               value: value.id,
@@ -594,12 +596,13 @@ export default {
         teacher:record.teacher,
         mobile:record.mobile,
         name:record.name,
-        beginTime:record.beginTime || '2024-06-11',
+        // beginTime:record.beginTime ,
         type:record.type,
         duration:record.duration,
         defaultTeachingTime:record.defaultTeachingTime,
         score:record.score,
-        remark:record.remark
+        remark:record.remark,
+        userNo:record.userNo
       }
       // getOuterTeacherCourseDetail(state.lookTeacherId).then((res) => {
       //   state.formParam = res.data.data
@@ -650,6 +653,7 @@ export default {
   };
 </script>
 <style lang="scss">
+
 //导出按钮icon
 .daochu {
   width: 16px;

src/views/lecturer/InsideLecturer.vue

@@ -136,7 +136,6 @@
                 src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
-                <!--  v-model:value="searchParam.name" -->
                 <span style="display:inline-block ;width:80px ;text-align:center ">讲师姓名 :</span>
                 <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.name" style="width:200px; height: 40px; "
                   placeholder="请输入讲师姓名" allowClear showSearch>
@@ -459,7 +458,7 @@ export default {
       getTeacherSystemList().then((res)=>{
         if (res.data.code === 200) {
             let arr = res.data.data;
-            let array = LecturerSystemList.value;
+            let array = [];
             arr.map((value) => {
               let obj = {
                 value: value.id,
@@ -510,7 +509,7 @@ export default {
       getTeacherPayRollPriceList().then((res)=>{
         if (res.data.code === 200) {
             let arr = res.data.data;
-            let array = PlaceOfPayList.value;
+            let array = [];
             arr.map((value) => {
               let obj = {
                 value: value.payrollPlaceId,
@@ -542,7 +541,7 @@ export default {
       getTeacherExpertise().then((res)=>{
         if (res.data.code === 200) {
             let arr = res.data.data;
-            let array = TeacherExpertiseList.value;
+            let array = [];
             arr.map((value) => {
               let obj = {
                 value: value.id,
@@ -553,8 +552,8 @@ export default {
             TeacherExpertiseList.value = array;
           }
       }) 
-      // getTeacherExpertiseByPida()
     }
+    getTeacherExpertisea()
     const changeSelect=(val)=>{
       state.byPid= val
       getTeacherExpertiseByPida(val)
@@ -570,7 +569,7 @@ export default {
       getTeacherExpertiseByPid (state.byPid).then((res)=>{
         if (res.data.code === 200) {
             let arr = res.data.data;
-            let array = getTeacherExpertiseByPidList.value;
+            let array = [];
             arr.map((value) => {
               let obj = {
                 value: value.id,
@@ -833,9 +832,9 @@ export default {
       state.teacherdialog1 = 0
       state.teacherdialog = true;
       state.teacherdialogtitle = '新增讲师'
-      LecturerSystemLista()
-      getLevelLista()
-      getTeacherExpertisea()
+      // LecturerSystemLista()
+      // getLevelLista()
+      // getTeacherExpertisea()
       // getinfoteacher()
       
     }

src/views/lecturer/InsideTeaching.vue

@@ -217,7 +217,7 @@
                    v-model:value="formParam.name"
             :options="LecturerSystemList">
             </a-select>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.defaultTeachingTime }}</span>
+                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.name }}</span>
               </div>
               <!-- 培训发生组织 -->
               <div class="select">
@@ -260,7 +260,7 @@
               />
             </div>
                 <!--  v-model:value="searchParam.name" -->
-                <span style="display:inline-block ;width:115px ;text-align:center ">授课/课程开发时 :</span>
+                <span style="display:inline-block ;width:115px ;text-align:center ">授课/课程开发时长:</span>
                 <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.duration" style="width:200px; height: 40px; "
                   placeholder="小时 " allowClear showSearch>
                 </a-input>
@@ -300,9 +300,9 @@
             </div>
                 <span style="display:inline-block ;width:115px ;text-align:center ">内容分类 :</span>
                 <a-select style="width: 200px" v-if="teacherdialog1 == 0" v-model:value="formParam.tsystemName"
-                showSearch  :option="getTeacherExpertiseList" placeholder=" " >
+                showSearch  :options="getTeacherExpertiseList" placeholder=" " >
                    </a-select> 
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.defaultTeachingTime }}</span>
+                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.tsystemName }}</span>
               </div>
               <!-- 授课类型 -->
               <div class="select">
@@ -314,9 +314,9 @@
             </div>
                 <span style="display:inline-block ;width:115px ;text-align:center ">授课类型 :</span>
                 <a-select style="width: 200px" v-if="teacherdialog1 == 0" v-model:value="formParam.type"
-                showSearch  :option="OnTheJobStatusList" placeholder="选择授课记录 " >
+                showSearch  :options="OnTheJobStatusList" placeholder="选择授课记录 " >
                    </a-select> 
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.type }}</span>
+                   <span v-if="teacherdialog1 == 1" class=display1>{{formParam.type==1 ?'项目开课':formParam.type==2?'路径开课' :formParam.type==3 ? '面授开课':''}}</span>
               </div>
               <!-- 备注 -->
               <div style="width: 834px;height: 1px;"></div>
@@ -324,7 +324,7 @@
                 <a-input type="textarea"  v-if="teacherdialog1 == 0" v-model:value="formParam.remark"
                   style="width:550px; height: 115px; ">
                 </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.userNo }}</span>
+                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.remark }}</span>
               <div class="del_btnbox"  v-if="teacherdialog1 == 0">
                 <a-button class="del_btn btn1" @click="cancelTeacherDialog" style="margin-right: 32px;">取消</a-button>
                 <a-button class="del_btn btn2" @click="createTeacherDialog" :loading="buttonLoading">保存
@@ -420,7 +420,7 @@ export default {
       getOrganization().then((res)=>{
         if (res.data.code === 200) {
             let arr = res.data.data;
-            let array = getOrganizationList.value;
+            let array =[];
             arr.map((value) => {
               let obj = {
                 value: value.departId,
@@ -442,7 +442,7 @@ export default {
       getTeacherSystemList().then((res)=>{
         if (res.data.code === 200) {
             let arr = res.data.data;
-            let array = LecturerSystemList.value;
+            let array = [];
             arr.map((value) => {
               let obj = {
                 value: value.id,
@@ -464,7 +464,7 @@ export default {
       getTeacherExpertise().then((res)=>{
         if (res.data.code === 200) {
             let arr = res.data.data;
-            let array = getTeacherExpertiseList.value;
+            let array =[];
             arr.map((value) => {
               let obj = {
                 value: value.id,
@@ -668,27 +668,7 @@ export default {
       }) 
     };
     getTableDate()
-    // // List接口数据
-    // const getTableDate = ()=>{
-    //   state.tableloading = true ;
-    //   api 
-    // // api 接口命名
-    //   getNewInTeacherCourseList({
-    //     ...state.searchParam
-    //   })
-    //   .then((res)=>{
-    //   console.log(res.data.rows)
-    //     // state.tableDataTotal = Number(res.data.data.total);
-    //     //   state.tableLoading = false;
-    //     //   const tableData = res.data.rows;
-    //     // //  initDataSublist("", data);
-    //     //   console.log(data);
-    //     //   tableData.value = data;
-    //     //   console.log("tableData", tableData);
-    //   })
-    // }
-    // 获取项目列表信息
-    //let tableData = ref([]);
+   
     //   // 翻页
     const changePagination = (page,pageSize) => {
       state.searchParam.pageNo = page;
@@ -712,7 +692,7 @@ export default {
       state.teacherdialog1 = 0
       state.teacherdialog = true;
       state.teacherdialogtitle = '修改信息'
-      TeacherSystem()
+      TeacherSystem(record)
     }
     //保存
     const createTeacherDialog =()=>{
@@ -798,20 +778,35 @@ export default {
       state.userNoid= record.userNo
       state.lookTeacherId= record.teacherId
       // // alert(record.grade)
-       TeacherSystem()
+       TeacherSystem(record)
       // let id = record.userNo
       // router.push({ path: '/insideteachingdetail', query: { id  } })
       // router.push({ path: '/InsideTeachingDetail' })
     }
     //内部讲师详情
-    const TeacherSystem=()=>{
-      getTeacherCourseList( state.lookTeacherId).then((res) => {
-          console.log("内部讲师详情", res.data);
-          state.formParam= res.data.data
-      }) 
-      .catch((err) => {
-          console.log("内部讲师详情", err);
-        });
+    const TeacherSystem=(record)=>{
+      // getTeacherCourseList( state.lookTeacherId).then((res) => {
+      //     console.log("内部讲师详情", res.data);
+      //     state.formParam= res.data.data
+      // }) 
+      // .catch((err) => {
+      //     console.log("内部讲师详情", err);
+      //   });
+      state.formParam={
+        teacher:record.teacher,
+        userNo:record.userNo,
+        departId:record.departId,
+        defaultTeachingTime:record.defaultTeachingTime,
+        tlevelName:record.tlevelName,
+        name:record.name,
+        // beginTime:record.beginTime,
+        duration:record.duration,
+        studys:record.studys,
+        score:record.score,
+        type:record.type,
+        remark:record.remark,
+        userNo:record.userNo
+      }
     }
     //导出功能
     const handleExport = ()=> {