Merge branch 'zcwy-teacher-manage' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-teacher-manage

src/components/project/SearchTeacher.vue

@@ -244,6 +244,7 @@ watch(()=>visible.value,(val)=>{
     // selectData.value = ''
     teacherId.value = ''
     loadingChange.value = false
+    // teacherId.value = '1012311820121276416'
     // changeneworg()
   }
 })
@@ -266,7 +267,14 @@ watch(()=>teacherId.value,(val)=>{
         systemName.value = {
           systemId:res.data.data.id,
           systemName:res.data.data.systemName,
-          systemCode:res.data.data.systemCode
+          systemCode:res.data.data.systemCode,
+          levelVoList: res.data.data.levelVoList.map(item=>{
+            return (
+              item.label = item.levelName,
+              item.value = item.id,
+              item
+            )
+          })
         }
       }
       loadingChange.value = false

src/views/lecturer/InsideLecturer.vue

@@ -176,7 +176,7 @@
             <!-- <div  @click="handleformlevel"> -->
             <a-form-item label="讲师级别" name="tLevelId">
                 <a-select class="draitem" v-model:value="formParam.tLevelId" placeholder="请选择讲师级别" allowClear
-                   :options="getLevelList">
+                   :options="tSystemNames.levelVoList" @change="handleformlevel">
                 </a-select>
             </a-form-item>
             <!-- </div> -->
@@ -413,7 +413,8 @@ export default {
       tableDataTotal: -1,//table列表总条数
       vf: false,
       tSystemNames:{
-        systemName:null
+        systemName:null,
+        levelVoList: []
       },
       formParam: {
         name: null,
@@ -565,8 +566,7 @@ export default {
     }
     LecturerSystemLista()
     //获取内部讲师级别
-    const getLevelList = ref([
+    const getLevelList = ref([])
-    ])
     const changetlevel = (val) => {
       console.log("讲师体系id" + val);
       getLevel({ id: val }).then((res) => {
@@ -866,6 +866,7 @@ export default {
     }
     //保存
     const createTeacherDialog = async () => {
+      state.formParam.tSystemName = state.tSystemNames.systemName
       const formItemNames = Object.keys(rules);
       for(let i=0;i<formItemNames.length;i++){
         const result = await validateField(formItemNames[i]);
@@ -1003,7 +1004,7 @@ export default {
       state.formParam = {
         name: null,
         status: null,
-        teacherType: '0',
+        teacherType: 1,
         photo: null,
         name: null,
         newdepartId: null,
@@ -1016,7 +1017,8 @@ export default {
         courses: '',
       }
       state.tSystemNames = {
-        systemName:null
+        systemName:null,
+        levelVoList: []
       }
     }
     const clearNonNumber = () => {
@@ -1025,8 +1027,8 @@ export default {
     const rules = {
       name: [{ required: true, message: '',log:'讲师不能为空' }],
       // newdepartId: [{ required: true, message: '组织不能为空' }],
+      tSystemName: [{ required: true, message: '',log:'讲师体系不能为空' }],
       tLevelId: [{ required: true, message: '',log:'讲师级别不能为空' }],
-      tSystemName: [{ required: true, message: '讲师体系不能为空' }],
       defaultteachingTime: [{ required: true, message: '',log:'初始授课时长不能为空' }],
       // certStatus: [{ required: true, message: '认证状态不能为空' }],
 
@@ -1085,9 +1087,10 @@ export default {
           state.formParam.workExp0erience = state.formParam.workExperience === null ? '' : state.formParam.workExperience
           state.formParam.courses = state.formParam.courses === null ? '' : state.formParam.courses
           state.formParam.photo = state.formParam.photo === null ? boe : state.formParam.photo
-          state.tSystemNames.systemName = res.data.data.systemName
+          state.tSystemNames.systemName = res.data.data.tSystemName
           state.tSystemNames.systemCode = res.data.data.systemCode
           state.tSystemNames.systemId = res.data.data.systemId
+          state.tSystemNames.levelVoList = res.data.data.levelVoList
         }
 
 
@@ -1112,11 +1115,8 @@ export default {
     //     message.warning('请先选择讲师体系')
     //   }
     // }
-    const handleformlevel = () => {
+    const handleformlevel = (val) => {
-      console.log('请先选择讲师体系')
+      state.formParam.tlevelName = state.tSystemNames.levelVoList.find(item=>item.id===val)?.levelName
-      if (state.formParam.tSystemId == undefined) {
-        message.warning('请先选择讲师体系')
-      }
     }
     //导出功能
     const handleExport = () => {