From 51b0e75fe3377cd144e41a872e8b424bea2972d8 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 14 Nov 2024 20:44:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Lecturer.js                     |  3 ++-
 src/views/lecturer/ExternalLecturer.vue |  2 +-
 src/views/lecturer/InsideLecturer.vue   | 28 +++++++++++++++----------
 src/views/lecturer/InsideTeaching.vue   | 12 +++++------
 src/views/lecturer/LecturerFee.vue      | 18 ++++++++--------
 5 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js
index d9884135..2cd97ac8 100644
--- a/src/api/Lecturer.js
+++ b/src/api/Lecturer.js
@@ -81,4 +81,5 @@ export const submitApproval = (obj) => http.post('/admin/expenseBill/submitAppro
 export const isConfirm = (obj) => http.post('/admin/expenseBill/isConfirm',obj)
 //培训发生组织根节点列表
 export const parentList = () => http.get('/admin/affiliation/parentList')
-
+//讲师级别获取
+export const getAllLevelList = () => http.get(' /admin/system/getAllLevelList')
diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index 3dffa6e1..702c72a1 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -40,7 +40,7 @@
           <template #bodyCell="{ record, column }">
             <template v-if="column.key === 'operation'">
               <a-space >
-                <a-button type="link" v-if="record.isPermission==='true'||record.isSuperPermission==='true'" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
+                <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
                 <a-button type="link" v-if="record.isPermission==='true'||record.isSuperPermission==='true'" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
                 <a-button v-if="record.status == '1'&&(record.isPermission==='true'||record.isSuperPermission==='true')" type="link"
                   @click="() => handleOperate(record, String(record.courseform))">停用</a-button>
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 4c98b2e7..273ecca7 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -12,7 +12,7 @@
         </a-form-item>
         <a-form-item class="select">
           <a-select style="width: 276px" placeholder="请选择讲师体系" v-model:value="searchParam.tSystemId" allowClear
-            :options="LecturerSystemList" @change="changetlevel">
+            :options="LecturerSystemList">
           </a-select>
         </a-form-item>
         <!-- <div  @click="handlesearchlevel"> -->
@@ -53,7 +53,7 @@
           </a-select>
         </a-form-item>
         <a-form-item v-if="moreid == 2" class="select">
-          <a-input style="width: 276px;height: 40px; border-radius:8px; " v-model:value="searchParam.expertiseNames"
+          <a-input style="width: 276px;height: 40px; border-radius:8px; " v-model:value="searchParam.courses"
             placeholder="擅长课程" allowClear @pressEnter="searchSubmit">
           </a-input>
         </a-form-item>
@@ -87,7 +87,7 @@
             </template>
             <template v-if="column.key === 'operation'">
               <a-space>
-                <a-button v-if="record.isPermission==='true'||record.isSuperPermission==='true'" type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
+                <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
 
                 <a-button v-if="record.isPermission==='true'||record.isSuperPermission==='true'" type="link" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
                 <a-button v-if="record.status == '1'&&(record.isPermission==='true'||record.isSuperPermission==='true')" type="link"
@@ -254,6 +254,7 @@
           closable="false"
           style="margin-top: 400px"
           @cancel="cancelupdialog"
+          :maskClosable="false"
         >
           <div class="selectonlineface" style="width: 660px;" :style="{ display: updialog ? 'block' : 'none' }">
             <div class="bg_headers"></div>
@@ -375,7 +376,7 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
 import SearchTeacher from "@/components/project/SearchTeacher";
 import { message } from "ant-design-vue";
 import { useRouter,useRoute  } from "vue-router";
-import { getTeacherSystemList, getTeacherList, getPayRollPlace, getLevel, insertTeacher, deleteInTeacher, updateInTeacher, getTeacherById, updateTeacherState } from "../../api/Lecturer";
+import { getTeacherSystemList, getTeacherList, getPayRollPlace, getAllLevelList, insertTeacher, deleteInTeacher, updateInTeacher, getTeacherById, updateTeacherState } from "../../api/Lecturer";
  import { fileUp } from "../../api/indexEval";
 import { teacherUpload } from "../../api/Teaching";
 import { getCookieForName } from "@/api/method";
@@ -462,7 +463,7 @@ export default {
         tLevelId: null,
         waitStatus: null,
         certStatus: null,
-        expertiseNames: null,
+        courses: null,
         pageNo: "1",
         pageSize: "10"
       },
@@ -540,7 +541,6 @@ export default {
     const changeUpload = (newValue) => {
       if (newValue[0].status == 'done' && newValue[0]?.response?.status == 200) {
           const { id, name, path } = newValue[0].response.result
-          console.log(id,name,path)
           state.formParam.certification = path
           state.formParam.certificationName = name
       }
@@ -576,11 +576,14 @@ export default {
       state.updialog = true
     }
     const cancelupdialog = () => {
+      state.formParam.certification = null
+      state.formParam.certificationName = null
       uploadRef.value.removeUpload()
       state.updialog = false
     }
     const createupdialog = () => {
-      cancelupdialog()
+      uploadRef.value.removeUpload()
+      state.updialog = false
     }
     const LecturerSystemList = ref([
     ]);
@@ -622,9 +625,9 @@ export default {
     LecturerSystemLista()
     //获取内部讲师级别
     const getLevelList = ref([])
-    const changetlevel = (val) => {
-      console.log("讲师体系id" + val);
-      getLevel({ id: val }).then((res) => {
+    const changetlevel = () => {
+      // console.log("讲师体系id" + val);
+      getAllLevelList().then((res) => {
         if (res.data.code === 200) {
           let arr = res.data.data;
           let array = [];
@@ -689,7 +692,7 @@ export default {
         state.moreid = 1
         state.searchParam.waitStatus = null
         state.searchParam.certStatus = null
-        state.searchParam.expertiseNames = null
+        state.searchParam.courses = null
       }
     }
     const columns = ref([
@@ -949,6 +952,9 @@ export default {
           return message.error(rules[formItemNames[i]][0].log)
         }
       }
+      if(state.formParam.certStatus&&!state.formParam.certificationName){
+        return message.error('请上传认证凭证')
+      }
       if(state.formParam.name){
         const nameNo = state.formParam?.name?.split('/')
         state.formParam.name = nameNo[0]
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 87b81ff0..3226d1d3 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -136,7 +136,7 @@
             <template v-if="column.key === 'operation'">
               <a-space>
                 <a-button type="link"    @click="() => handleLook(record, String(record.courseform))">查看</a-button>
-                <a-button type="link" @click="() => handleModify(record, String(record.courseform))"   v-if="record.createFrom == 1 && record.courseStatus == 0 ">修改 </a-button>
+                <a-button type="link" @click="() => handleModify(record, String(record.courseform))"   v-if="record.createFrom == 1 && record.courseStatus == 0 ">编辑 </a-button>
                 <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
                 <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
               </a-space>
@@ -166,15 +166,15 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="讲师组织" name="orgName">
-              <a-popover>
+              <!-- <a-popover>
                 <template #content>
                   {{ formParam.orgNames }}
-                </template>
+                </template> -->
 
-                <a-input disabled v-model:value="formParam.orgName" class="draitem"
+                <a-input :title="formParam.orgNames" disabled v-model:value="formParam.orgName" class="draitem"
                   placeholder="自动带出讲师的组织,展示主要部分,鼠标浮上去展示所有" allowClear showSearch>
                 </a-input>
-              </a-popover>
+              <!-- </a-popover> -->
             </a-form-item>
           </a-col>
         </a-row>
@@ -919,7 +919,7 @@ export default {
       console.log( state.formParam)
       if (state.vf == false) {
         updateInTeacherCourse(state.formParam).then(response => {
-            message.success("修改成功");
+            message.success("编辑成功");
             state.teacherdialog = false;
             cancel()
             getTableDate(); 
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 66c9c1a4..b92f0a0e 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -74,12 +74,12 @@
           </a-form-item> -->
           <a-form-item class="select" v-if="moreid == 2"> 
             <a-select style="width: 235px ;margin-bottom:20px" placeholder="请选择讲师体系" v-model:value="searchParam.tsystemId" allowClear
-              :options="lecturerSystemList" @change="changetlevel"
+              :options="lecturerSystemList"
               v-on:keydown.enter="enterPressHadlerSearch">
             </a-select>
           </a-form-item>
           <a-form-item class="select"  v-if="moreid == 2">
-            <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.levelId" placeholder="请选择讲师级别" allowClear   :disabled="getLevelList.length!==0 ? false:true"
+            <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.levelId" placeholder="请选择讲师级别" allowClear
               :options="getLevelList"
               v-on:keydown.enter="enterPressHadlerSearch">
             </a-select>
@@ -228,7 +228,7 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="课程名称"  name="courseName ">
+              <a-form-item label="课程名称"  name="courseName">
                 <!-- <a-radio-group v-model:value="formParam.courseName">
                   <a-radio :value="0">面授课</a-radio>
                   <a-radio :value="1">在线课</a-radio>
@@ -236,7 +236,7 @@
                 <!-- <a-select  class="draitem" v-model:value="formParam.courseName" placeholder="请选择输入或选择面授课" style="width:63%" allowClear
                   :options="getLevelList">
                 </a-select> -->
-                <a-input v-model:value="formParam.courseName"  placeholder="请输入面授课名称" class="draitem">
+                <a-input :maxlength="20" show-count v-model:value="formParam.courseName"  placeholder="请输入面授课名称" class="draitem">
                 </a-input>
             </a-form-item>
             </a-col>
@@ -438,7 +438,7 @@
   import ImportWork from "../../components/project/ImportWork.vue";
   import SearchTeacher from "@/components/project/SearchTeacher";
   import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,getListByIds,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTeacherLevel,deleteInTeacher,confirm} from "../../api/lecturerFeeManagement";
-  import {getTeacherSystemList, getLevel,getPayRollPlace,fileUp,teacherExpenseConfirm } from "../../api/Lecturer";
+  import {getTeacherSystemList, getAllLevelList,getPayRollPlace,fileUp,teacherExpenseConfirm } from "../../api/Lecturer";
   // lecturerFeeManagement
   // import {getProjSt} from "../../api/indexProjStu";
   // import AddTeacher from "../../components/drawers/project/AddTeacher"
@@ -599,9 +599,8 @@
       const getLevelList = ref([
       // { value: 0, label: "未定级" },
     ])
-    const changetlevel = (val) => {
-console.log( "讲师体系id" +val);
-      getLevel( {id:val}).then((res) => {
+    const changetlevel = () => {
+getAllLevelList().then((res) => {
         console.log(res,'rssssss')
         if (res.data.code === 200) {
           let arr = res.data.data;
@@ -617,6 +616,7 @@ console.log( "讲师体系id" +val);
         }
       })
     }
+    changetlevel()
       LecturerSystemLista()
 
       //  //获取讲师发薪地列表
@@ -1213,7 +1213,7 @@ console.log( "讲师体系id" +val);
         userNo: [{ required: true, message: '',log:'讲师工号不能为空' }],
         orgName: [{ required: true, message: '',log:'讲师组织不能为空' }],
         tsystemName: [{ required: true, message:'',log: '讲师体系不能为空' }],
-        tlevelName: [{ required: true, message:'',log: ' 讲师级别 不能为空' }],
+        tlevelName: [{ required: true, message:'',log: ' 讲师级别不能为空' }],
         payrollPlace: [{ required: true, message:'',log: '讲师发薪地不能为空' }],
         courseType: [{ required: true, message: '',log:'费用类型不能为空' }],
         courseName: [{ required: true, message:'',log: '课程名称不能为空' }],