授课记录接口联调

src/api/Lecturer.js

@@ -36,7 +36,7 @@ export const exportteacher = (obj) => http.post('/admin/lesson_records/export' ,
 // 所有教师专长
 export const getTeacherExpertise = (obj) => http.post('/admin/teacher/getTeacherExpertise' ,obj)
 //根据父级教师专长(pid)查找子级教师专长
-export const getTeacherExpertiseByPid = (obj) => http.post('/admin/teacher/getTeacherExpertiseByPid' ,obj)
+export const getTeacherExpertiseByPid = (obj) => http.post(`/admin/teacher/deleteInTeacher?id=${obj}`)
 // 新增页面内部姓名
 export const infoteacher = (obj) => http.get('/admin/thirdApi/org/info' ,{params: obj})
 //外部讲师列表

src/api/Teaching.js

@@ -2,7 +2,8 @@ import http from "./config";
 //列表查询内部讲师授课记录
 export const getNewInTeacherCourseList = (obj) => http.post('/admin/teacher/getNewInTeacherCourseList', obj)
 //内部讲师授课记录详情
-export const getTeacherCourseList = (obj) => http.post('/admin/teacher/getTeacherCourseList', obj)
+export const getTeacherCourseList = (obj) => http.post(`/admin/teacher/getTeacherCourseList?=${obj}`)
+// export const getTeacherCourseList = (obj) => http.post('/admin/teacher/getTeacherCourseList', obj)
 //授课记录导出
 export const getexport = (obj) => http.post('/lesson_records/export', obj)
 //授课记录导入
@@ -11,3 +12,11 @@ export const importTeacherCourseRecord = (obj) => http.post('/importTeacherCours
 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)

src/views/lecturer/ExternalLecturer.vue

@@ -50,8 +50,10 @@
               <a-space style="display:flex ;justify-content: space-around;  ">
                 <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
                 <a-button type="link" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
-                <a-button v-if="record.status== '1'" type="link" @click="() => handleOperate(record, String(record.courseform))">停用</a-button>
+                <a-button v-if="record.status == '1'" type="link"
-                <a-button v-if="record.status== '2'" type="link" @click="() => handleOperate(record, String(record.courseform))">启用</a-button>
+                  @click="() => handleOperate(record, String(record.courseform))">停用</a-button>
+                <a-button v-if="record.status == '2'" type="link"
+                  @click="() => handleOperate(record, String(record.courseform))">启用</a-button>
                 <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
               </a-space>
             </template>
@@ -62,26 +64,15 @@
     </div>
     <div class="tableBox ">
       <div style="float: right;">
-        <a-pagination
+        <a-pagination v-if="tableDataTotal > 10" :showSizeChanger="true" :hideOnSinglePage="true" :pageSize="pageSize"
-            v-if="tableDataTotal > 10"
+          v-model:current="searchParam.pageNo" :total="tableDataTotal" class="pagination" @change="changePagination" />
-            :showSizeChanger="true"
-            :hideOnSinglePage="true"
-            :pageSize="pageSize"
-            v-model:current="searchParam.pageNo"
-            :total="tableDataTotal"
-            class="pagination"
-            @change="changePagination"
-          />
       </div>
     </div>
     <!-- 弹窗组件 -->
     <a-modal :visible="teacherdialog" :title="teacherdialogtitle" @ok="closeModal2" :footer="null" :closable="false"
       wrapClassName="doublepro" width="774px" height="476px">
       <div style="cursor: pointer; margin-right: 32px;float: right; margin-top: -40px;" @click="cancelTeacherDialog">
-            <img
+        <img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
-            />
       </div>
       <div style="padding-bottom: 15px;">
         <div class="headerLeft" style="margin-left: 33px">
@@ -89,7 +80,8 @@
           <a-button @click="teacherrecords" v-if="teacherdialog1 == 1">授课记录</a-button>
         </div>
         <!-- 个人详情 -->
-        <div style="border: 1px rgb(177, 177, 177) solid; margin-left: 33px; margin-right: 33px; margin-bottom: 33px;" v-show="tagsshow==1">
+        <div style="border: 1px rgb(177, 177, 177) solid; margin-left: 33px; margin-right: 33px; margin-bottom: 33px;"
+          v-show="tagsshow == 1">
           <div class="ExternalLecturer">
             <div class="filter">
               <div class="filterItems">
@@ -99,10 +91,7 @@
           </div> -->
                 <div class="select">
                   <div style="display:inline-block ;width:5px ;text-align:center ">
-              <img
+                    <img style="width: 5px; height: 5px" src="../../assets/images/basicinfo/asterisk.png" />
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
                   </div>
                   <!--  v-model:value="searchParam.name" -->
                   <span style="display:inline-block ;width:80px ;text-align:center ">讲师姓名 :</span>
@@ -113,27 +102,21 @@
                 </div>
                 <div class="select">
                   <div style="display:inline-block ;width:5px ;text-align:center ">
-              <img
+                    <img style="width: 5px; height: 5px" src="../../assets/images/basicinfo/asterisk.png" />
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
                   </div>
                   <span style="display:inline-block ;width:80px ;text-align:center ">手机号码 :</span>
-                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.mobile"
+                  <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.mobile" style="width:200px; height: 40px; "
-                  style="width:200px; height: 40px; " placeholder="请输入11位手机号码" allowClear showSearch>
+                    placeholder="请输入11位手机号码" allowClear showSearch>
                   </a-input>
                   <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.mobile }}</span>
                 </div>
                 <div class="select">
                   <div style="display:inline-block ;width:5px ;text-align:center ">
-              <img
+                    <img style="width: 5px; height: 5px" src="../../assets/images/basicinfo/asterisk.png" />
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
                   </div>
                   <span style="display:inline-block ;width:80px ;text-align:center ">邮箱:</span>
-                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.email"
+                  <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.email" style="width:200px; height: 40px;"
-                  style="width:200px; height: 40px;" placeholder="" allowClear showSearch>
+                    placeholder="" allowClear showSearch>
                   </a-input>
                   <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.email }}</span>
                 </div>
@@ -144,7 +127,8 @@
                   </div>
                   <Editor v-if="teacherdialog1 == 0" v-model="formParam.description"
                     style="width: 500px ;display:inline-block ; margin-top:-50px ;margin-left:80px " />
-                <span v-if="teacherdialog1 == 1" style="display: block; width: 500px;">{{ formParam.description }}</span>
+                  <span v-if="teacherdialog1 == 1" style="display: block; width: 500px;">{{ formParam.description
+                  }}</span>
                 </div>
                 <div class="select">
                   <span style="display:inline-block ;width:80px ;text-align:center ">备注 :</span>
@@ -165,23 +149,16 @@
         <!-- 授课记录 -->
         <div class="ExternalLecturer" v-show="tagsshow == 2" style="margin">
           <div style="padding: 33px">
-        <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="teacherrecordsColumns"
+            <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe"
-        
+              :columns="teacherrecordsColumns" :data-source="teacherrecordstableData" :loading="teacherrecordsLoading"
-          :data-source="teacherrecordstableData" :loading="teacherrecordsLoading" @expand="expandTable" :pagination="false">
+              @expand="expandTable" :pagination="false">
               <template #bodyCell="{ record, column }">
               </template>
             </a-table>
           </div>
