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

src/components/project/AddContent.vue

@@ -82,8 +82,8 @@ export default {
       default: true,
     },
     AddContentList:{
-      type:Object,
-      default: true,
+      type:Array,
+      default: ()=>[],
     }
   },
   setup(props, ctx) {

src/components/project/AddOrgContent.vue

@@ -141,6 +141,7 @@ import * as lecturerApi from "@/api/Lecturer.js";
         }
         return {
           orgId: item.id,
+          orgName: item.name,
           affiliationId: item.id,
           ...item
         };

src/views/lecturer/InsideLecturer.vue

@@ -1235,7 +1235,7 @@ export default {
           state.formParam.orgLists = ids?.map((id, index) => ({
             name: names[index],
             id: id
-          }));
+          }))||[]
         }
 
 

src/views/lecturer/LecturerApproval.vue

@@ -5,7 +5,7 @@
       <div class="filter" >
         <a-form layout="inline" style="min-width: 1380px;">
           <a-form-item  class="select">
-            <a-select style="width: 276px" v-model:value="searchParam.trainorgId" placeholder="培训发生组织" allowClear
+            <a-select style="width: 276px" v-model:value="searchParam.trainOrgId" placeholder="培训发生组织" allowClear
               :options="trainOrglist"
               v-on:keydown.enter="enterPressHadlerSearch">
             </a-select>
