929t调整

src/api/Teaching.js

@@ -26,7 +26,7 @@ export const getOuterTeacherCourseDetail = (obj) => http.post(`/admin/teacher/ge
 //新增外部授课记录
 export const insertOutTeaherCourse = (obj) => http.post('/admin/teacher/insertOutTeaherCourse', obj)
 //讲师费发放情况
-export const getCharges = (obj) => http.post('/admin/teacher/fee/getCharges', obj)
+export const getCharges = (obj) => http.post('/teacher/fee/getCharges', obj)
 //上传组件
 export const teacherUpload = (data) =>
   http.post("/admin/teacher/teacherUpload", data, {

src/views/lecturer/ExternalLecturer.vue

@@ -103,7 +103,7 @@
         <a-row :gutter="16">
           <a-col :span="24">
             <a-form-item label="讲师名称" name="userNo">
-              <a-input v-model:value="formParam.name" style="width: 276px; height: 40px; border-radius: 8px"
+              <a-input v-model:value="formParam.name" class="draitem"
             placeholder="请输入讲师姓名" allowClear showSearch>
           </a-input>  
             </a-form-item>

src/views/lecturer/InsideLecturer.vue

@@ -30,7 +30,7 @@
           <a-button class="resetbtn " @click="searchReset">重置</a-button>
 
           <!-- 更多筛选-->
-          <div v-if="moreid == 1">
+          <div v-if="moreid == 1" >
             <a-button @click="handlemoreid()" class="moreidbtn" type="text"> 展开
               <RightOutlined />
             </a-button>
@@ -134,7 +134,7 @@
                 </a-upload>
               <div class="i_bottom">
                 <div class="tip" style="margin-bottom: 10px;">
-                  <span style="color: #999999; margin-left: 8px">支持图片格式为jpg/jpeg/png 图片最大为500KB</span>
+                  <span style="color: #999999; margin-left: 8px">支持图片格式为jpg/jpeg/png </span>
                 </div>
               </div>
             </div>
@@ -143,8 +143,8 @@
         <a-row :gutter="16">
           <a-col :span="24">
             <a-form-item label="讲师名称" name="name">
-              <SearchTeacher v-model:value="formParam.name" v-model:lable="formParam.orgName"
+                <SearchTeacher v-model:value="formParam.name" v-model:lable="formParam.orgName"
-                v-model:newlable="formParam.neworgName"></SearchTeacher>
+                v-model:system="formParam.systemName" v-model:level="formParam.levelName"></SearchTeacher>
             </a-form-item>
           </a-col>
           <a-col :span="24">
@@ -163,19 +163,22 @@
         </a-row>
           <a-col :span="24">
             <a-form-item label="讲师体系" name="systemId">
-              <a-select class="draitem" v-model:value="formParam.systemId" placeholder="请选择讲师体系" allowClear
+              <!-- <a-select class="draitem" v-model:value="formParam.systemId" placeholder="请选择讲师体系" allowClear
                 @change="changetlevel" .:options="LecturerSystemList">
-              </a-select>
+              </a-select> -->
+              <a-input disabled v-model:value="formParam.systemName" class="draitem"
+                  placeholder="自动带出讲师的体系" allowClear showSearch>
+                </a-input>
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <div  @click="handleformlevel">
+            <!-- <div  @click="handleformlevel"> -->
             <a-form-item label="讲师级别" name="levelId">
                 <a-select class="draitem" v-model:value="formParam.levelId" placeholder="请选择讲师级别" allowClear
                   :disabled="getLevelList.length !== 0 ? false : true" :options="getLevelList">
                 </a-select>
             </a-form-item>
-            </div>
+            <!-- </div> -->
           </a-col>
         <a-row :gutter="16">
           <a-col :span="24">
@@ -521,9 +524,6 @@ export default {
       state.updialog = false
     }
     const LecturerSystemList = ref([
-        { value: null, label: "讲师体系" },
-        { value: 1, label: "未定级" },
-      { value:2, label: "未定级11" },
     ]);
     //获取讲师体系列表
     const LecturerSystemLista = () => {
@@ -582,8 +582,6 @@ export default {
     LecturerSystemLista()
     //获取内部讲师级别
     const getLevelList = ref([
-      { value: 0, label: "未定级" },
-      { value: 1, label: "未定级11" },
     ])
     const changetlevel = (val) => {
       console.log("讲师体系id" + val);
@@ -604,12 +602,12 @@ export default {
     }
     changetlevel()
     const OnTheJobStatusList = ref([
-      { value: null, label: "全部" },
+      { value:"", label: "全部" },
       { value: 0, label: "在职" },
       { value: 1, label: "离职" },
     ])
     const AuthenticationStatusList = ref([
-      { value: null, label: "全部" },
+      { value: "", label: "全部" },
       { value: 0, label: "未认证" },
       { value: 1, label: "已认证" },
     ])

src/views/lecturer/InsideTeaching.vue

@@ -10,7 +10,7 @@
           </a-input>
         </a-form-item>
         <a-form-item class="select">
-          <a-input v-model:value="searchParam.name" style="width: 260px; height: 40px; border-radius: 8px"
+          <a-input v-model:value="searchParam.courseName" style="width: 260px; height: 40px; border-radius: 8px"
             placeholder="请输入课程名称进行搜索" allowClear showSearch>
           </a-input>
         </a-form-item>
@@ -176,7 +176,8 @@
                 <template #content>
                   {{ formParam.levelName }}
                 </template>
-                <a-input disabled v-model:value="formParam.levelName" class="draitem"
+                <a-input v-model:value="formParam.levelName" class="draitem"
+                :disabled="getLevelList.length !== 0 ? false : true" 
                   placeholder="自动带出讲师级别" allowClear showSearch>
                 </a-input>
               </a-popover>
@@ -282,10 +283,10 @@
         <a-descriptions-item label="讲师体系">{{ formParam.systemName }}</a-descriptions-item>
         <a-descriptions-item label="讲师级别">{{ formParam.levelName }}</a-descriptions-item>
         <a-descriptions-item label="录入方式">
-          {{ formParam.entryType == 0 ? '系统生成' : formParam.entryType == 1 ? '手动录入' : '' }}</a-descriptions-item>
+          {{  formParam.entryType == 0 ? '系统生成' : formParam.entryType == 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.name }}</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>
         <a-descriptions-item label="授课时长  "><span style="margin-left: 5px ;" v-if="formParam.duration != null">{{
@@ -621,8 +622,8 @@ export default {
       },
       {
         title: '课程名称 ',
-        dataIndex: 'name',
+        dataIndex: 'courseName',
-        key: 'name ',
+        key: 'courseName ',
         elipsis: true, align: "center",
         width: 120,
       },
@@ -741,7 +742,7 @@ export default {
       else if (state.moreid == 2) {
         state.moreid = 1
         state.searchParam.entryType = null
-        state.searchParam.status = null
+        state.searchParam.status = '0'
         state.searchParam.trainorgId = null
         state.searchParam.systemId = null
         state.searchParam.id = null
@@ -780,7 +781,7 @@ export default {
         managerId: null,
         teacherNameOrUserNo: null,
         entryType: null,
-        status: null,
+        status: '0',
         trainorgId: null,
         systemId: null,
         endDate: null,
@@ -901,7 +902,7 @@ export default {
         departId: null,
         systemId: null,
         levelId: null,
-        name: null,
+        courseName: null,
         duration:null,
         endDate: null,
         startDate: null,
@@ -955,7 +956,7 @@ export default {
         systemId: record.systemId,
         levelId: record.levelId,
         type: record.type,
-        name: record.name,
+        courseName: record.courseName,
         status:record.status,
         beginTime: dayjs(record.beginTime, 'YYYY-MM-DD'),
         // ref< moment.Moment >(moment(record.beginTime,'YYYY-MM-DD')),
@@ -978,7 +979,7 @@ export default {
         systemName: record.systemName,
         levelName: record.levelName,
         type: record.type,
-        name: record.name,
+        courseName: record.courseName,
         status:record.status,
         beginTime:record.beginTime,
         // ref< moment.Moment >(moment(record.beginTime,'YYYY-MM-DD')),
@@ -1043,7 +1044,7 @@ export default {
     },
     ])
     const gettableDatas = (record) => {
-      getCharges({ kid: record.kid })
+      getCharges({ id: record.id })
         .then((res) => {
           console.log(res)
           tableDatas.value = res.data.data.records
@@ -1057,7 +1058,7 @@ export default {
       levelId: [{ required: true, message: '讲师级别不能为空' }],
       systemId: [{ required: true, message: '讲师体系不能为空' }],
       id: [{ required: true, message: '内容分类不能为空' }],
-      name: [{ required: true, message: '课程名称不能为空' }],
+      courseName: [{ required: true, message: '课程名称不能为空' }],
       beginTime: [{ required: true, message: '授课/课程日期不能为空' }],
       duration: [{ required: true, message: '授课时长不能为空' }],
       status: [{ required: true, message: '开课状态不能为空' }],
@@ -1108,7 +1109,7 @@ export default {
         `${process.env.VUE_APP_BASE_API}/lesson_records/export?pageNo=${state.searchParam.currentPage
         }&pageSize=${state.searchParam.pageSize}
         &userNo=${state.searchParam.userNo ? state.searchParam.userNo : ""}
-        &name=${state.searchParam.name ? state.searchParam.name : ""}
+        &courseName=${state.searchParam.courseName ? state.searchParam.courseName : ""}
         &departId=${state.searchParam.departId ? state.searchParam.departId : ""}
         &systemId=${state.searchParam.systemId ? state.searchParam.systemId : ""}
         &startDate=${state.searchParam.startDate ? state.searchParam.startDate : ""}

src/views/lecturer/LecturerApproval.vue

@@ -234,7 +234,7 @@
         tagsshow:"1",
         delTeacherId:null, //删除id确认
         newStatus:null , //修改状态码确认
-        kid:null,    //内部讲师工号确认 
+        id:null,    //内部讲师工号确认 
         lookTeacherId:null, //内部讲师详情id确认
         // deleteInTeacherdialog: false, //删除弹窗
         editTeacher:false ,   //修改状态弹窗
@@ -252,14 +252,14 @@
         formParamstatues:{
           status:'S20',
           remark: null,
-          kid:null,
+          id:null,
         },
         searchdate: null, //选择时间
         searchParam: {
           teacherNo:null,
           teacherName:null,
           trainorgId:null,
-          kid:null,
+          id:null,
           levelId:null,
           courseType:null,
           certStatus:null,
@@ -506,7 +506,7 @@
           endDate:null,
         startDate:null,
           teacherNo:null,
-          kid:null,
+          id:null,
           levelId:null,
           courseType:null,
           certStatus:null,
@@ -560,7 +560,7 @@
       //修改状态窗口
       const handleOperate = (record) => {
         state.editTeacher = true
-        state.formParamstatues.kid= record.kid
+        state.formParamstatues.id= record.id
       };
       //提交
       const closehandleOperate= ()=>{
@@ -586,7 +586,7 @@
           teacher:null,
           teacherNo:null,
           departId:null,
-          kid:null,
+          id:null,
           courseName:0,
           levelId:null,
           payrollPlaceId:null,
@@ -607,14 +607,14 @@
       //表格内查看数据操作
       const handleLook = (record) => {
         state.teachingdialog = true;
-        state.kid= record.kid
+        state.id= record.id
         TeacherSystem()
         gettableDataExamine( )
       }
       
       //详情
       const TeacherSystem=()=>{
-        getTeacherFeeDetail({kid : state.kid}).then((res) => {
+        getTeacherFeeDetail({id : state.id}).then((res) => {
             // state.formParam=Object.assign({} ,res.data.data)
             state.formParam=res.data.data
             console.log( state.formParam)
@@ -626,7 +626,7 @@
       const tableDataExamine = ref([
   ])
    const gettableDataExamine = () => {
-        getTeacherFeeApprovalList({kid : state.kid})
+        getTeacherFeeApprovalList({id : state.id})
           .then((res) => {
             tableDataExamine.value = res.data.data.records
         }) 

src/views/lecturer/LecturerFee.vue

@@ -69,7 +69,7 @@
             </a-select>
           </a-form-item>
           <a-form-item class="select" v-if="moreid == 2"> 
-            <a-select style="width: 230px ;margin-bottom:20px" placeholder="请选择讲师体系" v-model:value="searchParam.kid" allowClear
+            <a-select style="width: 230px ;margin-bottom:20px" placeholder="请选择讲师体系" v-model:value="searchParam.id" allowClear
               :options="lecturerSystemList" @change="changetlevel">
             </a-select>
           </a-form-item>
@@ -184,7 +184,7 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="讲师体系" name="systemId">
-                <a-select disabled  class="draitem" v-model:value="formParam.kid" placeholder="请选择讲师体系"
+                <a-select disabled  class="draitem" v-model:value="formParam.id" placeholder="请选择讲师体系"
                   :options="lecturerSystemList">
                 </a-select>
               </a-form-item>
@@ -482,7 +482,7 @@
         tagsshow:"1",
         delTeacherId:null, //删除id确认
         newStatus:null , //修改状态码确认
-        kid:null,    //内部讲师工号确认 
+        id:null,    //内部讲师工号确认 
         lookTeacherId:null, //内部讲师详情id确认
         // deleteInTeacherdialog: false, //删除弹窗
         editTeacher:false ,   //修改状态弹窗
@@ -502,7 +502,7 @@
           teacherNo:null,
           teacherName:null,
           trainorgId:null,
-          kid:null,
+          id:null,
           levelId:null,
           courseType:null,
           certStatus:null,
@@ -584,7 +584,7 @@
     ])
     const changetlevel = (val) => {
 console.log( "讲师体系id" +val);
-      getLevel( {kid:val}).then((res) => {
+      getLevel( {id:val}).then((res) => {
         if (res.data.code === 200) {
           let arr = res.data.data;
           let array = [];
@@ -850,7 +850,7 @@ console.log( "讲师体系id" +val);
           endDate:null,
         startDate:null,
           teacherNo:null,
-          kid:null,
+          id:null,
           levelId:null,
           courseType:null,
           certStatus:null,
@@ -906,7 +906,7 @@ console.log( "讲师体系id" +val);
       const handleModify = (record) => {
         state.teacherdialog = true;
         state.teacherdialogtitle = '修改信息'
-        state.kid= record.kid
+        state.id= record.id
         state.vf = false
         TeacherSystem()
       }
@@ -950,7 +950,7 @@ console.log( "讲师体系id" +val);
         state.handleOperate1=null
         state.handleOperate1 = record.status
         state.editTeacher = true
-        state.kid= record.kid
+        state.id= record.id
       };
       // //确认删除
       const closeDeleteTeacher=()=>{
@@ -967,7 +967,7 @@ console.log( "讲师体系id" +val);
       const closehandleOperate= ()=>{
          //调用接口
          let ids ={
-        kid : state.kid
+        id : state.id
           } 
       console.log(state.handleOperate1)
       if ( state.handleOperate1 === 'A10'){
@@ -1006,7 +1006,7 @@ console.log( "讲师体系id" +val);
           teacher:null,
           teacherNo:null,
           departId:null,
-          kid:null,
+          id:null,
           levelId:null,
           payrollPlaceId:null,
           // 费用类型 : null
@@ -1027,14 +1027,14 @@ console.log( "讲师体系id" +val);
       const handleLook = (record) => {
         state.teachingdialog = true;
         state.teacherdialogtitle = '查看详情'
-        state.kid= record.id
+        state.id= record.id
         // alert(record.grade)
         TeacherSystem()
         // getteacherrecordstableData ()
       }
       //详情
       const TeacherSystem=()=>{
-        getTeacherFeeDetail({id : state.kid}).then((res) => {
+        getTeacherFeeDetail({id : state.id}).then((res) => {
             // state.formParam=Object.assign({} ,res.data.data)
             state.formParam=res.data.data
             // tableDataFeeDetail.value = res.data.data.records
@@ -1326,7 +1326,7 @@ const column = ref([
             state.currentPage1
           }&pageSize=${state.pageSize1}&teacherNo=${
             state.searchParam.teacherNo ? state.searchParam.teacherNo : ""
-          }&kid=${ state.searchParam.kid ?  state.searchParam.kid : ""}&levelId=${
+          }&id=${ state.searchParam.id ?  state.searchParam.id : ""}&levelId=${
             state.searchParam.levelId ? state.searchParam.levelId : ""
           }&courseType=${ state.searchParam.courseType ?  state.searchParam.courseType : ""}&certStatus=${
             state.searchParam.certStatus ? state.searchParam.certStatus : ""

src/views/lecturer/LookInsideLecturer.vue

@@ -38,7 +38,7 @@
                     @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 label="授课时长"> <span v-if="formParam.teaching!= null" >{{ (formParam.teaching /60 ).toFixed(2)}}小时</span>
            </a-descriptions-item>
     <a-descriptions-item label="发薪地  ">{{formParam.payrollPlaceName}}</a-descriptions-item>
     <!-- 三层 -->
@@ -171,8 +171,8 @@ export default{
           // console.log(objA ,'11111111111')
           state.formParam = objA
         state.formParam.photo = state.formParam.photo ===null ? 'https://p0.itc.cn/q_70/images01/20211013/f45d91616a364d6ea9c42a8db69734aa.png' : state.formParam.photo
-        state.teacherrepromo.userId=res.data.data[0].kid
+        state.teacherrepromo.userId=res.data.data[0].id
-        console.log(state.teacherrepromo.kid);
+        console.log(state.teacherrepromo.id);
         getpromotionrecordstableData()
       })
         .catch((err) => {
@@ -184,16 +184,16 @@ export default{
         const teacherrecordsColumns = ref([
       {
         title: '课程编号',
-        dataIndex: 'index',
+        dataIndex: 'courseId',
-        key: 'index',
+        key: 'courseId',
          align: "center",
         customRender: (text,record,index) => `${index+1}`,
         width: 120,
       },
       {
         title: '课程名称',
-        dataIndex: 'name',
+        dataIndex: 'courseName',
-        key: 'name',
+        key: 'courseName',
         elipsis: true, align: "center",
         width: 120,
       },
@@ -239,15 +239,15 @@ export default{
       },
       {
         title: '学习总人数',
-        dataIndex: 'projectMember',
+        dataIndex: 'studentNum',
-        key: 'projectMember',
+        key: 'studentNum',
         elipsis: true, align: "center",
         width: 120,
       },
       {
         title: '授课时长(分钟)',
-        dataIndex: 'duration',
+        dataIndex: 'teaching',
-        key: 'duration',
+        key: 'teaching',
         elipsis: true, align: "center",
         width: 120,
       },