-      <a-pagination
+          <a-pagination v-if="teacherrecordstableDataTotal > 10" :showSizeChanger="true" :hideOnSinglePage="true"
-            v-if="teacherrecordstableDataTotal > 10"
+            :pageSize="pageSize" v-model:current="searchParam.pageNo" :total="teacherrecordstableDataTotal"
-            :showSizeChanger="true"
+            class="pagination" @change="teacherchangePagination" />
-            :hideOnSinglePage="true"
-            :pageSize="pageSize"
-            v-model:current="searchParam.pageNo"
-            :total="teacherrecordstableDataTotal"
-            class="pagination"
-            @change="teacherchangePagination"
-          />
         </div>
       </div>
     </a-modal>
@@ -203,8 +180,7 @@
               <div class="del_btn btn2" @click="cancelTeacherDialog" style="margin-right: 32px">
                 <div class="btnText">取消</div>
               </div>
-              <div class="del_btn btn2" 
+              <div class="del_btn btn2" @click="closeDeleteTeacher">
-              @click="closeDeleteTeacher">
                 <div class="btnText">确定</div>
               </div>
             </div>
@@ -214,8 +190,7 @@
     </div>
     <!-- 修改状态功能弹窗 -->
     <div>
-      <a-modal v-model:visible="editTeacher" :footer="null" :closable="close" wrapClassName="canclestu1"
+      <a-modal v-model:visible="editTeacher" :footer="null" :closable="close" wrapClassName="canclestu1" centered="true">
-        centered="true">
         <div class="delete">
           <div class="del_header"></div>
           <div class="del_main">
@@ -377,7 +352,8 @@ export default {
         pageNo: 1,
         pageSize: 10,
         name: null,
-        status:null};
+        status: null
+      };
       getTableDate();
     };
     //  List接口数据