@@ -296,7 +296,7 @@
         searchParam: {
           teacherNo:null,
           teacherName:null,
-          trainorgId:null,
+          trainOrgId:null,
           id:null,
           levelId:null,
           courseType:null,
@@ -351,7 +351,7 @@
               let array = [];
               arr.map((value) => {
                 let obj = {
-                  value: value.affiliationCode,
+                  value: value.id,
                   label: value.affiliationName,
                 };
                 array.push(obj);
@@ -907,7 +907,7 @@
       //导出功能
       const handleExport = ()=>{
         window.open (
-          `${process.env.VUE_APP_BASE_API}/teachez/fee/exportTeacherFee?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&trainorgId=${state.searchParam.trainorgId ? state.searchParam.trainorgId : ""}&status=${ state.searchParam.status ?  state.searchParam.status : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${ state.searchParam.endTime ?  state.searchParam.endTime : ""}`
+          `${process.env.VUE_APP_BASE_API}/teachez/fee/exportTeacherFee?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&trainOrgId=${state.searchParam.trainOrgId ? state.searchParam.trainOrgId : ""}&status=${ state.searchParam.status ?  state.searchParam.status : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${ state.searchParam.endTime ?  state.searchParam.endTime : ""}`
         );
         // this.download('lesson_records/export', {
         //           ...state.searchParam

src/views/lecturer/LecturerFee.vue

@@ -73,13 +73,13 @@
             </a-select>
           </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
+            <a-select style="width: 235px ;margin-bottom:20px" placeholder="请选择讲师体系" v-model:value="searchParam.tSystemId" allowClear
               :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
+            <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.tLevelId" placeholder="请选择讲师级别" allowClear
               :options="getLevelList"
               v-on:keydown.enter="enterPressHadlerSearch">
             </a-select>
@@ -118,9 +118,9 @@
                 <a-space >
                   <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
                   <!-- :disabled="record.createFrom==1  ?false :true" -->
-                  <a-button type="link" :disabled="record.createFrom!=1  ?false :true" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
-                  <!-- <a-button :disabled="record.status==='A20' || record.status==='A30'||record.status==='S20'   ?true :false"  type="link" @click="() => handleOperate(record, String(record.courseform))">提交</a-button>
-                  <a-button :disabled="record.status==='A10' && record.status!=='A20' || record.status==='A30'||record.status==='S20' ||record.status==='E10' ?true :false"  type="link" @click="() => handleOperate(record, String(record.courseform))">撤回</a-button> -->
+                  <a-button type="link" v-if="record.status != 2&&record.status!=3" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
+                  <!-- <a-button :disabled="record.status==='A20' || record.status==='A30'||record.status==='S20'   ?true :false"  type="link" @click="() => handleOperate(record, String(record.courseform))">提交</a-button> -->
+                  <a-button type="link" @click="handleOperate(record)">撤回</a-button>
                   <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
                 </a-space>
               </template>
@@ -532,8 +532,8 @@
           userNo:null,
           name:null,
           trainOrgId:null,
-          tsystemId:null,
-          levelId:null,
+          tSystemId:null,
+          tLevelId:null,
           courseType:null,
           certStatus:null,
           salaryName:null,
@@ -631,7 +631,7 @@ getAllLevelList().then((res) => {
           let array = [];
           arr.map((value) => {
             let obj = {
-              value: value.levelName,
+              value: value.id,
               label: value.levelName,
             };
             array.push(obj);
@@ -736,13 +736,13 @@ getAllLevelList().then((res) => {
         ellipsis: true, align: "center",
           width: 120,
         },
-        // {
-        //   title: '讲师工号 ',
-        //   dataIndex: 'userNo',
-        //   key: 'userNo',
-        // ellipsis: true, align: "center",
-        //   width: 120,
-        // },
+        {
+          title: '讲师工号 ',
+          dataIndex: 'userNo',
+          key: 'userNo',
+        ellipsis: true, align: "center",
+          width: 120,
+        },
         {
           title: '课程名称 ',
           dataIndex: 'courseName',
@@ -751,27 +751,6 @@ getAllLevelList().then((res) => {
           align: "center",
           width: 200,
         },
-        {
-          title: '课程类型 ',
-          dataIndex: ' courseType',
-          key: ' courseType',
-          ellipsis: true,
-          align: "center",
-          width: 120,
-          customRender: (value) => {
-            return (
-              <div>
-                {value.record. courseType == "1" || value.record. courseType == "2"|| value.record.courseTypeype == "3"
-                  ? {
-                    "1": "项目开课",
-                    "2": "路径开课",
-                    "3": "面授开课",
-                  }[value.record. courseType + ""] || ""
-                  : "-"}
-              </div>
-            )
-          }
-        },
         {
           title: '培训发生组织',
           dataIndex: 'trainOrgName',
@@ -837,6 +816,20 @@ getAllLevelList().then((res) => {
         ellipsis: true, align: "center",
           width: 120,
         },
+        {
+          title: '参训人员',
+          dataIndex: 'studys',
+          key: 'studys',
+        ellipsis: true, align: "center",
+          width: 120,
+        },
+        {
+          title: '评分 ',
+          dataIndex: 'score',
+          key: 'score',
+        ellipsis: true, align: "center",
+          width: 120,
+        },
         {
           title: '状态 ',
           dataIndex: 'status',
@@ -847,7 +840,7 @@ getAllLevelList().then((res) => {
           customRender: (value) => {
             return (
               <div>
-                {value.record.status== "0" || value.record.status == "1" ||value.record.status == "2" ||value.record.status == "3"
+                {String(value.record.status)
                   ? {
                     "0": "待确认",
                     "1": "待提交",
@@ -862,18 +855,27 @@ getAllLevelList().then((res) => {
           }
         },
         {
-          title: '参训人员',
-          dataIndex: 'studys',
-          key: 'studys',
-        ellipsis: true, align: "center",
-          width: 120,
-        },
-        {
-          title: '评分 ',
-          dataIndex: 'score',
-          key: 'score',
-        ellipsis: true, align: "center",
+          title: '课程类型 ',
+          dataIndex: ' courseType',
+          key: ' courseType',
+          ellipsis: true,
+          align: "center",
           width: 120,
+          customRender: (value) => {
+            return (
+              <div>
+                {String(value.record. courseType)
+                  ? {
+                    "0": "在线课",
+                    "1": "面授课",
+                    "2": "课程开发",
+                    "3": "作业员入模培训",
+                    "4": "其他",
+                  }[value.record. courseType + ""]
+                  : "-"}
+              </div>
+            )
+          }
         },
         {
           title: '讲师组织',
@@ -911,8 +913,8 @@ getAllLevelList().then((res) => {
           endTime:null,
         beginTime:null,
           userNo:null,
-          tsystemId:null,
-          levelId:null,
+          tSystemId:null,
+          tLevelId:null,
           courseType:null,
           certStatus:null,
           salaryName:null,
@@ -1052,10 +1054,12 @@ getAllLevelList().then((res) => {
       // };
       //修改状态窗口
       const handleOperate = (record) => {
-        state.handleOperate1=null
-        state.handleOperate1 = record.status
-        state.editTeacher = true
-        state.id= record.id
+        dialog({
+          content: "等待接口中...",
+          ok: () => {
+            
+          }
+        })
       };
       // //确认删除
       const closeDeleteTeacher=()=>{
@@ -1480,7 +1484,7 @@ const column = ref([
       const handleExport = ()=>{
         window.open (
           `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherExpense?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""
-          }&trainOrgId=${ state.searchParam.trainOrgId ?  state.searchParam.trainOrgId : ""}&type=${state.searchParam.type ? state.searchParam.type : ""}&tsystemId=${ state.searchParam.tsystemId ?  state.searchParam.tsystemId : ""}&levelId=${ state.searchParam.levelId ? state.searchParam.levelId : ""}&beginTime=${state.searchParam.beginTime ?  state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ?  state.searchParam.endTime : ""}`
+          }&trainOrgId=${ state.searchParam.trainOrgId ?  state.searchParam.trainOrgId : ""}&type=${state.searchParam.type ? state.searchParam.type : ""}&tsystemId=${ state.searchParam.tSystemId ?  state.searchParam.tSystemId : ""}&levelId=${ state.searchParam.tLevelId ? state.searchParam.tLevelId : ""}&beginTime=${state.searchParam.beginTime ?  state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ?  state.searchParam.endTime : ""}`
         );
         // this.download('lesson_records/export', {
         //           ...state.searchParam