@@ -443,32 +419,19 @@ export default {
     //保存
     const createTeacherDialog = () => {
       console.log(state.formParam);
-      // if (state.formParam.id != undefined) {
+      if (state.formParam.id != undefined) {
         updateOutTeacher(state.formParam).then(response => {
           message.success("修改成功");
         });
-                    // }
+      }
-      // let objA = {...state.formParam};
+      else {
-      // state.formParam ={
+        insertTeacher(state.formParam)
-      //   name:'新增测试',
+          .then((res) => {
-      //   userNo:'12315',
+            message.success("保存成功");
-      //   departId:'8465784657',
+          }).catch((err) => {
-      //   defaultTeachingTime:50,
+            console.log(err);
-      //   leveId:1,
+          });
-      //   tsystemName:249,
+      }
-      //   certStatus:1,
-      //   description:'测试13.00',
-      //   workExperience:'测试13.00',
-      //   courses:'测试13.00',
-      // }
-      // else {
-      //   insertTeacherOutSide(state.formParam)
-      //   .then((res) => {
-      //     message.success("保存成功");
-      // }).catch((err) => {
-      //     console.log(err);
-      //   });
-      //  }
       state.teacherdialog = false;
       getTableDate();
     };
@@ -518,8 +481,7 @@ export default {
     }
     //取消按钮 清空输入的数据
     const cancelTeacherDialog = () => {
-      if(state.teacherdialog = true )
+      if (state.teacherdialog = true) {
-      {
         state.teacherdialog = false
         cancel()
       }
@@ -669,9 +631,11 @@ export default {
       state.loading = true;
       // let ids={id:  state.lookTeacherId  ,pageNo: "1", pageSize: "10" }
       let ids =
-    {id:  "965341999643234304",
+      {
+        id: "965341999643234304",
         pageNo: "1",
-        pageSize: "10"}
+        pageSize: "10"
+      }
       // api接口
       getOuterTeacherCourseList(ids).then((res) => {
         teacherrecordstableData.value = res.data.data
@@ -684,8 +648,7 @@ export default {
     //导出功能
     const handleExport = () => {
       window.open(
-        `${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${
+        `${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${state.currentPage1
-          state.currentPage1
         }&pageSize=${state.pageSize1}&name=${state.searchParam.name ? state.searchParam.name : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}`
       );
       //   this.download('lesson_records/export', {

src/views/lecturer/ExternalTeaching.vue

@@ -5,52 +5,33 @@
     <div class="filter">
       <div class="filterItems">
         <div class="select">
-          <a-input v-model:value="searchParam.userNo " style="width: 230px; height: 40px; border-radius: 8px"
+          <a-input v-model:value="searchParam.teacher" style="width: 230px; height: 40px; border-radius: 8px"
-            placeholder="请输入讲师姓名/工号" allowClear showSearch>
+            placeholder="请输入姓名检索" allowClear showSearch>
-          </a-input>
-             
-          <!-- <a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.userNo"
-            :options="infoteacherList">
-          </a-select> -->
-        </div>
-        <div class="select">
-          <a-input v-model:value="searchParam.teacherNo " style="width: 230px; height: 40px; border-radius: 8px"
-            placeholder="请输入姓名/课程编号" allowClear showSearch>
           </a-input>
         </div>
         <div class="select">
-          <a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.tsystemName"
+          <a-input v-model:value="searchParam.name" style="width: 230px; height: 40px; border-radius: 8px"
-            :options="LecturerSystemList">
+            placeholder="请输入课程名称" allowClear showSearch>
+          </a-input>
+        </div>
+        <div class="select">
+          <a-select style="width: 230px" placeholder="开课场地" v-model:value="searchParam.address" :options="AddressList">
           </a-select>
         </div>
         <div class="select">
-          <a-select style="width: 230px" placeholder="请选择讲师体系" v-model:value="searchParam.tsystemName"
+          <a-select style="width: 230px" v-model:value="searchParam.tlevelName" placeholder="内容分类"
-            :options="LecturerSystemList">
+            :options="getTeacherExpertiseList">
+          </a-select>
+        </div>
+        <div class="select">
+          <a-select style="width: 230px" v-model:value="searchParam.status" placeholder="开课状态"
+            :options="AuthenticationStatusList">
           </a-select>
         </div>
         <div class="select addTimeBox">
           <div class="addTime">课程日期：</div>
-          <a-date-picker
+          <a-date-picker v-model:value="searchParam.beginTime" style="width: 230px" format="YYYY-MM-DD" separator="至"
-            v-model:value="searchParam.valueDate"
+            placeholder="请选择课程日期" />
-            style="width: 230px"
-            format="YYYY-MM-DD"
-            separator="至"
-            placeholder="请选择课程日期"
-          />
-        </div>
-        <div class="select">
-          <a-select style="width: 230px" v-model:value="searchParam.tlevelName" placeholder="内容分类" :options="getLevelList">
-          </a-select>
-        </div>
-        <div class="select">
-          <a-select style="width: 230px" v-model:value="searchParam.waitStatus" placeholder="课程分类"
-            :options="OnTheJobStatusList">
-          </a-select>
-        </div>
-        <div class="select">
-          <a-select style="width: 230px" v-model:value="searchParam.certStatus" placeholder="开课状态"
-            :options="AuthenticationStatusList">
-          </a-select>
         </div>
         <div style="display: flex; margin-bottom: 20px">
           <div class="btnn btn1" @click="searchSubmit">
@@ -68,7 +49,7 @@
           <div class="btnText">添加授课记录</div>
         </div>
         <div class="btn btn3" @click="addTeacher" style="margin-left: 20px ;">
-          <div class="btnText">一键生成讲师费</div>
+          <div class="btnText">一键同步</div>
         </div>
       </div>
       <div class="btns">
@@ -100,26 +81,15 @@
     </div>
     <div class="tableBox ">
       <div style="float: right;">
-        <a-pagination
+        <a-pagination v-if="tableDataTotal > 10" :showSizeChanger="true" :hideOnSinglePage="true" :pageSize="pageSize"
-            v-if="tableDataTotal > 10"
+          v-model:current="searchParam.pageNo" :total="tableDataTotal" class="pagination" @change="changePagination" />
-            :showSizeChanger="true"
-            :hideOnSinglePage="true"
-            :pageSize="pageSize"
-            v-model:current="searchParam.pageNo"
-            :total="tableDataTotal"
-            class="pagination"
-            @change="changePagination"
-          />
       </div>
     </div>
     <!-- 弹窗组件 -->
     <a-modal :visible="teacherdialog" :title="teacherdialogtitle" @ok="closeModal2" :footer="null" :closable="false"
       wrapClassName="doublepro" width="834px" height="476px">
       <div style="cursor: pointer; margin-right: 32px;float: right; margin-top: -40px;" @click="cancelTeacherDialog">
-            <img
+        <img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
-              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;">
@@ -133,195 +103,103 @@
                 <!-- 讲师姓名 -->
                 <div class="select">
                   <div style="display:inline-block ;width:5px ;text-align:center ">
-              <img
+                    <img style="width: 5px; height: 5px" src="../../assets/images/basicinfo/asterisk.png" />
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
                   </div>
                   <!--  v-model:value="searchParam.name" -->
                   <span style="display:inline-block ;width:115px ;text-align:center ">讲师姓名 :</span>
-                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.name" style="width:200px; height: 40px; "
+                  <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.teacher" style="width:200px; height: 40px; "
                     placeholder="请输入讲师姓名" allowClear showSearch>
                   </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.name }}</span>
+                  <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.teacher }}</span>
                 </div>
-              <!-- 讲师工号 -->
+                <!-- 手机号码 -->
                 <div class="select">
                   <div style="display:inline-block ;width:5px ;text-align:center ">
-              <img
+                    <img style="width: 5px; height: 5px" src="../../assets/images/basicinfo/asterisk.png" />
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
                   </div>
-                <span style="display:inline-block ;width:125px ;text-align:center ">讲师工号 :</span>
+                  <span style="display:inline-block ;width:125px ;text-align:center ">手机号码 :</span>
-                <a-input v-if="teacherdialog1 == 0" disabled v-model:value="formParam.userNo"
+                  <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.mobile" style="width:200px; height: 40px; "
-                  style="width:200px; height: 40px; " placeholder="自动带出讲师工号" allowClear showSearch>
+                    placeholder="请输入11位手机号码" allowClear showSearch>
                   </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.userNo }}</span>
+                  <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.mobile }}</span>
-              </div>
-              <!-- 讲师组织 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <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-input disabled v-if="teacherdialog1 == 0" v-model:value="formParam.departId"
-                  style="width:200px; height: 40px;" placeholder="自动带出讲师组织" allowClear showSearch>
-                </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.departId }}</span>
-              </div>
-              <!-- 讲师体系 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <img
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-                <span style="display:inline-block ;width:125px ;text-align:center ">讲师体系 :</span>
-                <a-input disabled v-if="teacherdialog1 == 0" v-model:value="formParam.departId"
-                  style="width:200px; height: 40px;" placeholder="自动带出讲师体系" allowClear showSearch>
-                </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.departId }}</span>
-              </div>
-              <!-- 讲师级别 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <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-input v-if="teacherdialog1 == 0" disabled v-model:value="formParam.userNo"
-                  style="width:200px; height: 40px; " placeholder="自动带出讲级别" allowClear showSearch>
-                </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.userNo }}</span>
                 </div>
                 <!-- 课程名称 -->
                 <div class="select">
                   <div style="display:inline-block ;width:5px ;text-align:center ">
-              <img
+                    <img style="width: 5px; height: 5px" src="../../assets/images/basicinfo/asterisk.png" />
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
                   </div>
-                <span style="display:inline-block ;width:125px ;text-align:center ">课程名称 :</span>
+                  <span style="display:inline-block ;width:115px ;text-align:center ">课程名称 :</span>
-                   <a-select style="width: 200px" placeholder="填写或选择授课记录" 
+                  <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.name" style="width:200px; height: 40px;"
-                   showSearch
+                    placeholder="自动带出讲师组织" allowClear showSearch>
-                   v-model:value="formParam.tsystemName"
-            :options="LecturerSystemList">
-            </a-select>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.defaultTeachingTime }}</span>
-              </div>
-              <!-- 培训发生组织 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <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-input disabled v-if="teacherdialog1 == 0" v-model:value="formParam.departId"
-                  style="width:200px; height: 40px;" placeholder="自动带出培训发生组织" allowClear showSearch>
                   </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.departId }}</span>
+                  <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.name }}</span>
                 </div>
                 <!-- 授课日期 -->
                 <div class="select addTimeBox">
                   <div style="display:inline-block ;width:5px ;text-align:center ">
-              <img
+                    <img style="width: 5px; height: 5px" src="../../assets/images/basicinfo/asterisk.png" />
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
                   </div>
                   <span style="display:inline-block ;width:125px ;text-align:center ">授课日期 :</span>
-          <a-date-picker
+                  <a-date-picker v-if="teacherdialog1 == 0" v-model:value="formParam.beginTime" style="width: 200px"
-          v-if="teacherdialog1 == 0"
+                    format="YYYY-MM-DD" placeholder="年/月/日" />
-            v-model:value="formParam.valueDate"
-            style="width: 200px"
-            format="YYYY-MM-DD"
-            placeholder="请选择课程日期"
-          />
                   <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.valueDate }}</span>
                 </div>
-        <!-- 授课/课程开发时长  -->
+                <!-- 课程类型 -->
                 <div class="select">
                   <div style="display:inline-block ;width:5px ;text-align:center ">
-              <img
+                    <img style="width: 5px; height: 5px" src="../../assets/images/basicinfo/asterisk.png" />
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
                   </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-select style="width: 200px" v-if="teacherdialog1 == 0" v-model:value="formParam.type"
-                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.name" style="width:200px; height: 40px; "
+                    showSearch :option="OnTheJobStatusList" placeholder="课程类型 ">
-                  placeholder="小时 " allowClear showSearch>
+                  </a-select>
+                  <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.type }}</span>
+                </div>
+                <!-- 授课时长 -->
+                <div class="select">
+                  <div style="display:inline-block ;width:5px ;text-align:center ">
+                    <img style="width: 5px; height: 5px" src="../../assets/images/basicinfo/asterisk.png" />
+                  </div>
+                  <span style="display:inline-block ;width:125px ;text-align:center ">授课时长 :</span>
+                  <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.duration"
+                    style="width:200px; height: 40px;" placeholder=" 2小时" allowClear showSearch>
                   </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.name }}</span>
+                  <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.duration }}</span>
+                </div>
+                <!-- 内容分类 -->
+                <div class="select">
+                  <div style="display:inline-block ;width:5px ;text-align:center ">
+                    <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>
+                  <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.defaultTeachingTime }}</span>
+                </div>
+                <!-- 评分 -->
+                <div class="select">
+                  <!--  v-model:value="searchParam.name" -->
+                  <span style="display:inline-block ;width:125px ;text-align:center ">评分 :</span>
+                  <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.score" style="width:200px; height: 40px; "
+                    placeholder="" allowClear showSearch>
+                  </a-input>
+                  <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.score }}</span>
                 </div>
                 <!-- 参训人数 -->
                 <div class="select">
                   <!--  v-model:value="searchParam.name" -->
                   <span style="display:inline-block ;width:125px ;text-align:center ">参训人数 :</span>
-                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.name" style="width:200px; height: 40px; "
+                  <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.studys" style="width:200px; height: 40px; "
                     placeholder="0 " allowClear showSearch>
                   </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.name }}</span>
+                  <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.studys }}</span>
-              </div>
-              <!-- 评分 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <img
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-                <!--  v-model:value="searchParam.name" -->
-                <span style="display:inline-block ;width:115px ;text-align:center ">评分 :</span>
-                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.name" style="width:200px; height: 40px; "
-                  placeholder="" allowClear showSearch>
-                </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.name }}</span>
-              </div>
-              <!-- 内容分类 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <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="LecturerSystemList" placeholder=" " >
-                   </a-select> 
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.defaultTeachingTime }}</span>
-              </div>
-              <!-- 授课类型 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <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="LecturerSystemList" placeholder="选择授课记录 " >
-                   </a-select> 
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.defaultTeachingTime }}</span>
                 </div>
                 <!-- 备注 -->
                 <div style="width: 834px;height: 1px;"></div>
                 <span style="display:inline-block ;width:115px ;text-align:center ">备注 :</span>
-                <a-input type="textarea"  v-if="teacherdialog1 == 0" v-model:value="formParam.remark"
+                <Editor v-if="teacherdialog1 == 0" v-model="formParam.remark"
-                  style="width:550px; height: 115px; ">
+                  style="width: 500px ;display:inline-block ; margin-top:-50px ;margin-left:80px " />
-                </a-input>
                 <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.userNo }}</span>
                 <div class="del_btnbox" v-if="teacherdialog1 == 0">
                   <a-button class="del_btn btn1" @click="cancelTeacherDialog" style="margin-right: 32px;">取消</a-button>
@@ -353,8 +231,7 @@
               <div class="del_btn btn2" @click="cancelTeacherDialog" style="margin-right: 32px">
                 <div class="btnText">取消</div>
               </div>
-              <div class="del_btn btn2" 
+              <div class="del_btn btn2" @click="closeDeleteTeacher">
-              @click="closeDeleteTeacher">
                 <div class="btnText">确定</div>
               </div>
             </div>
@@ -368,18 +245,15 @@
 <script lang="jsx">
 import { reactive, toRefs, ref } from "vue";
 import { useRouter } from "vue-router";
-import Editor from "@/components/project/Editor";
+import { message } from "ant-design-vue";
-import Upload from "@/components/project/Upload";
+import { insertTeacher, deleteInTeacherCourse, updateInTeacher, getTeacherExpertise } from "../../api/Lecturer";
-import {getTeacherSystemList ,infoteacher, getTeacherPayRollPriceList, getLevel,insertTeacher,deleteTeacher,updateInTeacher,getTeacherById, updateTeacherState,getTeacherCourseList , getTeacherExpertise,getTeacherExpertiseByPid  } from "../../api/Lecturer";
+import { getOuterTeacherCourseList, getAddress,getOuterTeacherCourseDetail } from "../../api/Teaching";
-import { getNewInTeacherCourseList} from "../../api/Teaching";
 // import {getProjSt} from "../../api/indexProjStu";
 // import AddTeacher from "../../components/drawers/project/AddTeacher"
 export default {
   name: "ExternalTeaching",
   components: {
-    // AddTeacher,
+
-    Editor,
-    Upload
   },
   setup() {
     const router = useRouter();
@@ -398,24 +272,23 @@ export default {
       formParam: {
       },
       searchParam: {
-        userNo:null,//工号姓名
+        pageNo: 1,
-        teacherNo:null,//课程编号
+        pageSize: 10,
-        tsystemName:null,//讲师体系
+        teacher: null,
-        payrollPlaceName:null,//发薪地
+        name: null,
-        pageNo: "1",
+        address: null,
-        pageSize: "10"
+        status: null,
+        beginTime: null,
       },
     })
-    const LecturerSystemList = ref([
+    const AddressList = ref([
-    //   { value: 0, systemName: "讲师体系" },
     ]);
-    //获取讲师体系列表
+    //获取开课场地
-    const LecturerSystemLista =() => {
+    const AddressLista = () => {
-      // console.log('点击了LecturerSystemLista')
+      getAddress().then((res) => {
-      getTeacherSystemList().then((res)=>{
         if (res.data.code === 200) {
           let arr = res.data.data;
-            let array = LecturerSystemList.value;
+          let array = AddressList.value;
           arr.map((value) => {
             let obj = {
               value: value.id,
@@ -423,36 +296,16 @@ export default {
             };
             array.push(obj);
           });
-            LecturerSystemList.value = array;
+          AddressList.value = array;
         }
-        console.log("获取讲师",LecturerSystemList);
+        console.log("获取讲师", AddressList);
       })
     }
-    LecturerSystemLista()
+    AddressLista()
-    //获取内部讲师级别
-    const getLevelList = ref([
-      // { value: 0, label: "未定级" },
-    ])
-    const getLevelLista =() => {
-      getLevel().then((res)=>{
-        if (res.data.code === 200) {
-            let arr = res.data.data;
-            let array = getLevelList.value;
-            arr.map((value) => {
-              let obj = {
-                value: value.id,
-                label: value.name,
-              };
-              array.push(obj);
-            });
-            getLevelList.value = array;
-          }
-      }) 
-    }
-    getLevelLista()
     const OnTheJobStatusList = ref([
-      { value: 0, label: "分类1" },
+      { value: 1, label: "项目开课" },
-      { value: 1, label: "分类2" },
+      { value: 2, label: "路径开课" },
+      { value: 3, label: "面授开课" },
     ])
     const AuthenticationStatusList = ref([
       { value: 0, label: "未开课" },
@@ -468,58 +321,44 @@ export default {
         width: 120,
       },
       {
-        title: '讲师姓名 ',
+        title: '授课讲师 ',
         dataIndex: 'name',
         key: 'name',
         elipsis: true,
         width: 120,
       },
       {
-        title: '讲师工号 ',
+        title: '手机号码 ',
-        dataIndex: 'userNo',
+        dataIndex: 'mobile',
-        key: 'userNo',
+        key: 'mobile',
-        elipsis: true,
-        width: 120,
-      },
-      {
-        title: '所属组织 ', 
-        dataIndex: 'departId',
-        key: 'departId',
-        elipsis: true,
-        width: 400,
-        //  customRender: (value, record) => {
-        //   return (
-        //     <div>
-        //       {value.record.orgName}
-        //     </div>
-        //   )
-        // }
-      },
-      {
-        title: '讲师体系 ',
-        dataIndex: 'tsystemName',
-        key: 'tsystemName',
         elipsis: true,
         width: 120,
       },
       {
         title: '课程名称 ',
-        dataIndex: 'tlevelName',
+        dataIndex: 'name',
-        key: 'tlevelName',
+        key: 'name',
         elipsis: true,
         width: 120,
       },
       {
         title: '授课/课程日期 ',
-        dataIndex: 'payrollPlaceName',
+        dataIndex: 'beginTime',
-        key: 'payrollPlaceName',
+        key: 'beginTime',
+        elipsis: true,
+        width: 120,
+      },
+      {
+        title: '开课场地 ',
+        dataIndex: 'address',
+        key: 'address',
         elipsis: true,
         width: 120,
       },
       {
         title: '授课时长(H) ',
-        dataIndex: 'teaching',
+        dataIndex: 'duration',
-        key: 'teaching',
+        key: 'duration',
         elipsis: true,
         width: 120,
       },
@@ -532,18 +371,19 @@ export default {
       },
       {
         title: '课程类型 ',
-        dataIndex: 'waitStatus',
+        dataIndex: 'type',
-        key: 'waitStatus',
+        key: 'type',
         elipsis: true,
         width: 120,
         customRender: (value) => {
           return (
             <div>
-              {value.record.waitStatus == "0" || value.record.waitStatus == "1"
+              {value.record.type == "1" || value.record.type == "2" || value.record.type == "3"
                 ? {
-                  "0": "在线课",
+                  "1": "项目开课",
-                  "1": "面授课",
+                  "2": "路径开课",
-                }[value.record.waitStatus + ""] || ""
+                  "3": "面授开课",
+                }[value.record.type + ""] || ""
                 : "-"}
             </div>
           )
@@ -551,32 +391,32 @@ export default {
       },
       {
         title: '参训学员人数',
-        dataIndex: 'teaching',
+        dataIndex: 'studys',
-        key: 'teaching',
+        key: 'studys',
         elipsis: true,
         width: 120,
       },
       {
         title: '评分',
-        dataIndex: 'teaching',
+        dataIndex: 'score',
-        key: 'teaching',
+        key: 'score',
         elipsis: true,
         width: 120,
       },
       {
         title: '开课状态 ',
-        dataIndex: 'certStatus',
+        dataIndex: 'status',
-        key: 'certStatus',
+        key: 'status',
         elipsis: true,
         width: 120,
         customRender: (value) => {
           return (
             <div>
-              {value.record.certStatus == 0 || value.record.certStatus == 1
+              {value.record.status == 0 || value.record.status == 1
                 ? {
                   "0": "未开课",
                   "1": "已开课",
-                }[value.record.certStatus + ""] || ""
+                }[value.record.status + ""] || ""
                 : "-"}
             </div>
           )
@@ -613,16 +453,24 @@ export default {
     };
     //重置
     const searchReset = () => {
-      state.searchParam = { pageNo: 1, pageSize: 10 };
+      state.searchParam = {
+        pageNo: 1,
+        pageSize: 10,
+        teacher: null,
+        name: null,
+        address: null,
+        status: null,
+        beginTime: null,
+      };
       // getTableDate();
     };
     //  List接口数据
     const getTableDate = (obj) => {
       state.tableLoading = true
       let objA = { ...state.searchParam };
-      getNewInTeacherCourseList(objA)
+      getOuterTeacherCourseList(objA)
         .then((res) => {
-          tableData.value = res.data.data.records
+          tableData.value = res.data.data
           state.tableDataTotal = Number(res.data.data.total);
           state.tableLoading = false
           console.log("获取tableData", tableData);
@@ -634,7 +482,7 @@ export default {
     //   state.tableloading = true ;
     //   api 
     // // api 接口命名
-    //   getNewInTeacherCourseList({
+    //   getOuterTeacherCourseList({
     //     ...state.searchParam
     //   })
     //   .then((res)=>{
@@ -660,10 +508,8 @@ export default {
       state.teacherdialog1 = 0
       state.teacherdialog = true;
       state.teacherdialogtitle = '添加授课记录'
-      //获取内部讲师级别
+      getTeacherExpertiseLista()
-      LecturerSystemLista()
+      AddressLista()
-      getLevelLista()
-      getTeacherExpertisea()
 
     }
     //修改讲师信息弹窗
@@ -701,29 +547,44 @@ export default {
     //删除弹窗
     const deleteModal = (record) => {
       state.deleteTeacherdialog = true
-      state.delTeacherId = record.id 
+      state.delTeacherId = record.offcourseId
     };
 
     //确认删除
     const closeDeleteTeacher = () => {
-      let ids ={
-      id : state.delTeacherId
-      }
-      console.log(ids)
       //调用删除接口
-      deleteTeacher(ids).then((res)=>{
+      deleteInTeacherCourse(state.delTeacherId).then((res) => {
         if (res.data.code == 200) {
-          // message.success("删除成功");
+          message.success("删除成功");
           state.deleteTeacherdialog = false
           getTableDate();
         }
       })
     }
-    
+    //获取内容分类
+    const getTeacherExpertiseList = ref([
+      // { value: 0, label: "未定级" },
+    ])
+    const getTeacherExpertiseLista = () => {
+      getTeacherExpertise().then((res) => {
+        if (res.data.code === 200) {
+          let arr = res.data.data;
+          let array = getTeacherExpertiseList.value;
+          arr.map((value) => {
+            let obj = {
+              value: value.id,
+              label: value.name,
+            };
+            array.push(obj);
+          });
+          getTeacherExpertiseList.value = array;
+        }
+      })
+    }
+    getTeacherExpertiseLista()
     //取消按钮 清空输入的数据
     const cancelTeacherDialog = () => {
-      if(state.teacherdialog = true )
+      if (state.teacherdialog = true) {
-      {
         state.teacherdialog = false
         cancel()
       }
@@ -733,69 +594,58 @@ export default {
     //清空数据
     const cancel = () => {
       state.formParam = {
+        teacher: null,
+        mobile: null,
         name: null,
-        userNo:null,
+        type: null,
-        departId:null,
+        duration: null,
-        defaultTeachingTime:null,
+        score: null,
-        tlevelName:null,
+        remark: null,
-        tsystemName:null,
-        certStatus:1,
-        teacherIntrofuce:null,
-        workHistory:null,
-        proficientInCourse:null,
       }
 
     }
-     //页面内部姓名
-     const infoteacherList = ref([
-    ]);
-    const  getinfoteacher = (obj) => {
-      state.tableLoading=true 
-      infoteacher()
-        .then((res) => {
-          infoteacherList.value = res.data.data.records
-      }) 
-    };
 
     //表格内查看数据操作
     const handleLook = (record) => {
-      // state.teacherdialog1 = 1
+      state.teacherdialog1 = 1
-      // state.teacherdialog = true;
+      state.teacherdialog = true;
-      // state.teacherdialogtitle = '查看详情'
+      state.teacherdialogtitle = '查看详情'
-      // state.userNoid= record.userNo
+      state.userNoid = record.userNo
-      // state.lookTeacherId= record.id
+      state.lookTeacherId = record.
-      // // alert(record.grade)
+      // alert(record.grade)
-      // // TeacherSystem()
+      TeacherSystem()
-      let id = record.userNo
+      // let id = record.userNo
       // router.push({ path: '/lecturer/ExternalTeachingDetail/', query: { id  } })
-      router.push({ path: '/ExternalTeachingDetail' })
+      // router.push({ path: '/ExternalTeachingDetail' })
     }
-    //内部讲师详情
+    //外部授课详情
     const TeacherSystem = () => {
-      let ids={userNo :  state.userNoid }
+      getOuterTeacherCourseDetail(state.lookTeacherId).then((res) => {
-      getTeacherById(ids).then((res) => {
-          console.log("内部讲师详情", res.data);
         state.formParam = res.data.data
       })
         .catch((err) => {
-          console.log("内部讲师详情", err);
         });
     }
     //导出功能
-    // const handleExport = ()=>{
+        const handleExport = () => {
-    //   this.download('lesson_records/export', {
+      window.open(
-    //             ...state.searchParam
+        `${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${state.currentPage1
-    //         }, `project_${new Date().getTime()}.xlsx` )
+        }&pageSize=${state.pageSize1}
-    //     }
+        &teacher=${state.searchParam.teacher ? state.searchParam.teacher : ""
+        }&name=${state.searchParam.name ? state.searchParam.name : ""}
+        &address=${state.searchParam.address ? state.searchParam.address : ""
+        }&status=${state.searchParam.status ? state.searchParam.status : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.certbeginTimeStatus : ""
+        }`
+      );
+        }
       return {
         ...toRefs(state),
-      infoteacherList,
+        getTeacherExpertiseList,
-      getinfoteacher,
+        getTeacherExpertiseLista,
-      // handleExport,
+
-      LecturerSystemList,
+        handleExport,
-      getLevelList,
+        AddressList,
         OnTheJobStatusList,
-      getLevelLista,
         AuthenticationStatusList,
         searchSubmit,
         searchReset,
@@ -812,7 +662,7 @@ export default {
         createTeacherDialog,
         getTableDate, //list接口数据调用
         // getStu
-      LecturerSystemLista,
+        AddressLista,
         TeacherSystem,
       }
     },
@@ -825,12 +675,14 @@ export default {
   height: 18px;
   background-image: url("../../assets/images/coursewareManage/export1.png");
 }
+
 //导入按钮icon
 .daoru {
   width: 16px;
   height: 18px;
   background-image: url("../../assets/images/coursewareManage/daoru.png");
 }
+
 //弹窗内详情样式
 .display1 {
   display: inline-block;

src/views/lecturer/InsideLecturer.vue

@@ -197,7 +197,7 @@
                   <a-radio :value="0">未认证</a-radio>
                   <a-radio :value="1">已认证</a-radio>
                 </a-radio-group>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.certStatus }}</span>
+                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.certStatus==0 ? '未认证':formParam.certStatus==1?'已认证' :'' }}</span>
               </div>
               <div class="select">
                 <div  style="display:inline-block ;width:5px ;text-align:center ">
@@ -254,10 +254,10 @@
               <div class="select">
                 <span style="display:inline-block ;width:80px ;text-align:center ">教师专长 :</span>
           <a-select  v-if="teacherdialog1 == 0"  style="width: 230px" placeholder="" v-model:value="formParam.TeacherExpertise"
-            :options="TeacherExpertiseList.map(pro => ({value:pro }))">
+            :options="TeacherExpertiseList" @change=changeSelect >
           </a-select>
           <a-select  v-if="teacherdialog1 == 0" style="width: 230px" placeholder="" v-model:value="formParam.getTeacherExpertiseByPid"
-            :options="getTeacherExpertiseByPidList.map(pid=>({value:pid})) ">
+            :options="getTeacherExpertiseByPidList">
           </a-select>
           <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.expertise }}</span>
         </div>
@@ -397,6 +397,7 @@ export default {
   },
   setup() {
     const state = reactive({
+      byPid:null,
       currentPage1: 1,
       pageSize1: 10,
       promotionrecordsLoading:false ,  //晋级记录遮罩层
@@ -535,57 +536,53 @@ export default {
 
     //获取讲师父 专长
     const TeacherExpertiseList = ref([
-      { value: 0, systemName: "讲师体系" },
-      { value: 1, systemName: "讲师体系1" },
     ]);
     const getTeacherExpertisea =() => {
-    //   // console.log('点击了LecturerSystemLista')
+      // console.log('点击了LecturerSystemLista')
-    //   getTeacherExpertise().then((res)=>{
+      getTeacherExpertise().then((res)=>{
-    //     if (res.data.code === 200) {
+        if (res.data.code === 200) {
-    //         let arr = res.data.data;
+            let arr = res.data.data;
-    //         let array = TeacherExpertiseList.value;
+            let array = TeacherExpertiseList.value;
-    //         arr.map((value) => {
+            arr.map((value) => {
-    //           let obj = {
+              let obj = {
-    //             value: value.id,
+                value: value.id,
-    //             label: value.name,
+                label: value.name,
-    //           };
+              };
-    //           array.push(obj);
+              array.push(obj);
-    //         });
+            });
-    //         TeacherExpertiseList.value = array;
+            TeacherExpertiseList.value = array;
-    //       }
+          }
-    //   }) 
+      }) 
       // getTeacherExpertiseByPida()
+    }
+    const changeSelect=(val)=>{
+      state.byPid= val
+      getTeacherExpertiseByPida(val)
+      state.formParam.expertise = getTeacherExpertiseByPidList[0]
     }
      //获取讲师子 专长
     const getTeacherExpertiseByPidList = ref([
-    [  { value: 0, systemName: "讲师体系1" },
-       { value: 1, systemName: "讲师体系" },],
-       [ [  { value: 0, systemName: "讲师1" },
-       { value: 1, systemName: "讲师" },],]
     ]);
     const getTeacherExpertiseByPida =() => {
-    // let pid = {id :29}
+    // let pid = {id :val}
-    //   // console.log('点击了LecturerSystemLista')
+      // console.log('点击了LecturerSystemLista')
-    //   getTeacherExpertiseByPid(pid).then((res)=>{
+      let id = val 
-    //     if (res.data.code === 200) {
+      getTeacherExpertiseByPid (state.byPid).then((res)=>{
-    //         let arr = res.data.data;
+        if (res.data.code === 200) {
-    //         let array = getTeacherExpertiseByPidList.value;
+            let arr = res.data.data;
-    //         arr.map((value) => {
+            let array = getTeacherExpertiseByPidList.value;
-    //           let obj = {
+            arr.map((value) => {
-    //             value: value.id,
+              let obj = {
-    //             label: value.name,
+                value: value.id,
-    //           };
+                label: value.name,
-    //           array.push(obj);
+              };
-    //         });
+              array.push(obj);
-    //         getTeacherExpertiseByPidList.value = array;
+            });
-    //       }
+            getTeacherExpertiseByPidList.value = array;
-    //   }) 
+          }
+      }) 
     }
     watch(
-    ()=>state.formParam.TeacherExpertise,
-    val => {
-        state.formParam.getTeacherExpertiseByPid = state.getTeacherExpertiseByPidList[val][0];
-      },
     )
        //新增页面内部姓名
        const infoteacherList = ref([
@@ -757,7 +754,14 @@ export default {
       // getLevelLista()
       // LecturerSystemLista()
       // PlaceOfPayLista()
-      getTableDate();
+      // getTableDate();
+      // let obj ={
+      //   id:0
+      //   name :'修改测试'
+      // }
+      // updatelnTeacher().then((res)=>{
+      //   message.success('修改成功')
+      // })
     };
     //重置
     const searchReset = () => {
@@ -1188,6 +1192,7 @@ export default {
         }
     return {
       ...toRefs(state),
+      changeSelect,
       handleExport,
       LecturerSystemList,
       getLevelList,

src/views/lecturer/InsideTeaching.vue

@@ -140,10 +140,10 @@
             </div>
                 <!--  v-model:value="searchParam.name" -->
                 <span style="display:inline-block ;width:115px ;text-align:center ">讲师姓名 :</span>
-                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.name" style="width:200px; height: 40px; "
+                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.teacher" style="width:200px; height: 40px; "
                   placeholder="请输入讲师姓名" allowClear showSearch>
                 </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.name }}</span>
+                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.teacher }}</span>
               </div>
               <!-- 讲师工号 -->
               <div class="select">
@@ -210,9 +210,11 @@
               />
             </div>
                 <span style="display:inline-block ;width:125px ;text-align:center ">课程名称 :</span>
-                   <a-select style="width: 200px" placeholder="填写或选择授课记录" 
+                   <a-select style="width: 200px" 
+                   v-if="teacherdialog1 == 0" 
+                   placeholder="填写或选择授课记录" 
                    showSearch
-                   v-model:value="formParam.tsystemName"
+                   v-model:value="formParam.name"
             :options="LecturerSystemList">
             </a-select>
                 <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.defaultTeachingTime }}</span>
@@ -259,19 +261,19 @@
             </div>
                 <!--  v-model:value="searchParam.name" -->
                 <span style="display:inline-block ;width:115px ;text-align:center ">授课/课程开发时 :</span>
-                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.name" style="width:200px; height: 40px; "
+                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.duration" style="width:200px; height: 40px; "
                   placeholder="小时 " allowClear showSearch>
                 </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.name }}</span>
+                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.duration }}</span>
               </div>
               <!-- 参训人数 -->
               <div class="select">
                 <!--  v-model:value="searchParam.name" -->
                 <span style="display:inline-block ;width:125px ;text-align:center ">参训人数 :</span>
-                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.name" style="width:200px; height: 40px; "
+                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.studys" style="width:200px; height: 40px; "
                   placeholder="0 " allowClear showSearch>
                 </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.name }}</span>
+                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.studys }}</span>
               </div>
               <!-- 评分 -->
               <div class="select">
@@ -283,10 +285,10 @@
             </div>
                 <!--  v-model:value="searchParam.name" -->
                 <span style="display:inline-block ;width:115px ;text-align:center ">评分 :</span>
-                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.name" style="width:200px; height: 40px; "
+                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.score" style="width:200px; height: 40px; "
                   placeholder="" allowClear showSearch>
                 </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.name }}</span>
+                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.score }}</span>
               </div>
               <!-- 内容分类 -->
               <div class="select">
@@ -298,7 +300,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.tsystemName"
-                showSearch  :option="LecturerSystemList" placeholder=" " >
+                showSearch  :option="getTeacherExpertiseList" placeholder=" " >
                    </a-select> 
                 <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.defaultTeachingTime }}</span>
               </div>
@@ -311,10 +313,10 @@
               />
             </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"
+                <a-select style="width: 200px" v-if="teacherdialog1 == 0" v-model:value="formParam.type"
-                showSearch  :option="LecturerSystemList" placeholder="选择授课记录 " >
+                showSearch  :option="OnTheJobStatusList" placeholder="选择授课记录 " >
                    </a-select> 
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.defaultTeachingTime }}</span>
+                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.type }}</span>
               </div>
               <!-- 备注 -->
               <div style="width: 834px;height: 1px;"></div>
@@ -370,8 +372,9 @@ import { reactive, toRefs, ref } from "vue";
 import { useRouter } from "vue-router";
 import Editor from "@/components/project/Editor";
 import Upload from "@/components/project/Upload";
-import {getTeacherSystemList ,infoteacher, getTeacherExpertise,insertTeacher,deleteTeacher,updateInTeacher,getTeacherById, } from "../../api/Lecturer";
+import { message } from "ant-design-vue";
-import {getNewInTeacherCourseList,getOrganization} from "../../api/Teaching";
+import {getTeacherSystemList ,infoteacher, getTeacherExpertise,insertInTeacherCourse,deleteInTeacherCourse,updateInTeacher, } from "../../api/Lecturer";
+import {getNewInTeacherCourseList,getOrganization,getTeacherCourseList} from "../../api/Teaching";
 // import AddTeacher from "../../components/drawers/project/AddTeacher"
 export default { 
   name: "InsideTeaching",
@@ -383,6 +386,8 @@ export default {
   setup() {
     const router = useRouter();
     const state = reactive({
+      currentPage1: 1,
+      pageSize1: 10,
       tableLoading:false,
       delTeacherId:null, //删除id确认
       userNoid:null,    //详情工号确认 
@@ -506,8 +511,8 @@ export default {
       },
       {
         title: '所属组织 ', 
-        dataIndex: 'departId',
+        dataIndex: 'orgName',
-        key: 'departId',
+        key: 'orgName',
         elipsis: true,
         width: 400,
         //  customRender: (value, record) => {
@@ -589,18 +594,18 @@ export default {
       },
       {
         title: '开课状态 ',
-        dataIndex: 'certStatus',
+        dataIndex: 'status',
-        key: 'certStatus',
+        key: 'status',
         elipsis: true,
         width: 120,
         customRender: (value) => {
           return (
             <div>
-              {value.record.certStatus == 0 || value.record.certStatus == 1
+              {value.record.status == 0 || value.record.status == 1
                 ? {
                   "0": "未开课",
                   "1": "已开课",
-                }[value.record.certStatus + ""] || ""
+                }[value.record.status + ""] || ""
                 : "-"}
             </div>
           )
@@ -685,8 +690,10 @@ export default {
     // 获取项目列表信息
     //let tableData = ref([]);
     //   // 翻页
-    const changePagination = (page) => {
+    const changePagination = (page,pageSize) => {
       state.searchParam.pageNo = page;
+      state.currentPage1 = page;
+      state.pageSize1 = pageSize;
       getTableDate();
     };
     // 新增讲师
@@ -700,7 +707,7 @@ export default {
       getTeacherExpertisea()
       
     }
-    //修改讲师信息弹窗
+    //修改信息弹窗
     const handleModify = (record) => {
       state.teacherdialog1 = 0
       state.teacherdialog = true;
@@ -709,45 +716,35 @@ export default {
     }
     //保存
     const createTeacherDialog =()=>{
-      //调用新增修改接口
+      if (state.formParam.userNo != undefined) {
-      // this.$refs["formParam"].validate(valid => {
+                      updateInTeacher (state.formParam).then(response => {
-      //           if (valid) {
+                            message.success("修改成功");
-        let objform = {...state.formParam}
+                        });
-      //               if (state.formParam.userNo != undefined) {
+                    }
-      //                 updateInTeacher (objform).then(response => {
+      else {
-      //                       state.$modal.msgSuccess("修改成功");
+      insertInTeacherCourse(state.formParam)
-      //                       state.teacherdialog = false;
+        .then((res) => {
-      //                       state.getlist()
+          message.success("保存成功");
-      //                   });
+      }).catch((err) => {
-      //               }
+          console.log(err);
-      //             else {
+        });
-                      // insertTeacher(objform).then(response => {
+       }
-                      //   console.log('1')
+       getTableDate();
-                            // state.$modal.msgSuccess("新增成功");
-                            // state.teacherdialog = false;
-                            // getTableDate()
-                        // })
-      //               }
-      //           }
-      //       })
       state.teacherdialog = false
     }
     //删除弹窗
     const deleteModal = (record) => {
       state.deleteTeacherdialog = true
-      state.delTeacherId = record.id 
+      state.delTeacherId = record.offcourseId
+ 
     };
     
     //确认删除
     const closeDeleteTeacher=()=>{
-      let ids ={
-      id : state.delTeacherId
-      }
-      console.log(ids)
       //调用删除接口
-      deleteTeacher(ids).then((res)=>{
+      deleteInTeacherCourse(state.delTeacherId).then((res)=>{
         if(res.data.code == 200 ){
-          // message.success("删除成功");
+          message.success("删除成功");
           state.deleteTeacherdialog = false
           getTableDate();
         }
@@ -767,16 +764,18 @@ export default {
     //清空数据
     const cancel = () => {
       state.formParam ={
-        name:null,
+        teacher:null,
         userNo:null,
         departId:null,
         defaultTeachingTime:null,
         tlevelName:null,
-        tsystemName:null,
+        name:null,
-        certStatus:1,
+        beginTime:null,
-        teacherIntrofuce:null,
+        duration:null,
-        workHistory:null,
+        studys:null,
-        proficientInCourse:null,
+        score:null,
+        type:null,
+        remark:null,
       }
      
     }
@@ -793,21 +792,20 @@ export default {
 
     //表格内查看数据操作
     const handleLook = (record) => {
-      // state.teacherdialog1 = 1
+      state.teacherdialog1 = 1
-      // state.teacherdialog = true;
+      state.teacherdialog = true;
-      // state.teacherdialogtitle = '查看详情'
+      state.teacherdialogtitle = '查看详情'
-      // state.userNoid= record.userNo
+      state.userNoid= record.userNo
-      // state.lookTeacherId= record.id
+      state.lookTeacherId= record.teacherId
       // // alert(record.grade)
-      // // TeacherSystem()
+       TeacherSystem()
-      let id = record.userNo
+      // let id = record.userNo
-      router.push({ path: '/insideteachingdetail', query: { id  } })
+      // router.push({ path: '/insideteachingdetail', query: { id  } })
       // router.push({ path: '/InsideTeachingDetail' })
     }
     //内部讲师详情
     const TeacherSystem=()=>{
-      let ids={userNo :  state.userNoid }
+      getTeacherCourseList( state.lookTeacherId).then((res) => {
-      getTeacherById(ids).then((res) => {
           console.log("内部讲师详情", res.data);
           state.formParam= res.data.data
       }) 
@@ -816,16 +814,24 @@ export default {
         });
     }
     //导出功能
-    // const handleExport = ()=>{
+    const handleExport = ()=> {
-    //   this.download('lesson_records/export', {
+      window.open(
-    //             ...state.searchParam
+        `${process.env.VUE_APP_BASE_API}/lesson_records/export?pageNo=${ state.currentPage1
-    //         }, `project_${new Date().getTime()}.xlsx` )
+        }&pageSize=${state.pageSize1}
-    //     }
+        &userNo=${state.searchParam.userNo ? state.searchParam.userNo : "" }
+        &teacherNo=${ state.searchParam.teacherNo ?  state.searchParam.teacherNo : ""}
+        &departId=${state.searchParam.departId ? state.searchParam.departId : ""}
+        &systemId=${ state.searchParam.systemId ?  state.searchParam.systemId : ""}
+        &beginTime=${  state.searchParam.beginTime ? state.searchParam.beginTime : ""  }
+        &tlevelName=${state.searchParam.tlevelName ?  state.searchParam.tlevelName : ""}
+        &type=${state.searchParam.type ?  state.searchParam.type : ""}
+        &status=${state.searchParam.status ?  state.searchParam.status : ""}`)
+        }
     return {
       ...toRefs(state),
       infoteacherList,
       getinfoteacher,
-      // handleExport,
+      handleExport,
       LecturerSystemList,
       getTeacherExpertiseList,
       OnTheJobStatusList,

src/views/lecturer/InsideTeachingDetail.vue

@@ -1,6 +1,7 @@
 <!-- 内部授课详情页面 -->
 <template>
     <div class="InsideTeachingDetail">
+      <p>ID: {{ $route.query.id }}</p> 
       <div style="width:100px ; color:black ;margin: 10px ;" @click="handleBack">
          返回上一层
       </div>
@@ -135,10 +136,10 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref } from "vue";
+import { reactive, toRefs, ref ,watch,route  } from "vue";
 import { useRouter } from "vue-router";
-import Editor from "@/components/project/Editor";
+// import Editor from "@/components/project/Editor";
-import Upload from "@/components/project/Upload";
+// import Upload from "@/components/project/Upload";
 import {infoteacher,getLevel,deleteTeacher, } from "../../api/Lecturer";
 import { getNewInTeacherCourseList} from "../../api/Teaching";
 // import {getProjSt} from "../../api/indexProjStu";
@@ -146,13 +147,11 @@ import { getNewInTeacherCourseList} from "../../api/Teaching";
 export default { 
   name: "InsideTeachingDetail",
   components: {
-    // AddTeacher,
-    Editor,
-    Upload
   },
   setup() {
     const router = useRouter();
     const state = reactive({
+      id:null, //路径id
       tableLoading:false,
       delTeacherId:null, //删除id确认
       deleteTeacherdialog: false, //删除弹窗
@@ -172,6 +171,14 @@ export default {
         pageSize: "10"
       },
     })
+    watch(
+
+      // console.log($route.query.id) 
+    //   '$route.query.id': function(to, from) {  
+    //   // 当 id 参数变化时，这里会执行  
+    //   state.id = to;  
+    // }  
+    )
     //获取内部讲师级别
     const getLevelList = ref([
       // { value: 0, label: "未定级" },