From 908f814fbc8f445bf08c58b2446cdbc2a29deb04 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 13 Feb 2025 14:19:35 +0800
Subject: [PATCH 001/157] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=B2=E5=B8=88=20?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=B2=E5=B8=88=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/LookInsideLecturer.vue | 1030 +++++++++--------
 src/views/lecturer/InsideLecturer.vue         |  622 +++++-----
 src/views/lecturer/LecturerList.vue           |   96 +-
 3 files changed, 896 insertions(+), 852 deletions(-)

diff --git a/src/components/project/LookInsideLecturer.vue b/src/components/project/LookInsideLecturer.vue
index ae15e8de..01c88289 100644
--- a/src/components/project/LookInsideLecturer.vue
+++ b/src/components/project/LookInsideLecturer.vue
@@ -1,247 +1,240 @@
 <template>
-  <a-drawer class="largeDrawerInside" :visible="visible" placement="right" :closable="false" 
-    width="80%" :title="false" @close="handleClose">
+  <a-drawer class="largeDrawerInside" :visible="visible" placement="right" :closable="false" width="80%" :title="false"
+    @close="handleClose">
     <!-- 内部讲师查看详情 -->
     <div class="LookInsideLecturer">
-    <div class="header" style="margin-top: -24px;margin-left: -24px;">
+      <div class="header" style="margin-top: -24px;margin-left: -24px;">
         <div class="headerTitle">查看讲师</div>
         <!-- <router-link :to="{ path: '/lecturerList', query: { activeKey: '1', } }"> -->
-          <img
-            @click="handleClose"
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-          />
+        <img @click="handleClose" style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png" />
         <!-- </router-link> -->
       </div>
-    <a-layout-content>
+      <a-layout-content>
         <!-- 讲师信息 -->
         <div style="width: 100%;margin-top: 10px;padding: 20px;">
-        <span class="line"></span>
-        <a-descriptions title="基本信息" bordered :column="4" :contentStyle="rowCenter" :labelStyle="rowCenters">
+          <span class="line"></span>
+          <a-descriptions title="基本信息" bordered :column="4" :contentStyle="rowCenter" :labelStyle="rowCenters">
             <!-- 一层 -->
-    <a-descriptions-item label="讲师头像">
-      <a-image :width="55" style="border-radius: 50%;width:55px;height:55px;" :src=formParam.photo />
-    </a-descriptions-item>
-    <a-descriptions-item label="讲师姓名"><div style="user-select:text">{{formParam.name}}  /  {{formParam.userNo}}</div></a-descriptions-item>
-    <a-descriptions-item label="讲师体系"><div style="user-select:text">{{formParam.tsystemName || '-'}}</div></a-descriptions-item>
-    <!-- 二层 -->
-    <a-descriptions-item label="讲师级别">{{formParam.tlevelName||'-'}}</a-descriptions-item>
-    <a-descriptions-item label="认证状态">{{ formParam.certStatus==0?'未认证' :formParam.certStatus==1 ?'已认证':'-'}}
-      <span>
-                  <a-button type="text" class="moreidbtn" v-if="formParam.certStatus == 1"
-                    @click="handleup">查看认证资料</a-button>
-                </span>
-    </a-descriptions-item>
-    <a-descriptions-item label="授课时长"> <span v-if="formParam.teaching!= null" >{{formParam.teaching}}分钟({{ (Number(formParam.teaching) /60 ).toFixed(2)}}小时)</span><span v-else>-</span>
-          </a-descriptions-item>
-    <a-descriptions-item label="发薪地  ">{{formParam.salaryName||'-'}}</a-descriptions-item>
-    <!-- 三层 -->
-    <a-descriptions-item label="在职状态">{{formParam.waitStatus=='0'?'在职' :formParam.waitStatus=='1' ?'离职':'-'}}</a-descriptions-item>
-    <a-descriptions-item label="账号状态">{{formParam.status=='0'?'临时' :formParam.status=='1' ?'启用':formParam.status==2 ?'停用':'-'}}</a-descriptions-item>
-    <a-descriptions-item label="录入方式">{{formParam.createFrom=='0'?'自动录入' :formParam.createFrom=='1'?'手动录入':'-'}}</a-descriptions-item>
-    <a-descriptions-item style="max-width: 400px;" label="所属组织" >
-      <span :title="formParam.orgName" style="user-select:text">{{ formParam.orgName || '-' }}</span>
-    </a-descriptions-item>
-  </a-descriptions>
-  <div style="margin-top: 10px;"></div>
-  <span class="line" ></span>
-  <a-descriptions title="其他信息" bordered :column="4" :contentStyle="rowCenter" :labelStyle="rowCenters"  >
+            <a-descriptions-item label="讲师头像">
+              <a-image :width="55" style="border-radius: 50%;width:55px;height:55px;" :src=formParam.photo />
+            </a-descriptions-item>
+            <a-descriptions-item label="讲师姓名">
+              <div style="user-select:text">{{ formParam.name }} / {{ formParam.userNo }}</div>
+            </a-descriptions-item>
+            <a-descriptions-item label="讲师体系">
+              <div style="user-select:text">{{ formParam.tsystemName || '-' }}</div>
+            </a-descriptions-item>
+            <!-- 二层 -->
+            <a-descriptions-item label="讲师级别">{{ formParam.tlevelName || '-' }}</a-descriptions-item>
+            <a-descriptions-item label="认证状态">{{ formParam.certStatus == 0 ? '未认证' : formParam.certStatus == 1 ? '已认证' : '-' }}
+              <span>
+                <a-button type="text" class="moreidbtn" v-if="formParam.certStatus == 1"
+                  @click="handleup">查看认证资料</a-button>
+              </span>
+            </a-descriptions-item>
+            <a-descriptions-item label="授课时长"> <span v-if="formParam.teaching != null">{{ formParam.teaching }}分钟({{
+              (Number(formParam.teaching) / 60).toFixed(2)}}小时)</span><span v-else>-</span>
+            </a-descriptions-item>
+            <a-descriptions-item label="发薪地  ">{{ formParam.salaryName || '-' }}</a-descriptions-item>
+            <!-- 三层 -->
+            <a-descriptions-item label="在职状态">{{ formParam.waitStatus == '0' ? '在职' : formParam.waitStatus == '1'
+              ?'离职':'-'}}</a-descriptions-item>
+            <a-descriptions-item label="账号状态">{{ formParam.status == '0' ? '临时' : formParam.status == '1'
+              ? '启用' : formParam.status == 2 ?'停用':'-'}}</a-descriptions-item>
+            <a-descriptions-item label="录入方式">{{ formParam.createFrom == '0' ? '自动录入'
+              : formParam.createFrom == '1' ? '手动录入':'-'}}</a-descriptions-item>
+            <a-descriptions-item style="max-width: 400px;" label="所属组织">
+              <span :title="formParam.orgName" style="user-select:text">{{ formParam.orgName || '-' }}</span>
+            </a-descriptions-item>
+          </a-descriptions>
+          <div style="margin-top: 10px;"></div>
+          <span class="line"></span>
+          <a-descriptions title="其他信息" bordered :column="4" :contentStyle="rowCenter" :labelStyle="rowCenters">
             <!-- 一层 -->
-    <a-descriptions-item style="max-width: 200px;" label="讲师介绍" :span="4" >
-      <div v-if="formParam.description !=null&&resp(formParam.description)"  style="min-width: 500px;" v-html="formParam.description" ></div>
-      <div v-else>-</div>
-    </a-descriptions-item>
-    <a-descriptions-item label="工作职责" :span="4">
-      <div v-if="formParam.workExperience !=null&&resp(formParam.workExperience)"  style="min-width: 500px;" v-html="formParam.workExperience" ></div>
-      <div v-else>-</div>
-      </a-descriptions-item>
-    <a-descriptions-item label="擅长课程" :span="4">
-      <div v-if="formParam.courses !=null&&resp(formParam.courses)"  style="min-width: 500px;" v-html="formParam.courses" ></div>
-      <div v-else>-</div>
-      </a-descriptions-item>
-    <a-descriptions-item label="教师专长" :span="4">
-      <a-tag v-if="formParam.expertiseNames" color="blue" style="margin-right:10px" v-for="item in formParam.expertiseNames?.split(',')">{{item}}</a-tag>
-      <span v-else>-</span>
-    </a-descriptions-item>
-  </a-descriptions>
-  <!-- 记录 -->
-  <div style="margin-top: 8px;"></div>
-  <a-tabs v-model:activeKey="activeKey">
-    <a-tab-pane key="1" tab="授课记录">
-      <a-table :header-cell-style="{ 'text-align': 'center' }" :columns="teacherrecordsColumns"
-        
-        :data-source="teacherrecordstableData" :loading="teacherrecordsLoading" :scroll="{ x: '1000' }" :pagination="pagination">
-      </a-table>
-      <div style="float: right;">
-        <a-pagination
-          v-if="tableDataTotal > 10"
-        :showSizeChanger="true"
-        :showQuickJumper="false"
-        :hideOnSinglePage="false"
-        :pageSize="searchParam.pageSize"
-        :current="searchParam.pageNo"
-        :total="tableDataTotal"
-        class="pagination"
-        @change="changePagination"
-      />
-          </div>
-      </a-tab-pane>
-    <a-tab-pane key="2" tab="晋级记录">
-      <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="promotionrecordsColumns"
-        
-          :data-source="promotionrecordstableData" :loading="promotionrecordsLoading" @expand="expandTable" :pagination="false">
-          <template #bodyCell="{ record, column,index }" >
-          </template>
-        </a-table>
-        <div style="float: right;">
-          <a-pagination
-          v-if="teacherrepromotableDataTotal > 10"
-        :showSizeChanger="true"
-        :showQuickJumper="false"
-        :hideOnSinglePage="true"
-        :pageSize="teacherrepromo.pageSize"
-        :current="teacherrepromo.pageNo"
-        :total="teacherrepromotableDataTotal"
-        class="pagination"
-        @change="teacherrepromoPagination"
-      />
-          </div>
-      </a-tab-pane>
-  </a-tabs>
-</div>
-    </a-layout-content>
+            <a-descriptions-item style="max-width: 200px;" label="讲师介绍" :span="4">
+              <div v-if="formParam.description != null && resp(formParam.description)" style="min-width: 500px;"
+                v-html="formParam.description"></div>
+              <div v-else>-</div>
+            </a-descriptions-item>
+            <a-descriptions-item label="工作职责" :span="4">
+              <div v-if="formParam.workExperience != null && resp(formParam.workExperience)" style="min-width: 500px;"
+                v-html="formParam.workExperience"></div>
+              <div v-else>-</div>
+            </a-descriptions-item>
+            <a-descriptions-item label="擅长课程" :span="4">
+              <div v-if="formParam.courses != null && resp(formParam.courses)" style="min-width: 500px;"
+                v-html="formParam.courses"></div>
+              <div v-else>-</div>
+            </a-descriptions-item>
+            <a-descriptions-item label="教师专长" :span="4">
+              <a-tag v-if="formParam.expertiseNames" color="blue" style="margin-right:10px"
+                v-for="item in formParam.expertiseNames?.split(',')">{{ item }}</a-tag>
+              <span v-else>-</span>
+            </a-descriptions-item>
+          </a-descriptions>
+          <!-- 记录 -->
+          <div style="margin-top: 8px;"></div>
+          <a-tabs v-model:activeKey="activeKey">
+            <a-tab-pane key="1" tab="授课记录">
+              <a-table :header-cell-style="{ 'text-align': 'center' }" :columns="teacherrecordsColumns"
+                :data-source="teacherrecordstableData" :loading="teacherrecordsLoading" :scroll="{ x: '1000' }"
+                :pagination="pagination">
+              </a-table>
+              <div style="float: right;">
+                <a-pagination v-if="tableDataTotal > 10" :showSizeChanger="true" :showQuickJumper="false"
+                  :hideOnSinglePage="false" :pageSize="searchParam.pageSize" :current="searchParam.pageNo"
+                  :total="tableDataTotal" class="pagination" @change="changePagination" />
+              </div>
+            </a-tab-pane>
+            <a-tab-pane key="2" tab="晋级记录">
+              <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe"
+                :columns="promotionrecordsColumns" :data-source="promotionrecordstableData"
+                :loading="promotionrecordsLoading" @expand="expandTable" :pagination="false">
+                <template #bodyCell="{ record, column, index }">
+                </template>
+              </a-table>
+              <div style="float: right;">
+                <a-pagination v-if="teacherrepromotableDataTotal > 10" :showSizeChanger="true" :showQuickJumper="false"
+                  :hideOnSinglePage="true" :pageSize="teacherrepromo.pageSize" :current="teacherrepromo.pageNo"
+                  :total="teacherrepromotableDataTotal" class="pagination" @change="teacherrepromoPagination" />
+              </div>
+            </a-tab-pane>
+          </a-tabs>
+        </div>
+      </a-layout-content>
     </div>
   </a-drawer>
 </template>
-<script lang ="jsx">
-import { useRouter,useRoute } from "vue-router";
-import { reactive, toRefs, ref,  computed,watch } from "vue"
+<script lang="jsx">
+import { useRouter, useRoute } from "vue-router";
+import { reactive, toRefs, ref, computed, watch } from "vue"
 import { useStore } from "vuex";
-import {getTeacherById ,getTeacherLogList} from "../../api/Lecturer"; 
-import { getNewInTeacherCourseList  } from "../../api/Teaching";
+import { getTeacherById, getTeacherLogList } from "../../api/Lecturer";
+import { getNewInTeacherCourseList } from "../../api/Teaching";
 import avatar from '@/assets/avatar.png'
 import Avatarman from '@/assets/Avatarman.png'
 import Avatarwoman from '@/assets/Avatarwoman.png'
 import dayjs from "dayjs";
-export default{
-  name :"LookInsideLecturer",
-  components:{
+export default {
+  name: "LookInsideLecturer",
+  components: {
 
   },
-  props:{
-    visible:{
+  props: {
+    visible: {
       type: Boolean,
       default: false,
     },
-    id:{
+    id: {
       type: String,
       default: ""
     }
   },
-  setup(props,emits){
-    const router=useRouter();
+  setup(props, emits) {
+    const router = useRouter();
     const state = reactive({
-    activeKey:'1',
-    formParam: {
-    },
-    promotionrecordsLoading: false,  //晋级记录遮罩层
-    teacherrecordsLoading: false,// 授课记录遮罩层
-    teacherrecordstableDataTotal: 0,//授课记录列表总条数
-    teacherrepromotableDataTotal: -1,//晋级记录总条数
-    teacherrecords: {
-      recordType:1,
-      pageNo: "1",
-      pageSize: "10",
-      id: null
-    },
-    teacherrepromo:{
-      userId:null,
-      pageNo: "1",
-      pageSize: "10",
-    }
-      });
-      watch(() => props.visible, (val) => {
-        console.log(val,'xixixiixix')
-        if(val){
-          const id = props.id
-          TeacherSystem(id)
-        }else{
-          state.formParam = {}
-        }
-      })
-  const isOrgNames = (val) => {
-    if(val){
-      const parts = val.split('/');
-      const reversedParts = parts.reverse();
-      state.formParam.orgNames = reversedParts.join('/'); 
-    }
-  }
-  const handleClose = () => {
-    emits.emit('update:visible',false)
-  }
-        //内部讲师详情
-  const TeacherSystem = (id) => {
-    getTeacherById({id,}).then((res) => {
-      let objA= res.data.data
-      console.log(objA ,'11111111111')
-        state.formParam = objA
-      state.formParam.photo = state.formParam.photo ==null ?
-      state.formParam.gender == 1 ? Avatarman : 
-      state.formParam.gender ==2 ? Avatarwoman : Avatarman : (state.formParam.photo.includes('upload')?state.formParam.photo:'/upload'+state.formParam.photo)
-      state.teacherrepromo.userId=res.data.data.id
-      console.log(state.teacherrepromo.id);
-      isOrgNames(state.formParam.orgName)
-      getteacherrecordstableData()
-      promotionrecordstableData.value = res.data.data.levelLogList
-    })
-      .catch((err) => {
-        console.log("内部讲师详情", err);
-      });
-  }
-  const resp = (val) => {
-    if(val){
-      const reg = /<[^<>]+>/g;
-      const value = val.replace(reg, "");
-      return value
-    }
-  }
-      //授课记录列表
-      const teacherrecordsColumns = ref([
-    // {
-    //   title: '课程编号',
-    //   dataIndex: 'courseId',
-    //   key: 'courseId',
-    //    align: "center",
-    //    customRender: ({text, index})=>{
-    //           return index+1;
-    //       },
-          
-    //   width: 120,
-    // },
-    {
-      title: '课程名称',
-      dataIndex: 'courseName',
-      key: 'courseName',
-      ellipsis: true,
-      align: "center",
-      width: 180,
-      customCell:()=>{return{style:{userSelect: 'text'}}},
-    },
-    {
-      title: '课程日期',
-      dataIndex: 'teachingDate',
-      key: 'teachingDate',
-      ellipsis: true, align: "center",
-      width: 160,
-      customRender: (value) => {
-        return (
-          <div style="user-select: text">
-            {value.record?.teachingDate?dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm"):'-'}
-          </div>
-        );
+      activeKey: '1',
+      formParam: {
       },
-    },
-    {
+      promotionrecordsLoading: false,  //晋级记录遮罩层
+      teacherrecordsLoading: false,// 授课记录遮罩层
+      teacherrecordstableDataTotal: 0,//授课记录列表总条数
+      teacherrepromotableDataTotal: -1,//晋级记录总条数
+      teacherrecords: {
+        recordType: 1,
+        pageNo: "1",
+        pageSize: "10",
+        id: null
+      },
+      teacherrepromo: {
+        userId: null,
+        pageNo: "1",
+        pageSize: "10",
+      }
+    });
+    watch(() => props.visible, (val) => {
+      console.log(val, 'xixixiixix')
+      if (val) {
+        const id = props.id
+        TeacherSystem(id)
+      } else {
+        state.formParam = {}
+      }
+    })
+    const isOrgNames = (val) => {
+      if (val) {
+        const parts = val.split('/');
+        const reversedParts = parts.reverse();
+        state.formParam.orgNames = reversedParts.join('/');
+      }
+    }
+    const handleClose = () => {
+      emits.emit('update:visible', false)
+    }
+    //内部讲师详情
+    const TeacherSystem = (id) => {
+      getTeacherById({ id, }).then((res) => {
+        let objA = res.data.data
+        console.log(objA, '11111111111')
+        state.formParam = objA
+        state.formParam.photo = state.formParam.photo == null ?
+          state.formParam.gender == 1 ? Avatarman :
+            state.formParam.gender == 2 ? Avatarwoman : Avatarman : (state.formParam.photo.includes('upload') ? state.formParam.photo : '/upload' + state.formParam.photo)
+        state.teacherrepromo.userId = res.data.data.id
+        console.log(state.teacherrepromo.id);
+        isOrgNames(state.formParam.orgName)
+        getteacherrecordstableData()
+        promotionrecordstableData.value = res.data.data.levelLogList
+      })
+        .catch((err) => {
+          console.log("内部讲师详情", err);
+        });
+    }
+    const resp = (val) => {
+      if (val) {
+        const reg = /<[^<>]+>/g;
+        const value = val.replace(reg, "");
+        return value
+      }
+    }
+    //授课记录列表
+    const teacherrecordsColumns = ref([
+      // {
+      //   title: '课程编号',
+      //   dataIndex: 'courseId',
+      //   key: 'courseId',
+      //    align: "center",
+      //    customRender: ({text, index})=>{
+      //           return index+1;
+      //       },
+
+      //   width: 120,
+      // },
+      {
+        title: '课程名称',
+        dataIndex: 'courseName',
+        key: 'courseName',
+        ellipsis: true,
+        align: "center",
+        width: 180,
+        customCell: () => { return { style: { userSelect: 'text' } } },
+      },
+      {
+        title: '课程日期',
+        dataIndex: 'teachingDate',
+        key: 'teachingDate',
+        ellipsis: true, align: "center",
+        width: 160,
+        customRender: (value) => {
+          return (
+            <div style="user-select: text">
+              { value.record?.teachingDate ? dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm") : '-' }
+            </div>
+          );
+        },
+      },
+      {
         title: "内容分类",
         width: 100,
         dataIndex: "courseTypeName",
@@ -249,16 +242,16 @@ export default{
         key: "keywords",
         align: "center",
       },
-    {
-      title: '课程类型',
-      dataIndex: 'type',
-      key: 'type',
-      ellipsis: true, align: "center",
-      width: 120,
-      customRender: (value) => {
-        return (
+      {
+        title: '课程类型',
+        dataIndex: 'type',
+        key: 'type',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: (value) => {
+          return (
             <div>
-              {String(value.record.type)
+              { String(value.record.type)
                 ? {
                   "0": "在线课",
                   "1": "面授课",
@@ -266,328 +259,341 @@ export default{
                   "3": "作业员入模培训",
                   "4": "其他",
                 }[value.record.type + ""]
-                : "-"}
+                : "-" }
             </div>
           )
-      }
-    },
-    {
-      title: '参训人数',
-      dataIndex: 'studys',
-      key: 'studys',
-      ellipsis: true, align: "center",
-      width: 120,
-      customRender: ({text})=>{
-        return text ? text+'人' : '-'
-      }
-    },
-    {
-      title: '授课时长(分钟)',
-      dataIndex: 'teaching',
-      key: 'teaching',
-      ellipsis: true, align: "center",
-      width: 130,
-      customRender: ({text})=>{
-        return text ? text+'分钟' : '-'
-      }
-    },
-    {
-      title: '评分',
-      dataIndex: 'score',
-      key: 'score',
-      ellipsis: true, align: "center",
-      width: 120,
-      customRender: (value) => {
-        return (
-          <div>
-            {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(2)+'分' : '-'}
-          </div>
-        )
-      }
-    },
-    {
-      title: '开课状态',
-      dataIndex: 'courseStatus ',
-      key: 'courseStatus ',
-      ellipsis: true, align: "center",
-      width: 120,
-      customRender: (value) => {
-        return (
-          <div>
-            {value.record.courseStatus == 0 || value.record.courseStatus == 1
-              ? {
-                "0": "未开课",
-                "1": "已开课",
-              }[value.record.courseStatus + ""] || ""
-              : "-"}
-          </div>
-        )
-      }
-    },
-    {
-      title: '备注',
-      dataIndex: 'remark ',
-      key: 'remark ',
-      ellipsis: true,
-      align: "center",
-      width: 200,
-      customRender: (value) => {
-        return (
-          <div>{value.record.remark || '-'}</div>
-        )
-      }
-    },
-  ])
-  //授课记录列表数据
-  const teacherrecordstableData = ref([
-  ])
-  const getteacherrecordstableData = () => {
-    state.teacherrecordsLoading = true
-    // state.teacherrecords.name = state.formParam.name
-    state.teacherrecords.teacherId = state.formParam.id
-    let obj = { ...state.teacherrecords }
-    // api接口
-    getNewInTeacherCourseList(obj).then((res) => {
-      console.log(res);
-      teacherrecordstableData.value = res.data.data.records
-      state.teacherrecordstableDataTotal = Number(res.data.data.total);
-      state.teacherrecordsLoading = false
-    
-    })
-  };
-  const pagination = computed(() => ({
-    total: state.teacherrecordstableDataTotal,
-    showSizeChanger: true,
-    showQuickJumper:true,
-    current: state.teacherrecords.pageNo,
-    pageSize: state.teacherrecords.pageSize,
-    onChange: paginationChange,
-  }));
-  const paginationChange = (e,pageSize) => {
-    state.teacherrecords.pageNo = e;
-    state.teacherrecords.pageSize = pageSize
-    getteacherrecordstableData();
-  };
-  //授课翻页
-  const teacherchangePagination = (page) => {
-    state.teacherrecords.pageNo = page;
-    // state.pageNo = page;
-    state.teacherrecords.pageSize = pageSize;
-    getteacherrecordstableData();
-  };
-  //晋级记录翻页
-  const teacherrepromoPagination = (page) => {
-    state.teacherrepromo.pageNo = page;
-    // getpromotionrecordstableData();
-  };
-      //晋级记录列表
-      const promotionrecordsColumns = ref([
-    {
-      title: '变更时间',
-      dataIndex: 'createTime',
-      key: 'createTime',
-      ellipsis: true, align: "center",
-      width: 120,
-    },
-    {
-      title: '变更方式',
-      dataIndex: 'type',
-      key: 'type',
-      ellipsis: true, align: "center",
-      width: 120,
-      customRender: (value) => {
-        return (
-          <div>
-            {value.record.type == 1 ? "自动" : value.record.type == 0 ? '手动':"-"}
-          </div>
-        )
-      }
-    },
-    {
-      title: '变更结果',
-      dataIndex: 'result',
-      key: 'result',
-      ellipsis: true, align: "center",
-      width: 120,
-    },
-    {
-      title: '操作人',
-      dataIndex: 'updateName',
-      key: 'updateName',
-      ellipsis: true, align: "center",
-      width: 120,
-    },
-  ])
-  //晋级记录列表数据
-  const promotionrecordstableData = ref([
-  ])
-  // const getpromotionrecordstableData = () => {
-  //   state.promotionrecordsLoading = true
-  //   // state.teacherrepromo.kid = state.kid
-  //   getTeacherLogList(state.teacherrepromo).then((res) => {
-  //     promotionrecordstableData.value = res.data.data.records
-  //     state.teacherrepromotableDataTotal = Number(res.data.data.total);
-  //   })
-  //   state.promotionrecordsLoading = false
-  // };
-  const goback = ()=>{
-    router.back()
-  }
-  const store = useStore();
-  //  // 内容分类
-  //  const sysTypeOptions = computed(() => {return store.state.content_type;});
-  //     //内容分类
-  //     const getSysTypeMap = (code) => {
-  //   if(code=="")return
-  //   // console.log(store.state.sysTypeMap,'map集合');
-  //   return store.state.sysTypeMap.get(code)
-  // }
-  // getSysTypeMap()
-const handleup = ()=>{
-window.open (
-  `${process.env.VUE_APP_BOE_API_URL}/upload${state.formParam.certification}`
-);
-}
-      return{
-          ...toRefs(state),
-          router,
-          goback,
-          handleup,
-          // getSysTypeMap,
-          // sysTypeOptions,
-          TeacherSystem,
-          handleClose,
-          isOrgNames,
-          rowCenter:{"text-align":"left",'min-width':'176px'},
-          rowCenters:{"text-align":"center",'width':'160px','min-width':'110px'},
-          teacherrecordstableData,
-    teacherrecordsColumns,
-    resp,
-    getteacherrecordstableData,
-    teacherchangePagination,
-    pagination,
-    paginationChange,
-    teacherrepromoPagination,
-    promotionrecordsColumns,
-    promotionrecordstableData,
-    // getpromotionrecordstableData,
-      }
+        }
+      },
+      {
+        title: '参训人数',
+        dataIndex: 'studys',
+        key: 'studys',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text ? text + '人' : '-'
+        }
+      },
+      {
+        title: '授课时长(分钟)',
+        dataIndex: 'teaching',
+        key: 'teaching',
+        ellipsis: true, align: "center",
+        width: 130,
+        customRender: ({ text }) => {
+          return text ? text + '分钟' : '-'
+        }
+      },
+      {
+        title: '评分',
+        dataIndex: 'score',
+        key: 'score',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              { value.record.score ? Number(value.record.score).toFixed(0) == 0 ? '-' : Number(value.record.score).toFixed(2) + '分' : '-' }
+            </div>
+          )
+        }
+      },
+      {
+        title: '开课状态',
+        dataIndex: 'courseStatus ',
+        key: 'courseStatus ',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              { value.record.courseStatus == 0 || value.record.courseStatus == 1
+                ? {
+                  "0": "未开课",
+                  "1": "已开课",
+                }[value.record.courseStatus + ""] || ""
+                : "-" }
+            </div>
+          )
+        }
+      },
+      {
+        title: '备注',
+        dataIndex: 'remark ',
+        key: 'remark ',
+        ellipsis: true,
+        align: "center",
+        width: 200,
+        customRender: (value) => {
+          return (
+            <div>{ value.record.remark || '-' }</div>
+          )
+        }
+      },
+    ])
+    //授课记录列表数据
+    const teacherrecordstableData = ref([
+    ])
+    const getteacherrecordstableData = () => {
+      state.teacherrecordsLoading = true
+      // state.teacherrecords.name = state.formParam.name
+      state.teacherrecords.teacherId = state.formParam.id
+      let obj = { ...state.teacherrecords }
+      // api接口
+      getNewInTeacherCourseList(obj).then((res) => {
+        console.log(res);
+        teacherrecordstableData.value = res.data.data.records
+        state.teacherrecordstableDataTotal = Number(res.data.data.total);
+        state.teacherrecordsLoading = false
+
+      })
+    };
+    const pagination = computed(() => ({
+      total: state.teacherrecordstableDataTotal,
+      showSizeChanger: true,
+      showQuickJumper: true,
+      current: state.teacherrecords.pageNo,
+      pageSize: state.teacherrecords.pageSize,
+      onChange: paginationChange,
+    }));
+    const paginationChange = (e, pageSize) => {
+      state.teacherrecords.pageNo = e;
+      state.teacherrecords.pageSize = pageSize
+      getteacherrecordstableData();
+    };
+    //授课翻页
+    const teacherchangePagination = (page) => {
+      state.teacherrecords.pageNo = page;
+      // state.pageNo = page;
+      state.teacherrecords.pageSize = pageSize;
+      getteacherrecordstableData();
+    };
+    //晋级记录翻页
+    const teacherrepromoPagination = (page) => {
+      state.teacherrepromo.pageNo = page;
+      // getpromotionrecordstableData();
+    };
+    //晋级记录列表
+    const promotionrecordsColumns = ref([
+      {
+        title: '变更时间',
+        dataIndex: 'createTime',
+        key: 'createTime',
+        ellipsis: true, align: "center",
+        width: 120,
+      },
+      {
+        title: '变更方式',
+        dataIndex: 'type',
+        key: 'type',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              { value.record.type == 1 ? "自动" : value.record.type == 0 ? '手动' : "-" }
+            </div>
+          )
+        }
+      },
+      {
+        title: '变更结果',
+        dataIndex: 'result',
+        key: 'result',
+        ellipsis: true, align: "center",
+        width: 120,
+      },
+      {
+        title: '操作人',
+        dataIndex: 'updateName',
+        key: 'updateName',
+        ellipsis: true, align: "center",
+        width: 120,
+      },
+    ])
+    //晋级记录列表数据
+    const promotionrecordstableData = ref([
+    ])
+    // const getpromotionrecordstableData = () => {
+    //   state.promotionrecordsLoading = true
+    //   // state.teacherrepromo.kid = state.kid
+    //   getTeacherLogList(state.teacherrepromo).then((res) => {
+    //     promotionrecordstableData.value = res.data.data.records
+    //     state.teacherrepromotableDataTotal = Number(res.data.data.total);
+    //   })
+    //   state.promotionrecordsLoading = false
+    // };
+    const goback = () => {
+      router.back()
+    }
+    const store = useStore();
+    //  // 内容分类
+    //  const sysTypeOptions = computed(() => {return store.state.content_type;});
+    //     //内容分类
+    //     const getSysTypeMap = (code) => {
+    //   if(code=="")return
+    //   // console.log(store.state.sysTypeMap,'map集合');
+    //   return store.state.sysTypeMap.get(code)
+    // }
+    // getSysTypeMap()
+    const handleup = () => {
+      window.open(
+        `${process.env.VUE_APP_BOE_API_URL}/upload${state.formParam.certification}`
+      );
+    }
+    return {
+      ...toRefs(state),
+      router,
+      goback,
+      handleup,
+      // getSysTypeMap,
+      // sysTypeOptions,
+      TeacherSystem,
+      handleClose,
+      isOrgNames,
+      rowCenter: { "text-align": "left", 'min-width': '176px' },
+      rowCenters: { "text-align": "center", 'width': '160px', 'min-width': '110px' },
+      teacherrecordstableData,
+      teacherrecordsColumns,
+      resp,
+      getteacherrecordstableData,
+      teacherchangePagination,
+      pagination,
+      paginationChange,
+      teacherrepromoPagination,
+      promotionrecordsColumns,
+      promotionrecordstableData,
+      // getpromotionrecordstableData,
+    }
   }
 }
 </script>
 <style lang="scss" scoped>
 .LookInsideLecturer {
-padding:24px;
-.header {
-  padding: 0px 32px;
-  height: 73px;
-  border-bottom: 1px solid #e8e8e8;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  // background-color: red;
-  // margin-bottom: 20px;
-  flex-shrink: 0;
+  padding: 24px;
 
-  .headerTitle {
-    font-size: 18px;
-    font-weight: 600;
-    color: #333333;
-    line-height: 25px;
-    // margin-left: 24px;
+  .header {
+    padding: 0px 32px;
+    height: 73px;
+    border-bottom: 1px solid #e8e8e8;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    // background-color: red;
+    // margin-bottom: 20px;
+    flex-shrink: 0;
+
+    .headerTitle {
+      font-size: 18px;
+      font-weight: 600;
+      color: #333333;
+      line-height: 25px;
+      // margin-left: 24px;
+    }
   }
-}
-width: 100%;
-height: 100%;
-display: flex;
-flex-direction: column;
 
-.filter {
-  margin-left: 38px;
-  margin-right: 38px;
-  margin-top: 30px;
+  width: 100%;
+  height: 100%;
   display: flex;
-  justify-content: space-between;
-  flex-wrap: wrap;
+  flex-direction: column;
+
+  .filter {
+    margin-left: 38px;
+    margin-right: 38px;
+    margin-top: 30px;
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+
     .select {
       margin-right: 20px;
       margin-bottom: 20px;
     }
   }
 }
-.backbtn{
+
+.backbtn {
   float: right;
   margin-right: 20px;
-border: none;
-color: #4ea6ff;
-width: 80px;
-height:64px 
+  border: none;
+  color: #4ea6ff;
+  width: 80px;
+  height: 64px
 }
+
 //小竖线
-.line{
-float:left;
-width: 3px;
-height: 16px;
-background: #4ea6ff;
-border-radius: 30%;
-margin-left: -10px;
-margin-top: 5px;
+.line {
+  float: left;
+  width: 3px;
+  height: 16px;
+  background: #4ea6ff;
+  border-radius: 30%;
+  margin-left: -10px;
+  margin-top: 5px;
 }
-::v-deep .ant-descriptions-header{
-  margin-bottom: 18px ;
+
+::v-deep .ant-descriptions-header {
+  margin-bottom: 18px;
 }
+
 .goback {
-      float: right;
-      padding-right: 70px;
-      //padding-top: 37px;
-      position: relative;
+  float: right;
+  padding-right: 70px;
+  //padding-top: 37px;
+  position: relative;
 
-      .return {
-        display: inline-block;
-        width: 42px;
-        height: 42px;
-        margin-top: 12px;
-        margin-right: 10px;
-        background-image: url("../../assets/images/projectadd/return.png");
-      }
+  .return {
+    display: inline-block;
+    width: 42px;
+    height: 42px;
+    margin-top: 12px;
+    margin-right: 10px;
+    background-image: url("../../assets/images/projectadd/return.png");
+  }
 
-      .returntext {
-        display: inline-block;
-        position: absolute;
-        top: 12px;
-        color: #4ea6ff;
-        font-size: 14px;
-      }
-    }
-    .moreidbtn {
-border: none;
-color: #4ea6ff;
-width: 80px
+  .returntext {
+    display: inline-block;
+    position: absolute;
+    top: 12px;
+    color: #4ea6ff;
+    font-size: 14px;
+  }
+}
+
+.moreidbtn {
+  border: none;
+  color: #4ea6ff;
+  width: 80px
 }
 
 ::v-deep .ant-select-selection-overflow-item {
-margin-top: -2px;
+  margin-top: -2px;
 }
 
 ::v-deep .ant-select-multiple .ant-select-selection-item {
-height: 34px
+  height: 34px
 }
+
 .tableBox {
-padding-bottom: 20px;
-margin: 20px 38px 30px;
-::v-deep .ant-select-dropdown{
-display: inline-block;
-}
-::v-deep .ant-select-selection-item{
-margin-left: 3px;
-}
-::v-deep .ant-pagination-options-size-changer.ant-select{
-width: 84px;
-}
-.pa {
-width: 100%;
-display: flex;
-justify-content: right;
-}
+  padding-bottom: 20px;
+  margin: 20px 38px 30px;
+
+  ::v-deep .ant-select-dropdown {
+    display: inline-block;
+  }
+
+  ::v-deep .ant-select-selection-item {
+    margin-left: 3px;
+  }
+
+  ::v-deep .ant-pagination-options-size-changer.ant-select {
+    width: 84px;
+  }
+
+  .pa {
+    width: 100%;
+    display: flex;
+    justify-content: right;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index b9212dd7..70f92329 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -16,9 +16,9 @@
           </a-select>
         </a-form-item>
         <!-- <div  @click="handlesearchlevel"> -->
-        <a-form-item class="select" >
+        <a-form-item class="select">
           <a-select style="width: 200px" v-model:value="searchParam.tLevelName" placeholder="请选择讲师级别" allowClear
-            :options="getLevelList" @keydown.enter="enterPressHadlerSearch" >
+            :options="getLevelList" @keydown.enter="enterPressHadlerSearch">
             <!--  :disabled="getLevelList.length !== 0 ? false : true" 禁用状态 -->
           </a-select>
         </a-form-item>
@@ -37,7 +37,7 @@
             placeholder="擅长课程" allowClear @pressEnter="searchSubmit">
           </a-input>
         </a-form-item>
-      <!-- </div> -->
+        <!-- </div> -->
         <div style="display: flex; margin-bottom: 20px">
           <a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
           <!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
@@ -57,7 +57,7 @@
           </div> -->
         </div>
         <div style="width:100%"></div>
-        
+
       </a-form>
       <div style="width: 100%;"></div>
       <div v-if="checkMenu('lecturerAdd')" style="display: flex; margin-bottom: 20px">
@@ -82,7 +82,9 @@
                   <template #content>
                     <p>{{ record.orgName}}</p>
                   </template> -->
-                  <div style="max-width: 180px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;user-select:text" :title="record.orgName">{{ record.neworganizationName }}</div>
+                <div
+                  style="max-width: 180px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;user-select:text"
+                  :title="record.orgName">{{ record.neworganizationName }}</div>
                 <!-- </a-popover> -->
               </a-space>
             </template>
@@ -90,39 +92,41 @@
               <a-space>
                 <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
 
-                <a-button v-if="(record.isPermission==='true'||record.isSuperPermission==='true')&&checkMenu('lecturerEdit')" type="link" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
-                <a-button v-if="record.status == '1'&&(record.isPermission==='true'||record.isSuperPermission==='true')&&checkMenu('lecturerStop')" type="link"
-                  @click="() => handleOperate(record, String(record.courseform))">停用</a-button>
-                <a-button v-if="record.status == '2'&&(record.isPermission==='true'||record.isSuperPermission==='true')&&checkMenu('lecturerStop')" type="link"
-                  @click="() => handleOperate(record, String(record.courseform))">启用</a-button>
-                    <a-button  v-if="record.isSuperPermission==='true'&&checkMenu('lecturerDel')" type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
+                <a-button
+                  v-if="(record.isPermission === 'true' || record.isSuperPermission === 'true') && checkMenu('lecturerEdit')"
+                  type="link" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
+                <a-button
+                  v-if="record.status == '1' && (record.isPermission === 'true' || record.isSuperPermission === 'true') && checkMenu('lecturerStop')"
+                  type="link" @click="() => handleOperate(record, String(record.courseform))">停用</a-button>
+                <a-button
+                  v-if="record.status == '2' && (record.isPermission === 'true' || record.isSuperPermission === 'true') && checkMenu('lecturerStop')"
+                  type="link" @click="() => handleOperate(record, String(record.courseform))">启用</a-button>
+                <a-button v-if="record.isSuperPermission === 'true' && checkMenu('lecturerDel')" type="link"
+                  @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
                 <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))"  
                    v-if="lecturerAdmin('Lecturer-admin')">删除</a-button> -->
               </a-space>
             </template>
-          </template> 
+          </template>
         </a-table>
       </div>
 
     </div>
     <div class="tableBox ">
-      <div  class="pa">
+      <div class="pa">
         <a-pagination v-if="tableDataTotal > 10" :showSizeChanger="true" :showQuickJumper="false"
-          :hideOnSinglePage="true" :pageSize="searchParam.pageSize" :current="searchParam.pageNo" :total="tableDataTotal"
-          class="pagination" @change="changePagination" />
+          :hideOnSinglePage="true" :pageSize="searchParam.pageSize" :current="searchParam.pageNo"
+          :total="tableDataTotal" class="pagination" @change="changePagination" />
       </div>
     </div>
     <!-- 弹窗组件 -->
-    <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false"
-      width="700" :title="false">
-      <div style="padding:24px">
+    <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" placement="right" :closable="false"
+      :maskClosable="false" width="700" :title="false">
+      <div style="padding-right: 200px;">
         <div class="headers" style="margin-top:-24px;margin-left: -25px;width: 110%;">
           <div class="headerTitle" style="margin-left: 14px;">{{ teacherdialogtitle }}</div>
-          <img
-            style="width: 29px; height: 29px; cursor: pointer;margin-right: 24px;"
-            src="@/assets/images/basicinfo/close.png"
-            @click="cancelTeacherDialog"
-          />
+          <img style="width: 29px; height: 29px; cursor: pointer;margin-right: 24px;"
+            src="@/assets/images/basicinfo/close.png" @click="cancelTeacherDialog" />
         </div>
         <div ref="drawerContent" style="padding-left: 15px;padding-right: 46px;min-width:760px;">
           <a-form :model="formParam" layout="vertical" ref="formRef">
@@ -135,12 +139,15 @@
               <a-col :span="24">
                 <div class="item_inp" style="background-color: #fff;">
                   <div style="width:120px;margin:0 auto;" @click="avatarChange">
-                    <a-upload :disabled="!formParam.name" name="avatar" list-type="picture-card" class="avatar-uploader" :show-upload-list="false"
-                      :headers="headers" :before-upload="beforeUpload">
-                    <img class="i_upload_img" v-if="formParam.photo" :src="formParam.photo" alt="avatar" title="更换头像" />
-                    <img class="i_upload_img" v-else-if="formParam.gender==1" src="../../assets/Avatarman.png" alt="avatar" title="更换头像" />
-                    <img class="i_upload_img" v-else-if="formParam.gender==2" src="../../assets/Avatarwoman.png" alt="avatar" title="更换头像" />
-                    <img class="i_upload_img" v-else src="../../assets/Avatarman.png" alt="avatar" title="更换头像" />
+                    <a-upload :disabled="!formParam.name" name="avatar" list-type="picture-card" class="avatar-uploader"
+                      :show-upload-list="false" :headers="headers" :before-upload="beforeUpload">
+                      <img class="i_upload_img" v-if="formParam.photo" :src="formParam.photo" alt="avatar"
+                        title="更换头像" />
+                      <img class="i_upload_img" v-else-if="formParam.gender == 1" src="../../assets/Avatarman.png"
+                        alt="avatar" title="更换头像" />
+                      <img class="i_upload_img" v-else-if="formParam.gender == 2" src="../../assets/Avatarwoman.png"
+                        alt="avatar" title="更换头像" />
+                      <img class="i_upload_img" v-else src="../../assets/Avatarman.png" alt="avatar" title="更换头像" />
                       <!-- <div class="i_upload" v-else>
                         <div class="addimg">
                           <div class="heng"></div>
@@ -159,17 +166,16 @@
             </a-row>
             <a-row :gutter="16">
               <a-col :span="24">
-                <a-form-item  name="name">
-                    <template v-slot:label>
-                      <img
-                        style="margin-right:4px;width: 7px;height: 7px"
-                        src="@/assets/images/coursewareManage/asterisk.png"
-                        alt=""
-                      />
-                      讲师姓名
-                    </template>
-                    <SearchTeacher @tlevel="teacherTlevel" :lecturer="true" :disabled="!!id" v-model:value="formParam.name" v-model:lable="formParam.orgNames" v-model:orgId="formParam.orgId" v-model:id="formParam.id"
-                    v-model:system="tSystemNames" v-model:level="formParam.tlevelId"></SearchTeacher>
+                <a-form-item name="name">
+                  <template v-slot:label>
+                    <img style="margin-right:4px;width: 7px;height: 7px"
+                      src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                    讲师姓名
+                  </template>
+                  <SearchTeacher @tlevel="teacherTlevel" :lecturer="true" :disabled="!!id"
+                    v-model:value="formParam.name" v-model:lable="formParam.orgNames" v-model:orgId="formParam.orgId"
+                    v-model:id="formParam.id" v-model:system="tSystemNames" v-model:level="formParam.tlevelId">
+                  </SearchTeacher>
                 </a-form-item>
               </a-col>
               <a-col :span="24">
@@ -178,62 +184,53 @@
                     <template #content>
                       {{ formParam.orgNames }}
                     </template> -->
-                    <a-input :title="formParam.orgNames" disabled v-model:value="formParam.orgName" class="draitem"
-                      placeholder="自动带出讲师的组织,展示主要部分,鼠标浮上去展示所有" allowClear showSearch>
-                    </a-input>
+                  <a-input :title="formParam.orgNames" disabled v-model:value="formParam.orgName" class="draitem"
+                    placeholder="自动带出讲师的组织,展示主要部分,鼠标浮上去展示所有" allowClear showSearch>
+                  </a-input>
                   <!-- </a-popover> -->
                 </a-form-item>
               </a-col>
             </a-row>
-              <a-col :span="24">
-                <a-form-item name="tsystemName">
-                  <template v-slot:label>
-                    <img
-                      style="margin-right:4px;width: 7px;height: 7px"
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
-                    />
-                    讲师体系
-                  </template>
-                  <!-- <a-select class="draitem" v-model:value="formParam.tsystemName" placeholder="请选择讲师体系" allowClear
+            <a-col :span="24">
+              <a-form-item name="tsystemName">
+                <template v-slot:label>
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  讲师体系
+                </template>
+                <!-- <a-select class="draitem" v-model:value="formParam.tsystemName" placeholder="请选择讲师体系" allowClear
                     @change="changetlevel" .:options="LecturerSystemList">
                   </a-select> -->
-                  <a-input disabled v-model:value="tSystemNames.systemName" class="draitem"
-                      placeholder="自动带出讲师的体系" allowClear showSearch>
-                    </a-input>
-                </a-form-item>
-              </a-col>
-              <a-col :span="24">
-                <!-- <div  @click="handleformlevel"> -->
-                <a-form-item name="tlevelId">
-                  <template v-slot:label>
-                    <img
-                      style="margin-right:4px;width: 7px;height: 7px"
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
-                    />
-                    讲师级别
-                  </template>
-                    <a-select class="draitem" v-model:value="formParam.tlevelId" placeholder="请选择讲师级别" allowClear disableda
-                      :options="tSystemNames.levelVoList" @change="handleformlevel">
-                    </a-select>
-                </a-form-item>
-                <!-- </div> -->
-              </a-col>
+                <a-input disabled v-model:value="tSystemNames.systemName" class="draitem" placeholder="自动带出讲师的体系"
+                  allowClear showSearch>
+                </a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <!-- <div  @click="handleformlevel"> -->
+              <a-form-item name="tlevelId">
+                <template v-slot:label>
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  讲师级别
+                </template>
+                <a-select class="draitem" v-model:value="formParam.tlevelId" placeholder="请选择讲师级别" allowClear disableda
+                  :options="tSystemNames.levelVoList" @change="handleformlevel">
+                </a-select>
+              </a-form-item>
+              <!-- </div> -->
+            </a-col>
             <a-row :gutter="16">
               <a-col :span="24">
                 <a-form-item name="defaultTeachingTime">
                   <template v-slot:label>
-                    <img
-                      style="margin-right:4px;width: 7px;height: 7px"
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
-                    />
+                    <img style="margin-right:4px;width: 7px;height: 7px"
+                      src="@/assets/images/coursewareManage/asterisk.png" alt="" />
                     初始授课时长
                   </template>
-                  <a-input v-model:value="formParam.defaultTeachingTime" style="width:100%; height: 40px; border-radius: 8px; "
-                  :maxLength="8"
-                    @change="clearNonNumber" @blur="blurNumber" @focus="focusNumber" placeholder="请输入初始授课时长" allowClear  suffix="分钟">
+                  <a-input v-model:value="formParam.defaultTeachingTime"
+                    style="width:100%; height: 40px; border-radius: 8px; " :maxLength="8" @change="clearNonNumber"
+                    @blur="blurNumber" @focus="focusNumber" placeholder="请输入初始授课时长" allowClear suffix="分钟">
                   </a-input>
                   <!-- <span style="margin-left: 5px ;" v-if="formParam.defaultTeachingTime === null">0.00小时</span>
                   <span style="margin-left: 5px ;" v-if="formParam.defaultTeachingTime != null">{{
@@ -247,15 +244,16 @@
                     <a-radio :value="1">已认证</a-radio>
                     <span>
                       <a-button type="text" class="moreidbtn" v-if="formParam.certStatus == 1"
-                        @click="handleupdialog">{{formParam.certificationName?formParam.certificationName:'上传凭证'}}</a-button>
-                      </span>
-                    </a-radio-group>
+                        @click="handleupdialog">{{ formParam.certificationName ? formParam.certificationName : '上传凭证' }}</a-button>
+                    </span>
+                  </a-radio-group>
                 </a-form-item>
               </a-col>
             </a-row>
             <a-row>
               <a-col :span="24">
-                <span class="line" style="margin-bottom:24px;"></span><span style="color:#333333;font-weight: 600;font-size:16px;">其他信息</span>
+                <span class="line" style="margin-bottom:24px;"></span><span
+                  style="color:#333333;font-weight: 600;font-size:16px;">其他信息</span>
               </a-col>
             </a-row>
             <a-row :gutter="16">
@@ -275,7 +273,7 @@
             <a-row :gutter="16">
               <a-col :span="24">
                 <a-form-item label="擅长课程">
-                  <Editor v-model:value="formParam.courses"  :isupload="isupload"/>
+                  <Editor v-model:value="formParam.courses" :isupload="isupload" />
                 </a-form-item>
               </a-col>
             </a-row>
@@ -289,8 +287,8 @@
                   <div class="text">+</div>
                 </div> -->
                 <div class="add_list">
-                  <div :title="item.name" class="add_item" v-for="(item,index) in formParam.orgLists">
-                    {{item.name}}
+                  <div :title="item.name" class="add_item" v-for="(item, index) in formParam.orgLists">
+                    {{ item.name }}
                   </div>
                   <div class="add_content" @click="addContentData">
                     <div class="text">+</div>
@@ -300,15 +298,8 @@
             </a-row>
           </a-form>
           <div>
-            <a-modal 
-              v-model:visible="updialog"
-              :footer="null"
-              closable="false"
-              style="margin-top: 400px"
-              @cancel="cancelupdialog"
-              :maskClosable="false"
-              :destroyOnClose="true"
-            >
+            <a-modal v-model:visible="updialog" :footer="null" closable="false" style="margin-top: 400px"
+              @cancel="cancelupdialog" :maskClosable="false" :destroyOnClose="true">
               <div class="selectonlineface" style="width: 660px;" :style="{ display: updialog ? 'block' : 'none' }">
                 <div class="bg_headers"></div>
                 <div class="bg_main">
@@ -320,18 +311,16 @@
                     <a-form style="margin-top:30px ;">
                       <a-form-item style="color: #999999;">注意 :文件支持PDF、PNG、JPG ,文件大小不可超过5MB</a-form-item>
                       <a-form-item label="上传文件">
-                        <UploadDragger :size="5000000" ref="uploadRef" style="width:86%;height:148px;" @change="changeUpload" :accept="accept"
-                            @removeList="removeList"  :uploadUrl="uploadUrl" :params="folderId" :loadTrue="formParam.certificationName" />
+                        <UploadDragger :size="5000000" ref="uploadRef" style="width:86%;height:148px;"
+                          @change="changeUpload" :accept="accept" @removeList="removeList" :uploadUrl="uploadUrl"
+                          :params="folderId" :loadTrue="formParam.certificationName" />
                       </a-form-item>
                     </a-form>
                     <div class="bg_footer" style="margin-left: 160px;margin-top: 30px">
                       <div class="btn btn6" @click="cancelupdialog">
                         <div class="btnText">取消</div>
                       </div>
-                      <a-button
-                        class="btn btn6"
-                        @click="createupdialog"
-                      >
+                      <a-button class="btn btn6" @click="createupdialog">
                         确定
                       </a-button>
                     </div>
@@ -405,7 +394,7 @@
             </div>
             <div class="del_btnbox">
               <div class="del_btn btn2" @click="cancelTeacherDialog1" style="margin-right: 32px">
-                <div class="btnText">取消</div>                                                                                                                                                                                                                                                                                                                                                                                      
+                <div class="btnText">取消</div>
               </div>
               <div class="del_btn btn2" @click="closehandleOperate">
                 <div class="btnText">确定</div>
@@ -417,11 +406,11 @@
     </div>
     <AddContent v-model:showContent="showContent" v-model:AddContentList="formParam.orgLists" :Addtitle="Addtitle" />
     <!-- <div> <Upload/> </div>         -->
-     <LookInsideLecturer v-model:visible="lookinsideVisi" :id="lookinsideId"></LookInsideLecturer>
+    <LookInsideLecturer v-model:visible="lookinsideVisi" :id="lookinsideId"></LookInsideLecturer>
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch,computed,onMounted,nextTick  } from "vue";
+import { reactive, toRefs, ref, watch, computed, onMounted, nextTick } from "vue";
 import { useStore } from "vuex";
 import {
   RightOutlined,
@@ -433,9 +422,9 @@ import Editor from "@/components/project/Editor";
 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 { useRouter, useRoute } from "vue-router";
 import { getTeacherSystemList, getTeacherList, getPayRollPlace, getAllLevelList, insertTeacher, deleteInTeacher, updateInTeacher, getTeacherById, updateTeacherState } from "../../api/Lecturer";
- import { fileUp } from "../../api/indexEval";
+import { fileUp } from "../../api/indexEval";
 import { teacherUpload } from "../../api/Teaching";
 import { getCookieForName } from "@/api/method";
 // import {getProjSt} from "../../api/indexProjStu";
@@ -459,10 +448,10 @@ export default {
     UploadDragger,
     LookInsideLecturer,
   },
-  setup( ) {
+  setup() {
     onMounted(() => {
       const search = sessionStorage.getItem('searchLecturer')
-      if(route.query.activeKey == 1){
+      if (route.query.activeKey == 1) {
         state.moreid = 2
         state.searchParam = JSON.parse(search)
       }
@@ -474,7 +463,7 @@ export default {
     const router = useRouter();
     const userInfo = computed(() => store.state.userInfo);
     const state = reactive({
-      lookinsideVisi:false,
+      lookinsideVisi: false,
       lookinsideId: null,
       Addtitle: '选择教师专长',
       log: false,
@@ -502,8 +491,8 @@ export default {
       pageSize: 10,
       tableDataTotal: -1,//table列表总条数
       vf: false,
-      tSystemNames:{
-        systemName:null,
+      tSystemNames: {
+        systemName: null,
         systemId: null,
         levelVoList: []
       },
@@ -511,15 +500,15 @@ export default {
         name: null,
         certStatus: 0,//认证状态
         defaultTeachingTime: 0,
-        teacherType:1,
+        teacherType: 1,
         photo: null,
         gender: 0,
         orgLists: [],
         certification: null,
         certificationName: null,
       },
-      searchParam: { 
-        teacherType:1,
+      searchParam: {
+        teacherType: 1,
         pageNo: 1,
         // pageSize1: "10",
         name: null,
@@ -535,31 +524,31 @@ export default {
         pageNo: "1",
         pageSize: "10",
         userNo: null,
-        teacherType:1
+        teacherType: 1
       },
       activeName: 'first'
     })
     watch(() => state.formParam.description, (val) => {
-        console.log(val, 'description')
-      })
-      watch(() => state.formParam.workExperience, (val) => {
-        console.log(val, '')
-      })
-      watch(() => state.formParam.courses, (val) => {
-        console.log(val, 'courses')
-      })
-      watch(() => state.formParam.orgNames, (val) => {
-        console.log(val, 'orgName')
-        if(val){
-          const parts = val.split('/');
-          const reversedParts = parts.reverse();
-          state.formParam.orgName = reversedParts.join('/'); 
-        }
-      })
+      console.log(val, 'description')
+    })
+    watch(() => state.formParam.workExperience, (val) => {
+      console.log(val, '')
+    })
+    watch(() => state.formParam.courses, (val) => {
+      console.log(val, 'courses')
+    })
+    watch(() => state.formParam.orgNames, (val) => {
+      console.log(val, 'orgName')
+      if (val) {
+        const parts = val.split('/');
+        const reversedParts = parts.reverse();
+        state.formParam.orgName = reversedParts.join('/');
+      }
+    })
     const headers = { token: getCookieForName("token") };
     //图片上传
     const avatarChange = () => {
-      if(!state.formParam.name){
+      if (!state.formParam.name) {
         message.error('请先选择讲师')
         return
       }
@@ -601,9 +590,9 @@ export default {
     const folderId = ref({ folderId: process.env.VUE_APP_COURSE_FOLDERID })
     const changeUpload = (newValue) => {
       if (newValue[0].status == 'done' && newValue[0]?.response?.status == 200) {
-          const { id, name, path } = newValue[0].response.result
-          state.formParam.certifications = path
-          state.formParam.certificationNames = name
+        const { id, name, path } = newValue[0].response.result
+        state.formParam.certifications = path
+        state.formParam.certificationNames = name
       }
     }
 
@@ -622,8 +611,8 @@ export default {
       formData.append("file", file);
       teacherUpload(formData).then((res) => {
         if (res.data.code === 200) {
-        //  state.formParam.filesList = [res.data.data];
-        state.formParam.filesList = file.name
+          //  state.formParam.filesList = [res.data.data];
+          state.formParam.filesList = file.name
           // state.hasImgName = res.data.data;
         }
       });
@@ -654,9 +643,9 @@ export default {
     ]);
     //获取讲师体系列表
     const LecturerSystemLista = () => {
-      let obj ={
-        pageNo:1,
-        pageSize:1000,
+      let obj = {
+        pageNo: 1,
+        pageSize: 1000,
       }
       getTeacherSystemList(obj).then((res) => {
         if (res.data.code === 200) {
@@ -715,7 +704,7 @@ export default {
     }
     changetlevel()
     const OnTheJobStatusList = ref([
-      { value:"", label: "全部" },
+      { value: "", label: "全部" },
       { value: '0', label: "在职" },
       { value: '1', label: "离职" },
     ])
@@ -785,7 +774,7 @@ export default {
         customRender: (value, record) => {
           return (
             <div style="user-select:text">
-              {value.record.name}  /  {value.record.userNo}
+              { value.record.name }  /  { value.record.userNo }
             </div>
           )
         }
@@ -811,7 +800,7 @@ export default {
         key: 'tsystemName',
         ellipsis: true, align: "left",
         width: 200,
-        customCell:()=>{return{style:{userSelect: 'text'}}},
+        customCell: () => { return { style: { userSelect: 'text' } } },
       },
       {
         title: '级别 ',
@@ -827,8 +816,8 @@ export default {
         key: 'teaching',
         ellipsis: true, align: "center",
         width: 130,
-        customRender: ({text})=>{
-          return text ? text+'分钟' : '-'
+        customRender: ({ text }) => {
+          return text ? text + '分钟' : '-'
         }
       },
       {
@@ -840,12 +829,12 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {value.record.waitStatus == "0" || value.record.waitStatus == "1"
+              { value.record.waitStatus == "0" || value.record.waitStatus == "1"
                 ? {
                   "0": "在职",
                   "1": "离职",
                 }[value.record.waitStatus + ""] || ""
-                : "-"}
+                : "-" }
             </div>
           )
         }
@@ -859,12 +848,12 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {value.record?.certStatus == 0 || value.record?.certStatus == 1
+              { value.record?.certStatus == 0 || value.record?.certStatus == 1
                 ? {
                   "0": "未认证",
                   "1": "已认证",
                 }[value.record?.certStatus + ""] || ""
-                : "-"}
+                : "-" }
             </div>
           )
         }
@@ -878,13 +867,13 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {value.record.status == 0 || value.record.status == 1 || value.record.status == 2
+              { value.record.status == 0 || value.record.status == 1 || value.record.status == 2
                 ? {
                   '0': "临时",
                   '1': "启用",
                   '2': "停用"
                 }[value.record.status + ""] || ""
-                : "-"}
+                : "-" }
             </div>
           )
         }
@@ -898,12 +887,12 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {value.record?.createFrom == 0 || value.record?.createFrom == 1
+              { value.record?.createFrom == 0 || value.record?.createFrom == 1
                 ? {
                   "0": "自动录入",
                   "1": "手动录入",
                 }[value.record?.createFrom + ""] || ""
-                : "-"}
+                : "-" }
             </div>
           )
         }
@@ -924,7 +913,7 @@ export default {
 
     ])
     const enterPressHadlerSearch = (e) => {
-      if(e.keyCode==13){
+      if (e.keyCode == 13) {
         searchSubmit()
       }
     }
@@ -937,7 +926,7 @@ export default {
     const searchReset = () => {
       LecturerSystemLista()
       state.searchParam = {
-        teacherType:1,
+        teacherType: 1,
         name: null,
         userNo: null,
         newdepartId: null,
@@ -951,7 +940,7 @@ export default {
         pageNo: 1,
         pageSize: 10,
       };
-     // store.commit("setShouInclude", []);
+      // store.commit("setShouInclude", []);
       getTableDate();
     };
     //  List接口数据
@@ -989,7 +978,7 @@ export default {
     const addTeacher = () => {
       cancel()
       state.teacherdialog = true;
-      state.teacherdialogtitle = '新增讲师'
+      state.teacherdialogtitle = '新增讲师111'
       state.formParam.photo = null
       state.formParam.status = '1'
       state.vf = true
@@ -1014,14 +1003,14 @@ export default {
       });
     }
     const teacherTlevel = (val) => {
-      if(val?.avatar){
+      if (val?.avatar) {
         val.avatar = val.avatar.includes('upload') ? val.avatar : '/upload' + val.avatar
         state.formParam.photo = val.avatar
       }
       state.formParam.gender = val?.gender
     }
     const repl = (val) => {
-      if(val){
+      if (val) {
         val = val?.replace(/\s*&nbsp;\s*/g, '')
         val = val?.replace(/\s+/g, '')
         return val
@@ -1031,25 +1020,25 @@ export default {
     const createTeacherDialog = async () => {
       state.formParam.tsystemName = state.tSystemNames?.systemName
       state.formParam.tsystemId = state.tSystemNames?.systemId
-      if(state.formParam.defaultTeachingTime||state.formParam.defaultTeachingTime==0){
+      if (state.formParam.defaultTeachingTime || state.formParam.defaultTeachingTime == 0) {
         state.formParam.defaultTeachingTime = String(state.formParam.defaultTeachingTime)
       }
       const formItemNames = Object.keys(rules);
-      for(let i=0;i<formItemNames.length;i++){
+      for (let i = 0; i < formItemNames.length; i++) {
         // const result = await validateField(formItemNames[i]);
         const result = state.formParam[formItemNames[i]]
         if (!result) {
           return message.error(rules[formItemNames[i]][0].log)
         }
       }
-      if(state.formParam.certStatus&&!state.formParam.certificationName){
+      if (state.formParam.certStatus && !state.formParam.certificationName) {
         return message.error('请上传认证凭证')
       }
-      if(!state.formParam.certStatus){
+      if (!state.formParam.certStatus) {
         state.formParam.certification = null
         state.formParam.certificationName = null
       }
-      if(state.formParam.name){
+      if (state.formParam.name) {
         const nameNo = state.formParam?.name?.split('/')
         state.formParam.name = nameNo[0]
         state.formParam.userNo = nameNo[1]
@@ -1057,34 +1046,34 @@ export default {
       state.formParam.description = repl(state.formParam.description)
       state.formParam.workExperience = repl(state.formParam.workExperience)
       state.formParam.courses = repl(state.formParam.courses)
-      state.formParam.orgName =  state.formParam.orgNames
+      state.formParam.orgName = state.formParam.orgNames
       state.formParam.expertise = state.formParam?.orgLists?.map(item => item.id).join(',')
       state.formParam.expertiseNames = state.formParam?.orgLists?.map(item => item.name).join(',')
-      state.formParam = {...state.formParam,...state.tSystemNames}
+      state.formParam = { ...state.formParam, ...state.tSystemNames }
       delete state.formParam.teaching
       if (state.vf == false) {
         updateInTeacher(state.formParam).then(response => {
-            message.success("编辑成功");
+          message.success("编辑成功");
+          state.teacherdialog = false;
+          cancel()
+          getTableDate();
+        }).catch(err => {
+          message.error(err.data.msg)
+          state.teacherdialog = false;
+        })
+      }
+      else {
+        insertTeacher(state.formParam)
+          .then((res) => {
+            message.success("新增成功");
             state.teacherdialog = false;
             cancel()
-            getTableDate(); 
-          }).catch(err=>{
+            getTableDate();
+          }).catch((err) => {
             message.error(err.data.msg)
             state.teacherdialog = false;
-          })
-        }
-        else {
-          insertTeacher(state.formParam)
-            .then((res) => {
-              message.success("新增成功");
-              state.teacherdialog = false;
-              cancel()
-        getTableDate(); 
-            }).catch((err) => {
-              message.error(err.data.msg)
-              state.teacherdialog = false;
-            });
-        }
+          });
+      }
       // rule()
       // if (state.log = true) {
       //   state.teacherdialog = true;
@@ -1123,8 +1112,8 @@ export default {
       //           console.log(err);
       //         });
       //     }
-        //   state.teacherdialog = false;
-        //  getTableDate(); 
+      //   state.teacherdialog = false;
+      //  getTableDate(); 
       // }
     };
     //删除弹窗
@@ -1154,7 +1143,7 @@ export default {
           state.deleteInTeacherdialog = false
           getTableDate();
         }
-      }).catch((err)=>{
+      }).catch((err) => {
         message.error(err.data.msg)
         state.deleteInTeacherdialog = false
       })
@@ -1170,7 +1159,7 @@ export default {
         message.success("操作成功");
         state.editTeacher = false
         getTableDate();
-      }).catch((err)=>{
+      }).catch((err) => {
         state.editTeacher = false
       })
     }
@@ -1190,8 +1179,8 @@ export default {
       state.editTeacher = false
       state.tagsshow = 1
     };
-    watch(() => state.formParam.certStatus,(val)=>{
-      if(!val){
+    watch(() => state.formParam.certStatus, (val) => {
+      if (!val) {
         // state.formParam.certification = null
         // state.formParam.certificationName = null
       }
@@ -1207,7 +1196,7 @@ export default {
         name: null,
         newdepartId: null,
         tlevelId: null,
-        defaultTeachingTime:0,
+        defaultTeachingTime: 0,
         tsystemName: null,
         certStatus: 0,
         description: '',
@@ -1218,7 +1207,7 @@ export default {
         certificationName: null,
       }
       state.tSystemNames = {
-        systemName:null,
+        systemName: null,
         systemId: null,
         levelVoList: []
       }
@@ -1226,20 +1215,20 @@ export default {
     }
     const clearNonNumber = () => {
       state.formParam.defaultTeachingTime = state.formParam.defaultTeachingTime.replace(/\D/g, '');
-      state.formParam.defaultTeachingTime = state.formParam.defaultTeachingTime.slice(0,8)
+      state.formParam.defaultTeachingTime = state.formParam.defaultTeachingTime.slice(0, 8)
     }
     const blurNumber = () => {
       !state.formParam.defaultTeachingTime && (state.formParam.defaultTeachingTime = '0')
     }
     const focusNumber = () => {
-      state.formParam.defaultTeachingTime==0 && (state.formParam.defaultTeachingTime = null)
+      state.formParam.defaultTeachingTime == 0 && (state.formParam.defaultTeachingTime = null)
     }
     const rules = {
-      name: [{ required: true, message: '',log:'讲师不能为空' }],
+      name: [{ required: true, message: '', log: '讲师不能为空' }],
       // newdepartId: [{ required: true, message: '组织不能为空' }],
-      tsystemName: [{ required: true, message: '',log:'讲师体系不能为空' }],
-      tlevelId: [{ required: true, message: '',log:'讲师级别不能为空' }],
-      defaultTeachingTime: [{ required: true, message: '',log:'初始授课时长不能为空' }],
+      tsystemName: [{ required: true, message: '', log: '讲师体系不能为空' }],
+      tlevelId: [{ required: true, message: '', log: '讲师级别不能为空' }],
+      defaultTeachingTime: [{ required: true, message: '', log: '初始授课时长不能为空' }],
       // certStatus: [{ required: true, message: '认证状态不能为空' }],
 
     }
@@ -1285,7 +1274,7 @@ export default {
     }
     //内部讲师详情
     const TeacherSystem = () => {
-      getTeacherById({id:state.id}).then((res) => {
+      getTeacherById({ id: state.id }).then((res) => {
         if (res.data.code === 200) {
           // let objA= res.data.data[0]
           //   if( objA.orgName !==null ){
@@ -1298,12 +1287,12 @@ export default {
           state.formParam.description = state.formParam.description == null ? '<p><br></p>' : state.formParam.description
           state.formParam.workExperience = state.formParam.workExperience == null ? '<p><br></p>' : state.formParam.workExperience
           state.formParam.courses = state.formParam.courses == null ? '<p><br></p>' : state.formParam.courses
-          state.formParam.photo = state.formParam.photo == null ? null : state.formParam.photo.includes('upload') ? res.data.data.photo : '/upload'+res.data.data.photo
+          state.formParam.photo = state.formParam.photo == null ? null : state.formParam.photo.includes('upload') ? res.data.data.photo : '/upload' + res.data.data.photo
           state.tSystemNames.systemName = res.data.data.tsystemName
           state.tSystemNames.systemId = res.data.data.tsystemId
           state.tSystemNames.systemCode = res.data.data.systemCode
           state.tSystemNames.systemId = res.data.data.systemId
-          state.tSystemNames.levelVoList = res.data.data?.levelList?.map(item=>{
+          state.tSystemNames.levelVoList = res.data.data?.levelList?.map(item => {
             return {
               label: item.levelName,
               value: item.id,
@@ -1313,15 +1302,15 @@ export default {
           })
           state.formParam.tlevelName = res.data.data.tlevelName
           state.formParam.tlevelId = res.data.data.tlevelId
-          state.formParam.name = res.data.data.name+'/'+res.data.data.userNo
-          state.formParam.orgNames =  state.formParam.orgName
+          state.formParam.name = res.data.data.name + '/' + res.data.data.userNo
+          state.formParam.orgNames = state.formParam.orgName
           // state.formParam.orgLists = res.data.data.expertiseNames?.split(',').map(item=>({ name: item }))
           const ids = res.data.data?.expertise?.trim().split(',').filter(id => id !== '');
           const names = res.data.data?.expertiseNames?.split(',');
           state.formParam.orgLists = ids?.map((id, index) => ({
             name: names[index],
             id: id
-          }))||[]
+          })) || []
           state.formParam.certifications = state.formParam.certification
           state.formParam.certificationNames = state.formParam.certificationName
         }
@@ -1348,24 +1337,24 @@ export default {
     //   }
     // }
     const handleformlevel = (val) => {
-      state.formParam.tlevelName = state.tSystemNames.levelVoList.find(item=>item.id===val)?.levelName
-      state.formParam.tlevelId = state.tSystemNames.levelVoList.find(item=>item.id===val)?.id
+      state.formParam.tlevelName = state.tSystemNames.levelVoList.find(item => item.id === val)?.levelName
+      state.formParam.tlevelId = state.tSystemNames.levelVoList.find(item => item.id === val)?.id
     }
     //导出功能
     const handleExport = () => {
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacher?name=${state.searchParam.name || ""}&tSystemId=${state.searchParam.tSystemId || ""}&tLevelName=${state.searchParam.tLevelName || "" }&waitStatus=${state.searchParam.waitStatus || ""}&certStatus=${state.searchParam.certStatus || ""}&courses=${state.searchParam.courses || ""}`
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacher?name=${state.searchParam.name || ""}&tSystemId=${state.searchParam.tSystemId || ""}&tLevelName=${state.searchParam.tLevelName || ""}&waitStatus=${state.searchParam.waitStatus || ""}&certStatus=${state.searchParam.certStatus || ""}&courses=${state.searchParam.courses || ""}`
       );
       // this.download('lesson_records/export', {
       //           ...state.searchParam
       //       }, `project_${new Date().getTime()}.xlsx` )
     }
-    const lecturerAdmin = (admin)=>{
-        const roleCode = userInfo.value.roleList.map((item)=>item.roleCode)
-        if (admin){
-          return roleCode.some(t => t == admin)
-        }
-      }
+    const lecturerAdmin = (admin) => {
+      const roleCode = userInfo.value.roleList.map((item) => item.roleCode)
+      if (admin) {
+        return roleCode.some(t => t == admin)
+      }
+    }
     return {
       ...toRefs(state),
       lecturerAdmin,
@@ -1452,10 +1441,11 @@ export default {
 // ::v-deep .ant-input-affix-wrapper:not(.ant-input-affix-wrapper-disabled):hover{
 //   border-color: #40a9ff !important;
 // }
-.ant-form-item{
+.ant-form-item {
   // margin-bottom: 12px;
   // height: 40px;
 }
+
 .headers {
   height: 56px;
   border-bottom: 1px solid #e8e8e8;
@@ -1474,7 +1464,8 @@ export default {
     // margin-left: 24px;
   }
 }
-.selectonlineface{
+
+.selectonlineface {
   z-index: 999;
   width: 679px;
   background: #ffffff;
@@ -1483,24 +1474,26 @@ export default {
   left: 50%;
   top: -100%;
   transform: translate(-50%, -50%);
+
   .bg_headers {
     position: absolute;
     width: 100%;
     height: 40px;
-    background: linear-gradient(
-      rgba(78, 166, 255, 0.2) 0%,
-      rgba(78, 166, 255, 0) 100%
-    );
+    background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
+        rgba(78, 166, 255, 0) 100%);
   }
+
   .bg_main {
     width: 100%;
     position: relative;
+
     .bg_main_header {
       display: flex;
       align-items: center;
       padding-top: 20px;
       padding-left: 26px;
       font-size: 16px;
+
       .bg_main_header_icon {
         width: 16px;
         height: 16px;
@@ -1508,6 +1501,7 @@ export default {
         background-image: url(@/assets/images/evaluation/uploads.png);
         background-size: 100% 100%;
       }
+
       .bg_main_header_close {
         position: absolute;
         right: 42px;
@@ -1518,9 +1512,11 @@ export default {
         background-size: 100% 100%;
       }
     }
-    .text_color{
-      color:#d9d9d9;
+
+    .text_color {
+      color: #d9d9d9;
     }
+
     .bg_body {
       width: 80%;
       margin: 3px auto;
@@ -1536,7 +1532,8 @@ export default {
           display: flex;
           justify-content: end;
           margin-right: 20px;
-          .bg_body_btimg{
+
+          .bg_body_btimg {
             width: 10px;
             height: 10px;
             margin-top: -3px;
@@ -1544,15 +1541,21 @@ export default {
             background-size: 100% 100%;
           }
         }
+
         .mbl_items12 {
           width: 333px;
           margin-left: 128px;
-          .item_text{
+
+          .item_text {
             width: 300px;
-            white-space: nowrap; /* 不换行 */
-            overflow: hidden; /* 超出部分隐藏 */
-            text-overflow: ellipsis; /* 使用省略号表示被隐藏的部分 */
+            white-space: nowrap;
+            /* 不换行 */
+            overflow: hidden;
+            /* 超出部分隐藏 */
+            text-overflow: ellipsis;
+            /* 使用省略号表示被隐藏的部分 */
           }
+
           .i12_box1 {
             display: flex;
             align-items: center;
@@ -1614,7 +1617,8 @@ export default {
                     background-color: #4ea6ff;
                     border-radius: 3px;
                   }
-                  .updataxq1{
+
+                  .updataxq1 {
                     margin-top: 7px;
                   }
 
@@ -1653,62 +1657,70 @@ export default {
           }
         }
       }
+
       .bg_body_input {
         flex: 1;
         position: relative;
-        .ant-upload-picture-card-wrapper{
+
+        .ant-upload-picture-card-wrapper {
           width: 200px;
           margin-right: 18px;
         }
+
         .i_upload_img {
-            width: 200px;
-            height: 112px;
-          }
-          ::v-deep .ant-upload.ant-upload-select-picture-card{
-            width: 90px;
-            height: 90px;
-          }
-          .i_upload {
-            width: 200px;
-            height: 112px;
-            text-align: center;
-            align-items: center;
-            cursor: pointer;
+          width: 200px;
+          height: 112px;
+        }
 
-            .addimg {
-              position: relative;
+        ::v-deep .ant-upload.ant-upload-select-picture-card {
+          width: 90px;
+          height: 90px;
+        }
 
-              .heng {
-                position: absolute;
-                top: 59px;
-                left: 71px;
-                width: 60px;
-                border: 1px solid #d9d9d9;
-              }
+        .i_upload {
+          width: 200px;
+          height: 112px;
+          text-align: center;
+          align-items: center;
+          cursor: pointer;
 
-              .shu {
-                position: absolute;
-                top: 30px;
-                left: 100px;
-                height: 60px;
-                border: 1px solid #d9d9d9;
-              }
+          .addimg {
+            position: relative;
+
+            .heng {
+              position: absolute;
+              top: 59px;
+              left: 71px;
+              width: 60px;
+              border: 1px solid #d9d9d9;
+            }
+
+            .shu {
+              position: absolute;
+              top: 30px;
+              left: 100px;
+              height: 60px;
+              border: 1px solid #d9d9d9;
             }
           }
-        .upload_box{
+        }
+
+        .upload_box {
           border: 1px solid #d9d9d9;
           padding: 2px 5px;
           background-color: #d9d9d9;
           border-radius: 2px;
           cursor: pointer;
         }
-        .error-message{
+
+        .error-message {
           color: red;
           font-size: 11px;
           margin-top: 2px;
           margin-bottom: 0;
         }
       }
+
       .bg_footer {
         width: 100%;
         margin-left: 174px;
@@ -1744,28 +1756,34 @@ export default {
           background-color: #4ea6ff;
           color: #ffffff;
         }
+
         .btndesign {
           background-color: #eff4fc;
           color: #ffffff;
         }
       }
     }
-    .headers{
+
+    .headers {
       margin-left: 38px;
       margin-right: 38px;
       margin-top: 30px;
       display: flex;
       justify-content: space-between;
       flex-wrap: wrap;
-      .btn{
+
+      .btn {
         display: flex;
       }
-      .headers_item{
+
+      .headers_item {
         margin-right: 20px;
         margin-bottom: 20px;
-        .headers_item_text{
+
+        .headers_item_text {
           margin-right: 15px;
         }
+
         .headers_item_btn {
           padding: 0px 26px 0px 26px;
           height: 38px;
@@ -1791,6 +1809,7 @@ export default {
             margin-left: 5px;
           }
         }
+
         .btn1 {
           .search {
             width: 15px;
@@ -1798,6 +1817,7 @@ export default {
             background-image: url("../../assets/images/courseManage/search0.png");
           }
         }
+
         .btn2 {
           .search {
             width: 16px;
@@ -1805,19 +1825,23 @@ export default {
             background-image: url("../../assets/images/courseManage/reset0.png");
           }
         }
+
         ::v-deep .ant-select {
           border-radius: 5px;
           width: 100%;
           height: 40px;
+
           .ant-select-selector {
             border-radius: 8px;
             width: 100%;
             height: 40px;
           }
-          .ant-select-selection-placeholder{
+
+          .ant-select-selection-placeholder {
             line-height: 40px;
           }
-          .ant-select-selection-item{
+
+          .ant-select-selection-item {
             line-height: 40px;
           }
         }
@@ -1825,6 +1849,7 @@ export default {
     }
   }
 }
+
 ::v-deep .ant-upload.ant-upload-select-picture-card {
   border-radius: 50% !important;
   width: 90px;
@@ -1840,21 +1865,24 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  .text{
+
+  .text {
     font-size: 20px;
     color: #fff;
     margin-top: -4px;
   }
 }
-.add_list{
+
+.add_list {
   width: 136%;
-  margin-right:20px;
+  margin-right: 20px;
   display: flex;
   flex-wrap: wrap;
   margin-top: 10px;
   margin-bottom: 20px;
+
   // overflow: auto;
-  .add_item{
+  .add_item {
     padding: 5px 15px;
     color: #096dd9;
     background: #e6f7ff;
@@ -1870,6 +1898,7 @@ export default {
     margin-bottom: 20px;
     font-size: 12px;
   }
+
   .add_content {
     width: 30px;
     height: 30px;
@@ -1880,13 +1909,15 @@ export default {
     justify-content: center;
     align-items: center;
     margin-left: 10px;
-    .text{
+
+    .text {
       font-size: 20px;
       color: #fff;
       margin-top: -4px;
     }
   }
 }
+
 //导出按钮icon
 .daochu {
   width: 16px;
@@ -2091,6 +2122,7 @@ export default {
   margin-right: 14px;
   flex-shrink: 0;
   cursor: pointer;
+
   .search {
     width: 15px;
     height: 16px;
@@ -2208,25 +2240,31 @@ export default {
 ::v-deep .ant-modal-close {
   display: none;
 }
+
 .tableBox {
-padding-bottom: 20px;
-margin: 20px 38px 30px;
-::v-deep .ant-select-dropdown{
- display: inline-block;
-}
-::v-deep .ant-select-selection-item{
-margin-left: 3px;
-}
-::v-deep .ant-pagination-options-size-changer.ant-select{
-width: 84px;
-}
-.pa {
-width: 100%;
-display: flex;
-justify-content: right;
-}
+  padding-bottom: 20px;
+  margin: 20px 38px 30px;
+
+  ::v-deep .ant-select-dropdown {
+    display: inline-block;
+  }
+
+  ::v-deep .ant-select-selection-item {
+    margin-left: 3px;
+  }
+
+  ::v-deep .ant-pagination-options-size-changer.ant-select {
+    width: 84px;
+  }
+
+  .pa {
+    width: 100%;
+    display: flex;
+    justify-content: right;
+  }
 }
+
 .item_inp .i_upload_img[data-v-6b882d01] {
-  border-radius:50% 
+  border-radius: 50%
 }
-</style >
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/src/views/lecturer/LecturerList.vue b/src/views/lecturer/LecturerList.vue
index 2d0cad0f..cb2e747a 100644
--- a/src/views/lecturer/LecturerList.vue
+++ b/src/views/lecturer/LecturerList.vue
@@ -1,54 +1,55 @@
 <!-- 讲师列表 -->
 <template>
-    <div class="LecturerList">
-      <div style="margin: 20px;margin-top:0;" >
+  <div class="LecturerList">
+    <div style="margin: 20px;margin-top:0;">
       <a-tabs v-model:activeKey="activeKey">
-    <a-tab-pane key="1" tab="内部讲师">
-<InsideLecturer/>
-       </a-tab-pane>
-    <a-tab-pane key="2" tab="外部讲师">
-    <ExternalLecturer/>
-       </a-tab-pane>
-  </a-tabs>
+        <a-tab-pane key="1" tab="内部讲师">
+          <InsideLecturer />
+        </a-tab-pane>
+        <a-tab-pane key="2" tab="外部讲师">
+          <ExternalLecturer />
+        </a-tab-pane>
+      </a-tabs>
     </div>
-          </div>
-  </template>
-  <script lang="jsx">
-  import { reactive, toRefs, ref, watch,onMounted,nextTick } from "vue";
-  import InsideLecturer from "../lecturer/InsideLecturer.vue"
-  import ExternalLecturer from "../lecturer/ExternalLecturer.vue"
-  import { useRoute } from 'vue-router'
-  import { useStore } from 'vuex'
-   export default {
-    name: "LecturerList",
-    components: {
-      InsideLecturer,
-      ExternalLecturer
-    },
-    setup() {
-      const route = useRoute()
-      const store = useStore()
-      const state = reactive({
-        activeKey:'1'
-      })
-      watch(
-      )
-      onMounted(() => {
-        if(route.query.activeKey){
-          state.activeKey = route.query.activeKey
-        }
-      })
-     return {
-        ...toRefs(state),
+  </div>
+</template>
+<script lang="jsx">
+import { reactive, toRefs, ref, watch, onMounted, nextTick } from "vue";
+import InsideLecturer from "../lecturer/InsideLecturer.vue"
+import ExternalLecturer from "../lecturer/ExternalLecturer.vue"
+import { useRoute } from 'vue-router'
+import { useStore } from 'vuex'
+export default {
+  name: "LecturerList",
+  components: {
+    InsideLecturer,
+    ExternalLecturer
+  },
+  setup() {
+    const route = useRoute()
+    const store = useStore()
+    const state = reactive({
+      activeKey: '1'
+    })
+    watch(
+    )
+    onMounted(() => {
+      if (route.query.activeKey) {
+        state.activeKey = route.query.activeKey
       }
-    },
-  };
-  </script>
-  <style lang="scss" scoped>
-  ::v-deep .ant-tabs-tab{
-    font-weight: 600;
-  }
-  .LecturerList {
+    })
+    return {
+      ...toRefs(state),
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep .ant-tabs-tab {
+  font-weight: 600;
+}
+
+.LecturerList {
   width: 100%;
   height: 100%;
   display: flex;
@@ -320,5 +321,4 @@
     }
   }
 }
-</style>
-    
\ No newline at end of file
+</style>
\ No newline at end of file

From abbc468ad4b54d2f2a659181b436422649192149 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 13 Feb 2025 14:35:01 +0800
Subject: [PATCH 002/157] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=B2=E5=B8=88=20?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=B2=E5=B8=88=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=82=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideLecturer.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 70f92329..22cbc3ae 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -128,7 +128,7 @@
           <img style="width: 29px; height: 29px; cursor: pointer;margin-right: 24px;"
             src="@/assets/images/basicinfo/close.png" @click="cancelTeacherDialog" />
         </div>
-        <div ref="drawerContent" style="padding-left: 15px;padding-right: 46px;min-width:760px;">
+        <div ref="drawerContent" style="padding-left: 15px;padding-right: 100px;min-width:760px;">
           <a-form :model="formParam" layout="vertical" ref="formRef">
             <a-row>
               <a-col :span="24">
@@ -978,7 +978,7 @@ export default {
     const addTeacher = () => {
       cancel()
       state.teacherdialog = true;
-      state.teacherdialogtitle = '新增讲师111'
+      state.teacherdialogtitle = '新增讲师'
       state.formParam.photo = null
       state.formParam.status = '1'
       state.vf = true

From 49de02fe1f8b0667eafb0b745b2ca8d32801a7af Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 13 Feb 2025 14:38:48 +0800
Subject: [PATCH 003/157] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=B2=E5=B8=88=20?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=B2=E5=B8=88=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=82=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideLecturer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 22cbc3ae..0c2f92c5 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -128,7 +128,7 @@
           <img style="width: 29px; height: 29px; cursor: pointer;margin-right: 24px;"
             src="@/assets/images/basicinfo/close.png" @click="cancelTeacherDialog" />
         </div>
-        <div ref="drawerContent" style="padding-left: 15px;padding-right: 100px;min-width:760px;">
+        <div ref="drawerContent" style="padding-left: 15px;padding-right: 120px;min-width:760px;">
           <a-form :model="formParam" layout="vertical" ref="formRef">
             <a-row>
               <a-col :span="24">

From 3824a363be439b5ceb194c82b4b564e87345d7bf Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 13 Feb 2025 14:44:23 +0800
Subject: [PATCH 004/157] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=B2=E5=B8=88=20?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=B2=E5=B8=88=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=82=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideLecturer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 0c2f92c5..97b62245 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -128,7 +128,7 @@
           <img style="width: 29px; height: 29px; cursor: pointer;margin-right: 24px;"
             src="@/assets/images/basicinfo/close.png" @click="cancelTeacherDialog" />
         </div>
-        <div ref="drawerContent" style="padding-left: 15px;padding-right: 120px;min-width:760px;">
+        <div ref="drawerContent" style="padding-left: 15px;padding-right: 150px;min-width:760px;">
           <a-form :model="formParam" layout="vertical" ref="formRef">
             <a-row>
               <a-col :span="24">

From 7a22dcb8e38b7e14d555132537567bde43dad212 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 13 Feb 2025 15:38:23 +0800
Subject: [PATCH 005/157] =?UTF-8?q?=E5=86=85=E9=83=A8=E8=AE=B2=E5=B8=88?=
 =?UTF-8?q?=EF=BC=9A=20=20-=20=E6=9F=A5=E7=9C=8B=E8=AE=B2=E5=B8=88?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E4=B8=8B=E8=BD=BD=E2=80=9C=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E8=B5=84=E6=96=99=E2=80=9D=EF=BC=8C=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=20upload=20=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             | 21 ++++++++-----------
 src/components/project/LookInsideLecturer.vue | 12 ++++++++---
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e500dfe5..b73ffc61 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3727,8 +3727,6 @@
       "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
       "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -3740,9 +3738,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true,
-      "optional": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/ajv-keywords": {
       "version": "3.5.2",
@@ -14457,6 +14453,7 @@
       "integrity": "sha512-yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg==",
       "dev": true,
       "requires": {
+        "@babel/core": "^7.12.16",
         "@babel/helper-compilation-targets": "^7.12.16",
         "@babel/helper-module-imports": "^7.12.13",
         "@babel/plugin-proposal-class-properties": "^7.12.13",
@@ -14469,6 +14466,7 @@
         "@vue/babel-plugin-jsx": "^1.0.3",
         "@vue/babel-preset-jsx": "^1.1.2",
         "babel-plugin-dynamic-import-node": "^2.3.3",
+        "core-js": "^3.8.3",
         "core-js-compat": "^3.8.3",
         "semver": "^7.3.4"
       },
@@ -15334,14 +15332,15 @@
       "resolved": "https://registry.npmmirror.com/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
       "dev": true,
-      "requires": {},
+      "requires": {
+        "ajv": "^8.0.0"
+      },
       "dependencies": {
         "ajv": {
-          "version": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
+          "version": "8.12.0",
+          "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
           "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
           "dev": true,
-          "optional": true,
-          "peer": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "json-schema-traverse": "^1.0.0",
@@ -15353,9 +15352,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
           "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true,
-          "optional": true,
-          "peer": true
+          "dev": true
         }
       }
     },
diff --git a/src/components/project/LookInsideLecturer.vue b/src/components/project/LookInsideLecturer.vue
index 01c88289..d849bc5b 100644
--- a/src/components/project/LookInsideLecturer.vue
+++ b/src/components/project/LookInsideLecturer.vue
@@ -437,9 +437,15 @@ export default {
     // }
     // getSysTypeMap()
     const handleup = () => {
-      window.open(
-        `${process.env.VUE_APP_BOE_API_URL}/upload${state.formParam.certification}`
-      );
+      let url = "";
+      if(state.formParam.certification != null && state.formParam.certification != undefined && state.formParam.certification != ''){
+        if(state.formParam.certification.startWith("/upload")){
+          url = `${process.env.VUE_APP_BOE_API_URL}${state.formParam.certification}`
+        }else{
+          url = `${process.env.VUE_APP_BOE_API_URL}/upload${state.formParam.certification}`
+        }
+      }
+      window.open(url);
     }
     return {
       ...toRefs(state),

From 97612a8b26298da8bf7648d4c4106c0b03eb04e7 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 13 Feb 2025 15:45:43 +0800
Subject: [PATCH 006/157] =?UTF-8?q?=E5=86=85=E9=83=A8=E8=AE=B2=E5=B8=88?=
 =?UTF-8?q?=EF=BC=9A=20=20-=20=E6=9F=A5=E7=9C=8B=E8=AE=B2=E5=B8=88?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E4=B8=8B=E8=BD=BD=E2=80=9C=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E8=B5=84=E6=96=99=E2=80=9D=EF=BC=8C=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=20upload=20=E5=88=A4=E6=96=AD=20includes=20=E7=9A=84=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/LookInsideLecturer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/project/LookInsideLecturer.vue b/src/components/project/LookInsideLecturer.vue
index d849bc5b..f5dd19b9 100644
--- a/src/components/project/LookInsideLecturer.vue
+++ b/src/components/project/LookInsideLecturer.vue
@@ -439,7 +439,7 @@ export default {
     const handleup = () => {
       let url = "";
       if(state.formParam.certification != null && state.formParam.certification != undefined && state.formParam.certification != ''){
-        if(state.formParam.certification.startWith("/upload")){
+        if(state.formParam.certification.includes("/upload")){
           url = `${process.env.VUE_APP_BOE_API_URL}${state.formParam.certification}`
         }else{
           url = `${process.env.VUE_APP_BOE_API_URL}/upload${state.formParam.certification}`

From 93d2a8586bddf5c9b7f7d8793d73b82b737e4172 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 13 Feb 2025 16:50:36 +0800
Subject: [PATCH 007/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8Fee?=
 =?UTF-8?q?=20,=20log=20=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index f4487de0..8ed69af0 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -1121,6 +1121,7 @@ getAllLevelList().then((res) => {
       ])
       // 搜索
       const searchSubmit = () => {
+        console.log("searchSubmit gx")
         state.searchParam.pageNo = 1
         getTableDate();
       };
@@ -1160,8 +1161,10 @@ getAllLevelList().then((res) => {
         let objA = { ...state.searchParam };
          objA.beginTime = state.searchdate ? dayjs(state.searchdate[0]).format("YYYY-MM-DD") : "",
         objA.endTime =  state.searchdate ? dayjs(state.searchdate[1]).format("YYYY-MM-DD") : "",
+        console.log("getTableDate gx objA",objA);
         getTeacherFeeList(objA)
           .then((res) => {
+            console.log("getTeacherFeeList gx objA",objA);
             tableData.value = res.data.data.records
             state.tableDataTotal = Number(res.data.data.total);
             state.tableLoading=false
@@ -1590,10 +1593,12 @@ getAllLevelList().then((res) => {
       state.allFeedialog=true 
     }
     const visibleAll = (val) => {
+      console.log("visibleAll gx val",val)
       state.allFeedialog = val
       searchSubmit()
     }
     const getexample = (val) => {
+      console.log("getexample gx val",val);
       state.example = val
     }
     const selectedRowKey = (val) => {

From 89b358bd8668d30f2770fdb01dc40af6407bdde2 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 13 Feb 2025 17:02:18 +0800
Subject: [PATCH 008/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8Fee?=
 =?UTF-8?q?=20,=20log=20=E6=97=A5=E5=BF=97=20=EF=BC=8C=20=E7=9B=91?=
 =?UTF-8?q?=E5=90=AC=E6=97=A5=E5=BF=97=20=E5=BD=93=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E5=BC=B9=E8=B5=B7=20=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ConfirmLecturer.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index 7965643d..c82c1cb7 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -195,7 +195,8 @@ watch(()=>props.visible,(val)=>{
       }
     ).then(res=>{
       if(res.data.code === 200){
-        forData.value = res.data.data
+        forData.value = res.data.data;
+        console.log("getListByAffiliation gx forData.value ",forData.value)
         forData.value.forEach((item,i) => {
           searchConditions.value.push({ nameUserNo: '', dateValue: [] });
           expenseList.value.push(forData.value[i]?.expenseList || [])

From db5f0b91ed3a0043132ffc52f5ab62c27a94f543 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 13 Feb 2025 17:17:45 +0800
Subject: [PATCH 009/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8Fee?=
 =?UTF-8?q?=20,=20log=20=E6=97=A5=E5=BF=97=20=EF=BC=8C=20=E7=9B=91?=
 =?UTF-8?q?=E5=90=AC=E6=97=A5=E5=BF=97=20=E5=BD=93=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E5=BC=B9=E8=B5=B7=20=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=20,=20=E7=82=B9=E5=87=BB=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ConfirmLecturer.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index c82c1cb7..a90f3f8c 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -173,6 +173,7 @@ const expenseList = ref([])
 const searchList = ref([])
 const timesList = ref([])
 const clickItem = (item,i) => {
+  console.log("clickItem gx item",item,i);
   indexList.value = i
   resetData(i,false)
 }
@@ -197,6 +198,7 @@ watch(()=>props.visible,(val)=>{
       if(res.data.code === 200){
         forData.value = res.data.data;
         console.log("getListByAffiliation gx forData.value ",forData.value)
+        console.log("getListByAffiliation gx forData.value value",forData.value)
         forData.value.forEach((item,i) => {
           searchConditions.value.push({ nameUserNo: '', dateValue: [] });
           expenseList.value.push(forData.value[i]?.expenseList || [])
@@ -466,6 +468,7 @@ const columns = [
 const closeDrawer = () => emit("update:visible", false);
 const activeList = ref([])
 const setList = (item) => {
+  console.log("setList gx item",item)
   const index = activeList.value.findIndex(listItem => listItem === item);
   if (index > -1) {
     activeList.value.splice(index, 1);

From ca90b06bba19192be9c700e32b8bff95fcfa03d1 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 13 Feb 2025 17:30:36 +0800
Subject: [PATCH 010/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8Fee?=
 =?UTF-8?q?=20,=20log=20=E6=97=A5=E5=BF=97=20=EF=BC=8C=20=E7=9B=91?=
 =?UTF-8?q?=E5=90=AC=E6=97=A5=E5=BF=97=20=E5=BD=93=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E5=BC=B9=E8=B5=B7=20=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=20,=20=E7=82=B9=E5=87=BB=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=20,=20=E6=BF=80=E6=B4=BB=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ConfirmLecturer.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index a90f3f8c..5299de32 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -469,6 +469,7 @@ const closeDrawer = () => emit("update:visible", false);
 const activeList = ref([])
 const setList = (item) => {
   console.log("setList gx item",item)
+  console.log("setList gx activeList",activeList)
   const index = activeList.value.findIndex(listItem => listItem === item);
   if (index > -1) {
     activeList.value.splice(index, 1);

From a93278ab200507d1591262adfc354fe09940d9ff Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 13 Feb 2025 17:54:57 +0800
Subject: [PATCH 011/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8Fee?=
 =?UTF-8?q?=20,=20log=20=E6=97=A5=E5=BF=97=20=EF=BC=8C=20=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E6=BF=80=E6=B4=BB=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ConfirmLecturer.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index 5299de32..039bedf0 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -199,6 +199,11 @@ watch(()=>props.visible,(val)=>{
         forData.value = res.data.data;
         console.log("getListByAffiliation gx forData.value ",forData.value)
         console.log("getListByAffiliation gx forData.value value",forData.value)
+        //todo1 , 只有一个处理 初始化 处理数据 ，进行 激活处理
+        if(forData.value.length == 1){
+            activeList.value.push(forData.value[0]);
+        }
+
         forData.value.forEach((item,i) => {
           searchConditions.value.push({ nameUserNo: '', dateValue: [] });
           expenseList.value.push(forData.value[i]?.expenseList || [])

From a0cac8107ace26743e96600ebc86817f6f0bb161 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 13 Feb 2025 18:00:18 +0800
Subject: [PATCH 012/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8Fee?=
 =?UTF-8?q?=20,=20log=20=E6=97=A5=E5=BF=97=20=EF=BC=8C=20=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E6=BF=80=E6=B4=BB=E7=8A=B6=E6=80=81=20,=20?=
 =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E5=8F=AA=E6=9C=89=E4=B8=80=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ConfirmLecturer.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index 039bedf0..7a377a6a 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -200,6 +200,7 @@ watch(()=>props.visible,(val)=>{
         console.log("getListByAffiliation gx forData.value ",forData.value)
         console.log("getListByAffiliation gx forData.value value",forData.value)
         //todo1 , 只有一个处理 初始化 处理数据 ，进行 激活处理
+        forData.value = forData.value.splice(0,1);
         if(forData.value.length == 1){
             activeList.value.push(forData.value[0]);
         }

From f39cad094d242d0f65fe2f3f5945dc2c05d8f9b3 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 13 Feb 2025 18:03:22 +0800
Subject: [PATCH 013/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8Fee?=
 =?UTF-8?q?=20,=20log=20=E6=97=A5=E5=BF=97=20=EF=BC=8C=20=E6=A8=A1?=
 =?UTF-8?q?=E6=8B=9F=200=20=E8=A7=92=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ConfirmLecturer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index 7a377a6a..5c173a73 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -202,7 +202,7 @@ watch(()=>props.visible,(val)=>{
         //todo1 , 只有一个处理 初始化 处理数据 ，进行 激活处理
         forData.value = forData.value.splice(0,1);
         if(forData.value.length == 1){
-            activeList.value.push(forData.value[0]);
+            activeList.value.push(0);
         }
 
         forData.value.forEach((item,i) => {

From ecd05cafa6d56f05286c855f56e8b4573c23e639 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 13 Feb 2025 18:11:08 +0800
Subject: [PATCH 014/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8Fee?=
 =?UTF-8?q?=20,=20log=20=E6=97=A5=E5=BF=97=20=EF=BC=8C=20=E6=A8=A1?=
 =?UTF-8?q?=E6=8B=9F=200=20=E8=A7=92=E6=A0=87=20,=20=E9=AB=98=E4=BA=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=BB=98=E8=AE=A4=201=20=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ConfirmLecturer.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index 5c173a73..cc0c4628 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -200,11 +200,9 @@ watch(()=>props.visible,(val)=>{
         console.log("getListByAffiliation gx forData.value ",forData.value)
         console.log("getListByAffiliation gx forData.value value",forData.value)
         //todo1 , 只有一个处理 初始化 处理数据 ，进行 激活处理
-        forData.value = forData.value.splice(0,1);
         if(forData.value.length == 1){
             activeList.value.push(0);
         }
-
         forData.value.forEach((item,i) => {
           searchConditions.value.push({ nameUserNo: '', dateValue: [] });
           expenseList.value.push(forData.value[i]?.expenseList || [])

From 74f69bf70f2244ef7392c6fd1b83f1cb52b4dbcb Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 10:15:36 +0800
Subject: [PATCH 015/157] =?UTF-8?q?"=E6=95=99=E5=B8=88=E4=BD=93=E7=B3=BB":?=
 =?UTF-8?q?=20=E8=BF=87=E6=BB=A4=E5=8D=8E=E7=81=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideLecturer.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 97b62245..1027a80b 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -646,8 +646,10 @@ export default {
       let obj = {
         pageNo: 1,
         pageSize: 1000,
+        isView: 1
       }
       getTeacherSystemList(obj).then((res) => {
+        console.log("getTeacherSystemList res.data.data.records",res.data.data.records)
         if (res.data.code === 200) {
           let arr = res.data.data.records;
           let array = [];

From f7f8e384dd6024d03932711f59afa02889e55397 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 10:34:58 +0800
Subject: [PATCH 016/157] =?UTF-8?q?"=E6=95=99=E5=B8=88=E4=BD=93=E7=B3=BB":?=
 =?UTF-8?q?=20=E8=BF=87=E6=BB=A4=E5=8D=8E=E7=81=BF=20,"=E6=95=99=E5=B8=88?=
 =?UTF-8?q?=E8=B4=B9=E7=94=A8"=20=E8=BF=87=E6=BB=A4=20=E5=8D=8E=E7=81=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 8ed69af0..eabf2af4 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -756,6 +756,7 @@
       let obj ={
         pageNo:1,
         pageSize:1000,
+        isView: 1
       }
       getTeacherSystemList(obj).then((res) => {
         if (res.data.code === 200) {

From 777dac17c222a280578134ed31d1736acbf0687a Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 11:09:47 +0800
Subject: [PATCH 017/157] =?UTF-8?q?"=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95"?=
 =?UTF-8?q?=20=E6=9F=A5=E7=9C=8B=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue | 28 +++++-----
 src/views/lecturer/TeachingRecord.vue | 77 ++++++++++++++-------------
 2 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 7f359295..0916eebf 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -413,27 +413,27 @@
         <span style="font-weight:600;">讲师信息</span>
         <a-descriptions style="margin-top:15px;" bordered :column="2" :contentStyle="{'maxWidth':'300px'}" :labelStyle="{'width':'160px'}">
           <a-descriptions-item label="讲师名称"><div style="user-select: text">{{ formParam.teacherName ||'-'}}/{{ formParam.userNo||'-' }}</div></a-descriptions-item>
-          
-          <!-- <a-descriptions-item label="讲师组织">{{ formParam.orgName||'-' }}</a-descriptions-item> -->
-          <a-descriptions-item label="培训发生组织">{{ formParam.trainOrgName||'-' }}</a-descriptions-item>
-          <!-- <a-descriptions-item label="讲师体系">{{ formParam.tsystemName||'-' }}</a-descriptions-item> -->
-          <!-- <a-descriptions-item label="讲师级别">{{ formParam.tlevelName||'-'}}</a-descriptions-item> -->
-          <a-descriptions-item label="数据来源">
-            {{ formParam.createFrom == 0 ? '系统生成' : formParam.createFrom == 1 ? '手动录入' : '-' }}</a-descriptions-item>
-            <a-descriptions-item label="课程类型">{{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 2 ? '手动录入' : '-'
-          }}</a-descriptions-item>
           <a-descriptions-item label="课程名称"><div style="user-select: text">{{ formParam.courseName||'-' }}</div></a-descriptions-item>
+          <a-descriptions-item label="课程类型">{{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 5 ? '手动录入' : '-'
+          }}</a-descriptions-item>
+          <a-descriptions-item label="授课/课程日期"><div style="user-select: text">{{ formParam.teachingDate||'-' }}</div></a-descriptions-item>
           <a-descriptions-item label="开课状态">{{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1
             ? '已开课' : '-' }}</a-descriptions-item>
-          <a-descriptions-item label="授课/课程时长  ">
+         <a-descriptions-item label="授课/课程时长（分钟）">
             <span> {{ formParam.teaching }} 分钟</span>
             <span style="margin-left: 10px ;" v-if="formParam.teaching != '0'">({{ (formParam.teaching / 60
             ).toFixed(2) }}小时)</span> </a-descriptions-item>
-          <a-descriptions-item label="授课/课程日期"><div style="user-select: text">{{ formParam.teachingDate||'-' }}</div></a-descriptions-item>
-          <a-descriptions-item label="参训人数  ">{{ formParam.studys?formParam.studys+'人':'-' }}</a-descriptions-item>
-          <a-descriptions-item label="评分  ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(2)+'分':'-' }}</a-descriptions-item>
+   <a-descriptions-item label="参训人数  ">{{ formParam.studys?formParam.studys+'人':'-' }}</a-descriptions-item>
+   <a-descriptions-item label="评分  ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(2)+'分':'-' }}</a-descriptions-item>
+          <!-- <a-descriptions-item label="讲师组织">{{ formParam.orgName||'-' }}</a-descriptions-item> -->
+          <a-descriptions-item label="培训发生组织">{{ formParam.trainOrgName||'-' }}</a-descriptions-item>
+          <a-descriptions-item label="是否生成讲师费">{{{0:'否',1:'是'}[formParam.createdFee]}}</a-descriptions-item>
+          <!-- <a-descriptions-item label="讲师体系">{{ formParam.tsystemName||'-' }}</a-descriptions-item> -->
+          <!-- <a-descriptions-item label="讲师级别">{{ formParam.tlevelName||'-'}}</a-descriptions-item> -->
+          <!-- <a-descriptions-item label="数据来源">
+            {{ formParam.createFrom == 0 ? '系统生成' : formParam.createFrom == 1 ? '手动录入' : '-' }}</a-descriptions-item> -->
           <!-- <a-descriptions-item label="内容分类">{{ formParam.courseTypeName||'-' }}</a-descriptions-item> -->
-           <a-descriptions-item label="是否生成讲师费">{{{0:'否',1:'是'}[formParam.createdFee]}}</a-descriptions-item>
+          
           <a-descriptions-item label="备注  ">{{ formParam.remark||'-' }}</a-descriptions-item>
         </a-descriptions>
         <div v-if="formParam.createFrom == '0'">
diff --git a/src/views/lecturer/TeachingRecord.vue b/src/views/lecturer/TeachingRecord.vue
index 4134ae6b..903ac89a 100644
--- a/src/views/lecturer/TeachingRecord.vue
+++ b/src/views/lecturer/TeachingRecord.vue
@@ -1,45 +1,46 @@
 <!-- 授课记录 -->
 <template>
-    <div class="TeachingRecord" >
-      <div style="margin: 20px;margin-top:0;" >
+  <div class="TeachingRecord">
+    <div style="margin: 20px;margin-top:0;">
       <a-tabs v-model:activeKey="activeKey">
-    <a-tab-pane key="1" tab="内部讲师授课记录">
-<InsideTeaching/>
-       </a-tab-pane>
-    <a-tab-pane key="2" tab="外部讲师授课记录">
-      <ExternalTeaching/>
-       </a-tab-pane>
-  </a-tabs>
+        <a-tab-pane key="1" tab="内部讲师授课记录">
+          <InsideTeaching />
+        </a-tab-pane>
+        <a-tab-pane key="2" tab="外部讲师授课记录">
+          <ExternalTeaching />
+        </a-tab-pane>
+      </a-tabs>
     </div>
-    </div>
-  </template>
-  <script lang="jsx">
-  import { reactive, toRefs, ref, watch } from "vue";
-  import InsideTeaching from "../lecturer/InsideTeaching.vue"
-  import ExternalTeaching from "../lecturer/ExternalTeaching.vue"
-   export default {
-    name: "TeachingRecord",
-    components: {
-      InsideTeaching,
-      ExternalTeaching,
-    },
-    setup() {
-      const state = reactive({
-        activeKey:'1'
-      })
-      watch(
-      )
-     return {
-        ...toRefs(state), 
-    
-      }
-    },
-  };
-  </script>
-  <style lang="scss" scoped>
-  ::v-deep .ant-tabs-tab{
-    font-weight: 600;
-  }
+  </div>
+</template>
+<script lang="jsx">
+import { reactive, toRefs, ref, watch } from "vue";
+import InsideTeaching from "../lecturer/InsideTeaching.vue"
+import ExternalTeaching from "../lecturer/ExternalTeaching.vue"
+export default {
+  name: "TeachingRecord",
+  components: {
+    InsideTeaching,
+    ExternalTeaching,
+  },
+  setup() {
+    const state = reactive({
+      activeKey: '1'
+    })
+    watch(
+    )
+    return {
+      ...toRefs(state),
+
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep .ant-tabs-tab {
+  font-weight: 600;
+}
+
 .TeachingRecord {
   width: 100%;
   height: 100%;

From b072a1435748fcb5dcbb11d612dae31f47abfbae Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 13:21:00 +0800
Subject: [PATCH 018/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E8=AE=B2=E5=B8=88=E4=BD=93=E7=B3=BB=20?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=94=AF=E6=8C=81=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index eabf2af4..af62877f 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -25,6 +25,7 @@
           <a-form-item  class="select">
             <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.trainOrgId" placeholder="请选择培训发生组织" allowClear
               :options="orgListSearch" 
+              showSearch
               v-on:keydown.enter="enterPressHadlerSearch">
             </a-select>
           </a-form-item>

From 0882621349c09793b3d5a29b2d87811b2036ec23 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 14:12:52 +0800
Subject: [PATCH 019/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E8=AE=B2=E5=B8=88=E4=BD=93=E7=B3=BB=20?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=94=AF=E6=8C=81=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=20,=20=E7=AD=9B=E9=80=89=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index af62877f..f419b1c3 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -714,7 +714,7 @@
           state.orgListSearch = res.data.data?.map(item=>{
             return{
               label: item.affiliationName,
-              value: item.id 
+              value: item.affiliationName 
             }
           })
           state.orgListSearch.unshift({

From d3b71987504228ae5c9226f2c0a8689598dfb4c5 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 14:19:53 +0800
Subject: [PATCH 020/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E8=AE=B2=E5=B8=88=E4=BD=93=E7=B3=BB=20?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=94=AF=E6=8C=81=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=20,=20=E7=AD=9B=E9=80=89=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index f419b1c3..1c1bd75e 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -708,13 +708,13 @@
           state.orgList = res.data.data?.map(item=>{
             return{
               label: item.affiliationName,
-              value: item.id 
+              value: item.affiliationName 
             }
           })
           state.orgListSearch = res.data.data?.map(item=>{
             return{
               label: item.affiliationName,
-              value: item.affiliationName 
+              value: item.id 
             }
           })
           state.orgListSearch.unshift({

From d457b501c3767400f699587879cd43909494c694 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 14:38:05 +0800
Subject: [PATCH 021/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E8=AE=B2=E5=B8=88=E4=BD=93=E7=B3=BB=20?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=94=AF=E6=8C=81=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=20,=20=E7=AD=9B=E9=80=89=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 1c1bd75e..f419b1c3 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -708,13 +708,13 @@
           state.orgList = res.data.data?.map(item=>{
             return{
               label: item.affiliationName,
-              value: item.affiliationName 
+              value: item.id 
             }
           })
           state.orgListSearch = res.data.data?.map(item=>{
             return{
               label: item.affiliationName,
-              value: item.id 
+              value: item.affiliationName 
             }
           })
           state.orgListSearch.unshift({

From e399d8b014e1ef2458117ebc1846636c19f42545 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 15:04:16 +0800
Subject: [PATCH 022/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 3117 ++++++++++++++--------------
 1 file changed, 1551 insertions(+), 1566 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index f419b1c3..76032e2c 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -1,205 +1,198 @@
 <!-- 讲师费管理页面 -->
 <template>
-    <div >
-      <!-- 搜索框及按钮 -->
-      <div class="filter" >
-        <a-form layout="inline" style="min-width: 1056px;">
-          <a-form-item class="select">
-            <!--  v-model:value="searchParam.name" -->
-            <!-- <a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
+  <div>
+    <!-- 搜索框及按钮 -->
+    <div class="filter">
+      <a-form layout="inline" style="min-width: 1056px;">
+        <a-form-item class="select">
+          <!--  v-model:value="searchParam.name" -->
+          <!-- <a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
               placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
             </a-input>
-   -->  <div  style="width: 235px; height: 40px; border-radius: 8px"  >
-    <a-input v-model:value="searchParam.name" style="width: 235px; height: 40px; border-radius: 8px"
-            placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch
-            v-on:keydown.enter="enterPressHadlerSearch">
-          </a-input>
-                  </div>
-          </a-form-item>
-          <a-form-item class="select">
-            <a-input v-model:value="searchParam.courseName" style="width: 230px; height: 40px; border-radius: 8px"
-              placeholder="请输入课程名称进行检索" allowClear showSearch
-              v-on:keydown.enter="enterPressHadlerSearch">
+   -->
+          <div style="width: 235px; height: 40px; border-radius: 8px">
+            <a-input v-model:value="searchParam.name" style="width: 235px; height: 40px; border-radius: 8px"
+              placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch v-on:keydown.enter="enterPressHadlerSearch">
             </a-input>
-          </a-form-item>
-          <a-form-item  class="select">
-            <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.trainOrgId" placeholder="请选择培训发生组织" allowClear
-              :options="orgListSearch" 
-              showSearch
-              v-on:keydown.enter="enterPressHadlerSearch">
-            </a-select>
-          </a-form-item>
-          <a-form-item class="select ">
+          </div>
+        </a-form-item>
+        <a-form-item class="select">
+          <a-input v-model:value="searchParam.courseName" style="width: 230px; height: 40px; border-radius: 8px"
+            placeholder="请输入课程名称进行检索" allowClear showSearch v-on:keydown.enter="enterPressHadlerSearch">
+          </a-input>
+        </a-form-item>
+        <a-form-item class="select">
+          <a-select 
+            v-model:value="searchParam.trainOrgId" 
+            style="width: 200px" 
+            :options="orgListSearch" 
+            @search="handleSearch"
+            placeholder="请选择培训发生组织"
+            allowClear>
+            <a-select-option v-for="option in orgListSearch" :key="option.value" :value="option.value">
+              {{ option.label }}
+            </a-select-option>
+          </a-select>
+
+
+
+          <!-- <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.trainOrgId"
+            placeholder="请选择培训发生组织" allowClear :options="orgListSearch" showSearch
+            v-on:keydown.enter="enterPressHadlerSearch">
+          </a-select> -->
+        </a-form-item>
+        <a-form-item class="select ">
           <!-- <div class="select addTimeBox">
             <div class="addTime" >授课日期：</div> -->
-            <a-range-picker
-              v-model:value="searchdate"
-              style="width: 340px !important;"
-              format="YYYY-MM-DD"
-              valueFormat="YYYY-MM-DD"
-              separator="至"
-              :placeholder="['授课日期开始时间', '授课日期结束时间']"
-              v-on:keydown.enter="enterPressHadlerSearch"
-            />
+          <a-range-picker v-model:value="searchdate" style="width: 340px !important;" format="YYYY-MM-DD"
+            valueFormat="YYYY-MM-DD" separator="至" :placeholder="['授课日期开始时间', '授课日期结束时间']"
+            v-on:keydown.enter="enterPressHadlerSearch" />
           <!-- </div> -->
-          </a-form-item>
-          <a-form-item class="select">
-            <a-select style="width: 200px ;margin-bottom:20px" v-model:value="searchParam.type" placeholder="请选择课程类型" allowClear
-              :options="OnTheJobStatusList"
-              v-on:keydown.enter="enterPressHadlerSearch">
-            </a-select>
-          </a-form-item>
-          <a-form-item class="select"  v-if="moreid==2">
-            <a-select style="width: 200px ;margin-bottom:20px" v-model:value="searchParam.status" placeholder="请选择状态" allowClear
-              :options="AuthenticationStatusList"
-              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" 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.tLevelName" placeholder="请选择讲师级别" allowClear
-              :options="getLevelList"
-              v-on:keydown.enter="enterPressHadlerSearch">
-            </a-select>
-          </a-form-item>
-          <div style="display: flex; margin-bottom: 20px">
-            <a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
-            <!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
-            <!-- <div class="search"></div> -->
-            <a-button class="resetbtn " @click="searchReset">重置</a-button>
-  
-            <!-- 更多筛选-->
-            <div v-if="moreid == 1">
-              <a-button @click="handlemoreid()" class="moreidbtn" type="text"> 展开
-                <DownOutlined />
-              </a-button>
-            </div>
-            <div v-if="moreid == 2">
-              <a-button @click="handlemoreid()" class="moreidbtn"> 收起
-                <UpOutlined />
-              </a-button>
-            </div>
+        </a-form-item>
+        <a-form-item class="select">
+          <a-select style="width: 200px ;margin-bottom:20px" v-model:value="searchParam.type" placeholder="请选择课程类型"
+            allowClear :options="OnTheJobStatusList" v-on:keydown.enter="enterPressHadlerSearch">
+          </a-select>
+        </a-form-item>
+        <a-form-item class="select" v-if="moreid == 2">
+          <a-select style="width: 200px ;margin-bottom:20px" v-model:value="searchParam.status" placeholder="请选择状态"
+            allowClear :options="AuthenticationStatusList" 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" 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.tLevelName"
+            placeholder="请选择讲师级别" allowClear :options="getLevelList" v-on:keydown.enter="enterPressHadlerSearch">
+          </a-select>
+        </a-form-item>
+        <div style="display: flex; margin-bottom: 20px">
+          <a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
+          <!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
+          <!-- <div class="search"></div> -->
+          <a-button class="resetbtn " @click="searchReset">重置</a-button>
+
+          <!-- 更多筛选-->
+          <div v-if="moreid == 1">
+            <a-button @click="handlemoreid()" class="moreidbtn" type="text"> 展开
+              <DownOutlined />
+            </a-button>
           </div>
-          <div style="width:100%"></div>
-          <!-- <a-form-item class="select" v-if="moreid == 2">
+          <div v-if="moreid == 2">
+            <a-button @click="handlemoreid()" class="moreidbtn"> 收起
+              <UpOutlined />
+            </a-button>
+          </div>
+        </div>
+        <div style="width:100%"></div>
+        <!-- <a-form-item class="select" v-if="moreid == 2">
             <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.courseType" placeholder="请选择费用类型" allowClear
               :options="courseTypeList">
             </a-select>
           </a-form-item> -->
-          
-        </a-form>
-        <div style="width: 100%;"></div>   
-        <div style="display: flex; margin-bottom: 20px">
-          <a-button v-if="checkMenu('lecturerExpenseAdd')" @click="addTeacher()" type="primary" class="langbtn">
-            <div class="search"></div> 添加费用
-          </a-button>
-          <!-- <div style="margin-left: 20px ;">
+
+      </a-form>
+      <div style="width: 100%;"></div>
+      <div style="display: flex; margin-bottom: 20px">
+        <a-button v-if="checkMenu('lecturerExpenseAdd')" @click="addTeacher()" type="primary" class="langbtn">
+          <div class="search"></div> 添加费用
+        </a-button>
+        <!-- <div style="margin-left: 20px ;">
             <a-button @click="addTeacher()" class="langbtn">
               <UploadOutlined /> 一键生成讲师费
             </a-button>
           </div> -->
-          <a-button v-if="checkMenu('lecturerExpenseImport')" class="resetbtn" @click="handleImport()" >
-            <DownloadOutlined /> 导入
-          </a-button>
+        <a-button v-if="checkMenu('lecturerExpenseImport')" class="resetbtn" @click="handleImport()">
+          <DownloadOutlined /> 导入
+        </a-button>
         <a-button v-if="checkMenu('lecturerExpenseExport')" @click="handleExport()" class="resetbtn">
           <UploadOutlined /> 导出
         </a-button>
         <a-button v-if="orgList.length" @click="handleTeacher()" type="primary" class="langbtn">
-            一键确认讲师费
-          </a-button>
-          <a-button v-if="orgList.length" @click="allFee()" type="primary" class="langbtn">
-           批量确认讲师费
-          </a-button>
-          <!-- <div     style="line-height: 40px;" >当前页面汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">1,230,490</span>元     当前总汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">9,230,490</span>元</div> -->
-         </div>
-        <!-- 表格 -->
-        <div>
-          <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columns"
-            :data-source="tableData"  :scroll="{ x: 1500 }" :loading="tableLoading" @expand="expandTable" :pagination="false">
-            <template #bodyCell="{ record, column }">
-              <template v-if="column.key === 'operation'">
-                <a-space >
-                  <a-button type="link" v-if="(record.status==0||record.status==5)&&checkMenu('lecturerExpenseStop')" @click="updateModal(record,record.status)">{{record.status==0?'停用':'启用'}}</a-button>
-                  <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
-                  <!-- :disabled="record.createFrom==1  ?false :true" -->
-                  <a-button type="link" v-if="(record.status == 0||record.status==4)&&checkMenu('lecturerExpenseEdit')" @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" v-if="(record.status==0||record.status==4||record.status==5)&&checkMenu('lecturerExpenseDel')" @click="deleteModal(record)">删除</a-button>
-                </a-space>
-              </template>
-            </template>
-            <template  #trainOrg="{ record }">
-              <a-space style="display:flex ;justify-content: space-around;">
-                <div style="max-width: 180px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" :title="record.orgName">{{ orgSplit(record.orgName) }}</div>
+          一键确认讲师费
+        </a-button>
+        <a-button v-if="orgList.length" @click="allFee()" type="primary" class="langbtn">
+          批量确认讲师费
+        </a-button>
+        <!-- <div     style="line-height: 40px;" >当前页面汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">1,230,490</span>元     当前总汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">9,230,490</span>元</div> -->
+      </div>
+      <!-- 表格 -->
+      <div>
+        <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columns"
+          :data-source="tableData" :scroll="{ x: 1500 }" :loading="tableLoading" @expand="expandTable"
+          :pagination="false">
+          <template #bodyCell="{ record, column }">
+            <template v-if="column.key === 'operation'">
+              <a-space>
+                <a-button type="link" v-if="(record.status == 0 || record.status == 5) && checkMenu('lecturerExpenseStop')"
+                  @click="updateModal(record, record.status)">{{ record.status == 0 ? '停用' : '启用' }}</a-button>
+                <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
+                <!-- :disabled="record.createFrom==1  ?false :true" -->
+                <a-button type="link" v-if="(record.status == 0 || record.status == 4) && checkMenu('lecturerExpenseEdit')"
+                  @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"
+                  v-if="(record.status == 0 || record.status == 4 || record.status == 5) && checkMenu('lecturerExpenseDel')"
+                  @click="deleteModal(record)">删除</a-button>
               </a-space>
             </template>
-          </a-table>
-        </div>
-  
+          </template>
+          <template #trainOrg="{ record }">
+            <a-space style="display:flex ;justify-content: space-around;">
+              <div style="max-width: 180px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                :title="record.orgName">{{ orgSplit(record.orgName) }}</div>
+            </a-space>
+          </template>
+        </a-table>
       </div>
-      <div class="tableBox ">
-        <div style="float: right;">
-          <a-pagination
-          v-if="tableDataTotal > 10"
-          :showSizeChanger="true" 
-          :showQuickJumper="false"
-          :hideOnSinglePage="false"
-          :pageSize="searchParam.pageSize"
-          :current="searchParam.pageNo"
-          :total="tableDataTotal"
-          class="pagination"
-          @change="changePagination"
-        />
-        </div>
+
+    </div>
+    <div class="tableBox ">
+      <div style="float: right;">
+        <a-pagination v-if="tableDataTotal > 10" :showSizeChanger="true" :showQuickJumper="false"
+          :hideOnSinglePage="false" :pageSize="searchParam.pageSize" :current="searchParam.pageNo"
+          :total="tableDataTotal" class="pagination" @change="changePagination" />
       </div>
-      <!-- 弹窗组件 -->
-      <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false" dropdown-style="drawaer"
-        width="60%" :title="false">
-        <div style="padding:24px;">
+    </div>
+    <!-- 弹窗组件 -->
+    <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" placement="right" :closable="false"
+      :maskClosable="false" dropdown-style="drawaer" width="60%" :title="false">
+      <div style="padding:24px;">
         <div class="headers" style="margin-top:-24px;">
           <div class="headerTitle">{{ teacherdialogtitle }}</div>
-          <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="@/assets/images/basicinfo/close.png"
-            @click="cancelTeacherDialog"
-          />
+          <img style="width: 29px; height: 29px; cursor: pointer" src="@/assets/images/basicinfo/close.png"
+            @click="cancelTeacherDialog" />
         </div>
-        <a-form :model="formParam" layout="vertical" ref="formRef" >
+        <a-form :model="formParam" layout="vertical" ref="formRef">
           <!-- 讲师姓名  name  讲师工号  userNo-->
           <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item name="name">
                 <template v-slot:label>
-                <img
-                  style="margin-right:4px;width: 7px;height: 7px"
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-                讲师名称
-              </template>
-               <SearchTeacher :disabled="!!id" @byUserIdData="byUserIdData" @tlevel="tlevelChange" v-model:id="formParam.teacherId" v-model:value="formParam.name" v-model:orgId="formParam.orgId" v-model:lable="formParam.orgNames" v-model:user="formParam.userNo"
-                v-model:system="tSystemNames" v-model:payrollPlaceCode="formParam.payrollPlaceId"
-                v-model:payrollPlaceName="formParam.payrollPlace" ></SearchTeacher>
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  讲师名称
+                </template>
+                <SearchTeacher :disabled="!!id" @byUserIdData="byUserIdData" @tlevel="tlevelChange"
+                  v-model:id="formParam.teacherId" v-model:value="formParam.name" v-model:orgId="formParam.orgId"
+                  v-model:lable="formParam.orgNames" v-model:user="formParam.userNo" v-model:system="tSystemNames"
+                  v-model:payrollPlaceCode="formParam.payrollPlaceId" v-model:payrollPlaceName="formParam.payrollPlace">
+                </SearchTeacher>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item name="userNo">
                 <template v-slot:label>
-                <img
-                  style="margin-right:4px;width: 7px;height: 7px"
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-                讲师工号
-              </template>
-                <a-input class="draitem"  v-model:value="formParam.userNo"  disabled
-                  placeholder="请输入讲师工号" allowClear showSearch> 
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  讲师工号
+                </template>
+                <a-input class="draitem" v-model:value="formParam.userNo" disabled placeholder="请输入讲师工号" allowClear
+                  showSearch>
                 </a-input>
               </a-form-item>
             </a-col>
@@ -207,16 +200,13 @@
           <!--  讲师组织  departId 讲师体系  systemId   -->
           <a-row :gutter="16">
             <a-col :span="12">
-                <a-form-item name="orgName">
-                  <template v-slot:label>
-                <img
-                  style="margin-right:4px;width: 7px;height: 7px"
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-                讲师组织
-              </template>
-              <!-- <a-popover>
+              <a-form-item name="orgName">
+                <template v-slot:label>
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  讲师组织
+                </template>
+                <!-- <a-popover>
                 <template #content>
                   {{ formParam.orgNames }}
                 </template> -->
@@ -224,26 +214,23 @@
                 <a-input :title="formParam.orgNames" disabled v-model:value="formParam.orgName" class="draitem"
                   placeholder="自动带出讲师的组织,展示主要部分,鼠标浮上去展示所有" allowClear showSearch>
                 </a-input>
-              <!-- </a-popover> -->
-            </a-form-item>
+                <!-- </a-popover> -->
+              </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item name="tsystemName">
                 <template v-slot:label>
-                <img
-                  style="margin-right:4px;width: 7px;height: 7px"
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-                讲师体系
-              </template>
-              <!-- <a-select class="draitem" v-model:value="formParam.tsystemName" placeholder="请选择讲师体系" allowClear
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  讲师体系
+                </template>
+                <!-- <a-select class="draitem" v-model:value="formParam.tsystemName" placeholder="请选择讲师体系" allowClear
                 @change="changetlevel" .:options="LecturerSystemList">
               </a-select> -->
-              <a-input disabled v-model:value="tSystemNames.systemName" class="draitem"
-                  placeholder="自动带出讲师的体系" allowClear showSearch>
+                <a-input disabled v-model:value="tSystemNames.systemName" class="draitem" placeholder="自动带出讲师的体系"
+                  allowClear showSearch>
                 </a-input>
-            </a-form-item>
+              </a-form-item>
             </a-col>
           </a-row>
           <!-- 讲师级别 levelId   讲师发薪地  payrollPlaceName-->
@@ -251,32 +238,26 @@
             <a-col :span="12">
               <a-form-item name="tlevelName">
                 <template v-slot:label>
-                <img
-                  style="margin-right:4px;width: 7px;height: 7px"
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-                讲师级别
-              </template>
-                <a-input disabled v-model:value="formParam.tlevelName" class="draitem"
-                  placeholder="自动带出讲师级别" allowClear showSearch>
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  讲师级别
+                </template>
+                <a-input disabled v-model:value="formParam.tlevelName" class="draitem" placeholder="自动带出讲师级别" allowClear
+                  showSearch>
                 </a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item name="payrollPlace">
                 <template v-slot:label>
-                <img
-                  style="margin-right:4px;width: 7px;height: 7px"
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-                讲师发薪地
-              </template>
-            <a-input disabled v-model:value="formParam.payrollPlace" class="draitem"
-                    placeholder="自动带出讲师发薪地" allowClear showSearch >
-                  </a-input>
-            </a-form-item>
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  讲师发薪地
+                </template>
+                <a-input disabled v-model:value="formParam.payrollPlace" class="draitem" placeholder="自动带出讲师发薪地"
+                  allowClear showSearch>
+                </a-input>
+              </a-form-item>
             </a-col>
           </a-row>
           <!-- 费用类型  课程名称 courseName-->
@@ -284,28 +265,22 @@
             <a-col :span="12">
               <a-form-item name="courseType">
                 <template v-slot:label>
-                <img
-                  style="margin-right:4px;width: 7px;height: 7px"
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-                费用类型
-              </template>
-                <a-select :disabled="formParam.createFrom==0" class="draitem" v-model:value="formParam.courseType" placeholder="请选择费用类型"
-                  :options="courseTypeList">
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  费用类型
+                </template>
+                <a-select :disabled="formParam.createFrom == 0" class="draitem" v-model:value="formParam.courseType"
+                  placeholder="请选择费用类型" :options="courseTypeList">
                 </a-select>
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item  name="courseName">
+              <a-form-item name="courseName">
                 <template v-slot:label>
-                <img
-                  style="margin-right:4px;width: 7px;height: 7px"
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-                课程名称
-              </template>
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  课程名称
+                </template>
                 <!-- <a-radio-group v-model:value="formParam.courseName">
                   <a-radio :value="0">面授课</a-radio>
                   <a-radio :value="1">在线课</a-radio>
@@ -313,9 +288,10 @@
                 <!-- <a-select  class="draitem" v-model:value="formParam.courseName" placeholder="请选择输入或选择面授课" style="width:63%" allowClear
                   :options="getLevelList">
                 </a-select> -->
-                <a-input :disabled="formParam.createFrom==0" :maxlength="20" show-count v-model:value="formParam.courseName"  placeholder="请输入面授课名称" class="draitem">
+                <a-input :disabled="formParam.createFrom == 0" :maxlength="20" show-count
+                  v-model:value="formParam.courseName" placeholder="请输入面授课名称" class="draitem">
                 </a-input>
-            </a-form-item>
+              </a-form-item>
             </a-col>
           </a-row>
           <!-- 授课日期 teachingDate   授课时长  teachingTime -->
@@ -323,34 +299,30 @@
             <a-col :span="12">
               <a-form-item name="trainOrgId">
                 <template v-slot:label>
-                <img
-                  style="margin-right:4px;width: 7px;height: 7px"
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-                培训发生组织
-              </template>
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  培训发生组织
+                </template>
                 <!-- <OrgClass
                   v-model:value="formParam.sourceBelongId"
                   v-model:name="formParam.sourceBelongFullName"
                 ></OrgClass> -->
-                <a-select :disabled="formParam.createFrom==0" v-model:value="formParam.trainOrgId" placeholder="请选择培训发生组织" allowClear
-                  :options="orgList"  @change="changeOrg">
+                <a-select :disabled="formParam.createFrom == 0" v-model:value="formParam.trainOrgId"
+                  placeholder="请选择培训发生组织" allowClear :options="orgList" @change="changeOrg">
                 </a-select>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item name="teachingDate">
                 <template v-slot:label>
-                <img
-                  style="margin-right:4px;width: 7px;height: 7px"
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-                {{formParam.courseType==2?'课程':'授课'}}日期 :
-              </template>
-                <a-date-picker :disabled="formParam.createFrom==0" :locale="locale" class="draitem" v-model:value="teachingDate" style="width:100%" :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm" valueFormat="YYYY-MM-DD HH:mm"
-                placeholder="请选择课程日期" @select="handleSelect" />
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  {{ formParam.courseType == 2 ? '课程' : '授课' }}日期 :
+                </template>
+                <a-date-picker :disabled="formParam.createFrom == 0" :locale="locale" class="draitem"
+                  v-model:value="teachingDate" style="width:100%" :show-time="{ format: 'HH:mm' }"
+                  format="YYYY-MM-DD HH:mm" valueFormat="YYYY-MM-DD HH:mm" placeholder="请选择课程日期"
+                  @select="handleSelect" />
               </a-form-item>
             </a-col>
           </a-row>
@@ -359,33 +331,27 @@
             <a-col :span="12">
               <a-form-item name="teachingTime">
                 <template v-slot:label>
-                <img
-                  style="margin-right:4px;width: 7px;height: 7px"
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-                {{formParam.courseType==2?'课程时长':'授课时长'}}
-              </template>
-              <a-input v-model:value="formParam.teachingTime" style="width:100%; height: 40px; border-radius: 8px; "
-                @change="clearNonNumber" placeholder="请输入授课分钟数" allowClear showSearch suffix="分钟">
-              </a-input>
-              <!-- <span style="margin-left: 5px ;" v-if="formParam.teachingTime != null">{{
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  {{ formParam.courseType == 2 ? '课程时长' : '授课时长' }}
+                </template>
+                <a-input v-model:value="formParam.teachingTime" style="width:100%; height: 40px; border-radius: 8px; "
+                  @change="clearNonNumber" placeholder="请输入授课分钟数" allowClear showSearch suffix="分钟">
+                </a-input>
+                <!-- <span style="margin-left: 5px ;" v-if="formParam.teachingTime != null">{{
                 (formParam.teachingTime / 60).toFixed(2) }}小时</span>
                     <span style="margin-left: 5px ;" v-if="formParam.teachingTime == null">0.00小时</span> -->
-            </a-form-item>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item name="studys">
                 <template v-slot:label>
-                <img
-                  style="margin-right:4px;width: 7px;height: 7px"
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-                参训人数
-              </template>
-                <a-input  :disabled="formParam.createFrom==0" v-model:value="formParam.studys" class="draitem" @change="clearstudysNumber" 
-                  placeholder="请输入参训人数" allowClear showSearch  >
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  参训人数
+                </template>
+                <a-input :disabled="formParam.createFrom == 0" v-model:value="formParam.studys" class="draitem"
+                  @change="clearstudysNumber" placeholder="请输入参训人数" allowClear showSearch>
                 </a-input>
               </a-form-item>
             </a-col>
@@ -395,49 +361,41 @@
             <a-col :span="12">
               <a-form-item name="score">
                 <template v-slot:label>
-                <img
-                  style="margin-right:4px;width: 7px;height: 7px"
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-                评分
-              </template>
-                <a-input-number :disabled="formParam.createFrom==0" class="draitem" v-model:value="formParam.score" :defaultValue="null" :max="100" :controls="false" :min="1" :precision="2" placeholder="请输入评分" 
-                 allowClear @change="scoreNumber">
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  评分
+                </template>
+                <a-input-number :disabled="formParam.createFrom == 0" class="draitem" v-model:value="formParam.score"
+                  :defaultValue="null" :max="100" :controls="false" :min="1" :precision="2" placeholder="请输入评分"
+                  allowClear @change="scoreNumber">
                 </a-input-number>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item name="levelPay">
                 <template v-slot:label>
-                <img
-                  style="margin-right:4px;width: 7px;height: 7px"
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-                课酬基准
-              </template>
-                <a-input-number v-model:value="formParam.levelPay" placeholder="自动键入系统基准（可手动更改）"  :max="99999999" :controls="false" :min="0" :precision="2"
-                @change="clearlevelPayNumber"
-                  allowClear showSearch  class="draitem">
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  课酬基准
+                </template>
+                <a-input-number v-model:value="formParam.levelPay" placeholder="自动键入系统基准（可手动更改）" :max="99999999"
+                  :controls="false" :min="0" :precision="2" @change="clearlevelPayNumber" allowClear showSearch
+                  class="draitem">
                 </a-input-number>
               </a-form-item>
             </a-col>
           </a-row>
-           <!-- 应发费用 -->
-           <a-row :gutter="16">
+          <!-- 应发费用 -->
+          <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item name="expense">
                 <template v-slot:label>
-                <img
-                  style="margin-right:4px;width: 7px;height: 7px"
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-                计划费用
-              </template>
-                <a-input class="draitem" v-model:value="formParam.expense"  placeholder="自动计算（ 授课时长（或课程时长）*课酬基准 ）" allowClear   disabled
-                  showSearch>
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  计划费用
+                </template>
+                <a-input class="draitem" v-model:value="formParam.expense" placeholder="自动计算（ 授课时长（或课程时长）*课酬基准 ）"
+                  allowClear disabled showSearch>
                 </a-input>
               </a-form-item>
             </a-col>
@@ -449,8 +407,8 @@
               </a-form-item>
             </a-col> -->
           </a-row>
-            <!-- 备注 remark -->
-            <a-row :gutter="16">
+          <!-- 备注 remark -->
+          <a-row :gutter="16">
             <a-col :span="24">
               <a-form-item label="备注">
                 <a-textarea v-model:value="formParam.remark" showCount :maxlength="200"
@@ -458,8 +416,8 @@
               </a-form-item>
             </a-col>
           </a-row>
-          </a-form>
-          <div :style="{
+        </a-form>
+        <div :style="{
           position: 'absolute',
           right: 0,
           bottom: 0,
@@ -470,85 +428,97 @@
           textAlign: 'right',
           zIndex: 1,
         }">
-          <a-button  class="drabtn"  @click="cancelTeacherDialog">取消</a-button>
-          <a-button   class="drabtn" type="primary" @click="createTeacherDialog" :loading="buttonLoading">保存
+          <a-button class="drabtn" @click="cancelTeacherDialog">取消</a-button>
+          <a-button class="drabtn" type="primary" @click="createTeacherDialog" :loading="buttonLoading">保存
           </a-button>
         </div>
       </div>
-      </a-drawer>
-       <!-- 修改状态功能弹窗 -->
-       <div>
-        <a-modal v-model:visible="editTeacher" :footer="null" :closable="close" wrapClassName="canclestu1"
-          centered="true">
-          <div class="delete">
-            <div class="del_header"></div>
-            <div class="del_main">
-              <div class="header">
-                <div class="icon1"></div>
-                <span>提示</span>
+    </a-drawer>
+    <!-- 修改状态功能弹窗 -->
+    <div>
+      <a-modal v-model:visible="editTeacher" :footer="null" :closable="close" wrapClassName="canclestu1"
+        centered="true">
+        <div class="delete">
+          <div class="del_header"></div>
+          <div class="del_main">
+            <div class="header">
+              <div class="icon1"></div>
+              <span>提示</span>
+            </div>
+            <div class="body">
+              <span v-if="handleOperate1 == 'A10' || handleOperate1 == 'E10'">您确定要提交此信息吗</span>
+              <span v-if="handleOperate1 == 'A20'">您确定要撤回此信息吗</span>
+            </div>
+            <div class="del_btnbox">
+              <div class="del_btn btn2" @click="canceleditTeacherDialog" style="margin-right: 32px">
+                <div class="btnText">取消</div>
               </div>
-              <div class="body">
-                <span v-if="handleOperate1== 'A10' ||handleOperate1== 'E10' ">您确定要提交此信息吗</span>
-                <span v-if="handleOperate1== 'A20'">您确定要撤回此信息吗</span>
-              </div>
-              <div class="del_btnbox">
-                <div class="del_btn btn2" @click="canceleditTeacherDialog" style="margin-right: 32px">
-                  <div class="btnText">取消</div>
-                </div>
-                <div class="del_btn btn2" @click="closehandleOperate">
-                  <div class="btnText">确定</div>
-                </div>
+              <div class="del_btn btn2" @click="closehandleOperate">
+                <div class="btnText">确定</div>
               </div>
             </div>
           </div>
-        </a-modal>
-      </div>
-      <!-- <div> <Upload/> </div>         -->
-      <a-drawer class="largeDrawerInside" v-model:visible="teachingdialog" placement="right"
-        :closable="false"  width="60%" :title="false">
-        <div style="padding:24px;">
+        </div>
+      </a-modal>
+    </div>
+    <!-- <div> <Upload/> </div>         -->
+    <a-drawer class="largeDrawerInside" v-model:visible="teachingdialog" placement="right" :closable="false" width="60%"
+      :title="false">
+      <div style="padding:24px;">
         <div class="headers" style="margin-top:-24px;">
           <div class="headerTitle">查看讲师费用</div>
-          <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="cancelTeachingDialog(false)"
-          />
+          <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+            @click="cancelTeachingDialog(false)" />
         </div>
-  <span class="line"></span>
-  <span style="font-weight: 600;">讲师费用详情</span>
-<a-descriptions style="padding-bottom: 35px;margin-top:20px;" bordered :column="2" :contentStyle="{width:'300px',}" :labelStyle="{width:'166px'}">
-    <a-descriptions-item label="讲师姓名"><div style="user-select: text">{{formParam.name}}</div></a-descriptions-item>
-    <!-- <a-descriptions-item label="讲师工号">{{formParam.userNo}}</a-descriptions-item> -->
-    <a-descriptions-item label="讲师组织">{{formParam.orgNames}}</a-descriptions-item>
-    <a-descriptions-item label="讲师体系">{{formParam.tsystemName}}</a-descriptions-item>
-    <a-descriptions-item label="讲师级别">{{formParam.tlevelName }}</a-descriptions-item>
-    <a-descriptions-item label="讲师发薪地">{{formParam?.payrollPlace || '-'}}</a-descriptions-item>
-    <a-descriptions-item label="课程名称"><div style="user-select: text">{{formParam.courseName || '-'}}</div></a-descriptions-item>
-    <a-descriptions-item label="费用类型">{{{0:'在线',1:'面授',2:'课程开发',3:'作业员入模培训',4:'其他'}[formParam?.courseType]}}</a-descriptions-item>
-    <!-- <a-descriptions-item label="课程类型">{{formParam.courseType==1?'项目开课' :formParam.courseType==2 ?'路径开课':formParam.courseType==3 ?'面授开课':'-'}}</a-descriptions-item> -->
-    <a-descriptions-item label="培训发生组织"><div style="user-select: text">{{formParam.trainOrgName || '-'}}</div></a-descriptions-item>
-    <a-descriptions-item label="授课/课程开发日期  ">{{(formParam.teachingDate) || '-'}}</a-descriptions-item>
-    <a-descriptions-item label="授课/课程开发时长  ">{{formParam.teachingTime || '-'}}分 <span v-if="formParam.teachingTime">({{(formParam.teachingTime/60).toFixed(2)}}小时)</span></a-descriptions-item>
-    <a-descriptions-item label="参训人数  ">{{formParam.studys?formParam.studys+'人' : '-'}}</a-descriptions-item>
-    <a-descriptions-item label="评分  ">{{formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(2)+'分':'-' }}</a-descriptions-item>
-    <a-descriptions-item label="基准课酬  ">{{formParam.levelPay||formParam.levelPay==0?formParam.levelPay+'元' : '-'}}</a-descriptions-item>
-    <a-descriptions-item label="计划费用  ">{{formParam.expense?formParam.expense+'元': '-'}}</a-descriptions-item>
-    <!-- <a-descriptions-item label="应发费用  ">{{formParam.payableExpense || '-'}}</a-descriptions-item> -->
-    <!-- <a-descriptions-item label="费用发放时间">{{formParam.payableExpenseTime || '-'}}</a-descriptions-item> -->
-    <a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'审核通过', 4:'审核拒绝',5:'停用'}[formParam?.status]}}</a-descriptions-item>
-    <!-- <a-descriptions-item label="课程类型">{{{"0": "在线课","1": "面授课","2": "课程开发","3": "作业员入模培训","4": "其他",}[formParam.courseType + ""]}}</a-descriptions-item> -->
-    <a-descriptions-item label="备注  ">{{formParam.remark || '-'}}</a-descriptions-item>
-  </a-descriptions>
-  <div style="margin-bottom: 20px;" v-if="false">
-    <span class="line"></span>
-    <span style="font-weight: 600;">讲师费审批</span>
-  </div>
-  <div style="margin-bottom:32px;" v-if="false">
-    <a-table :columns="columnSee" :loading="SeeLoading" :data-source="tableDataSee"  :pagination="false" />
-  </div>
-  <!-- <span class="line"></span> -->
-  <!-- <div :style="{
+        <span class="line"></span>
+        <span style="font-weight: 600;">讲师费用详情</span>
+        <a-descriptions style="padding-bottom: 35px;margin-top:20px;" bordered :column="2"
+          :contentStyle="{ width: '300px', }" :labelStyle="{ width: '166px' }">
+          <a-descriptions-item label="讲师姓名">
+            <div style="user-select: text">{{ formParam.name }}</div>
+          </a-descriptions-item>
+          <!-- <a-descriptions-item label="讲师工号">{{formParam.userNo}}</a-descriptions-item> -->
+          <a-descriptions-item label="讲师组织">{{ formParam.orgNames }}</a-descriptions-item>
+          <a-descriptions-item label="讲师体系">{{ formParam.tsystemName }}</a-descriptions-item>
+          <a-descriptions-item label="讲师级别">{{ formParam.tlevelName }}</a-descriptions-item>
+          <a-descriptions-item label="讲师发薪地">{{ formParam?.payrollPlace || '-' }}</a-descriptions-item>
+          <a-descriptions-item label="课程名称">
+            <div style="user-select: text">{{ formParam.courseName || '-' }}</div>
+          </a-descriptions-item>
+          <a-descriptions-item
+            label="费用类型">{{ { 0: '在线', 1: '面授', 2: '课程开发', 3: '作业员入模培训', 4: '其他' }[formParam?.courseType] }}</a-descriptions-item>
+          <!-- <a-descriptions-item label="课程类型">{{formParam.courseType==1?'项目开课' :formParam.courseType==2 ?'路径开课':formParam.courseType==3 ?'面授开课':'-'}}</a-descriptions-item> -->
+          <a-descriptions-item label="培训发生组织">
+            <div style="user-select: text">{{ formParam.trainOrgName || '-' }}</div>
+          </a-descriptions-item>
+          <a-descriptions-item label="授课/课程开发日期  ">{{ (formParam.teachingDate) || '-' }}</a-descriptions-item>
+          <a-descriptions-item label="授课/课程开发时长  ">{{ formParam.teachingTime || '-' }}分 <span
+              v-if="formParam.teachingTime">({{ (formParam.teachingTime / 60).toFixed(2) }}小时)</span></a-descriptions-item>
+          <a-descriptions-item label="参训人数  ">{{ formParam.studys ? formParam.studys + '人' : '-' }}</a-descriptions-item>
+          <a-descriptions-item
+            label="评分  ">{{ formParam.score ? Number(formParam.score).toFixed(0) == 0 ? '-' : Number(formParam.score).toFixed(2) + '分' : '-'
+            }}</a-descriptions-item>
+          <a-descriptions-item label="基准课酬  ">{{ formParam.levelPay || formParam.levelPay == 0 ? formParam.levelPay + '元' :
+            '-'}}</a-descriptions-item>
+          <a-descriptions-item label="计划费用  ">{{ formParam.expense ? formParam.expense + '元' : '-' }}</a-descriptions-item>
+          <!-- <a-descriptions-item label="应发费用  ">{{formParam.payableExpense || '-'}}</a-descriptions-item> -->
+          <!-- <a-descriptions-item label="费用发放时间">{{formParam.payableExpenseTime || '-'}}</a-descriptions-item> -->
+          <a-descriptions-item label="状态">{{ {
+            0: '待确认', 1: '待提交', 2: '审核中', 3: '审核通过',
+            4: '审核拒绝', 5: '停用'
+          }[formParam?.status]}}</a-descriptions-item>
+          <!-- <a-descriptions-item label="课程类型">{{{"0": "在线课","1": "面授课","2": "课程开发","3": "作业员入模培训","4": "其他",}[formParam.courseType + ""]}}</a-descriptions-item> -->
+          <a-descriptions-item label="备注  ">{{ formParam.remark || '-' }}</a-descriptions-item>
+        </a-descriptions>
+        <div style="margin-bottom: 20px;" v-if="false">
+          <span class="line"></span>
+          <span style="font-weight: 600;">讲师费审批</span>
+        </div>
+        <div style="margin-bottom:32px;" v-if="false">
+          <a-table :columns="columnSee" :loading="SeeLoading" :data-source="tableDataSee" :pagination="false" />
+        </div>
+        <!-- <span class="line"></span> -->
+        <!-- <div :style="{
         position: 'absolute',
         right: 0,
         bottom: 0,
@@ -563,200 +533,202 @@
         <a-button   class="drabtn" @click="cancelTeachingDialog(false)" :loading="buttonLoading">取消
         </a-button>
       </div> -->
-    </div>
-  </a-drawer>
-  <ImportWork v-model:showWork="showWork" :template="'讲师费导入模版-20250115.xlsx'" :url="'/admin/export/importTeacherExpense'" :fileName="uploadFile" :title="title"></ImportWork>
-</div>
-    <div class="example" v-if="example">
-      <a-spin />
-    </div>
-    <!-- 一键确认讲师费 -->
-    <ConfirmLecturer @example="getexample" @visibleFalse="visibleAll" :ids="selectsIds" v-model:visible="visibleConfirm" :name="'确认讲师费'" />
-    <!-- 批量确认讲师费 -->
-     <BatchLecturer @selectedRowKeys="selectedRowKey" v-model:visible="allFeedialog" :name="'批量审批'" />
-  </template>
-  <script lang="jsx">
-  import { reactive, toRefs, ref ,watch,onMounted} from "vue";
-  import { message } from "ant-design-vue";
-  import dayjs from "dayjs";
-  import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
-  import 'dayjs/locale/zh-cn';
-  import {
-    DownOutlined,
-    UpOutlined,
-    UploadOutlined,
-    FolderAddOutlined,
-    DownloadOutlined
-  } from '@ant-design/icons-vue';
-  import ImportWork from "../../components/lecturer/ImportWork.vue";
-  import SearchTeacher from "@/components/project/SearchTeacher";
-  import {getTeacherFeeList,getTeacherFeeDetail,getListByTeacherExpenseId,addTeacherFee ,getListByIds,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTeacherLevel,deleteInTeacher,confirm} from "../../api/lecturerFeeManagement";
-  import {getTeacherSystemList, getAllLevelList,getPayRollPlace,fileUp,submitApproval,deleteLecturerFee,updateLecturerFee } from "../../api/Lecturer";
-  // lecturerFeeManagement
-  // import {getProjSt} from "../../api/indexProjStu";
-  // import AddTeacher from "../../components/drawers/project/AddTeacher"
-  import ConfirmLecturer from "@/components/project/ConfirmLecturer"
-  import BatchLecturer from "@/components/project/BatchLecturer"
-  import { queryTrainOrgPor,} from "../../api/organization";
-  import dialog from '@/utils/dialog';
-  import OrgClass from "@/components/project/OrgClass";
-  import { checkMenu } from '@/utils/utils'
-  export default { 
-    name: "LecturerFee",
-    components: {
-      DownOutlined, //图标--展开
-      UpOutlined,//图标--收起
-      UploadOutlined,//图标--导出
-      DownloadOutlined,//图标-导入
-      FolderAddOutlined,//图标--新增
-      SearchTeacher,
-      ImportWork,
-      ConfirmLecturer,
-      BatchLecturer,
-      OrgClass,
-    },
-    setup() {
-      const formRef = ref();
-      const state = reactive({
-        example: false,
-        tableDataSee: [],
-        SeeLoading: false,
-        orgList: [],
-        orgListSearch: [],
-        selectsIds: '',
-        visibleConfirm: false,
-        title:'导入讲师费记录',
-        allFeedialog:false,
-        tableLoadings:false,
-        teachingdialog:false,
-        showWork: false,
-        vf:true,
-        moreid:1,
-        byPid:null,
-        currentPage1: 1,
-        pageSize1: 10,
-        promotionrecordsLoading:false ,  //晋级记录遮罩层
-        teacherrecordsLoading:false,// 授课记录遮罩层
-        tableLoading:false,
-        tagsshow:"1",
-        delTeacherId:null, //删除id确认
-        newStatus:null , //修改状态码确认
-        id:null,    //内部讲师工号确认 
-        lookTeacherId:null, //内部讲师详情id确认
-        // deleteInTeacherdialog: false, //删除弹窗
-        editTeacher:false ,   //修改状态弹窗
-        handleOperate1:null, //修改状态弹窗内容
-        teacherdialog1: null,
-        teacherdialog: false,  //控制讲师弹窗
-        teacherdialogtitle: '',//讲师弹框title内容
-        pageSizeOptions: ['10', '20', '30', '50'], //下拉选择每页显示多少条
-        pageSize: 10,
-        tableDataTotal: -1,//table列表总条数
-        teachingDate:null,
-        formParam: {
-          teachingDate:null ,
-          teachingTime:null,
-          name: null,
-          userNo: null,
-          payrollPlace: null,
-          payrollPlaceId: null,
-          trainOrgId: null,
-          trainOrgName: null,
-        },
-        searchdate: null, //选择时间
-        allsearchdate: null, //选择时间
-        searchParam: {
-          userNo:null,
-          name:null,
-          trainOrgId:null,
-          tSystemId:null,
-          courseName: null,
-          tLevelName:null,
-          courseType:null,
-          certStatus:null,
-          salaryName:null,
-          payrollPlaceName:null,
-          status:null,
-          pageNo: "1",
-          pageSize: "10",
-          beginTime: null,
-          endTime: null,
-        },
-        //一键确认
-        searchall:{
-          name:null,
-          beginTime: null,
-          endTime: null,
-          pageNo: "1",
-          pageSize: "10",
-        },
-        tSystemNames:{
-        systemName:null,
+      </div>
+    </a-drawer>
+    <ImportWork v-model:showWork="showWork" :template="'讲师费导入模版-20250115.xlsx'"
+      :url="'/admin/export/importTeacherExpense'" :fileName="uploadFile" :title="title"></ImportWork>
+  </div>
+  <div class="example" v-if="example">
+    <a-spin />
+  </div>
+  <!-- 一键确认讲师费 -->
+  <ConfirmLecturer @example="getexample" @visibleFalse="visibleAll" :ids="selectsIds" v-model:visible="visibleConfirm"
+    :name="'确认讲师费'" />
+  <!-- 批量确认讲师费 -->
+  <BatchLecturer @selectedRowKeys="selectedRowKey" v-model:visible="allFeedialog" :name="'批量审批'" />
+</template>
+<script lang="jsx">
+import { reactive, toRefs, ref, watch, onMounted } from "vue";
+import { message } from "ant-design-vue";
+import dayjs from "dayjs";
+import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
+import 'dayjs/locale/zh-cn';
+import {
+  DownOutlined,
+  UpOutlined,
+  UploadOutlined,
+  FolderAddOutlined,
+  DownloadOutlined
+} from '@ant-design/icons-vue';
+import ImportWork from "../../components/lecturer/ImportWork.vue";
+import SearchTeacher from "@/components/project/SearchTeacher";
+import { getTeacherFeeList, getTeacherFeeDetail, getListByTeacherExpenseId, addTeacherFee, getListByIds, updateTeacherFee, updateStatusSubmit, approveTeacherFee, getTeacherLevel, deleteInTeacher, confirm } from "../../api/lecturerFeeManagement";
+import { getTeacherSystemList, getAllLevelList, getPayRollPlace, fileUp, submitApproval, deleteLecturerFee, updateLecturerFee } from "../../api/Lecturer";
+// lecturerFeeManagement
+// import {getProjSt} from "../../api/indexProjStu";
+// import AddTeacher from "../../components/drawers/project/AddTeacher"
+import ConfirmLecturer from "@/components/project/ConfirmLecturer"
+import BatchLecturer from "@/components/project/BatchLecturer"
+import { queryTrainOrgPor, } from "../../api/organization";
+import dialog from '@/utils/dialog';
+import OrgClass from "@/components/project/OrgClass";
+import { checkMenu } from '@/utils/utils'
+export default {
+  name: "LecturerFee",
+  components: {
+    DownOutlined, //图标--展开
+    UpOutlined,//图标--收起
+    UploadOutlined,//图标--导出
+    DownloadOutlined,//图标-导入
+    FolderAddOutlined,//图标--新增
+    SearchTeacher,
+    ImportWork,
+    ConfirmLecturer,
+    BatchLecturer,
+    OrgClass,
+  },
+  setup() {
+    const formRef = ref();
+    const state = reactive({
+      example: false,
+      tableDataSee: [],
+      SeeLoading: false,
+      orgList: [],
+      orgListSearch: [],
+      selectsIds: '',
+      visibleConfirm: false,
+      title: '导入讲师费记录',
+      allFeedialog: false,
+      tableLoadings: false,
+      teachingdialog: false,
+      showWork: false,
+      vf: true,
+      moreid: 1,
+      byPid: null,
+      currentPage1: 1,
+      pageSize1: 10,
+      promotionrecordsLoading: false,  //晋级记录遮罩层
+      teacherrecordsLoading: false,// 授课记录遮罩层
+      tableLoading: false,
+      tagsshow: "1",
+      delTeacherId: null, //删除id确认
+      newStatus: null, //修改状态码确认
+      id: null,    //内部讲师工号确认 
+      lookTeacherId: null, //内部讲师详情id确认
+      // deleteInTeacherdialog: false, //删除弹窗
+      editTeacher: false,   //修改状态弹窗
+      handleOperate1: null, //修改状态弹窗内容
+      teacherdialog1: null,
+      teacherdialog: false,  //控制讲师弹窗
+      teacherdialogtitle: '',//讲师弹框title内容
+      pageSizeOptions: ['10', '20', '30', '50'], //下拉选择每页显示多少条
+      pageSize: 10,
+      tableDataTotal: -1,//table列表总条数
+      teachingDate: null,
+      formParam: {
+        teachingDate: null,
+        teachingTime: null,
+        name: null,
+        userNo: null,
+        payrollPlace: null,
+        payrollPlaceId: null,
+        trainOrgId: null,
+        trainOrgName: null,
+      },
+      searchdate: null, //选择时间
+      allsearchdate: null, //选择时间
+      searchParam: {
+        userNo: null,
+        name: null,
+        trainOrgId: null,
+        tSystemId: null,
+        courseName: null,
+        tLevelName: null,
+        courseType: null,
+        certStatus: null,
+        salaryName: null,
+        payrollPlaceName: null,
+        status: null,
+        pageNo: "1",
+        pageSize: "10",
+        beginTime: null,
+        endTime: null,
+      },
+      //一键确认
+      searchall: {
+        name: null,
+        beginTime: null,
+        endTime: null,
+        pageNo: "1",
+        pageSize: "10",
+      },
+      tSystemNames: {
+        systemName: null,
         systemId: null,
         levelVoList: []
       },
-      })
-      onMounted(()=>{
-        orgLists()
-      })
-      const orgLists = () => {
-        const obj = {
-          pageNo:1,
-          pageSize:50
-        }
-        queryTrainOrgPor(obj).then((res) => {
-          state.orgList = res.data.data?.map(item=>{
-            return{
-              label: item.affiliationName,
-              value: item.id 
-            }
-          })
-          state.orgListSearch = res.data.data?.map(item=>{
-            return{
-              label: item.affiliationName,
-              value: item.affiliationName 
-            }
-          })
-          state.orgListSearch.unshift({
-            label: '全部', value: ''
-          })
-        })
+    })
+    onMounted(() => {
+      orgLists()
+    })
+    const orgLists = () => {
+      const obj = {
+        pageNo: 1,
+        pageSize: 50
       }
-     //费用类型
-     const courseTypeList=ref([
+      queryTrainOrgPor(obj).then((res) => {
+        state.orgList = res.data.data?.map(item => {
+          return {
+            label: item.affiliationName,
+            value: item.id
+          }
+        })
+        state.orgListSearch = res.data.data?.map(item => {
+          return {
+            label: item.affiliationName,
+            value: item.id
+          }
+        })
+        state.orgListSearch.unshift({
+          label: '全部', value: ''
+        })
+      })
+    }
+    //费用类型
+    const courseTypeList = ref([
       // { value: '0', label: "在线" },
       //  { value: '1', label: "面授 " },
       //   { value: '2', label: "授课 " },
-        { value: '2', label: "课程开发" },
-        { value: '3', label: "作业员入模培训" },
-        // { value: '4', label: "其他" },
-     ])
-           //课程类型
-           const OnTheJobStatusList = ref([
-        { value: '', label: "全部" },
-        { value: '1', label: "面授课" },
-        { value: '0', label: "在线课" },
-        { value: '2', label: "课程开发" },
-        { value: '3', label: "作业员入模培训" },
-        // { value: '4', label: "其他" },
-      ])
-      //认证状态
-      const AuthenticationStatusList = ref([
-        { value: '', label: "全部" },
-        { value: '0', label: "待确认" },
-        { value: '1', label: "待提交" },
-        { value: '2', label: "审核中" },
-        { value: '4', label: "审核拒绝" },
-        { value: '3', label: "审核通过" },
-      ])
+      { value: '2', label: "课程开发" },
+      { value: '3', label: "作业员入模培训" },
+      // { value: '4', label: "其他" },
+    ])
+    //课程类型
+    const OnTheJobStatusList = ref([
+      { value: '', label: "全部" },
+      { value: '1', label: "面授课" },
+      { value: '0', label: "在线课" },
+      { value: '2', label: "课程开发" },
+      { value: '3', label: "作业员入模培训" },
+      // { value: '4', label: "其他" },
+    ])
+    //认证状态
+    const AuthenticationStatusList = ref([
+      { value: '', label: "全部" },
+      { value: '0', label: "待确认" },
+      { value: '1', label: "待提交" },
+      { value: '2', label: "审核中" },
+      { value: '4', label: "审核拒绝" },
+      { value: '3', label: "审核通过" },
+    ])
 
-      const lecturerSystemList = ref([
-      ]);
-      ///获取讲师体系列表
-      const LecturerSystemLista = () => {
-      let obj ={
-        pageNo:1,
-        pageSize:1000,
+    const lecturerSystemList = ref([
+    ]);
+    ///获取讲师体系列表
+    const LecturerSystemLista = () => {
+      let obj = {
+        pageNo: 1,
+        pageSize: 1000,
         isView: 1
       }
       getTeacherSystemList(obj).then((res) => {
@@ -778,11 +750,11 @@
         }
       })
     }
-      const getLevelList = ref([
+    const getLevelList = ref([
       // { value: 0, label: "未定级" },
     ])
     const changetlevel = () => {
-getAllLevelList().then((res) => {
+      getAllLevelList().then((res) => {
         if (res.data.code === 200) {
           let arr = res.data.data;
           let array = [];
@@ -802,409 +774,409 @@ getAllLevelList().then((res) => {
       })
     }
     changetlevel()
-      LecturerSystemLista()
+    LecturerSystemLista()
 
-      //  //获取讲师发薪地列表
-      // const PlaceOfPayList = ref([
-      //   // { value: 0, label: "发薪地B1" },
-      // ])
-      //  const PlaceOfPayLista =() => {
-      //   getPayRollPlace().then((res)=>{
-      //     if (res.data.code === 200) {
-      //         let arr = res.data.data;
-      //         let array = [];
-      //         arr.map((value) => {
-      //           let obj = {
-      //             value: value.id,
-      //           label: value.name,
-      //           };
-      //           array.push(obj);
-      //         });
-      //         PlaceOfPayList.value = array;
-      //       }
-      //     console.log("获取发薪地", PlaceOfPayList);
-      //   })
-      // }
-      // PlaceOfPayLista()
-      //状态
-      const AccountStatusList = ref([
-        { value:"0", label: "待确认", },
-        { value:"1", label: "待提交", },
-        { value:"2", label: "审核中", },
-        { value:"3", label: "审核通过", },
-        { value:"4", label: "审核拒绝", },
-        { value:"5", label: "待提交", },
-      ])
-      watch(()=>state.formParam.name,(val)=>{
-        state.formParam.userNo = val?.split('/')[1]
+    //  //获取讲师发薪地列表
+    // const PlaceOfPayList = ref([
+    //   // { value: 0, label: "发薪地B1" },
+    // ])
+    //  const PlaceOfPayLista =() => {
+    //   getPayRollPlace().then((res)=>{
+    //     if (res.data.code === 200) {
+    //         let arr = res.data.data;
+    //         let array = [];
+    //         arr.map((value) => {
+    //           let obj = {
+    //             value: value.id,
+    //           label: value.name,
+    //           };
+    //           array.push(obj);
+    //         });
+    //         PlaceOfPayList.value = array;
+    //       }
+    //     console.log("获取发薪地", PlaceOfPayList);
+    //   })
+    // }
+    // PlaceOfPayLista()
+    //状态
+    const AccountStatusList = ref([
+      { value: "0", label: "待确认", },
+      { value: "1", label: "待提交", },
+      { value: "2", label: "审核中", },
+      { value: "3", label: "审核通过", },
+      { value: "4", label: "审核拒绝", },
+      { value: "5", label: "待提交", },
+    ])
+    watch(() => state.formParam.name, (val) => {
+      state.formParam.userNo = val?.split('/')[1]
+    }
+    )
+
+    //切换筛选
+    const handlemoreid = () => {
+      if (state.moreid == 1) {
+        state.moreid = 2
       }
-      )
- 
-      //切换筛选
-      const handlemoreid=()=>{
-        if(state.moreid==1){
-          state.moreid=2
-        }
-        else if(state.moreid == 2){
-          state.moreid=1
-          // state.searchParam.certStatus=null
-          // state.searchParam.salaryName=null
-          state.searchParam.status=null
-          state.searchParam.tSystemId = null
-          state.searchParam.tLevelName = null
-        }
+      else if (state.moreid == 2) {
+        state.moreid = 1
+        // state.searchParam.certStatus=null
+        // state.searchParam.salaryName=null
+        state.searchParam.status = null
+        state.searchParam.tSystemId = null
+        state.searchParam.tLevelName = null
       }
-      const columnSee = ref([
-        {
-          title: '审批层级',
-          dataIndex: 'levelName',
-          key: 'levelName',
-          ellipsis: true,
-          align: "center",
-        },
-        {
-          title: '审批人 ',
-          dataIndex: 'employeeNames',
-          key: 'employeeNames',
-          ellipsis: true,
-          align: "center",
-        },
-        {
-          title: '审批状态 ',
-          dataIndex: 'approvalStatus',
-          key: 'approvalStatus',
-          ellipsis: true,
-          align: "center",
-          customRender: ({text})=>{
-            switch (text) {
-              case 0:
-                return <span>待提交</span>;
-              case 1:
-                return <span>待审核</span>;
-              case 2:
-                return <span>审核中</span>;
-              case 3:
-                return <span>审核通过</span>;
-              case 4:
-                return <span>拒绝</span>;
-              case 5:
-                return <span>撤销中</span>;
-              case 6:
-                return <span>已撤销</span>;
-              default:
-                return <span>-</span>;
-            }
+    }
+    const columnSee = ref([
+      {
+        title: '审批层级',
+        dataIndex: 'levelName',
+        key: 'levelName',
+        ellipsis: true,
+        align: "center",
+      },
+      {
+        title: '审批人 ',
+        dataIndex: 'employeeNames',
+        key: 'employeeNames',
+        ellipsis: true,
+        align: "center",
+      },
+      {
+        title: '审批状态 ',
+        dataIndex: 'approvalStatus',
+        key: 'approvalStatus',
+        ellipsis: true,
+        align: "center",
+        customRender: ({ text }) => {
+          switch (text) {
+            case 0:
+              return <span>待提交</span>;
+            case 1:
+              return <span>待审核</span>;
+            case 2:
+              return <span>审核中</span>;
+            case 3:
+              return <span>审核通过</span>;
+            case 4:
+              return <span>拒绝</span>;
+            case 5:
+              return <span>撤销中</span>;
+            case 6:
+              return <span>已撤销</span>;
+            default:
+              return <span>-</span>;
           }
-        },
-        {
-          title: '审批时间 ',
-          dataIndex: 'approvalTime',
-          key: 'approvalTime',
-          ellipsis: true,
-          align: "center",
-        },
-        {
-          title: '备注 ',
-          dataIndex: 'approvalMsg',
-          key: 'approvalMsg',
-          ellipsis: true,
-          align: "center",
-          customRender:({text})=>{
-            return text||'-'
-          }
-        },
-      ])
-      const columns = ref([
-        {
-          title: '讲师姓名 ',
-          dataIndex: 'name',
-          key: 'name',
+        }
+      },
+      {
+        title: '审批时间 ',
+        dataIndex: 'approvalTime',
+        key: 'approvalTime',
+        ellipsis: true,
+        align: "center",
+      },
+      {
+        title: '备注 ',
+        dataIndex: 'approvalMsg',
+        key: 'approvalMsg',
+        ellipsis: true,
+        align: "center",
+        customRender: ({ text }) => {
+          return text || '-'
+        }
+      },
+    ])
+    const columns = ref([
+      {
+        title: '讲师姓名 ',
+        dataIndex: 'name',
+        key: 'name',
         ellipsis: true, align: "center",
-          width: 180,
-          customRender: (value, index) => {
-            return (
-              <div style="user-select: text;">
-                {value.record?.name}  /  {value.record?.userNo}
-              </div>
-            );
-          },
+        width: 180,
+        customRender: (value, index) => {
+          return (
+            <div style="user-select: text;">
+              { value.record?.name }  /  { value.record?.userNo }
+            </div>
+          );
         },
-        // {
-        //   title: '讲师工号 ',
-        //   dataIndex: 'userNo',
-        //   key: 'userNo',
-        // ellipsis: true, align: "center",
-        //   width: 120,
-        // },
-        {
-          title: '课程名称 ',
-          dataIndex: 'courseName',
-          key: 'courseName',
-          ellipsis: true,
-          align: "left",
-          width: 200,
-          customCell:()=>{return{style:{userSelect: 'text'}}}
-        },
-        {
-          title: '培训发生组织',
-          dataIndex: 'trainOrgName',
-          key: 'trainOrgName',
+      },
+      // {
+      //   title: '讲师工号 ',
+      //   dataIndex: 'userNo',
+      //   key: 'userNo',
+      // ellipsis: true, align: "center",
+      //   width: 120,
+      // },
+      {
+        title: '课程名称 ',
+        dataIndex: 'courseName',
+        key: 'courseName',
+        ellipsis: true,
+        align: "left",
+        width: 200,
+        customCell: () => { return { style: { userSelect: 'text' } } }
+      },
+      {
+        title: '培训发生组织',
+        dataIndex: 'trainOrgName',
+        key: 'trainOrgName',
         ellipsis: true, align: "left",
-          width: 200,
-          customCell:()=>{return{style:{userSelect: 'text'}}}
-        },
-        {
-          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: '授课/课程开发日期',
-          dataIndex: 'teachingDate',
-          key: 'teachingDate',
-        ellipsis: true, align: "center",
-          width: 160,
-          
-        },
-        {
-          title: '授课/课程开发时长 ',
-          dataIndex: 'teachingTime',
-          key: 'teachingTime',
-        ellipsis: true, align: "center",
-          width: 160,
-          customRender:(value)=>{
-            return (
-              <div>
-                {(value.record?.teachingTime/60).toFixed(2)}小时
-              </div>
-            )
-          }
-        },
-        {
-          title: '基准课酬 ',
-          dataIndex: 'levelPay',
-          key: 'levelPay',
-        ellipsis: true, align: "center",
-          width: 120,
-          customRender: ({text})=>{
-            return text||text==0 ? text+'元' : '-'
-          }
-        },
-        {
-          title: '计划费用 ',
-          dataIndex: 'expense',
-          key: 'expense',
-        ellipsis: true, align: "center",
-          width: 120,
-          customRender: ({text})=>{
-          return text ? text+'元' : '-'
-        }
-        },
-        {
-          title: '参训人数',
-          dataIndex: 'studys',
-          key: 'studys',
-        ellipsis: true, align: "center",
-          width: 120,
-          customRender: ({text})=>{
-            return text ? text+'人' : '0人'
-          }
-        },
-        {
-          title: '评分 ',
-          dataIndex: 'score',
-          key: 'score',
-        ellipsis: true, align: "center",
-          width: 120,
-          customRender: (value) => {
+        width: 200,
+        customCell: () => { return { style: { userSelect: 'text' } } }
+      },
+      {
+        title: '课程类型 ',
+        dataIndex: ' courseType',
+        key: ' courseType',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: (value) => {
           return (
             <div>
-              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(2)+'分' : '-'}
+              { String(value.record.courseType)
+                ? {
+                  "0": "在线课",
+                  "1": "面授课",
+                  "2": "课程开发",
+                  "3": "作业员入模培训",
+                  "4": "其他",
+                }[value.record.courseType + ""]
+                : "-" }
             </div>
           )
         }
-        },
+      },
+      {
+        title: '授课/课程开发日期',
+        dataIndex: 'teachingDate',
+        key: 'teachingDate',
+        ellipsis: true, align: "center",
+        width: 160,
 
-        {
-          title: '状态 ',
-          dataIndex: 'status',
-          key: 'status',
-          ellipsis: true,
-          align: "center",
-          width: 120,
-          customRender: (value) => {
-            return (
-              <div>
-                {String(value.record.status)
-                  ? {
-                    "0": "待确认",
-                    "1": "待提交",
-                    "2": "审核中",
-                    "3": "审核通过",
-                    '4': '审核拒绝',
-                    '5': '停用',
-                  }[value.record.status + ""] || ""
-                  : "-"}
-              </div>
-            )
-          }
-        },
-        {
-          title: '发薪地 ',
-          dataIndex: 'payrollPlace',
-          key: 'payrollPlace',
+      },
+      {
+        title: '授课/课程开发时长 ',
+        dataIndex: 'teachingTime',
+        key: 'teachingTime',
         ellipsis: true, align: "center",
-          width: 120,
-          customRender: ({ text })=>{
-            return text||'-'
-          }
-        },
-        {
-          title: '讲师体系',
-          dataIndex: 'tsystemName',
-          key: 'tsystemName',
+        width: 160,
+        customRender: (value) => {
+          return (
+            <div>
+              { (value.record?.teachingTime / 60).toFixed(2) }小时
+            </div>
+          )
+        }
+      },
+      {
+        title: '基准课酬 ',
+        dataIndex: 'levelPay',
+        key: 'levelPay',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text || text == 0 ? text + '元' : '-'
+        }
+      },
+      {
+        title: '计划费用 ',
+        dataIndex: 'expense',
+        key: 'expense',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text ? text + '元' : '-'
+        }
+      },
+      {
+        title: '参训人数',
+        dataIndex: 'studys',
+        key: 'studys',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text ? text + '人' : '0人'
+        }
+      },
+      {
+        title: '评分 ',
+        dataIndex: 'score',
+        key: 'score',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              { value.record.score ? Number(value.record.score).toFixed(0) == 0 ? '-' : Number(value.record.score).toFixed(2) + '分' : '-' }
+            </div>
+          )
+        }
+      },
+
+      {
+        title: '状态 ',
+        dataIndex: 'status',
+        key: 'status',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              { String(value.record.status)
+                ? {
+                  "0": "待确认",
+                  "1": "待提交",
+                  "2": "审核中",
+                  "3": "审核通过",
+                  '4': '审核拒绝',
+                  '5': '停用',
+                }[value.record.status + ""] || ""
+                : "-" }
+            </div>
+          )
+        }
+      },
+      {
+        title: '发薪地 ',
+        dataIndex: 'payrollPlace',
+        key: 'payrollPlace',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text || '-'
+        }
+      },
+      {
+        title: '讲师体系',
+        dataIndex: 'tsystemName',
+        key: 'tsystemName',
         ellipsis: true, align: "left",
-          width: 200,
-          customRender: ({ text })=>{
-            return text||'-'
-          }
-        },
-        {
-          title: '讲师级别 ',
-          dataIndex: 'tlevelName',
-          key: 'tlevelName',
+        width: 200,
+        customRender: ({ text }) => {
+          return text || '-'
+        }
+      },
+      {
+        title: '讲师级别 ',
+        dataIndex: 'tlevelName',
+        key: 'tlevelName',
         ellipsis: true, align: "center",
-          width: 120,
-          customRender: ({ text })=>{
-            return text||'-'
-          }
-        },
-        {
-          title: '讲师组织',
-          dataIndex: 'orgName',
-          key: 'orgName',
+        width: 120,
+        customRender: ({ text }) => {
+          return text || '-'
+        }
+      },
+      {
+        title: '讲师组织',
+        dataIndex: 'orgName',
+        key: 'orgName',
         ellipsis: true, align: "center",
-          width: 200,
-          slots: { customRender: "trainOrg" },
-        },
-        {
+        width: 200,
+        slots: { customRender: "trainOrg" },
+      },
+      {
         title: '操作 ',
         dataIndex: 'operation',
         key: 'operation',
-      ellipsis: true, align: "center",
-      fixed: "right",
+        ellipsis: true, align: "center",
+        fixed: "right",
         width: 180,
         scopedSlots: { customRender: "action" },
       },
-        
-      ])
-      //列表数据
-      const tableData = ref([
-  
-  
-      ])
-      // 搜索
-      const searchSubmit = () => {
-        console.log("searchSubmit gx")
-        state.searchParam.pageNo = 1
-        getTableDate();
-      };
-      //重置
-      const searchReset = () => {
-        state.searchdate= null,
-        state.searchParam = { 
-          endTime:null,
-        beginTime:null,
-          userNo:null,
-          tSystemId:null,
+
+    ])
+    //列表数据
+    const tableData = ref([
+
+
+    ])
+    // 搜索
+    const searchSubmit = () => {
+      console.log("searchSubmit gx")
+      state.searchParam.pageNo = 1
+      getTableDate();
+    };
+    //重置
+    const searchReset = () => {
+      state.searchdate = null,
+        state.searchParam = {
+          endTime: null,
+          beginTime: null,
+          userNo: null,
+          tSystemId: null,
           courseName: null,
-          tLevelName:null,
-          courseType:null,
-          certStatus:null,
-          salaryName:null,
-          status:null,
-          pageNo: 1, 
-          pageSize: 10 ,
+          tLevelName: null,
+          courseType: null,
+          certStatus: null,
+          salaryName: null,
+          status: null,
+          pageNo: 1,
+          pageSize: 10,
         };
-        getTableDate();
-      };
-//         //修改时间
-//         function searchTimeChange(time, timeStr) {
-//       let startTime = timeStr[0]
-//       let beginTime = timeStr[1] ;
-//       state.startTime = new Date(startTime).getTime();
-//       state.beginTime = new Date(beginTime).getTime();
-//       // state.searchParam.beginTime = new Date(beginTime).getTime() ;
-//       // state.searchParam.endTime = new Date(endTime).getTime() ;
-//       state.searchParam.beginTime = state.startTime ? state.startTime : null,
-//         state.searchParam.endTime = state.beginTime ? state.beginTime : null
-// }
-      //  List接口数据
-       const getTableDate = (obj) => {
-        state.tableLoading=true
-        let objA = { ...state.searchParam };
-         objA.beginTime = state.searchdate ? dayjs(state.searchdate[0]).format("YYYY-MM-DD") : "",
-        objA.endTime =  state.searchdate ? dayjs(state.searchdate[1]).format("YYYY-MM-DD") : "",
-        console.log("getTableDate gx objA",objA);
-        getTeacherFeeList(objA)
-          .then((res) => {
-            console.log("getTeacherFeeList gx objA",objA);
-            tableData.value = res.data.data.records
-            state.tableDataTotal = Number(res.data.data.total);
-            state.tableLoading=false
-        }).catch(err=>{
-          state.tableLoading=false
+      getTableDate();
+    };
+    //         //修改时间
+    //         function searchTimeChange(time, timeStr) {
+    //       let startTime = timeStr[0]
+    //       let beginTime = timeStr[1] ;
+    //       state.startTime = new Date(startTime).getTime();
+    //       state.beginTime = new Date(beginTime).getTime();
+    //       // state.searchParam.beginTime = new Date(beginTime).getTime() ;
+    //       // state.searchParam.endTime = new Date(endTime).getTime() ;
+    //       state.searchParam.beginTime = state.startTime ? state.startTime : null,
+    //         state.searchParam.endTime = state.beginTime ? state.beginTime : null
+    // }
+    //  List接口数据
+    const getTableDate = (obj) => {
+      state.tableLoading = true
+      let objA = { ...state.searchParam };
+      objA.beginTime = state.searchdate ? dayjs(state.searchdate[0]).format("YYYY-MM-DD") : "",
+        objA.endTime = state.searchdate ? dayjs(state.searchdate[1]).format("YYYY-MM-DD") : "",
+        console.log("getTableDate gx objA", objA);
+      getTeacherFeeList(objA)
+        .then((res) => {
+          console.log("getTeacherFeeList gx objA", objA);
+          tableData.value = res.data.data.records
+          state.tableDataTotal = Number(res.data.data.total);
+          state.tableLoading = false
+        }).catch(err => {
+          state.tableLoading = false
           message.destroy()
           message.error(err.data.msg)
         })
-      };
-      getTableDate()
-      //   // 翻页
-      const changePagination = (page,pageSize) => {
-        state.searchParam.pageNo = page;
+    };
+    getTableDate()
+    //   // 翻页
+    const changePagination = (page, pageSize) => {
+      state.searchParam.pageNo = page;
       // state.pageNo = page;
       state.searchParam.pageSize = pageSize;
       getTableDate();
-      };
-      // 添加讲师费
-      const addTeacher = () => {
-        cancel()
-        state.teacherdialog = true;
-        state.vf = true
-        state.teacherdialogtitle = '添加讲师费'
-        
-      }
-      //修改讲师费信息弹窗
-      const handleModify = (record) => {
-        state.teacherdialog = true;
-        state.teacherdialogtitle = '编辑讲师费'
-        state.id= record.id
-        state.vf = false
-        TeacherSystem()
-      }
-      //一键确认讲师费
-      const handleTeacher =()=>{
-        state.visibleConfirm = true
-      }
-      async function validateField(name) {
+    };
+    // 添加讲师费
+    const addTeacher = () => {
+      cancel()
+      state.teacherdialog = true;
+      state.vf = true
+      state.teacherdialogtitle = '添加讲师费'
+
+    }
+    //修改讲师费信息弹窗
+    const handleModify = (record) => {
+      state.teacherdialog = true;
+      state.teacherdialogtitle = '编辑讲师费'
+      state.id = record.id
+      state.vf = false
+      TeacherSystem()
+    }
+    //一键确认讲师费
+    const handleTeacher = () => {
+      state.visibleConfirm = true
+    }
+    async function validateField(name) {
       return new Promise((resolve) => {
         formRef.value.validateFields([name])
           .then(() => {
@@ -1216,38 +1188,38 @@ getAllLevelList().then((res) => {
       });
     }
     watch(() => state.formParam.orgNames, (val) => {
-      if(val){
+      if (val) {
         const parts = val.split('/');
         const reversedParts = parts.reverse();
         state.formParam.orgName = reversedParts.join('/');
       }
     })
-    const changeOrg = (e,l) => {
+    const changeOrg = (e, l) => {
       state.formParam.trainOrgName = l?.label
     }
     //保存
     const createTeacherDialog = async () => {
       state.formParam.expense = String(state.formParam.expense)
-      state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : ""
+      state.formParam.teachingDate = state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : ""
       state.formParam.tsystemName = state.tSystemNames.systemName
       state.formParam.tsystemId = state.tSystemNames.systemId
       state.formParam.courseName = state.formParam.courseName?.trim()
-      if(state.formParam.studys==0){
+      if (state.formParam.studys == 0) {
         state.formParam.studys = null
       }
-      if(state.formParam.score){
+      if (state.formParam.score) {
         state.formParam.score = String(state.formParam.score)
-      }else{
+      } else {
         state.formParam.score = null
       }
-      if(state.formParam.levelPay){
+      if (state.formParam.levelPay) {
         state.formParam.levelPay = String(state.formParam.levelPay)
       }
-      if(state.formParam.payableExpense){
+      if (state.formParam.payableExpense) {
         state.formParam.payableExpense = String(state.formParam.payableExpense)
       }
       const formItemNames = Object.keys(rules);
-      for(let i=0;i<formItemNames.length;i++){
+      for (let i = 0; i < formItemNames.length; i++) {
         // const result = await validateField(formItemNames[i]);
         const result = state.formParam[formItemNames[i]]
         if (!result) {
@@ -1255,587 +1227,587 @@ getAllLevelList().then((res) => {
         }
       }
       state.formParam.orgName = state.formParam.orgNames
-      state.formParam = {...state.formParam,...state.tSystemNames}
+      state.formParam = { ...state.formParam, ...state.tSystemNames }
       state.formParam.name = state.formParam?.name?.split('/')[0]
       if (state.vf == false) {
         updateTeacherFee(state.formParam).then(response => {
-            message.success("编辑成功");
+          message.success("编辑成功");
+          state.teacherdialog = false;
+          cancel()
+          getTableDate();
+        }).catch(err => {
+          message.destroy()
+          state.teacherdialog = false;
+          message.error(err.data.msg)
+        })
+      }
+      else {
+        addTeacherFee(state.formParam)
+          .then((res) => {
+            message.success("新增成功");
             state.teacherdialog = false;
             cancel()
-            getTableDate(); 
-          }).catch(err=>{
-            message.destroy()
-            state.teacherdialog = false;
-            message.error(err.data.msg)
-          })
-        }
-        else {
-          addTeacherFee(state.formParam)
-            .then((res) => {
-              message.success("新增成功");
-              state.teacherdialog = false;
-              cancel()
-              getTableDate(); 
-            }).catch(err=>{
-            message.destroy()
-            state.teacherdialog = false;
-            message.error(err.data.msg)
-          })
-        }
-    };
-      //删除弹窗
-      const deleteModal = (record) => {
-        dialog({
-          content: '是否确认进行删除?',
-          ok: () => {
-            deleteLecturerFee({id:record.id}).then(res=>{
-              if(typeof (res.data.data) != 'object'){
-                message.error(res.data.data)
-                return
-              }
-              message.success("删除成功");
-              searchSubmit()
-           }).catch(err=>{
-            message.destroy()
-            message.error(err.data.msg)
-           })
-          }
-        })
-      };
-      const updateModal = (record) => {
-        dialog({
-          content: `是否确认${record.status == 5 ? '启用':'停用'}?`,
-          ok: () => {
-            const status = record.status ==0 ? 5 : 0
-            updateLecturerFee({id:record.id,status}).then(res=>{
-              if(typeof (res.data.data) != 'object'){
-                message.error(res.data.data)
-                return
-              }
-              message.success(`${status == 0 ? '启用':'停用'}成功`);
-              searchSubmit()
-           }).catch(err=>{
-            message.destroy()
-            message.error(err.data.msg)
-           })
-          }
-        })
-      }
-      //修改状态窗口
-      const handleOperate = (record) => {
-        dialog({
-          content: "等待接口中...",
-          ok: () => {
-            
-          }
-        })
-      };
-      // //确认删除
-      const closeDeleteTeacher=()=>{
-        //调用删除接口
-        deleteInTeacher(state.delTeacherId).then((res)=>{
-          if(res.data.code == 200 ){
-            // message.success("删除成功");
-            state.deleteInTeacherdialog = false
             getTableDate();
-          }
-        })
-      } 
-      //提交撤回状态
-      const closehandleOperate= ()=>{
-         //调用接口
-         let ids ={
-        id : state.id
-          } 
-      if ( state.handleOperate1 === 'A10'){
+          }).catch(err => {
+            message.destroy()
+            state.teacherdialog = false;
+            message.error(err.data.msg)
+          })
+      }
+    };
+    //删除弹窗
+    const deleteModal = (record) => {
+      dialog({
+        content: '是否确认进行删除?',
+        ok: () => {
+          deleteLecturerFee({ id: record.id }).then(res => {
+            if (typeof (res.data.data) != 'object') {
+              message.error(res.data.data)
+              return
+            }
+            message.success("删除成功");
+            searchSubmit()
+          }).catch(err => {
+            message.destroy()
+            message.error(err.data.msg)
+          })
+        }
+      })
+    };
+    const updateModal = (record) => {
+      dialog({
+        content: `是否确认${record.status == 5 ? '启用' : '停用'}?`,
+        ok: () => {
+          const status = record.status == 0 ? 5 : 0
+          updateLecturerFee({ id: record.id, status }).then(res => {
+            if (typeof (res.data.data) != 'object') {
+              message.error(res.data.data)
+              return
+            }
+            message.success(`${status == 0 ? '启用' : '停用'}成功`);
+            searchSubmit()
+          }).catch(err => {
+            message.destroy()
+            message.error(err.data.msg)
+          })
+        }
+      })
+    }
+    //修改状态窗口
+    const handleOperate = (record) => {
+      dialog({
+        content: "等待接口中...",
+        ok: () => {
+
+        }
+      })
+    };
+    // //确认删除
+    const closeDeleteTeacher = () => {
+      //调用删除接口
+      deleteInTeacher(state.delTeacherId).then((res) => {
+        if (res.data.code == 200) {
+          // message.success("删除成功");
+          state.deleteInTeacherdialog = false
+          getTableDate();
+        }
+      })
+    }
+    //提交撤回状态
+    const closehandleOperate = () => {
+      //调用接口
+      let ids = {
+        id: state.id
+      }
+      if (state.handleOperate1 === 'A10') {
         updateStatusSubmit(ids).then((res) => {
-              message.success("提交成功");
-             getTableDate();
-          })
-        }
-        else{
-          approveTeacherFee(ids).then((res) => {
-              message.success("撤回成功");
-             getTableDate();
-          })
-        }
-        // else if(state.handleOperate1 === 'A20'){
-        //   approveTeacherFee(ids).then((res) => {
-        //       message.success("撤回成功");
-        //      getTableDate();
-        //   })
-        // }
-        state.editTeacher =false
-      }
-      //取消按钮 清空输入的数据
-      const cancelTeacherDialog = () => {
-        formRef.value.resetFields();
-        state.teacherdialog = false
-        cancel()
-      };
-      const canceleditTeacherDialog=()=>{
-        state.editTeacher =false
-      }
-  
-      //清空数据
-      const cancel = () => {
-        state.formParam ={
-          name:null,
-          userNo:null,
-          orgNames:null,
-          orgName:null,
-          tsystemName:null,
-          tlevelId:null,
-          payrollPlace:null,
-          courseType: null,
-          courseName:null,
-          teachingDate:null,
-          teachingTime:null,
-          courseType:null,
-          studys:null,
-          teacherlevelPay:null,
-          score:null,
-          levelPay:null,
-          payableExpense:null,
-          expense:null,
-          remark:null,
-          trainOrgId: null,
-          trainOrgName: null,
-        }
-        state.id = null
-        state.teachingDate=null
-        state.tSystemNames = {
-          systemName:null,
-          levelVoList: []
-        }
-      }
-      const orgSplit = (val) => {
-        if(val){
-          const org = val.split('/')
-          return org[org.length-1]
-        }
-      }
-      //表格内查看数据操作
-      const handleLook = (record) => {
-        state.teachingdialog = true;
-        state.teacherdialogtitle = '查看详情'
-        state.id= record.id
-        // alert(record.grade)
-        TeacherSystem()
-        // getListData()
-        // getteacherrecordstableData ()
-      }
-      const getListData = () => {
-        state.SeeLoading = true
-        getListByTeacherExpenseId(state.id).then(res=>{
-          if(res.data.code == 200){
-            state.tableDataSee = res.data.data
-          }
-          state.SeeLoading = false
-        }).catch(err=>{
-          message.destroy()
-          message.error(err.data.msg)
-          state.SeeLoading = false
+          message.success("提交成功");
+          getTableDate();
         })
       }
-      //详情
-      const TeacherSystem=()=>{
-        getTeacherFeeDetail({id : state.id}).then((res) => {
-            // state.formParam=Object.assign({} ,res.data.data)
-            state.formParam=res.data.data
-            // tableDataFeeDetail.value = res.data.data.records
-            state.formParam.courseType = String(res.data.data.courseType)
-            state.formParam.levelPay = String(res.data.data.levelPay)
-            state.tSystemNames.systemName = res.data.data.tsystemName
-            state.tSystemNames.systemId = res.data.data.tsystemId
-            state.tSystemNames.systemCode = res.data.data.systemCode
-            state.tSystemNames.levelVoList = res.data.data.levelVoList
-            state.formParam.tlevelName = res.data.data.tlevelName
-            state.formParam.tlevelId = res.data.data.tlevelId
-            state.formParam.name = res.data.data.name+'/'+res.data.data.userNo
-            state.teachingDate = dayjs(res.data.data.teachingDate)
-            state.formParam.payrollPlaceId = res.data.data.payrollPlaceId
-            state.formParam.orgNames = state.formParam.orgName
-            state.formParam.teachingDate = dayjs(state.formParam.teachingDate).format("YYYY-MM-DD HH:mm")
-        }) 
+      else {
+        approveTeacherFee(ids).then((res) => {
+          message.success("撤回成功");
+          getTableDate();
+        })
+      }
+      // else if(state.handleOperate1 === 'A20'){
+      //   approveTeacherFee(ids).then((res) => {
+      //       message.success("撤回成功");
+      //      getTableDate();
+      //   })
+      // }
+      state.editTeacher = false
+    }
+    //取消按钮 清空输入的数据
+    const cancelTeacherDialog = () => {
+      formRef.value.resetFields();
+      state.teacherdialog = false
+      cancel()
+    };
+    const canceleditTeacherDialog = () => {
+      state.editTeacher = false
+    }
+
+    //清空数据
+    const cancel = () => {
+      state.formParam = {
+        name: null,
+        userNo: null,
+        orgNames: null,
+        orgName: null,
+        tsystemName: null,
+        tlevelId: null,
+        payrollPlace: null,
+        courseType: null,
+        courseName: null,
+        teachingDate: null,
+        teachingTime: null,
+        courseType: null,
+        studys: null,
+        teacherlevelPay: null,
+        score: null,
+        levelPay: null,
+        payableExpense: null,
+        expense: null,
+        remark: null,
+        trainOrgId: null,
+        trainOrgName: null,
+      }
+      state.id = null
+      state.teachingDate = null
+      state.tSystemNames = {
+        systemName: null,
+        levelVoList: []
+      }
+    }
+    const orgSplit = (val) => {
+      if (val) {
+        const org = val.split('/')
+        return org[org.length - 1]
+      }
+    }
+    //表格内查看数据操作
+    const handleLook = (record) => {
+      state.teachingdialog = true;
+      state.teacherdialogtitle = '查看详情'
+      state.id = record.id
+      // alert(record.grade)
+      TeacherSystem()
+      // getListData()
+      // getteacherrecordstableData ()
+    }
+    const getListData = () => {
+      state.SeeLoading = true
+      getListByTeacherExpenseId(state.id).then(res => {
+        if (res.data.code == 200) {
+          state.tableDataSee = res.data.data
+        }
+        state.SeeLoading = false
+      }).catch(err => {
+        message.destroy()
+        message.error(err.data.msg)
+        state.SeeLoading = false
+      })
+    }
+    //详情
+    const TeacherSystem = () => {
+      getTeacherFeeDetail({ id: state.id }).then((res) => {
+        // state.formParam=Object.assign({} ,res.data.data)
+        state.formParam = res.data.data
+        // tableDataFeeDetail.value = res.data.data.records
+        state.formParam.courseType = String(res.data.data.courseType)
+        state.formParam.levelPay = String(res.data.data.levelPay)
+        state.tSystemNames.systemName = res.data.data.tsystemName
+        state.tSystemNames.systemId = res.data.data.tsystemId
+        state.tSystemNames.systemCode = res.data.data.systemCode
+        state.tSystemNames.levelVoList = res.data.data.levelVoList
+        state.formParam.tlevelName = res.data.data.tlevelName
+        state.formParam.tlevelId = res.data.data.tlevelId
+        state.formParam.name = res.data.data.name + '/' + res.data.data.userNo
+        state.teachingDate = dayjs(res.data.data.teachingDate)
+        state.formParam.payrollPlaceId = res.data.data.payrollPlaceId
+        state.formParam.orgNames = state.formParam.orgName
+        state.formParam.teachingDate = dayjs(state.formParam.teachingDate).format("YYYY-MM-DD HH:mm")
+      })
         .catch((err) => {
           message.destroy()
           message.error(err.data.msg)
         });
-      }
-      //二级页面
-      const columnsFeeDetail = ref([
-        { 
-          title: '时间',
-          dataIndex: 'updatedAt',
-          key: 'updatedAt',
+    }
+    //二级页面
+    const columnsFeeDetail = ref([
+      {
+        title: '时间',
+        dataIndex: 'updatedAt',
+        key: 'updatedAt',
         ellipsis: true, align: "center",
-          width: 150,
-        } ,
-        { 
-          title: '操作人 ',
-          dataIndex: 'updatedBy',
-          key: 'updatedBy9',
+        width: 150,
+      },
+      {
+        title: '操作人 ',
+        dataIndex: 'updatedBy',
+        key: 'updatedBy9',
         ellipsis: true, align: "center",
-          width: 150,
-        } ,
-        {
-          title: '操作 ',
-          dataIndex: 'status',
-          key: 'status',
+        width: 150,
+      },
+      {
+        title: '操作 ',
+        dataIndex: 'status',
+        key: 'status',
         ellipsis: true, align: "center",
-          width: 150,
-          customRender: (value) => {
-            return (
-              <div>
-                {value.record.status == "A10" || value.record.status == "A20"
-                  ? {
-                    "A10": "已提交",
-                    "A20": "待审核",
-                  }[value.record.status + ""] || ""
-                  : "-"}
-              </div>
-            )
-          }
-        },
-        { 
-          title: '备注 ',
-          dataIndex: 'remark',
-          key: 'remark',
+        width: 150,
+        customRender: (value) => {
+          return (
+            <div>
+              { value.record.status == "A10" || value.record.status == "A20"
+                ? {
+                  "A10": "已提交",
+                  "A20": "待审核",
+                }[value.record.status + ""] || ""
+                : "-" }
+            </div>
+          )
+        }
+      },
+      {
+        title: '备注 ',
+        dataIndex: 'remark',
+        key: 'remark',
         ellipsis: true, align: "center",
-          width: 150,
-        } ,
-      ])
-        //取消按钮 清空输入的数据
-         const cancelTeachingDialog = (val) => {
-          if(val){
-            dialog({
-              content: '是否确认讲师费信息无误？提交后按“培训发生组织”汇总至审批中心，等待验证后“提交”进入审批流程。',
-              ok: () => {
-                submitApproval({ids:state.formParam.id}).then(res=>{
-                  if(res.data.code == 200){
-                    message.success('提交成功')
-                    state.teachingdialog = false
-                    searchSubmit()
-                  }
-                }).catch(err=>{
-                  message.destroy()
-                  message.error(err.data.msg)
-                  state.teachingdialog = false
-                })
+        width: 150,
+      },
+    ])
+    //取消按钮 清空输入的数据
+    const cancelTeachingDialog = (val) => {
+      if (val) {
+        dialog({
+          content: '是否确认讲师费信息无误？提交后按“培训发生组织”汇总至审批中心，等待验证后“提交”进入审批流程。',
+          ok: () => {
+            submitApproval({ ids: state.formParam.id }).then(res => {
+              if (res.data.code == 200) {
+                message.success('提交成功')
+                state.teachingdialog = false
+                searchSubmit()
               }
+            }).catch(err => {
+              message.destroy()
+              message.error(err.data.msg)
+              state.teachingdialog = false
             })
-          }else{
-            state.teachingdialog = false
           }
-      };
-      const clearNonNumber = () => {
+        })
+      } else {
+        state.teachingdialog = false
+      }
+    };
+    const clearNonNumber = () => {
       state.formParam.teachingTime = state.formParam.teachingTime?.replace(/\D/g, '');
-      state.formParam.teachingTime = state.formParam.teachingTime?.slice(0,8);
+      state.formParam.teachingTime = state.formParam.teachingTime?.slice(0, 8);
       state.formParam.teachingTime == 0 && (state.formParam.teachingTime = null);
-      state.formParam.teachingTime && state.formParam.levelPay && (state.formParam.expense = (state.formParam.levelPay*(state.formParam.teachingTime/60)).toFixed(2));
-      state.formParam.teachingTime && state.formParam.levelPay && (state.formParam.payableExpense = (state.formParam.levelPay*(state.formParam.teachingTime/60)).toFixed(2));
+      state.formParam.teachingTime && state.formParam.levelPay && (state.formParam.expense = (state.formParam.levelPay * (state.formParam.teachingTime / 60)).toFixed(2));
+      state.formParam.teachingTime && state.formParam.levelPay && (state.formParam.payableExpense = (state.formParam.levelPay * (state.formParam.teachingTime / 60)).toFixed(2));
     }
     const clearstudysNumber = () => {
       state.formParam.studys = state.formParam.studys.replace(/\D/g, '');
-      state.formParam.studys = state.formParam.studys?.slice(0,8)
+      state.formParam.studys = state.formParam.studys?.slice(0, 8)
     }
-    const  clearscoreNumber= () => {
+    const clearscoreNumber = () => {
       state.formParam.score = state.formParam.score?.replace(/\D/g, '');
       state.formParam.score == 0 && (state.formParam.score = null);
       // state.formParam.score > 10 && (state.formParam.score = '10');
     }
     const payExpense = () => {
       state.formParam.payableExpense = state.formParam.payableExpense?.replace(/\D/g, '');
-      state.formParam.payableExpense = state.formParam.payableExpense?.slice(0,8);
+      state.formParam.payableExpense = state.formParam.payableExpense?.slice(0, 8);
       state.formParam.payableExpense == 0 && (state.formParam.payableExpense = null);
     }
     const scoreNumber = () => {
-      state.formParam.score&&(state.formParam.score=String(state.formParam.score))
+      state.formParam.score && (state.formParam.score = String(state.formParam.score))
     }
     const clearlevelPayNumber = () => {
       // state.formParam.levelPay = state.formParam.levelPay?.replace(/\D/g, '');
       // state.formParam.levelPay = state.formParam.levelPay?.slice(0,8);
       state.formParam.levelPay == 0 && (state.formParam.levelPay = null);
-      state.formParam.levelPay&&state.formParam.teachingTime && (state.formParam.expense = (state.formParam.levelPay*(state.formParam.teachingTime/60)).toFixed(2))
-      state.formParam.levelPay&&state.formParam.teachingTime && (state.formParam.payableExpense = (state.formParam.levelPay*(state.formParam.teachingTime/60)).toFixed(2))
-      state.formParam.levelPay&&(state.formParam.levelPay=String(state.formParam.levelPay))
+      state.formParam.levelPay && state.formParam.teachingTime && (state.formParam.expense = (state.formParam.levelPay * (state.formParam.teachingTime / 60)).toFixed(2))
+      state.formParam.levelPay && state.formParam.teachingTime && (state.formParam.payableExpense = (state.formParam.levelPay * (state.formParam.teachingTime / 60)).toFixed(2))
+      state.formParam.levelPay && (state.formParam.levelPay = String(state.formParam.levelPay))
     }
     const clearPayableExpense = () => {
       state.formParam.payableExpense == 0 && (state.formParam.payableExpense = null);
       state.formParam.payableExpense && (state.formParam.payableExpense = String(state.formParam.payableExpense))
     }
-    watch(()=>state.formParam.levelPay,(val)=>{
-      state.formParam.levelPay&&state.formParam.teachingTime && (state.formParam.expense = (state.formParam.levelPay*(state.formParam.teachingTime/60)).toFixed(2))
-      state.formParam.levelPay&&state.formParam.teachingTime && (state.formParam.payableExpense = (state.formParam.levelPay*(state.formParam.teachingTime/60)).toFixed(2))
+    watch(() => state.formParam.levelPay, (val) => {
+      state.formParam.levelPay && state.formParam.teachingTime && (state.formParam.expense = (state.formParam.levelPay * (state.formParam.teachingTime / 60)).toFixed(2))
+      state.formParam.levelPay && state.formParam.teachingTime && (state.formParam.payableExpense = (state.formParam.levelPay * (state.formParam.teachingTime / 60)).toFixed(2))
     })
-      const rules = {
-        name: [{ required: true, message:'',log: '讲师不能为空' }],
-        userNo: [{ required: true, message: '',log:'讲师工号不能为空' }],
-        orgName: [{ required: true, message: '',log:'讲师组织不能为空' }],
-        tsystemName: [{ required: true, message:'',log: '讲师体系不能为空' }],
-        tlevelName: [{ required: true, message:'',log: ' 讲师级别不能为空' }],
-        payrollPlace: [{ required: true, message:'',log: '讲师发薪地不能为空' }],
-        courseType: [{ required: true, message: '',log:'费用类型不能为空' }],
-        courseName: [{ required: true, message:'',log: '课程名称不能为空' }],
-        trainOrgId: [{ required: true, message: '',log:'培训发生组织不能为空' }],
-        teachingDate: [{ required: true, message:'',log: '授课日期不能为空' }],
-        teachingTime: [{ required: true, message:'',log: ' 授课时长不能为空' }],
-        studys: [{ required: true, message: '',log:' 参训人数不能为空' }],
-        score: [{ required: true, message:'',log: ' 评分不能为空' }],
-        levelPay: [{ required: true, message:'',log: '课酬基准不能为空' }],
-        expense: [{ required: true, message: '',log:'计划费用不能为空' }],
-        // payableExpense: [{ required: true, message: '',log:'应发费用不能为空' }],
-      }
+    const rules = {
+      name: [{ required: true, message: '', log: '讲师不能为空' }],
+      userNo: [{ required: true, message: '', log: '讲师工号不能为空' }],
+      orgName: [{ required: true, message: '', log: '讲师组织不能为空' }],
+      tsystemName: [{ required: true, message: '', log: '讲师体系不能为空' }],
+      tlevelName: [{ required: true, message: '', log: ' 讲师级别不能为空' }],
+      payrollPlace: [{ required: true, message: '', log: '讲师发薪地不能为空' }],
+      courseType: [{ required: true, message: '', log: '费用类型不能为空' }],
+      courseName: [{ required: true, message: '', log: '课程名称不能为空' }],
+      trainOrgId: [{ required: true, message: '', log: '培训发生组织不能为空' }],
+      teachingDate: [{ required: true, message: '', log: '授课日期不能为空' }],
+      teachingTime: [{ required: true, message: '', log: ' 授课时长不能为空' }],
+      studys: [{ required: true, message: '', log: ' 参训人数不能为空' }],
+      score: [{ required: true, message: '', log: ' 评分不能为空' }],
+      levelPay: [{ required: true, message: '', log: '课酬基准不能为空' }],
+      expense: [{ required: true, message: '', log: '计划费用不能为空' }],
+      // payableExpense: [{ required: true, message: '',log:'应发费用不能为空' }],
+    }
 
     const handleImport = () => {
       state.showWork = true
     }
-    const allFee=()=>{
-      state.allFeedialog=true 
+    const allFee = () => {
+      state.allFeedialog = true
     }
     const visibleAll = (val) => {
-      console.log("visibleAll gx val",val)
+      console.log("visibleAll gx val", val)
       state.allFeedialog = val
       searchSubmit()
     }
     const getexample = (val) => {
-      console.log("getexample gx val",val);
+      console.log("getexample gx val", val);
       state.example = val
     }
     const selectedRowKey = (val) => {
       state.selectsIds = val?.join(',');
       state.visibleConfirm = true;
     }
-    watch(()=>state.visibleConfirm,(val)=>{
-      if(!val){
+    watch(() => state.visibleConfirm, (val) => {
+      if (!val) {
         state.selectsIds = '';
       }
     })
-const tableDatas = ref([])
-const column = ref([
-        {
-          title: '讲师姓名 ',
-          dataIndex: 'name',
-          key: 'name',
+    const tableDatas = ref([])
+    const column = ref([
+      {
+        title: '讲师姓名 ',
+        dataIndex: 'name',
+        key: 'name',
         ellipsis: true, align: "center",
-          width: 180,
-          customRender: (value, index) => {
-            return (
-              <div>
-                {value.record?.name}  /  {value.record?.userNo}
-              </div>
-            );
-          },
-        },
-        // {
-        //   title: '讲师工号 ',
-        //   dataIndex: 'userNo',
-        //   key: 'userNo',
-        // ellipsis: true, align: "center",
-        //   width: 120,
-        // },
-        {
-          title: '课程名称 ',
-          dataIndex: 'courseName',
-          key: 'courseName',
-        ellipsis: true, align: "center",
-          width: 120,
-        },
-        {
-          title: '培训发生组织',
-          dataIndex: 'trainOrg',
-          key: 'trainOrg',
-        ellipsis: true, align: "center",
-          width: 120,
-        },
-        
-        {
-          title: '授课时长 ',
-          dataIndex: 'teachingTime',
-          key: 'teachingTime',
-        ellipsis: true, align: "center",
-          width: 120,
-          
-        },
-        {
-          title: '授课时间 ',
-          dataIndex: 'teachingTime',
-          key: 'teachingTime',
-        ellipsis: true, align: "center",
-          width: 120,
-          
-        },
-        {
-          title: '讲师体系',
-          dataIndex: 'systemName',
-          key: 'systemName',
-        ellipsis: true, align: "center",
-          width: 120,
-        },
-        {
-          title: '讲师级别 ',
-          dataIndex: 'levelName',
-          key: 'levelName',
-        ellipsis: true, align: "center",
-          width: 120,
-          customRender: ({ text })=>{
-            return text||'-'
-          }
-          // customRender: (value, record) => {
-          //   return (
-          //     <div>
-          //       {value.record.grade == 0 || value.record.grade == 1 || value.record.grade == 2 || value.record.grade == 3
-          //         ? {
-          //           0: "未定级",
-          //           1: "1级",
-          //           2: "2级",
-          //           3: "3级",
-          //         }[value.record.grade + ""] || ""
-          //         : "-"}
-          //     </div>
-          //   )
-          // }
-        },
-        {
-          title: '发薪地 ',
-          dataIndex: 'teacherpayrollPlace',
-          key: 'teacherpayrollPlace',
-        ellipsis: true, align: "center",
-          width: 120,
-          customRender: ({ text })=>{
-            return text||'-'
-          }
-        },
-        {
-          title: '基准课酬 ',
-          dataIndex: 'teacherlevelPay',
-          key: 'teacherlevelPay',
-        ellipsis: true, align: "center",
-          width: 120,
-        },
-        {
-          title: '计划费用 ',
-          dataIndex: 'expense',
-          key: 'expense',
-        ellipsis: true, align: "center",
-          width: 120,
-        },
-        {
-          title: '参训人数 ',
-          dataIndex: 'studentNum',
-          key: 'studentNum',
-        ellipsis: true, align: "center",
-          width: 120,
-          customRender: ({ text })=>{
-            return text||'-'
-          }
-        },
-        {
-          title: '评分 ',
-          dataIndex: 'courseAssess',
-          key: 'courseAssess',
-        ellipsis: true, align: "center",
-          width: 120,
-          customRender: (value) => {
+        width: 180,
+        customRender: (value, index) => {
           return (
             <div>
-              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+              { value.record?.name }  /  { value.record?.userNo }
+            </div>
+          );
+        },
+      },
+      // {
+      //   title: '讲师工号 ',
+      //   dataIndex: 'userNo',
+      //   key: 'userNo',
+      // ellipsis: true, align: "center",
+      //   width: 120,
+      // },
+      {
+        title: '课程名称 ',
+        dataIndex: 'courseName',
+        key: 'courseName',
+        ellipsis: true, align: "center",
+        width: 120,
+      },
+      {
+        title: '培训发生组织',
+        dataIndex: 'trainOrg',
+        key: 'trainOrg',
+        ellipsis: true, align: "center",
+        width: 120,
+      },
+
+      {
+        title: '授课时长 ',
+        dataIndex: 'teachingTime',
+        key: 'teachingTime',
+        ellipsis: true, align: "center",
+        width: 120,
+
+      },
+      {
+        title: '授课时间 ',
+        dataIndex: 'teachingTime',
+        key: 'teachingTime',
+        ellipsis: true, align: "center",
+        width: 120,
+
+      },
+      {
+        title: '讲师体系',
+        dataIndex: 'systemName',
+        key: 'systemName',
+        ellipsis: true, align: "center",
+        width: 120,
+      },
+      {
+        title: '讲师级别 ',
+        dataIndex: 'levelName',
+        key: 'levelName',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text || '-'
+        }
+        // customRender: (value, record) => {
+        //   return (
+        //     <div>
+        //       {value.record.grade == 0 || value.record.grade == 1 || value.record.grade == 2 || value.record.grade == 3
+        //         ? {
+        //           0: "未定级",
+        //           1: "1级",
+        //           2: "2级",
+        //           3: "3级",
+        //         }[value.record.grade + ""] || ""
+        //         : "-"}
+        //     </div>
+        //   )
+        // }
+      },
+      {
+        title: '发薪地 ',
+        dataIndex: 'teacherpayrollPlace',
+        key: 'teacherpayrollPlace',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text || '-'
+        }
+      },
+      {
+        title: '基准课酬 ',
+        dataIndex: 'teacherlevelPay',
+        key: 'teacherlevelPay',
+        ellipsis: true, align: "center",
+        width: 120,
+      },
+      {
+        title: '计划费用 ',
+        dataIndex: 'expense',
+        key: 'expense',
+        ellipsis: true, align: "center",
+        width: 120,
+      },
+      {
+        title: '参训人数 ',
+        dataIndex: 'studentNum',
+        key: 'studentNum',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text || '-'
+        }
+      },
+      {
+        title: '评分 ',
+        dataIndex: 'courseAssess',
+        key: 'courseAssess',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              { value.record.score ? Number(value.record.score).toFixed(0) == 0 ? '-' : Number(value.record.score).toFixed(0) : '-' }
             </div>
           )
         }
-        },
-        {
-          title: '课程类型 ',
-          dataIndex: ' courseType',
-          key: ' courseType',
+      },
+      {
+        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: '状态 ',
-          dataIndex: 'status',
-          key: 'status',
+        width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              { String(value.record.courseType)
+                ? {
+                  "0": "在线课",
+                  "1": "面授课",
+                  "2": "课程开发",
+                  "3": "作业员入模培训",
+                  "4": "其他",
+                }[value.record.courseType + ""]
+                : "-" }
+            </div>
+          )
+        }
+      },
+      {
+        title: '状态 ',
+        dataIndex: 'status',
+        key: 'status',
         ellipsis: true, align: "center",
-          width: 120,
-          customRender: (value) => {
-            return (
-              <div>
-                 {value.record.status== "0" || value.record.status == "1" ||value.record.status == "2" ||value.record.status == "3"
-                  ? {
-                    "0": "待确认",
-                    "1": "待提交",
-                    "2": "审核中",
-                    "3": "审核通过",
-                    '4': '审核拒绝',
-                    '5': '停用',
-                  }[value.record.status + ""] || ""
-                  : "-"}
-              </div>
-            )
-          }
-        },
-        {
-          title: '讲师组织',
-          dataIndex: 'trainOrg',
-          key: 'trainOrg',
+        width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              { value.record.status == "0" || value.record.status == "1" || value.record.status == "2" || value.record.status == "3"
+                ? {
+                  "0": "待确认",
+                  "1": "待提交",
+                  "2": "审核中",
+                  "3": "审核通过",
+                  '4': '审核拒绝',
+                  '5': '停用',
+                }[value.record.status + ""] || ""
+                : "-" }
+            </div>
+          )
+        }
+      },
+      {
+        title: '讲师组织',
+        dataIndex: 'trainOrg',
+        key: 'trainOrg',
         ellipsis: true, align: "center",
-          width: 200,
-          scopedSlots: { customRender: "trainOrg" },
-        },
-        {
+        width: 200,
+        scopedSlots: { customRender: "trainOrg" },
+      },
+      {
         title: '操作 ',
         dataIndex: 'operation',
         key: 'operation',
-      ellipsis: true, align: "right",
-      fixed: "right",
+        ellipsis: true, align: "right",
+        fixed: "right",
         width: 100,
         scopedSlots: { customRender: "action" },
       },
-        
-      ])
-      const tlevelChange = (e) => {
-        state.formParam.tlevelName = e?.tlevelName
-        state.formParam.tlevelId = e?.tlevelId
-        // state.formParam.payrollPlace = e?.salaryName
-        // state.formParam.payrollPlaceId = e?.salaryId
-        // state.formParam.levelPay = e?.levelPay
-      }
-      const byUserIdData = (e) => {
-        // e?.levelVoList.some(item=>{
-        //   if(item.id == e?.levelId){
-        //     state.formParam.levelPay = item.levelPay
-        //     return true
-        //   }
-        // })
-        state.formParam.levelPay = e
-      }
-      //导出功能
-      const handleExport = ()=>{
-        window.open (
-          `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherExpense?name=${state.searchParam.name || ""
-          }&status=${ state.searchParam.status || ""}&trainOrgId=${ state.searchParam.trainOrgId || ""}&type=${state.searchParam.type || ""}&courseName=${ state.searchParam.courseName || ""}&tSystemId=${ state.searchParam.tSystemId || ""}&tLevelName=${ state.searchParam.tLevelName || ""}&beginTime=${state.searchParam.beginTime || ""}&endTime=${state.searchParam.endTime || ""}`
-        );
-        // this.download('lesson_records/export', {
-        //           ...state.searchParam
-        //       }, `project_${new Date().getTime()}.xlsx` )
-          }
-          const beforeUpload2 = (file) => {
+
+    ])
+    const tlevelChange = (e) => {
+      state.formParam.tlevelName = e?.tlevelName
+      state.formParam.tlevelId = e?.tlevelId
+      // state.formParam.payrollPlace = e?.salaryName
+      // state.formParam.payrollPlaceId = e?.salaryId
+      // state.formParam.levelPay = e?.levelPay
+    }
+    const byUserIdData = (e) => {
+      // e?.levelVoList.some(item=>{
+      //   if(item.id == e?.levelId){
+      //     state.formParam.levelPay = item.levelPay
+      //     return true
+      //   }
+      // })
+      state.formParam.levelPay = e
+    }
+    //导出功能
+    const handleExport = () => {
+      window.open(
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherExpense?name=${state.searchParam.name || ""
+        }&status=${state.searchParam.status || ""}&trainOrgId=${state.searchParam.trainOrgId || ""}&type=${state.searchParam.type || ""}&courseName=${state.searchParam.courseName || ""}&tSystemId=${state.searchParam.tSystemId || ""}&tLevelName=${state.searchParam.tLevelName || ""}&beginTime=${state.searchParam.beginTime || ""}&endTime=${state.searchParam.endTime || ""}`
+      );
+      // this.download('lesson_records/export', {
+      //           ...state.searchParam
+      //       }, `project_${new Date().getTime()}.xlsx` )
+    }
+    const beforeUpload2 = (file) => {
       const fileType = [
         "xls",
         "xlsx",
@@ -1862,89 +1834,90 @@ const column = ref([
       });
       return false;
     };
-        //回车
-        const enterPressHadlerSearch = e => {
-    if (e.keyCode === 13) {
-      searchSubmit()
+    //回车
+    const enterPressHadlerSearch = e => {
+      if (e.keyCode === 13) {
+        searchSubmit()
 
-    }
-};
-      return {
-        ...toRefs(state),
-        handleTeacher,
-        enterPressHadlerSearch,
-        rules,
-        formRef,
-        clearNonNumber,
-        handleImport,
-        beforeUpload2,
-        closeDeleteTeacher,
-        cancelTeachingDialog,
-        courseTypeList,
-        orgLists,
-        // searchTimeChange,
-        handlemoreid,
-        handleExport,
-        lecturerSystemList,
-        getLevelList,
-        OnTheJobStatusList,
-        // PlaceOfPayLista,
-        AuthenticationStatusList,
-        // PlaceOfPayList,
-        AccountStatusList,
-        searchSubmit,
-        searchReset,
-        columns,
-        columnSee,
-        columnsFeeDetail,
-        tableData,
-        changePagination,
-        addTeacher,
-        cancelTeacherDialog,
-        handleLook,
-        orgSplit,
-        cancel,
-        deleteModal,
-        updateModal,
-        handleModify,
-        // closeDeleteTeacher,
-        createTeacherDialog,
-        changeOrg,
-        handleOperate,
-        closehandleOperate,
-         getTableDate, //list接口数据调用
-        // getStu
-        LecturerSystemLista,
-        TeacherSystem,
-        getListData,
-        changetlevel,
-        canceleditTeacherDialog,
-        allFee,
-        selectedRowKey,
-        visibleAll,
-        getexample,
-        column,
-        tableDatas,
-        tlevelChange,
-        byUserIdData,
-        validateField,
-        clearstudysNumber,
-        clearscoreNumber,
-        clearlevelPayNumber,
-        scoreNumber,
-        clearPayableExpense,
-        payExpense,
-        locale,
-        checkMenu
       }
-    },
-  };
-  </script>
-<style lang="scss" scoped >
+    };
+    return {
+      ...toRefs(state),
+      handleTeacher,
+      enterPressHadlerSearch,
+      rules,
+      formRef,
+      clearNonNumber,
+      handleImport,
+      beforeUpload2,
+      closeDeleteTeacher,
+      cancelTeachingDialog,
+      courseTypeList,
+      orgLists,
+      // searchTimeChange,
+      handlemoreid,
+      handleExport,
+      lecturerSystemList,
+      getLevelList,
+      OnTheJobStatusList,
+      // PlaceOfPayLista,
+      AuthenticationStatusList,
+      // PlaceOfPayList,
+      AccountStatusList,
+      searchSubmit,
+      searchReset,
+      columns,
+      columnSee,
+      columnsFeeDetail,
+      tableData,
+      changePagination,
+      addTeacher,
+      cancelTeacherDialog,
+      handleLook,
+      orgSplit,
+      cancel,
+      deleteModal,
+      updateModal,
+      handleModify,
+      // closeDeleteTeacher,
+      createTeacherDialog,
+      changeOrg,
+      handleOperate,
+      closehandleOperate,
+      getTableDate, //list接口数据调用
+      // getStu
+      LecturerSystemLista,
+      TeacherSystem,
+      getListData,
+      changetlevel,
+      canceleditTeacherDialog,
+      allFee,
+      selectedRowKey,
+      visibleAll,
+      getexample,
+      column,
+      tableDatas,
+      tlevelChange,
+      byUserIdData,
+      validateField,
+      clearstudysNumber,
+      clearscoreNumber,
+      clearlevelPayNumber,
+      scoreNumber,
+      clearPayableExpense,
+      payExpense,
+      locale,
+      checkMenu
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
 .select .ant-picker {
   width: 410px !important;
 }
-.example{
+
+.example {
   width: 100%;
   height: 100%;
   background: rgba(0, 0, 0, 0.45);
@@ -1956,6 +1929,7 @@ const column = ref([
   justify-content: center;
   align-items: center;
 }
+
 .headers {
   height: 57px;
   border-bottom: 1px solid #e8e8e8;
@@ -1974,29 +1948,32 @@ const column = ref([
     // margin-left: 24px;
   }
 }
+
 .addTimeBox {
-        position: relative;
-        display: flex;
-        align-items: center;
+  position: relative;
+  display: flex;
+  align-items: center;
 
-        .addTime {
-          position: absolute;
-          z-index: 1;
-          margin-left: 10px;
-          color: rgba(0, 0, 0, 0.4);
-        }
+  .addTime {
+    position: absolute;
+    z-index: 1;
+    margin-left: 10px;
+    color: rgba(0, 0, 0, 0.4);
+  }
 
-        .ant-picker {
-          padding-left: 85px;
-        }
+  .ant-picker {
+    padding-left: 85px;
+  }
 
-      ::v-deep  .ant-picker-range .ant-picker-active-bar {
-          margin-left: 85px  !important;
-        }
-      }
-.addTimeBox .ant-picker{
+  ::v-deep .ant-picker-range .ant-picker-active-bar {
+    margin-left: 85px !important;
+  }
+}
+
+.addTimeBox .ant-picker {
   padding-left: 85px;
 }
+
 //导出按钮icon
 .daochu {
   width: 16px;
@@ -2246,6 +2223,7 @@ const column = ref([
   margin-right: 14px;
   flex-shrink: 0;
   cursor: pointer;
+
   .search {
     width: 15px;
     height: 16px;
@@ -2289,9 +2267,7 @@ const column = ref([
 }
 
 //抽屉功能
-.drawaer
-
-// /* 改变所有 a-tree-select 输入框的高度 */
+.drawaer // /* 改变所有 a-tree-select 输入框的高度 */
 //   ::v-deep  .ant-select:not(.ant-select-customize-input) .ant-select-selector{
 //   height: 40px;
 //   line-height: 40px;
@@ -2299,30 +2275,34 @@ const column = ref([
 
 //   /* 确保文字垂直居中 */
 // }
-::v-deep .ant-select-single:not(.ant-select-customize-input) .ant-select-selector{
+::v-deep .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
   height: 40px !important;
   line-height: 40px;
   border-radius: 8px
 }
+
 // 抽屉内样式
-.draitem{
- width: 100%;
-  height: 40px !important; 
+.draitem {
+  width: 100%;
+  height: 40px !important;
   border-radius: 8px;
   line-height: 40px;
 }
-.drabtn{
-  height:40px;
-  width:80px;
-  border-radius:8px;
-  margin-right:20px
+
+.drabtn {
+  height: 40px;
+  width: 80px;
+  border-radius: 8px;
+  margin-right: 20px
 }
-::v-deep  .ant-select:not(.ant-select-customize-input) .ant-select-selector{
-  border-radius:8px;
-  height:40px;
+
+::v-deep .ant-select:not(.ant-select-customize-input) .ant-select-selector {
+  border-radius: 8px;
+  height: 40px;
 }
-.ant-col-12{
-  height:90px;
+
+.ant-col-12 {
+  height: 90px;
 }
 
 ::v-deep .ant-select-selection-overflow-item {
@@ -2332,22 +2312,27 @@ const column = ref([
 ::v-deep .ant-select-multiple .ant-select-selection-item {
   height: 34px
 }
+
 .tableBox {
-padding-bottom: 20px;
-margin: 20px 38px 30px;
-::v-deep .ant-select-dropdown{
- display: inline-block;
-}
-::v-deep .ant-select-selection-item{
-margin-left: 3px;
-}
-::v-deep .ant-pagination-options-size-changer.ant-select{
-width: 84px;
-}
-.pa {
-width: 100%;
-display: flex;
-justify-content: right;
-}
+  padding-bottom: 20px;
+  margin: 20px 38px 30px;
+
+  ::v-deep .ant-select-dropdown {
+    display: inline-block;
+  }
+
+  ::v-deep .ant-select-selection-item {
+    margin-left: 3px;
+  }
+
+  ::v-deep .ant-pagination-options-size-changer.ant-select {
+    width: 84px;
+  }
+
+  .pa {
+    width: 100%;
+    display: flex;
+    justify-content: right;
+  }
 }
 </style>
\ No newline at end of file

From 886c9a4d5d70bd9beb5f479667da728f69afb26f Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 15:13:22 +0800
Subject: [PATCH 023/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87=20=EF=BC=8C=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 76032e2c..5502b1f9 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -26,16 +26,14 @@
             v-model:value="searchParam.trainOrgId" 
             style="width: 200px" 
             :options="orgListSearch" 
-            @search="handleSearch"
+            @search="handleOrgSearch"
             placeholder="请选择培训发生组织"
             allowClear>
             <a-select-option v-for="option in orgListSearch" :key="option.value" :value="option.value">
-              {{ option.label }}
+              {{ orgInput }}
             </a-select-option>
           </a-select>
 
-
-
           <!-- <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.trainOrgId"
             placeholder="请选择培训发生组织" allowClear :options="orgListSearch" showSearch
             v-on:keydown.enter="enterPressHadlerSearch">
@@ -594,6 +592,7 @@ export default {
       tableDataSee: [],
       SeeLoading: false,
       orgList: [],
+      orgInput:"",
       orgListSearch: [],
       selectsIds: '',
       visibleConfirm: false,
@@ -684,6 +683,7 @@ export default {
           }
         })
         state.orgListSearch = res.data.data?.map(item => {
+          state.orgInput = item.affiliationName;
           return {
             label: item.affiliationName,
             value: item.id
@@ -1560,6 +1560,11 @@ export default {
       // payableExpense: [{ required: true, message: '',log:'应发费用不能为空' }],
     }
 
+    const handleOrgSearch = (value) => {
+      console.log("handleOrgSearch value: ",value)
+      state.orgInput = value;
+    }
+
     const handleImport = () => {
       state.showWork = true
     }
@@ -1890,6 +1895,7 @@ export default {
       TeacherSystem,
       getListData,
       changetlevel,
+      handleOrgSearch,
       canceleditTeacherDialog,
       allFee,
       selectedRowKey,

From 52503fd69a4e5606f7bb91a90d26275d7b06f525 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 15:17:44 +0800
Subject: [PATCH 024/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87=20=EF=BC=8C=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=20=E5=85=81=E8=AE=B8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 5502b1f9..f4e9ed80 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -26,9 +26,11 @@
             v-model:value="searchParam.trainOrgId" 
             style="width: 200px" 
             :options="orgListSearch" 
+            allowClear 
+            showSearch
             @search="handleOrgSearch"
             placeholder="请选择培训发生组织"
-            allowClear>
+            >
             <a-select-option v-for="option in orgListSearch" :key="option.value" :value="option.value">
               {{ orgInput }}
             </a-select-option>

From 7e1e1bac2f52803e2b6dcd6ad44a62bfa7ce1eed Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 16:01:50 +0800
Subject: [PATCH 025/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87=20,=20=E9=87=8D=E6=96=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index f4e9ed80..b5b18fb3 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -22,18 +22,16 @@
           </a-input>
         </a-form-item>
         <a-form-item class="select">
+          <!-- TODO4 -->
           <a-select 
             v-model:value="searchParam.trainOrgId" 
-            style="width: 200px" 
-            :options="orgListSearch" 
+            style="width: 200px"
+            :options="copyOrgListSearch" 
             allowClear 
             showSearch
             @search="handleOrgSearch"
             placeholder="请选择培训发生组织"
             >
-            <a-select-option v-for="option in orgListSearch" :key="option.value" :value="option.value">
-              {{ orgInput }}
-            </a-select-option>
           </a-select>
 
           <!-- <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.trainOrgId"
@@ -548,7 +546,7 @@
   <BatchLecturer @selectedRowKeys="selectedRowKey" v-model:visible="allFeedialog" :name="'批量审批'" />
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch, onMounted } from "vue";
+import { reactive, toRefs, ref, watch, onMounted ,computed} from "vue";
 import { message } from "ant-design-vue";
 import dayjs from "dayjs";
 import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
@@ -594,7 +592,8 @@ export default {
       tableDataSee: [],
       SeeLoading: false,
       orgList: [],
-      orgInput:"",
+      //TODO4
+      copyOrgListSearch:[],
       orgListSearch: [],
       selectsIds: '',
       visibleConfirm: false,
@@ -694,6 +693,7 @@ export default {
         state.orgListSearch.unshift({
           label: '全部', value: ''
         })
+        state.copyOrgListSearch = state.orgListSearch;
       })
     }
     //费用类型
@@ -1562,9 +1562,10 @@ export default {
       // payableExpense: [{ required: true, message: '',log:'应发费用不能为空' }],
     }
 
+    //TODO4 筛查
     const handleOrgSearch = (value) => {
-      console.log("handleOrgSearch value: ",value)
-      state.orgInput = value;
+      let temp = JSON.parse(JSON.stringify(state.orgListSearch));
+      state.copyOrgListSearch = temp.filter((item)=>item.label.includes(value));
     }
 
     const handleImport = () => {
@@ -1921,6 +1922,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+
 .select .ant-picker {
   width: 410px !important;
 }

From cc2fbbb05f172765020282f67524c3e3a8a8c24c Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 16:03:36 +0800
Subject: [PATCH 026/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87=20,=20=E9=87=8D=E6=96=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20Log=20=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index b5b18fb3..f9ce2a1e 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -694,6 +694,7 @@ export default {
           label: '全部', value: ''
         })
         state.copyOrgListSearch = state.orgListSearch;
+        console.log("queryTrainOrgPor copyOrgListSearch",state.copyOrgListSearch)
       })
     }
     //费用类型
@@ -1564,8 +1565,11 @@ export default {
 
     //TODO4 筛查
     const handleOrgSearch = (value) => {
+      console.log("handleOrgSearch value",value)
       let temp = JSON.parse(JSON.stringify(state.orgListSearch));
+      console.log("handleOrgSearch temp",temp)
       state.copyOrgListSearch = temp.filter((item)=>item.label.includes(value));
+      console.log("handleOrgSearch copyOrgListSearch",state.copyOrgListSearch)
     }
 
     const handleImport = () => {

From d10384c40c68e38c92972623fb86f5905958ed15 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 16:26:58 +0800
Subject: [PATCH 027/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87=20,=20=E9=87=8D=E6=96=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E8=BF=87=E6=BB=A4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index f9ce2a1e..8b81ac51 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -1565,10 +1565,14 @@ export default {
 
     //TODO4 筛查
     const handleOrgSearch = (value) => {
+      let filterParam = value.trim();
       console.log("handleOrgSearch value",value)
+      console.log("handleOrgSearch filterParam",filterParam)
       let temp = JSON.parse(JSON.stringify(state.orgListSearch));
       console.log("handleOrgSearch temp",temp)
-      state.copyOrgListSearch = temp.filter((item)=>item.label.includes(value));
+      state.copyOrgListSearch = temp.filter((item)=> 
+        item.label.includes(filterParam)
+      );
       console.log("handleOrgSearch copyOrgListSearch",state.copyOrgListSearch)
     }
 

From 9d9b9b4de20af62741561b7770dd382343cc9df9 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 16:32:01 +0800
Subject: [PATCH 028/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87=20,=20=E9=87=8D=E6=96=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E8=BF=87=E6=BB=A4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 8b81ac51..7e6231f8 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -1924,7 +1924,8 @@ export default {
       clearPayableExpense,
       payExpense,
       locale,
-      checkMenu
+      checkMenu,
+      copyOrgListSearch
     }
   },
 };

From 32dfe4f68b900e7a92db35360be244859f5b2a22 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 16:32:48 +0800
Subject: [PATCH 029/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87=20,=20=E9=87=8D=E6=96=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E8=BF=87=E6=BB=A4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 7e6231f8..8b81ac51 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -1924,8 +1924,7 @@ export default {
       clearPayableExpense,
       payExpense,
       locale,
-      checkMenu,
-      copyOrgListSearch
+      checkMenu
     }
   },
 };

From eb655271375e30427b8c673f0bd389d477f7de30 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 16:53:20 +0800
Subject: [PATCH 030/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87=20,=20=E9=87=8D=E6=96=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E8=BF=87=E6=BB=A4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 8b81ac51..48116c81 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -26,10 +26,10 @@
           <a-select 
             v-model:value="searchParam.trainOrgId" 
             style="width: 200px"
-            :options="copyOrgListSearch" 
+            :options="orgListSearch" 
             allowClear 
             showSearch
-            @search="handleOrgSearch"
+            :filter-option="handleOrgSearch"
             placeholder="请选择培训发生组织"
             >
           </a-select>
@@ -592,8 +592,6 @@ export default {
       tableDataSee: [],
       SeeLoading: false,
       orgList: [],
-      //TODO4
-      copyOrgListSearch:[],
       orgListSearch: [],
       selectsIds: '',
       visibleConfirm: false,
@@ -693,8 +691,6 @@ export default {
         state.orgListSearch.unshift({
           label: '全部', value: ''
         })
-        state.copyOrgListSearch = state.orgListSearch;
-        console.log("queryTrainOrgPor copyOrgListSearch",state.copyOrgListSearch)
       })
     }
     //费用类型
@@ -1564,16 +1560,10 @@ export default {
     }
 
     //TODO4 筛查
-    const handleOrgSearch = (value) => {
-      let filterParam = value.trim();
-      console.log("handleOrgSearch value",value)
-      console.log("handleOrgSearch filterParam",filterParam)
-      let temp = JSON.parse(JSON.stringify(state.orgListSearch));
-      console.log("handleOrgSearch temp",temp)
-      state.copyOrgListSearch = temp.filter((item)=> 
-        item.label.includes(filterParam)
-      );
-      console.log("handleOrgSearch copyOrgListSearch",state.copyOrgListSearch)
+    const handleOrgSearch = (input , option) => {
+      console.log("handleOrgSearch input",input)
+      console.log("handleOrgSearch option",option)
+      console.log("orgListSearch data",orgListSearch)
     }
 
     const handleImport = () => {

From ef85763e95725eae5d5cbc9910087eb9b236511b Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 17:05:14 +0800
Subject: [PATCH 031/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87=20,=20=E9=87=8D=E6=96=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E8=BF=87=E6=BB=A4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 48116c81..7e08e786 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -1561,9 +1561,9 @@ export default {
 
     //TODO4 筛查
     const handleOrgSearch = (input , option) => {
-      console.log("handleOrgSearch input",input)
-      console.log("handleOrgSearch option",option)
-      console.log("orgListSearch data",orgListSearch)
+      let temp = JSON.parse(JSON.stringify(state.orgListSearch));
+      return temp.filter((item) => item.includes(input))
+      // return `${option.label}`.toLowerCase().includes(`${input || ''}`.toLowerCase());
     }
 
     const handleImport = () => {

From 3457a067bed5ca1d9386d5b4eff6c017377fc10c Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 17:18:37 +0800
Subject: [PATCH 032/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87=20,=20=E9=87=8D=E6=96=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E8=BF=87=E6=BB=A4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 7e08e786..cd752a21 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -1562,7 +1562,7 @@ export default {
     //TODO4 筛查
     const handleOrgSearch = (input , option) => {
       let temp = JSON.parse(JSON.stringify(state.orgListSearch));
-      return temp.filter((item) => item.includes(input))
+      return temp.filter((item) => item.label.includes(input))
       // return `${option.label}`.toLowerCase().includes(`${input || ''}`.toLowerCase());
     }
 

From 70faa6589a1de4871c0f1edde10a7d14f1a93ecd Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 17:32:27 +0800
Subject: [PATCH 033/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87=20,=20=E9=87=8D=E6=96=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E8=BF=87=E6=BB=A4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index cd752a21..c5a00670 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -26,12 +26,15 @@
           <a-select 
             v-model:value="searchParam.trainOrgId" 
             style="width: 200px"
-            :options="orgListSearch" 
             allowClear 
             showSearch
-            :filter-option="handleOrgSearch"
+            :filter-option="false"
+            @search="handleOrgSearch"
             placeholder="请选择培训发生组织"
             >
+            <a-select-option v-for="item in filterOrgListSearch" :key="item.value" :value="item.value">
+                {{ item.label }}
+            </a-select-option>
           </a-select>
 
           <!-- <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.trainOrgId"
@@ -592,6 +595,7 @@ export default {
       tableDataSee: [],
       SeeLoading: false,
       orgList: [],
+      filterOrgListSearch: [],
       orgListSearch: [],
       selectsIds: '',
       visibleConfirm: false,
@@ -691,6 +695,9 @@ export default {
         state.orgListSearch.unshift({
           label: '全部', value: ''
         })
+
+        state.filterOrgListSearch = state.orgListSearch
+
       })
     }
     //费用类型
@@ -1560,11 +1567,14 @@ export default {
     }
 
     //TODO4 筛查
-    const handleOrgSearch = (input , option) => {
+    const handleOrgSearch = (value) => {
+      //克隆数据
       let temp = JSON.parse(JSON.stringify(state.orgListSearch));
-      return temp.filter((item) => item.label.includes(input))
-      // return `${option.label}`.toLowerCase().includes(`${input || ''}`.toLowerCase());
+      //选择数据
+      state.filterOrgListSearch = temp.filter(item => item.label.includes(value))
+    
     }
+    
 
     const handleImport = () => {
       state.showWork = true

From cb31d73de4ca7e026c020c194773ddb05ab3fad5 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 17:41:46 +0800
Subject: [PATCH 034/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87=20,=20=E9=87=8D=E6=96=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E8=BF=87=E6=BB=A4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index c5a00670..8abd2d0d 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -1568,6 +1568,7 @@ export default {
 
     //TODO4 筛查
     const handleOrgSearch = (value) => {
+      console.log("handleOrgSearch value： ",value)
       //克隆数据
       let temp = JSON.parse(JSON.stringify(state.orgListSearch));
       //选择数据

From 458a9c1e531c515090dbc6c8b3173b4d3731b2cd Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 17:46:25 +0800
Subject: [PATCH 035/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87=20,=20=E9=87=8D=E6=96=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E8=BF=87=E6=BB=A4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 8abd2d0d..f4ecd129 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -29,6 +29,7 @@
             allowClear 
             showSearch
             :filter-option="false"
+            @change="handleOrgChange"
             @search="handleOrgSearch"
             placeholder="请选择培训发生组织"
             >
@@ -1575,6 +1576,10 @@ export default {
       state.filterOrgListSearch = temp.filter(item => item.label.includes(value))
     
     }
+
+    const handleOrgChange = (value) => {
+      console.log("清除动作 handleOrgChange value",value)
+    }
     
 
     const handleImport = () => {
@@ -1908,6 +1913,7 @@ export default {
       getListData,
       changetlevel,
       handleOrgSearch,
+      handleOrgChange,
       canceleditTeacherDialog,
       allFee,
       selectedRowKey,

From 9e5f97d06632f2b22f7f7c94db32a4871936223e Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 17:51:59 +0800
Subject: [PATCH 036/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87=20,=20=E9=87=8D=E6=96=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E8=BF=87=E6=BB=A4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index f4ecd129..bc89f4c6 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -1578,7 +1578,8 @@ export default {
     }
 
     const handleOrgChange = (value) => {
-      console.log("清除动作 handleOrgChange value",value)
+      console.log("清除动作1 handleOrgChange value",value)
+      console.log("清除动作2 handleOrgChange value",value)
     }
     
 

From fbd08f1d43002e6696470e29a16237d818caaa7f Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 18:04:18 +0800
Subject: [PATCH 037/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E9=80=89=E6=8B=A9=E5=9F=B9=E8=AE=AD=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=BB=84=E7=BB=87=20,=20=E9=87=8D=E6=96=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E8=BF=87=E6=BB=A4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index bc89f4c6..ce1a30de 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -1578,8 +1578,9 @@ export default {
     }
 
     const handleOrgChange = (value) => {
-      console.log("清除动作1 handleOrgChange value",value)
-      console.log("清除动作2 handleOrgChange value",value)
+      if(value == undefined || value == null){
+        state.filterOrgListSearch = state.orgListSearch;
+      }
     }
     
 

From 95563be95ab4c13af6344e34287dc141cf5632b4 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 18:40:20 +0800
Subject: [PATCH 038/157] =?UTF-8?q?=E6=8E=88=E8=AF=BE=E7=AE=A1=E7=90=86,?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 0916eebf..ab6b8895 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -284,7 +284,7 @@
                   />
                   培训发生组织
                 </template>
-                <a-select v-model:value="formParam.trainOrgId" placeholder="请选择培训发生组织" allowClear
+                <a-select v-model:value="formParam.trainOrgId" placeholder="请选择培训发生组织" allowClear showSearch
                   :options="orgList"  @change="changeOrg">
                 </a-select>
                 <!-- <OrgClass v-model:value="formParam.sourceBelongId" v-model:name="formParam.sourceBelongFullName"></OrgClass> -->

From 50f2f3c8246fed96f5cd3f74cf34eb364491c7f7 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 19:00:34 +0800
Subject: [PATCH 039/157] =?UTF-8?q?=E6=8E=88=E8=AF=BE=E7=AE=A1=E7=90=86,?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue | 33 ++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index ab6b8895..155f1dbf 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -284,8 +284,13 @@
                   />
                   培训发生组织
                 </template>
-                <a-select v-model:value="formParam.trainOrgId" placeholder="请选择培训发生组织" allowClear showSearch
-                  :options="orgList"  @change="changeOrg">
+                <!-- TODO5 授课讲师 -->
+                <a-select v-model:value="formParam.trainOrgId" placeholder="请选择培训发生组织" allowClear 
+                  showSearch
+                   :filter-option="false"
+                  :options="filterOrgListSearch"  
+                  @search="handleOrgSearch"
+                  @change="changeOrg">
                 </a-select>
                 <!-- <OrgClass v-model:value="formParam.sourceBelongId" v-model:name="formParam.sourceBelongFullName"></OrgClass> -->
               </a-form-item>
@@ -963,6 +968,7 @@ export default {
         pageSize:50
       }
       queryTrainOrgPor(obj).then((res) => {
+        //TODO5 赋值语句
         state.orgList = res.data.data?.map(item=>{
           return{
             label: item.affiliationName,
@@ -978,9 +984,19 @@ export default {
         state.orgListSearch.unshift({
           label: '全部', value: ''
         })
+
+
+
+
       })
     }
+    //TODO5
     const changeOrg = (e,l) => {
+      console.log("changeOrg e",e);
+      console.log("changeOrg l",l);
+      if(l == undefined || l == null){
+        state.filterOrgListSearch = state.orgListSearch;
+      }
       state.formParam.trainOrgName = l?.label
     }
     const rules = {
@@ -1489,6 +1505,16 @@ export default {
     const sendRemark = () => {
       state.formParam.remark = state.formParam.remark.replace(/\s/g, '');
     }
+
+    //TODO5
+    const handleOrgSearch = (value) => {
+      let temp = JSON.parse(JSON.stringify(state.orgListSearch));
+      //选择数据
+      state.filterOrgListSearch = temp.filter(item => item.label.includes(value))
+    }
+
+
+
     return {
       ...toRefs(state),
       sendName,
@@ -1548,7 +1574,8 @@ export default {
       // editTimeChange,
       scoreChange,
       locale,
-      checkMenu
+      checkMenu,
+      handleOrgSearch
     }
   },
 };

From 098a47bceddc7faa1e2411adf45aeb9635bbce6f Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 19:05:43 +0800
Subject: [PATCH 040/157] =?UTF-8?q?=E6=8E=88=E8=AF=BE=E7=AE=A1=E7=90=86,?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 155f1dbf..b1fbf2c0 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -285,7 +285,8 @@
                   培训发生组织
                 </template>
                 <!-- TODO5 授课讲师 -->
-                <a-select v-model:value="formParam.trainOrgId" placeholder="请选择培训发生组织" allowClear 
+                <a-select v-model:value="formParam.trainOrgId" placeholder="请选择培训发生组织" 
+                  allowClear 
                   showSearch
                    :filter-option="false"
                   :options="filterOrgListSearch"  
@@ -984,7 +985,7 @@ export default {
         state.orgListSearch.unshift({
           label: '全部', value: ''
         })
-
+        state.filterOrgListSearch = state.orgListSearch;
 
 
 

From f034efc65624b6d1e614fd90ac5cdf74a9dfe5db Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 14 Feb 2025 19:09:46 +0800
Subject: [PATCH 041/157] =?UTF-8?q?=E6=8E=88=E8=AF=BE=E7=AE=A1=E7=90=86,?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index b1fbf2c0..ba014ec6 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -566,6 +566,7 @@ export default {
     const router = useRouter();
     const state = reactive({
       orgListSearch: [],
+      filterOrgListSearch: [],
       moreid: 1,
       title: '导入内部授课记录',
       vf: false,

From 072e969e5b053c55edb4cf9d72a5ea0ca465ee18 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 17 Feb 2025 10:59:29 +0800
Subject: [PATCH 042/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=AE=A1=E6=89=B9=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue      | 2002 +++++++++---------
 src/views/lecturer/LecturerFeeManagement.vue |   51 +-
 2 files changed, 1035 insertions(+), 1018 deletions(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index fbec634e..a452e74b 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -1,43 +1,35 @@
 <!-- 讲师费审批页面 -->
 <template>
-    <div >
-      <!-- 搜索框及按钮 -->
-      <div class="filter" >
-        <a-form layout="inline" style="min-width: 1380px;">
-          <a-form-item  class="select">
-            <a-select style="width: 235px" v-model:value="searchParam.trainOrgId" placeholder="培训发生组织" allowClear
-              :options="trainOrglist"
-              v-on:keydown.enter="enterPressHadlerSearch">
-            </a-select>
-          </a-form-item>
-          <a-form-item class="select ">
-            <!-- <div class="select addTimeBox">
+  <div>
+    <!-- 搜索框及按钮 -->
+    <div class="filter">
+      <a-form layout="inline" style="min-width: 1380px;">
+        <a-form-item class="select">
+          <a-select style="width: 235px" v-model:value="searchParam.trainOrgId" placeholder="培训发生组织" allowClear
+            :options="trainOrglist" v-on:keydown.enter="enterPressHadlerSearch">
+          </a-select>
+        </a-form-item>
+        <a-form-item class="select ">
+          <!-- <div class="select addTimeBox">
             <div class="addTime" >汇总时间：</div> -->
-            <a-range-picker
-              v-model:value="searchdate"
-              style="width: 340px !important;"
-              format="YYYY-MM-DD"
-              valueFormat="YYYY-MM-DD"
-              separator="至"
-              :placeholder="['汇总时间开始时间', '汇总时间结束时间']"
-              v-on:keydown.enter="enterPressHadlerSearch"
-            />
+          <a-range-picker v-model:value="searchdate" style="width: 340px !important;" format="YYYY-MM-DD"
+            valueFormat="YYYY-MM-DD" separator="至" :placeholder="['汇总时间开始时间', '汇总时间结束时间']"
+            v-on:keydown.enter="enterPressHadlerSearch" />
           <!-- </div> -->
-          </a-form-item>
-          <a-form-item class="select">
-            <a-select style="width: 200px ;margin-bottom:20px" v-model:value="searchParam.status" placeholder="请选择状态" allowClear
-              :options="AuthenticationStatusList"
-              v-on:keydown.enter="enterPressHadlerSearch">
-            </a-select>
-          </a-form-item>
-          <div style="display: flex; margin-bottom: 20px">
-            <a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
-            <!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
-            <!-- <div class="search"></div> -->
-            <a-button class="resetbtn " @click="searchReset">重置</a-button>
-  
-            <!-- 更多筛选-->
-             <!-- <div v-if="moreid == 1">
+        </a-form-item>
+        <a-form-item class="select">
+          <a-select style="width: 200px ;margin-bottom:20px" v-model:value="searchParam.status" placeholder="请选择状态"
+            allowClear :options="AuthenticationStatusList" v-on:keydown.enter="enterPressHadlerSearch">
+          </a-select>
+        </a-form-item>
+        <div style="display: flex; margin-bottom: 20px">
+          <a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
+          <!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
+          <!-- <div class="search"></div> -->
+          <a-button class="resetbtn " @click="searchReset">重置</a-button>
+
+          <!-- 更多筛选-->
+          <!-- <div v-if="moreid == 1">
               <a-button @click="handlemoreid()" class="moreidbtn" type="text"> 展开
                 <RightOutlined />
               </a-button>
@@ -47,9 +39,9 @@
                 <UpOutlined />
               </a-button>
             </div> -->
-          </div>
-          <!-- <div style="width:100%"></div> -->
-          <!-- <a-form-item class="select" v-if="moreid == 2">
+        </div>
+        <!-- <div style="width:100%"></div> -->
+        <!-- <a-form-item class="select" v-if="moreid == 2">
             <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.courseType" placeholder="请选择费用类型" allowClear
               :options="courseTypeList">
             </a-select>
@@ -74,8 +66,8 @@
               :options="getLevelList">
             </a-select>
           </a-form-item> -->
-        </a-form>
-        <!-- <div style="width: 100%;"></div>
+      </a-form>
+      <!-- <div style="width: 100%;"></div>
         <div style="display: flex; margin-bottom: 20px">
           
           <a-button @click="handleExport()" class="resetbtn">
@@ -83,389 +75,395 @@
           </a-button>
           <div  v-if="moreid == 2"   style="line-height: 40px;" >当前页面汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">1,230,490</span>元     当前总汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">9,230,490</span>元</div>
         </div>  -->
-        <!-- 表格 -->
-        <div>
-          <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columns"
+      <!-- 表格 -->
+      <div>
+        <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columns"
           :data-source="tableData" :loading="tableLoading" @expand="expandTable" :pagination="false">
-            <template #bodyCell="{ record, column }">
-              <template v-if="column.key === 'operation'">
-                <a-space >
-                  <a-button type="link" v-if="record.status != 2&&record.status!=3" @click="goDdit(record)">提交</a-button>
-                  <a-button type="link" v-if="record.status != 1&&record.status!=5" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
-                  <!-- <a-button  type="link" @click="() => handleOperate(record, String(record.courseform))">审批</a-button> -->
-                  <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
-                  <!-- <a-button v-if="record.status == 4" type="link" @click="submit(record)">提交</a-button> -->
-                  <a-button v-if="record.status == 2&&false" type="link" @click="withdraw(record)">撤回</a-button>
-                </a-space>
-              </template>
+          <template #bodyCell="{ record, column }">
+            <template v-if="column.key === 'operation'">
+              <a-space>
+                <a-button type="link" v-if="record.status != 2 && record.status != 3" @click="goDdit(record)">提交</a-button>
+                <a-button type="link" v-if="record.status != 1 && record.status != 5"
+                  @click="() => handleLook(record, String(record.courseform))">查看</a-button>
+                <!-- <a-button  type="link" @click="() => handleOperate(record, String(record.courseform))">审批</a-button> -->
+                <!-- TODO1 -->
+                <a-button v-if="record.status = 1 || record.status != 4" type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
+                <!-- <a-button v-if="record.status == 4" type="link" @click="submit(record)">提交</a-button> -->
+                <a-button v-if="record.status == 2 && false" type="link" @click="withdraw(record)">撤回</a-button>
+              </a-space>
             </template>
-          </a-table>
-        </div>
-  
-      </div>
-      <div class="tableBox ">
-        <div style="float: right;">
-          <a-pagination
-          v-if="tableDataTotal > 10"
-        :showSizeChanger="true "
-        :showQuickJumper="false"
-        :hideOnSinglePage="false"
-        :pageSize="searchParam.pageSize"
-        :current="searchParam.pageNo"
-        :total="tableDataTotal"
-        class="pagination"
-        @change="changePagination"
-      />
-        </div>
-      </div>
-      <!-- 弹窗组件 -->
-<!--查看讲师费详情 -->
-<a-drawer class="largeDrawerInside" :closable="false" v-model:visible="teachingdialog" placement="right"
-@closa="cancelTeachingDialog"  width="60%" :title="false">
-<div style="padding:24px;">
-<div class="headers" style="margin-top:-24px;">
-  <div class="headerTitle">汇总讲师费详情</div>
-  <img
-    style="width: 29px; height: 29px; cursor: pointer"
-    src="../../assets/images/basicinfo/close.png"
-    @click="cancelTeachingDialog"
-  />
-</div>
-<span class="line"></span>
-<span style="font-weight:600;">基本信息</span>
-<a-descriptions style="margin-top:16px" bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
-    <a-descriptions-item label="审批编号"><div style="user-select:text">{{formParam?.approvalNumber||'-'}}</div></a-descriptions-item>
-    <a-descriptions-item label="培训发生组织"><div style="user-select:text">{{formParam?.trainOrgName||'-'}}</div></a-descriptions-item>
-    <a-descriptions-item label="汇总时间" >{{formParam?.summaryTime||'-'}}</a-descriptions-item>
-    <a-descriptions-item label="汇总金额">{{formParam?.summaryTotal?formParam?.summaryTotal+'元':'-'}}</a-descriptions-item>
-    <a-descriptions-item label="提交时间">{{formParam?.approvalSubmitTime||'-'}}</a-descriptions-item>
-    <a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'审核通过', 4:'审核拒绝',5:'待提交'}[formParam?.status]}}</a-descriptions-item>
-  </a-descriptions>
-  <!-- <span>审批详情</span> -->
-  <!-- <span class="line" style="margin-top:15px;"></span> -->
-  <a-tabs v-model:activeKey="activeKey" @change="tabsChange">
-  <a-tab-pane key="1" tab="讲师费列表">
-    <div style="padding: 10px 0;">
-      <div style="display: flex;margin-bottom: 20px;">
-        <div style="margin-right:20px;">
-          <a-input @pressEnter="searchTeacherFeeApprovalList()" style="height:40px;border-radius:8px;" v-model:value="userNoOrName" placeholder="请输入工号/讲师名称进行搜索" />
-        </div>
-        <div style="margin-right:20px;">
-          <a-range-picker style="height:40px;border-radius:8px;" @change="seeDateChange" valueFormat="YYYY-MM-DD" format="YYYY-MM-DD" v-model:value="seeDateValue" />
-        </div>
-        <div style="margin-right:20px;">
-          <a-button style="margin-right:15px;height:40px;border-radius:8px;" type="primary" @click="searchTeacherFeeApprovalList()">搜索</a-button>
-          <a-button style="margin-right:15px;height:40px;border-radius:8px;" type="primary" @click="resetSearch()">重置</a-button>
-        </div>
-      </div>
-      <div style="padding-bottom:70px">
-        <a-table :scroll="{x:'max-content'}" :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columnsExamine"
-          :data-source="tableDataExamine" :loading="examinetableLoading" @expand="expandTable" :pagination="pagination">
+          </template>
         </a-table>
       </div>
+
     </div>
-  </a-tab-pane>
-  <a-tab-pane key="2" tab="讲师费审批记录" force-render v-if="false">
-    <div style="padding-bottom:70px">
-        <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columnsExamineTwo"
-          :data-source="tableDataExamineTwo" :loading="tableDataExamineLoading" @expand="expandTable" :pagination="false">
-        </a-table>
-      </div>
-  </a-tab-pane>
-</a-tabs>
-  <div v-if="formParam?.status==1||formParam?.status==5" :style="{
-        position: 'absolute',
-        right: 0,
-        bottom: 0,
-        width: '100%',
-        borderTop: '1px solid #e9e9e9',
-        padding: '10px 16px',
-        background: '#fff',
-        textAlign: 'right',
-        zIndex: 1,
-      }">
-        <a-button  class="drabtn"  @click="cancelTeachingDialog">取消</a-button>
-        <a-button   class="drabtn" type="primary" @click="cancelTeachingDialog(1)" :loading="buttonLoading">提交
-        </a-button>
-        <!-- <a-button  class="drabtn"  @click="cancelTeachingDialog" type="primary" danger>拒绝</a-button> -->
+    <div class="tableBox ">
+      <div style="float: right;">
+        <a-pagination v-if="tableDataTotal > 10" :showSizeChanger="true" :showQuickJumper="false"
+          :hideOnSinglePage="false" :pageSize="searchParam.pageSize" :current="searchParam.pageNo"
+          :total="tableDataTotal" class="pagination" @change="changePagination" />
       </div>
     </div>
-</a-drawer>
-       <!-- 修改状态功能弹窗 -->
-       <div>
-        <a-modal v-model:visible="editTeacher" :footer="null" :closable="close" wrapClassName=""
-          centered="true">
-          <div class="delete" style="width:500px">
-            <div class="del_header"></div>
-            <div class="del_main">
-              <div class="header">
-                <div class="icon1"></div>
-                <span>提示</span>
+    <!-- 弹窗组件 -->
+    <!--查看讲师费详情 -->
+    <a-drawer class="largeDrawerInside" :closable="false" v-model:visible="teachingdialog" placement="right"
+      @closa="cancelTeachingDialog" width="60%" :title="false">
+      <div style="padding:24px;">
+        <div class="headers" style="margin-top:-24px;">
+          <div class="headerTitle">汇总讲师费详情</div>
+          <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+            @click="cancelTeachingDialog" />
+        </div>
+        <span class="line"></span>
+        <span style="font-weight:600;">基本信息</span>
+        <a-descriptions style="margin-top:16px" bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
+          <a-descriptions-item label="审批编号">
+            <div style="user-select:text">{{ formParam?.approvalNumber || '-' }}</div>
+          </a-descriptions-item>
+          <a-descriptions-item label="培训发生组织">
+            <div style="user-select:text">{{ formParam?.trainOrgName || '-' }}</div>
+          </a-descriptions-item>
+          <a-descriptions-item label="汇总时间">{{ formParam?.summaryTime || '-' }}</a-descriptions-item>
+          <a-descriptions-item
+            label="汇总金额">{{ formParam?.summaryTotal ? formParam?.summaryTotal + '元' : '-' }}</a-descriptions-item>
+          <a-descriptions-item label="提交时间">{{ formParam?.approvalSubmitTime || '-' }}</a-descriptions-item>
+          <a-descriptions-item label="状态">{{ {
+            0: '待确认', 1: '待提交', 2: '审核中', 3: '审核通过',
+            4: '审核拒绝', 5: '待提交'
+          }[formParam?.status]}}</a-descriptions-item>
+        </a-descriptions>
+        <!-- <span>审批详情</span> -->
+        <!-- <span class="line" style="margin-top:15px;"></span> -->
+        <a-tabs v-model:activeKey="activeKey" @change="tabsChange">
+          <a-tab-pane key="1" tab="讲师费列表">
+            <div style="padding: 10px 0;">
+              <div style="display: flex;margin-bottom: 20px;">
+                <div style="margin-right:20px;">
+                  <a-input @pressEnter="searchTeacherFeeApprovalList()" style="height:40px;border-radius:8px;"
+                    v-model:value="userNoOrName" placeholder="请输入工号/讲师名称进行搜索" />
+                </div>
+                <div style="margin-right:20px;">
+                  <a-range-picker style="height:40px;border-radius:8px;" @change="seeDateChange"
+                    valueFormat="YYYY-MM-DD" format="YYYY-MM-DD" v-model:value="seeDateValue" />
+                </div>
+                <div style="margin-right:20px;">
+                  <a-button style="margin-right:15px;height:40px;border-radius:8px;" type="primary"
+                    @click="searchTeacherFeeApprovalList()">搜索</a-button>
+                  <a-button style="margin-right:15px;height:40px;border-radius:8px;" type="primary"
+                    @click="resetSearch()">重置</a-button>
+                </div>
               </div>
-                <a-form style="margin-left:20px; margin-top:10px ">
-                  <a-form-item label="审批" >
-                      <a-radio-group v-model:value="formParamstatues.status">
+              <div style="padding-bottom:70px">
+                <a-table :scroll="{ x: 'max-content' }" :header-cell-style="{ 'text-align': 'center' }"
+                  style="border: 1px solid #f2f6fe" :columns="columnsExamine" :data-source="tableDataExamine"
+                  :loading="examinetableLoading" @expand="expandTable" :pagination="pagination">
+                </a-table>
+              </div>
+            </div>
+          </a-tab-pane>
+          <a-tab-pane key="2" tab="讲师费审批记录" force-render v-if="false">
+            <div style="padding-bottom:70px">
+              <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe"
+                :columns="columnsExamineTwo" :data-source="tableDataExamineTwo" :loading="tableDataExamineLoading"
+                @expand="expandTable" :pagination="false">
+              </a-table>
+            </div>
+          </a-tab-pane>
+        </a-tabs>
+        <div v-if="formParam?.status == 1 || formParam?.status == 5" :style="{
+          position: 'absolute',
+          right: 0,
+          bottom: 0,
+          width: '100%',
+          borderTop: '1px solid #e9e9e9',
+          padding: '10px 16px',
+          background: '#fff',
+          textAlign: 'right',
+          zIndex: 1,
+        }">
+          <a-button class="drabtn" @click="cancelTeachingDialog">取消</a-button>
+          <a-button class="drabtn" type="primary" @click="cancelTeachingDialog(1)" :loading="buttonLoading">提交
+          </a-button>
+          <!-- <a-button  class="drabtn"  @click="cancelTeachingDialog" type="primary" danger>拒绝</a-button> -->
+        </div>
+      </div>
+    </a-drawer>
+    <!-- 修改状态功能弹窗 -->
+    <div>
+      <a-modal v-model:visible="editTeacher" :footer="null" :closable="close" wrapClassName="" centered="true">
+        <div class="delete" style="width:500px">
+          <div class="del_header"></div>
+          <div class="del_main">
+            <div class="header">
+              <div class="icon1"></div>
+              <span>提示</span>
+            </div>
+            <a-form style="margin-left:20px; margin-top:10px ">
+              <a-form-item label="审批">
+                <a-radio-group v-model:value="formParamstatues.status">
                   <a-radio value="S20">同意</a-radio>
                   <a-radio value="E10">拒绝</a-radio>
                 </a-radio-group>
-                  </a-form-item>
-                  <a-form-item label="备注">
-                    <a-textarea v-model:value="formParamstatues.remark" 
-                  style="width: 90%; height: 100px; border-radius: 8px ;"  placeholder="一旦拒绝 备注变为必填" />
-                  </a-form-item>
-                </a-form>
-              <div class="del_btnbox">
-                <div class="del_btn btn2" @click="cancelTeachingDialog" style="margin-right: 32px">
-                  <div class="btnText">取消</div>
-                </div>
-                <div class="del_btn btn2" @click="closehandleOperate">
-                  <div class="btnText">确定</div>
-                </div>
+              </a-form-item>
+              <a-form-item label="备注">
+                <a-textarea v-model:value="formParamstatues.remark"
+                  style="width: 90%; height: 100px; border-radius: 8px ;" placeholder="一旦拒绝 备注变为必填" />
+              </a-form-item>
+            </a-form>
+            <div class="del_btnbox">
+              <div class="del_btn btn2" @click="cancelTeachingDialog" style="margin-right: 32px">
+                <div class="btnText">取消</div>
+              </div>
+              <div class="del_btn btn2" @click="closehandleOperate">
+                <div class="btnText">确定</div>
               </div>
             </div>
           </div>
-        </a-modal>
-      </div>
-      <!-- <div> <Upload/> </div>         -->
-       <LecturerAppEdit @example="getExample" @successParams="successParams" v-model:visible="editTeacherDialog" :id="editId" ></LecturerAppEdit>
-       <div class="example" v-if="example">
-          <a-spin />
         </div>
-      </div>
-  </template>
-  <script lang="jsx">
-  import { reactive, toRefs, ref ,watch,computed,onMounted} from "vue";
-  import { useRouter } from "vue-router";
-  import { message } from "ant-design-vue";
-  import dayjs from "dayjs";
-  import dialog from '@/utils/dialog'
-  import {
-    RightOutlined,
-    UpOutlined,
-    UploadOutlined,
-    FolderAddOutlined,
-    DownloadOutlined
-  } from '@ant-design/icons-vue';
-  import ProjectManager from "@/components/project/ProjectManagerNew";
-  import {expenseBillList,queryById,queryExpnseByBillId ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,isConfirm} from "../../api/lecturerFeeManagement";
-  import { getTeacherSystemList,getApprovalResultByBusinessIdList } from "../../api/Lecturer";
-  import { queryTrainOrgPor,} from "../../api/organization";
-  // lecturerFeeManagement
-  // import {getProjSt} from "../../api/indexProjStu";
-  // import AddTeacher from "../../components/drawers/project/AddTeacher"
-  import LecturerAppEdit from "./LecturerAPPEdit"
-  export default { 
-    name: "LecturerApproval",
-    components: {
-      RightOutlined, //图标--展开
-      UpOutlined,//图标--收起
-      UploadOutlined,//图标--导出
-      DownloadOutlined,//图标-导入
-      FolderAddOutlined,//图标--新增
-      ProjectManager,
-      LecturerAppEdit,
-    },
-    setup(props,emit) {
-      watch(()=>props.key,(val)=>{
-        console.log(val,'valllllll')
-      })
-      onMounted(()=>{
-        // const search = sessionStorage.getItem('searchApprlval')
-        // console.log(search,'search')
-        // if(search){
-        //   state.searchParam = JSON.parse(search)
-        //   state.searchdate = state.searchParam.searchdate
-        // }
-        getTableDate()
-      })
-      const router = useRouter()
-      const state = reactive({
-        example: false,
-        editId: null,
-        editTeacherDialog: false,
-        tableDataExamineLoading: false,
-        tableDataExamineTwo: [],
-        tableDataParams:{
-          pageNo: 1,
-          pageSize: 10,
-          total: 0,
-        },
-        userNoOrName: null,
-        seeDateValue: [],
-        seeBegin: null,
-        seeEnd: null,
-        activeKey: '1',
-        moreid:1,
-        byPid:null,
-        currentPage1: 1,
-        pageSize1: 10,
-        promotionrecordsLoading:false ,  //晋级记录遮罩层
-        teacherrecordsLoading:false,// 授课记录遮罩层
-        tableLoading:false,
-        examinetableLoading:false,
-        tagsshow:"1",
-        delTeacherId:null, //删除id确认
-        newStatus:null , //修改状态码确认
-        id:null,    //内部讲师工号确认 
-        lookTeacherId:null, //内部讲师详情id确认
-        // deleteInTeacherdialog: false, //删除弹窗
-        editTeacher:false ,   //修改状态弹窗
-        handleOperate1:null, //修改状态弹窗内容
-        teacherdialog1: null,
-        teachingdialog: false,  //控制讲师弹窗
-        teacherdialogtitle: '',//讲师弹框title内容
-        pageSizeOptions: ['10', '20', '30', '50'], //下拉选择每页显示多少条
+      </a-modal>
+    </div>
+    <!-- <div> <Upload/> </div>         -->
+    <LecturerAppEdit @example="getExample" @successParams="successParams" v-model:visible="editTeacherDialog"
+      :id="editId">
+    </LecturerAppEdit>
+    <div class="example" v-if="example">
+      <a-spin />
+    </div>
+  </div>
+</template>
+<script lang="jsx">
+import { reactive, toRefs, ref, watch, computed, onMounted } from "vue";
+import { useRouter } from "vue-router";
+import { message } from "ant-design-vue";
+import dayjs from "dayjs";
+import dialog from '@/utils/dialog'
+import {
+  RightOutlined,
+  UpOutlined,
+  UploadOutlined,
+  FolderAddOutlined,
+  DownloadOutlined
+} from '@ant-design/icons-vue';
+import ProjectManager from "@/components/project/ProjectManagerNew";
+import { expenseBillList, queryById, queryExpnseByBillId, updateTeacherFee, updateStatusSubmit, approveTeacherFee, getTrainOrg, isConfirm } from "../../api/lecturerFeeManagement";
+import { getTeacherSystemList, getApprovalResultByBusinessIdList } from "../../api/Lecturer";
+import { queryTrainOrgPor, } from "../../api/organization";
+// lecturerFeeManagement
+// import {getProjSt} from "../../api/indexProjStu";
+// import AddTeacher from "../../components/drawers/project/AddTeacher"
+import LecturerAppEdit from "./LecturerAPPEdit"
+export default {
+  name: "LecturerApproval",
+  components: {
+    RightOutlined, //图标--展开
+    UpOutlined,//图标--收起
+    UploadOutlined,//图标--导出
+    DownloadOutlined,//图标-导入
+    FolderAddOutlined,//图标--新增
+    ProjectManager,
+    LecturerAppEdit,
+  },
+  setup(props, emit) {
+    watch(() => props.key, (val) => {
+      console.log(val, 'valllllll')
+    })
+    onMounted(() => {
+      // const search = sessionStorage.getItem('searchApprlval')
+      // console.log(search,'search')
+      // if(search){
+      //   state.searchParam = JSON.parse(search)
+      //   state.searchdate = state.searchParam.searchdate
+      // }
+      getTableDate()
+    })
+    const router = useRouter()
+    const state = reactive({
+      example: false,
+      editId: null,
+      editTeacherDialog: false,
+      tableDataExamineLoading: false,
+      tableDataExamineTwo: [],
+      tableDataParams: {
+        pageNo: 1,
         pageSize: 10,
-        tableDataTotal: -1,//table列表总条数
-        formParam: {
-          beginTime:null ,
-          defaultTeachingTime:"0",
-        },
-        formParamstatues:{
-          status:'S20',
-          remark: null,
-          id:null,
-        },
-        searchdate: null, //选择时间
-        searchParam: {
-          teacherNo:null,
-          teacherName:null,
-          trainOrgId:null,
-          id:null,
-          levelId:null,
-          courseType:null,
-          certStatus:null,
-          salaryName:null,
-          payrollPlaceId:null,
-          status:null,
-          pageNo: "1",
-          pageSize: "10",
-          beginTime: null,
-          endTime: null,
-        },
-      })
-       //费用类型
-       const courseTypeList=ref([
-       { value: 1, label: "课程开发" },
-        { value: 2, label: "作业人员入模培训" },
-        { value: 3, label: "其他" },
-     ])
-   
-      const lecturerSystemList = ref([
-      ]);
-      ///获取讲师体系列表
-      const LecturerSystemLista =() => {
-        // console.log('点击了LecturerSystemLista')
-        getTeacherSystemList().then((res) => {
-          if (res.data.code === 200) {
-            let arr = res.data.data;
-            let array = [];
-            arr?.map((value) => {
-              let obj = {
-                value: value.kid,
-              label: value.systemName,
-              };
-              array.push(obj);
-            });
-            lecturerSystemList.value = array;
-          }
-        })
-      }
-      // LecturerSystemLista()
-      const trainOrglist=ref([])
-      //获取培训发生组织
-      const trainOrglista =() => {
-        let obj = {
-                 pageNo: "1",
-                pageSize: "10000"
-      }
-      queryTrainOrgPor(obj).then((res)=>{
-          if (res.data.code === 200) {
-              let arr = res.data.data;
-              let array = [];
-              arr.map((value) => {
-                let obj = {
-                  value: value.id,
-                  label: value.affiliationName,
-                };
-                array.push(obj);
-              });
-              trainOrglist.value = array;
-              trainOrglist.value.unshift({
-                value: '',
-                label: "全部"
-              })
-            }
-        }) 
-      }
-      trainOrglista()
-   
-      //课程类型
-      const OnTheJobStatusList = ref([
-      { value: 1, label: "项目开课" },
-        { value: 2, label: "路径开课" },
-        { value: 3, label: "面授开课" },
-      ])
-      //认证状态0待确认 1待提交 2审核中 3审核通过 4.审核拒绝
-      const AuthenticationStatusList = ref([
-        { value: '', label: "全部" },
-        { value: 1, label: "待提交" },
-        { value: 2, label: "审核中" },
-        { value: 4, label: "审核拒绝" },
-        { value: 3, label: "已审核" },
-      ])
+        total: 0,
+      },
+      userNoOrName: null,
+      seeDateValue: [],
+      seeBegin: null,
+      seeEnd: null,
+      activeKey: '1',
+      moreid: 1,
+      byPid: null,
+      currentPage1: 1,
+      pageSize1: 10,
+      promotionrecordsLoading: false,  //晋级记录遮罩层
+      teacherrecordsLoading: false,// 授课记录遮罩层
+      tableLoading: false,
+      examinetableLoading: false,
+      tagsshow: "1",
+      delTeacherId: null, //删除id确认
+      newStatus: null, //修改状态码确认
+      id: null,    //内部讲师工号确认 
+      lookTeacherId: null, //内部讲师详情id确认
+      // deleteInTeacherdialog: false, //删除弹窗
+      editTeacher: false,   //修改状态弹窗
+      handleOperate1: null, //修改状态弹窗内容
+      teacherdialog1: null,
+      teachingdialog: false,  //控制讲师弹窗
+      teacherdialogtitle: '',//讲师弹框title内容
+      pageSizeOptions: ['10', '20', '30', '50'], //下拉选择每页显示多少条
+      pageSize: 10,
+      tableDataTotal: -1,//table列表总条数
+      formParam: {
+        beginTime: null,
+        defaultTeachingTime: "0",
+      },
+      formParamstatues: {
+        status: 'S20',
+        remark: null,
+        id: null,
+      },
+      searchdate: null, //选择时间
+      searchParam: {
+        teacherNo: null,
+        teacherName: null,
+        trainOrgId: null,
+        id: null,
+        levelId: null,
+        courseType: null,
+        certStatus: null,
+        salaryName: null,
+        payrollPlaceId: null,
+        status: null,
+        pageNo: "1",
+        pageSize: "10",
+        beginTime: null,
+        endTime: null,
+      },
+    })
+    //费用类型
+    const courseTypeList = ref([
+      { value: 1, label: "课程开发" },
+      { value: 2, label: "作业人员入模培训" },
+      { value: 3, label: "其他" },
+    ])
 
-      //状态
-      const AccountStatusList = ref([
-        { value:"A10", label: "待审核", },
-        { value:"A20", label: "已提交", },
-        { value:"A30", label: "审核中", },
-        { value:"E10", label: "审核打回", },
-        { value:"S20", label: "审核通过", },
-      ])
-      watch(
-      )
-      //切换筛选
-      const handlemoreid=()=>{
-        if(state.moreid==1){
-          state.moreid=2
-        }
-        else if(state.moreid == 2){
-          state.moreid=1
-          state.searchParam.certStatus=null
-          state.searchParam.salaryName=null
-          state.searchParam.payrollPlaceId=null
-          state.searchParam.status=null
+    const lecturerSystemList = ref([
+    ]);
+    ///获取讲师体系列表
+    const LecturerSystemLista = () => {
+      // console.log('点击了LecturerSystemLista')
+      getTeacherSystemList().then((res) => {
+        if (res.data.code === 200) {
+          let arr = res.data.data;
+          let array = [];
+          arr?.map((value) => {
+            let obj = {
+              value: value.kid,
+              label: value.systemName,
+            };
+            array.push(obj);
+          });
+          lecturerSystemList.value = array;
         }
+      })
+    }
+    // LecturerSystemLista()
+    const trainOrglist = ref([])
+    //获取培训发生组织
+    const trainOrglista = () => {
+      let obj = {
+        pageNo: "1",
+        pageSize: "10000"
       }
-         //新增页面内部姓名
-         const infoteacherList = ref([
+      queryTrainOrgPor(obj).then((res) => {
+        if (res.data.code === 200) {
+          let arr = res.data.data;
+          let array = [];
+          arr.map((value) => {
+            let obj = {
+              value: value.id,
+              label: value.affiliationName,
+            };
+            array.push(obj);
+          });
+          trainOrglist.value = array;
+          trainOrglist.value.unshift({
+            value: '',
+            label: "全部"
+          })
+        }
+      })
+    }
+    trainOrglista()
+
+    //课程类型
+    const OnTheJobStatusList = ref([
+      { value: 1, label: "项目开课" },
+      { value: 2, label: "路径开课" },
+      { value: 3, label: "面授开课" },
+    ])
+    //认证状态0待确认 1待提交 2审核中 3审核通过 4.审核拒绝
+    const AuthenticationStatusList = ref([
+      { value: '', label: "全部" },
+      { value: 1, label: "待提交" },
+      { value: 2, label: "审核中" },
+      { value: 4, label: "审核拒绝" },
+      { value: 3, label: "已审核" },
+    ])
+
+    //状态
+    const AccountStatusList = ref([
+      { value: "A10", label: "待审核", },
+      { value: "A20", label: "已提交", },
+      { value: "A30", label: "审核中", },
+      { value: "E10", label: "审核打回", },
+      { value: "S20", label: "审核通过", },
+    ])
+    watch(
+    )
+    //切换筛选
+    const handlemoreid = () => {
+      if (state.moreid == 1) {
+        state.moreid = 2
+      }
+      else if (state.moreid == 2) {
+        state.moreid = 1
+        state.searchParam.certStatus = null
+        state.searchParam.salaryName = null
+        state.searchParam.payrollPlaceId = null
+        state.searchParam.status = null
+      }
+    }
+    //新增页面内部姓名
+    const infoteacherList = ref([
       //   { value: 0, systemName: "讲师体系" },
-      ]);
-      const  getinfoteacher = () => {
-        // state.tableLoading=true 
-        // ()
-        //   .then((res) => {
-        //     infoteacherList.value = res.data.data.records
-        // }) 
-      };
-      const columns = ref([
-        
-        {
-          title: '培训发生组织 ',
-          dataIndex: 'trainOrgName',
-          key: 'trainOrgName',
+    ]);
+    const getinfoteacher = () => {
+      // state.tableLoading=true 
+      // ()
+      //   .then((res) => {
+      //     infoteacherList.value = res.data.data.records
+      // }) 
+    };
+    const columns = ref([
+
+      {
+        title: '培训发生组织 ',
+        dataIndex: 'trainOrgName',
+        key: 'trainOrgName',
         ellipsis: true, align: "center",
-          width: 200,
-          customCell:()=>{return{style:{userSelect: 'text'}}}
-        },
-        {
+        width: 200,
+        customCell: () => { return { style: { userSelect: 'text' } } }
+      },
+      {
         title: '汇总时间 ',
         dataIndex: 'summaryTime',
         key: 'summaryTime',
         ellipsis: true,
         align: "center",
-        width:200
+        width: 200
       },
       {
         title: '汇总金额 ',
@@ -474,355 +472,362 @@
         ellipsis: true,
         align: "center",
         width: 200,
-        customRender: ({text})=>{
-          return text ? text+'元' : '-'
+        customRender: ({ text }) => {
+          return text ? text + '元' : '-'
         }
       },
       {
-          title: '提交时间',
-          dataIndex: 'approvalSubmitTime',
-          key: 'approvalSubmitTime',
+        title: '提交时间',
+        dataIndex: 'approvalSubmitTime',
+        key: 'approvalSubmitTime',
         ellipsis: true, align: "center",
-          width: 200,
-          customRender: ({text, record}) => {
-            return text ? text : '-'
+        width: 200,
+        customRender: ({ text, record }) => {
+          return text ? text : '-'
+        }
+      },
+      {
+        title: '状态 ',
+        dataIndex: 'status',
+        key: 'status',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        // customCell: (record) => {return{style:{color:['#67C23A','#F56C6C'][record.status]}}},
+        customRender: (value) => {
+          switch (value.record.status) {
+            case 0:
+              return "待确认 "
+            case 1:
+              return "待提交"
+            case 2:
+              return "审核中"
+            case 3:
+              return "审核通过"
+            case 4:
+              return "审核拒绝"
+            case 5:
+              return "待提交"
+            default:
+              return "-"
           }
-        },
-        {
-          title: '状态 ',
-          dataIndex: 'status',
-          key: 'status',
-          ellipsis: true, 
-          align: "center",
-          width: 120,
-          // customCell: (record) => {return{style:{color:['#67C23A','#F56C6C'][record.status]}}},
-          customRender: (value) => {
-            switch (value.record.status) {
-              case 0:
-                return "待确认 "
-              case 1:
-                return "待提交"
-              case 2:
-                return "审核中"
-              case 3:
-                return "审核通过"
-              case 4:
-                return "审核拒绝"
-              case 5:
-                return "待提交"
-              default:
-                return "-"
-            }
-          }
-        },
-        {
-          title: '操作 ',
-          dataIndex: 'operation',
-          key: 'operation',
+        }
+      },
+      {
+        title: '操作 ',
+        dataIndex: 'operation',
+        key: 'operation',
         ellipsis: true, align: "center",
         fixed: "right",
-          width: 120,
-          scopedSlots: { customRender: "action" },
-        },
-        
-      ])
-      //列表数据
-      const tableData = ref([
-      ])
-      // 搜索
-      const searchSubmit = () => {
-        state.searchParam.pageNo = 1;
-        getTableDate();
-        // sessionStorage.removeItem('searchApprlval')
-      };
+        width: 120,
+        scopedSlots: { customRender: "action" },
+      },
+
+    ])
+    //列表数据
+    const tableData = ref([
+    ])
+    // 搜索
+    const searchSubmit = () => {
+      state.searchParam.pageNo = 1;
+      getTableDate();
+      // sessionStorage.removeItem('searchApprlval')
+    };
     //重置
     const searchReset = () => {
-      state.searchdate= null,
-        state.searchParam = { 
-          endTime:null,
-        beginTime:null,
-          teacherNo:null,
-          id:null,
-          levelId:null,
-          courseType:null,
-          certStatus:null,
-          salaryName:null,
-          payrollPlaceId:null,
-          status:null,
-          pageNo: 1, 
-          pageSize: 10 ,
+      state.searchdate = null,
+        state.searchParam = {
+          endTime: null,
+          beginTime: null,
+          teacherNo: null,
+          id: null,
+          levelId: null,
+          courseType: null,
+          certStatus: null,
+          salaryName: null,
+          payrollPlaceId: null,
+          status: null,
+          pageNo: 1,
+          pageSize: 10,
         };
-        getTableDate();
-        // sessionStorage.removeItem('searchApprlval')
-      };
-//              //修改时间
-//              function searchTimeChange(time, timeStr) {
-//       let startTime = timeStr[0]
-//       let endTime = timeStr[1] ;
-//       state.startTime = new Date(startTime).getTime();
-//       state.endTime = new Date(endTime).getTime();
-//       // state.searchParam.beginTime = new Date(beginTime).getTime() ;
-//       // state.searchParam.endTime = new Date(endTime).getTime() ;
-//       state.searchParam.beginTime = state.startTime ? state.startTime : null,
-//         state.searchParam.endTime = state.endTime ? state.endTime : null
-// }
-      //  List接口数据
-       const getTableDate = (obj) => {
-        state.tableLoading=true 
-        let objA = { ...state.searchParam };
-         objA.beginTime = state.searchdate ? dayjs(state.searchdate[0]).format("YYYY-MM-DD") : "",
-        objA.endTime =  state.searchdate ? dayjs(state.searchdate[1]).format("YYYY-MM-DD") : "",
+      getTableDate();
+      // sessionStorage.removeItem('searchApprlval')
+    };
+    //              //修改时间
+    //              function searchTimeChange(time, timeStr) {
+    //       let startTime = timeStr[0]
+    //       let endTime = timeStr[1] ;
+    //       state.startTime = new Date(startTime).getTime();
+    //       state.endTime = new Date(endTime).getTime();
+    //       // state.searchParam.beginTime = new Date(beginTime).getTime() ;
+    //       // state.searchParam.endTime = new Date(endTime).getTime() ;
+    //       state.searchParam.beginTime = state.startTime ? state.startTime : null,
+    //         state.searchParam.endTime = state.endTime ? state.endTime : null
+    // }
+    //  List接口数据
+    const getTableDate = (obj) => {
+      state.tableLoading = true
+      let objA = { ...state.searchParam };
+      objA.beginTime = state.searchdate ? dayjs(state.searchdate[0]).format("YYYY-MM-DD") : "",
+        objA.endTime = state.searchdate ? dayjs(state.searchdate[1]).format("YYYY-MM-DD") : "",
         delete objA.searchdate
-     expenseBillList(objA)
-          .then((res) => {
-            tableData.value = res.data.data.records
-            state.tableDataTotal = Number(res.data.data.total);
-            state.tableLoading=false 
-        }).catch(err=>{
-          state.tableLoading=false
+      expenseBillList(objA)
+        .then((res) => {
+          tableData.value = res.data.data.records
+          state.tableDataTotal = Number(res.data.data.total);
+          state.tableLoading = false
+        }).catch(err => {
+          state.tableLoading = false
           message.destroy()
           message.error(err.data.msg)
         })
-      };
-      // getTableDate()
-      //   // 翻页
-      const changePagination = (page,pageSize) => {
-        state.searchParam.pageNo = page;
+    };
+    // getTableDate()
+    //   // 翻页
+    const changePagination = (page, pageSize) => {
+      state.searchParam.pageNo = page;
       // state.pageNo = page;
       state.searchParam.pageSize = pageSize;
       getTableDate();
-      };
-      // 新增讲师
-      const addTeacher = () => {
-        state.teachingdialog = true;
-        state.teacherdialogtitle = '添加讲师费'
-        
-      }
-      //修改状态窗口
-      const handleOperate = (record) => {
-        state.editTeacher = true
-        state.formParamstatues.id= record.id
-      };
-      //提交
-      const closehandleOperate= ()=>{
-          approveTeacherFee(state.formParamstatues).then((res) => {
-              message.success("审批成功");
-              state.editTeacher = false
-             getTableDate();
-          })
-      }
-      //取消按钮 清空输入的数据
-      const cancelTeachingDialog = (val) => {
-        if(state.teachingdialog = true )
-        {
-        if(val == 1){
+    };
+    // 新增讲师
+    const addTeacher = () => {
+      state.teachingdialog = true;
+      state.teacherdialogtitle = '添加讲师费'
+
+    }
+    //修改状态窗口
+    const handleOperate = (record) => {
+      state.editTeacher = true
+      state.formParamstatues.id = record.id
+    };
+    //提交
+    const closehandleOperate = () => {
+      approveTeacherFee(state.formParamstatues).then((res) => {
+        message.success("审批成功");
+        state.editTeacher = false
+        getTableDate();
+      })
+    }
+    //取消按钮 清空输入的数据
+    const cancelTeachingDialog = (val) => {
+      if (state.teachingdialog = true) {
+        if (val == 1) {
           submit(state.formParam)
           return
         }
         state.teachingdialog = false
         cancel()
-       }
-         state.deleteInTeacherdialog = false 
-         state.editTeacher = false 
-      };
-        //清空数据
-        const cancel = () => {
-          state.formParam ={
-          teacher:null,
-          teacherNo:null,
-          departId:null,
-          id:null,
-          courseName:0,
-          levelId:null,
-          payrollPlaceId:null,
-          // 费用类型 : null
-          teacherpayrollPlace:null,
-          teachingDate:null,
-          defaultTeachingTime:0,
-          courseType:null,
-          studys:null,
-          teacherlevelPay:null,
-          score:null,
-          trainOrg:null,
-          payableExpense:null,
-          expense:null,
-          remark:null,
-        }
       }
-      const goDdit = (record) => {
-        state.editTeacherDialog = true
-        state.editId = record.id
-        // state.searchParam.searchdate = state.searchdate
-        // sessionStorage.setItem('searchApprlval', JSON.stringify(state.searchParam))
-        // router.push({
-        //   path:'/LecturerAppEdit',
-        //   query:{
-        //     id: record.id
-        //   }
-        // })
+      state.deleteInTeacherdialog = false
+      state.editTeacher = false
+    };
+    //清空数据
+    const cancel = () => {
+      state.formParam = {
+        teacher: null,
+        teacherNo: null,
+        departId: null,
+        id: null,
+        courseName: 0,
+        levelId: null,
+        payrollPlaceId: null,
+        // 费用类型 : null
+        teacherpayrollPlace: null,
+        teachingDate: null,
+        defaultTeachingTime: 0,
+        courseType: null,
+        studys: null,
+        teacherlevelPay: null,
+        score: null,
+        trainOrg: null,
+        payableExpense: null,
+        expense: null,
+        remark: null,
       }
-      //表格内查看数据操作
-      const handleLook = (record) => {
-        state.activeKey = '1'
-        state.teachingdialog = true;
-        state.id= record.id
-        TeacherSystem()
-        gettableDataExamine()
+    }
+    const goDdit = (record) => {
+      state.editTeacherDialog = true
+      state.editId = record.id
+      // state.searchParam.searchdate = state.searchdate
+      // sessionStorage.setItem('searchApprlval', JSON.stringify(state.searchParam))
+      // router.push({
+      //   path:'/LecturerAppEdit',
+      //   query:{
+      //     id: record.id
+      //   }
+      // })
+    }
+    //表格内查看数据操作
+    const handleLook = (record) => {
+      state.activeKey = '1'
+      state.teachingdialog = true;
+      state.id = record.id
+      TeacherSystem()
+      gettableDataExamine()
+    }
+    const params = reactive({
+      pageNo: 1,
+      pageSize: 10,
+      total: 0,
+      businessType: 1,
+      businessId: '366'
+    })
+    const paginations = computed(() => ({
+      total: params.total,
+      showSizeChanger: true,
+      showQuickJumper: true,
+      current: params.pageNo,
+      pageSize: params.pageSize,
+      onChange: paginationChanges,
+    }));
+    const paginationChanges = (e, pageSize) => {
+      params.pageNo = e;
+      params.pageSize = pageSize
+      // getListData()
+    };
+    const tabsChange = (val) => {
+      if (val == 2) {
+        getListData()
       }
-      const params = reactive({
-        pageNo: 1,
-        pageSize: 10,
-        total: 0,
+    }
+    const getListData = () => {
+      state.tableDataExamineLoading = true
+      getApprovalResultByBusinessIdList({
         businessType: 1,
-        businessId: '366'
-      })
-      const paginations = computed(() => ({
-        total: params.total,
-        showSizeChanger: true,
-        showQuickJumper:true,
-        current: params.pageNo,
-        pageSize: params.pageSize,
-        onChange: paginationChanges,
-      }));
-      const paginationChanges = (e,pageSize) => {
-        params.pageNo = e;
-        params.pageSize = pageSize
-        // getListData()
-      };
-      const tabsChange = (val) => {
-        if(val == 2){
-          getListData()
+        businessId: state.id
+      }).then(res => {
+        if (res.data.code == 200) {
+          state.tableDataExamineTwo = res.data.data
+          // params.total = res.data.data.total
         }
-      }
-      const getListData = () => {
-        state.tableDataExamineLoading = true
-        getApprovalResultByBusinessIdList({
-          businessType: 1,
-          businessId: state.id
-        }).then(res=>{
-          if(res.data.code == 200){
-            state.tableDataExamineTwo = res.data.data
-            // params.total = res.data.data.total
-          }
-          state.tableDataExamineLoading = false
-        }).catch(err=>{
-          message.destroy()
-          state.tableDataExamineLoading = false
-          message.error(err.data.msg)
-        })
-      }
-      const submit = (record) => {
-        dialog({
-          content: '请仔细核对讲师费信息，确认无误后，将自动进入(BPM系统)审批流程',
-          ok: () => {
-            isConfirm({
-              id: record.id,
-              status: 2
-            }).then(res=>{
-              if(res.data.code == 200){
-                message.success('提交成功')
-                getTableDate();
-                cancel()
-                state.teachingdialog = false
-              }
-            }).catch(err=>{
-              message.destroy()
+        state.tableDataExamineLoading = false
+      }).catch(err => {
+        message.destroy()
+        state.tableDataExamineLoading = false
+        message.error(err.data.msg)
+      })
+    }
+    const submit = (record) => {
+      dialog({
+        content: '请仔细核对讲师费信息，确认无误后，将自动进入(BPM系统)审批流程',
+        ok: () => {
+          isConfirm({
+            id: record.id,
+            status: 2
+          }).then(res => {
+            if (res.data.code == 200) {
+              message.success('提交成功')
+              getTableDate();
               cancel()
               state.teachingdialog = false
-              message.error(err.data.msg)
-            })
-          }
-        })
-      }
-      const successParams = () => {
-        getTableDate();
-      }
-      const getExample = (val) => {
-        state.example = val
-      }
-      const withdraw = (record) => {
-        dialog({
-          content: '确定要撤回此条数据吗？',
-          ok: () => {
-            isConfirm({
-              id: record.id,
-              status: 1
-            }).then(res=>{
-              if(res.data.code == 200){
-                message.success('撤回成功')
-                getTableDate();
-                
-              }
-            }).catch(err=>{
-              message.destroy()
-              message.error(err.data.msg)
-            })
-          }
-        })
-      }
-      
-      //详情
-      const TeacherSystem=()=>{
-        queryById({id : state.id}).then((res) => {
-            // state.formParam=Object.assign({} ,res.data.data)
-            state.formParam=res.data.data
-        }) 
+            }
+          }).catch(err => {
+            message.destroy()
+            cancel()
+            state.teachingdialog = false
+            message.error(err.data.msg)
+          })
+        }
+      })
+    }
+    const successParams = () => {
+      getTableDate();
+    }
+    const getExample = (val) => {
+      state.example = val
+    }
+    const withdraw = (record) => {
+      dialog({
+        content: '确定要撤回此条数据吗？',
+        ok: () => {
+          isConfirm({
+            id: record.id,
+            status: 1
+          }).then(res => {
+            if (res.data.code == 200) {
+              message.success('撤回成功')
+              getTableDate();
+
+            }
+          }).catch(err => {
+            message.destroy()
+            message.error(err.data.msg)
+          })
+        }
+      })
+    }
+
+    //详情
+    const TeacherSystem = () => {
+      queryById({ id: state.id }).then((res) => {
+        // state.formParam=Object.assign({} ,res.data.data)
+        state.formParam = res.data.data
+      })
         .catch((err) => {
-            console.log("详情", err);
-          });
-      }
-      const searchTeacherFeeApprovalList = () => {
-        state.tableDataParams.pageNo = 1
-        gettableDataExamine()
-      }
-      const resetSearch = () => {
-        state.userNoOrName = null
-        state.seeDateValue = []
+          console.log("详情", err);
+        });
+    }
+    const searchTeacherFeeApprovalList = () => {
+      state.tableDataParams.pageNo = 1
+      gettableDataExamine()
+    }
+    const resetSearch = () => {
+      state.userNoOrName = null
+      state.seeDateValue = []
+      state.seeBegin = null
+      state.seeEnd = null
+      searchTeacherFeeApprovalList()
+    }
+    const seeDateChange = (e) => {
+      if (e) {
+        state.seeBegin = e[0]
+        state.seeEnd = e[1]
+      } else {
         state.seeBegin = null
         state.seeEnd = null
-        searchTeacherFeeApprovalList()
       }
-      const seeDateChange = (e) => {
-        if(e){
-          state.seeBegin = e[0]
-          state.seeEnd = e[1]
-        }else{
-          state.seeBegin = null
-          state.seeEnd = null
-        }
-      }
-      const tableDataExamine = ref([])
-      const gettableDataExamine = () => {
-        state.examinetableLoading = true
-        queryExpnseByBillId({
-          billId : state.id,
-          pageNo: state.tableDataParams.pageNo,
-          pageSize: state.tableDataParams.pageSize,
-          name: state.userNoOrName,
-          startTime: state.seeBegin,
-          endTime: state.seeEnd
-        }).then((res) => {
-          tableDataExamine.value = res.data.data.records
-          state.tableDataParams.total = Number(res.data.data.total);
-          state.examinetableLoading = false
-        }).catch(err=>{
-          state.examinetableLoading = false
-          message.error(err.data.msg)
-        })
-      };
-      const pagination = computed(() => ({
-        total: state.tableDataParams.total,
-        showSizeChanger: true,
-        showQuickJumper:true,
-        current: state.tableDataParams.pageNo,
+    }
+    const tableDataExamine = ref([])
+    const gettableDataExamine = () => {
+      state.examinetableLoading = true
+      queryExpnseByBillId({
+        billId: state.id,
+        pageNo: state.tableDataParams.pageNo,
         pageSize: state.tableDataParams.pageSize,
-        onChange: paginationChange,
-      }));
-      const paginationChange = (e,pageSize) => {
-        state.tableDataParams.pageNo = e;
-        state.tableDataParams.pageSize = pageSize
-        gettableDataExamine();
-      };
+        name: state.userNoOrName,
+        startTime: state.seeBegin,
+        endTime: state.seeEnd
+      }).then((res) => {
+        tableDataExamine.value = res.data.data.records
+        state.tableDataParams.total = Number(res.data.data.total);
+        state.examinetableLoading = false
+      }).catch(err => {
+        state.examinetableLoading = false
+        message.error(err.data.msg)
+      })
+    };
+    const pagination = computed(() => ({
+      total: state.tableDataParams.total,
+      showSizeChanger: true,
+      showQuickJumper: true,
+      current: state.tableDataParams.pageNo,
+      pageSize: state.tableDataParams.pageSize,
+      onChange: paginationChange,
+    }));
+    const paginationChange = (e, pageSize) => {
+      state.tableDataParams.pageNo = e;
+      state.tableDataParams.pageSize = pageSize
+      gettableDataExamine();
+    };
+
+    //TODO1
+    const deleteModal = (val1 , val2) => {
+
+    }
+
+
+
     const columnsExamineTwo = ref([
       {
         title: '审批层级 ',
@@ -847,7 +852,7 @@
         ellipsis: true,
         align: "center",
         width: 120,
-        customRender: ({text})=>{
+        customRender: ({ text }) => {
           switch (text) {
             case -1:
               return <span>未处理</span>;
@@ -883,254 +888,254 @@
         ellipsis: true,
         align: "center",
         width: 120,
-        customRender: ({text}) => {
-          return text||'-'
+        customRender: ({ text }) => {
+          return text || '-'
         }
       },
     ])
-      //二级页面
+    //二级页面
     const columnsExamine = ref([
       {
-          title: '讲师姓名 ',
-          dataIndex: 'name',
-          key: 'name',
-          ellipsis: true,
-          align: "center",
-          width: 180,
-          customRender: (value) => {
-            return (
-              <div style="user-select:text">
-                {value.record?.name}  /  {value.record?.userNo}
-              </div>
-            );
-          },
+        title: '讲师姓名 ',
+        dataIndex: 'name',
+        key: 'name',
+        ellipsis: true,
+        align: "center",
+        width: 180,
+        customRender: (value) => {
+          return (
+            <div style="user-select:text">
+              { value.record?.name }  /  { value.record?.userNo }
+            </div>
+          );
         },
-        // {
-        //   title: '讲师工号 ',
-        //   dataIndex: 'userNo',
-        //   key: 'userNo',
-        //   ellipsis: true,
-        //   align: "center",
-        //   width: 120,
-        // },
-        {
-          title: '课程名称 ',
-          dataIndex: 'courseName',
-          key: 'courseName',
-          ellipsis: true,
-          align: "center",
-          width: 200,
-          customCell:()=>{return{style:{userSelect: 'text'}}}
-        },
-        {
-          title: '培训发生组织',
-          dataIndex: 'trainOrgName',
-          key: 'trainOrgName',
-          ellipsis: true,
-          align: "center",
-          width: 120,
-          customCell:()=>{return{style:{userSelect: 'text'}}}
-        },
-        
-        {
-          title: '授课时长 ',
-          dataIndex: 'teachingTime',
-          key: 'teachingTime',
-          ellipsis: true,
-          align: "center",
-          width: 120,
-          customRender:(value)=>{
-            return (
-              <div>
-                {(value.record?.teachingTime/60).toFixed(2)}小时
-              </div>
-            )
-          }
-        },
-        {
-          title: '授课时间 ',
-          dataIndex: 'teachingDate',
-          key: 'teachingDate',
-          ellipsis: true,
-          align: "center",
-          width: 120,
-          
-        },
-        {
-          title: '讲师体系',
-          dataIndex: 'tsystemName',
-          key: 'tsystemName',
-          ellipsis: true,
-          align: "center",
-          width: 120,
-        },
-        {
-          title: '讲师级别 ',
-          dataIndex: 'tlevelName',
-          key: 'tlevelName',
-          ellipsis: true,
-          align: "center",
-          width: 120,
-        },
-        {
-          title: '发薪地 ',
-          dataIndex: 'payrollPlace',
-          key: 'payrollPlace',
-          ellipsis: true,
-          align: "center",
-          width: 120,
-          customRender: ({text}) => {
-          return text || '-'
-        }
-        },
-        {
-          title: '基准课酬 ',
-          dataIndex: 'levelPay',
-          key: 'levelPay',
-          ellipsis: true,
-          align: "center",
-          width: 120,
-          customRender: ({text}) => {
-            return text||text==0 ? text + '元' : '-';
-          }
-        },
-        {
-          title: '计划费用 ',
-          dataIndex: 'expense',
-          key: 'expense',
-          ellipsis: true,
-          align: "center",
-          width: 120,
-          customRender: ({text}) => {
-            return text ? text + '元' : '-';
-          }
-        },
-        {
-          title: '参训人数 ',
-          dataIndex: 'studys',
-          key: 'studys',
-          ellipsis: true,
-          align: "center",
-          width: 120,
-          customRender: ({text}) => {
-            return text ? text + '人' : '-';
-          }
-        },
-        {
-          title: '评分 ',
-          dataIndex: 'score',
-          key: 'score',
-          ellipsis: true,
-          align: "center",
-          width: 120,
-          customRender: (value) => {
+      },
+      // {
+      //   title: '讲师工号 ',
+      //   dataIndex: 'userNo',
+      //   key: 'userNo',
+      //   ellipsis: true,
+      //   align: "center",
+      //   width: 120,
+      // },
+      {
+        title: '课程名称 ',
+        dataIndex: 'courseName',
+        key: 'courseName',
+        ellipsis: true,
+        align: "center",
+        width: 200,
+        customCell: () => { return { style: { userSelect: 'text' } } }
+      },
+      {
+        title: '培训发生组织',
+        dataIndex: 'trainOrgName',
+        key: 'trainOrgName',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customCell: () => { return { style: { userSelect: 'text' } } }
+      },
+
+      {
+        title: '授课时长 ',
+        dataIndex: 'teachingTime',
+        key: 'teachingTime',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: (value) => {
           return (
             <div>
-              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(2)+'分' : '-'}
+              { (value.record?.teachingTime / 60).toFixed(2) }小时
             </div>
           )
         }
-        },
-        {
-          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>
-            )
-          }
-        },
-      ])
-      function managerChange(e, l, d, t, orgName) {
+      },
+      {
+        title: '授课时间 ',
+        dataIndex: 'teachingDate',
+        key: 'teachingDate',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+
+      },
+      {
+        title: '讲师体系',
+        dataIndex: 'tsystemName',
+        key: 'tsystemName',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+      },
+      {
+        title: '讲师级别 ',
+        dataIndex: 'tlevelName',
+        key: 'tlevelName',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+      },
+      {
+        title: '发薪地 ',
+        dataIndex: 'payrollPlace',
+        key: 'payrollPlace',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text || '-'
+        }
+      },
+      {
+        title: '基准课酬 ',
+        dataIndex: 'levelPay',
+        key: 'levelPay',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text || text == 0 ? text + '元' : '-';
+        }
+      },
+      {
+        title: '计划费用 ',
+        dataIndex: 'expense',
+        key: 'expense',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text ? text + '元' : '-';
+        }
+      },
+      {
+        title: '参训人数 ',
+        dataIndex: 'studys',
+        key: 'studys',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text ? text + '人' : '-';
+        }
+      },
+      {
+        title: '评分 ',
+        dataIndex: 'score',
+        key: 'score',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              { value.record.score ? Number(value.record.score).toFixed(0) == 0 ? '-' : Number(value.record.score).toFixed(2) + '分' : '-' }
+            </div>
+          )
+        }
+      },
+      {
+        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>
+          )
+        }
+      },
+    ])
+    function managerChange(e, l, d, t, orgName) {
       state.searchParam.teacherNo = d;
       state.searchParam.teacherName = t;
       // state.searchParam.trainorgName=orgName
     }
-      //导出功能
-      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 : ""}`
-        );
-        // this.download('lesson_records/export', {
-        //           ...state.searchParam
-        //       }, `project_${new Date().getTime()}.xlsx` )
-          }
-              //回车
+    //导出功能
+    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 : ""}`
+      );
+      // this.download('lesson_records/export', {
+      //           ...state.searchParam
+      //       }, `project_${new Date().getTime()}.xlsx` )
+    }
+    //回车
     const enterPressHadlerSearch = e => {
-    if (e.keyCode === 13) {
-      searchSubmit()
+      if (e.keyCode === 13) {
+        searchSubmit()
 
-    }
-}
-      return {
-        ...toRefs(state),
-        enterPressHadlerSearch,
-        // searchTimeChange,
-        gettableDataExamine,
-        courseTypeList,
-        managerChange,
-        trainOrglist,
-        trainOrglista,
-        handlemoreid,
-        handleExport,
-        lecturerSystemList,
-        OnTheJobStatusList,
-        AuthenticationStatusList,
-        AccountStatusList,
-        searchSubmit,
-        searchReset,
-        columns,
-        columnsExamine,
-        columnsExamineTwo,
-        tableData,
-        tableDataExamine,
-        seeDateChange,
-        changePagination,
-        addTeacher,
-        cancelTeachingDialog,
-        handleLook,
-        submit,
-        getListData,
-        tabsChange,
-        withdraw,
-        successParams,
-        getExample,
-        goDdit,
-        cancel,
-        handleOperate,
-        closehandleOperate,
-         getTableDate, //list接口数据调用
-        // getStu
-        LecturerSystemLista,
-        TeacherSystem,
-        infoteacherList,
-        getinfoteacher,
-        pagination,
-        paginationChange,
-        searchTeacherFeeApprovalList,
-        resetSearch,
-        paginations,
-        paginationChanges,
       }
-    },
-  };
-  </script>
-<style lang="scss" scoped >
-.example{
+    }
+    return {
+      ...toRefs(state),
+      enterPressHadlerSearch,
+      // searchTimeChange,
+      gettableDataExamine,
+      courseTypeList,
+      managerChange,
+      trainOrglist,
+      trainOrglista,
+      handlemoreid,
+      handleExport,
+      lecturerSystemList,
+      OnTheJobStatusList,
+      AuthenticationStatusList,
+      AccountStatusList,
+      searchSubmit,
+      searchReset,
+      columns,
+      columnsExamine,
+      columnsExamineTwo,
+      tableData,
+      tableDataExamine,
+      seeDateChange,
+      changePagination,
+      addTeacher,
+      cancelTeachingDialog,
+      handleLook,
+      submit,
+      getListData,
+      tabsChange,
+      withdraw,
+      successParams,
+      getExample,
+      goDdit,
+      cancel,
+      handleOperate,
+      closehandleOperate,
+      getTableDate, //list接口数据调用
+      // getStu
+      LecturerSystemLista,
+      TeacherSystem,
+      infoteacherList,
+      getinfoteacher,
+      pagination,
+      paginationChange,
+      searchTeacherFeeApprovalList,
+      resetSearch,
+      paginations,
+      paginationChanges,
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.example {
   width: 100%;
   height: 100%;
   background: rgba(0, 0, 0, 0.45);
@@ -1142,9 +1147,11 @@
   justify-content: center;
   align-items: center;
 }
+
 .select .ant-picker {
   width: 410px !important;
 }
+
 .headers {
   height: 73px;
   border-bottom: 1px solid #e8e8e8;
@@ -1163,26 +1170,27 @@
     // margin-left: 24px;
   }
 }
+
 .addTimeBox {
-        position: relative;
-        display: flex;
-        align-items: center;
+  position: relative;
+  display: flex;
+  align-items: center;
 
-        .addTime {
-          position: absolute;
-          z-index: 1;
-          margin-left: 10px;
-          color: rgba(0, 0, 0, 0.4);
-        }
+  .addTime {
+    position: absolute;
+    z-index: 1;
+    margin-left: 10px;
+    color: rgba(0, 0, 0, 0.4);
+  }
 
-        .ant-picker {
-          padding-left: 85px;
-        }
+  .ant-picker {
+    padding-left: 85px;
+  }
 
-      ::v-deep  .ant-picker-range .ant-picker-active-bar {
-          margin-left: 85px  !important;
-        }
-      }
+  ::v-deep .ant-picker-range .ant-picker-active-bar {
+    margin-left: 85px !important;
+  }
+}
 
 //导出按钮icon
 .daochu {
@@ -1467,9 +1475,7 @@
 }
 
 //抽屉功能
-.drawaer
-
-// /* 改变所有 a-tree-select 输入框的高度 */
+.drawaer // /* 改变所有 a-tree-select 输入框的高度 */
 //   ::v-deep  .ant-select:not(.ant-select-customize-input) .ant-select-selector{
 //   height: 40px;
 //   line-height: 40px;
@@ -1477,31 +1483,36 @@
 
 //   /* 确保文字垂直居中 */
 // }
-::v-deep .ant-select-single:not(.ant-select-customize-input) .ant-select-selector{
+::v-deep .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
   height: 40px !important;
   line-height: 40px;
   border-radius: 8px
 }
+
 // 抽屉内样式
-.draitem{
- width: 100%;
-  height: 40px !important; 
+.draitem {
+  width: 100%;
+  height: 40px !important;
   border-radius: 8px;
   line-height: 40px;
 }
-.drabtn{
-  height:40px;
-  width:80px;
-  border-radius:8px;
-  margin-right:20px
+
+.drabtn {
+  height: 40px;
+  width: 80px;
+  border-radius: 8px;
+  margin-right: 20px
 }
-::v-deep  .ant-select:not(.ant-select-customize-input) .ant-select-selector{
-  border-radius:8px;
-  height:40px;
+
+::v-deep .ant-select:not(.ant-select-customize-input) .ant-select-selector {
+  border-radius: 8px;
+  height: 40px;
 }
-.ant-col-12{
-  height:90px;
+
+.ant-col-12 {
+  height: 90px;
 }
+
 ::v-deep .ant-select-selection-overflow-item {
   margin-top: -2px;
 }
@@ -1509,22 +1520,27 @@
 ::v-deep .ant-select-multiple .ant-select-selection-item {
   height: 34px
 }
+
 .tableBox {
-padding-bottom: 20px;
-margin: 20px 38px 30px;
-::v-deep .ant-select-dropdown{
- display: inline-block;
-}
-::v-deep .ant-select-selection-item{
-margin-left: 3px;
-}
-::v-deep .ant-pagination-options-size-changer.ant-select{
-width: 84px;
-}
-.pa {
-width: 100%;
-display: flex;
-justify-content: right;
-}
+  padding-bottom: 20px;
+  margin: 20px 38px 30px;
+
+  ::v-deep .ant-select-dropdown {
+    display: inline-block;
+  }
+
+  ::v-deep .ant-select-selection-item {
+    margin-left: 3px;
+  }
+
+  ::v-deep .ant-pagination-options-size-changer.ant-select {
+    width: 84px;
+  }
+
+  .pa {
+    width: 100%;
+    display: flex;
+    justify-content: right;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index 04c827d8..cd52df27 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -1,26 +1,26 @@
 <!-- 讲师费管理 -->
 <template>
   <div class="LecturerFeeManagement">
-    <div style="margin: 20px;margin-top:0;" >
-    <a-tabs v-model:activeKey="activeKey" >
-  <a-tab-pane key="1" tab="讲师费管理">
-<LecturerFee />
-     </a-tab-pane>
-     <!-- v-if="lecturerAdmin('lecturer-admin')" -->
-  <a-tab-pane key="2" tab="审批中心">
-  <LecturerApproval/>
-     </a-tab-pane>
-</a-tabs>
+    <div style="margin: 20px;margin-top:0;">
+      <a-tabs v-model:activeKey="activeKey">
+        <a-tab-pane key="1" tab="讲师费管理">
+          <LecturerFee />
+        </a-tab-pane>
+        <!-- v-if="lecturerAdmin('lecturer-admin')" -->
+        <a-tab-pane key="2" tab="审批中心">
+          <LecturerApproval />
+        </a-tab-pane>
+      </a-tabs>
+    </div>
   </div>
-        </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch,onMounted,computed } from "vue";
-import LecturerFee  from "../lecturer/LecturerFee.vue"
+import { reactive, toRefs, ref, watch, onMounted, computed } from "vue";
+import LecturerFee from "../lecturer/LecturerFee.vue"
 import LecturerApproval from "../lecturer/LecturerApproval.vue"
 import { useRoute } from "vue-router";
-import {useStore} from 'vuex'
- export default { 
+import { useStore } from 'vuex'
+export default {
   name: "LecturerFeeManagement",
   components: {
     LecturerFee,
@@ -28,36 +28,37 @@ import {useStore} from 'vuex'
   },
   setup() {
     const store = useStore();
-    const userInfo = computed(()=> store.state.userInfo)
+    const userInfo = computed(() => store.state.userInfo)
     const route = useRoute();
     const state = reactive({
-      activeKey:'1',
+      activeKey: '1',
     })
-    const lecturerAdmin = (admin)=>{
-      const roleCode = userInfo.value.roleList.map((item)=>item.roleCode)
-      if (admin){
+    const lecturerAdmin = (admin) => {
+      const roleCode = userInfo.value.roleList.map((item) => item.roleCode)
+      if (admin) {
         return roleCode.some(t => t == admin)
       }
     }
     watch(
     )
     onMounted(() => {
-      if(route.query.activeKey){
+      if (route.query.activeKey) {
         state.activeKey = '2'
       }
     })
-   return {
-      ...toRefs(state), 
+    return {
+      ...toRefs(state),
       lecturerAdmin,
     }
   },
 };
 </script>
 <style lang="scss" scoped>
-::v-deep .ant-tabs-tab{
+::v-deep .ant-tabs-tab {
   font-weight: 600;
 }
-  .LecturerFeeManagement {
+
+.LecturerFeeManagement {
   width: 100%;
   height: 100%;
   display: flex;

From 42bb33e152492619a9ffff32f0f5fe7193dee76a Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 17 Feb 2025 11:05:19 +0800
Subject: [PATCH 043/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=AE=A1=E6=89=B9=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index a452e74b..bb00c99c 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -87,7 +87,7 @@
                   @click="() => handleLook(record, String(record.courseform))">查看</a-button>
                 <!-- <a-button  type="link" @click="() => handleOperate(record, String(record.courseform))">审批</a-button> -->
                 <!-- TODO1 -->
-                <a-button v-if="record.status = 1 || record.status != 4" type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
+                <a-button v-if="record.status == 1 || record.status == 4" type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
                 <!-- <a-button v-if="record.status == 4" type="link" @click="submit(record)">提交</a-button> -->
                 <a-button v-if="record.status == 2 && false" type="link" @click="withdraw(record)">撤回</a-button>
               </a-space>

From 207c2b8df2612b7ebdae14837df7a67ec7043a85 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 17 Feb 2025 11:10:16 +0800
Subject: [PATCH 044/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=AE=A1=E6=89=B9=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=20Log=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index bb00c99c..91931848 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -822,8 +822,9 @@ export default {
     };
 
     //TODO1
-    const deleteModal = (val1 , val2) => {
-
+    const deleteModal = (record , courseform) => {
+      console.log("deleteModal gx record",record)
+      console.log("courseform gx record",record)
     }
 
 
@@ -1130,6 +1131,7 @@ export default {
       resetSearch,
       paginations,
       paginationChanges,
+      deleteModal
     }
   },
 };

From abe02552c3d5933ca2f0db03eedaab55e54ab9a1 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 17 Feb 2025 15:34:52 +0800
Subject: [PATCH 045/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=AE=A1=E6=89=B9=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/lecturerFeeManagement.js        |  4 +++-
 src/views/lecturer/LecturerApproval.vue | 13 ++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/api/lecturerFeeManagement.js b/src/api/lecturerFeeManagement.js
index f5986576..cb0f5c2a 100644
--- a/src/api/lecturerFeeManagement.js
+++ b/src/api/lecturerFeeManagement.js
@@ -13,7 +13,7 @@ export const addTeacherFee= (obj) => http.post('/admin/teacherExpense/addTeacher
 export const deleteInTeacher= (obj) => http.post(`/admin/teacher/delByIdr?id=${obj}`)
 //修改讲师费信息
 export const updateTeacherFee= (obj) => http.post('/admin/teacherExpense/editTeacherExpense',obj)
-//修改讲师费状态提交
+//修改讲师费状态提交/admin/expenseBill
 export const updateStatusSubmit= (obj) => http.post('/admin/teacherExpense/confirm',obj)
 //修改讲师费状态撤回
 export const approveTeacherFee= (obj) => http.post('/admin/teacherExpense/withdraw',obj)
@@ -57,5 +57,7 @@ export const CreateSummary= () => http.post('/admin/expenseBill/CreateSummary')
 export const queryExpnseByBillId= (obj) => http.get('/admin/expenseBill/queryExpnseByBillId',{params:obj})
 //
 export const CreateSummaryAgain= (id) => http.post(`/admin/expenseBill/createSummaryAgain?billId=${id}`)
+//删除 费用审批删除
+export const expenseBillDelById = (id)=>http.post(`/admin/expenseBill/delById?id=${id}`)
 //
 export const submitApproval= (obj) => http.post('/admin/expenseBill/submitApproval',obj)
\ No newline at end of file
diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 91931848..b95b0eb5 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -245,7 +245,7 @@ import {
   DownloadOutlined
 } from '@ant-design/icons-vue';
 import ProjectManager from "@/components/project/ProjectManagerNew";
-import { expenseBillList, queryById, queryExpnseByBillId, updateTeacherFee, updateStatusSubmit, approveTeacherFee, getTrainOrg, isConfirm } from "../../api/lecturerFeeManagement";
+import { expenseBillList, queryById, queryExpnseByBillId, updateTeacherFee, updateStatusSubmit, approveTeacherFee, getTrainOrg, isConfirm , expenseBillDelById} from "../../api/lecturerFeeManagement";
 import { getTeacherSystemList, getApprovalResultByBusinessIdList } from "../../api/Lecturer";
 import { queryTrainOrgPor, } from "../../api/organization";
 // lecturerFeeManagement
@@ -823,8 +823,15 @@ export default {
 
     //TODO1
     const deleteModal = (record , courseform) => {
-      console.log("deleteModal gx record",record)
-      console.log("courseform gx record",record)
+      console.log("deleteModal gx record".record.id)
+      expenseBillDelById(record.id).then(res=>{
+        if (res.data.code == 200) {
+          console.log("expenseBillDelById res.data.code",res.data.code)
+          message.success('删除成功')
+          getTableDate();
+        }
+      })
+
     }
 
 

From ed56a1f0b9d31091c7f0bfa3589efcf43b526365 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 17 Feb 2025 15:47:00 +0800
Subject: [PATCH 046/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=AE=A1=E6=89=B9=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index b95b0eb5..26c76a8f 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -823,7 +823,7 @@ export default {
 
     //TODO1
     const deleteModal = (record , courseform) => {
-      console.log("deleteModal gx record".record.id)
+      console.log("deleteModal gx record".record)
       expenseBillDelById(record.id).then(res=>{
         if (res.data.code == 200) {
           console.log("expenseBillDelById res.data.code",res.data.code)

From a0e60925ad26400288bd255f91faf31b07460be6 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 17 Feb 2025 15:58:52 +0800
Subject: [PATCH 047/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=AE=A1=E6=89=B9=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 26c76a8f..6902dbbb 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -822,13 +822,22 @@ export default {
     };
 
     //TODO1
-    const deleteModal = (record , courseform) => {
-      console.log("deleteModal gx record".record)
-      expenseBillDelById(record.id).then(res=>{
-        if (res.data.code == 200) {
-          console.log("expenseBillDelById res.data.code",res.data.code)
-          message.success('删除成功')
-          getTableDate();
+    const deleteModal = (record) => {
+      dialog({
+        content: '是否确认进行删除?',
+        ok: () => {
+          expenseBillDelById(record.id).then(res => {
+            if (typeof (res.data.data) != 'object') {
+              message.success('删除成功')
+              message.error(res.data.data)
+              return
+            }
+            message.success("删除成功");
+            searchSubmit()
+          }).catch(err => {
+            message.destroy()
+            message.error(err.data.msg)
+          })
         }
       })
 

From 5eaa3d9319894c7b23fee46a330bdbf28547db38 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 17 Feb 2025 18:33:59 +0800
Subject: [PATCH 048/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=AE=A1=E6=89=B9=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue           | 10 +++++++++-
 src/views/lecturer/LecturerFeeManagement.vue |  8 +++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index ce1a30de..f04c4c7a 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -550,7 +550,7 @@
   <BatchLecturer @selectedRowKeys="selectedRowKey" v-model:visible="allFeedialog" :name="'批量审批'" />
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch, onMounted ,computed} from "vue";
+import { reactive, toRefs, ref, watch, onMounted , computed ,defineProps} from "vue";
 import { message } from "ant-design-vue";
 import dayjs from "dayjs";
 import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
@@ -590,6 +590,13 @@ export default {
     OrgClass,
   },
   setup() {
+
+    const props = defineProps({
+      activeKeyFn: {
+        type: Function,
+      }
+    })
+
     const formRef = ref();
     const state = reactive({
       example: false,
@@ -1597,6 +1604,7 @@ export default {
     }
     const getexample = (val) => {
       console.log("getexample gx val", val);
+      props.activeKeyFn();
       state.example = val
     }
     const selectedRowKey = (val) => {
diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index cd52df27..02250a33 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -4,7 +4,7 @@
     <div style="margin: 20px;margin-top:0;">
       <a-tabs v-model:activeKey="activeKey">
         <a-tab-pane key="1" tab="讲师费管理">
-          <LecturerFee />
+          <LecturerFee :activeKeyFn="activeKeyFn"/>
         </a-tab-pane>
         <!-- v-if="lecturerAdmin('lecturer-admin')" -->
         <a-tab-pane key="2" tab="审批中心">
@@ -46,9 +46,15 @@ export default {
         state.activeKey = '2'
       }
     })
+
+    const activeKeyFn = () => {
+      state.activeKey = '2'
+    }
+
     return {
       ...toRefs(state),
       lecturerAdmin,
+      activeKeyFn
     }
   },
 };

From 337d39381d0dc7054dfb768bcc5b84380f008432 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 17 Feb 2025 18:50:37 +0800
Subject: [PATCH 049/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=AE=A1=E6=89=B9=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index f04c4c7a..cd8a5596 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -577,6 +577,10 @@ import OrgClass from "@/components/project/OrgClass";
 import { checkMenu } from '@/utils/utils'
 export default {
   name: "LecturerFee",
+  props: {
+    activeKeyFn: Function,
+    default: null,
+  },
   components: {
     DownOutlined, //图标--展开
     UpOutlined,//图标--收起
@@ -589,14 +593,7 @@ export default {
     BatchLecturer,
     OrgClass,
   },
-  setup() {
-
-    const props = defineProps({
-      activeKeyFn: {
-        type: Function,
-      }
-    })
-
+  setup(props) {
     const formRef = ref();
     const state = reactive({
       example: false,

From 035c01d5b07b8d922f34d7e2798a5c30953d9a0a Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 17 Feb 2025 19:38:39 +0800
Subject: [PATCH 050/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=AE=A1=E6=89=B9=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFeeManagement.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index 02250a33..7b857f2b 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -8,7 +8,7 @@
         </a-tab-pane>
         <!-- v-if="lecturerAdmin('lecturer-admin')" -->
         <a-tab-pane key="2" tab="审批中心">
-          <LecturerApproval />
+          <LecturerApproval ref="lecturerApproval"/>
         </a-tab-pane>
       </a-tabs>
     </div>
@@ -48,7 +48,11 @@ export default {
     })
 
     const activeKeyFn = () => {
+      const lecturerApproval = ref(null);
+      console.log("activeKeyFn lecturerApproval",lecturerApproval)
       state.activeKey = '2'
+      lecturerApproval.getTableDate();
+      
     }
 
     return {

From 8f3f2a86ded1ad2e5c49921d30ac18adeb6d242d Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 17 Feb 2025 19:44:23 +0800
Subject: [PATCH 051/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFeeManagement.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index 7b857f2b..7a4496cc 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -51,7 +51,7 @@ export default {
       const lecturerApproval = ref(null);
       console.log("activeKeyFn lecturerApproval",lecturerApproval)
       state.activeKey = '2'
-      lecturerApproval.getTableDate();
+      lecturerApproval.value.getTableDate();
       
     }
 

From f7160305625fa9045798b195247a3a7411a0bfe1 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 17 Feb 2025 20:16:49 +0800
Subject: [PATCH 052/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 6902dbbb..4e802b31 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -232,7 +232,7 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch, computed, onMounted } from "vue";
+import { reactive, toRefs, ref, watch, computed, onMounted ,defineExpose} from "vue";
 import { useRouter } from "vue-router";
 import { message } from "ant-design-vue";
 import dayjs from "dayjs";
@@ -264,6 +264,9 @@ export default {
     LecturerAppEdit,
   },
   setup(props, emit) {
+
+    defineExpose({ getTableDate })
+
     watch(() => props.key, (val) => {
       console.log(val, 'valllllll')
     })

From bcc9f683466f6f3b1fdd13e0b5bc2f1f1e362131 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 17 Feb 2025 20:20:51 +0800
Subject: [PATCH 053/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFeeManagement.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index 7a4496cc..60586a6f 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -48,10 +48,9 @@ export default {
     })
 
     const activeKeyFn = () => {
-      const lecturerApproval = ref(null);
-      console.log("activeKeyFn lecturerApproval",lecturerApproval)
       state.activeKey = '2'
-      lecturerApproval.value.getTableDate();
+      //刷新页面数据
+      location.reload();
       
     }
 

From 741e046e7ecdfeae8a16e2a5911eda56583545da Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 17 Feb 2025 20:23:35 +0800
Subject: [PATCH 054/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFeeManagement.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index 60586a6f..e81f932b 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -50,8 +50,8 @@ export default {
     const activeKeyFn = () => {
       state.activeKey = '2'
       //刷新页面数据
-      location.reload();
-      
+      const lecturerApproval = ref(null);
+      console.log("activeKeyFn lecturerApproval",lecturerApproval.value)
     }
 
     return {

From 51c15ce782cfef2e05219a4389fb57c0bebf4626 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 08:32:03 +0800
Subject: [PATCH 055/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFeeManagement.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index e81f932b..712be118 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -50,7 +50,7 @@ export default {
     const activeKeyFn = () => {
       state.activeKey = '2'
       //刷新页面数据
-      const lecturerApproval = ref(null);
+      const lecturerApproval = ref();
       console.log("activeKeyFn lecturerApproval",lecturerApproval.value)
     }
 

From 0488c75a132a6b95fa7c87735c58f076f22b4873 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 08:39:12 +0800
Subject: [PATCH 056/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 4e802b31..7fa3f0ba 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -264,9 +264,6 @@ export default {
     LecturerAppEdit,
   },
   setup(props, emit) {
-
-    defineExpose({ getTableDate })
-
     watch(() => props.key, (val) => {
       console.log(val, 'valllllll')
     })

From 1ffa84e538408859bb273be44fb524522dc6b358 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 08:46:41 +0800
Subject: [PATCH 057/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFeeManagement.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index 712be118..e7d23348 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -30,6 +30,7 @@ export default {
     const store = useStore();
     const userInfo = computed(() => store.state.userInfo)
     const route = useRoute();
+    const lecturerApproval = ref(null);
     const state = reactive({
       activeKey: '1',
     })
@@ -48,10 +49,11 @@ export default {
     })
 
     const activeKeyFn = () => {
-      state.activeKey = '2'
-      //刷新页面数据
-      const lecturerApproval = ref();
       console.log("activeKeyFn lecturerApproval",lecturerApproval.value)
+      state.activeKey = '2'
+      //刷新页面数据getTableDate()
+      lecturerApproval.value.getTableDate()
+ 
     }
 
     return {

From 37195a50452facc2fe6c2f36862abb26f1b2ef2b Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 09:01:15 +0800
Subject: [PATCH 058/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFeeManagement.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index e7d23348..68f98865 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -30,7 +30,7 @@ export default {
     const store = useStore();
     const userInfo = computed(() => store.state.userInfo)
     const route = useRoute();
-    const lecturerApproval = ref(null);
+    const lecturerApproval = ref();
     const state = reactive({
       activeKey: '1',
     })

From 100a31d6659e5dc80a2118b0d6c68676286b2438 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 09:02:46 +0800
Subject: [PATCH 059/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFeeManagement.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index 68f98865..2c0aaa93 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -49,10 +49,10 @@ export default {
     })
 
     const activeKeyFn = () => {
-      console.log("activeKeyFn lecturerApproval",lecturerApproval.value)
+      console.log("activeKeyFn lecturerApproval",lecturerApproval)
       state.activeKey = '2'
       //刷新页面数据getTableDate()
-      lecturerApproval.value.getTableDate()
+      lecturerApproval.getTableDate()
  
     }
 

From edf0e099ba37861a8ef65213edc53a3bdd94d487 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 09:10:11 +0800
Subject: [PATCH 060/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ConfirmLecturer.vue   | 5 -----
 src/views/lecturer/LecturerApproval.vue      | 5 +++++
 src/views/lecturer/LecturerFeeManagement.vue | 7 +------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index cc0c4628..1bfaf3cd 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -173,7 +173,6 @@ const expenseList = ref([])
 const searchList = ref([])
 const timesList = ref([])
 const clickItem = (item,i) => {
-  console.log("clickItem gx item",item,i);
   indexList.value = i
   resetData(i,false)
 }
@@ -197,8 +196,6 @@ watch(()=>props.visible,(val)=>{
     ).then(res=>{
       if(res.data.code === 200){
         forData.value = res.data.data;
-        console.log("getListByAffiliation gx forData.value ",forData.value)
-        console.log("getListByAffiliation gx forData.value value",forData.value)
         //todo1 , 只有一个处理 初始化 处理数据 ，进行 激活处理
         if(forData.value.length == 1){
             activeList.value.push(0);
@@ -472,8 +469,6 @@ const columns = [
 const closeDrawer = () => emit("update:visible", false);
 const activeList = ref([])
 const setList = (item) => {
-  console.log("setList gx item",item)
-  console.log("setList gx activeList",activeList)
   const index = activeList.value.findIndex(listItem => listItem === item);
   if (index > -1) {
     activeList.value.splice(index, 1);
diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 7fa3f0ba..2dbe9381 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -267,6 +267,11 @@ export default {
     watch(() => props.key, (val) => {
       console.log(val, 'valllllll')
     })
+
+    watch(() => props.activeKey, (activeKey) => {
+      console.log(activeKey, 'activeKey props')
+    })
+
     onMounted(() => {
       // const search = sessionStorage.getItem('searchApprlval')
       // console.log(search,'search')
diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index 2c0aaa93..4e291ede 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -8,7 +8,7 @@
         </a-tab-pane>
         <!-- v-if="lecturerAdmin('lecturer-admin')" -->
         <a-tab-pane key="2" tab="审批中心">
-          <LecturerApproval ref="lecturerApproval"/>
+          <LecturerApproval :activeKey="state.activeKey" ref="lecturerApproval"/>
         </a-tab-pane>
       </a-tabs>
     </div>
@@ -30,7 +30,6 @@ export default {
     const store = useStore();
     const userInfo = computed(() => store.state.userInfo)
     const route = useRoute();
-    const lecturerApproval = ref();
     const state = reactive({
       activeKey: '1',
     })
@@ -49,11 +48,7 @@ export default {
     })
 
     const activeKeyFn = () => {
-      console.log("activeKeyFn lecturerApproval",lecturerApproval)
       state.activeKey = '2'
-      //刷新页面数据getTableDate()
-      lecturerApproval.getTableDate()
- 
     }
 
     return {

From 55b5db2b15096a72ca0668dd9dcb056956d3b573 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 09:16:02 +0800
Subject: [PATCH 061/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFeeManagement.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index 4e291ede..eb5378ab 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -8,7 +8,7 @@
         </a-tab-pane>
         <!-- v-if="lecturerAdmin('lecturer-admin')" -->
         <a-tab-pane key="2" tab="审批中心">
-          <LecturerApproval :activeKey="state.activeKey" ref="lecturerApproval"/>
+          <LecturerApproval :activeKey="activeKey" ref="lecturerApproval"/>
         </a-tab-pane>
       </a-tabs>
     </div>

From dc99b5b81ec860cbc3e6d6ff860502923d483d16 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 09:19:26 +0800
Subject: [PATCH 062/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 2dbe9381..84140f61 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -263,6 +263,10 @@ export default {
     ProjectManager,
     LecturerAppEdit,
   },
+  props: {
+    activeKey: String,
+    default: null,
+  },
   setup(props, emit) {
     watch(() => props.key, (val) => {
       console.log(val, 'valllllll')

From 375586eb3472471b328afd5ffaa0444024e747bc Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 09:22:21 +0800
Subject: [PATCH 063/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 84140f61..ad766219 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -264,7 +264,7 @@ export default {
     LecturerAppEdit,
   },
   props: {
-    activeKey: String,
+    activeKeyProps: String,
     default: null,
   },
   setup(props, emit) {
@@ -272,7 +272,7 @@ export default {
       console.log(val, 'valllllll')
     })
 
-    watch(() => props.activeKey, (activeKey) => {
+    watch(() => props.activeKeyProps, (activeKey) => {
       console.log(activeKey, 'activeKey props')
     })
 

From 038cae4f8288fc5642276d1b05fd3acc151127c3 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 09:58:03 +0800
Subject: [PATCH 064/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFeeManagement.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index eb5378ab..f83f96e9 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -8,7 +8,7 @@
         </a-tab-pane>
         <!-- v-if="lecturerAdmin('lecturer-admin')" -->
         <a-tab-pane key="2" tab="审批中心">
-          <LecturerApproval :activeKey="activeKey" ref="lecturerApproval"/>
+          <LecturerApproval :activeKeyProps="activeKey" ref="lecturerApproval"/>
         </a-tab-pane>
       </a-tabs>
     </div>

From 1caeeab582c5b182057e81ad82d8027c6e093da5 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 09:58:17 +0800
Subject: [PATCH 065/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index ad766219..1ef948fa 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -263,17 +263,17 @@ export default {
     ProjectManager,
     LecturerAppEdit,
   },
-  props: {
-    activeKeyProps: String,
-    default: null,
-  },
-  setup(props, emit) {
-    watch(() => props.key, (val) => {
-      console.log(val, 'valllllll')
+
+  setup() {
+    const props = defineProps({
+      activeKeyProps: {
+        type: String,
+        default: false,
+      },
     })
 
-    watch(() => props.activeKeyProps, (activeKey) => {
-      console.log(activeKey, 'activeKey props')
+    watch(()=>props.activeKeyProps, (activeKeyPropsVal) => {
+        console.log("activeKeyPropsVal",activeKeyPropsVal)
     })
 
     onMounted(() => {

From f2f38ee9cd3083692ce7cc63e568bdd7bc0d6622 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 10:00:48 +0800
Subject: [PATCH 066/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 1ef948fa..e8298ee1 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -232,7 +232,7 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch, computed, onMounted ,defineExpose} from "vue";
+import { reactive, toRefs, ref, watch, computed, onMounted ,defineProps} from "vue";
 import { useRouter } from "vue-router";
 import { message } from "ant-design-vue";
 import dayjs from "dayjs";

From f6531d34e0e382e6738e930051e6332eda77126a Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 10:18:35 +0800
Subject: [PATCH 067/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue      | 11 +----------
 src/views/lecturer/LecturerFeeManagement.vue |  7 ++++---
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index e8298ee1..7cc6e121 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -232,7 +232,7 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch, computed, onMounted ,defineProps} from "vue";
+import { reactive, toRefs, ref, watch, computed, onMounted} from "vue";
 import { useRouter } from "vue-router";
 import { message } from "ant-design-vue";
 import dayjs from "dayjs";
@@ -265,16 +265,7 @@ export default {
   },
 
   setup() {
-    const props = defineProps({
-      activeKeyProps: {
-        type: String,
-        default: false,
-      },
-    })
 
-    watch(()=>props.activeKeyProps, (activeKeyPropsVal) => {
-        console.log("activeKeyPropsVal",activeKeyPropsVal)
-    })
 
     onMounted(() => {
       // const search = sessionStorage.getItem('searchApprlval')
diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index f83f96e9..9931465d 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -8,7 +8,7 @@
         </a-tab-pane>
         <!-- v-if="lecturerAdmin('lecturer-admin')" -->
         <a-tab-pane key="2" tab="审批中心">
-          <LecturerApproval :activeKeyProps="activeKey" ref="lecturerApproval"/>
+          <LecturerApproval ref="lecturerApproval"/>
         </a-tab-pane>
       </a-tabs>
     </div>
@@ -39,8 +39,9 @@ export default {
         return roleCode.some(t => t == admin)
       }
     }
-    watch(
-    )
+    watch(()=>state.activeKey,(valActiveKey)=>{
+      console.log("valActiveKey",valActiveKey)
+    })
     onMounted(() => {
       if (route.query.activeKey) {
         state.activeKey = '2'

From 40f12c9fd24839d6a6ab3c5e13d5664a027b2307 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 10:25:41 +0800
Subject: [PATCH 068/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue      | 6 ++++--
 src/views/lecturer/LecturerFee.vue           | 3 +--
 src/views/lecturer/LecturerFeeManagement.vue | 6 ++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 7cc6e121..b8b7b87c 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -263,11 +263,13 @@ export default {
     ProjectManager,
     LecturerAppEdit,
   },
-
+  props: {
+    activeKeyProps: String,
+  },
   setup() {
 
-
     onMounted(() => {
+      console.log("activeKeyProps",activeKeyProps)
       // const search = sessionStorage.getItem('searchApprlval')
       // console.log(search,'search')
       // if(search){
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index cd8a5596..36818e1c 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -578,8 +578,7 @@ import { checkMenu } from '@/utils/utils'
 export default {
   name: "LecturerFee",
   props: {
-    activeKeyFn: Function,
-    default: null,
+    activeKeyFn: Function
   },
   components: {
     DownOutlined, //图标--展开
diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index 9931465d..4807f58a 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -8,7 +8,7 @@
         </a-tab-pane>
         <!-- v-if="lecturerAdmin('lecturer-admin')" -->
         <a-tab-pane key="2" tab="审批中心">
-          <LecturerApproval ref="lecturerApproval"/>
+          <LecturerApproval :activeKeyProps="activeKey"/>
         </a-tab-pane>
       </a-tabs>
     </div>
@@ -39,9 +39,7 @@ export default {
         return roleCode.some(t => t == admin)
       }
     }
-    watch(()=>state.activeKey,(valActiveKey)=>{
-      console.log("valActiveKey",valActiveKey)
-    })
+
     onMounted(() => {
       if (route.query.activeKey) {
         state.activeKey = '2'

From 308cbf4b7c4111e9ec945d428611abaf0dbb4431 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 10:29:54 +0800
Subject: [PATCH 069/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFeeManagement.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index 4807f58a..48129f60 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -33,6 +33,7 @@ export default {
     const state = reactive({
       activeKey: '1',
     })
+    //
     const lecturerAdmin = (admin) => {
       const roleCode = userInfo.value.roleList.map((item) => item.roleCode)
       if (admin) {

From c6530ed291d6a8a9c0fa64be182c3a12ed875f6f Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 10:32:33 +0800
Subject: [PATCH 070/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index b8b7b87c..2b859a67 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -266,10 +266,10 @@ export default {
   props: {
     activeKeyProps: String,
   },
-  setup() {
+  setup(props) {
 
     onMounted(() => {
-      console.log("activeKeyProps",activeKeyProps)
+      console.log("props.activeKeyProps",props.activeKeyProps)
       // const search = sessionStorage.getItem('searchApprlval')
       // console.log(search,'search')
       // if(search){

From 22e5192109591d01fd76dbfa162dc5fc7650d9ba Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 10:37:48 +0800
Subject: [PATCH 071/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 2b859a67..5864330f 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -232,7 +232,7 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch, computed, onMounted} from "vue";
+import { reactive, toRefs, ref, watch, computed, onMounted, onUpdated} from "vue";
 import { useRouter } from "vue-router";
 import { message } from "ant-design-vue";
 import dayjs from "dayjs";
@@ -268,6 +268,11 @@ export default {
   },
   setup(props) {
 
+    onUpdated(() => {
+      console.log("props.activeKeyProps",props.activeKeyProps)
+
+    });
+
     onMounted(() => {
       console.log("props.activeKeyProps",props.activeKeyProps)
       // const search = sessionStorage.getItem('searchApprlval')

From 17c06a2c29cc2c3ee6d7fd683be57fe80b336f63 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 10:41:33 +0800
Subject: [PATCH 072/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 5864330f..7ae5cf35 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -270,7 +270,9 @@ export default {
 
     onUpdated(() => {
       console.log("props.activeKeyProps",props.activeKeyProps)
-
+      if(props.activeKeyProps == 2){
+        getTableDate()
+      }
     });
 
     onMounted(() => {

From 7efc169aaf769ca4e2898be51e0e8c12d13a0af0 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 10:51:19 +0800
Subject: [PATCH 073/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 7ae5cf35..12a54fe5 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -232,7 +232,7 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch, computed, onMounted, onUpdated} from "vue";
+import { reactive, toRefs, ref, watch, watchEffect, computed, onMounted, onUpdated} from "vue";
 import { useRouter } from "vue-router";
 import { message } from "ant-design-vue";
 import dayjs from "dayjs";
@@ -268,11 +268,9 @@ export default {
   },
   setup(props) {
 
-    onUpdated(() => {
-      console.log("props.activeKeyProps",props.activeKeyProps)
-      if(props.activeKeyProps == 2){
-        getTableDate()
-      }
+    watchEffect(() => {
+      console.log('Item changed:', props.activeKeyProps);
+      // 在这里你可以根据 props.item 进行一些操作
     });
 
     onMounted(() => {

From 2b0c1fb4e12e89c7c1b039926cfb869aaa7835ac Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 10:56:03 +0800
Subject: [PATCH 074/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 12a54fe5..39605925 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -268,8 +268,13 @@ export default {
   },
   setup(props) {
 
+    let initData = ref(false);
+
     watchEffect(() => {
       console.log('Item changed:', props.activeKeyProps);
+      if(!initData.value && props.activeKeyProps == 2){
+        getTableDate()
+      }
       // 在这里你可以根据 props.item 进行一些操作
     });
 
@@ -282,6 +287,7 @@ export default {
       //   state.searchdate = state.searchParam.searchdate
       // }
       getTableDate()
+      initData.value = true;
     })
     const router = useRouter()
     const state = reactive({

From 24109ab423cb1eb9d36c6f0d0970e6dfa419a5c2 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 10:59:41 +0800
Subject: [PATCH 075/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 39605925..48f774b9 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -270,14 +270,7 @@ export default {
 
     let initData = ref(false);
 
-    watchEffect(() => {
-      console.log('Item changed:', props.activeKeyProps);
-      if(!initData.value && props.activeKeyProps == 2){
-        getTableDate()
-      }
-      // 在这里你可以根据 props.item 进行一些操作
-    });
-
+   
     onMounted(() => {
       console.log("props.activeKeyProps",props.activeKeyProps)
       // const search = sessionStorage.getItem('searchApprlval')
@@ -434,8 +427,7 @@ export default {
       { value: "E10", label: "审核打回", },
       { value: "S20", label: "审核通过", },
     ])
-    watch(
-    )
+  
     //切换筛选
     const handlemoreid = () => {
       if (state.moreid == 1) {
@@ -1111,6 +1103,16 @@ export default {
 
       }
     }
+
+    watchEffect(() => {
+      console.log('Item changed:', props.activeKeyProps);
+      if(!initData.value && props.activeKeyProps == 2){
+        getTableDate()
+      }
+      // 在这里你可以根据 props.item 进行一些操作
+    });
+
+
     return {
       ...toRefs(state),
       enterPressHadlerSearch,

From 8fbb6d991223715ef9e350310a022d1573da46b9 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 11:11:05 +0800
Subject: [PATCH 076/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 48f774b9..76d0a373 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -268,9 +268,7 @@ export default {
   },
   setup(props) {
 
-    let initData = ref(false);
-
-   
+  
     onMounted(() => {
       console.log("props.activeKeyProps",props.activeKeyProps)
       // const search = sessionStorage.getItem('searchApprlval')
@@ -280,7 +278,6 @@ export default {
       //   state.searchdate = state.searchParam.searchdate
       // }
       getTableDate()
-      initData.value = true;
     })
     const router = useRouter()
     const state = reactive({
@@ -825,8 +822,6 @@ export default {
       state.tableDataParams.pageSize = pageSize
       gettableDataExamine();
     };
-
-    //TODO1
     const deleteModal = (record) => {
       dialog({
         content: '是否确认进行删除?',
@@ -1104,9 +1099,10 @@ export default {
       }
     }
 
+    //TODO1
     watchEffect(() => {
       console.log('Item changed:', props.activeKeyProps);
-      if(!initData.value && props.activeKeyProps == 2){
+      if(props.activeKeyProps == 2){
         getTableDate()
       }
       // 在这里你可以根据 props.item 进行一些操作

From 006872ecb767fe8aad74b875c7dea66b83e4a79e Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 11:18:05 +0800
Subject: [PATCH 077/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 76d0a373..7c7726b5 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -568,6 +568,7 @@ export default {
     // }
     //  List接口数据
     const getTableDate = (obj) => {
+      console.log("执行 getTableDate")
       state.tableLoading = true
       let objA = { ...state.searchParam };
       objA.beginTime = state.searchdate ? dayjs(state.searchdate[0]).format("YYYY-MM-DD") : "",
@@ -1103,6 +1104,7 @@ export default {
     watchEffect(() => {
       console.log('Item changed:', props.activeKeyProps);
       if(props.activeKeyProps == 2){
+        state.searchParam.pageNo = 1;
         getTableDate()
       }
       // 在这里你可以根据 props.item 进行一些操作

From 4d46cba25a9d3f7541cd8e91b528faba1d675e5d Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 13:09:23 +0800
Subject: [PATCH 078/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 7c7726b5..a9380039 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -577,6 +577,8 @@ export default {
       expenseBillList(objA)
         .then((res) => {
           tableData.value = res.data.data.records
+    const getTableDate = (obj) => {
+          console.log("getTableDate list 数据",tableData.value )
           state.tableDataTotal = Number(res.data.data.total);
           state.tableLoading = false
         }).catch(err => {

From 56456da86592df3de4b7d2dd2ad6ef0315f266dd Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 13:12:54 +0800
Subject: [PATCH 079/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index a9380039..cc1962ac 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -267,8 +267,6 @@ export default {
     activeKeyProps: String,
   },
   setup(props) {
-
-  
     onMounted(() => {
       console.log("props.activeKeyProps",props.activeKeyProps)
       // const search = sessionStorage.getItem('searchApprlval')
@@ -577,8 +575,7 @@ export default {
       expenseBillList(objA)
         .then((res) => {
           tableData.value = res.data.data.records
-    const getTableDate = (obj) => {
-          console.log("getTableDate list 数据",tableData.value )
+          console.log("getTableDate gx tableData: ",tableData.value)
           state.tableDataTotal = Number(res.data.data.total);
           state.tableLoading = false
         }).catch(err => {
@@ -825,6 +822,8 @@ export default {
       state.tableDataParams.pageSize = pageSize
       gettableDataExamine();
     };
+
+    //TODO1
     const deleteModal = (record) => {
       dialog({
         content: '是否确认进行删除?',

From 1f777059dc9f23db494dea29f1eb7caf4a17e0e7 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 13:36:26 +0800
Subject: [PATCH 080/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 36818e1c..042c5aba 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -1105,7 +1105,6 @@ export default {
     ])
     // 搜索
     const searchSubmit = () => {
-      console.log("searchSubmit gx")
       state.searchParam.pageNo = 1
       getTableDate();
     };
@@ -1145,10 +1144,8 @@ export default {
       let objA = { ...state.searchParam };
       objA.beginTime = state.searchdate ? dayjs(state.searchdate[0]).format("YYYY-MM-DD") : "",
         objA.endTime = state.searchdate ? dayjs(state.searchdate[1]).format("YYYY-MM-DD") : "",
-        console.log("getTableDate gx objA", objA);
       getTeacherFeeList(objA)
         .then((res) => {
-          console.log("getTeacherFeeList gx objA", objA);
           tableData.value = res.data.data.records
           state.tableDataTotal = Number(res.data.data.total);
           state.tableLoading = false
@@ -1594,14 +1591,12 @@ export default {
       state.allFeedialog = true
     }
     const visibleAll = (val) => {
-      console.log("visibleAll gx val", val)
       state.allFeedialog = val
       searchSubmit()
     }
     const getexample = (val) => {
-      console.log("getexample gx val", val);
-      props.activeKeyFn();
       state.example = val
+      props.activeKeyFn();
     }
     const selectedRowKey = (val) => {
       state.selectsIds = val?.join(',');

From ad899a21c8a87e92a793b4994a5bf9221c4d2b00 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 14:04:21 +0800
Subject: [PATCH 081/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerApproval.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index cc1962ac..01bdd8c6 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -575,7 +575,6 @@ export default {
       expenseBillList(objA)
         .then((res) => {
           tableData.value = res.data.data.records
-          console.log("getTableDate gx tableData: ",tableData.value)
           state.tableDataTotal = Number(res.data.data.total);
           state.tableLoading = false
         }).catch(err => {

From 08245a8bba11aea82ccb586e7171de185dfe9be5 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 14:04:40 +0800
Subject: [PATCH 082/157] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E6=94=BE=E7=94=9F?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index ba014ec6..81f34a01 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -50,10 +50,19 @@
           <!-- <OrgClass @enter="searchSubmit()" v-model:value="searchParam.orgId" :placeholder="'请选择讲师组织'"
           style="width: 235px" 
           ></OrgClass> -->
-          <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.trainOrgId" placeholder="请选择培训发生组织" allowClear
-              :options="orgListSearch" 
-              v-on:keydown.enter="enterPressHadlerSearch">
-            </a-select>
+          <!-- TODO -->
+          <a-select 
+            style="width: 235px ;
+            margin-bottom:20px" 
+            v-model:value="searchParam.trainOrgId" 
+            placeholder="请选择培训发生组织" 
+            allowClear
+            :filter-option="false"
+            :options="filterOrgListSearch"
+            @search="handleOrgSearch"
+            @change="changeOrg"
+            v-on:keydown.enter="enterPressHadlerSearch">
+          </a-select>
         </a-form-item>
         <a-form-item class="select" v-if="moreid == 2">
           <a-select style="width: 200px;margin-bottom:20px" placeholder="是否生成讲师费" v-model:value="searchParam.createdFee"
@@ -289,7 +298,7 @@
                   allowClear 
                   showSearch
                    :filter-option="false"
-                  :options="filterOrgListSearch"  
+                  :options="filterOrgListSearch"
                   @search="handleOrgSearch"
                   @change="changeOrg">
                 </a-select>
@@ -970,7 +979,7 @@ export default {
         pageSize:50
       }
       queryTrainOrgPor(obj).then((res) => {
-        //TODO5 赋值语句
+     
         state.orgList = res.data.data?.map(item=>{
           return{
             label: item.affiliationName,

From 247a56c9a18f6b936ef6a996e37b10c5af045b46 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 14:07:19 +0800
Subject: [PATCH 083/157] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E6=94=BE=E7=94=9F?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 81f34a01..38662dd8 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -57,6 +57,7 @@
             v-model:value="searchParam.trainOrgId" 
             placeholder="请选择培训发生组织" 
             allowClear
+            showSearch
             :filter-option="false"
             :options="filterOrgListSearch"
             @search="handleOrgSearch"

From f34f7f5846502943f6697a616da1d63bf80ec98a Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 14:24:42 +0800
Subject: [PATCH 084/157] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E6=94=BE=E7=94=9F?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 38662dd8..78db5fd3 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -430,8 +430,11 @@
         <a-descriptions style="margin-top:15px;" bordered :column="2" :contentStyle="{'maxWidth':'300px'}" :labelStyle="{'width':'160px'}">
           <a-descriptions-item label="讲师名称"><div style="user-select: text">{{ formParam.teacherName ||'-'}}/{{ formParam.userNo||'-' }}</div></a-descriptions-item>
           <a-descriptions-item label="课程名称"><div style="user-select: text">{{ formParam.courseName||'-' }}</div></a-descriptions-item>
-          <a-descriptions-item label="课程类型">{{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 5 ? '手动录入' : '-'
-          }}</a-descriptions-item>
+          <a-descriptions-item label="课程类型">
+              {{formParam.type == 0 ? '在线课' :'-'}}
+              {{formParam.type == 1 ? '面授课' :'-'}}
+              {{formParam.type == 5 ? '手动录入' :'-'}}
+           </a-descriptions-item>
           <a-descriptions-item label="授课/课程日期"><div style="user-select: text">{{ formParam.teachingDate||'-' }}</div></a-descriptions-item>
           <a-descriptions-item label="开课状态">{{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1
             ? '已开课' : '-' }}</a-descriptions-item>

From 0c33ba31d6b4e32926e47662739084977a0eb6da Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 14:25:55 +0800
Subject: [PATCH 085/157] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E6=94=BE=E7=94=9F?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 78db5fd3..c3a878d5 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -431,10 +431,9 @@
           <a-descriptions-item label="讲师名称"><div style="user-select: text">{{ formParam.teacherName ||'-'}}/{{ formParam.userNo||'-' }}</div></a-descriptions-item>
           <a-descriptions-item label="课程名称"><div style="user-select: text">{{ formParam.courseName||'-' }}</div></a-descriptions-item>
           <a-descriptions-item label="课程类型">
-              {{formParam.type == 0 ? '在线课' :'-'}}
-              {{formParam.type == 1 ? '面授课' :'-'}}
-              {{formParam.type == 5 ? '手动录入' :'-'}}
-           </a-descriptions-item>
+            {{ formParam.type }} 
+            {{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 5 ? '手动录入' : '-'
+          }}</a-descriptions-item>
           <a-descriptions-item label="授课/课程日期"><div style="user-select: text">{{ formParam.teachingDate||'-' }}</div></a-descriptions-item>
           <a-descriptions-item label="开课状态">{{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1
             ? '已开课' : '-' }}</a-descriptions-item>

From c9c90110d322652e2348a6aafb20ae1c72c97d0c Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 14:33:02 +0800
Subject: [PATCH 086/157] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E6=94=BE=E7=94=9F?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index c3a878d5..c4be3b4c 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -431,7 +431,6 @@
           <a-descriptions-item label="讲师名称"><div style="user-select: text">{{ formParam.teacherName ||'-'}}/{{ formParam.userNo||'-' }}</div></a-descriptions-item>
           <a-descriptions-item label="课程名称"><div style="user-select: text">{{ formParam.courseName||'-' }}</div></a-descriptions-item>
           <a-descriptions-item label="课程类型">
-            {{ formParam.type }} 
             {{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 5 ? '手动录入' : '-'
           }}</a-descriptions-item>
           <a-descriptions-item label="授课/课程日期"><div style="user-select: text">{{ formParam.teachingDate||'-' }}</div></a-descriptions-item>
@@ -822,7 +821,7 @@ export default {
                   ? {
                     "0": "在线课",
                     "1": "面授课",
-                    "2": "手动录入",
+                    "5": "手动录入",
                   }[value.record.type + ""]
                   : "-"}
               </div>

From d1918810e94793a5cbe44e6aae953376c185551a Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 14:35:29 +0800
Subject: [PATCH 087/157] =?UTF-8?q?=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=EF=BC=8C=E5=86=85=E9=83=A8=E8=AE=B2=E5=B8=88=20=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue | 38 +++++++++++++--------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index c4be3b4c..7c7ed030 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -908,25 +908,25 @@ export default {
           )
         }
       },
-      {
-        title: '数据来源',
-        dataIndex: 'createFrom',
-        key: 'createFrom',
-        ellipsis: true, align: "center",
-        width: 120,
-        customRender: (value) => {
-          return (
-            <div>
-              {value.record.createFrom == "0" || value.record.createFrom == "1"
-                ? {
-                  "0": "系统生成",
-                  "1": "手动录入",
-                }[value.record.createFrom + ""] || ""
-                : "-"}
-            </div>
-          )
-        }
-      },
+      // {
+      //   title: '数据来源',
+      //   dataIndex: 'createFrom',
+      //   key: 'createFrom',
+      //   ellipsis: true, align: "center",
+      //   width: 120,
+      //   customRender: (value) => {
+      //     return (
+      //       <div>
+      //         {value.record.createFrom == "0" || value.record.createFrom == "1"
+      //           ? {
+      //             "0": "系统生成",
+      //             "1": "手动录入",
+      //           }[value.record.createFrom + ""] || ""
+      //           : "-"}
+      //       </div>
+      //     )
+      //   }
+      // },
       {
         title: '培训发生组织 ',
         dataIndex: 'trainOrgName',

From c8d8bd0b591e861cdc44094c59306ddae12c60ec Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 15:19:41 +0800
Subject: [PATCH 088/157] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 4e54a6c1..583ebfe3 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -9,7 +9,7 @@
           <!-- <a-input v-model:value="searchParam.userNo" style="width: 276px; height: 40px; border-radius: 8px"
             placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
           </a-input> -->
-          <a-input style="width: 235px; height: 40px; border-radius: 8px" placeholder="请输入姓名/手机号进行检索" showSearch
+          <a-input style="width: 235px; height: 40px; border-radius: 8px" placeholder="请输入姓名进行检索" showSearch
             allowClear v-model:value="searchParam.name"
             v-on:keydown.enter="enterPressHadlerSearch"></a-input>
         </a-form-item>

From 6afe5f9635155d2fa120b31baf0c1957f2a45516 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 15:44:11 +0800
Subject: [PATCH 089/157] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A1=86=20=E5=90=8D=E7=A7=B0=E5=B8=85=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/ProjectManagerOutTeacher.vue      |  83 ++---
 src/views/lecturer/ExternalTeaching.vue       | 332 ++++++++----------
 2 files changed, 194 insertions(+), 221 deletions(-)

diff --git a/src/components/project/ProjectManagerOutTeacher.vue b/src/components/project/ProjectManagerOutTeacher.vue
index db2050a9..6c527449 100644
--- a/src/components/project/ProjectManagerOutTeacher.vue
+++ b/src/components/project/ProjectManagerOutTeacher.vue
@@ -1,33 +1,18 @@
 <template>
-  <a-select
-      :getPopupContainer="
-                          (triggerNode) => {
-                            return triggerNode.parentNode || document.body;
-                          }
-                        "
-      v-model:value="managerArray"
-      :placeholder="placeholder"
-      :filterOption="false"
-      :options="isOpen?options:selectOptions"
-      allowClear
-      showSearch
-      :disabled="disabled"
-      @popupScroll="memberScroll"
-      @search="searchMember"
-      :open="isOpen"
-      @change="change"
-      @blur="blur"
-      :show-arrow="false"
-      style="width: 100%"
-  >
+  <a-select :getPopupContainer="(triggerNode) => {
+      return triggerNode.parentNode || document.body;
+    }
+    " v-model:value="managerArray" :placeholder="placeholder" :filterOption="false"
+    :options="isOpen ? options : selectOptions" allowClear showSearch :disabled="disabled" @popupScroll="memberScroll"
+    @search="searchMember" :open="isOpen" @change="change" @blur="blur" :show-arrow="false" style="width: 100%">
     <template v-if="loading" #notFoundContent>
-      <a-spin size="small"/>
+      <a-spin size="small" />
     </template>
   </a-select>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref, watch} from "vue";
-import {useThrottlePage} from "@/api/request";
+import { computed, defineEmits, defineProps, onMounted, ref, watch } from "vue";
+import { useThrottlePage } from "@/api/request";
 import { getTeacherList } from "@/api/Lecturer";
 const props = defineProps({
   value: {
@@ -52,38 +37,39 @@ const props = defineProps({
 
 const selectOptions = ref([])
 
-const managerArray = computed(() => props.value ===  '' ? null : props.value)
+const managerArray = computed(() => props.value === '' ? null : props.value)
 
 const emit = defineEmits({})
 
 const isOpen = ref(false)
 function debounce(func, wait) {
   let timeout;
-  return function(...args) {
+  return function (...args) {
     clearTimeout(timeout);
     timeout = setTimeout(() => func.apply(this, args), wait);
   };
 }
-const memberParam = ref({name: '', pageNo:1, pageSize: 999,teacherType:2 ,status:1})
+const memberParam = ref({ name: '', pageNo: 1, pageSize: 999, teacherType: 2, status: 1 })
 
 const userList = ref([])
 const loading = ref(false)
 const getOutTeacher = () => {
-  getTeacherList(memberParam.value).then(res=>{
-    if(res.data.code == 200){
+  getTeacherList(memberParam.value).then(res => {
+    if (res.data.code == 200) {
       userList.value = res.data.data.records
       loading.value = false
     }
   })
 }
-const options = computed(() => userList.value.map(e => ({
-
-  // label: e.name + '(' + e.userNo + ')' + e.organizationName,
-  label:e.name+ '(' +e.supplier + ')',
-  value: e.name,
-  ...e,
-  audienceList: null
-})))
+const options = computed(() => 
+    userList.value.map(e => ({
+      // label: e.name + '(' + e.userNo + ')' + e.organizationName,
+      label: e.name + '(' + e.supplier + ')',
+      value: e.name,
+      ...e,
+      audienceList: null
+    })
+))
 
 watch(props, init)
 
@@ -101,10 +87,10 @@ onMounted(() => {
 })
 
 
-const memberScroll = ({target: {scrollHeight, scrollTop, clientHeight}}) => {
+const memberScroll = ({ target: { scrollHeight, scrollTop, clientHeight } }) => {
   scrollHeight === (clientHeight + scrollTop) && memberParam.value.pageNo++
 };
-const debounceObject = debounce(getOutTeacher,1000)
+const debounceObject = debounce(getOutTeacher, 1000)
 //搜索学员
 const searchMember = (keyword) => {
   console.log('searchMember', keyword)
@@ -112,7 +98,7 @@ const searchMember = (keyword) => {
   isOpen.value = true
   userList.value = []
   memberParam.value.pageNo = 1
-  memberParam.value.teacherType=2
+  memberParam.value.teacherType = 2
   memberParam.value.name = keyword
   console.log('searchMember', memberParam.value)
   debounceObject()
@@ -122,19 +108,26 @@ function blur() {
   isOpen.value = false
   memberParam.value.name = ''
   memberParam.value.pageNo = 1
-  memberParam.value.teacherType=2
+  memberParam.value.teacherType = 2
 }
 
 function change(e, l) {
   memberParam.value.name = ''
-  memberParam.value.teacherType=2
+  memberParam.value.teacherType = 2
   memberParam.value.pageNo = 1
   isOpen.value = false
   Array.isArray(l) && (selectOptions.value = l)
   Array.isArray(selectOptions.value) && emit('onChange', e, l)
-    emit('update:name', l?.label)
-    emit('update:value', l?.value)
-    emit('update:mobile', l?.label)
+  selectOptions.value.map(e => ({
+      // label: e.name + '(' + e.userNo + ')' + e.organizationName,
+      label: e.name + '(' + e.supplier + ')',
+      value: e.name,
+      ...e,
+      audienceList: null
+    }));
+  emit('update:name', l?.label)
+  emit('update:value', l?.value)
+  emit('update:mobile', l?.label)
 }
 
 </script>
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 583ebfe3..f00994b2 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -9,34 +9,30 @@
           <!-- <a-input v-model:value="searchParam.userNo" style="width: 276px; height: 40px; border-radius: 8px"
             placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
           </a-input> -->
-          <a-input style="width: 235px; height: 40px; border-radius: 8px" placeholder="请输入姓名进行检索" showSearch
-            allowClear v-model:value="searchParam.name"
-            v-on:keydown.enter="enterPressHadlerSearch"></a-input>
+          <a-input style="width: 235px; height: 40px; border-radius: 8px" placeholder="请输入姓名进行检索" showSearch allowClear
+            v-model:value="searchParam.name" v-on:keydown.enter="enterPressHadlerSearch"></a-input>
         </a-form-item>
         <a-form-item class="select">
-          <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.supplier" placeholder="请输入供应商" :options="supperList" allowClear
-           v-on:keydown.enter="enterPressHadlerSearch" showSearch > 
+          <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.supplier" placeholder="请输入供应商"
+            :options="supperList" allowClear v-on:keydown.enter="enterPressHadlerSearch" showSearch>
           </a-select>
         </a-form-item>
         <a-form-item class="select">
           <a-input v-model:value="searchParam.courseName" style="width: 235px; height: 40px; border-radius: 8px"
-            placeholder="请输入课程名称进行搜索" allowClear showSearch
-            v-on:keydown.enter="enterPressHadlerSearch">
+            placeholder="请输入课程名称进行搜索" allowClear showSearch v-on:keydown.enter="enterPressHadlerSearch">
           </a-input>
         </a-form-item>
         <a-form-item class="select ">
           <!-- <div class="select addTimeBox">
             <div class="addTime">授课日期：</div> -->
-            <a-range-picker v-model:value="searchdate" style="width: 340px !important;" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"
-              separator="至" :placeholder="['授课日期开始时间', '授课日期结束时间']
-              "
-               v-on:keydown.enter="enterPressHadlerSearch" />
+          <a-range-picker v-model:value="searchdate" style="width: 340px !important;" format="YYYY-MM-DD"
+            valueFormat="YYYY-MM-DD" separator="至" :placeholder="['授课日期开始时间', '授课日期结束时间']
+              " v-on:keydown.enter="enterPressHadlerSearch" />
           <!-- </div> -->
         </a-form-item>
         <a-form-item class="select">
           <a-select style="width: 200px ;margin-bottom:20px" v-model:value="searchParam.createFrom" placeholder="录入类型"
-            :options="entryTypeList" allowClear
-            v-on:keydown.enter="enterPressHadlerSearch">
+            :options="entryTypeList" allowClear v-on:keydown.enter="enterPressHadlerSearch">
           </a-select>
         </a-form-item>
         <a-form-item class="select">
@@ -47,14 +43,12 @@
           }" allow-clear :getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
             v-model:value="searchParam.courseTypeId" show-search
             :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择内容分类" tree-default-expand-all
-            :tree-data="sysTypeOptions"
-            v-on:keydown.enter="enterPressHadlerSearch">
+            :tree-data="sysTypeOptions" v-on:keydown.enter="enterPressHadlerSearch">
           </a-tree-select>
         </a-form-item>
         <a-form-item class="select">
           <a-select style="width: 200px" v-model:value="searchParam.courseStatus" placeholder="开课状态"
-            :options="AuthenticationStatusList" allowClear
-            v-on:keydown.enter="enterPressHadlerSearch">
+            :options="AuthenticationStatusList" allowClear v-on:keydown.enter="enterPressHadlerSearch">
           </a-select>
         </a-form-item>
         <div style="display: flex; margin-bottom: 20px">
@@ -77,7 +71,7 @@
           </div> -->
         </div>
         <div style="width:100%"></div>
-        
+
       </a-form>
       <div style="width: 100%;"></div>
       <div style="display: flex; margin-bottom: 20px">
@@ -105,8 +99,10 @@
             <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&&checkMenu('lecturerRecordsEdit')">编辑</a-button>
-                <a-button v-if="record.isSuperPermission==='true'&&checkMenu('lecturerRecordsDel')" type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
+                <a-button type="link" @click="() => handleModify(record, String(record.courseform))"
+                  v-if="record.createFrom == 1 && checkMenu('lecturerRecordsEdit')">编辑</a-button>
+                <a-button v-if="record.isSuperPermission === 'true' && checkMenu('lecturerRecordsDel')" type="link"
+                  @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
               </a-space>
             </template>
           </template>
@@ -116,51 +112,36 @@
     </div>
     <div class="tableBox ">
       <div class="pa">
-        <a-pagination
-            v-if="tableDataTotal > 10"
-            :showSizeChanger="true"
-            :showQuickJumper="false"
-            :hideOnSinglePage="false"
-            :pageSize="searchParam.pageSize"
-            :current="searchParam.pageNo"
-            :total="tableDataTotal"
-            class="pagination"
-            @change="changePagination"
-          />
-          <!--  :show-total="total => `共 ${total} 条数据`" -->
+        <a-pagination v-if="tableDataTotal > 10" :showSizeChanger="true" :showQuickJumper="false"
+          :hideOnSinglePage="false" :pageSize="searchParam.pageSize" :current="searchParam.pageNo"
+          :total="tableDataTotal" class="pagination" @change="changePagination" />
+        <!--  :show-total="total => `共 ${total} 条数据`" -->
       </div>
     </div>
     <!-- 弹窗组件 -->
-    <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" placement="right" :maskClosable="false" :closable="false"
-      width="60%" :title="false">
+    <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" placement="right" :maskClosable="false"
+      :closable="false" width="60%" :title="false">
       <div style="padding:24px;">
         <div class="headers" style="margin-top:-24px;">
           <div class="headerTitle">{{ teacherdialogtitle }}</div>
-          <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="@/assets/images/basicinfo/close.png"
-            @click="cancelTeacherDialog"
-          />
+          <img style="width: 29px; height: 29px; cursor: pointer" src="@/assets/images/basicinfo/close.png"
+            @click="cancelTeacherDialog" />
         </div>
         <a-form :model="formParam" layout="vertical" ref="formRef">
           <!--讲师名称  teacherName 内容分类 coursetypeid -->
           <a-row :gutter="16">
             <a-col :span="12">
-        
+
               <a-form-item name="teacherName">
                 <template v-slot:label>
-                  <img
-                    style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
                   讲师名称
                 </template>
-                    <ProjectManagerOutTeacher v-model:value="formParam.name" 
-          v-model:name="formParam.teacherName" 
-          placeholder="请输入工号/讲师姓名进行检索"
-                              @onChange="managerChange"></ProjectManagerOutTeacher> 
-                              
+                <!-- TODO GX01 -->
+                <ProjectManagerOutTeacher v-model:value="formParam.name" v-model:name="formParam.teacherName"
+                  placeholder="请输入工号/讲师姓名进行检索" @onChange="managerChange"></ProjectManagerOutTeacher>
+
                 <!-- <a-input v-model:value="formParam.teacherName" allowClear showSearch class="draitem"
                   placeholder="请输入讲师姓名"></a-input> -->
               </a-form-item>
@@ -168,11 +149,8 @@
             <a-col :span="12">
               <a-form-item name="courseTypeId">
                 <template v-slot:label>
-                  <img
-                    style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
                   内容分类
                 </template>
                 <a-tree-select :fieldNames="{
@@ -181,9 +159,8 @@
                   value: 'code',
                 }" allow-clear :getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
                   v-model:value="formParam.courseTypeId" show-search
-                  :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择内容分类" tree-default-expand-all
-                  :tree-data="sysTypeOptions"
-                  @change="treetype">
+                  :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择内容分类"
+                  tree-default-expand-all :tree-data="sysTypeOptions" @change="treetype">
                 </a-tree-select>
               </a-form-item>
             </a-col>
@@ -193,14 +170,12 @@
             <a-col :span="12">
               <a-form-item name="courseName">
                 <template v-slot:label>
-                  <img
-                    style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
                   课程名称
                 </template>
-                <a-input class="draitem" v-model:value="formParam.courseName"  :maxlength="20"   showCount  placeholder="请输入课程名称"  @blur="sendName" allowClear showSearch>
+                <a-input class="draitem" v-model:value="formParam.courseName" :maxlength="20" showCount
+                  placeholder="请输入课程名称" @blur="sendName" allowClear showSearch>
                 </a-input>
               </a-form-item>
             </a-col>
@@ -215,34 +190,27 @@
             <a-col :span="12">
               <a-form-item name="teachingDate">
                 <template v-slot:label>
-                  <img
-                    style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
                   授课/课程日期 :
                 </template>
-                <a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" format="YYYY-MM-DD HH:mm" :show-time="{ format: 'HH:mm' }"
-                  placeholder="请选择课程日期" />
+                <a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" format="YYYY-MM-DD HH:mm"
+                  :show-time="{ format: 'HH:mm' }" placeholder="请选择课程日期" />
               </a-form-item>
             </a-col>
           </a-row>
           <!-- 授课日期 teachingDate  授课时长defaultTeachingTime-->
           <a-row :gutter="16">
-            
+
             <a-col :span="12">
               <a-form-item name="teaching">
                 <template v-slot:label>
-                  <img
-                    style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
                   授课时长
                 </template>
                 <a-input v-model:value="formParam.teaching" style="width:100%; height: 40px; border-radius: 8px; "
-                  placeholder="请输入授课时长" allowClear showSearch suffix="分钟" 
-                  :maxLength="8" @change="clearNonNumber">
+                  placeholder="请输入授课时长" allowClear showSearch suffix="分钟" :maxLength="8" @change="clearNonNumber">
                 </a-input>
                 <!-- <span style="margin-left: 5px ;" v-if="formParam.teaching != null">{{ (formParam.teaching / 60
                 ).toFixed(2) }}小时</span>
@@ -252,36 +220,30 @@
             <a-col :span="12">
               <a-form-item name="studys">
                 <template v-slot:label>
-                  <img
-                    style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
                   参训人数
                 </template>
-                <a-input v-model:value="formParam.studys" class="draitem" placeholder="请输入参训人数" allowClear showSearch :maxLength="8"
-                  @blur="clearstudysNumber">
+                <a-input v-model:value="formParam.studys" class="draitem" placeholder="请输入参训人数" allowClear showSearch
+                  :maxLength="8" @blur="clearstudysNumber">
                 </a-input>
               </a-form-item>
             </a-col>
           </a-row>
           <!-- 参训人数 studys评分  score-->
           <a-row :gutter="16">
-            
+
             <a-col :span="12">
               <a-form-item name="score">
                 <template v-slot:label>
-                  <img
-                    style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
                   评分
                 </template>
                 <!-- <a-input class="draitem" v-model:value="formParam.score"  @blur="clearscoreNumber" placeholder="" allowClear showSearch>
                 </a-input> -->
-                    <a-input-number @blur="blurScore" @focus="focusScore" v-model:value="formParam.score" :precision="2" :min="1" :max="100" 
-                style="width:100%; height: 40px; border-radius: 8px ; " placeholder="请输入评分" />
+                <a-input-number @blur="blurScore" @focus="focusScore" v-model:value="formParam.score" :precision="2"
+                  :min="1" :max="100" style="width:100%; height: 40px; border-radius: 8px ; " placeholder="请输入评分" />
               </a-form-item>
             </a-col>
           </a-row>
@@ -289,8 +251,7 @@
           <a-row :gutter="16">
             <a-col :span="24">
               <a-form-item label="备注">
-                <a-textarea v-model:value="formParam.remark" showCount :maxlength="200"
-                @blur="sendRemark"
+                <a-textarea v-model:value="formParam.remark" showCount :maxlength="200" @blur="sendRemark"
                   style="width: 100%; height: 100px; border-radius: 8px" placeholder="请输入" />
               </a-form-item>
             </a-col>
@@ -314,36 +275,36 @@
       </div>
     </a-drawer>
     <!-- 查看授课记录 -->
-    <a-drawer class="largeDrawerInside" v-model:visible="teachingdialog" placement="right" :maskClosable="true" :closable="false"
-      width="60%" :title="false">
+    <a-drawer class="largeDrawerInside" v-model:visible="teachingdialog" placement="right" :maskClosable="true"
+      :closable="false" width="60%" :title="false">
       <div style="padding:24px;">
         <div class="headers" style="margin-top:-24px;">
           <div class="headerTitle">查看讲师授课记录</div>
-          <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="@/assets/images/basicinfo/close.png"
-            @click="cancelTeachingDialog"
-          />
+          <img style="width: 29px; height: 29px; cursor: pointer" src="@/assets/images/basicinfo/close.png"
+            @click="cancelTeachingDialog" />
         </div>
-        <a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="{'width':'160px'}">
-          <a-descriptions-item label="讲师名称">{{ formParam.teacherName ||'-'}}</a-descriptions-item>
-          <a-descriptions-item label="手机号码">{{ formParam.mobile  ||'-'}}</a-descriptions-item>
-          <a-descriptions-item label="课程类型">{{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 2 ? '手动录入' : '-'
-          }}</a-descriptions-item>
-          <a-descriptions-item label="课程名称">{{ formParam.courseName  ||'-'}}</a-descriptions-item>
+        <a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="{ 'width': '160px' }">
+          <a-descriptions-item label="讲师名称">{{ formParam.teacherName || '-' }}</a-descriptions-item>
+          <a-descriptions-item label="手机号码">{{ formParam.mobile || '-' }}</a-descriptions-item>
+          <a-descriptions-item label="课程类型">{{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' :
+            formParam.type ==
+              2 ? '手动录入' : '-'
+            }}</a-descriptions-item>
+          <a-descriptions-item label="课程名称">{{ formParam.courseName || '-' }}</a-descriptions-item>
           <a-descriptions-item label="开课状态">{{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1
             ? '已开课' : '-' }}</a-descriptions-item>
-          <a-descriptions-item label="内容分类  ">{{ formParam.courseTypeName  ||'-'}}</a-descriptions-item>
-          <a-descriptions-item label="授课/课程日期  ">{{ formParam.teachingDate ||'-' }}
-          
+          <a-descriptions-item label="内容分类  ">{{ formParam.courseTypeName || '-' }}</a-descriptions-item>
+          <a-descriptions-item label="授课/课程日期  ">{{ formParam.teachingDate || '-' }}
+
           </a-descriptions-item>
-          <a-descriptions-item label="授课时长  ">  <span > {{ formParam.teaching  }} 分钟</span> 
+          <a-descriptions-item label="授课时长  "> <span> {{ formParam.teaching }} 分钟</span>
             <span style="margin-left: 10px ;" v-if="formParam.teaching != '0'">({{ (formParam.teaching / 60
             ).toFixed(2) }}小时)</span>
           </a-descriptions-item>
-          <a-descriptions-item label="评分  ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(2)+'分':'-'}}</a-descriptions-item>
-          <a-descriptions-item label="参训人数  ">{{ formParam.studys ? formParam.studys+'人' :'-'}}</a-descriptions-item>
-          <a-descriptions-item label="备注  " :span="2">{{ formParam.remark ||'-' }}</a-descriptions-item>
+          <a-descriptions-item label="评分  ">{{
+            formParam.score ? Number(formParam.score).toFixed(0) == 0 ? '-' : Number(formParam.score).toFixed(2) +'分':'-'}}</a-descriptions-item>
+          <a-descriptions-item label="参训人数  ">{{ formParam.studys ? formParam.studys + '人' : '-' }}</a-descriptions-item>
+          <a-descriptions-item label="备注  " :span="2">{{ formParam.remark || '-' }}</a-descriptions-item>
         </a-descriptions>
         <!-- <div :style="{
           position: 'absolute',
@@ -389,12 +350,13 @@
       </a-modal>
     </div>
     <!-- <div> <ImageUpload/> </div>         -->
-    <ImportWork v-model:showWork="showWork" :template="'外部讲师授课记录导入模版-20250115.xlsx'" :url="'/admin/export/importOutTeacherRecord'" :title="title"></ImportWork>
+    <ImportWork v-model:showWork="showWork" :template="'外部讲师授课记录导入模版-20250115.xlsx'"
+      :url="'/admin/export/importOutTeacherRecord'" :title="title"></ImportWork>
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, computed,onMounted } from "vue";
-import { useRouter ,useRoute} from "vue-router";
+import { reactive, toRefs, ref, computed, onMounted } from "vue";
+import { useRouter, useRoute } from "vue-router";
 import { useStore } from "vuex";
 import {
   RightOutlined,
@@ -408,7 +370,7 @@ import { message } from "ant-design-vue";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import ProjectManagerOutTeacher from "@/components/project/ProjectManagerOutTeacher";
 import dayjs from "dayjs";
-import { getTeacherCourseList, updateInTeacherCourse, getNewInTeacherCourseList, deleteInTeacherCourse, insertInTeacherCourse,selectSupplier } from "../../api/Teaching";
+import { getTeacherCourseList, updateInTeacherCourse, getNewInTeacherCourseList, deleteInTeacherCourse, insertInTeacherCourse, selectSupplier } from "../../api/Teaching";
 // import {getProjSt} from "../../api/indexProjStu";
 import { checkMenu } from '@/utils/utils'
 // import AddTeacher from "../../components/drawers/project/AddTeacher"
@@ -427,7 +389,7 @@ export default {
   setup() {
     onMounted(() => {
       const search = sessionStorage.getItem('searchExter')
-      if(route.query.activeKey == 2&&search){
+      if (route.query.activeKey == 2 && search) {
         state.searchParam = JSON.parse(search)
       }
       searchSubmit()
@@ -456,12 +418,13 @@ export default {
       teachingDate: undefined, //选择时间
       tableDataTotal: -1,//table列表总条数
       formParam: {
+        name: null,
         courseStatus: '1',
         createFrom: 1,
         teaching: null,
         teachingDate: null,
-        teacherId:null,
-        mobile:null,
+        teacherId: null,
+        mobile: null,
         score: null
       },
       searchdate: undefined, //选择时间
@@ -503,8 +466,22 @@ export default {
 
     //获取内容分类
     const sysTypeOptions = computed(() => store.state.content_type);
-    const treetype =(val,lab)=>{
-      state.formParam.courseTypeName =lab.toString()
+    //TODO GX01
+    const FULL_NAME_SUPPLIER = computed(() => {
+        if(state.formParam.name){
+          let supplier =  state.formParam.supplier == null ? state.formParam.supplier:"";
+          if(supplier){
+            return state.formParam.name;
+          }else{
+            return state.formParam.name + "/" + supplier;
+          }
+          
+        }
+        return "";
+    });
+   
+    const treetype = (val, lab) => {
+      state.formParam.courseTypeName = lab.toString()
     }
     const OnTheJobStatusList = ref([
       { value: 1, label: "项目开课" },
@@ -512,13 +489,13 @@ export default {
       { value: 3, label: "面授开课" },
     ])
     const supperList = ref([])
-    const getSupplier = ()=>{
-      selectSupplier().then(res=>{
-        if(res.data.code == 200){
-          supperList.value = res.data.data.map(item=>{
+    const getSupplier = () => {
+      selectSupplier().then(res => {
+        if (res.data.code == 200) {
+          supperList.value = res.data.data.map(item => {
             return {
-              value:item,
-              label:item
+              value: item,
+              label: item
             }
           })
           supperList.value.unshift({
@@ -529,12 +506,12 @@ export default {
       })
     }
     const AuthenticationStatusList = ref([
-    { value: '', label: "全部" },
+      { value: '', label: "全部" },
       { value: '0', label: "未开课" },
       { value: '1', label: "已开课" },
     ])
     const entryTypeList = ref([
-    { value: '', label: "全部" },
+      { value: '', label: "全部" },
       { value: '0', label: "系统生成" },
       { value: '1', label: "手动录入" },
     ])
@@ -560,7 +537,7 @@ export default {
         key: 'supplier',
         ellipsis: true, align: "center",
         width: 150,
-        customRender: ({text})=> text||'-'
+        customRender: ({ text }) => text || '-'
       },
       {
         title: '课程名称 ',
@@ -585,16 +562,16 @@ export default {
         width: 120,
         customRender: (value) => {
           return (
-              <div>
-                {String(value.record.type)
-                  ? {
-                    "0": "在线课",
-                    "1": "面授课",
-                    "2": "手动录入",
-                  }[value.record.type + ""]
-                  : "-"}
-              </div>
-            )
+            <div>
+              { String(value.record.type)
+                ? {
+                  "0": "在线课",
+                  "1": "面授课",
+                  "2": "手动录入",
+                }[value.record.type + ""]
+                : "-" }
+            </div>
+          )
         }
       },
       {
@@ -606,7 +583,7 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {value.record?.teachingDate?dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm"):'-'}
+              { value.record?.teachingDate ? dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm") : '-' }
             </div>
           );
         },
@@ -627,12 +604,12 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {value.record.courseStatus == 0 || value.record.courseStatus == 1
+              { value.record.courseStatus == 0 || value.record.courseStatus == 1
                 ? {
                   "0": "未开课",
                   "1": "已开课",
                 }[value.record.courseStatus + ""] || ""
-                : "-"}
+                : "-" }
             </div>
           )
         }
@@ -666,7 +643,7 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {value.record?.teaching ? value.record.teaching + '分钟' : '-'}
+              { value.record?.teaching ? value.record.teaching + '分钟' : '-' }
             </div>
           );
         },
@@ -677,8 +654,8 @@ export default {
         key: 'studys',
         ellipsis: true, align: "center",
         width: 120,
-        customRender: ({text})=>{
-          return text ? text+'人' : '-'
+        customRender: ({ text }) => {
+          return text ? text + '人' : '-'
         }
       },
       {
@@ -690,7 +667,7 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(2)+'分' : '-'}
+              { value.record.score ? Number(value.record.score).toFixed(0) == 0 ? '-' : Number(value.record.score).toFixed(2) + '分' : '-' }
             </div>
           )
         }
@@ -704,12 +681,12 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {value.record.createFrom == "0" || value.record.createFrom == "1"
+              { value.record.createFrom == "0" || value.record.createFrom == "1"
                 ? {
                   "0": "系统生成",
                   "1": "手动录入",
                 }[value.record.createFrom + ""] || ""
-                : "-"}
+                : "-" }
             </div>
           )
         }
@@ -785,9 +762,9 @@ export default {
             state.tableLoading = false
           })
           .catch(err => {
-          state.tableLoading = false
-          message.error(err.data.msg)
-        })
+            state.tableLoading = false
+            message.error(err.data.msg)
+          })
 
     };
     getTableDate()
@@ -802,7 +779,7 @@ export default {
       cancel()
       state.teacherdialog = true;
       state.teacherdialogtitle = '添加授课记录'
-      state.formParam.createFrom='1'
+      state.formParam.createFrom = '1'
       state.vf = true
 
     }
@@ -829,12 +806,12 @@ export default {
     //保存
     const createTeacherDialog = async () => {
       state.formParam.teachingDate = state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : ""
-      if(state.formParam.studys==0){
+      if (state.formParam.studys == 0) {
         state.formParam.studys = null
       }
-      if(state.formParam.score||state.formParam.score==0){
+      if (state.formParam.score || state.formParam.score == 0) {
         state.formParam.score = String(state.formParam.score)
-      }else{
+      } else {
         state.formParam.score = null
       }
       state.formParam.courseStatus = String(state.formParam.courseStatus)
@@ -915,7 +892,7 @@ export default {
         score: null,
         remark: null,
         teachingDate: null,
-        teacherId:null
+        teacherId: null
       }
       state.teachingDate = null
     }
@@ -937,7 +914,7 @@ export default {
       state.teachingdialog = true
       state.lookTeacherId = record.id
       TeacherSystem()
-    } 
+    }
     //取消查看
     const cancelTeachingDialog = () => {
       state.teachingdialog = false
@@ -946,8 +923,8 @@ export default {
     const TeacherSystem = () => {
       getTeacherCourseList({ id: state.lookTeacherId }).then((res) => {
         state.formParam = res.data.data
-        state.teachingDate = res.data.data.teachingDate ? dayjs(res.data.data.teachingDate, 'YYYY-MM-DD HH:mm'):'',
-        state.formParam.name=state.formParam.teacherName
+        state.teachingDate = res.data.data.teachingDate ? dayjs(res.data.data.teachingDate, 'YYYY-MM-DD HH:mm') : '',
+          state.formParam.name = state.formParam.teacherName
         state.formParam.teachingDate = state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : ""
         state.formParam.courseStatus = String(state.formParam.courseStatus)
       })
@@ -956,8 +933,8 @@ export default {
     }
     function managerChange(e, l, d, t, orgName) {
       // console.log(e, l, d, t, orgName,'e, l, d, t, orgName');
-      state.formParam.mobile=e?l.mobile:''
-      state.formParam.teacherId=e?l.id:''
+      state.formParam.mobile = e ? l.mobile : ''
+      state.formParam.teacherId = e ? l.id : ''
       // state.searchParam.userNo = d;
       // state.searchParam.name = t;
       // state.searchParam.trainorgName=orgName
@@ -972,7 +949,7 @@ export default {
     //导出功能
     const handleExport = () => {
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacherRecord?recordType=2&name=${state.searchParam.name || ""}&courseName=${state.searchParam.courseName || ""}&createFrom=${state.searchParam.createFrom || ""}&beginTime=${state.searchParam.beginTime|| ""}&endTime=${state.searchParam.endTime || ""}&courseTypeId=${state.searchParam.courseTypeId || ""}&courseStatus=${state.searchParam.courseStatus || ""}&supplier=${state.searchParam.supplier || ""}`
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacherRecord?recordType=2&name=${state.searchParam.name || ""}&courseName=${state.searchParam.courseName || ""}&createFrom=${state.searchParam.createFrom || ""}&beginTime=${state.searchParam.beginTime || ""}&endTime=${state.searchParam.endTime || ""}&courseTypeId=${state.searchParam.courseTypeId || ""}&courseStatus=${state.searchParam.courseStatus || ""}&supplier=${state.searchParam.supplier || ""}`
       );
     }
     const clearstudysNumber = () => {
@@ -981,14 +958,14 @@ export default {
     const clearscoreNumber = () => {
       state.formParam.score = state.formParam.score.replace(/\D/g, '');
     }
-        //回车
-const enterPressHadlerSearch = e => {
-    if (e.keyCode === 13) {
-      searchSubmit()
+    //回车
+    const enterPressHadlerSearch = e => {
+      if (e.keyCode === 13) {
+        searchSubmit()
 
-    }
-};
-const sendName=()=>{
+      }
+    };
+    const sendName = () => {
       state.formParam.courseName = state.formParam.courseName.replace(/\s/g, '');
     }
     const blurScore = () => {
@@ -997,7 +974,7 @@ const sendName=()=>{
     const focusScore = () => {
       // state.formParam.score == 0 && (state.formParam.score = null)
     }
-    const sendRemark=()=>{
+    const sendRemark = () => {
       state.formParam.remark = state.formParam.remark.replace(/\s/g, '');
     }
     return {
@@ -1050,10 +1027,11 @@ const sendName=()=>{
   },
 };
 </script>
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 .select .ant-picker {
   width: 410px !important;
 }
+
 .headers {
   height: 73px;
   border-bottom: 1px solid #e8e8e8;
@@ -1072,6 +1050,7 @@ const sendName=()=>{
     // margin-left: 24px;
   }
 }
+
 .addTimeBox {
   position: relative;
   display: flex;
@@ -1343,6 +1322,7 @@ const sendName=()=>{
   margin-right: 14px;
   flex-shrink: 0;
   cursor: pointer;
+
   .search {
     width: 15px;
     height: 16px;

From 67ab0f7599d271c4169f630a695945126daeec8c Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 16:02:06 +0800
Subject: [PATCH 090/157] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A1=86=20=E5=90=8D=E7=A7=B0=E5=B8=85=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ProjectManagerOutTeacher.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/project/ProjectManagerOutTeacher.vue b/src/components/project/ProjectManagerOutTeacher.vue
index 6c527449..c6ee1b8d 100644
--- a/src/components/project/ProjectManagerOutTeacher.vue
+++ b/src/components/project/ProjectManagerOutTeacher.vue
@@ -57,6 +57,7 @@ const getOutTeacher = () => {
   getTeacherList(memberParam.value).then(res => {
     if (res.data.code == 200) {
       userList.value = res.data.data.records
+      userList.value.map(item => item.supplier?item.name+"/"+item.supplier:item.name ) 
       loading.value = false
     }
   })
@@ -118,13 +119,6 @@ function change(e, l) {
   isOpen.value = false
   Array.isArray(l) && (selectOptions.value = l)
   Array.isArray(selectOptions.value) && emit('onChange', e, l)
-  selectOptions.value.map(e => ({
-      // label: e.name + '(' + e.userNo + ')' + e.organizationName,
-      label: e.name + '(' + e.supplier + ')',
-      value: e.name,
-      ...e,
-      audienceList: null
-    }));
   emit('update:name', l?.label)
   emit('update:value', l?.value)
   emit('update:mobile', l?.label)

From 7f5239886b7e418dcca526b7b424c3ab5d6ea61a Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 16:20:43 +0800
Subject: [PATCH 091/157] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A1=86=20=E5=90=8D=E7=A7=B0=E5=B8=85=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ProjectManagerOutTeacher.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/project/ProjectManagerOutTeacher.vue b/src/components/project/ProjectManagerOutTeacher.vue
index c6ee1b8d..04ebef97 100644
--- a/src/components/project/ProjectManagerOutTeacher.vue
+++ b/src/components/project/ProjectManagerOutTeacher.vue
@@ -57,7 +57,6 @@ const getOutTeacher = () => {
   getTeacherList(memberParam.value).then(res => {
     if (res.data.code == 200) {
       userList.value = res.data.data.records
-      userList.value.map(item => item.supplier?item.name+"/"+item.supplier:item.name ) 
       loading.value = false
     }
   })
@@ -65,7 +64,7 @@ const getOutTeacher = () => {
 const options = computed(() => 
     userList.value.map(e => ({
       // label: e.name + '(' + e.userNo + ')' + e.organizationName,
-      label: e.name + '(' + e.supplier + ')',
+      label: e.name + '/' + e.supplier,
       value: e.name,
       ...e,
       audienceList: null

From a3337e12f1447cd454f851e27243a86898d0a0e7 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 16:33:33 +0800
Subject: [PATCH 092/157] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A1=86=20=E5=90=8D=E7=A7=B0=E5=B8=85=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 042c5aba..502edeb5 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -309,8 +309,16 @@
                   v-model:value="formParam.sourceBelongId"
                   v-model:name="formParam.sourceBelongFullName"
                 ></OrgClass> -->
-                <a-select :disabled="formParam.createFrom == 0" v-model:value="formParam.trainOrgId"
-                  placeholder="请选择培训发生组织" allowClear :options="orgList" @change="changeOrg">
+                <!-- TODO GX02 -->
+                <a-select 
+                  :disabled="formParam.createFrom == 0" 
+                  v-model:value="formParam.trainOrgId"
+                  placeholder="请选择培训发生组织" 
+                  allowClear
+                  showSearch 
+                 :options="filterOrgListSearch"
+                  @search="handleOrgSearch"
+                  @change="changeOrg">
                 </a-select>
               </a-form-item>
             </a-col>
@@ -1202,6 +1210,11 @@ export default {
       }
     })
     const changeOrg = (e, l) => {
+      console.log("changeOrg e",e);
+      console.log("changeOrg l",l);
+      if(l == undefined || l == null){
+        state.filterOrgListSearch = state.orgListSearch;
+      }
       state.formParam.trainOrgName = l?.label
     }
     //保存

From 9cbd72d6aeb86846f37f8adc2fab3208d215c599 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 17:10:43 +0800
Subject: [PATCH 093/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E4=B8=8B=20=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue    |   2 +-
 src/views/lecturer/MonthlyStatistics.vue | 673 ++++++++++++-----------
 2 files changed, 348 insertions(+), 327 deletions(-)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 7c7ed030..d07a8bc1 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -50,7 +50,7 @@
           <!-- <OrgClass @enter="searchSubmit()" v-model:value="searchParam.orgId" :placeholder="'请选择讲师组织'"
           style="width: 235px" 
           ></OrgClass> -->
-          <!-- TODO -->
+          <!-- TODO GX02-->
           <a-select 
             style="width: 235px ;
             margin-bottom:20px" 
diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue
index 6928979d..e8b7fb88 100644
--- a/src/views/lecturer/MonthlyStatistics.vue
+++ b/src/views/lecturer/MonthlyStatistics.vue
@@ -1,10 +1,10 @@
 <!-- 讲师费月度统计详情页面 -->
 <template>
-  <a-drawer :visible="visible" class="largeDrawerInside" placement="right" :closable="false" 
-    width="80%" :title="false" @close="handleBack">
-    <div  class="MonthlyStatistics">
-    <!-- 搜索框及按钮 -->
-    <!-- <a-layout-header style="background: white;color: black; font-size: 20px ;">
+  <a-drawer :visible="visible" class="largeDrawerInside" placement="right" :closable="false" width="80%" :title="false"
+    @close="handleBack">
+    <div class="MonthlyStatistics">
+      <!-- 搜索框及按钮 -->
+      <!-- <a-layout-header style="background: white;color: black; font-size: 20px ;">
      <span>讲师费月度统计详情</span>
      <router-link to="/LecturerFeeStatistics" class="goback">
             <span class="return"></span>
@@ -13,22 +13,18 @@
             </router-link>
           </router-link>
      </a-layout-header> -->
-     <div class="header">
+      <div class="header">
         <div class="headerTitle">讲师费月度统计详情</div>
-        <img
-          style="width: 29px; height: 29px; cursor: pointer"
-          src="../../assets/images/basicinfo/close.png"
-          @click="handleBack"
-        />
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+          @click="handleBack" />
       </div>
-     <!-- <a-divider style="height: 1px; background-color: #b7b8b7 ;margin: 0;" /> -->
-    <div class="filter">
-      <a-form layout="inline" >
-          <a-form-item  class="select">
-              <a-input v-model:value="searchParam.name" style="width: 240px; height: 40px; border-radius: 8px"
-            placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch
-            v-on:keydown.enter="enterPressHadlerSearch">
-          </a-input>
+      <!-- <a-divider style="height: 1px; background-color: #b7b8b7 ;margin: 0;" /> -->
+      <div class="filter">
+        <a-form layout="inline">
+          <a-form-item class="select">
+            <a-input v-model:value="searchParam.name" style="width: 240px; height: 40px; border-radius: 8px"
+              placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch v-on:keydown.enter="enterPressHadlerSearch">
+            </a-input>
           </a-form-item>
           <!-- <a-form-item class="select">
             <a-select style="width: 230px" v-model:value="searchParam.payrollPlaceId" placeholder="发薪地"
@@ -36,7 +32,7 @@
                   v-on:keydown.enter="enterPressHadlerSearch"/>
           </a-form-item> -->
           <!-- <a-form-item class="select " > -->
-            <!-- <a-tree-select style="width: 230px"
+          <!-- <a-tree-select style="width: 230px"
 								:fieldNames="{
 									children: 'children',
 									label: 'name',
@@ -52,7 +48,7 @@
 								:tree-data="sysTypeOptions"
                 v-on:keydown.enter="enterPressHadlerSearch">
 							</a-tree-select> -->
-            <!-- <a-select style="width: 235px" placeholder="请选择培训发生组织" v-model:value="searchParam.trainOrgId"
+          <!-- <a-select style="width: 235px" placeholder="请选择培训发生组织" v-model:value="searchParam.trainOrgId"
                 :options="getOrganizationList">
               </a-select> -->
           <!-- </a-form-item> -->
@@ -63,34 +59,47 @@
             <a-button class="resetbtn " @click="searchReset">重置</a-button>
           </div>
         </a-form>
-        <div style="width: 100%;"></div>   
+        <div style="width: 100%;"></div>
         <div v-if="checkMenu('lecturerSummaryExport')" style="display: flex; margin-bottom: 20px">
-          <a-button  class="resetbtn"  @click="handleFeeMonthly" type="primary"><UploadOutlined/>导出</a-button>
-        </div>   
-      <!-- 表格 -->
-       <div style="margin-bottom: 4px;color: #aaaaaa;">
-        注：下表为按讲师汇总的费用
-       </div>
-      <div style="padding: 10px 0">
-        <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columns"
-          :data-source="tableData" :loading="tableLoading" :scroll="{ x: 600}" :pagination="pagination">
-          <template #orgName="{ record }">
-            <div :title="record.orgName">{{ endOrg(record.orgName) }}</div>
-          </template>"
-          <template #bodyCell="{ record, column }">
-            <template v-if="column.key === 'operation'">
-              <a-space >
-                <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
-                <a-button v-if="checkMenu('lecturerSummaryCancel')" type="link" @click="handleLess(record)">撤回</a-button>
-              </a-space>
+          <a-button class="resetbtn" @click="handleFeeMonthly" type="primary">
+            <UploadOutlined />导出
+          </a-button>
+        </div>
+        <div v-if="checkMenu('lecturerSummaryExport')" style="display: flex; margin-bottom: 20px">
+          <a-button class="resetbtn" @click="handleFeeMonthly" type="primary">
+            <UploadOutlined />讲师月度费用下载
+          </a-button>
+        </div>
+        <div v-if="checkMenu('lecturerSummaryExport')" style="display: flex; margin-bottom: 20px">
+          <a-button class="resetbtn" @click="handleFeeMonthly" type="primary">
+            <UploadOutlined />讲师费用详情下载
+          </a-button>
+        </div>
+        <!-- 表格 -->
+        <div style="margin-bottom: 4px;color: #aaaaaa;">
+          注：下表为按讲师汇总的费用
+        </div>
+        <div style="padding: 10px 0">
+          <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columns"
+            :data-source="tableData" :loading="tableLoading" :scroll="{ x: 600 }" :pagination="pagination">
+            <template #orgName="{ record }">
+              <div :title="record.orgName">{{ endOrg(record.orgName) }}</div>
+            </template>"
+            <template #bodyCell="{ record, column }">
+              <template v-if="column.key === 'operation'">
+                <a-space>
+                  <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
+                  <a-button v-if="checkMenu('lecturerSummaryCancel')" type="link"
+                    @click="handleLess(record)">撤回</a-button>
+                </a-space>
+              </template>
             </template>
-          </template>
-        </a-table>
-      </div>
+          </a-table>
+        </div>
 
-    </div>
-    <!-- 翻页 -->
-    <!-- <div class="tableBox ">
+      </div>
+      <!-- 翻页 -->
+      <!-- <div class="tableBox ">
       <div style="float: right;">
         <a-pagination
           v-if="tableDataTotal > 10"
@@ -105,41 +114,41 @@
       />
       </div>
     </div> -->
-   <!-- 抽屉 -->
-   <a-drawer class="largeDrawerInside" v-model:visible="opendrawer" placement="right"
-@closa="cancelTeachingDialog" :maskClosable="true"  width="80%" :title="false">
-<div style="padding:24px;">
-  <div class="headers" style="margin-top:-24px;">
-    <div class="headerTitle">查看详情</div>
-    <img
-      style="width: 29px; height: 29px; cursor: pointer"
-      src="@/assets/images/basicinfo/close.png"
-      @click="cancelTeachingDialog"
-    />
-  </div>
-<a-form  layout="inline">
-  <a-form-item class="select">
-          <a-input @pressEnter="searchSubmitdrawer" v-model:value="drawer.name" style="width: 260px; height: 40px; border-radius: 8px"
-            placeholder="请输入课程名称进行搜索" allowClear showSearch>
-          </a-input>
-        </a-form-item>
-        <a-form-item class="select ">
-          <a-range-picker format="YYYY-MM-DD"
-          valueFormat="YYYY-MM-DD" style="width: 260px; height: 40px; margin-bottom: 20px; border-radius: 8px" v-model:value="drawer.drawersearchdate" separator="至"
-            :placeholder="['      开始时间', '        结束时间']" @change="searchTimeChange" />
-        </a-form-item>
-        <div style="display: flex; margin-bottom: 20px">
-          <a-button @click="searchSubmitdrawer()" type="primary" class="resetbtn">查询 </a-button>
-          <a-button class="resetbtn " @click="searchResetdrawer">重置</a-button>
-</div>
-</a-form>
-<!-- <span>讲师费发放情况</span> -->
-<a-table :columns="column"  :scroll="{ x: '1000' }" :data-source="tableDatas" :loading="tableLoadings" :pagination="false">
+      <!-- 抽屉 -->
+      <a-drawer class="largeDrawerInside" v-model:visible="opendrawer" placement="right" @closa="cancelTeachingDialog"
+        :maskClosable="true" width="80%" :title="false">
+        <div style="padding:24px;">
+          <div class="headers" style="margin-top:-24px;">
+            <div class="headerTitle">查看详情</div>
+            <img style="width: 29px; height: 29px; cursor: pointer" src="@/assets/images/basicinfo/close.png"
+              @click="cancelTeachingDialog" />
+          </div>
+          <a-form layout="inline">
+            <a-form-item class="select">
+              <a-input @pressEnter="searchSubmitdrawer" v-model:value="drawer.name"
+                style="width: 260px; height: 40px; border-radius: 8px" placeholder="请输入课程名称进行搜索" allowClear showSearch>
+              </a-input>
+            </a-form-item>
+            <a-form-item class="select ">
+              <a-range-picker format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"
+                style="width: 260px; height: 40px; margin-bottom: 20px; border-radius: 8px"
+                v-model:value="drawer.drawersearchdate" separator="至" :placeholder="['      开始时间', '        结束时间']"
+                @change="searchTimeChange" />
+            </a-form-item>
+            <div style="display: flex; margin-bottom: 20px">
+              <a-button @click="searchSubmitdrawer()" type="primary" class="resetbtn">查询 </a-button>
+              <a-button class="resetbtn " @click="searchResetdrawer">重置</a-button>
+            </div>
+          </a-form>
+          <!-- <span>讲师费发放情况</span> -->
+          <a-table :columns="column" :scroll="{ x: '1000' }" :data-source="tableDatas" :loading="tableLoadings"
+            :pagination="false">
             <template #action="{ record, column }">
-              <a-button v-if="checkMenu('lecturerSummaryCancel')" type="link" @click="handleDetail(record)">撤回</a-button>
+              <a-button v-if="checkMenu('lecturerSummaryCancel')" type="link"
+                @click="handleDetail(record)">撤回</a-button>
             </template>
           </a-table>
-  <!-- <div :style="{
+          <!-- <div :style="{
         position: 'absolute',
         right: 0,
         bottom: 0,
@@ -154,51 +163,51 @@
         <a-button   class="drabtn" type="primary" @click="cancelTeachingDialog" :loading="buttonLoading">返回
         </a-button>
       </div> -->
+        </div>
+      </a-drawer>
     </div>
-</a-drawer>
-  </div>
-</a-drawer>
+  </a-drawer>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch,computed  } from "vue";
+import { reactive, toRefs, ref, watch, computed } from "vue";
 import { useStore } from "vuex";
-import { useRouter,useRoute } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
 import {
-    UploadOutlined,
-  } from '@ant-design/icons-vue';
-  import { getPayRollPlace,expenseSummaryById ,removeBySummaryId,removeBySummaryDetailId,queryDetailId} from "../../api/Lecturer";
-  import { getOrganization } from "../../api/Teaching";
+  UploadOutlined,
+} from '@ant-design/icons-vue';
+import { getPayRollPlace, expenseSummaryById, removeBySummaryId, removeBySummaryDetailId, queryDetailId } from "../../api/Lecturer";
+import { getOrganization } from "../../api/Teaching";
 import ProjectManager from "@/components/project/ProjectManagerNew";
-import {queryTeacherFeeMonthly} from "../../api/lecturerFeeStatistics";
-import {CostDetails} from "../lecturer/CostDetails.vue"
+import { queryTeacherFeeMonthly } from "../../api/lecturerFeeStatistics";
+import { CostDetails } from "../lecturer/CostDetails.vue"
 // import * as api from '@/api/Lecturer'
 import dialog from '@/utils/dialog'
-import {message} from 'ant-design-vue'
+import { message } from 'ant-design-vue'
 import { checkMenu } from '@/utils/utils'
 export default {
   name: "MonthlyStatistics",
   components: {
     UploadOutlined,//图标--导出,
-    ProjectManager,CostDetails
+    ProjectManager, CostDetails
   },
-  props:{
-    visible:{
+  props: {
+    visible: {
       type: Boolean,
       default: false,
     },
-    id:{
+    id: {
       type: String,
       default: ""
     },
   },
-  setup(props,emits) {
-    const router=useRouter();
+  setup(props, emits) {
+    const router = useRouter();
     const route = useRoute();
-    const { query: { id }} = useRoute();
+    const { query: { id } } = useRoute();
     const state = reactive({
       tableLoading: false,
       tableLoadings: false,
-      opendrawer:false,
+      opendrawer: false,
       id,
       summaryDate: null,
       resbgTxt: null,
@@ -219,11 +228,11 @@ export default {
         name: '',
         payrollPlaceId: null,
         departId: null,
-        summaryDate:null,
+        summaryDate: null,
         id: props.id,
         // trainOrgId: '',
       },
-      name:null,
+      name: null,
       drawer: {
         name: '',
         drawersearchdate: [],
@@ -234,34 +243,34 @@ export default {
       }
     })
     const handleBack = () => {
-      emits.emit('update:visible',false)
+      emits.emit('update:visible', false)
     }
-    watch(()=>props.visible,(val)=>{
-      if(val){
+    watch(() => props.visible, (val) => {
+      if (val) {
         state.searchParam.id = props.id
         getTableDate()
-      }else{
+      } else {
         state.searchParam = {
           pageNo: "1",
           pageSize: "10",
           name: '',
           payrollPlaceId: null,
           departId: null,
-          summaryDate:null,
+          summaryDate: null,
           id: null,
         }
       }
     })
     const endOrg = (val) => {
-      if(val){
+      if (val) {
         const parts = val.split('/');
         // const reversedParts = parts.reverse();
         // return reversedParts.join('/');
         return parts[parts.length - 1]
       }
     }
-        //获取内容分类
-        const store = useStore();
+    //获取内容分类
+    const store = useStore();
     const sysTypeOptions = computed(() => store.state.content_type);
     const columns = ref([
       {
@@ -271,9 +280,9 @@ export default {
         ellipsis: true,
         align: "center",
         width: 180,
-        customRender: (value)=>{
+        customRender: (value) => {
           return (
-            <div style="user-select:text">{value.record.name}  /  {value.record.userNo}</div>
+            <div style="user-select:text">{ value.record.name }  /  { value.record.userNo }</div>
           )
         }
       },
@@ -312,8 +321,8 @@ export default {
         ellipsis: true,
         align: "center",
         width: 140,
-        customRender: ({text})=>{
-          return text ? text+'分钟' : '-'
+        customRender: ({ text }) => {
+          return text ? text + '分钟' : '-'
         }
       },
       {
@@ -323,8 +332,8 @@ export default {
         ellipsis: true,
         align: "center",
         width: 140,
-        customRender: ({text})=>{
-          return text ? text+'分钟' : '-'
+        customRender: ({ text }) => {
+          return text ? text + '分钟' : '-'
         }
       },
       {
@@ -334,8 +343,8 @@ export default {
         ellipsis: true,
         align: "center",
         width: 120,
-        customRender: ({text})=>{
-          return text ? text+'分钟' : '-'
+        customRender: ({ text }) => {
+          return text ? text + '分钟' : '-'
         }
       },
       {
@@ -345,8 +354,8 @@ export default {
         ellipsis: true,
         align: "center",
         width: 120,
-        customRender: ({text})=>{
-          return text ? text+'元' : '-'
+        customRender: ({ text }) => {
+          return text ? text + '元' : '-'
         }
       },
       {
@@ -356,9 +365,9 @@ export default {
         ellipsis: true,
         align: "center",
         width: 120,
-        customCell:(text)=>{return{style:{color:colorSet(text)}}},
-        customRender: ({text})=>{
-          return text ? text+'元' : '-'
+        customCell: (text) => { return { style: { color: colorSet(text) } } },
+        customRender: ({ text }) => {
+          return text ? text + '元' : '-'
         }
       },
       {
@@ -376,7 +385,7 @@ export default {
     const tableData = ref([
     ])
     const colorSet = (val) => {
-      if(val.payableExpense!=val.expense){
+      if (val.payableExpense != val.expense) {
         return 'red'
       }
     }
@@ -386,19 +395,19 @@ export default {
       getTableDate();
     };
 
-      const PlaceOfPayList = ref([
+    const PlaceOfPayList = ref([
     ])
     //获取讲师发薪地列表
     const PlaceOfPayLista = () => {
       getPayRollPlace().then((res) => {
-        
+
         if (res.data.code === 200) {
           let arr = res.data.data;
           let array = [];
           arr.map((value) => {
             let obj = {
               value: value.id,
-                label: value.name,
+              label: value.name,
             };
             array.push(obj);
           });
@@ -417,14 +426,14 @@ export default {
           tableData.value = res.data.data.records
           state.tableDataTotal = Number(res.data.data.total);
           state.tableLoading = false
-        }).catch(err=>{
+        }).catch(err => {
           state.tableLoading = false
           message.error(err.data.msg)
         })
     };
-  
-      //获取所属组织
-      const getOrganizationList = ref([
+
+    //获取所属组织
+    const getOrganizationList = ref([
       //   { value: 0, systemName: "讲师体系" },
     ]);
     //获取所属组织
@@ -448,7 +457,7 @@ export default {
     getOrganizationLista()
     //表格内查看数据操作
     const handleLook = (record) => {
-      state.drawer={
+      state.drawer = {
         name: '',
         drawersearchdate: [],
         pageNo: '1',
@@ -457,22 +466,22 @@ export default {
         startTime: '',
         id: record.id,
       }
-      state.opendrawer=true
+      state.opendrawer = true
       searchSubmitdrawer()
     }
     const handleLess = (record) => {
       dialog({
         content: '是否确认撤回 ?',
-        ok:()=>{
-          removeBySummaryId({summaryId:record.id}).then(res=>{
-            if(res.data.code == 200){
+        ok: () => {
+          removeBySummaryId({ summaryId: record.id }).then(res => {
+            if (res.data.code == 200) {
               message.success('撤回成功')
-              emits.emit('tableList',true)
+              emits.emit('tableList', true)
               searchSubmit()
-            }else{
+            } else {
               message.error(res.data.msg)
             }
-          }).catch(err=>{
+          }).catch(err => {
             message.error(err.data.msg)
           })
         }
@@ -481,17 +490,17 @@ export default {
     const handleDetail = (record) => {
       dialog({
         content: '是否确认撤回 ?',
-        ok:()=>{
-          removeBySummaryDetailId({detailId:record.detailId}).then(res=>{
-            if(res.data.code == 200){
+        ok: () => {
+          removeBySummaryDetailId({ detailId: record.detailId }).then(res => {
+            if (res.data.code == 200) {
               message.success('撤回成功')
-              emits.emit('tableList',true)
+              emits.emit('tableList', true)
               searchSubmit()
               searchSubmitdrawer()
-            }else{
+            } else {
               message.error(res.data.msg)
             }
-          }).catch(err=>{
+          }).catch(err => {
             message.destroy()
             message.error(err.data.msg)
           })
@@ -499,20 +508,20 @@ export default {
       })
     }
     const searchTimeChange = (e) => {
-      console.log(e,'eeeee')
-      if(e){
+      console.log(e, 'eeeee')
+      if (e) {
         state.drawer.startTime = e[0]
         state.drawer.endTime = e[1]
-      }else{
+      } else {
         state.drawer.startTime = ''
         state.drawer.endTime = ''
       }
-      
+
     }
     const pagination = computed(() => ({
       total: state.tableDataTotal,
       showSizeChanger: true,
-      showQuickJumper:true,
+      showQuickJumper: true,
       current: state.searchParam.pageNo,
       pageSize: state.searchParam.pageSize,
       onChange: changePagination,
@@ -528,51 +537,51 @@ export default {
       window.open(
         `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherSummary?&name=${state.searchParam.name ? state.searchParam.name : ""}&id=${state.searchParam.id ? state.searchParam.id : ""}&trainOrgId=${state.searchParam.trainOrgId || ''}`)
     }
-     //重置
-     const searchReset = () => {
-        state.searchParam = { 
-          pageNo: "1",
-          pageSize: "10",
-          id: props.id,
-          name : '',
-          payrollPlaceId: null,
-          departId: '',
-          summaryDate:'',
-          // trainOrgId: '',
-        };
-        getTableDate();
+    //重置
+    const searchReset = () => {
+      state.searchParam = {
+        pageNo: "1",
+        pageSize: "10",
+        id: props.id,
+        name: '',
+        payrollPlaceId: null,
+        departId: '',
+        summaryDate: '',
+        // trainOrgId: '',
       };
-      //二级页面重置
-      const searchResetdrawer =()=>{
-        const id = state.drawer.id
-        state.drawer={
-          name: '',
-          drawersearchdate: [],
-          pageNo: '1',
-          pageSize: '10',
-          endTime: '',
-          startTime: '',
-          id,
-        }
-        searchSubmitdrawer()
+      getTableDate();
+    };
+    //二级页面重置
+    const searchResetdrawer = () => {
+      const id = state.drawer.id
+      state.drawer = {
+        name: '',
+        drawersearchdate: [],
+        pageNo: '1',
+        pageSize: '10',
+        endTime: '',
+        startTime: '',
+        id,
       }
-      //二级页面查询
-      const searchSubmitdrawer=()=>{
-        state.tableLoadings = true
-        const params = {
-          summaryId: state.drawer.id,
-          name: state.drawer.name,
-          endTime: state.drawer.endTime,
-          startTime: state.drawer.startTime,
-        }
-        queryDetailId(params).then(res=>{
-          console.log(res,'resss')
-          tableDatas.value = res.data.data
-          state.tableLoadings = false
-        })
+      searchSubmitdrawer()
+    }
+    //二级页面查询
+    const searchSubmitdrawer = () => {
+      state.tableLoadings = true
+      const params = {
+        summaryId: state.drawer.id,
+        name: state.drawer.name,
+        endTime: state.drawer.endTime,
+        startTime: state.drawer.startTime,
       }
-      const  tableDatas = ref([])
-      const column = ref([
+      queryDetailId(params).then(res => {
+        console.log(res, 'resss')
+        tableDatas.value = res.data.data
+        state.tableLoadings = false
+      })
+    }
+    const tableDatas = ref([])
+    const column = ref([
       {
         title: '讲师姓名 ',
         dataIndex: 'name',
@@ -583,7 +592,7 @@ export default {
         customRender: (value) => {
           return (
             <div style="user-select: text">
-              {value.record?.name}  /  {value.record?.userNo}
+              { value.record?.name }  /  { value.record?.userNo }
             </div>
           );
         },
@@ -597,53 +606,53 @@ export default {
       //   width: 100,
       // },
       {
-          title: '课程名称 ',
-          dataIndex: 'courseName',
-          key: 'courseName',
+        title: '课程名称 ',
+        dataIndex: 'courseName',
+        key: 'courseName',
         ellipsis: true, align: "center",
-          width: 160,
-          customCell:()=>{return{style:{userSelect: 'text'}}}
-        },
-        {
-          title: '培训发生组织 ',
-          dataIndex: 'trainOrgName',
-          key: 'trainOrgName',
+        width: 160,
+        customCell: () => { return { style: { userSelect: 'text' } } }
+      },
+      {
+        title: '培训发生组织 ',
+        dataIndex: 'trainOrgName',
+        key: 'trainOrgName',
         ellipsis: true, align: "center",
-          width: 160,
-          customCell:()=>{return{style:{userSelect: 'text'}}}
-        },
-        {
-          title: '课程类型 ',
-          dataIndex: ' courseType',
-          key: ' courseType',
+        width: 160,
+        customCell: () => { return { style: { userSelect: 'text' } } }
+      },
+      {
+        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: '授课时长 ',
-          dataIndex: 'teachingTime',
-          key: 'teachingTime',
+        width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              { String(value.record.courseType)
+                ? {
+                  "0": "在线课",
+                  "1": "面授课",
+                  "2": "课程开发",
+                  "3": "作业员入模培训",
+                  "4": "其他",
+                }[value.record.courseType + ""]
+                : "-" }
+            </div>
+          )
+        }
+      },
+      {
+        title: '授课时长 ',
+        dataIndex: 'teachingTime',
+        key: 'teachingTime',
         ellipsis: true, align: "center",
-          width: 120,
-          customRender: ({text})=>{
-            return text ? text+'分钟' : '-'
-          }
-        },
+        width: 120,
+        customRender: ({ text }) => {
+          return text ? text + '分钟' : '-'
+        }
+      },
       {
         title: '授课时间',
         dataIndex: 'teachingDate',
@@ -654,19 +663,19 @@ export default {
         scopedSlots: { customRender: "teacherOrg" },
       },
       {
-          title: '讲师体系',
-          dataIndex: 'tsystemName',
-          key: 'tsystemName',
+        title: '讲师体系',
+        dataIndex: 'tsystemName',
+        key: 'tsystemName',
         ellipsis: true, align: "center",
-          width: 120,
-        },
+        width: 120,
+      },
       {
-          title: '讲师级别 ',
-          dataIndex: 'tlevelName',
-          key: 'tlevelName',
+        title: '讲师级别 ',
+        dataIndex: 'tlevelName',
+        key: 'tlevelName',
         ellipsis: true, align: "center",
-          width: 120,
-        },
+        width: 120,
+      },
       {
         title: '讲师发薪地 ',
         dataIndex: 'payrollPlace',
@@ -675,17 +684,17 @@ export default {
         align: "center",
         width: 120,
       },
-    
+
       {
-          title: '基准课酬 ',
-          dataIndex: 'levelPay',
-          key: 'levelPay',
+        title: '基准课酬 ',
+        dataIndex: 'levelPay',
+        key: 'levelPay',
         ellipsis: true, align: "center",
-          width: 100,
-          customRender: ({text})=>{
-            return text||text==0 ? text+'元' : '-'
-          }
-        },
+        width: 100,
+        customRender: ({ text }) => {
+          return text || text == 0 ? text + '元' : '-'
+        }
+      },
       {
         title: '计划费用 ',
         dataIndex: 'expense',
@@ -693,8 +702,8 @@ export default {
         ellipsis: true,
         align: "center",
         width: 100,
-        customRender: ({text})=>{
-          return text ? text+'元' : '-'
+        customRender: ({ text }) => {
+          return text ? text + '元' : '-'
         }
       },
       {
@@ -704,9 +713,9 @@ export default {
         ellipsis: true,
         align: "center",
         width: 100,
-        customCell:(text)=>{return{style:{color:colorSet(text)}}},
-        customRender: ({text})=>{
-          return text ? text+'元' : '-'
+        customCell: (text) => { return { style: { color: colorSet(text) } } },
+        customRender: ({ text }) => {
+          return text ? text + '元' : '-'
         }
       },
       {
@@ -720,30 +729,30 @@ export default {
         slots: { customRender: "action" },
       },
     ])
-         //取消按钮 清空输入的数据
-      const cancelTeachingDialog = () => {
-        state.opendrawer = false
-        
-        state.drawer={
-          name: '',
-          drawersearchdate: [],
-          pageNo: '1',
-          pageSize: '10',
-          endTime: '',
-          startTime: '',
-        }
-      };
-          //回车
-    const enterPressHadlerSearch = e => {
-  console.log("e",e);
-    if (e.keyCode === 13) {
-      searchSubmit()
+    //取消按钮 清空输入的数据
+    const cancelTeachingDialog = () => {
+      state.opendrawer = false
 
-    }
-};
+      state.drawer = {
+        name: '',
+        drawersearchdate: [],
+        pageNo: '1',
+        pageSize: '10',
+        endTime: '',
+        startTime: '',
+      }
+    };
+    //回车
+    const enterPressHadlerSearch = e => {
+      console.log("e", e);
+      if (e.keyCode === 13) {
+        searchSubmit()
+
+      }
+    };
     return {
       ...toRefs(state),
-      tableDatas, 
+      tableDatas,
       column,
       enterPressHadlerSearch,
       cancelTeachingDialog,
@@ -774,7 +783,7 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 .MonthlyStatistics {
   .header {
     padding: 0px 32px;
@@ -795,6 +804,7 @@ export default {
       // margin-left: 24px;
     }
   }
+
   width: 100%;
   height: 100%;
   display: flex;
@@ -804,18 +814,21 @@ export default {
     margin-left: 38px;
     margin-right: 38px;
     margin-top: 30px;
+
     // display: flex;
     // justify-content: space-between;
     // flex-wrap: wrap;
-      .select {
-        margin-right: 20px;
-        margin-bottom: 20px;
-      }
+    .select {
+      margin-right: 20px;
+      margin-bottom: 20px;
     }
+  }
 }
+
 .select .ant-picker {
   width: 410px !important;
 }
+
 .headers {
   height: 73px;
   border-bottom: 1px solid #e8e8e8;
@@ -834,6 +847,7 @@ export default {
     // margin-left: 24px;
   }
 }
+
 .addTimeBox {
   position: relative;
   display: flex;
@@ -1158,53 +1172,60 @@ export default {
   border-radius: 8px;
   margin-right: 20px
 }
-::v-deep  .ant-select:not(.ant-select-customize-input) .ant-select-selector{
+
+::v-deep .ant-select:not(.ant-select-customize-input) .ant-select-selector {
   // border-radius:8px;
-  height:32px;
+  height: 32px;
 }
-.ant-col-12{
-  height:90px;
+
+.ant-col-12 {
+  height: 90px;
 }
+
 .goback {
-        float: right;
-        padding-right: 70px;
-        //padding-top: 37px;
-        position: relative;
+  float: right;
+  padding-right: 70px;
+  //padding-top: 37px;
+  position: relative;
 
-        .return {
-          display: inline-block;
-          width: 42px;
-          height: 42px;
-          margin-top: 17px;
-          margin-right: 10px;
-          background-image: url("../../assets/images/projectadd/return.png");
-        }
+  .return {
+    display: inline-block;
+    width: 42px;
+    height: 42px;
+    margin-top: 17px;
+    margin-right: 10px;
+    background-image: url("../../assets/images/projectadd/return.png");
+  }
 
-        .returntext {
-          display: inline-block;
-          position: absolute;
-          top: 12px;
-          color: #4ea6ff;
-          font-size: 14px;
-        }
-      }
-      tableBox {
-padding-bottom: 20px;
-margin: 20px 38px 30px;
-::v-deep .ant-select-dropdown{
- display: inline-block;
+  .returntext {
+    display: inline-block;
+    position: absolute;
+    top: 12px;
+    color: #4ea6ff;
+    font-size: 14px;
+  }
 }
-::v-deep .ant-select-selection-item{
-margin-left: 3px;
+
+tableBox {
+  padding-bottom: 20px;
+  margin: 20px 38px 30px;
+
+  ::v-deep .ant-select-dropdown {
+    display: inline-block;
+  }
+
+  ::v-deep .ant-select-selection-item {
+    margin-left: 3px;
+  }
+
+  ::v-deep .ant-pagination-options-size-changer.ant-select {
+    width: 84px;
+  }
+
+  .pa {
+    width: 100%;
+    display: flex;
+    justify-content: right;
+  }
 }
-::v-deep .ant-pagination-options-size-changer.ant-select{
-width: 84px;
-}
-.pa {
-width: 100%;
-display: flex;
-justify-content: right;
-}
-}
-      </style>
-  
\ No newline at end of file
+</style>
\ No newline at end of file

From c4ee10f3daef93d0ebb5ff3b22c8ead8f77eb097 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 17:21:01 +0800
Subject: [PATCH 094/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E4=B8=8B=20=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/MonthlyStatistics.vue | 27 ++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue
index e8b7fb88..f9dbd03b 100644
--- a/src/views/lecturer/MonthlyStatistics.vue
+++ b/src/views/lecturer/MonthlyStatistics.vue
@@ -65,13 +65,13 @@
             <UploadOutlined />导出
           </a-button>
         </div>
-        <div v-if="checkMenu('lecturerSummaryExport')" style="display: flex; margin-bottom: 20px">
-          <a-button class="resetbtn" @click="handleFeeMonthly" type="primary">
+        <div v-if="checkMenu('lecturerMonthDown')" style="display: flex; margin-bottom: 20px">
+          <a-button class="resetbtn" @click="handleFeeMonthlyDown" type="primary">
             <UploadOutlined />讲师月度费用下载
           </a-button>
         </div>
-        <div v-if="checkMenu('lecturerSummaryExport')" style="display: flex; margin-bottom: 20px">
-          <a-button class="resetbtn" @click="handleFeeMonthly" type="primary">
+        <div v-if="checkMenu('lecturerMonthDetailDown')" style="display: flex; margin-bottom: 20px">
+          <a-button class="resetbtn" @click="handleFeeMonthlyDetail" type="primary">
             <UploadOutlined />讲师费用详情下载
           </a-button>
         </div>
@@ -537,6 +537,23 @@ export default {
       window.open(
         `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherSummary?&name=${state.searchParam.name ? state.searchParam.name : ""}&id=${state.searchParam.id ? state.searchParam.id : ""}&trainOrgId=${state.searchParam.trainOrgId || ''}`)
     }
+
+    // 讲师月度费用下载
+    const handleFeeMonthlyDown = () => {
+      console.log("handleFeeMonthlyDown state.searchParam.id param" , state.searchParam.id)
+      // window.open(
+      // `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherSummary?&name=${state.searchParam.name ? state.searchParam.name : ""}&id=${state.searchParam.id ? state.searchParam.id : ""}&trainOrgId=${state.searchParam.trainOrgId || ''}`)
+    }
+
+     // 讲师费用详情下载
+    const handleFeeMonthlyDetail = () => {
+      console.log("handleFeeMonthlyDetail state.searchParam.id param" , state.searchParam.id)
+
+      // window.open(
+      // `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherSummary?&name=${state.searchParam.name ? state.searchParam.name : ""}&id=${state.searchParam.id ? state.searchParam.id : ""}&trainOrgId=${state.searchParam.trainOrgId || ''}`)
+    }
+
+
     //重置
     const searchReset = () => {
       state.searchParam = {
@@ -758,6 +775,8 @@ export default {
       cancelTeachingDialog,
       searchReset,
       handleFeeMonthly,
+      handleFeeMonthlyDown,
+      handleFeeMonthlyDetail,
       handleLook,
       handleLess,
       handleDetail,

From 3ec80d27ef1e85f5562840cf3e7be79744b5c0d1 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 17:25:32 +0800
Subject: [PATCH 095/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E4=B8=8B=20=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/MonthlyStatistics.vue | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue
index f9dbd03b..70e9b07d 100644
--- a/src/views/lecturer/MonthlyStatistics.vue
+++ b/src/views/lecturer/MonthlyStatistics.vue
@@ -60,18 +60,14 @@
           </div>
         </a-form>
         <div style="width: 100%;"></div>
-        <div v-if="checkMenu('lecturerSummaryExport')" style="display: flex; margin-bottom: 20px">
-          <a-button class="resetbtn" @click="handleFeeMonthly" type="primary">
+        <div  style="display: flex; margin-bottom: 20px">
+          <a-button v-if="checkMenu('lecturerSummaryExport')" class="resetbtn" @click="handleFeeMonthly" type="primary">
             <UploadOutlined />导出
           </a-button>
-        </div>
-        <div v-if="checkMenu('lecturerMonthDown')" style="display: flex; margin-bottom: 20px">
-          <a-button class="resetbtn" @click="handleFeeMonthlyDown" type="primary">
+          <a-button v-if="checkMenu('lecturerMonthDown')" class="resetbtn" @click="handleFeeMonthlyDown" type="primary">
             <UploadOutlined />讲师月度费用下载
           </a-button>
-        </div>
-        <div v-if="checkMenu('lecturerMonthDetailDown')" style="display: flex; margin-bottom: 20px">
-          <a-button class="resetbtn" @click="handleFeeMonthlyDetail" type="primary">
+          <a-button v-if="checkMenu('lecturerMonthDetailDown')" class="resetbtn" @click="handleFeeMonthlyDetail" type="primary">
             <UploadOutlined />讲师费用详情下载
           </a-button>
         </div>

From bb49bbbdf3b62bf906a0ff5acba7b24486a9a86b Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 18:06:21 +0800
Subject: [PATCH 096/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E4=B8=8B=20=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/MonthlyStatistics.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue
index 70e9b07d..55dd25ff 100644
--- a/src/views/lecturer/MonthlyStatistics.vue
+++ b/src/views/lecturer/MonthlyStatistics.vue
@@ -537,16 +537,15 @@ export default {
     // 讲师月度费用下载
     const handleFeeMonthlyDown = () => {
       console.log("handleFeeMonthlyDown state.searchParam.id param" , state.searchParam.id)
-      // window.open(
-      // `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherSummary?&name=${state.searchParam.name ? state.searchParam.name : ""}&id=${state.searchParam.id ? state.searchParam.id : ""}&trainOrgId=${state.searchParam.trainOrgId || ''}`)
+      window.open(
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherDimension?&billId=${state.searchParam.id ? state.searchParam.id : ""}`)
     }
 
      // 讲师费用详情下载
     const handleFeeMonthlyDetail = () => {
       console.log("handleFeeMonthlyDetail state.searchParam.id param" , state.searchParam.id)
-
-      // window.open(
-      // `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherSummary?&name=${state.searchParam.name ? state.searchParam.name : ""}&id=${state.searchParam.id ? state.searchParam.id : ""}&trainOrgId=${state.searchParam.trainOrgId || ''}`)
+      window.open(
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherDimensionDetail?&billId=${state.searchParam.id ? state.searchParam.id : ""}`)
     }
 
 

From 247414d561be26439ba11ee85d4b464f1f45bae3 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 18:24:58 +0800
Subject: [PATCH 097/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E4=B8=8B=20=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideLecturer.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 1027a80b..aeaed22b 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -1344,8 +1344,10 @@ export default {
     }
     //导出功能
     const handleExport = () => {
+      console.log("handleExport state.searchParam",state.searchParam)
+
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacher?name=${state.searchParam.name || ""}&tSystemId=${state.searchParam.tSystemId || ""}&tLevelName=${state.searchParam.tLevelName || ""}&waitStatus=${state.searchParam.waitStatus || ""}&certStatus=${state.searchParam.certStatus || ""}&courses=${state.searchParam.courses || ""}`
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacher?name=${state.searchParam.name || ""}&tSystemId=${state.searchParam.tSystemId || ""}&tLevelName=${state.searchParam.tLevelName || ""}&waitStatus=${state.searchParam.waitStatus || ""}&certStatus=${state.searchParam.certStatus || ""}&courses=${state.searchParam.courses || ""}&teacherType=${state.searchParam.teacherType || ""}`
       );
       // this.download('lesson_records/export', {
       //           ...state.searchParam

From af0babc3945d0236cacf61251f438783e576d1b0 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 19:06:11 +0800
Subject: [PATCH 098/157] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/Organization.vue | 1717 ++++++++++++++++-----------
 1 file changed, 1000 insertions(+), 717 deletions(-)

diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index b43ee3b9..16093486 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -1,69 +1,127 @@
 <!-- 归属组织 -->
 <template>
- <!-- 搜索框及按钮 -->
- <div class="filter" style="min-width: 1380px; margin: 20px;" >
-      <a-form   layout="inline">
-        <a-form-item class="select">
-          <div>
-          <a-input style="width: 235px; height: 40px; border-radius: 8px" v-model:value="searchParam.name" placeholder="请输入编号/名称进行搜索"
-          v-on:keydown.enter="enterPressHadlerSearch" />
-          </div>
-        </a-form-item>
-        <a-form-item class="select">
-          <div>
-            <a-select style="width: 235px" v-model:value="searchParam.isParent" placeholder="请选择节点类型" allowClear
-              :options="TrainOrglist" 
-              v-on:keydown.enter="enterPressHadlerSearch"/>
-          </div>
-        </a-form-item>
-        <a-form-item class="select">
-          <div>
-          <a-input style="width: 235px; height: 40px; border-radius: 8px" v-model:value="searchParam.leaderName" placeholder="请输入担当姓名/工号"
-          v-on:keydown.enter="enterPressHadlerSearch" />
-          </div>
-        </a-form-item>
-        <div style="display: flex; margin-bottom: 20px">
-          <a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
-          <!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
-          <!-- <div class="search"></div> -->
-          <a-button class="resetbtn " @click="searchReset">重置</a-button>
-        </div>
-        </a-form>
-        <div style="width: 100%;"></div>
-      <div style="display: flex; margin-bottom: 20px">
-        <a-button v-if="checkMenu('lecturerTrainOrgAdd')" @click="addTeacher()" type="primary" class="resetbtn" style="width: 164px;">
-          <div class="search"></div> 新增培训发生组织
-        </a-button>
-        <div
-          class="btnn btn2"
-          @click="downOpen"
-          style="margin-right: 14px"
-           v-if="checkMenu('lecturerTrainOrgExport')"
-        >
-          <div class="daochu"></div>
-          <div class="btnText">导出</div>
-        </div>
-      </div>
-      <a-table style="border: 1px solid #f2f6fe" :columns="columns" :data-source="tableData" :loading="tableLoading"
-          @expand="expandTable" :pagination="false">
-          <template #bodyCell="{ record, column }">
-            <template v-if="column.key === 'operation'">
-              <a-space >
-                <lockLecturer :parentName="record.parentName" :id="record.id" :title="'培训发生组织详情'" @searchList="searchList">
-                    <div style="color: #1890ff;cursor: pointer;">查看</div>
-                </lockLecturer>
-                <a-button v-if="record.status!=2&&checkMenu('lecturerTrainOrgEdit')" type="link" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
-                <a-button v-if="record.status==2&&false" type="link" @click="() => updateModal(record)">撤回</a-button>
-                <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
-                 <a-button @click="isEnablePost(record,0)" v-if="record.enable&&checkMenu('lecturerTrainOrgStop')" type="link" >启用</a-button>
-                 <a-button @click="isEnablePost(record,1)" v-if="!record.enable&&checkMenu('lecturerTrainOrgStop')" type="link" >停用</a-button>
-              </a-space>
-            </template>
-            </template>
-            </a-table>
-            <div class="tableBox ">
-      <div class="pa">
+  <a-tabs v-model:activeKey="activeKey">
+    <a-tab-pane key="1" tab="培训发僧组织列表"> 培训发僧组织列表 </a-tab-pane>
+    <!-- v-if="lecturerAdmin('lecturer-admin')" -->
+    <a-tab-pane key="2" tab="审批中心"> 审批中心 </a-tab-pane>
+  </a-tabs>
 
+  <!-- 搜索框及按钮 -->
+  <div class="filter" style="min-width: 1380px; margin: 20px">
+    <a-form layout="inline">
+      <a-form-item class="select">
+        <div>
+          <a-input
+            style="width: 235px; height: 40px; border-radius: 8px"
+            v-model:value="searchParam.name"
+            placeholder="请输入编号/名称进行搜索"
+            v-on:keydown.enter="enterPressHadlerSearch"
+          />
+        </div>
+      </a-form-item>
+      <a-form-item class="select">
+        <div>
+          <a-select
+            style="width: 235px"
+            v-model:value="searchParam.isParent"
+            placeholder="请选择节点类型"
+            allowClear
+            :options="TrainOrglist"
+            v-on:keydown.enter="enterPressHadlerSearch"
+          />
+        </div>
+      </a-form-item>
+      <a-form-item class="select">
+        <div>
+          <a-input
+            style="width: 235px; height: 40px; border-radius: 8px"
+            v-model:value="searchParam.leaderName"
+            placeholder="请输入担当姓名/工号"
+            v-on:keydown.enter="enterPressHadlerSearch"
+          />
+        </div>
+      </a-form-item>
+      <div style="display: flex; margin-bottom: 20px">
+        <a-button @click="searchSubmit()" type="primary" class="resetbtn"
+          >查询
+        </a-button>
+        <!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
+        <!-- <div class="search"></div> -->
+        <a-button class="resetbtn" @click="searchReset">重置</a-button>
+      </div>
+    </a-form>
+    <div style="width: 100%"></div>
+    <div style="display: flex; margin-bottom: 20px">
+      <a-button
+        v-if="checkMenu('lecturerTrainOrgAdd')"
+        @click="addTeacher()"
+        type="primary"
+        class="resetbtn"
+        style="width: 164px"
+      >
+        <div class="search"></div>
+        新增培训发生组织
+      </a-button>
+      <div
+        class="btnn btn2"
+        @click="downOpen"
+        style="margin-right: 14px"
+        v-if="checkMenu('lecturerTrainOrgExport')"
+      >
+        <div class="daochu"></div>
+        <div class="btnText">导出</div>
+      </div>
+    </div>
+    <a-table
+      style="border: 1px solid #f2f6fe"
+      :columns="columns"
+      :data-source="tableData"
+      :loading="tableLoading"
+      @expand="expandTable"
+      :pagination="false"
+    >
+      <template #bodyCell="{ record, column }">
+        <template v-if="column.key === 'operation'">
+          <a-space>
+            <lockLecturer
+              :parentName="record.parentName"
+              :id="record.id"
+              :title="'培训发生组织详情'"
+              @searchList="searchList"
+            >
+              <div style="color: #1890ff; cursor: pointer">查看</div>
+            </lockLecturer>
+            <a-button
+              v-if="record.status != 2 && checkMenu('lecturerTrainOrgEdit')"
+              type="link"
+              @click="() => handleModify(record, String(record.courseform))"
+              >编辑</a-button
+            >
+            <a-button
+              v-if="record.status == 2 && false"
+              type="link"
+              @click="() => updateModal(record)"
+              >撤回</a-button
+            >
+            <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
+            <a-button
+              @click="isEnablePost(record, 0)"
+              v-if="record.enable && checkMenu('lecturerTrainOrgStop')"
+              type="link"
+              >启用</a-button
+            >
+            <a-button
+              @click="isEnablePost(record, 1)"
+              v-if="!record.enable && checkMenu('lecturerTrainOrgStop')"
+              type="link"
+              >停用</a-button
+            >
+          </a-space>
+        </template>
+      </template>
+    </a-table>
+    <div class="tableBox">
+      <div class="pa">
         <a-pagination
           v-if="tableDataTotal > 10"
           :showSizeChanger="true"
@@ -77,10 +135,14 @@
         />
       </div>
     </div>
-             <!-- 删除功能弹窗 -->
+    <!-- 删除功能弹窗 -->
     <div>
-      <a-modal v-model:visible="deleteInTeacherdialog" :footer="null" :closable="close"
-        centered="true">
+      <a-modal
+        v-model:visible="deleteInTeacherdialog"
+        :footer="null"
+        :closable="close"
+        centered="true"
+      >
         <div class="delete">
           <div class="del_header"></div>
           <div class="del_main">
@@ -92,7 +154,11 @@
               <span>您确定要删除当前组织吗</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn2" @click="cancelTeacherDialog" style="margin-right: 32px">
+              <div
+                class="del_btn btn2"
+                @click="cancelTeacherDialog"
+                style="margin-right: 32px"
+              >
                 <div class="btnText">取消</div>
               </div>
               <div class="del_btn btn2" @click="closeDeleteTeacher">
@@ -107,8 +173,16 @@
     <div class="example" v-if="example">
       <a-spin />
     </div>
-    <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" :closable="false" :title="false" placement="right" width="60%" :maskClosable="false" >
-      <div style="padding:24px;">
+    <a-drawer
+      class="largeDrawerInside"
+      v-model:visible="teacherdialog"
+      :closable="false"
+      :title="false"
+      placement="right"
+      width="60%"
+      :maskClosable="false"
+    >
+      <div style="padding: 24px">
         <div class="headers" style="margin-top: -24px">
           <div class="headerTitle">{{ teacherdialogtitle }}</div>
           <img
@@ -117,41 +191,54 @@
             @click="cancelTeacherDialog"
           />
         </div>
-      <a-form :model="formParam" layout="vertical"   ref="formRef">
+        <a-form :model="formParam" layout="vertical" ref="formRef">
           <a-row :gutter="16">
             <a-col :span="24">
-            <!-- <span class="line"></span><span>讲师体系基本信息</span> -->
-          </a-col>
+              <!-- <span class="line"></span><span>讲师体系基本信息</span> -->
+            </a-col>
           </a-row>
           <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item name="affiliationCode">
                 <template v-slot:label>
                   <img
-                    style="margin-right:4px;width: 7px;height: 7px"
+                    style="margin-right: 4px; width: 7px; height: 7px"
                     src="@/assets/images/coursewareManage/asterisk.png"
                     alt=""
                   />
                   培训发生组织编号：
                 </template>
-          <a-input disabled v-model:value="formParam.affiliationCode"  class="draitem"
-                    placeholder="请输入讲师体系编号" allowClear showSearch>
-                    </a-input>
+                <a-input
+                  disabled
+                  v-model:value="formParam.affiliationCode"
+                  class="draitem"
+                  placeholder="请输入讲师体系编号"
+                  allowClear
+                  showSearch
+                >
+                </a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item name="affiliationName">
                 <template v-slot:label>
                   <img
-                    style="margin-right:4px;width: 7px;height: 7px"
+                    style="margin-right: 4px; width: 7px; height: 7px"
                     src="@/assets/images/coursewareManage/asterisk.png"
                     alt=""
                   />
                   培训发生组织名称：
                 </template>
-          <a-input :maxlength="30" show-count v-model:value="formParam.affiliationName"  class="draitem"
-                    placeholder="请输入培训发生组织名称" allowClear showSearch>
-                    </a-input>
+                <a-input
+                  :maxlength="30"
+                  show-count
+                  v-model:value="formParam.affiliationName"
+                  class="draitem"
+                  placeholder="请输入培训发生组织名称"
+                  allowClear
+                  showSearch
+                >
+                </a-input>
               </a-form-item>
             </a-col>
           </a-row>
@@ -160,39 +247,65 @@
               <a-form-item name="code">
                 <template v-slot:label>
                   <img
-                    style="margin-right:4px;width: 7px;height: 7px"
+                    style="margin-right: 4px; width: 7px; height: 7px"
                     src="@/assets/images/coursewareManage/asterisk.png"
                     alt=""
                   />
                   是否为根节点：
                 </template>
-                <div style="display: flex;align-items: center;">
-                  <a-radio-group :disabled="formParam.locking" style="min-width:126px;" @change="selectRadio" v-model:value="formParam.isParent" name="radioGroup">
+                <div style="display: flex; align-items: center">
+                  <a-radio-group
+                    :disabled="formParam.locking"
+                    style="min-width: 126px"
+                    @change="selectRadio"
+                    v-model:value="formParam.isParent"
+                    name="radioGroup"
+                  >
                     <a-radio :value="1">否</a-radio>
                     <a-radio :value="0">是</a-radio>
                   </a-radio-group>
-                <a-select :disabled="formParam.locking" v-model:value="formParam.code" :placeholder="!formParam.isParent?'请选择审批层级':'请选择根节点'"
-                  :options="!formParam.isParent?PlaceOfPayList:PlaceOfPayListTwo" allowClear showSearch/>
+                  <a-select
+                    :disabled="formParam.locking"
+                    v-model:value="formParam.code"
+                    :placeholder="
+                      !formParam.isParent ? '请选择审批层级' : '请选择根节点'
+                    "
+                    :options="
+                      !formParam.isParent ? PlaceOfPayList : PlaceOfPayListTwo
+                    "
+                    allowClear
+                    showSearch
+                  />
                 </div>
-            </a-form-item>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item name="actValue">
                 <template v-slot:label>
                   <img
-                    style="margin-right:4px;width: 7px;height: 7px"
+                    style="margin-right: 4px; width: 7px; height: 7px"
                     src="@/assets/images/coursewareManage/asterisk.png"
                     alt=""
                   />
                   组织担当：
                 </template>
-              <!-- <a-select v-model:value="formParam.zzfzr" placeholder="请选择组织负责人"
+                <!-- <a-select v-model:value="formParam.zzfzr" placeholder="请选择组织负责人"
                     :options="PlaceOfPayList" allowClear showSearch/> -->
                 <!-- <ProjectManager :type="0" v-model:value="formParam.actValue" :placeholder="'请选择担当'" v-model:arrayList="formParam.actArray" ></ProjectManager> -->
-                <AddApprover :title="'组织担当'" v-model:arrayList="formParam.actArray" @valueChange="valueChange" :type="0">
-                  <a-select style="width:100%" v-model:value="formParam.actValue" :open="false" :placeholder="'请选择担当'"></a-select>
+                <AddApprover
+                  :title="'组织担当'"
+                  v-model:arrayList="formParam.actArray"
+                  @valueChange="valueChange"
+                  :type="0"
+                >
+                  <a-select
+                    style="width: 100%"
+                    v-model:value="formParam.actValue"
+                    :open="false"
+                    :placeholder="'请选择担当'"
+                  ></a-select>
                 </AddApprover>
-            </a-form-item>
+              </a-form-item>
             </a-col>
           </a-row>
           <a-row :gutter="16" v-if="formParam.isParent">
@@ -200,7 +313,7 @@
               <a-form-item name="leveOneValue">
                 <template v-slot:label>
                   <img
-                    style="margin-right:4px;width: 7px;height: 7px"
+                    style="margin-right: 4px; width: 7px; height: 7px"
                     src="@/assets/images/coursewareManage/asterisk.png"
                     alt=""
                   />
@@ -208,158 +321,230 @@
                 </template>
                 <!-- <a-select v-model:value="formParam.yjspr" placeholder="请选择一级审批人"
                     :options="PlaceOfPayList" allowClear showSearch/> -->
-                    <!-- <ProjectManager :type="1" v-model:value="formParam.leveOneValue" :placeholder="'请选择一级审批人'" v-model:arrayList="formParam.leveOneArray" ></ProjectManager> -->
-                    <AddApprover :title="'一级审批人'" v-model:arrayList="formParam.leveOneArray" @valueChange="valueChange" :type="1">
-                      <a-select style="width:100%" v-model:value="formParam.leveOneValue" :open="false" :placeholder="'请选择一级审批人'"></a-select>
-                    </AddApprover>
+                <!-- <ProjectManager :type="1" v-model:value="formParam.leveOneValue" :placeholder="'请选择一级审批人'" v-model:arrayList="formParam.leveOneArray" ></ProjectManager> -->
+                <AddApprover
+                  :title="'一级审批人'"
+                  v-model:arrayList="formParam.leveOneArray"
+                  @valueChange="valueChange"
+                  :type="1"
+                >
+                  <a-select
+                    style="width: 100%"
+                    v-model:value="formParam.leveOneValue"
+                    :open="false"
+                    :placeholder="'请选择一级审批人'"
+                  ></a-select>
+                </AddApprover>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="二级审批人">
-              <!-- <a-select v-model:value="formParam.zzfzr" placeholder="请选择二级审批人"
+                <!-- <a-select v-model:value="formParam.zzfzr" placeholder="请选择二级审批人"
                     :options="PlaceOfPayList" allowClear showSearch/> -->
-                    <!-- <ProjectManager :type="1" :placeholder="'请选择二级审批人'" v-model:arrayList="formParam.leveTwoArray" ></ProjectManager> -->
-                    <AddApprover :title="'二级审批人'" v-model:arrayList="formParam.leveTwoArray" @valueChange="valueChange" :type="2">
-                      <a-select style="width:100%" v-model:value="formParam.leveTwoValue" :open="false" :placeholder="'请选择二级审批人'"></a-select>
-                    </AddApprover>
-            </a-form-item>
+                <!-- <ProjectManager :type="1" :placeholder="'请选择二级审批人'" v-model:arrayList="formParam.leveTwoArray" ></ProjectManager> -->
+                <AddApprover
+                  :title="'二级审批人'"
+                  v-model:arrayList="formParam.leveTwoArray"
+                  @valueChange="valueChange"
+                  :type="2"
+                >
+                  <a-select
+                    style="width: 100%"
+                    v-model:value="formParam.leveTwoValue"
+                    :open="false"
+                    :placeholder="'请选择二级审批人'"
+                  ></a-select>
+                </AddApprover>
+              </a-form-item>
             </a-col>
           </a-row>
           <a-row :gutter="16">
             <a-col :span="12" v-if="formParam.isParent">
-              <a-form-item label="三级审批人" >
+              <a-form-item label="三级审批人">
                 <!-- <a-select v-model:value="formParam.sjspr" placeholder="请选择三级审批人"
                     :options="PlaceOfPayList" allowClear showSearch/> -->
-                    <!-- <ProjectManager :type="1" :placeholder="'请选择三级审批人'" v-model:arrayList="formParam.leveThreeArray" ></ProjectManager> -->
-                    <AddApprover :title="'三级审批人'" v-model:arrayList="formParam.leveThreeArray" @valueChange="valueChange" :type="3">
-                      <a-select style="width:100%" v-model:value="formParam.leveThreeValue" :open="false" :placeholder="'请选择三级审批人'"></a-select>
-                    </AddApprover>
+                <!-- <ProjectManager :type="1" :placeholder="'请选择三级审批人'" v-model:arrayList="formParam.leveThreeArray" ></ProjectManager> -->
+                <AddApprover
+                  :title="'三级审批人'"
+                  v-model:arrayList="formParam.leveThreeArray"
+                  @valueChange="valueChange"
+                  :type="3"
+                >
+                  <a-select
+                    style="width: 100%"
+                    v-model:value="formParam.leveThreeValue"
+                    :open="false"
+                    :placeholder="'请选择三级审批人'"
+                  ></a-select>
+                </AddApprover>
               </a-form-item>
             </a-col>
-            <a-col :span="12" v-if="formParam.isParent==0">
+            <a-col :span="12" v-if="formParam.isParent == 0">
               <a-form-item name="isContains">
                 <template v-slot:label>
                   <img
-                    style="margin-right:4px;width: 7px;height: 7px"
+                    style="margin-right: 4px; width: 7px; height: 7px"
                     src="@/assets/images/coursewareManage/asterisk.png"
                     alt=""
                   />
                   审批流程是否加该担当
                 </template>
-                <a-select v-model:value="formParam.isContains" placeholder="请选择审批流程是否加担当"
-                  :options="isConSelect" allowClear showSearch/>
+                <a-select
+                  v-model:value="formParam.isContains"
+                  placeholder="请选择审批流程是否加担当"
+                  :options="isConSelect"
+                  allowClear
+                  showSearch
+                />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="备注" >
-                <a-input v-model:value="formParam.remark" showCount :maxlength="200"
-                  style="width: 100%; height: 40px; border-radius: 8px" placeholder="请输入" />
+              <a-form-item label="备注">
+                <a-input
+                  v-model:value="formParam.remark"
+                  showCount
+                  :maxlength="200"
+                  style="width: 100%; height: 40px; border-radius: 8px"
+                  placeholder="请输入"
+                />
               </a-form-item>
             </a-col>
           </a-row>
-        <a-form-item name="orglistName">
-          <template v-slot:label>
-            <img
-              style="margin-right:4px;width: 7px;height: 7px"
-              src="@/assets/images/coursewareManage/asterisk.png"
-              alt=""
-            />
-            选择管理组织
-          </template>
-          <a-row :gutter="50" style="margin-bottom: 10px;">
-            <a-col :span="2">
-        <!-- <a-tag color="blue" style="line-height: 40px; ">管理业务</a-tag> -->
-        <a-button type="primary" @click="addContentData" style="width: 100px; height: 40px;border-radius: 8px">添加组织</a-button>
-        </a-col>
-        <!-- <a-col :span="20">
+          <a-form-item name="orglistName">
+            <template v-slot:label>
+              <img
+                style="margin-right: 4px; width: 7px; height: 7px"
+                src="@/assets/images/coursewareManage/asterisk.png"
+                alt=""
+              />
+              选择管理组织
+            </template>
+            <a-row :gutter="50" style="margin-bottom: 10px">
+              <a-col :span="2">
+                <!-- <a-tag color="blue" style="line-height: 40px; ">管理业务</a-tag> -->
+                <a-button
+                  type="primary"
+                  @click="addContentData"
+                  style="width: 100px; height: 40px; border-radius: 8px"
+                  >添加组织</a-button
+                >
+              </a-col>
+              <!-- <a-col :span="20">
         <div class="add_content" @click="addContentData" >+</div>
         </a-col> -->
-        </a-row>
+            </a-row>
           </a-form-item>
-                <!-- 备注 remark -->
-                <a-row :gutter="16" style="padding-bottom: 60px;">
+          <!-- 备注 remark -->
+          <a-row :gutter="16" style="padding-bottom: 60px">
             <a-col :span="24">
               <a-form-item label="">
                 <!-- <a-textarea v-model:value="formParam.remark" showCount :maxlength="200"
                   style="width: 100%; height: 100px; border-radius: 8px" placeholder="请输入" /> -->
-                  <a-table :dataSource="formParam?.affiliationOrgList" :scroll="{ x: '600' }" :columns="orgColumns"/>
+                <a-table
+                  :dataSource="formParam?.affiliationOrgList"
+                  :scroll="{ x: '600' }"
+                  :columns="orgColumns"
+                />
               </a-form-item>
             </a-col>
           </a-row>
-          </a-form>
+        </a-form>
         <!-- 交互按钮 -->
         <div
-        :style="{
-          position: 'absolute',
-          right: 0,
-          bottom: 0,
-          width: '100%',
-          borderTop: '1px solid #e9e9e9',
-          padding: '10px 16px',
-          background: '#fff',
-          textAlign: 'right',
-          zIndex: 1,
-        } "
-      >
-        <a-button class="drabtn"  @click="cancelTeacherDialog" >取消</a-button>
-        <a-button  class="drabtn" type="primary" @click="createTeacherDialog(0)" :loading="buttonLoading">保存</a-button>
-        <a-button v-if="editParams||editIndex>1" class="drabtn" type="primary" @click="createTeacherDialog(1)" :loading="buttonLoading">提交</a-button>
-      </div>
-    </div>
-    </a-drawer>
-    <AddOrgContent :Addtitle="'选择组织'" :isParent="formParam.isParent" v-model:showContent="showContent" :AddContentLists="formParam.affiliationOrgLists" v-model:AddContentList="formParam.affiliationOrgList" />
+          :style="{
+            position: 'absolute',
+            right: 0,
+            bottom: 0,
+            width: '100%',
+            borderTop: '1px solid #e9e9e9',
+            padding: '10px 16px',
+            background: '#fff',
+            textAlign: 'right',
+            zIndex: 1,
+          }"
+        >
+          <a-button class="drabtn" @click="cancelTeacherDialog">取消</a-button>
+          <a-button
+            class="drabtn"
+            type="primary"
+            @click="createTeacherDialog(0)"
+            :loading="buttonLoading"
+            >保存</a-button
+          >
+          <a-button
+            v-if="editParams || editIndex > 1"
+            class="drabtn"
+            type="primary"
+            @click="createTeacherDialog(1)"
+            :loading="buttonLoading"
+            >提交</a-button
+          >
         </div>
+      </div>
+    </a-drawer>
+    <AddOrgContent
+      :Addtitle="'选择组织'"
+      :isParent="formParam.isParent"
+      v-model:showContent="showContent"
+      :AddContentLists="formParam.affiliationOrgLists"
+      v-model:AddContentList="formParam.affiliationOrgList"
+    />
+  </div>
 </template>
 <script lang="jsx">
 import { reactive, toRefs, ref, watch } from "vue";
-import {
-  FolderAddOutlined
-} from '@ant-design/icons-vue';
+import { FolderAddOutlined } from "@ant-design/icons-vue";
 import { message } from "ant-design-vue";
 import dialog from "@/utils/dialog";
 import ProjectManager from "@/components/project/ProjectManagerLecturer";
-import { queryTrainOrg,deleteTrainOrg,addReviewer,updateTrainOrg} from "../../api/organization";
-import AddOrgContent from "../../components/project/AddOrgContent.vue"
+import {
+  queryTrainOrg,
+  deleteTrainOrg,
+  addReviewer,
+  updateTrainOrg,
+} from "../../api/organization";
+import AddOrgContent from "../../components/project/AddOrgContent.vue";
 import * as lecturer from "../../api/Lecturer.js";
-import lockLecturer from "@/components/project/lockLecturer"
-import AddApprover from '@/components/project/AddApprover'
-import { checkMenu } from '@/utils/utils'
-export default{
-    name:"organization",
-    components: {
-      ProjectManager,
-      FolderAddOutlined,//图标--新增
-      AddOrgContent,
-      lockLecturer,
-      AddApprover,
-    },
-    setup() {
-      const formRef = ref();
-      const state = reactive({
-        example: false,
-        editParams: true,
-        editIndex: 0,
-        tableDataTotal: 0,
-      vf:true,
+import lockLecturer from "@/components/project/lockLecturer";
+import AddApprover from "@/components/project/AddApprover";
+import { checkMenu } from "@/utils/utils";
+export default {
+  name: "organization",
+  components: {
+    ProjectManager,
+    FolderAddOutlined, //图标--新增
+    AddOrgContent,
+    lockLecturer,
+    AddApprover,
+  },
+  setup() {
+    const formRef = ref();
+
+    const state = reactive({
+      example: false,
+      editParams: true,
+      editIndex: 0,
+      tableDataTotal: 0,
+      vf: true,
       showContent: false,
-      tableLoading:false,
-      deleteInTeacherdialog:false,
-      teacherdialog:false,
-      teacherdialogtitle:null,
-      delId:null,
+      tableLoading: false,
+      deleteInTeacherdialog: false,
+      teacherdialog: false,
+      teacherdialogtitle: null,
+      delId: null,
       searchParam: {
-        name:null,
+        name: null,
         isParent: null,
         leaderName: null,
         pageNo: "1",
-        pageSize: "10"
+        pageSize: "10",
       },
-      formParam:{
+      formParam: {
         orglistName: null,
-        affiliationCode:null,
-        affiliationName:null,
+        affiliationCode: null,
+        affiliationName: null,
         isParent: 1,
-        remark:null,
+        remark: null,
         actValue: null,
         actArray: [],
         leveOneValue: null,
@@ -369,46 +554,46 @@ export default{
         leveTwoArray: [],
         leveThreeArray: [],
         code: null,
-        isContains: '0',
+        isContains: "0",
         affiliationOrgList: [],
-        affiliationOrgLists:[],
+        affiliationOrgLists: [],
         locking: 1,
       },
-    })
+    });
     const PlaceOfPayList = ref([
-      { value: '1', label: "一级审批" },
-      { value: '2', label: "二级审批" },
-      { value: '3', label: "三级审批" },
-    ])
+      { value: "1", label: "一级审批" },
+      { value: "2", label: "二级审批" },
+      { value: "3", label: "三级审批" },
+    ]);
     const isConSelect = ref([
-      { value: '1', label: "是" },
-      { value: '0', label: "否" },
-    ])
+      { value: "1", label: "是" },
+      { value: "0", label: "否" },
+    ]);
     const placeData = () => {
-      lecturer.parentList().then(res=>{
-        if(res.data.code == 200){
-          PlaceOfPayListTwo.value = res.data.data.map(item=>{
+      lecturer.parentList().then((res) => {
+        if (res.data.code == 200) {
+          PlaceOfPayListTwo.value = res.data.data.map((item) => {
             return {
               value: item.affiliationCode,
-              label: item.affiliationName
-            }
-          })
+              label: item.affiliationName,
+            };
+          });
         }
-      })
-    }
+      });
+    };
     // placeData()
-    const PlaceOfPayListTwo = ref([])
-    const selectRadio = (val)=>{
-      if(val.target.value == 1){
-        state.formParam.leveOneArray = []
-        state.formParam.leveTwoArray = []
-        state.formParam.leveThreeArray = []
-        state.formParam.leveOneValue = null
-        state.formParam.leveTwoValue = null
-        state.formParam.leveThreeValue = null
+    const PlaceOfPayListTwo = ref([]);
+    const selectRadio = (val) => {
+      if (val.target.value == 1) {
+        state.formParam.leveOneArray = [];
+        state.formParam.leveTwoArray = [];
+        state.formParam.leveThreeArray = [];
+        state.formParam.leveOneValue = null;
+        state.formParam.leveTwoValue = null;
+        state.formParam.leveThreeValue = null;
       }
-      state.formParam.code = null
-    }
+      state.formParam.code = null;
+    };
     const columns = ref([
       // {
       //   title: '培训发生组织编号 ',
@@ -419,30 +604,34 @@ export default{
       //   width: '100px',
       // },
       {
-        title: '培训发生组织名称 ',
-        dataIndex: 'affiliationName',
-        key: 'affiliationName',
-        ellipsis: true, align: "left",
-        width: '200px',
-        customCell:()=>{return{style:{userSelect: 'text'}}}
+        title: "培训发生组织名称 ",
+        dataIndex: "affiliationName",
+        key: "affiliationName",
+        ellipsis: true,
+        align: "left",
+        width: "200px",
+        customCell: () => {
+          return { style: { userSelect: "text" } };
+        },
       },
       {
-        title: '状态',
-        dataIndex: 'status',
-        key: 'status',
-        ellipsis: true, align: "center",
-        width: '100px',
-        customRender: ({text})=>{
+        title: "状态",
+        dataIndex: "status",
+        key: "status",
+        ellipsis: true,
+        align: "center",
+        width: "100px",
+        customRender: ({ text }) => {
           switch (text) {
-            case '1':
+            case "1":
               return <span>待提交</span>;
-            case '2':
+            case "2":
               return <span>审核中</span>;
-            case '3':
+            case "3":
               return <span>已完成</span>;
-            case '4':
+            case "4":
               return <span>审核失败</span>;
-            case '5':
+            case "5":
               return <span>待审核</span>;
             default:
               return <span>-</span>;
@@ -450,25 +639,34 @@ export default{
         },
       },
       {
-        title: '是否为根节点',
-        dataIndex: 'parentName',
-        key: 'parentName',
+        title: "是否为根节点",
+        dataIndex: "parentName",
+        key: "parentName",
         align: "left",
-        width: '200px',
-        customRender: ({text,record})=>{
-          return (
-            text ? <div><span style={{marginRight:'10px'}}>否</span>({text})</div> : <div><span style={{marginRight:'10px'}}>是</span>({{1:'一',2:'二',3:'三'}[record.code]}级审批)</div>
-          )
+        width: "200px",
+        customRender: ({ text, record }) => {
+          return text ? (
+            <div>
+              <span style={{ marginRight: "10px" }}>否</span>({text})
+            </div>
+          ) : (
+            <div>
+              <span style={{ marginRight: "10px" }}>是</span>(
+              {{ 1: "一", 2: "二", 3: "三" }[record.code]}级审批)
+            </div>
+          );
         },
       },
       {
-        title: '担当',
-        dataIndex: 'leaderName',
-        key: 'leaderName',
+        title: "担当",
+        dataIndex: "leaderName",
+        key: "leaderName",
         ellipsis: true,
         align: "left",
-        width: '200px',
-        customCell:()=>{return{style:{userSelect: 'text'}}}
+        width: "200px",
+        customCell: () => {
+          return { style: { userSelect: "text" } };
+        },
       },
 
       // {
@@ -479,82 +677,78 @@ export default{
       //   width: 160,
       // },
       {
-        title: '操作 ',
-        dataIndex: 'operation',
-        key: 'operation',
-        width: '120px',
+        title: "操作 ",
+        dataIndex: "operation",
+        key: "operation",
+        width: "120px",
         align: "center",
-        fixed: 'right',
+        fixed: "right",
         scopedSlots: { customRender: "action" },
       },
-])
-const orgColumns = ref([
-  {
-    title: '组织名称',
-    dataIndex: 'orgName',
-    key: 'orgName',
-    ellipsis: true,
-    width: '20%',
-    align: 'center',
-  },
-  {
-    title: '是否被培训发生组织选择',
-    dataIndex: 'isSelect',
-    key: 'isSelect',
-    ellipsis: true,
-    align: 'center',
-    width: '30%',
-    customRender: (text) => {
-      return (
-        <div>
-          {text.record.isSelect == 1 ? `是 (${text.record.affiliationName})` : "否 (-)"}
-        </div>
-      )
-    }
-  },
-  {
-    title: '担当',
-    dataIndex: 'leaders',
-    key: 'leaders',
-    ellipsis: true,
-    align: 'center',
-    width: '60%',
-    customRender: (text) => {
-      return (
-        <div>
-          {text.record.leaders || '-'}
-        </div>
-      )
-    }
-  },
-])
-  //列表数据
-  const tableData = ref([
-])
-//  List接口数据
-const getTableDate = (obj) => {
-      state.tableLoading = true
+    ]);
+    const orgColumns = ref([
+      {
+        title: "组织名称",
+        dataIndex: "orgName",
+        key: "orgName",
+        ellipsis: true,
+        width: "20%",
+        align: "center",
+      },
+      {
+        title: "是否被培训发生组织选择",
+        dataIndex: "isSelect",
+        key: "isSelect",
+        ellipsis: true,
+        align: "center",
+        width: "30%",
+        customRender: (text) => {
+          return (
+            <div>
+              {text.record.isSelect == 1
+                ? `是 (${text.record.affiliationName})`
+                : "否 (-)"}
+            </div>
+          );
+        },
+      },
+      {
+        title: "担当",
+        dataIndex: "leaders",
+        key: "leaders",
+        ellipsis: true,
+        align: "center",
+        width: "60%",
+        customRender: (text) => {
+          return <div>{text.record.leaders || "-"}</div>;
+        },
+      },
+    ]);
+    //列表数据
+    const tableData = ref([]);
+    //  List接口数据
+    const getTableDate = (obj) => {
+      state.tableLoading = true;
       let objA = { ...state.searchParam };
-      queryTrainOrg(objA)
-        .then((res) => {
-          tableData.value = res.data.data.records
-          state.tableDataTotal = Number(res.data.data.total);
-          state.tableLoading = false
-        })
+      queryTrainOrg(objA).then((res) => {
+        tableData.value = res.data.data.records;
+        state.tableDataTotal = Number(res.data.data.total);
+        state.tableLoading = false;
+      });
     };
-    getTableDate()
+    getTableDate();
     // 搜索
     const searchSubmit = () => {
       state.searchParam.pageNo = 1;
-        getTableDate();
-      };
-    const searchList = (val)=>{
       getTableDate();
-    }
+    };
+    const searchList = (val) => {
+      getTableDate();
+    };
     //重置
     const searchReset = () => {
       state.searchParam = {
-        name:null,
+        name: null,
         isParent: null,
         leaderName: null,
         pageNo: 1,
@@ -562,234 +756,281 @@ const getTableDate = (obj) => {
       };
       getTableDate();
     };
-      //   // 翻页
-      const changePagination = (page, pageSize) => {
-        state.searchParam.pageNo = page;
+    //   // 翻页
+    const changePagination = (page, pageSize) => {
+      state.searchParam.pageNo = page;
       // state.pageNo = page;
       state.searchParam.pageSize = pageSize;
       getTableDate();
     };
     const updateModal = (record) => {
       dialog({
-        content: '是否确认撤回 ?',
+        content: "是否确认撤回 ?",
         ok: () => {
-          lecturer.affiliatIsConfirm(record.id).then(res=>{
-            message.success("撤回成功")
-            getTableDate();
-          }).catch(err=>{
-            message.destroy()
-            message.error(err.data.msg)
-          })
-        }
-      })
-    }
-      //删除弹窗
-      const deleteModal = (record) => {
-        let contents = '';
-        (record.status == 1 || record.status == 4)&& record.parentName && (contents = '是否确认进行删除?');
-        (record.status == 1 || record.status == 4)&& !record.parentName && (contents = '是否确认进行删除?删除后关联的子节点将一并删除');
-        record.status == 2 && (contents = '该培训发生组织正在审核中，无法删除');
-        dialog({
-          content: contents||'是否确认进行删除?',
-          isCloseBtn: record.status == 2 ? false : true,
-          ok: () => {
-            lecturer.affiliationDelById(record.id).then(res=>{
-              if(typeof (res.data.data) != 'object'){
-                message.error(res.data.data)
-                return
-              }
-              message.success("删除成功")
-              searchSubmit();
-            }).catch(err=>{
-              message.destroy()
-              message.error(err.data.msg)
+          lecturer
+            .affiliatIsConfirm(record.id)
+            .then((res) => {
+              message.success("撤回成功");
+              getTableDate();
             })
-          }
-        })
+            .catch((err) => {
+              message.destroy();
+              message.error(err.data.msg);
+            });
+        },
+      });
     };
-    const isEnablePost = (record,status) => {
+    //删除弹窗
+    const deleteModal = (record) => {
+      let contents = "";
+      (record.status == 1 || record.status == 4) &&
+        record.parentName &&
+        (contents = "是否确认进行删除?");
+      (record.status == 1 || record.status == 4) &&
+        !record.parentName &&
+        (contents = "是否确认进行删除?删除后关联的子节点将一并删除");
+      record.status == 2 && (contents = "该培训发生组织正在审核中，无法删除");
       dialog({
-        content: `是否确认${!status?'启用':'停用'}该培训发生组织?`,
+        content: contents || "是否确认进行删除?",
+        isCloseBtn: record.status == 2 ? false : true,
         ok: () => {
-          lecturer.isEnable({id:record.id,status}).then(res=>{
-            if(typeof (res.data.data) != 'object'){
-              message.error(res.data.data)
-              return
-            }
-            message.success(`${!status?'启用':'停用'}成功`)
-            searchSubmit();
-          }).catch(err=>{
-            message.destroy()
-            message.error(err.data.msg)
-          })
-        }
-      })
-    }
-     //确认删除
-     const closeDeleteTeacher = () => {
+          lecturer
+            .affiliationDelById(record.id)
+            .then((res) => {
+              if (typeof res.data.data != "object") {
+                message.error(res.data.data);
+                return;
+              }
+              message.success("删除成功");
+              searchSubmit();
+            })
+            .catch((err) => {
+              message.destroy();
+              message.error(err.data.msg);
+            });
+        },
+      });
+    };
+    const isEnablePost = (record, status) => {
+      dialog({
+        content: `是否确认${!status ? "启用" : "停用"}该培训发生组织?`,
+        ok: () => {
+          lecturer
+            .isEnable({ id: record.id, status })
+            .then((res) => {
+              if (typeof res.data.data != "object") {
+                message.error(res.data.data);
+                return;
+              }
+              message.success(`${!status ? "启用" : "停用"}成功`);
+              searchSubmit();
+            })
+            .catch((err) => {
+              message.destroy();
+              message.error(err.data.msg);
+            });
+        },
+      });
+    };
+    //确认删除
+    const closeDeleteTeacher = () => {
       //调用删除接口
-      deleteTrainOrg({kid:state.delId}).then((res) => {
+      deleteTrainOrg({ kid: state.delId }).then((res) => {
         if (res.data.code == 200) {
           // message.success("删除成功");
-          state.deleteInTeacherdialog = false
+          state.deleteInTeacherdialog = false;
           searchSubmit();
         }
-      })
-    }
-     //取消按钮 清空输入的数据
-     const cancelTeacherDialog = () => {
-      if (state.teacherdialog = true) {
-        formRef.value.resetFields();
-        state.teacherdialog = false
-        
-      }
-      cancel()
-      state.deleteInTeacherdialog = false
-      state.editTeacher = false
+      });
     };
-    watch(()=>state.teacherdialog,(val)=>{
-      if(val){
-        placeData()
-      }else{
-        state.editParams = true
-        state.editIndex = 0
+    //取消按钮 清空输入的数据
+    const cancelTeacherDialog = () => {
+      if ((state.teacherdialog = true)) {
+        formRef.value.resetFields();
+        state.teacherdialog = false;
       }
-    })
-    const addTeacher=()=>{
-      state.teacherdialog=true ,
-      state.formParam.locking = 0
-      state.teacherdialogtitle="新增培训发生组织"
-      state.vf = true
-      lecturer.getAffiliationCode().then(res=>{
-        state.formParam.affiliationCode = res.data.data
-      }).catch(()=>{
-        message.error('获取培训发生组织编号失败')
-      })
-    }
-    const downOpen = () => {
-      window.open(`/manageApi/admin/export/exportTeacherAffiliation?name=${state.searchParam.name || ''}&isParent=${state.searchParam.isParent||''}&leaderName=${state.searchParam.leaderName||''}`)
-    }
-    const addContentData = () => {
-      state.showContent = true
-    }
-    watch(()=>state.formParam,(val)=>{
-      if(!state.editParams){
-        state.editIndex++
+      cancel();
+      state.deleteInTeacherdialog = false;
+      state.editTeacher = false;
+    };
+    watch(
+      () => state.teacherdialog,
+      (val) => {
+        if (val) {
+          placeData();
+        } else {
+          state.editParams = true;
+          state.editIndex = 0;
+        }
       }
-    },{deep:true})
-      //修改信息弹窗
-      const handleModify = (record) => {
-        lecturer.getAffiliationById(record.id).then(res=>{
-          res.data.data.status==3 && (state.editParams = false)
-          state.formParam = res.data.data
-          const actArray = res.data.data.affiliationUserList.filter(item=>item.type == 0).reduce((accumulator, current) => {
-            if (!accumulator.some(item => item.userId === current.userId)) {
-              accumulator.push(current);
-            }
-            return accumulator;
-          }, []);
-          const leveOneArray = res.data.data.affiliationUserList.filter(item=>item.type == 1).reduce((accumulator, current) => {
-            if (!accumulator.some(item => item.userId === current.userId)) {
-              accumulator.push(current);
-            }
-            return accumulator;
-          }, []);
-          const leveTwoArray = res.data.data.affiliationUserList.filter(item=>item.type == 2).reduce((accumulator, current) => {
-            if (!accumulator.some(item => item.userId === current.userId)) {
-              accumulator.push(current);
-            }
-            return accumulator;
-          }, []);
-          const leveThreeArray = res.data.data.affiliationUserList.filter(item=>item.type == 3).reduce((accumulator, current) => {
-            if (!accumulator.some(item => item.userId === current.userId)) {
-              accumulator.push(current);
-            }
-            return accumulator;
-          }, []);
-          state.formParam.actArray = actArray.map(item => {
-            return {
-              label: item.userName + item.userNo,
-              value: item.userId,
-              realName: item.userName,
-              ...item,
-              id: item.userId
-            };
-          });
-          state.formParam.actValue = state.formParam.actArray.map(item => item.label).join(',');
-          state.formParam.leveOneArray = leveOneArray.map(item => {
-            return {
-              label: item.userName + item.userNo,
-              value: item.userId,
-              realName: item.userName,
-              ...item
-            };
-          });
-          state.formParam.leveOneValue = state.formParam.leveOneArray.map(item => item.label).join(',');
-          state.formParam.leveTwoArray = leveTwoArray.map(item => {
-            return {
-              label: item.userName + item.userNo,
-              value: item.userId,
-              realName: item.userName,
-              ...item
-            };
-          });
-          state.formParam.leveTwoValue = state.formParam.leveTwoArray.map(item => item.label).join(',')||null;
-          state.formParam.leveThreeArray = leveThreeArray.map(item => {
-            return {
-              label: item.userName + item.userNo,
-              value: item.userId,
-              realName: item.userName,
-              ...item
-            };
-          });
-          state.formParam.leveThreeValue = state.formParam.leveThreeArray.map(item => item.label).join(',')||null;
-          state.formParam.orglistName = state.formParam.affiliationOrgList?.map(item=>item.id).join(',')
-          state.formParam.selectOrgList?.map(item=>{
-            state.formParam.affiliationOrgList.some(item2=>{
-              if(item.orgId==item2.orgId){
-                item2 = Object.assign(item2,item)
-                return true
-              }
-            })
-          })
-          state.formParam.affiliationOrgLists = state.formParam.affiliationOrgList
-          state.formParam.isContains = String(state.formParam.isContains)
-          state.teacherdialog = true;
-          state.teacherdialogtitle = '编辑培训发生组织'
-          state.vf = false
+    );
+    const addTeacher = () => {
+      (state.teacherdialog = true), (state.formParam.locking = 0);
+      state.teacherdialogtitle = "新增培训发生组织";
+      state.vf = true;
+      lecturer
+        .getAffiliationCode()
+        .then((res) => {
+          state.formParam.affiliationCode = res.data.data;
         })
+        .catch(() => {
+          message.error("获取培训发生组织编号失败");
+        });
+    };
+    const downOpen = () => {
+      window.open(
+        `/manageApi/admin/export/exportTeacherAffiliation?name=${
+          state.searchParam.name || ""
+        }&isParent=${state.searchParam.isParent || ""}&leaderName=${
+          state.searchParam.leaderName || ""
+        }`
+      );
+    };
+    const addContentData = () => {
+      state.showContent = true;
+    };
+    watch(
+      () => state.formParam,
+      (val) => {
+        if (!state.editParams) {
+          state.editIndex++;
+        }
+      },
+      { deep: true }
+    );
+    //修改信息弹窗
+    const handleModify = (record) => {
+      lecturer.getAffiliationById(record.id).then((res) => {
+        res.data.data.status == 3 && (state.editParams = false);
+        state.formParam = res.data.data;
+        const actArray = res.data.data.affiliationUserList
+          .filter((item) => item.type == 0)
+          .reduce((accumulator, current) => {
+            if (!accumulator.some((item) => item.userId === current.userId)) {
+              accumulator.push(current);
+            }
+            return accumulator;
+          }, []);
+        const leveOneArray = res.data.data.affiliationUserList
+          .filter((item) => item.type == 1)
+          .reduce((accumulator, current) => {
+            if (!accumulator.some((item) => item.userId === current.userId)) {
+              accumulator.push(current);
+            }
+            return accumulator;
+          }, []);
+        const leveTwoArray = res.data.data.affiliationUserList
+          .filter((item) => item.type == 2)
+          .reduce((accumulator, current) => {
+            if (!accumulator.some((item) => item.userId === current.userId)) {
+              accumulator.push(current);
+            }
+            return accumulator;
+          }, []);
+        const leveThreeArray = res.data.data.affiliationUserList
+          .filter((item) => item.type == 3)
+          .reduce((accumulator, current) => {
+            if (!accumulator.some((item) => item.userId === current.userId)) {
+              accumulator.push(current);
+            }
+            return accumulator;
+          }, []);
+        state.formParam.actArray = actArray.map((item) => {
+          return {
+            label: item.userName + item.userNo,
+            value: item.userId,
+            realName: item.userName,
+            ...item,
+            id: item.userId,
+          };
+        });
+        state.formParam.actValue = state.formParam.actArray
+          .map((item) => item.label)
+          .join(",");
+        state.formParam.leveOneArray = leveOneArray.map((item) => {
+          return {
+            label: item.userName + item.userNo,
+            value: item.userId,
+            realName: item.userName,
+            ...item,
+          };
+        });
+        state.formParam.leveOneValue = state.formParam.leveOneArray
+          .map((item) => item.label)
+          .join(",");
+        state.formParam.leveTwoArray = leveTwoArray.map((item) => {
+          return {
+            label: item.userName + item.userNo,
+            value: item.userId,
+            realName: item.userName,
+            ...item,
+          };
+        });
+        state.formParam.leveTwoValue =
+          state.formParam.leveTwoArray.map((item) => item.label).join(",") ||
+          null;
+        state.formParam.leveThreeArray = leveThreeArray.map((item) => {
+          return {
+            label: item.userName + item.userNo,
+            value: item.userId,
+            realName: item.userName,
+            ...item,
+          };
+        });
+        state.formParam.leveThreeValue =
+          state.formParam.leveThreeArray.map((item) => item.label).join(",") ||
+          null;
+        state.formParam.orglistName = state.formParam.affiliationOrgList
+          ?.map((item) => item.id)
+          .join(",");
+        state.formParam.selectOrgList?.map((item) => {
+          state.formParam.affiliationOrgList.some((item2) => {
+            if (item.orgId == item2.orgId) {
+              item2 = Object.assign(item2, item);
+              return true;
+            }
+          });
+        });
+        state.formParam.affiliationOrgLists =
+          state.formParam.affiliationOrgList;
+        state.formParam.isContains = String(state.formParam.isContains);
+        state.teacherdialog = true;
+        state.teacherdialogtitle = "编辑培训发生组织";
+        state.vf = false;
+      });
       // TeacherSystem(record)
-    }
-   const  TeacherSystem =(record)=>{
-      state.formParam.affiliationCode=record.affiliationCode
-      state.formParam.affiliationName=record.affiliationName
-      state.formParam.remark=record.remark
-    }
-    const cancel=()=>{
-      state.formParam={
+    };
+    const TeacherSystem = (record) => {
+      state.formParam.affiliationCode = record.affiliationCode;
+      state.formParam.affiliationName = record.affiliationName;
+      state.formParam.remark = record.remark;
+    };
+    const cancel = () => {
+      state.formParam = {
         orglistName: null,
-        affiliationCode:null,
-        affiliationName:null,
+        affiliationCode: null,
+        affiliationName: null,
         isParent: 1,
-        remark:null,
+        remark: null,
         actValue: null,
         actArray: [],
         leveOneValue: null,
-        leveTwoValue:null,
-        leveThreeValue:null,
+        leveTwoValue: null,
+        leveThreeValue: null,
         leveOneArray: [],
         leveTwoArray: [],
         leveThreeArray: [],
         code: null,
-        isContains: '0',
+        isContains: "0",
         affiliationOrgList: [],
-        affiliationOrgLists:[],
+        affiliationOrgLists: [],
         locking: 1,
-      }
-    }
+      };
+    };
     async function validateField(name) {
       return new Promise((resolve) => {
-        formRef.value.validateFields([name])
+        formRef.value
+          .validateFields([name])
           .then(() => {
             resolve(false);
           })
@@ -798,145 +1039,177 @@ const getTableDate = (obj) => {
           });
       });
     }
-    const valueChange = (val,type) => {
-      if(type==0){
-        state.formParam.actValue = val?.map(item=>item.label).join(',') || null
-      }else if(type==1){
-        state.formParam.leveOneValue = val?.map(item=>item.label).join(',') || null
-      }else if(type==2){
-        state.formParam.leveTwoValue = val?.map(item=>item.label).join(',') || null
-      }else if(type==3){
-        state.formParam.leveThreeValue = val?.map(item=>item.label).join(',') || null
-      }
-    }
-   //保存
-   const createTeacherDialog = async (val) => {
-    state.formParam.affiliationName = state.formParam.affiliationName?.trim()
-    state.formParam.affiliationUserList = [...state.formParam?.actArray,...state.formParam?.leveOneArray,...state.formParam?.leveTwoArray,...state.formParam?.leveThreeArray]
-    state.formParam.orglistName = state.formParam.affiliationOrgList?.map(item=>item.id).join(',')
-    let formItemNames = Object.keys(rules);
-    if(state.formParam.isParent == 0){
-      formItemNames = formItemNames.filter(item=>item!='leveOneValue')
-    }else{
-      formItemNames = formItemNames.filter(item=>item!='isContains')
-    }
-    for(let i=0;i<formItemNames.length;i++){
-      // const result = await validateField(formItemNames[i]);
-      const result = state.formParam[formItemNames[i]]
-      if (!result) {
-        if(formItemNames[i]=='code' && !state.formParam.isParent){
-          return message.error(rules[formItemNames[i]][0].log2)
-        }else{
-          return message.error(rules[formItemNames[i]][0].log)
-        }
-      }
-    }
-    if(!state.formParam.leveTwoValue&&state.formParam.leveThreeValue&&state.formParam.isParent){
-      return message.error('请选择二级审批人')
-    }
-    state.formParam.remark = state.formParam?.remark?.trim()
-    state.formParam.submitStatus = val
-    dialog({
-      content: val?'是否确认提交，一旦提交将进入（BPM系统）审核流程。':'是否确认保存？',
-      ok: () => {
-        state.example = true;
-        if (state.vf == false) {
-          updateTrainOrg(state.formParam).then(res => {
-            if(res.data.code == 200){
-              message.success("修改成功");
-              cancel()
-              getTableDate();
-            }else{
-              message.error(res.data.msg)
-            }
-            state.teacherdialog = false;
-            state.example = false;
-          }).catch(err=>{
-            message.destroy();
-            message.error(err.data.msg)
-            state.teacherdialog = false;
-            state.example = false;
-            cancel()
-          })
-        }else {
-          addReviewer(state.formParam).then((res) => {
-            message.success("保存成功");
-            state.teacherdialog = false;
-            cancel()
-            searchSubmit();
-            state.example = false;
-          }).catch(err=>{
-            message.destroy();
-            message.error(err.data.msg)
-            state.teacherdialog = false;
-            cancel()
-            state.example = false;
-          })
-        }
-      }
-    })
-   };
-    const rules = {
-      affiliationCode: [{ required: true, message: '',log:'请选择培训发生组织编号' }],
-      affiliationName: [{ required: true, message: '',log:'请选择培训发生组织名称' }],
-      code: [{ required: true, message: '',log:'请选择根节点',log2:'请选择审批层级' }],
-      actValue: [{ required: true, message: '',log:'请选择组织担当' }],
-      leveOneValue: [{ required: true, message: '',log:'请选择一级审批人' }],
-      isContains: [{ required: true, message: '',log:'请选择审批流程是否加担当' }],
-      orglistName: [{ required: true, message: '',log:'请选择管理组织' }],
-
-    }
-    const TrainOrglist = ref([
-      {label: '全部', value: ''},
-      {label: '根节点', value: '0'},
-      {label: '子节点', value: '1'},
-    ])
-    //回车
-    const enterPressHadlerSearch = e => {
-      if (e.keyCode === 13) {
-        searchSubmit()
+    const valueChange = (val, type) => {
+      if (type == 0) {
+        state.formParam.actValue =
+          val?.map((item) => item.label).join(",") || null;
+      } else if (type == 1) {
+        state.formParam.leveOneValue =
+          val?.map((item) => item.label).join(",") || null;
+      } else if (type == 2) {
+        state.formParam.leveTwoValue =
+          val?.map((item) => item.label).join(",") || null;
+      } else if (type == 3) {
+        state.formParam.leveThreeValue =
+          val?.map((item) => item.label).join(",") || null;
       }
     };
-    return{
-        ...toRefs(state),
-        enterPressHadlerSearch,
-        TrainOrglist,
-        rules,
-        formRef,
-        columns,
-        orgColumns,
-        tableData,
-        getTableDate,
-        searchSubmit,
-        selectRadio,
-        PlaceOfPayList,
-        isConSelect,
-        PlaceOfPayListTwo,
-        placeData,
-        searchReset,
-        searchList,
-        deleteModal,
-        isEnablePost,
-        updateModal,
-        cancelTeacherDialog,
-        addTeacher,
-        downOpen,
-        addContentData,
-        handleModify,
-        closeDeleteTeacher,
-        changePagination,
-        TeacherSystem,
-        createTeacherDialog,
-        valueChange,
-        validateField,
-        checkMenu,
-    }
-    }
-}
-
+    //保存
+    const createTeacherDialog = async (val) => {
+      state.formParam.affiliationName = state.formParam.affiliationName?.trim();
+      state.formParam.affiliationUserList = [
+        ...state.formParam?.actArray,
+        ...state.formParam?.leveOneArray,
+        ...state.formParam?.leveTwoArray,
+        ...state.formParam?.leveThreeArray,
+      ];
+      state.formParam.orglistName = state.formParam.affiliationOrgList
+        ?.map((item) => item.id)
+        .join(",");
+      let formItemNames = Object.keys(rules);
+      if (state.formParam.isParent == 0) {
+        formItemNames = formItemNames.filter((item) => item != "leveOneValue");
+      } else {
+        formItemNames = formItemNames.filter((item) => item != "isContains");
+      }
+      for (let i = 0; i < formItemNames.length; i++) {
+        // const result = await validateField(formItemNames[i]);
+        const result = state.formParam[formItemNames[i]];
+        if (!result) {
+          if (formItemNames[i] == "code" && !state.formParam.isParent) {
+            return message.error(rules[formItemNames[i]][0].log2);
+          } else {
+            return message.error(rules[formItemNames[i]][0].log);
+          }
+        }
+      }
+      if (
+        !state.formParam.leveTwoValue &&
+        state.formParam.leveThreeValue &&
+        state.formParam.isParent
+      ) {
+        return message.error("请选择二级审批人");
+      }
+      state.formParam.remark = state.formParam?.remark?.trim();
+      state.formParam.submitStatus = val;
+      dialog({
+        content: val
+          ? "是否确认提交，一旦提交将进入（BPM系统）审核流程。"
+          : "是否确认保存？",
+        ok: () => {
+          state.example = true;
+          if (state.vf == false) {
+            updateTrainOrg(state.formParam)
+              .then((res) => {
+                if (res.data.code == 200) {
+                  message.success("修改成功");
+                  cancel();
+                  getTableDate();
+                } else {
+                  message.error(res.data.msg);
+                }
+                state.teacherdialog = false;
+                state.example = false;
+              })
+              .catch((err) => {
+                message.destroy();
+                message.error(err.data.msg);
+                state.teacherdialog = false;
+                state.example = false;
+                cancel();
+              });
+          } else {
+            addReviewer(state.formParam)
+              .then((res) => {
+                message.success("保存成功");
+                state.teacherdialog = false;
+                cancel();
+                searchSubmit();
+                state.example = false;
+              })
+              .catch((err) => {
+                message.destroy();
+                message.error(err.data.msg);
+                state.teacherdialog = false;
+                cancel();
+                state.example = false;
+              });
+          }
+        },
+      });
+    };
+    const rules = {
+      affiliationCode: [
+        { required: true, message: "", log: "请选择培训发生组织编号" },
+      ],
+      affiliationName: [
+        { required: true, message: "", log: "请选择培训发生组织名称" },
+      ],
+      code: [
+        {
+          required: true,
+          message: "",
+          log: "请选择根节点",
+          log2: "请选择审批层级",
+        },
+      ],
+      actValue: [{ required: true, message: "", log: "请选择组织担当" }],
+      leveOneValue: [{ required: true, message: "", log: "请选择一级审批人" }],
+      isContains: [
+        { required: true, message: "", log: "请选择审批流程是否加担当" },
+      ],
+      orglistName: [{ required: true, message: "", log: "请选择管理组织" }],
+    };
+    const TrainOrglist = ref([
+      { label: "全部", value: "" },
+      { label: "根节点", value: "0" },
+      { label: "子节点", value: "1" },
+    ]);
+    //回车
+    const enterPressHadlerSearch = (e) => {
+      if (e.keyCode === 13) {
+        searchSubmit();
+      }
+    };
+    return {
+      ...toRefs(state),
+      enterPressHadlerSearch,
+      TrainOrglist,
+      rules,
+      formRef,
+      columns,
+      orgColumns,
+      tableData,
+      getTableDate,
+      searchSubmit,
+      selectRadio,
+      PlaceOfPayList,
+      isConSelect,
+      PlaceOfPayListTwo,
+      placeData,
+      searchReset,
+      searchList,
+      deleteModal,
+      isEnablePost,
+      updateModal,
+      cancelTeacherDialog,
+      addTeacher,
+      downOpen,
+      addContentData,
+      handleModify,
+      closeDeleteTeacher,
+      changePagination,
+      TeacherSystem,
+      createTeacherDialog,
+      valueChange,
+      validateField,
+      checkMenu,
+    };
+  },
+};
 </script>
 <style lang="scss" scoped>
-.example{
+.example {
   width: 100%;
   height: 100%;
   background: rgba(0, 0, 0, 0.45);
@@ -968,13 +1241,13 @@ const getTableDate = (obj) => {
 .tableBox {
   padding-bottom: 20px;
   margin: 20px 38px 30px;
-  ::v-deep .ant-select-dropdown{
+  ::v-deep .ant-select-dropdown {
     display: inline-block;
   }
-  ::v-deep .ant-select-selection-item{
+  ::v-deep .ant-select-selection-item {
     margin-left: 3px;
   }
-  ::v-deep .ant-pagination-options-size-changer.ant-select{
+  ::v-deep .ant-pagination-options-size-changer.ant-select {
     width: 84px;
   }
   .pa {
@@ -983,7 +1256,7 @@ const getTableDate = (obj) => {
     justify-content: right;
   }
 }
-.add_content{
+.add_content {
   width: 40px;
   height: 40px;
   cursor: pointer;
@@ -1051,15 +1324,16 @@ const getTableDate = (obj) => {
   width: 300px !important;
 }
 
-.ant-table-tbody>tr>td {
+.ant-table-tbody > tr > td {
   text-align: center;
 }
 
-.InsideLecturer {  width: 100%;
+.InsideLecturer {
+  width: 100%;
   height: 100%;
   display: flex;
   flex-direction: column;
-position: relative;
+  position: relative;
   .filter {
     margin-left: 38px;
     margin-right: 38px;
@@ -1067,11 +1341,12 @@ position: relative;
     display: flex;
     justify-content: space-between;
     flex-wrap: wrap;
-      .select {
-        margin-right: 20px;
-        margin-bottom: 20px;
-      }
-    }}
+    .select {
+      margin-right: 20px;
+      margin-bottom: 20px;
+    }
+  }
+}
 
 .delete {
   z-index: 9999;
@@ -1088,8 +1363,10 @@ position: relative;
     position: absolute;
     width: calc(100%);
     height: 40px;
-    background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-        rgba(78, 166, 255, 0) 100%);
+    background: linear-gradient(
+      rgba(78, 166, 255, 0.2) 0%,
+      rgba(78, 166, 255, 0) 100%
+    );
   }
 
   .del_main {
@@ -1195,8 +1472,10 @@ position: relative;
       width: 100%;
       height: 68px;
 
-      background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-          rgba(78, 166, 255, 0) 100%);
+      background: linear-gradient(
+        rgba(78, 166, 255, 0.2) 0%,
+        rgba(78, 166, 255, 0) 100%
+      );
       display: flex;
       align-items: center;
 
@@ -1281,12 +1560,17 @@ position: relative;
 .moreidbtn {
   border: none;
   color: #4ea6ff;
-  width: 80px
+  width: 80px;
 }
 
 //小竖线
-.line{
-  float:left; width: 3px; height: 25px; background: #4ea6ff;border-radius: 30%; margin-right: 5px;
+.line {
+  float: left;
+  width: 3px;
+  height: 25px;
+  background: #4ea6ff;
+  border-radius: 30%;
+  margin-right: 5px;
 }
 //抽屉功能
 .drawaer
@@ -1296,74 +1580,73 @@ position: relative;
   line-height: 40px;
   /* 确保文字垂直居中 */
 }
-.draitem{
- width: 100%;
-  height: 40px !important; 
+.draitem {
+  width: 100%;
+  height: 40px !important;
   border-radius: 8px;
   line-height: 40px;
 }
-.drabtn{
-  height:40px;
-  width:80px;
-  border-radius:8px;
-  margin-right:20px
+.drabtn {
+  height: 40px;
+  width: 80px;
+  border-radius: 8px;
+  margin-right: 20px;
 }
- ::v-deep  .ant-select:not(.ant-select-customize-input) .ant-select-selector{
-  border-radius:8px;
-  height:40px;
+::v-deep .ant-select:not(.ant-select-customize-input) .ant-select-selector {
+  border-radius: 8px;
+  height: 40px;
   line-height: 40px;
   text-align: left;
 }
-.ant-col-12{
-  height:90px;
+.ant-col-12 {
+  height: 90px;
 }
 .item_inp {
-            flex: 1;
-            text-align: center ;
-            .i_upload_img {
-              width: 100px;
-              height: 100px;
-              border-radius: 8px;
-            }
+  flex: 1;
+  text-align: center;
+  .i_upload_img {
+    width: 100px;
+    height: 100px;
+    border-radius: 8px;
+  }
 
-            .i_upload {
-              width: 100px;
-              height: 100px;
-              border: 1px solid #4ea6ff;
-              border-radius:50%;
-              text-align: center;
-              align-items: center;
-              cursor: pointer;
+  .i_upload {
+    width: 100px;
+    height: 100px;
+    border: 1px solid #4ea6ff;
+    border-radius: 50%;
+    text-align: center;
+    align-items: center;
+    cursor: pointer;
 
-              .addimg {
-                position: relative;
+    .addimg {
+      position: relative;
 
-                .heng {
-                  position: absolute;
-                  top: 50px;
-                  left: 25px;
-                  width: 50px;
-                  border: 1px solid #4ea6ff;
-                }
+      .heng {
+        position: absolute;
+        top: 50px;
+        left: 25px;
+        width: 50px;
+        border: 1px solid #4ea6ff;
+      }
 
-                .shu {
-                  position: absolute;
-                  top: 25px;
-                  left: 50px;
-                  height: 50px;
-                  border: 1px solid #4ea6ff;
-                }
-              }
-            }
+      .shu {
+        position: absolute;
+        top: 25px;
+        left: 50px;
+        height: 50px;
+        border: 1px solid #4ea6ff;
+      }
+    }
+  }
 
-            .ant-upload.ant-upload-select-picture-card {
-              border: 0px !important;
-              border-radius: 50%!important;
-            }
-          }
-          .ant-upload.ant-upload-select-picture-card {
-            border: 0px !important;
-              border-radius: 50%!important;
-          }
-
-</style>
\ No newline at end of file
+  .ant-upload.ant-upload-select-picture-card {
+    border: 0px !important;
+    border-radius: 50% !important;
+  }
+}
+.ant-upload.ant-upload-select-picture-card {
+  border: 0px !important;
+  border-radius: 50% !important;
+}
+</style>

From 200c95b04731cdc48134e9c571deac323299933c Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 19:18:55 +0800
Subject: [PATCH 099/157] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/Organization.vue         | 1647 +------------------
 src/views/lecturer/OrganizationApproval.vue | 1577 ++++++++++++++++++
 src/views/lecturer/OrganizationList.vue     | 1646 ++++++++++++++++++
 3 files changed, 3245 insertions(+), 1625 deletions(-)
 create mode 100644 src/views/lecturer/OrganizationApproval.vue
 create mode 100644 src/views/lecturer/OrganizationList.vue

diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index 16093486..805ab452 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -1,1652 +1,49 @@
 <!-- 归属组织 -->
 <template>
   <a-tabs v-model:activeKey="activeKey">
-    <a-tab-pane key="1" tab="培训发僧组织列表"> 培训发僧组织列表 </a-tab-pane>
+    <a-tab-pane key="1" tab="培训发僧组织列表"> 
+      <OrganizationList/>
+    </a-tab-pane>
     <!-- v-if="lecturerAdmin('lecturer-admin')" -->
-    <a-tab-pane key="2" tab="审批中心"> 审批中心 </a-tab-pane>
+    <a-tab-pane key="2" tab="审批中心"> 
+      <OrganizationApproval/>
+    </a-tab-pane>
   </a-tabs>
 
-  <!-- 搜索框及按钮 -->
-  <div class="filter" style="min-width: 1380px; margin: 20px">
-    <a-form layout="inline">
-      <a-form-item class="select">
-        <div>
-          <a-input
-            style="width: 235px; height: 40px; border-radius: 8px"
-            v-model:value="searchParam.name"
-            placeholder="请输入编号/名称进行搜索"
-            v-on:keydown.enter="enterPressHadlerSearch"
-          />
-        </div>
-      </a-form-item>
-      <a-form-item class="select">
-        <div>
-          <a-select
-            style="width: 235px"
-            v-model:value="searchParam.isParent"
-            placeholder="请选择节点类型"
-            allowClear
-            :options="TrainOrglist"
-            v-on:keydown.enter="enterPressHadlerSearch"
-          />
-        </div>
-      </a-form-item>
-      <a-form-item class="select">
-        <div>
-          <a-input
-            style="width: 235px; height: 40px; border-radius: 8px"
-            v-model:value="searchParam.leaderName"
-            placeholder="请输入担当姓名/工号"
-            v-on:keydown.enter="enterPressHadlerSearch"
-          />
-        </div>
-      </a-form-item>
-      <div style="display: flex; margin-bottom: 20px">
-        <a-button @click="searchSubmit()" type="primary" class="resetbtn"
-          >查询
-        </a-button>
-        <!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
-        <!-- <div class="search"></div> -->
-        <a-button class="resetbtn" @click="searchReset">重置</a-button>
-      </div>
-    </a-form>
-    <div style="width: 100%"></div>
-    <div style="display: flex; margin-bottom: 20px">
-      <a-button
-        v-if="checkMenu('lecturerTrainOrgAdd')"
-        @click="addTeacher()"
-        type="primary"
-        class="resetbtn"
-        style="width: 164px"
-      >
-        <div class="search"></div>
-        新增培训发生组织
-      </a-button>
-      <div
-        class="btnn btn2"
-        @click="downOpen"
-        style="margin-right: 14px"
-        v-if="checkMenu('lecturerTrainOrgExport')"
-      >
-        <div class="daochu"></div>
-        <div class="btnText">导出</div>
-      </div>
-    </div>
-    <a-table
-      style="border: 1px solid #f2f6fe"
-      :columns="columns"
-      :data-source="tableData"
-      :loading="tableLoading"
-      @expand="expandTable"
-      :pagination="false"
-    >
-      <template #bodyCell="{ record, column }">
-        <template v-if="column.key === 'operation'">
-          <a-space>
-            <lockLecturer
-              :parentName="record.parentName"
-              :id="record.id"
-              :title="'培训发生组织详情'"
-              @searchList="searchList"
-            >
-              <div style="color: #1890ff; cursor: pointer">查看</div>
-            </lockLecturer>
-            <a-button
-              v-if="record.status != 2 && checkMenu('lecturerTrainOrgEdit')"
-              type="link"
-              @click="() => handleModify(record, String(record.courseform))"
-              >编辑</a-button
-            >
-            <a-button
-              v-if="record.status == 2 && false"
-              type="link"
-              @click="() => updateModal(record)"
-              >撤回</a-button
-            >
-            <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
-            <a-button
-              @click="isEnablePost(record, 0)"
-              v-if="record.enable && checkMenu('lecturerTrainOrgStop')"
-              type="link"
-              >启用</a-button
-            >
-            <a-button
-              @click="isEnablePost(record, 1)"
-              v-if="!record.enable && checkMenu('lecturerTrainOrgStop')"
-              type="link"
-              >停用</a-button
-            >
-          </a-space>
-        </template>
-      </template>
-    </a-table>
-    <div class="tableBox">
-      <div class="pa">
-        <a-pagination
-          v-if="tableDataTotal > 10"
-          :showSizeChanger="true"
-          :showQuickJumper="true"
-          :hideOnSinglePage="false"
-          :pageSize="searchParam.pageSize"
-          :current="searchParam.pageNo"
-          :total="tableDataTotal"
-          class="pagination"
-          @change="changePagination"
-        />
-      </div>
-    </div>
-    <!-- 删除功能弹窗 -->
-    <div>
-      <a-modal
-        v-model:visible="deleteInTeacherdialog"
-        :footer="null"
-        :closable="close"
-        centered="true"
-      >
-        <div class="delete">
-          <div class="del_header"></div>
-          <div class="del_main">
-            <div class="header">
-              <div class="icon1"></div>
-              <span>提示</span>
-            </div>
-            <div class="body">
-              <span>您确定要删除当前组织吗</span>
-            </div>
-            <div class="del_btnbox">
-              <div
-                class="del_btn btn2"
-                @click="cancelTeacherDialog"
-                style="margin-right: 32px"
-              >
-                <div class="btnText">取消</div>
-              </div>
-              <div class="del_btn btn2" @click="closeDeleteTeacher">
-                <div class="btnText">确定</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </a-modal>
-    </div>
-    <!-- 抽屉 -->
-    <div class="example" v-if="example">
-      <a-spin />
-    </div>
-    <a-drawer
-      class="largeDrawerInside"
-      v-model:visible="teacherdialog"
-      :closable="false"
-      :title="false"
-      placement="right"
-      width="60%"
-      :maskClosable="false"
-    >
-      <div style="padding: 24px">
-        <div class="headers" style="margin-top: -24px">
-          <div class="headerTitle">{{ teacherdialogtitle }}</div>
-          <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="@/assets/images/basicinfo/close.png"
-            @click="cancelTeacherDialog"
-          />
-        </div>
-        <a-form :model="formParam" layout="vertical" ref="formRef">
-          <a-row :gutter="16">
-            <a-col :span="24">
-              <!-- <span class="line"></span><span>讲师体系基本信息</span> -->
-            </a-col>
-          </a-row>
-          <a-row :gutter="16">
-            <a-col :span="12">
-              <a-form-item name="affiliationCode">
-                <template v-slot:label>
-                  <img
-                    style="margin-right: 4px; width: 7px; height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
-                  培训发生组织编号：
-                </template>
-                <a-input
-                  disabled
-                  v-model:value="formParam.affiliationCode"
-                  class="draitem"
-                  placeholder="请输入讲师体系编号"
-                  allowClear
-                  showSearch
-                >
-                </a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item name="affiliationName">
-                <template v-slot:label>
-                  <img
-                    style="margin-right: 4px; width: 7px; height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
-                  培训发生组织名称：
-                </template>
-                <a-input
-                  :maxlength="30"
-                  show-count
-                  v-model:value="formParam.affiliationName"
-                  class="draitem"
-                  placeholder="请输入培训发生组织名称"
-                  allowClear
-                  showSearch
-                >
-                </a-input>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="16">
-            <a-col :span="12">
-              <a-form-item name="code">
-                <template v-slot:label>
-                  <img
-                    style="margin-right: 4px; width: 7px; height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
-                  是否为根节点：
-                </template>
-                <div style="display: flex; align-items: center">
-                  <a-radio-group
-                    :disabled="formParam.locking"
-                    style="min-width: 126px"
-                    @change="selectRadio"
-                    v-model:value="formParam.isParent"
-                    name="radioGroup"
-                  >
-                    <a-radio :value="1">否</a-radio>
-                    <a-radio :value="0">是</a-radio>
-                  </a-radio-group>
-                  <a-select
-                    :disabled="formParam.locking"
-                    v-model:value="formParam.code"
-                    :placeholder="
-                      !formParam.isParent ? '请选择审批层级' : '请选择根节点'
-                    "
-                    :options="
-                      !formParam.isParent ? PlaceOfPayList : PlaceOfPayListTwo
-                    "
-                    allowClear
-                    showSearch
-                  />
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item name="actValue">
-                <template v-slot:label>
-                  <img
-                    style="margin-right: 4px; width: 7px; height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
-                  组织担当：
-                </template>
-                <!-- <a-select v-model:value="formParam.zzfzr" placeholder="请选择组织负责人"
-                    :options="PlaceOfPayList" allowClear showSearch/> -->
-                <!-- <ProjectManager :type="0" v-model:value="formParam.actValue" :placeholder="'请选择担当'" v-model:arrayList="formParam.actArray" ></ProjectManager> -->
-                <AddApprover
-                  :title="'组织担当'"
-                  v-model:arrayList="formParam.actArray"
-                  @valueChange="valueChange"
-                  :type="0"
-                >
-                  <a-select
-                    style="width: 100%"
-                    v-model:value="formParam.actValue"
-                    :open="false"
-                    :placeholder="'请选择担当'"
-                  ></a-select>
-                </AddApprover>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="16" v-if="formParam.isParent">
-            <a-col :span="12">
-              <a-form-item name="leveOneValue">
-                <template v-slot:label>
-                  <img
-                    style="margin-right: 4px; width: 7px; height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
-                  一级审批人
-                </template>
-                <!-- <a-select v-model:value="formParam.yjspr" placeholder="请选择一级审批人"
-                    :options="PlaceOfPayList" allowClear showSearch/> -->
-                <!-- <ProjectManager :type="1" v-model:value="formParam.leveOneValue" :placeholder="'请选择一级审批人'" v-model:arrayList="formParam.leveOneArray" ></ProjectManager> -->
-                <AddApprover
-                  :title="'一级审批人'"
-                  v-model:arrayList="formParam.leveOneArray"
-                  @valueChange="valueChange"
-                  :type="1"
-                >
-                  <a-select
-                    style="width: 100%"
-                    v-model:value="formParam.leveOneValue"
-                    :open="false"
-                    :placeholder="'请选择一级审批人'"
-                  ></a-select>
-                </AddApprover>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="二级审批人">
-                <!-- <a-select v-model:value="formParam.zzfzr" placeholder="请选择二级审批人"
-                    :options="PlaceOfPayList" allowClear showSearch/> -->
-                <!-- <ProjectManager :type="1" :placeholder="'请选择二级审批人'" v-model:arrayList="formParam.leveTwoArray" ></ProjectManager> -->
-                <AddApprover
-                  :title="'二级审批人'"
-                  v-model:arrayList="formParam.leveTwoArray"
-                  @valueChange="valueChange"
-                  :type="2"
-                >
-                  <a-select
-                    style="width: 100%"
-                    v-model:value="formParam.leveTwoValue"
-                    :open="false"
-                    :placeholder="'请选择二级审批人'"
-                  ></a-select>
-                </AddApprover>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="16">
-            <a-col :span="12" v-if="formParam.isParent">
-              <a-form-item label="三级审批人">
-                <!-- <a-select v-model:value="formParam.sjspr" placeholder="请选择三级审批人"
-                    :options="PlaceOfPayList" allowClear showSearch/> -->
-                <!-- <ProjectManager :type="1" :placeholder="'请选择三级审批人'" v-model:arrayList="formParam.leveThreeArray" ></ProjectManager> -->
-                <AddApprover
-                  :title="'三级审批人'"
-                  v-model:arrayList="formParam.leveThreeArray"
-                  @valueChange="valueChange"
-                  :type="3"
-                >
-                  <a-select
-                    style="width: 100%"
-                    v-model:value="formParam.leveThreeValue"
-                    :open="false"
-                    :placeholder="'请选择三级审批人'"
-                  ></a-select>
-                </AddApprover>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12" v-if="formParam.isParent == 0">
-              <a-form-item name="isContains">
-                <template v-slot:label>
-                  <img
-                    style="margin-right: 4px; width: 7px; height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
-                  审批流程是否加该担当
-                </template>
-                <a-select
-                  v-model:value="formParam.isContains"
-                  placeholder="请选择审批流程是否加担当"
-                  :options="isConSelect"
-                  allowClear
-                  showSearch
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="备注">
-                <a-input
-                  v-model:value="formParam.remark"
-                  showCount
-                  :maxlength="200"
-                  style="width: 100%; height: 40px; border-radius: 8px"
-                  placeholder="请输入"
-                />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-form-item name="orglistName">
-            <template v-slot:label>
-              <img
-                style="margin-right: 4px; width: 7px; height: 7px"
-                src="@/assets/images/coursewareManage/asterisk.png"
-                alt=""
-              />
-              选择管理组织
-            </template>
-            <a-row :gutter="50" style="margin-bottom: 10px">
-              <a-col :span="2">
-                <!-- <a-tag color="blue" style="line-height: 40px; ">管理业务</a-tag> -->
-                <a-button
-                  type="primary"
-                  @click="addContentData"
-                  style="width: 100px; height: 40px; border-radius: 8px"
-                  >添加组织</a-button
-                >
-              </a-col>
-              <!-- <a-col :span="20">
-        <div class="add_content" @click="addContentData" >+</div>
-        </a-col> -->
-            </a-row>
-          </a-form-item>
-          <!-- 备注 remark -->
-          <a-row :gutter="16" style="padding-bottom: 60px">
-            <a-col :span="24">
-              <a-form-item label="">
-                <!-- <a-textarea v-model:value="formParam.remark" showCount :maxlength="200"
-                  style="width: 100%; height: 100px; border-radius: 8px" placeholder="请输入" /> -->
-                <a-table
-                  :dataSource="formParam?.affiliationOrgList"
-                  :scroll="{ x: '600' }"
-                  :columns="orgColumns"
-                />
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-        <!-- 交互按钮 -->
-        <div
-          :style="{
-            position: 'absolute',
-            right: 0,
-            bottom: 0,
-            width: '100%',
-            borderTop: '1px solid #e9e9e9',
-            padding: '10px 16px',
-            background: '#fff',
-            textAlign: 'right',
-            zIndex: 1,
-          }"
-        >
-          <a-button class="drabtn" @click="cancelTeacherDialog">取消</a-button>
-          <a-button
-            class="drabtn"
-            type="primary"
-            @click="createTeacherDialog(0)"
-            :loading="buttonLoading"
-            >保存</a-button
-          >
-          <a-button
-            v-if="editParams || editIndex > 1"
-            class="drabtn"
-            type="primary"
-            @click="createTeacherDialog(1)"
-            :loading="buttonLoading"
-            >提交</a-button
-          >
-        </div>
-      </div>
-    </a-drawer>
-    <AddOrgContent
-      :Addtitle="'选择组织'"
-      :isParent="formParam.isParent"
-      v-model:showContent="showContent"
-      :AddContentLists="formParam.affiliationOrgLists"
-      v-model:AddContentList="formParam.affiliationOrgList"
-    />
-  </div>
+
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch } from "vue";
-import { FolderAddOutlined } from "@ant-design/icons-vue";
-import { message } from "ant-design-vue";
-import dialog from "@/utils/dialog";
-import ProjectManager from "@/components/project/ProjectManagerLecturer";
-import {
-  queryTrainOrg,
-  deleteTrainOrg,
-  addReviewer,
-  updateTrainOrg,
-} from "../../api/organization";
-import AddOrgContent from "../../components/project/AddOrgContent.vue";
-import * as lecturer from "../../api/Lecturer.js";
-import lockLecturer from "@/components/project/lockLecturer";
-import AddApprover from "@/components/project/AddApprover";
-import { checkMenu } from "@/utils/utils";
+import { reactive, toRefs, ref, watch ,onMounted} from "vue";
+import OrganizationList from "../lecturer/OrganizationList.vue"
+import OrganizationApproval from "../lecturer/OrganizationApproval.vue"
+
+import { useRoute } from "vue-router";
 export default {
   name: "organization",
   components: {
-    ProjectManager,
-    FolderAddOutlined, //图标--新增
-    AddOrgContent,
-    lockLecturer,
-    AddApprover,
+    OrganizationList,
+    OrganizationApproval
   },
   setup() {
-    const formRef = ref();
+    const route = useRoute();
 
     const state = reactive({
-      example: false,
-      editParams: true,
-      editIndex: 0,
-      tableDataTotal: 0,
-      vf: true,
-      showContent: false,
-      tableLoading: false,
-      deleteInTeacherdialog: false,
-      teacherdialog: false,
-      teacherdialogtitle: null,
-      delId: null,
-      searchParam: {
-        name: null,
-        isParent: null,
-        leaderName: null,
-        pageNo: "1",
-        pageSize: "10",
-      },
-      formParam: {
-        orglistName: null,
-        affiliationCode: null,
-        affiliationName: null,
-        isParent: 1,
-        remark: null,
-        actValue: null,
-        actArray: [],
-        leveOneValue: null,
-        leveTwoValue: null,
-        leveThreeValue: null,
-        leveOneArray: [],
-        leveTwoArray: [],
-        leveThreeArray: [],
-        code: null,
-        isContains: "0",
-        affiliationOrgList: [],
-        affiliationOrgLists: [],
-        locking: 1,
-      },
+      activeKey: '1',
     });
-    const PlaceOfPayList = ref([
-      { value: "1", label: "一级审批" },
-      { value: "2", label: "二级审批" },
-      { value: "3", label: "三级审批" },
-    ]);
-    const isConSelect = ref([
-      { value: "1", label: "是" },
-      { value: "0", label: "否" },
-    ]);
-    const placeData = () => {
-      lecturer.parentList().then((res) => {
-        if (res.data.code == 200) {
-          PlaceOfPayListTwo.value = res.data.data.map((item) => {
-            return {
-              value: item.affiliationCode,
-              label: item.affiliationName,
-            };
-          });
-        }
-      });
-    };
-    // placeData()
-    const PlaceOfPayListTwo = ref([]);
-    const selectRadio = (val) => {
-      if (val.target.value == 1) {
-        state.formParam.leveOneArray = [];
-        state.formParam.leveTwoArray = [];
-        state.formParam.leveThreeArray = [];
-        state.formParam.leveOneValue = null;
-        state.formParam.leveTwoValue = null;
-        state.formParam.leveThreeValue = null;
-      }
-      state.formParam.code = null;
-    };
-    const columns = ref([
-      // {
-      //   title: '培训发生组织编号 ',
-      //   dataIndex: 'affiliationCode',
-      //   key: 'affiliationCode',
-      //   ellipsis: true,
-      //   align: "center",
-      //   width: '100px',
-      // },
-      {
-        title: "培训发生组织名称 ",
-        dataIndex: "affiliationName",
-        key: "affiliationName",
-        ellipsis: true,
-        align: "left",
-        width: "200px",
-        customCell: () => {
-          return { style: { userSelect: "text" } };
-        },
-      },
-      {
-        title: "状态",
-        dataIndex: "status",
-        key: "status",
-        ellipsis: true,
-        align: "center",
-        width: "100px",
-        customRender: ({ text }) => {
-          switch (text) {
-            case "1":
-              return <span>待提交</span>;
-            case "2":
-              return <span>审核中</span>;
-            case "3":
-              return <span>已完成</span>;
-            case "4":
-              return <span>审核失败</span>;
-            case "5":
-              return <span>待审核</span>;
-            default:
-              return <span>-</span>;
-          }
-        },
-      },
-      {
-        title: "是否为根节点",
-        dataIndex: "parentName",
-        key: "parentName",
-        align: "left",
-        width: "200px",
-        customRender: ({ text, record }) => {
-          return text ? (
-            <div>
-              <span style={{ marginRight: "10px" }}>否</span>({text})
-            </div>
-          ) : (
-            <div>
-              <span style={{ marginRight: "10px" }}>是</span>(
-              {{ 1: "一", 2: "二", 3: "三" }[record.code]}级审批)
-            </div>
-          );
-        },
-      },
-      {
-        title: "担当",
-        dataIndex: "leaderName",
-        key: "leaderName",
-        ellipsis: true,
-        align: "left",
-        width: "200px",
-        customCell: () => {
-          return { style: { userSelect: "text" } };
-        },
-      },
 
-      // {
-      //   title: '备注 ',
-      //   dataIndex: 'remark',
-      //   key: 'remark',
-      //   ellipsis: true, align: "center",
-      //   width: 160,
-      // },
-      {
-        title: "操作 ",
-        dataIndex: "operation",
-        key: "operation",
-        width: "120px",
-        align: "center",
-        fixed: "right",
-        scopedSlots: { customRender: "action" },
-      },
-    ]);
-    const orgColumns = ref([
-      {
-        title: "组织名称",
-        dataIndex: "orgName",
-        key: "orgName",
-        ellipsis: true,
-        width: "20%",
-        align: "center",
-      },
-      {
-        title: "是否被培训发生组织选择",
-        dataIndex: "isSelect",
-        key: "isSelect",
-        ellipsis: true,
-        align: "center",
-        width: "30%",
-        customRender: (text) => {
-          return (
-            <div>
-              {text.record.isSelect == 1
-                ? `是 (${text.record.affiliationName})`
-                : "否 (-)"}
-            </div>
-          );
-        },
-      },
-      {
-        title: "担当",
-        dataIndex: "leaders",
-        key: "leaders",
-        ellipsis: true,
-        align: "center",
-        width: "60%",
-        customRender: (text) => {
-          return <div>{text.record.leaders || "-"}</div>;
-        },
-      },
-    ]);
-    //列表数据
-    const tableData = ref([]);
-    //  List接口数据
-    const getTableDate = (obj) => {
-      state.tableLoading = true;
-      let objA = { ...state.searchParam };
-      queryTrainOrg(objA).then((res) => {
-        tableData.value = res.data.data.records;
-        state.tableDataTotal = Number(res.data.data.total);
-        state.tableLoading = false;
-      });
-    };
-    getTableDate();
-    // 搜索
-    const searchSubmit = () => {
-      state.searchParam.pageNo = 1;
-      getTableDate();
-    };
-    const searchList = (val) => {
-      getTableDate();
-    };
-    //重置
-    const searchReset = () => {
-      state.searchParam = {
-        name: null,
-        isParent: null,
-        leaderName: null,
-        pageNo: 1,
-        pageSize: 10,
-      };
-      getTableDate();
-    };
-    //   // 翻页
-    const changePagination = (page, pageSize) => {
-      state.searchParam.pageNo = page;
-      // state.pageNo = page;
-      state.searchParam.pageSize = pageSize;
-      getTableDate();
-    };
-    const updateModal = (record) => {
-      dialog({
-        content: "是否确认撤回 ?",
-        ok: () => {
-          lecturer
-            .affiliatIsConfirm(record.id)
-            .then((res) => {
-              message.success("撤回成功");
-              getTableDate();
-            })
-            .catch((err) => {
-              message.destroy();
-              message.error(err.data.msg);
-            });
-        },
-      });
-    };
-    //删除弹窗
-    const deleteModal = (record) => {
-      let contents = "";
-      (record.status == 1 || record.status == 4) &&
-        record.parentName &&
-        (contents = "是否确认进行删除?");
-      (record.status == 1 || record.status == 4) &&
-        !record.parentName &&
-        (contents = "是否确认进行删除?删除后关联的子节点将一并删除");
-      record.status == 2 && (contents = "该培训发生组织正在审核中，无法删除");
-      dialog({
-        content: contents || "是否确认进行删除?",
-        isCloseBtn: record.status == 2 ? false : true,
-        ok: () => {
-          lecturer
-            .affiliationDelById(record.id)
-            .then((res) => {
-              if (typeof res.data.data != "object") {
-                message.error(res.data.data);
-                return;
-              }
-              message.success("删除成功");
-              searchSubmit();
-            })
-            .catch((err) => {
-              message.destroy();
-              message.error(err.data.msg);
-            });
-        },
-      });
-    };
-    const isEnablePost = (record, status) => {
-      dialog({
-        content: `是否确认${!status ? "启用" : "停用"}该培训发生组织?`,
-        ok: () => {
-          lecturer
-            .isEnable({ id: record.id, status })
-            .then((res) => {
-              if (typeof res.data.data != "object") {
-                message.error(res.data.data);
-                return;
-              }
-              message.success(`${!status ? "启用" : "停用"}成功`);
-              searchSubmit();
-            })
-            .catch((err) => {
-              message.destroy();
-              message.error(err.data.msg);
-            });
-        },
-      });
-    };
-    //确认删除
-    const closeDeleteTeacher = () => {
-      //调用删除接口
-      deleteTrainOrg({ kid: state.delId }).then((res) => {
-        if (res.data.code == 200) {
-          // message.success("删除成功");
-          state.deleteInTeacherdialog = false;
-          searchSubmit();
-        }
-      });
-    };
-    //取消按钮 清空输入的数据
-    const cancelTeacherDialog = () => {
-      if ((state.teacherdialog = true)) {
-        formRef.value.resetFields();
-        state.teacherdialog = false;
+
+    onMounted(() => {
+      if (route.query.activeKey) {
+        state.activeKey = '2'
       }
-      cancel();
-      state.deleteInTeacherdialog = false;
-      state.editTeacher = false;
-    };
-    watch(
-      () => state.teacherdialog,
-      (val) => {
-        if (val) {
-          placeData();
-        } else {
-          state.editParams = true;
-          state.editIndex = 0;
-        }
-      }
-    );
-    const addTeacher = () => {
-      (state.teacherdialog = true), (state.formParam.locking = 0);
-      state.teacherdialogtitle = "新增培训发生组织";
-      state.vf = true;
-      lecturer
-        .getAffiliationCode()
-        .then((res) => {
-          state.formParam.affiliationCode = res.data.data;
-        })
-        .catch(() => {
-          message.error("获取培训发生组织编号失败");
-        });
-    };
-    const downOpen = () => {
-      window.open(
-        `/manageApi/admin/export/exportTeacherAffiliation?name=${
-          state.searchParam.name || ""
-        }&isParent=${state.searchParam.isParent || ""}&leaderName=${
-          state.searchParam.leaderName || ""
-        }`
-      );
-    };
-    const addContentData = () => {
-      state.showContent = true;
-    };
-    watch(
-      () => state.formParam,
-      (val) => {
-        if (!state.editParams) {
-          state.editIndex++;
-        }
-      },
-      { deep: true }
-    );
-    //修改信息弹窗
-    const handleModify = (record) => {
-      lecturer.getAffiliationById(record.id).then((res) => {
-        res.data.data.status == 3 && (state.editParams = false);
-        state.formParam = res.data.data;
-        const actArray = res.data.data.affiliationUserList
-          .filter((item) => item.type == 0)
-          .reduce((accumulator, current) => {
-            if (!accumulator.some((item) => item.userId === current.userId)) {
-              accumulator.push(current);
-            }
-            return accumulator;
-          }, []);
-        const leveOneArray = res.data.data.affiliationUserList
-          .filter((item) => item.type == 1)
-          .reduce((accumulator, current) => {
-            if (!accumulator.some((item) => item.userId === current.userId)) {
-              accumulator.push(current);
-            }
-            return accumulator;
-          }, []);
-        const leveTwoArray = res.data.data.affiliationUserList
-          .filter((item) => item.type == 2)
-          .reduce((accumulator, current) => {
-            if (!accumulator.some((item) => item.userId === current.userId)) {
-              accumulator.push(current);
-            }
-            return accumulator;
-          }, []);
-        const leveThreeArray = res.data.data.affiliationUserList
-          .filter((item) => item.type == 3)
-          .reduce((accumulator, current) => {
-            if (!accumulator.some((item) => item.userId === current.userId)) {
-              accumulator.push(current);
-            }
-            return accumulator;
-          }, []);
-        state.formParam.actArray = actArray.map((item) => {
-          return {
-            label: item.userName + item.userNo,
-            value: item.userId,
-            realName: item.userName,
-            ...item,
-            id: item.userId,
-          };
-        });
-        state.formParam.actValue = state.formParam.actArray
-          .map((item) => item.label)
-          .join(",");
-        state.formParam.leveOneArray = leveOneArray.map((item) => {
-          return {
-            label: item.userName + item.userNo,
-            value: item.userId,
-            realName: item.userName,
-            ...item,
-          };
-        });
-        state.formParam.leveOneValue = state.formParam.leveOneArray
-          .map((item) => item.label)
-          .join(",");
-        state.formParam.leveTwoArray = leveTwoArray.map((item) => {
-          return {
-            label: item.userName + item.userNo,
-            value: item.userId,
-            realName: item.userName,
-            ...item,
-          };
-        });
-        state.formParam.leveTwoValue =
-          state.formParam.leveTwoArray.map((item) => item.label).join(",") ||
-          null;
-        state.formParam.leveThreeArray = leveThreeArray.map((item) => {
-          return {
-            label: item.userName + item.userNo,
-            value: item.userId,
-            realName: item.userName,
-            ...item,
-          };
-        });
-        state.formParam.leveThreeValue =
-          state.formParam.leveThreeArray.map((item) => item.label).join(",") ||
-          null;
-        state.formParam.orglistName = state.formParam.affiliationOrgList
-          ?.map((item) => item.id)
-          .join(",");
-        state.formParam.selectOrgList?.map((item) => {
-          state.formParam.affiliationOrgList.some((item2) => {
-            if (item.orgId == item2.orgId) {
-              item2 = Object.assign(item2, item);
-              return true;
-            }
-          });
-        });
-        state.formParam.affiliationOrgLists =
-          state.formParam.affiliationOrgList;
-        state.formParam.isContains = String(state.formParam.isContains);
-        state.teacherdialog = true;
-        state.teacherdialogtitle = "编辑培训发生组织";
-        state.vf = false;
-      });
-      // TeacherSystem(record)
-    };
-    const TeacherSystem = (record) => {
-      state.formParam.affiliationCode = record.affiliationCode;
-      state.formParam.affiliationName = record.affiliationName;
-      state.formParam.remark = record.remark;
-    };
-    const cancel = () => {
-      state.formParam = {
-        orglistName: null,
-        affiliationCode: null,
-        affiliationName: null,
-        isParent: 1,
-        remark: null,
-        actValue: null,
-        actArray: [],
-        leveOneValue: null,
-        leveTwoValue: null,
-        leveThreeValue: null,
-        leveOneArray: [],
-        leveTwoArray: [],
-        leveThreeArray: [],
-        code: null,
-        isContains: "0",
-        affiliationOrgList: [],
-        affiliationOrgLists: [],
-        locking: 1,
-      };
-    };
-    async function validateField(name) {
-      return new Promise((resolve) => {
-        formRef.value
-          .validateFields([name])
-          .then(() => {
-            resolve(false);
-          })
-          .catch(() => {
-            resolve(true);
-          });
-      });
-    }
-    const valueChange = (val, type) => {
-      if (type == 0) {
-        state.formParam.actValue =
-          val?.map((item) => item.label).join(",") || null;
-      } else if (type == 1) {
-        state.formParam.leveOneValue =
-          val?.map((item) => item.label).join(",") || null;
-      } else if (type == 2) {
-        state.formParam.leveTwoValue =
-          val?.map((item) => item.label).join(",") || null;
-      } else if (type == 3) {
-        state.formParam.leveThreeValue =
-          val?.map((item) => item.label).join(",") || null;
-      }
-    };
-    //保存
-    const createTeacherDialog = async (val) => {
-      state.formParam.affiliationName = state.formParam.affiliationName?.trim();
-      state.formParam.affiliationUserList = [
-        ...state.formParam?.actArray,
-        ...state.formParam?.leveOneArray,
-        ...state.formParam?.leveTwoArray,
-        ...state.formParam?.leveThreeArray,
-      ];
-      state.formParam.orglistName = state.formParam.affiliationOrgList
-        ?.map((item) => item.id)
-        .join(",");
-      let formItemNames = Object.keys(rules);
-      if (state.formParam.isParent == 0) {
-        formItemNames = formItemNames.filter((item) => item != "leveOneValue");
-      } else {
-        formItemNames = formItemNames.filter((item) => item != "isContains");
-      }
-      for (let i = 0; i < formItemNames.length; i++) {
-        // const result = await validateField(formItemNames[i]);
-        const result = state.formParam[formItemNames[i]];
-        if (!result) {
-          if (formItemNames[i] == "code" && !state.formParam.isParent) {
-            return message.error(rules[formItemNames[i]][0].log2);
-          } else {
-            return message.error(rules[formItemNames[i]][0].log);
-          }
-        }
-      }
-      if (
-        !state.formParam.leveTwoValue &&
-        state.formParam.leveThreeValue &&
-        state.formParam.isParent
-      ) {
-        return message.error("请选择二级审批人");
-      }
-      state.formParam.remark = state.formParam?.remark?.trim();
-      state.formParam.submitStatus = val;
-      dialog({
-        content: val
-          ? "是否确认提交，一旦提交将进入（BPM系统）审核流程。"
-          : "是否确认保存？",
-        ok: () => {
-          state.example = true;
-          if (state.vf == false) {
-            updateTrainOrg(state.formParam)
-              .then((res) => {
-                if (res.data.code == 200) {
-                  message.success("修改成功");
-                  cancel();
-                  getTableDate();
-                } else {
-                  message.error(res.data.msg);
-                }
-                state.teacherdialog = false;
-                state.example = false;
-              })
-              .catch((err) => {
-                message.destroy();
-                message.error(err.data.msg);
-                state.teacherdialog = false;
-                state.example = false;
-                cancel();
-              });
-          } else {
-            addReviewer(state.formParam)
-              .then((res) => {
-                message.success("保存成功");
-                state.teacherdialog = false;
-                cancel();
-                searchSubmit();
-                state.example = false;
-              })
-              .catch((err) => {
-                message.destroy();
-                message.error(err.data.msg);
-                state.teacherdialog = false;
-                cancel();
-                state.example = false;
-              });
-          }
-        },
-      });
-    };
-    const rules = {
-      affiliationCode: [
-        { required: true, message: "", log: "请选择培训发生组织编号" },
-      ],
-      affiliationName: [
-        { required: true, message: "", log: "请选择培训发生组织名称" },
-      ],
-      code: [
-        {
-          required: true,
-          message: "",
-          log: "请选择根节点",
-          log2: "请选择审批层级",
-        },
-      ],
-      actValue: [{ required: true, message: "", log: "请选择组织担当" }],
-      leveOneValue: [{ required: true, message: "", log: "请选择一级审批人" }],
-      isContains: [
-        { required: true, message: "", log: "请选择审批流程是否加担当" },
-      ],
-      orglistName: [{ required: true, message: "", log: "请选择管理组织" }],
-    };
-    const TrainOrglist = ref([
-      { label: "全部", value: "" },
-      { label: "根节点", value: "0" },
-      { label: "子节点", value: "1" },
-    ]);
-    //回车
-    const enterPressHadlerSearch = (e) => {
-      if (e.keyCode === 13) {
-        searchSubmit();
-      }
-    };
+    })
+
     return {
       ...toRefs(state),
-      enterPressHadlerSearch,
-      TrainOrglist,
-      rules,
-      formRef,
-      columns,
-      orgColumns,
-      tableData,
-      getTableDate,
-      searchSubmit,
-      selectRadio,
-      PlaceOfPayList,
-      isConSelect,
-      PlaceOfPayListTwo,
-      placeData,
-      searchReset,
-      searchList,
-      deleteModal,
-      isEnablePost,
-      updateModal,
-      cancelTeacherDialog,
-      addTeacher,
-      downOpen,
-      addContentData,
-      handleModify,
-      closeDeleteTeacher,
-      changePagination,
-      TeacherSystem,
-      createTeacherDialog,
-      valueChange,
-      validateField,
-      checkMenu,
     };
   },
 };
 </script>
 <style lang="scss" scoped>
-.example {
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.45);
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 999999;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.headers {
-  height: 73px;
-  border-bottom: 1px solid #e8e8e8;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  // background-color: red;
-  margin-bottom: 20px;
 
-  .headerTitle {
-    font-size: 18px;
-    font-weight: 600;
-    color: #333333;
-    line-height: 25px;
-    // margin-left: 24px;
-  }
-}
-.tableBox {
-  padding-bottom: 20px;
-  margin: 20px 38px 30px;
-  ::v-deep .ant-select-dropdown {
-    display: inline-block;
-  }
-  ::v-deep .ant-select-selection-item {
-    margin-left: 3px;
-  }
-  ::v-deep .ant-pagination-options-size-changer.ant-select {
-    width: 84px;
-  }
-  .pa {
-    width: 100%;
-    display: flex;
-    justify-content: right;
-  }
-}
-.add_content {
-  width: 40px;
-  height: 40px;
-  cursor: pointer;
-  border-radius: 50%;
-  background-color: #4ea6ff;
-  text-align: center;
-  line-height: 40px;
-  color: #ffffff;
-  font-size: 26px;
-}
-//导出按钮icon
-.daochu {
-  width: 16px;
-  height: 18px;
-  background-image: url("../../assets/images/coursewareManage/export1.png");
-}
-
-//弹窗内详情样式
-.display1 {
-  display: inline-block;
-  width: 200px;
-}
-
-// .display0{
-// display:inline-block ;
-// width:200px ;
-// text-align:center }
-//弹窗内确认取消按钮布局
-.del_btnbox {
-  display: flex;
-  margin: 30px auto;
-  justify-content: center;
-
-  .del_btn {
-    width: 100px;
-    height: 40px;
-    background: rgba(64, 158, 255, 0);
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-shrink: 0;
-    cursor: pointer;
-
-    .btnText {
-      font-size: 14px;
-      font-weight: 400;
-      line-height: 40px;
-    }
-  }
-
-  .btn1 {
-    border: 1px solid rgba(64, 158, 255, 1);
-    color: #4ea6ff;
-    margin-right: 14px;
-  }
-
-  .btn2 {
-    background-color: #4ea6ff;
-    color: #ffffff;
-  }
-}
-
-.ant-table-cell-fix-right {
-  width: 300px !important;
-}
-
-.ant-table-tbody > tr > td {
-  text-align: center;
-}
-
-.InsideLecturer {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  position: relative;
-  .filter {
-    margin-left: 38px;
-    margin-right: 38px;
-    margin-top: 30px;
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    .select {
-      margin-right: 20px;
-      margin-bottom: 20px;
-    }
-  }
-}
-
-.delete {
-  z-index: 9999;
-  width: 424px;
-  background: #ffffff;
-  box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
-  border-radius: 4px;
-  position: absolute;
-  left: 30%;
-  top: 10%;
-  // transform: translate(-50%, -50%);
-
-  .del_header {
-    position: absolute;
-    width: calc(100%);
-    height: 40px;
-    background: linear-gradient(
-      rgba(78, 166, 255, 0.2) 0%,
-      rgba(78, 166, 255, 0) 100%
-    );
-  }
-
-  .del_main {
-    width: 100%;
-    position: relative;
-
-    .header {
-      display: flex;
-      align-items: center;
-      padding-top: 20px;
-      padding-left: 26px;
-      font-size: 16px;
-
-      .del-icon {
-        width: 16px;
-        height: 16px;
-        margin-right: 10px;
-        background-image: url(@/assets/images/coursewareManage/notice.png);
-        background-size: 100% 100%;
-      }
-
-      .icon {
-        width: 16px;
-        height: 16px;
-        margin-right: 10px;
-        background-image: url(@/assets/images/coursewareManage/QR.png);
-        background-size: 100% 100%;
-      }
-
-      .close_exit {
-        position: absolute;
-        right: 42px;
-        cursor: pointer;
-        width: 20px;
-        height: 20px;
-        background-image: url(@/assets/images/coursewareManage/close.png);
-        background-size: 100% 100%;
-      }
-    }
-
-    .body {
-      width: 100%;
-      margin: 34px auto 56px auto;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-
-    .del_btnbox {
-      display: flex;
-      margin: 30px auto;
-      justify-content: center;
-
-      .del_btn {
-        width: 100px;
-        height: 40px;
-        background: rgba(64, 158, 255, 0);
-        border-radius: 8px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-right: 14px;
-        flex-shrink: 0;
-        cursor: pointer;
-
-        .btnText {
-          font-size: 14px;
-          font-weight: 400;
-          line-height: 40px;
-        }
-      }
-
-      .btn1 {
-        border: 1px solid rgba(64, 158, 255, 1);
-        color: #4ea6ff;
-      }
-
-      .btn2 {
-        background-color: #4ea6ff;
-        color: #ffffff;
-      }
-    }
-  }
-}
-
-.CreatePath {
-  .out {
-    z-index: 9999;
-    display: block;
-    position: absolute;
-    top: 90px;
-    width: 1080px !important;
-    height: 650px;
-    overflow: auto;
-    background-color: #fff;
-
-    box-shadow: 0 0 10px rgba(118, 136, 166, 0.21);
-    left: 50%;
-    top: 300px;
-    transform: translate(-50%, -50%);
-
-    .top {
-      width: 100%;
-      height: 68px;
-
-      background: linear-gradient(
-        rgba(78, 166, 255, 0.2) 0%,
-        rgba(78, 166, 255, 0) 100%
-      );
-      display: flex;
-      align-items: center;
-
-      .topimg {
-        width: 18px;
-        height: 18px;
-        margin-left: 27px;
-        margin-top: -2px;
-      }
-
-      .topc {
-        color: #000000;
-        font-size: 16px;
-        margin-left: 8px;
-      }
-    }
-
-    .mid {
-      width: 100%;
-      height: 100%;
-      background-color: #fff;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-
-      .d {
-        // margin-top: 8px;
-        // color: #ff4e4e;
-        margin-left: -5px;
-      }
-    }
-  }
-}
-
-// 重置样式
-.resetbtn {
-  width: 100px;
-  height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 14px;
-  flex-shrink: 0;
-  cursor: pointer;
-  .search {
-    width: 15px;
-    height: 16px;
-    margin-right: 5px;
-    background: url("../../assets/images/courseManage/add0.png") no-repeat;
-    background-size: 100% 100%;
-  }
-}
-.btnn {
-  padding: 0px 26px 0px 26px;
-  height: 40px;
-  background: #1890ff;
-  border-radius: 8px;
-  border: 1px solid #1890ff;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 14px;
-  flex-shrink: 0;
-  cursor: pointer;
-
-  .btnText {
-    font-size: 14px;
-    font-weight: 400;
-    color: #fff;
-    line-height: 36px;
-    margin-left: 5px;
-  }
-  .daochu {
-    width: 16px;
-    height: 18px;
-    background-image: url("../../assets/images/coursewareManage/export1.png");
-  }
-}
-
-//展开收起样式
-.moreidbtn {
-  border: none;
-  color: #4ea6ff;
-  width: 80px;
-}
-
-//小竖线
-.line {
-  float: left;
-  width: 3px;
-  height: 25px;
-  background: #4ea6ff;
-  border-radius: 30%;
-  margin-right: 5px;
-}
-//抽屉功能
-.drawaer
-/* 改变所有 a-tree-select 输入框的高度 */
-.ant-tree-select .ant-select-selection {
-  height: 40px;
-  line-height: 40px;
-  /* 确保文字垂直居中 */
-}
-.draitem {
-  width: 100%;
-  height: 40px !important;
-  border-radius: 8px;
-  line-height: 40px;
-}
-.drabtn {
-  height: 40px;
-  width: 80px;
-  border-radius: 8px;
-  margin-right: 20px;
-}
-::v-deep .ant-select:not(.ant-select-customize-input) .ant-select-selector {
-  border-radius: 8px;
-  height: 40px;
-  line-height: 40px;
-  text-align: left;
-}
-.ant-col-12 {
-  height: 90px;
-}
-.item_inp {
-  flex: 1;
-  text-align: center;
-  .i_upload_img {
-    width: 100px;
-    height: 100px;
-    border-radius: 8px;
-  }
-
-  .i_upload {
-    width: 100px;
-    height: 100px;
-    border: 1px solid #4ea6ff;
-    border-radius: 50%;
-    text-align: center;
-    align-items: center;
-    cursor: pointer;
-
-    .addimg {
-      position: relative;
-
-      .heng {
-        position: absolute;
-        top: 50px;
-        left: 25px;
-        width: 50px;
-        border: 1px solid #4ea6ff;
-      }
-
-      .shu {
-        position: absolute;
-        top: 25px;
-        left: 50px;
-        height: 50px;
-        border: 1px solid #4ea6ff;
-      }
-    }
-  }
-
-  .ant-upload.ant-upload-select-picture-card {
-    border: 0px !important;
-    border-radius: 50% !important;
-  }
-}
-.ant-upload.ant-upload-select-picture-card {
-  border: 0px !important;
-  border-radius: 50% !important;
-}
 </style>
diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue
new file mode 100644
index 00000000..01bdd8c6
--- /dev/null
+++ b/src/views/lecturer/OrganizationApproval.vue
@@ -0,0 +1,1577 @@
+<!-- 讲师费审批页面 -->
+<template>
+  <div>
+    <!-- 搜索框及按钮 -->
+    <div class="filter">
+      <a-form layout="inline" style="min-width: 1380px;">
+        <a-form-item class="select">
+          <a-select style="width: 235px" v-model:value="searchParam.trainOrgId" placeholder="培训发生组织" allowClear
+            :options="trainOrglist" v-on:keydown.enter="enterPressHadlerSearch">
+          </a-select>
+        </a-form-item>
+        <a-form-item class="select ">
+          <!-- <div class="select addTimeBox">
+            <div class="addTime" >汇总时间：</div> -->
+          <a-range-picker v-model:value="searchdate" style="width: 340px !important;" format="YYYY-MM-DD"
+            valueFormat="YYYY-MM-DD" separator="至" :placeholder="['汇总时间开始时间', '汇总时间结束时间']"
+            v-on:keydown.enter="enterPressHadlerSearch" />
+          <!-- </div> -->
+        </a-form-item>
+        <a-form-item class="select">
+          <a-select style="width: 200px ;margin-bottom:20px" v-model:value="searchParam.status" placeholder="请选择状态"
+            allowClear :options="AuthenticationStatusList" v-on:keydown.enter="enterPressHadlerSearch">
+          </a-select>
+        </a-form-item>
+        <div style="display: flex; margin-bottom: 20px">
+          <a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
+          <!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
+          <!-- <div class="search"></div> -->
+          <a-button class="resetbtn " @click="searchReset">重置</a-button>
+
+          <!-- 更多筛选-->
+          <!-- <div v-if="moreid == 1">
+              <a-button @click="handlemoreid()" class="moreidbtn" type="text"> 展开
+                <RightOutlined />
+              </a-button>
+            </div>
+            <div v-if="moreid == 2">
+              <a-button @click="handlemoreid()" class="moreidbtn"> 返回
+                <UpOutlined />
+              </a-button>
+            </div> -->
+        </div>
+        <!-- <div style="width:100%"></div> -->
+        <!-- <a-form-item class="select" v-if="moreid == 2">
+            <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.courseType" placeholder="请选择费用类型" allowClear
+              :options="courseTypeList">
+            </a-select>
+          </a-form-item>
+          <a-form-item class="select" v-if="moreid == 2">
+            <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.type" placeholder="请选择课程类型" allowClear
+              :options="OnTheJobStatusList">
+            </a-select>
+          </a-form-item>
+          <a-form-item class="select" v-if="moreid == 2">
+            <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.status" placeholder="请选择状态" allowClear
+              :options="AuthenticationStatusList">
+            </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
+              :options="lecturerSystemList" @change="changetlevel">
+            </a-select>
+          </a-form-item>
+          <a-form-item class="select"  v-if="moreid == 2">
+            <a-select style="width: 230px ;margin-bottom:10px" v-model:value="searchParam.levelId" placeholder="请选择讲师级别" allowClear   :disabled="getLevelList.length!==0 ? false:true"
+              :options="getLevelList">
+            </a-select>
+          </a-form-item> -->
+      </a-form>
+      <!-- <div style="width: 100%;"></div>
+        <div style="display: flex; margin-bottom: 20px">
+          
+          <a-button @click="handleExport()" class="resetbtn">
+            <UploadOutlined /> 导出
+          </a-button>
+          <div  v-if="moreid == 2"   style="line-height: 40px;" >当前页面汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">1,230,490</span>元     当前总汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">9,230,490</span>元</div>
+        </div>  -->
+      <!-- 表格 -->
+      <div>
+        <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columns"
+          :data-source="tableData" :loading="tableLoading" @expand="expandTable" :pagination="false">
+          <template #bodyCell="{ record, column }">
+            <template v-if="column.key === 'operation'">
+              <a-space>
+                <a-button type="link" v-if="record.status != 2 && record.status != 3" @click="goDdit(record)">提交</a-button>
+                <a-button type="link" v-if="record.status != 1 && record.status != 5"
+                  @click="() => handleLook(record, String(record.courseform))">查看</a-button>
+                <!-- <a-button  type="link" @click="() => handleOperate(record, String(record.courseform))">审批</a-button> -->
+                <!-- TODO1 -->
+                <a-button v-if="record.status == 1 || record.status == 4" type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
+                <!-- <a-button v-if="record.status == 4" type="link" @click="submit(record)">提交</a-button> -->
+                <a-button v-if="record.status == 2 && false" type="link" @click="withdraw(record)">撤回</a-button>
+              </a-space>
+            </template>
+          </template>
+        </a-table>
+      </div>
+
+    </div>
+    <div class="tableBox ">
+      <div style="float: right;">
+        <a-pagination v-if="tableDataTotal > 10" :showSizeChanger="true" :showQuickJumper="false"
+          :hideOnSinglePage="false" :pageSize="searchParam.pageSize" :current="searchParam.pageNo"
+          :total="tableDataTotal" class="pagination" @change="changePagination" />
+      </div>
+    </div>
+    <!-- 弹窗组件 -->
+    <!--查看讲师费详情 -->
+    <a-drawer class="largeDrawerInside" :closable="false" v-model:visible="teachingdialog" placement="right"
+      @closa="cancelTeachingDialog" width="60%" :title="false">
+      <div style="padding:24px;">
+        <div class="headers" style="margin-top:-24px;">
+          <div class="headerTitle">汇总讲师费详情</div>
+          <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+            @click="cancelTeachingDialog" />
+        </div>
+        <span class="line"></span>
+        <span style="font-weight:600;">基本信息</span>
+        <a-descriptions style="margin-top:16px" bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
+          <a-descriptions-item label="审批编号">
+            <div style="user-select:text">{{ formParam?.approvalNumber || '-' }}</div>
+          </a-descriptions-item>
+          <a-descriptions-item label="培训发生组织">
+            <div style="user-select:text">{{ formParam?.trainOrgName || '-' }}</div>
+          </a-descriptions-item>
+          <a-descriptions-item label="汇总时间">{{ formParam?.summaryTime || '-' }}</a-descriptions-item>
+          <a-descriptions-item
+            label="汇总金额">{{ formParam?.summaryTotal ? formParam?.summaryTotal + '元' : '-' }}</a-descriptions-item>
+          <a-descriptions-item label="提交时间">{{ formParam?.approvalSubmitTime || '-' }}</a-descriptions-item>
+          <a-descriptions-item label="状态">{{ {
+            0: '待确认', 1: '待提交', 2: '审核中', 3: '审核通过',
+            4: '审核拒绝', 5: '待提交'
+          }[formParam?.status]}}</a-descriptions-item>
+        </a-descriptions>
+        <!-- <span>审批详情</span> -->
+        <!-- <span class="line" style="margin-top:15px;"></span> -->
+        <a-tabs v-model:activeKey="activeKey" @change="tabsChange">
+          <a-tab-pane key="1" tab="讲师费列表">
+            <div style="padding: 10px 0;">
+              <div style="display: flex;margin-bottom: 20px;">
+                <div style="margin-right:20px;">
+                  <a-input @pressEnter="searchTeacherFeeApprovalList()" style="height:40px;border-radius:8px;"
+                    v-model:value="userNoOrName" placeholder="请输入工号/讲师名称进行搜索" />
+                </div>
+                <div style="margin-right:20px;">
+                  <a-range-picker style="height:40px;border-radius:8px;" @change="seeDateChange"
+                    valueFormat="YYYY-MM-DD" format="YYYY-MM-DD" v-model:value="seeDateValue" />
+                </div>
+                <div style="margin-right:20px;">
+                  <a-button style="margin-right:15px;height:40px;border-radius:8px;" type="primary"
+                    @click="searchTeacherFeeApprovalList()">搜索</a-button>
+                  <a-button style="margin-right:15px;height:40px;border-radius:8px;" type="primary"
+                    @click="resetSearch()">重置</a-button>
+                </div>
+              </div>
+              <div style="padding-bottom:70px">
+                <a-table :scroll="{ x: 'max-content' }" :header-cell-style="{ 'text-align': 'center' }"
+                  style="border: 1px solid #f2f6fe" :columns="columnsExamine" :data-source="tableDataExamine"
+                  :loading="examinetableLoading" @expand="expandTable" :pagination="pagination">
+                </a-table>
+              </div>
+            </div>
+          </a-tab-pane>
+          <a-tab-pane key="2" tab="讲师费审批记录" force-render v-if="false">
+            <div style="padding-bottom:70px">
+              <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe"
+                :columns="columnsExamineTwo" :data-source="tableDataExamineTwo" :loading="tableDataExamineLoading"
+                @expand="expandTable" :pagination="false">
+              </a-table>
+            </div>
+          </a-tab-pane>
+        </a-tabs>
+        <div v-if="formParam?.status == 1 || formParam?.status == 5" :style="{
+          position: 'absolute',
+          right: 0,
+          bottom: 0,
+          width: '100%',
+          borderTop: '1px solid #e9e9e9',
+          padding: '10px 16px',
+          background: '#fff',
+          textAlign: 'right',
+          zIndex: 1,
+        }">
+          <a-button class="drabtn" @click="cancelTeachingDialog">取消</a-button>
+          <a-button class="drabtn" type="primary" @click="cancelTeachingDialog(1)" :loading="buttonLoading">提交
+          </a-button>
+          <!-- <a-button  class="drabtn"  @click="cancelTeachingDialog" type="primary" danger>拒绝</a-button> -->
+        </div>
+      </div>
+    </a-drawer>
+    <!-- 修改状态功能弹窗 -->
+    <div>
+      <a-modal v-model:visible="editTeacher" :footer="null" :closable="close" wrapClassName="" centered="true">
+        <div class="delete" style="width:500px">
+          <div class="del_header"></div>
+          <div class="del_main">
+            <div class="header">
+              <div class="icon1"></div>
+              <span>提示</span>
+            </div>
+            <a-form style="margin-left:20px; margin-top:10px ">
+              <a-form-item label="审批">
+                <a-radio-group v-model:value="formParamstatues.status">
+                  <a-radio value="S20">同意</a-radio>
+                  <a-radio value="E10">拒绝</a-radio>
+                </a-radio-group>
+              </a-form-item>
+              <a-form-item label="备注">
+                <a-textarea v-model:value="formParamstatues.remark"
+                  style="width: 90%; height: 100px; border-radius: 8px ;" placeholder="一旦拒绝 备注变为必填" />
+              </a-form-item>
+            </a-form>
+            <div class="del_btnbox">
+              <div class="del_btn btn2" @click="cancelTeachingDialog" style="margin-right: 32px">
+                <div class="btnText">取消</div>
+              </div>
+              <div class="del_btn btn2" @click="closehandleOperate">
+                <div class="btnText">确定</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+    </div>
+    <!-- <div> <Upload/> </div>         -->
+    <LecturerAppEdit @example="getExample" @successParams="successParams" v-model:visible="editTeacherDialog"
+      :id="editId">
+    </LecturerAppEdit>
+    <div class="example" v-if="example">
+      <a-spin />
+    </div>
+  </div>
+</template>
+<script lang="jsx">
+import { reactive, toRefs, ref, watch, watchEffect, computed, onMounted, onUpdated} from "vue";
+import { useRouter } from "vue-router";
+import { message } from "ant-design-vue";
+import dayjs from "dayjs";
+import dialog from '@/utils/dialog'
+import {
+  RightOutlined,
+  UpOutlined,
+  UploadOutlined,
+  FolderAddOutlined,
+  DownloadOutlined
+} from '@ant-design/icons-vue';
+import ProjectManager from "@/components/project/ProjectManagerNew";
+import { expenseBillList, queryById, queryExpnseByBillId, updateTeacherFee, updateStatusSubmit, approveTeacherFee, getTrainOrg, isConfirm , expenseBillDelById} from "../../api/lecturerFeeManagement";
+import { getTeacherSystemList, getApprovalResultByBusinessIdList } from "../../api/Lecturer";
+import { queryTrainOrgPor, } from "../../api/organization";
+// lecturerFeeManagement
+// import {getProjSt} from "../../api/indexProjStu";
+// import AddTeacher from "../../components/drawers/project/AddTeacher"
+import LecturerAppEdit from "./LecturerAPPEdit"
+export default {
+  name: "LecturerApproval",
+  components: {
+    RightOutlined, //图标--展开
+    UpOutlined,//图标--收起
+    UploadOutlined,//图标--导出
+    DownloadOutlined,//图标-导入
+    FolderAddOutlined,//图标--新增
+    ProjectManager,
+    LecturerAppEdit,
+  },
+  props: {
+    activeKeyProps: String,
+  },
+  setup(props) {
+    onMounted(() => {
+      console.log("props.activeKeyProps",props.activeKeyProps)
+      // const search = sessionStorage.getItem('searchApprlval')
+      // console.log(search,'search')
+      // if(search){
+      //   state.searchParam = JSON.parse(search)
+      //   state.searchdate = state.searchParam.searchdate
+      // }
+      getTableDate()
+    })
+    const router = useRouter()
+    const state = reactive({
+      example: false,
+      editId: null,
+      editTeacherDialog: false,
+      tableDataExamineLoading: false,
+      tableDataExamineTwo: [],
+      tableDataParams: {
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+      },
+      userNoOrName: null,
+      seeDateValue: [],
+      seeBegin: null,
+      seeEnd: null,
+      activeKey: '1',
+      moreid: 1,
+      byPid: null,
+      currentPage1: 1,
+      pageSize1: 10,
+      promotionrecordsLoading: false,  //晋级记录遮罩层
+      teacherrecordsLoading: false,// 授课记录遮罩层
+      tableLoading: false,
+      examinetableLoading: false,
+      tagsshow: "1",
+      delTeacherId: null, //删除id确认
+      newStatus: null, //修改状态码确认
+      id: null,    //内部讲师工号确认 
+      lookTeacherId: null, //内部讲师详情id确认
+      // deleteInTeacherdialog: false, //删除弹窗
+      editTeacher: false,   //修改状态弹窗
+      handleOperate1: null, //修改状态弹窗内容
+      teacherdialog1: null,
+      teachingdialog: false,  //控制讲师弹窗
+      teacherdialogtitle: '',//讲师弹框title内容
+      pageSizeOptions: ['10', '20', '30', '50'], //下拉选择每页显示多少条
+      pageSize: 10,
+      tableDataTotal: -1,//table列表总条数
+      formParam: {
+        beginTime: null,
+        defaultTeachingTime: "0",
+      },
+      formParamstatues: {
+        status: 'S20',
+        remark: null,
+        id: null,
+      },
+      searchdate: null, //选择时间
+      searchParam: {
+        teacherNo: null,
+        teacherName: null,
+        trainOrgId: null,
+        id: null,
+        levelId: null,
+        courseType: null,
+        certStatus: null,
+        salaryName: null,
+        payrollPlaceId: null,
+        status: null,
+        pageNo: "1",
+        pageSize: "10",
+        beginTime: null,
+        endTime: null,
+      },
+    })
+    //费用类型
+    const courseTypeList = ref([
+      { value: 1, label: "课程开发" },
+      { value: 2, label: "作业人员入模培训" },
+      { value: 3, label: "其他" },
+    ])
+
+    const lecturerSystemList = ref([
+    ]);
+    ///获取讲师体系列表
+    const LecturerSystemLista = () => {
+      // console.log('点击了LecturerSystemLista')
+      getTeacherSystemList().then((res) => {
+        if (res.data.code === 200) {
+          let arr = res.data.data;
+          let array = [];
+          arr?.map((value) => {
+            let obj = {
+              value: value.kid,
+              label: value.systemName,
+            };
+            array.push(obj);
+          });
+          lecturerSystemList.value = array;
+        }
+      })
+    }
+    // LecturerSystemLista()
+    const trainOrglist = ref([])
+    //获取培训发生组织
+    const trainOrglista = () => {
+      let obj = {
+        pageNo: "1",
+        pageSize: "10000"
+      }
+      queryTrainOrgPor(obj).then((res) => {
+        if (res.data.code === 200) {
+          let arr = res.data.data;
+          let array = [];
+          arr.map((value) => {
+            let obj = {
+              value: value.id,
+              label: value.affiliationName,
+            };
+            array.push(obj);
+          });
+          trainOrglist.value = array;
+          trainOrglist.value.unshift({
+            value: '',
+            label: "全部"
+          })
+        }
+      })
+    }
+    trainOrglista()
+
+    //课程类型
+    const OnTheJobStatusList = ref([
+      { value: 1, label: "项目开课" },
+      { value: 2, label: "路径开课" },
+      { value: 3, label: "面授开课" },
+    ])
+    //认证状态0待确认 1待提交 2审核中 3审核通过 4.审核拒绝
+    const AuthenticationStatusList = ref([
+      { value: '', label: "全部" },
+      { value: 1, label: "待提交" },
+      { value: 2, label: "审核中" },
+      { value: 4, label: "审核拒绝" },
+      { value: 3, label: "已审核" },
+    ])
+
+    //状态
+    const AccountStatusList = ref([
+      { value: "A10", label: "待审核", },
+      { value: "A20", label: "已提交", },
+      { value: "A30", label: "审核中", },
+      { value: "E10", label: "审核打回", },
+      { value: "S20", label: "审核通过", },
+    ])
+  
+    //切换筛选
+    const handlemoreid = () => {
+      if (state.moreid == 1) {
+        state.moreid = 2
+      }
+      else if (state.moreid == 2) {
+        state.moreid = 1
+        state.searchParam.certStatus = null
+        state.searchParam.salaryName = null
+        state.searchParam.payrollPlaceId = null
+        state.searchParam.status = null
+      }
+    }
+    //新增页面内部姓名
+    const infoteacherList = ref([
+      //   { value: 0, systemName: "讲师体系" },
+    ]);
+    const getinfoteacher = () => {
+      // state.tableLoading=true 
+      // ()
+      //   .then((res) => {
+      //     infoteacherList.value = res.data.data.records
+      // }) 
+    };
+    const columns = ref([
+
+      {
+        title: '培训发生组织 ',
+        dataIndex: 'trainOrgName',
+        key: 'trainOrgName',
+        ellipsis: true, align: "center",
+        width: 200,
+        customCell: () => { return { style: { userSelect: 'text' } } }
+      },
+      {
+        title: '汇总时间 ',
+        dataIndex: 'summaryTime',
+        key: 'summaryTime',
+        ellipsis: true,
+        align: "center",
+        width: 200
+      },
+      {
+        title: '汇总金额 ',
+        dataIndex: 'summaryTotal',
+        key: 'summaryTotal',
+        ellipsis: true,
+        align: "center",
+        width: 200,
+        customRender: ({ text }) => {
+          return text ? text + '元' : '-'
+        }
+      },
+      {
+        title: '提交时间',
+        dataIndex: 'approvalSubmitTime',
+        key: 'approvalSubmitTime',
+        ellipsis: true, align: "center",
+        width: 200,
+        customRender: ({ text, record }) => {
+          return text ? text : '-'
+        }
+      },
+      {
+        title: '状态 ',
+        dataIndex: 'status',
+        key: 'status',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        // customCell: (record) => {return{style:{color:['#67C23A','#F56C6C'][record.status]}}},
+        customRender: (value) => {
+          switch (value.record.status) {
+            case 0:
+              return "待确认 "
+            case 1:
+              return "待提交"
+            case 2:
+              return "审核中"
+            case 3:
+              return "审核通过"
+            case 4:
+              return "审核拒绝"
+            case 5:
+              return "待提交"
+            default:
+              return "-"
+          }
+        }
+      },
+      {
+        title: '操作 ',
+        dataIndex: 'operation',
+        key: 'operation',
+        ellipsis: true, align: "center",
+        fixed: "right",
+        width: 120,
+        scopedSlots: { customRender: "action" },
+      },
+
+    ])
+    //列表数据
+    const tableData = ref([
+    ])
+    // 搜索
+    const searchSubmit = () => {
+      state.searchParam.pageNo = 1;
+      getTableDate();
+      // sessionStorage.removeItem('searchApprlval')
+    };
+    //重置
+    const searchReset = () => {
+      state.searchdate = null,
+        state.searchParam = {
+          endTime: null,
+          beginTime: null,
+          teacherNo: null,
+          id: null,
+          levelId: null,
+          courseType: null,
+          certStatus: null,
+          salaryName: null,
+          payrollPlaceId: null,
+          status: null,
+          pageNo: 1,
+          pageSize: 10,
+        };
+      getTableDate();
+      // sessionStorage.removeItem('searchApprlval')
+    };
+    //              //修改时间
+    //              function searchTimeChange(time, timeStr) {
+    //       let startTime = timeStr[0]
+    //       let endTime = timeStr[1] ;
+    //       state.startTime = new Date(startTime).getTime();
+    //       state.endTime = new Date(endTime).getTime();
+    //       // state.searchParam.beginTime = new Date(beginTime).getTime() ;
+    //       // state.searchParam.endTime = new Date(endTime).getTime() ;
+    //       state.searchParam.beginTime = state.startTime ? state.startTime : null,
+    //         state.searchParam.endTime = state.endTime ? state.endTime : null
+    // }
+    //  List接口数据
+    const getTableDate = (obj) => {
+      console.log("执行 getTableDate")
+      state.tableLoading = true
+      let objA = { ...state.searchParam };
+      objA.beginTime = state.searchdate ? dayjs(state.searchdate[0]).format("YYYY-MM-DD") : "",
+        objA.endTime = state.searchdate ? dayjs(state.searchdate[1]).format("YYYY-MM-DD") : "",
+        delete objA.searchdate
+      expenseBillList(objA)
+        .then((res) => {
+          tableData.value = res.data.data.records
+          state.tableDataTotal = Number(res.data.data.total);
+          state.tableLoading = false
+        }).catch(err => {
+          state.tableLoading = false
+          message.destroy()
+          message.error(err.data.msg)
+        })
+    };
+    // getTableDate()
+    //   // 翻页
+    const changePagination = (page, pageSize) => {
+      state.searchParam.pageNo = page;
+      // state.pageNo = page;
+      state.searchParam.pageSize = pageSize;
+      getTableDate();
+    };
+    // 新增讲师
+    const addTeacher = () => {
+      state.teachingdialog = true;
+      state.teacherdialogtitle = '添加讲师费'
+
+    }
+    //修改状态窗口
+    const handleOperate = (record) => {
+      state.editTeacher = true
+      state.formParamstatues.id = record.id
+    };
+    //提交
+    const closehandleOperate = () => {
+      approveTeacherFee(state.formParamstatues).then((res) => {
+        message.success("审批成功");
+        state.editTeacher = false
+        getTableDate();
+      })
+    }
+    //取消按钮 清空输入的数据
+    const cancelTeachingDialog = (val) => {
+      if (state.teachingdialog = true) {
+        if (val == 1) {
+          submit(state.formParam)
+          return
+        }
+        state.teachingdialog = false
+        cancel()
+      }
+      state.deleteInTeacherdialog = false
+      state.editTeacher = false
+    };
+    //清空数据
+    const cancel = () => {
+      state.formParam = {
+        teacher: null,
+        teacherNo: null,
+        departId: null,
+        id: null,
+        courseName: 0,
+        levelId: null,
+        payrollPlaceId: null,
+        // 费用类型 : null
+        teacherpayrollPlace: null,
+        teachingDate: null,
+        defaultTeachingTime: 0,
+        courseType: null,
+        studys: null,
+        teacherlevelPay: null,
+        score: null,
+        trainOrg: null,
+        payableExpense: null,
+        expense: null,
+        remark: null,
+      }
+    }
+    const goDdit = (record) => {
+      state.editTeacherDialog = true
+      state.editId = record.id
+      // state.searchParam.searchdate = state.searchdate
+      // sessionStorage.setItem('searchApprlval', JSON.stringify(state.searchParam))
+      // router.push({
+      //   path:'/LecturerAppEdit',
+      //   query:{
+      //     id: record.id
+      //   }
+      // })
+    }
+    //表格内查看数据操作
+    const handleLook = (record) => {
+      state.activeKey = '1'
+      state.teachingdialog = true;
+      state.id = record.id
+      TeacherSystem()
+      gettableDataExamine()
+    }
+    const params = reactive({
+      pageNo: 1,
+      pageSize: 10,
+      total: 0,
+      businessType: 1,
+      businessId: '366'
+    })
+    const paginations = computed(() => ({
+      total: params.total,
+      showSizeChanger: true,
+      showQuickJumper: true,
+      current: params.pageNo,
+      pageSize: params.pageSize,
+      onChange: paginationChanges,
+    }));
+    const paginationChanges = (e, pageSize) => {
+      params.pageNo = e;
+      params.pageSize = pageSize
+      // getListData()
+    };
+    const tabsChange = (val) => {
+      if (val == 2) {
+        getListData()
+      }
+    }
+    const getListData = () => {
+      state.tableDataExamineLoading = true
+      getApprovalResultByBusinessIdList({
+        businessType: 1,
+        businessId: state.id
+      }).then(res => {
+        if (res.data.code == 200) {
+          state.tableDataExamineTwo = res.data.data
+          // params.total = res.data.data.total
+        }
+        state.tableDataExamineLoading = false
+      }).catch(err => {
+        message.destroy()
+        state.tableDataExamineLoading = false
+        message.error(err.data.msg)
+      })
+    }
+    const submit = (record) => {
+      dialog({
+        content: '请仔细核对讲师费信息，确认无误后，将自动进入(BPM系统)审批流程',
+        ok: () => {
+          isConfirm({
+            id: record.id,
+            status: 2
+          }).then(res => {
+            if (res.data.code == 200) {
+              message.success('提交成功')
+              getTableDate();
+              cancel()
+              state.teachingdialog = false
+            }
+          }).catch(err => {
+            message.destroy()
+            cancel()
+            state.teachingdialog = false
+            message.error(err.data.msg)
+          })
+        }
+      })
+    }
+    const successParams = () => {
+      getTableDate();
+    }
+    const getExample = (val) => {
+      state.example = val
+    }
+    const withdraw = (record) => {
+      dialog({
+        content: '确定要撤回此条数据吗？',
+        ok: () => {
+          isConfirm({
+            id: record.id,
+            status: 1
+          }).then(res => {
+            if (res.data.code == 200) {
+              message.success('撤回成功')
+              getTableDate();
+
+            }
+          }).catch(err => {
+            message.destroy()
+            message.error(err.data.msg)
+          })
+        }
+      })
+    }
+
+    //详情
+    const TeacherSystem = () => {
+      queryById({ id: state.id }).then((res) => {
+        // state.formParam=Object.assign({} ,res.data.data)
+        state.formParam = res.data.data
+      })
+        .catch((err) => {
+          console.log("详情", err);
+        });
+    }
+    const searchTeacherFeeApprovalList = () => {
+      state.tableDataParams.pageNo = 1
+      gettableDataExamine()
+    }
+    const resetSearch = () => {
+      state.userNoOrName = null
+      state.seeDateValue = []
+      state.seeBegin = null
+      state.seeEnd = null
+      searchTeacherFeeApprovalList()
+    }
+    const seeDateChange = (e) => {
+      if (e) {
+        state.seeBegin = e[0]
+        state.seeEnd = e[1]
+      } else {
+        state.seeBegin = null
+        state.seeEnd = null
+      }
+    }
+    const tableDataExamine = ref([])
+    const gettableDataExamine = () => {
+      state.examinetableLoading = true
+      queryExpnseByBillId({
+        billId: state.id,
+        pageNo: state.tableDataParams.pageNo,
+        pageSize: state.tableDataParams.pageSize,
+        name: state.userNoOrName,
+        startTime: state.seeBegin,
+        endTime: state.seeEnd
+      }).then((res) => {
+        tableDataExamine.value = res.data.data.records
+        state.tableDataParams.total = Number(res.data.data.total);
+        state.examinetableLoading = false
+      }).catch(err => {
+        state.examinetableLoading = false
+        message.error(err.data.msg)
+      })
+    };
+    const pagination = computed(() => ({
+      total: state.tableDataParams.total,
+      showSizeChanger: true,
+      showQuickJumper: true,
+      current: state.tableDataParams.pageNo,
+      pageSize: state.tableDataParams.pageSize,
+      onChange: paginationChange,
+    }));
+    const paginationChange = (e, pageSize) => {
+      state.tableDataParams.pageNo = e;
+      state.tableDataParams.pageSize = pageSize
+      gettableDataExamine();
+    };
+
+    //TODO1
+    const deleteModal = (record) => {
+      dialog({
+        content: '是否确认进行删除?',
+        ok: () => {
+          expenseBillDelById(record.id).then(res => {
+            if (typeof (res.data.data) != 'object') {
+              message.success('删除成功')
+              message.error(res.data.data)
+              return
+            }
+            message.success("删除成功");
+            searchSubmit()
+          }).catch(err => {
+            message.destroy()
+            message.error(err.data.msg)
+          })
+        }
+      })
+
+    }
+
+
+
+    const columnsExamineTwo = ref([
+      {
+        title: '审批层级 ',
+        dataIndex: 'levelName',
+        key: 'levelName',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+      },
+      {
+        title: '层级审批人 ',
+        dataIndex: 'employeeNames',
+        key: 'employeeNames',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+      },
+      {
+        title: '操作 ',
+        dataIndex: 'approvalStatus',
+        key: 'approvalStatus',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          switch (text) {
+            case -1:
+              return <span>未处理</span>;
+            case 3:
+              return <span>通过</span>;
+            case 4:
+              return <span>拒绝</span>;
+            default:
+              return <span>-</span>;
+          }
+        }
+      },
+      {
+        title: '审批人 ',
+        dataIndex: 'employeeName',
+        key: 'employeeName',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+      },
+      {
+        title: '审批时间 ',
+        dataIndex: 'approvalTime',
+        key: 'approvalTime',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+      },
+      {
+        title: '审批建议 ',
+        dataIndex: 'approvalMsg',
+        key: 'approvalMsg',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text || '-'
+        }
+      },
+    ])
+    //二级页面
+    const columnsExamine = ref([
+      {
+        title: '讲师姓名 ',
+        dataIndex: 'name',
+        key: 'name',
+        ellipsis: true,
+        align: "center",
+        width: 180,
+        customRender: (value) => {
+          return (
+            <div style="user-select:text">
+              { value.record?.name }  /  { value.record?.userNo }
+            </div>
+          );
+        },
+      },
+      // {
+      //   title: '讲师工号 ',
+      //   dataIndex: 'userNo',
+      //   key: 'userNo',
+      //   ellipsis: true,
+      //   align: "center",
+      //   width: 120,
+      // },
+      {
+        title: '课程名称 ',
+        dataIndex: 'courseName',
+        key: 'courseName',
+        ellipsis: true,
+        align: "center",
+        width: 200,
+        customCell: () => { return { style: { userSelect: 'text' } } }
+      },
+      {
+        title: '培训发生组织',
+        dataIndex: 'trainOrgName',
+        key: 'trainOrgName',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customCell: () => { return { style: { userSelect: 'text' } } }
+      },
+
+      {
+        title: '授课时长 ',
+        dataIndex: 'teachingTime',
+        key: 'teachingTime',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              { (value.record?.teachingTime / 60).toFixed(2) }小时
+            </div>
+          )
+        }
+      },
+      {
+        title: '授课时间 ',
+        dataIndex: 'teachingDate',
+        key: 'teachingDate',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+
+      },
+      {
+        title: '讲师体系',
+        dataIndex: 'tsystemName',
+        key: 'tsystemName',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+      },
+      {
+        title: '讲师级别 ',
+        dataIndex: 'tlevelName',
+        key: 'tlevelName',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+      },
+      {
+        title: '发薪地 ',
+        dataIndex: 'payrollPlace',
+        key: 'payrollPlace',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text || '-'
+        }
+      },
+      {
+        title: '基准课酬 ',
+        dataIndex: 'levelPay',
+        key: 'levelPay',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text || text == 0 ? text + '元' : '-';
+        }
+      },
+      {
+        title: '计划费用 ',
+        dataIndex: 'expense',
+        key: 'expense',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text ? text + '元' : '-';
+        }
+      },
+      {
+        title: '参训人数 ',
+        dataIndex: 'studys',
+        key: 'studys',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: ({ text }) => {
+          return text ? text + '人' : '-';
+        }
+      },
+      {
+        title: '评分 ',
+        dataIndex: 'score',
+        key: 'score',
+        ellipsis: true,
+        align: "center",
+        width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              { value.record.score ? Number(value.record.score).toFixed(0) == 0 ? '-' : Number(value.record.score).toFixed(2) + '分' : '-' }
+            </div>
+          )
+        }
+      },
+      {
+        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>
+          )
+        }
+      },
+    ])
+    function managerChange(e, l, d, t, orgName) {
+      state.searchParam.teacherNo = d;
+      state.searchParam.teacherName = t;
+      // state.searchParam.trainorgName=orgName
+    }
+    //导出功能
+    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 : ""}`
+      );
+      // this.download('lesson_records/export', {
+      //           ...state.searchParam
+      //       }, `project_${new Date().getTime()}.xlsx` )
+    }
+    //回车
+    const enterPressHadlerSearch = e => {
+      if (e.keyCode === 13) {
+        searchSubmit()
+
+      }
+    }
+
+    //TODO1
+    watchEffect(() => {
+      console.log('Item changed:', props.activeKeyProps);
+      if(props.activeKeyProps == 2){
+        state.searchParam.pageNo = 1;
+        getTableDate()
+      }
+      // 在这里你可以根据 props.item 进行一些操作
+    });
+
+
+    return {
+      ...toRefs(state),
+      enterPressHadlerSearch,
+      // searchTimeChange,
+      gettableDataExamine,
+      courseTypeList,
+      managerChange,
+      trainOrglist,
+      trainOrglista,
+      handlemoreid,
+      handleExport,
+      lecturerSystemList,
+      OnTheJobStatusList,
+      AuthenticationStatusList,
+      AccountStatusList,
+      searchSubmit,
+      searchReset,
+      columns,
+      columnsExamine,
+      columnsExamineTwo,
+      tableData,
+      tableDataExamine,
+      seeDateChange,
+      changePagination,
+      addTeacher,
+      cancelTeachingDialog,
+      handleLook,
+      submit,
+      getListData,
+      tabsChange,
+      withdraw,
+      successParams,
+      getExample,
+      goDdit,
+      cancel,
+      handleOperate,
+      closehandleOperate,
+      getTableDate, //list接口数据调用
+      // getStu
+      LecturerSystemLista,
+      TeacherSystem,
+      infoteacherList,
+      getinfoteacher,
+      pagination,
+      paginationChange,
+      searchTeacherFeeApprovalList,
+      resetSearch,
+      paginations,
+      paginationChanges,
+      deleteModal
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.example {
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.45);
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 999999;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.select .ant-picker {
+  width: 410px !important;
+}
+
+.headers {
+  height: 73px;
+  border-bottom: 1px solid #e8e8e8;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  // background-color: red;
+  margin-bottom: 20px;
+  flex-shrink: 0;
+
+  .headerTitle {
+    font-size: 18px;
+    font-weight: 600;
+    color: #333333;
+    line-height: 25px;
+    // margin-left: 24px;
+  }
+}
+
+.addTimeBox {
+  position: relative;
+  display: flex;
+  align-items: center;
+
+  .addTime {
+    position: absolute;
+    z-index: 1;
+    margin-left: 10px;
+    color: rgba(0, 0, 0, 0.4);
+  }
+
+  .ant-picker {
+    padding-left: 85px;
+  }
+
+  ::v-deep .ant-picker-range .ant-picker-active-bar {
+    margin-left: 85px !important;
+  }
+}
+
+//导出按钮icon
+.daochu {
+  width: 16px;
+  height: 18px;
+  background-image: url("../../assets/images/coursewareManage/export1.png");
+}
+
+//弹窗内详情样式
+.display1 {
+  display: inline-block;
+  width: 200px;
+}
+
+// .display0{
+// display:inline-block ;
+// width:200px ;
+// text-align:center }
+//弹窗内确认取消按钮布局
+.del_btnbox {
+  display: flex;
+  margin: 30px auto;
+  justify-content: center;
+
+  .del_btn {
+    width: 100px;
+    height: 40px;
+    background: rgba(64, 158, 255, 0);
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+    cursor: pointer;
+
+    .btnText {
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 40px;
+    }
+  }
+
+  .btn1 {
+    border: 1px solid rgba(64, 158, 255, 1);
+    color: #4ea6ff;
+    margin-right: 14px;
+  }
+
+  .btn2 {
+    background-color: #4ea6ff;
+    color: #ffffff;
+  }
+}
+
+.ant-table-cell-fix-right {
+  width: 300px !important;
+}
+
+.ant-table-tbody>tr>td {
+  text-align: center;
+}
+
+.InsideTeaching {
+  width: 100%;
+  height: 100%;
+
+
+  .filter {
+    margin-left: 38px;
+    margin-right: 38px;
+    margin-top: 30px;
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+
+    .select {
+      margin-right: 20px;
+      margin-bottom: 10px;
+    }
+  }
+}
+
+.delete {
+  z-index: 9999;
+  width: 424px;
+  background: #ffffff;
+  box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+  border-radius: 4px;
+  position: absolute;
+  left: 30%;
+  top: 10%;
+  // transform: translate(-50%, -50%);
+
+  .del_header {
+    position: absolute;
+    width: calc(100%);
+    height: 40px;
+    background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
+        rgba(78, 166, 255, 0) 100%);
+  }
+
+  .del_main {
+    width: 100%;
+    position: relative;
+
+    .header {
+      display: flex;
+      align-items: center;
+      padding-top: 20px;
+      padding-left: 26px;
+      font-size: 16px;
+
+      .del-icon {
+        width: 16px;
+        height: 16px;
+        margin-right: 10px;
+        background-image: url(@/assets/images/coursewareManage/notice.png);
+        background-size: 100% 100%;
+      }
+
+      .icon {
+        width: 16px;
+        height: 16px;
+        margin-right: 10px;
+        background-image: url(@/assets/images/coursewareManage/QR.png);
+        background-size: 100% 100%;
+      }
+
+      .close_exit {
+        position: absolute;
+        right: 42px;
+        cursor: pointer;
+        width: 20px;
+        height: 20px;
+        background-image: url(@/assets/images/coursewareManage/close.png);
+        background-size: 100% 100%;
+      }
+    }
+
+    .body {
+      width: 100%;
+      margin: 34px auto 56px auto;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
+    .del_btnbox {
+      display: flex;
+      margin: 30px auto;
+      justify-content: center;
+
+      .del_btn {
+        width: 100px;
+        height: 40px;
+        background: rgba(64, 158, 255, 0);
+        border-radius: 8px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 14px;
+        flex-shrink: 0;
+        cursor: pointer;
+
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          line-height: 40px;
+        }
+      }
+
+      .btn1 {
+        border: 1px solid rgba(64, 158, 255, 1);
+        color: #4ea6ff;
+      }
+
+      .btn2 {
+        background-color: #4ea6ff;
+        color: #ffffff;
+      }
+    }
+  }
+}
+
+.CreatePath {
+  .out {
+    z-index: 9999;
+    display: block;
+    position: absolute;
+    top: 90px;
+    width: 1080px !important;
+    height: 650px;
+    overflow: auto;
+    background-color: #fff;
+
+    box-shadow: 0 0 10px rgba(118, 136, 166, 0.21);
+    left: 50%;
+    top: 300px;
+    transform: translate(-50%, -50%);
+
+    .top {
+      width: 100%;
+      height: 68px;
+
+      background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
+          rgba(78, 166, 255, 0) 100%);
+      display: flex;
+      align-items: center;
+
+      .topimg {
+        width: 18px;
+        height: 18px;
+        margin-left: 27px;
+        margin-top: -2px;
+      }
+
+      .topc {
+        color: #000000;
+        font-size: 16px;
+        margin-left: 8px;
+      }
+    }
+
+    .mid {
+      width: 100%;
+      height: 100%;
+      background-color: #fff;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
+      .d {
+        // margin-top: 8px;
+        // color: #ff4e4e;
+        margin-left: -5px;
+      }
+    }
+  }
+}
+
+//添加样式
+.langbtn {
+  height: 40px;
+  border-radius: 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 14px;
+  flex-shrink: 0;
+  cursor: pointer;
+}
+
+// 重置样式
+.resetbtn {
+  width: 100px;
+  height: 40px;
+  border-radius: 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 14px;
+  flex-shrink: 0;
+  cursor: pointer;
+}
+
+//展开收起样式
+.moreidbtn {
+  border: none;
+  color: #4ea6ff;
+  width: 80px
+}
+
+//小竖线
+.line {
+  float: left;
+  width: 3px;
+  height: 17px;
+  background: #4ea6ff;
+  border-radius: 30%;
+  margin-right: 5px;
+  margin-top: 3px;
+}
+
+//抽屉功能
+.drawaer // /* 改变所有 a-tree-select 输入框的高度 */
+//   ::v-deep  .ant-select:not(.ant-select-customize-input) .ant-select-selector{
+//   height: 40px;
+//   line-height: 40px;
+//   border-radius: 8px
+
+//   /* 确保文字垂直居中 */
+// }
+::v-deep .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
+  height: 40px !important;
+  line-height: 40px;
+  border-radius: 8px
+}
+
+// 抽屉内样式
+.draitem {
+  width: 100%;
+  height: 40px !important;
+  border-radius: 8px;
+  line-height: 40px;
+}
+
+.drabtn {
+  height: 40px;
+  width: 80px;
+  border-radius: 8px;
+  margin-right: 20px
+}
+
+::v-deep .ant-select:not(.ant-select-customize-input) .ant-select-selector {
+  border-radius: 8px;
+  height: 40px;
+}
+
+.ant-col-12 {
+  height: 90px;
+}
+
+::v-deep .ant-select-selection-overflow-item {
+  margin-top: -2px;
+}
+
+::v-deep .ant-select-multiple .ant-select-selection-item {
+  height: 34px
+}
+
+.tableBox {
+  padding-bottom: 20px;
+  margin: 20px 38px 30px;
+
+  ::v-deep .ant-select-dropdown {
+    display: inline-block;
+  }
+
+  ::v-deep .ant-select-selection-item {
+    margin-left: 3px;
+  }
+
+  ::v-deep .ant-pagination-options-size-changer.ant-select {
+    width: 84px;
+  }
+
+  .pa {
+    width: 100%;
+    display: flex;
+    justify-content: right;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/lecturer/OrganizationList.vue b/src/views/lecturer/OrganizationList.vue
new file mode 100644
index 00000000..5bb3ec10
--- /dev/null
+++ b/src/views/lecturer/OrganizationList.vue
@@ -0,0 +1,1646 @@
+<!-- 归属组织 -->
+<template>
+  <!-- 搜索框及按钮 -->
+  <div class="filter" style="min-width: 1380px; margin: 20px">
+    <a-form layout="inline">
+      <a-form-item class="select">
+        <div>
+          <a-input
+            style="width: 235px; height: 40px; border-radius: 8px"
+            v-model:value="searchParam.name"
+            placeholder="请输入编号/名称进行搜索"
+            v-on:keydown.enter="enterPressHadlerSearch"
+          />
+        </div>
+      </a-form-item>
+      <a-form-item class="select">
+        <div>
+          <a-select
+            style="width: 235px"
+            v-model:value="searchParam.isParent"
+            placeholder="请选择节点类型"
+            allowClear
+            :options="TrainOrglist"
+            v-on:keydown.enter="enterPressHadlerSearch"
+          />
+        </div>
+      </a-form-item>
+      <a-form-item class="select">
+        <div>
+          <a-input
+            style="width: 235px; height: 40px; border-radius: 8px"
+            v-model:value="searchParam.leaderName"
+            placeholder="请输入担当姓名/工号"
+            v-on:keydown.enter="enterPressHadlerSearch"
+          />
+        </div>
+      </a-form-item>
+      <div style="display: flex; margin-bottom: 20px">
+        <a-button @click="searchSubmit()" type="primary" class="resetbtn"
+          >查询
+        </a-button>
+        <!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
+        <!-- <div class="search"></div> -->
+        <a-button class="resetbtn" @click="searchReset">重置</a-button>
+      </div>
+    </a-form>
+    <div style="width: 100%"></div>
+    <div style="display: flex; margin-bottom: 20px">
+      <a-button
+        v-if="checkMenu('lecturerTrainOrgAdd')"
+        @click="addTeacher()"
+        type="primary"
+        class="resetbtn"
+        style="width: 164px"
+      >
+        <div class="search"></div>
+        新增培训发生组织
+      </a-button>
+      <div
+        class="btnn btn2"
+        @click="downOpen"
+        style="margin-right: 14px"
+        v-if="checkMenu('lecturerTrainOrgExport')"
+      >
+        <div class="daochu"></div>
+        <div class="btnText">导出</div>
+      </div>
+    </div>
+    <a-table
+      style="border: 1px solid #f2f6fe"
+      :columns="columns"
+      :data-source="tableData"
+      :loading="tableLoading"
+      @expand="expandTable"
+      :pagination="false"
+    >
+      <template #bodyCell="{ record, column }">
+        <template v-if="column.key === 'operation'">
+          <a-space>
+            <lockLecturer
+              :parentName="record.parentName"
+              :id="record.id"
+              :title="'培训发生组织详情'"
+              @searchList="searchList"
+            >
+              <div style="color: #1890ff; cursor: pointer">查看</div>
+            </lockLecturer>
+            <a-button
+              v-if="record.status != 2 && checkMenu('lecturerTrainOrgEdit')"
+              type="link"
+              @click="() => handleModify(record, String(record.courseform))"
+              >编辑</a-button
+            >
+            <a-button
+              v-if="record.status == 2 && false"
+              type="link"
+              @click="() => updateModal(record)"
+              >撤回</a-button
+            >
+            <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
+            <a-button
+              @click="isEnablePost(record, 0)"
+              v-if="record.enable && checkMenu('lecturerTrainOrgStop')"
+              type="link"
+              >启用</a-button
+            >
+            <a-button
+              @click="isEnablePost(record, 1)"
+              v-if="!record.enable && checkMenu('lecturerTrainOrgStop')"
+              type="link"
+              >停用</a-button
+            >
+          </a-space>
+        </template>
+      </template>
+    </a-table>
+    <div class="tableBox">
+      <div class="pa">
+        <a-pagination
+          v-if="tableDataTotal > 10"
+          :showSizeChanger="true"
+          :showQuickJumper="true"
+          :hideOnSinglePage="false"
+          :pageSize="searchParam.pageSize"
+          :current="searchParam.pageNo"
+          :total="tableDataTotal"
+          class="pagination"
+          @change="changePagination"
+        />
+      </div>
+    </div>
+    <!-- 删除功能弹窗 -->
+    <div>
+      <a-modal
+        v-model:visible="deleteInTeacherdialog"
+        :footer="null"
+        :closable="close"
+        centered="true"
+      >
+        <div class="delete">
+          <div class="del_header"></div>
+          <div class="del_main">
+            <div class="header">
+              <div class="icon1"></div>
+              <span>提示</span>
+            </div>
+            <div class="body">
+              <span>您确定要删除当前组织吗</span>
+            </div>
+            <div class="del_btnbox">
+              <div
+                class="del_btn btn2"
+                @click="cancelTeacherDialog"
+                style="margin-right: 32px"
+              >
+                <div class="btnText">取消</div>
+              </div>
+              <div class="del_btn btn2" @click="closeDeleteTeacher">
+                <div class="btnText">确定</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+    </div>
+    <!-- 抽屉 -->
+    <div class="example" v-if="example">
+      <a-spin />
+    </div>
+    <a-drawer
+      class="largeDrawerInside"
+      v-model:visible="teacherdialog"
+      :closable="false"
+      :title="false"
+      placement="right"
+      width="60%"
+      :maskClosable="false"
+    >
+      <div style="padding: 24px">
+        <div class="headers" style="margin-top: -24px">
+          <div class="headerTitle">{{ teacherdialogtitle }}</div>
+          <img
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="@/assets/images/basicinfo/close.png"
+            @click="cancelTeacherDialog"
+          />
+        </div>
+        <a-form :model="formParam" layout="vertical" ref="formRef">
+          <a-row :gutter="16">
+            <a-col :span="24">
+              <!-- <span class="line"></span><span>讲师体系基本信息</span> -->
+            </a-col>
+          </a-row>
+          <a-row :gutter="16">
+            <a-col :span="12">
+              <a-form-item name="affiliationCode">
+                <template v-slot:label>
+                  <img
+                    style="margin-right: 4px; width: 7px; height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
+                  培训发生组织编号：
+                </template>
+                <a-input
+                  disabled
+                  v-model:value="formParam.affiliationCode"
+                  class="draitem"
+                  placeholder="请输入讲师体系编号"
+                  allowClear
+                  showSearch
+                >
+                </a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item name="affiliationName">
+                <template v-slot:label>
+                  <img
+                    style="margin-right: 4px; width: 7px; height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
+                  培训发生组织名称：
+                </template>
+                <a-input
+                  :maxlength="30"
+                  show-count
+                  v-model:value="formParam.affiliationName"
+                  class="draitem"
+                  placeholder="请输入培训发生组织名称"
+                  allowClear
+                  showSearch
+                >
+                </a-input>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="16">
+            <a-col :span="12">
+              <a-form-item name="code">
+                <template v-slot:label>
+                  <img
+                    style="margin-right: 4px; width: 7px; height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
+                  是否为根节点：
+                </template>
+                <div style="display: flex; align-items: center">
+                  <a-radio-group
+                    :disabled="formParam.locking"
+                    style="min-width: 126px"
+                    @change="selectRadio"
+                    v-model:value="formParam.isParent"
+                    name="radioGroup"
+                  >
+                    <a-radio :value="1">否</a-radio>
+                    <a-radio :value="0">是</a-radio>
+                  </a-radio-group>
+                  <a-select
+                    :disabled="formParam.locking"
+                    v-model:value="formParam.code"
+                    :placeholder="
+                      !formParam.isParent ? '请选择审批层级' : '请选择根节点'
+                    "
+                    :options="
+                      !formParam.isParent ? PlaceOfPayList : PlaceOfPayListTwo
+                    "
+                    allowClear
+                    showSearch
+                  />
+                </div>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item name="actValue">
+                <template v-slot:label>
+                  <img
+                    style="margin-right: 4px; width: 7px; height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
+                  组织担当：
+                </template>
+                <!-- <a-select v-model:value="formParam.zzfzr" placeholder="请选择组织负责人"
+                    :options="PlaceOfPayList" allowClear showSearch/> -->
+                <!-- <ProjectManager :type="0" v-model:value="formParam.actValue" :placeholder="'请选择担当'" v-model:arrayList="formParam.actArray" ></ProjectManager> -->
+                <AddApprover
+                  :title="'组织担当'"
+                  v-model:arrayList="formParam.actArray"
+                  @valueChange="valueChange"
+                  :type="0"
+                >
+                  <a-select
+                    style="width: 100%"
+                    v-model:value="formParam.actValue"
+                    :open="false"
+                    :placeholder="'请选择担当'"
+                  ></a-select>
+                </AddApprover>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="16" v-if="formParam.isParent">
+            <a-col :span="12">
+              <a-form-item name="leveOneValue">
+                <template v-slot:label>
+                  <img
+                    style="margin-right: 4px; width: 7px; height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
+                  一级审批人
+                </template>
+                <!-- <a-select v-model:value="formParam.yjspr" placeholder="请选择一级审批人"
+                    :options="PlaceOfPayList" allowClear showSearch/> -->
+                <!-- <ProjectManager :type="1" v-model:value="formParam.leveOneValue" :placeholder="'请选择一级审批人'" v-model:arrayList="formParam.leveOneArray" ></ProjectManager> -->
+                <AddApprover
+                  :title="'一级审批人'"
+                  v-model:arrayList="formParam.leveOneArray"
+                  @valueChange="valueChange"
+                  :type="1"
+                >
+                  <a-select
+                    style="width: 100%"
+                    v-model:value="formParam.leveOneValue"
+                    :open="false"
+                    :placeholder="'请选择一级审批人'"
+                  ></a-select>
+                </AddApprover>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="二级审批人">
+                <!-- <a-select v-model:value="formParam.zzfzr" placeholder="请选择二级审批人"
+                    :options="PlaceOfPayList" allowClear showSearch/> -->
+                <!-- <ProjectManager :type="1" :placeholder="'请选择二级审批人'" v-model:arrayList="formParam.leveTwoArray" ></ProjectManager> -->
+                <AddApprover
+                  :title="'二级审批人'"
+                  v-model:arrayList="formParam.leveTwoArray"
+                  @valueChange="valueChange"
+                  :type="2"
+                >
+                  <a-select
+                    style="width: 100%"
+                    v-model:value="formParam.leveTwoValue"
+                    :open="false"
+                    :placeholder="'请选择二级审批人'"
+                  ></a-select>
+                </AddApprover>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="16">
+            <a-col :span="12" v-if="formParam.isParent">
+              <a-form-item label="三级审批人">
+                <!-- <a-select v-model:value="formParam.sjspr" placeholder="请选择三级审批人"
+                    :options="PlaceOfPayList" allowClear showSearch/> -->
+                <!-- <ProjectManager :type="1" :placeholder="'请选择三级审批人'" v-model:arrayList="formParam.leveThreeArray" ></ProjectManager> -->
+                <AddApprover
+                  :title="'三级审批人'"
+                  v-model:arrayList="formParam.leveThreeArray"
+                  @valueChange="valueChange"
+                  :type="3"
+                >
+                  <a-select
+                    style="width: 100%"
+                    v-model:value="formParam.leveThreeValue"
+                    :open="false"
+                    :placeholder="'请选择三级审批人'"
+                  ></a-select>
+                </AddApprover>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12" v-if="formParam.isParent == 0">
+              <a-form-item name="isContains">
+                <template v-slot:label>
+                  <img
+                    style="margin-right: 4px; width: 7px; height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
+                  审批流程是否加该担当
+                </template>
+                <a-select
+                  v-model:value="formParam.isContains"
+                  placeholder="请选择审批流程是否加担当"
+                  :options="isConSelect"
+                  allowClear
+                  showSearch
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="备注">
+                <a-input
+                  v-model:value="formParam.remark"
+                  showCount
+                  :maxlength="200"
+                  style="width: 100%; height: 40px; border-radius: 8px"
+                  placeholder="请输入"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-form-item name="orglistName">
+            <template v-slot:label>
+              <img
+                style="margin-right: 4px; width: 7px; height: 7px"
+                src="@/assets/images/coursewareManage/asterisk.png"
+                alt=""
+              />
+              选择管理组织
+            </template>
+            <a-row :gutter="50" style="margin-bottom: 10px">
+              <a-col :span="2">
+                <!-- <a-tag color="blue" style="line-height: 40px; ">管理业务</a-tag> -->
+                <a-button
+                  type="primary"
+                  @click="addContentData"
+                  style="width: 100px; height: 40px; border-radius: 8px"
+                  >添加组织</a-button
+                >
+              </a-col>
+              <!-- <a-col :span="20">
+        <div class="add_content" @click="addContentData" >+</div>
+        </a-col> -->
+            </a-row>
+          </a-form-item>
+          <!-- 备注 remark -->
+          <a-row :gutter="16" style="padding-bottom: 60px">
+            <a-col :span="24">
+              <a-form-item label="">
+                <!-- <a-textarea v-model:value="formParam.remark" showCount :maxlength="200"
+                  style="width: 100%; height: 100px; border-radius: 8px" placeholder="请输入" /> -->
+                <a-table
+                  :dataSource="formParam?.affiliationOrgList"
+                  :scroll="{ x: '600' }"
+                  :columns="orgColumns"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+        <!-- 交互按钮 -->
+        <div
+          :style="{
+            position: 'absolute',
+            right: 0,
+            bottom: 0,
+            width: '100%',
+            borderTop: '1px solid #e9e9e9',
+            padding: '10px 16px',
+            background: '#fff',
+            textAlign: 'right',
+            zIndex: 1,
+          }"
+        >
+          <a-button class="drabtn" @click="cancelTeacherDialog">取消</a-button>
+          <a-button
+            class="drabtn"
+            type="primary"
+            @click="createTeacherDialog(0)"
+            :loading="buttonLoading"
+            >保存</a-button
+          >
+          <a-button
+            v-if="editParams || editIndex > 1"
+            class="drabtn"
+            type="primary"
+            @click="createTeacherDialog(1)"
+            :loading="buttonLoading"
+            >提交</a-button
+          >
+        </div>
+      </div>
+    </a-drawer>
+    <AddOrgContent
+      :Addtitle="'选择组织'"
+      :isParent="formParam.isParent"
+      v-model:showContent="showContent"
+      :AddContentLists="formParam.affiliationOrgLists"
+      v-model:AddContentList="formParam.affiliationOrgList"
+    />
+  </div>
+</template>
+<script lang="jsx">
+import { reactive, toRefs, ref, watch } from "vue";
+import { FolderAddOutlined } from "@ant-design/icons-vue";
+import { message } from "ant-design-vue";
+import dialog from "@/utils/dialog";
+import ProjectManager from "@/components/project/ProjectManagerLecturer";
+import {
+  queryTrainOrg,
+  deleteTrainOrg,
+  addReviewer,
+  updateTrainOrg,
+} from "../../api/organization";
+import AddOrgContent from "../../components/project/AddOrgContent.vue";
+import * as lecturer from "../../api/Lecturer.js";
+import lockLecturer from "@/components/project/lockLecturer";
+import AddApprover from "@/components/project/AddApprover";
+import { checkMenu } from "@/utils/utils";
+export default {
+  name: "organizationList",
+  components: {
+    ProjectManager,
+    FolderAddOutlined, //图标--新增
+    AddOrgContent,
+    lockLecturer,
+    AddApprover,
+  },
+  setup() {
+    const formRef = ref();
+
+    const state = reactive({
+      example: false,
+      editParams: true,
+      editIndex: 0,
+      tableDataTotal: 0,
+      vf: true,
+      showContent: false,
+      tableLoading: false,
+      deleteInTeacherdialog: false,
+      teacherdialog: false,
+      teacherdialogtitle: null,
+      delId: null,
+      searchParam: {
+        name: null,
+        isParent: null,
+        leaderName: null,
+        pageNo: "1",
+        pageSize: "10",
+      },
+      formParam: {
+        orglistName: null,
+        affiliationCode: null,
+        affiliationName: null,
+        isParent: 1,
+        remark: null,
+        actValue: null,
+        actArray: [],
+        leveOneValue: null,
+        leveTwoValue: null,
+        leveThreeValue: null,
+        leveOneArray: [],
+        leveTwoArray: [],
+        leveThreeArray: [],
+        code: null,
+        isContains: "0",
+        affiliationOrgList: [],
+        affiliationOrgLists: [],
+        locking: 1,
+      },
+    });
+    const PlaceOfPayList = ref([
+      { value: "1", label: "一级审批" },
+      { value: "2", label: "二级审批" },
+      { value: "3", label: "三级审批" },
+    ]);
+    const isConSelect = ref([
+      { value: "1", label: "是" },
+      { value: "0", label: "否" },
+    ]);
+    const placeData = () => {
+      lecturer.parentList().then((res) => {
+        if (res.data.code == 200) {
+          PlaceOfPayListTwo.value = res.data.data.map((item) => {
+            return {
+              value: item.affiliationCode,
+              label: item.affiliationName,
+            };
+          });
+        }
+      });
+    };
+    // placeData()
+    const PlaceOfPayListTwo = ref([]);
+    const selectRadio = (val) => {
+      if (val.target.value == 1) {
+        state.formParam.leveOneArray = [];
+        state.formParam.leveTwoArray = [];
+        state.formParam.leveThreeArray = [];
+        state.formParam.leveOneValue = null;
+        state.formParam.leveTwoValue = null;
+        state.formParam.leveThreeValue = null;
+      }
+      state.formParam.code = null;
+    };
+    const columns = ref([
+      // {
+      //   title: '培训发生组织编号 ',
+      //   dataIndex: 'affiliationCode',
+      //   key: 'affiliationCode',
+      //   ellipsis: true,
+      //   align: "center",
+      //   width: '100px',
+      // },
+      {
+        title: "培训发生组织名称 ",
+        dataIndex: "affiliationName",
+        key: "affiliationName",
+        ellipsis: true,
+        align: "left",
+        width: "200px",
+        customCell: () => {
+          return { style: { userSelect: "text" } };
+        },
+      },
+      {
+        title: "状态",
+        dataIndex: "status",
+        key: "status",
+        ellipsis: true,
+        align: "center",
+        width: "100px",
+        customRender: ({ text }) => {
+          switch (text) {
+            case "1":
+              return <span>待提交</span>;
+            case "2":
+              return <span>审核中</span>;
+            case "3":
+              return <span>已完成</span>;
+            case "4":
+              return <span>审核失败</span>;
+            case "5":
+              return <span>待审核</span>;
+            default:
+              return <span>-</span>;
+          }
+        },
+      },
+      {
+        title: "是否为根节点",
+        dataIndex: "parentName",
+        key: "parentName",
+        align: "left",
+        width: "200px",
+        customRender: ({ text, record }) => {
+          return text ? (
+            <div>
+              <span style={{ marginRight: "10px" }}>否</span>({text})
+            </div>
+          ) : (
+            <div>
+              <span style={{ marginRight: "10px" }}>是</span>(
+              {{ 1: "一", 2: "二", 3: "三" }[record.code]}级审批)
+            </div>
+          );
+        },
+      },
+      {
+        title: "担当",
+        dataIndex: "leaderName",
+        key: "leaderName",
+        ellipsis: true,
+        align: "left",
+        width: "200px",
+        customCell: () => {
+          return { style: { userSelect: "text" } };
+        },
+      },
+
+      // {
+      //   title: '备注 ',
+      //   dataIndex: 'remark',
+      //   key: 'remark',
+      //   ellipsis: true, align: "center",
+      //   width: 160,
+      // },
+      {
+        title: "操作 ",
+        dataIndex: "operation",
+        key: "operation",
+        width: "120px",
+        align: "center",
+        fixed: "right",
+        scopedSlots: { customRender: "action" },
+      },
+    ]);
+    const orgColumns = ref([
+      {
+        title: "组织名称",
+        dataIndex: "orgName",
+        key: "orgName",
+        ellipsis: true,
+        width: "20%",
+        align: "center",
+      },
+      {
+        title: "是否被培训发生组织选择",
+        dataIndex: "isSelect",
+        key: "isSelect",
+        ellipsis: true,
+        align: "center",
+        width: "30%",
+        customRender: (text) => {
+          return (
+            <div>
+              {text.record.isSelect == 1
+                ? `是 (${text.record.affiliationName})`
+                : "否 (-)"}
+            </div>
+          );
+        },
+      },
+      {
+        title: "担当",
+        dataIndex: "leaders",
+        key: "leaders",
+        ellipsis: true,
+        align: "center",
+        width: "60%",
+        customRender: (text) => {
+          return <div>{text.record.leaders || "-"}</div>;
+        },
+      },
+    ]);
+    //列表数据
+    const tableData = ref([]);
+    //  List接口数据
+    const getTableDate = (obj) => {
+      state.tableLoading = true;
+      let objA = { ...state.searchParam };
+      queryTrainOrg(objA).then((res) => {
+        tableData.value = res.data.data.records;
+        state.tableDataTotal = Number(res.data.data.total);
+        state.tableLoading = false;
+      });
+    };
+    getTableDate();
+    // 搜索
+    const searchSubmit = () => {
+      state.searchParam.pageNo = 1;
+      getTableDate();
+    };
+    const searchList = (val) => {
+      getTableDate();
+    };
+    //重置
+    const searchReset = () => {
+      state.searchParam = {
+        name: null,
+        isParent: null,
+        leaderName: null,
+        pageNo: 1,
+        pageSize: 10,
+      };
+      getTableDate();
+    };
+    //   // 翻页
+    const changePagination = (page, pageSize) => {
+      state.searchParam.pageNo = page;
+      // state.pageNo = page;
+      state.searchParam.pageSize = pageSize;
+      getTableDate();
+    };
+    const updateModal = (record) => {
+      dialog({
+        content: "是否确认撤回 ?",
+        ok: () => {
+          lecturer
+            .affiliatIsConfirm(record.id)
+            .then((res) => {
+              message.success("撤回成功");
+              getTableDate();
+            })
+            .catch((err) => {
+              message.destroy();
+              message.error(err.data.msg);
+            });
+        },
+      });
+    };
+    //删除弹窗
+    const deleteModal = (record) => {
+      let contents = "";
+      (record.status == 1 || record.status == 4) &&
+        record.parentName &&
+        (contents = "是否确认进行删除?");
+      (record.status == 1 || record.status == 4) &&
+        !record.parentName &&
+        (contents = "是否确认进行删除?删除后关联的子节点将一并删除");
+      record.status == 2 && (contents = "该培训发生组织正在审核中，无法删除");
+      dialog({
+        content: contents || "是否确认进行删除?",
+        isCloseBtn: record.status == 2 ? false : true,
+        ok: () => {
+          lecturer
+            .affiliationDelById(record.id)
+            .then((res) => {
+              if (typeof res.data.data != "object") {
+                message.error(res.data.data);
+                return;
+              }
+              message.success("删除成功");
+              searchSubmit();
+            })
+            .catch((err) => {
+              message.destroy();
+              message.error(err.data.msg);
+            });
+        },
+      });
+    };
+    const isEnablePost = (record, status) => {
+      dialog({
+        content: `是否确认${!status ? "启用" : "停用"}该培训发生组织?`,
+        ok: () => {
+          lecturer
+            .isEnable({ id: record.id, status })
+            .then((res) => {
+              if (typeof res.data.data != "object") {
+                message.error(res.data.data);
+                return;
+              }
+              message.success(`${!status ? "启用" : "停用"}成功`);
+              searchSubmit();
+            })
+            .catch((err) => {
+              message.destroy();
+              message.error(err.data.msg);
+            });
+        },
+      });
+    };
+    //确认删除
+    const closeDeleteTeacher = () => {
+      //调用删除接口
+      deleteTrainOrg({ kid: state.delId }).then((res) => {
+        if (res.data.code == 200) {
+          // message.success("删除成功");
+          state.deleteInTeacherdialog = false;
+          searchSubmit();
+        }
+      });
+    };
+    //取消按钮 清空输入的数据
+    const cancelTeacherDialog = () => {
+      if ((state.teacherdialog = true)) {
+        formRef.value.resetFields();
+        state.teacherdialog = false;
+      }
+      cancel();
+      state.deleteInTeacherdialog = false;
+      state.editTeacher = false;
+    };
+    watch(
+      () => state.teacherdialog,
+      (val) => {
+        if (val) {
+          placeData();
+        } else {
+          state.editParams = true;
+          state.editIndex = 0;
+        }
+      }
+    );
+    const addTeacher = () => {
+      (state.teacherdialog = true), (state.formParam.locking = 0);
+      state.teacherdialogtitle = "新增培训发生组织";
+      state.vf = true;
+      lecturer
+        .getAffiliationCode()
+        .then((res) => {
+          state.formParam.affiliationCode = res.data.data;
+        })
+        .catch(() => {
+          message.error("获取培训发生组织编号失败");
+        });
+    };
+    const downOpen = () => {
+      window.open(
+        `/manageApi/admin/export/exportTeacherAffiliation?name=${
+          state.searchParam.name || ""
+        }&isParent=${state.searchParam.isParent || ""}&leaderName=${
+          state.searchParam.leaderName || ""
+        }`
+      );
+    };
+    const addContentData = () => {
+      state.showContent = true;
+    };
+    watch(
+      () => state.formParam,
+      (val) => {
+        if (!state.editParams) {
+          state.editIndex++;
+        }
+      },
+      { deep: true }
+    );
+    //修改信息弹窗
+    const handleModify = (record) => {
+      lecturer.getAffiliationById(record.id).then((res) => {
+        res.data.data.status == 3 && (state.editParams = false);
+        state.formParam = res.data.data;
+        const actArray = res.data.data.affiliationUserList
+          .filter((item) => item.type == 0)
+          .reduce((accumulator, current) => {
+            if (!accumulator.some((item) => item.userId === current.userId)) {
+              accumulator.push(current);
+            }
+            return accumulator;
+          }, []);
+        const leveOneArray = res.data.data.affiliationUserList
+          .filter((item) => item.type == 1)
+          .reduce((accumulator, current) => {
+            if (!accumulator.some((item) => item.userId === current.userId)) {
+              accumulator.push(current);
+            }
+            return accumulator;
+          }, []);
+        const leveTwoArray = res.data.data.affiliationUserList
+          .filter((item) => item.type == 2)
+          .reduce((accumulator, current) => {
+            if (!accumulator.some((item) => item.userId === current.userId)) {
+              accumulator.push(current);
+            }
+            return accumulator;
+          }, []);
+        const leveThreeArray = res.data.data.affiliationUserList
+          .filter((item) => item.type == 3)
+          .reduce((accumulator, current) => {
+            if (!accumulator.some((item) => item.userId === current.userId)) {
+              accumulator.push(current);
+            }
+            return accumulator;
+          }, []);
+        state.formParam.actArray = actArray.map((item) => {
+          return {
+            label: item.userName + item.userNo,
+            value: item.userId,
+            realName: item.userName,
+            ...item,
+            id: item.userId,
+          };
+        });
+        state.formParam.actValue = state.formParam.actArray
+          .map((item) => item.label)
+          .join(",");
+        state.formParam.leveOneArray = leveOneArray.map((item) => {
+          return {
+            label: item.userName + item.userNo,
+            value: item.userId,
+            realName: item.userName,
+            ...item,
+          };
+        });
+        state.formParam.leveOneValue = state.formParam.leveOneArray
+          .map((item) => item.label)
+          .join(",");
+        state.formParam.leveTwoArray = leveTwoArray.map((item) => {
+          return {
+            label: item.userName + item.userNo,
+            value: item.userId,
+            realName: item.userName,
+            ...item,
+          };
+        });
+        state.formParam.leveTwoValue =
+          state.formParam.leveTwoArray.map((item) => item.label).join(",") ||
+          null;
+        state.formParam.leveThreeArray = leveThreeArray.map((item) => {
+          return {
+            label: item.userName + item.userNo,
+            value: item.userId,
+            realName: item.userName,
+            ...item,
+          };
+        });
+        state.formParam.leveThreeValue =
+          state.formParam.leveThreeArray.map((item) => item.label).join(",") ||
+          null;
+        state.formParam.orglistName = state.formParam.affiliationOrgList
+          ?.map((item) => item.id)
+          .join(",");
+        state.formParam.selectOrgList?.map((item) => {
+          state.formParam.affiliationOrgList.some((item2) => {
+            if (item.orgId == item2.orgId) {
+              item2 = Object.assign(item2, item);
+              return true;
+            }
+          });
+        });
+        state.formParam.affiliationOrgLists =
+          state.formParam.affiliationOrgList;
+        state.formParam.isContains = String(state.formParam.isContains);
+        state.teacherdialog = true;
+        state.teacherdialogtitle = "编辑培训发生组织";
+        state.vf = false;
+      });
+      // TeacherSystem(record)
+    };
+    const TeacherSystem = (record) => {
+      state.formParam.affiliationCode = record.affiliationCode;
+      state.formParam.affiliationName = record.affiliationName;
+      state.formParam.remark = record.remark;
+    };
+    const cancel = () => {
+      state.formParam = {
+        orglistName: null,
+        affiliationCode: null,
+        affiliationName: null,
+        isParent: 1,
+        remark: null,
+        actValue: null,
+        actArray: [],
+        leveOneValue: null,
+        leveTwoValue: null,
+        leveThreeValue: null,
+        leveOneArray: [],
+        leveTwoArray: [],
+        leveThreeArray: [],
+        code: null,
+        isContains: "0",
+        affiliationOrgList: [],
+        affiliationOrgLists: [],
+        locking: 1,
+      };
+    };
+    async function validateField(name) {
+      return new Promise((resolve) => {
+        formRef.value
+          .validateFields([name])
+          .then(() => {
+            resolve(false);
+          })
+          .catch(() => {
+            resolve(true);
+          });
+      });
+    }
+    const valueChange = (val, type) => {
+      if (type == 0) {
+        state.formParam.actValue =
+          val?.map((item) => item.label).join(",") || null;
+      } else if (type == 1) {
+        state.formParam.leveOneValue =
+          val?.map((item) => item.label).join(",") || null;
+      } else if (type == 2) {
+        state.formParam.leveTwoValue =
+          val?.map((item) => item.label).join(",") || null;
+      } else if (type == 3) {
+        state.formParam.leveThreeValue =
+          val?.map((item) => item.label).join(",") || null;
+      }
+    };
+    //保存
+    const createTeacherDialog = async (val) => {
+      state.formParam.affiliationName = state.formParam.affiliationName?.trim();
+      state.formParam.affiliationUserList = [
+        ...state.formParam?.actArray,
+        ...state.formParam?.leveOneArray,
+        ...state.formParam?.leveTwoArray,
+        ...state.formParam?.leveThreeArray,
+      ];
+      state.formParam.orglistName = state.formParam.affiliationOrgList
+        ?.map((item) => item.id)
+        .join(",");
+      let formItemNames = Object.keys(rules);
+      if (state.formParam.isParent == 0) {
+        formItemNames = formItemNames.filter((item) => item != "leveOneValue");
+      } else {
+        formItemNames = formItemNames.filter((item) => item != "isContains");
+      }
+      for (let i = 0; i < formItemNames.length; i++) {
+        // const result = await validateField(formItemNames[i]);
+        const result = state.formParam[formItemNames[i]];
+        if (!result) {
+          if (formItemNames[i] == "code" && !state.formParam.isParent) {
+            return message.error(rules[formItemNames[i]][0].log2);
+          } else {
+            return message.error(rules[formItemNames[i]][0].log);
+          }
+        }
+      }
+      if (
+        !state.formParam.leveTwoValue &&
+        state.formParam.leveThreeValue &&
+        state.formParam.isParent
+      ) {
+        return message.error("请选择二级审批人");
+      }
+      state.formParam.remark = state.formParam?.remark?.trim();
+      state.formParam.submitStatus = val;
+      dialog({
+        content: val
+          ? "是否确认提交，一旦提交将进入（BPM系统）审核流程。"
+          : "是否确认保存？",
+        ok: () => {
+          state.example = true;
+          if (state.vf == false) {
+            updateTrainOrg(state.formParam)
+              .then((res) => {
+                if (res.data.code == 200) {
+                  message.success("修改成功");
+                  cancel();
+                  getTableDate();
+                } else {
+                  message.error(res.data.msg);
+                }
+                state.teacherdialog = false;
+                state.example = false;
+              })
+              .catch((err) => {
+                message.destroy();
+                message.error(err.data.msg);
+                state.teacherdialog = false;
+                state.example = false;
+                cancel();
+              });
+          } else {
+            addReviewer(state.formParam)
+              .then((res) => {
+                message.success("保存成功");
+                state.teacherdialog = false;
+                cancel();
+                searchSubmit();
+                state.example = false;
+              })
+              .catch((err) => {
+                message.destroy();
+                message.error(err.data.msg);
+                state.teacherdialog = false;
+                cancel();
+                state.example = false;
+              });
+          }
+        },
+      });
+    };
+    const rules = {
+      affiliationCode: [
+        { required: true, message: "", log: "请选择培训发生组织编号" },
+      ],
+      affiliationName: [
+        { required: true, message: "", log: "请选择培训发生组织名称" },
+      ],
+      code: [
+        {
+          required: true,
+          message: "",
+          log: "请选择根节点",
+          log2: "请选择审批层级",
+        },
+      ],
+      actValue: [{ required: true, message: "", log: "请选择组织担当" }],
+      leveOneValue: [{ required: true, message: "", log: "请选择一级审批人" }],
+      isContains: [
+        { required: true, message: "", log: "请选择审批流程是否加担当" },
+      ],
+      orglistName: [{ required: true, message: "", log: "请选择管理组织" }],
+    };
+    const TrainOrglist = ref([
+      { label: "全部", value: "" },
+      { label: "根节点", value: "0" },
+      { label: "子节点", value: "1" },
+    ]);
+    //回车
+    const enterPressHadlerSearch = (e) => {
+      if (e.keyCode === 13) {
+        searchSubmit();
+      }
+    };
+    return {
+      ...toRefs(state),
+      enterPressHadlerSearch,
+      TrainOrglist,
+      rules,
+      formRef,
+      columns,
+      orgColumns,
+      tableData,
+      getTableDate,
+      searchSubmit,
+      selectRadio,
+      PlaceOfPayList,
+      isConSelect,
+      PlaceOfPayListTwo,
+      placeData,
+      searchReset,
+      searchList,
+      deleteModal,
+      isEnablePost,
+      updateModal,
+      cancelTeacherDialog,
+      addTeacher,
+      downOpen,
+      addContentData,
+      handleModify,
+      closeDeleteTeacher,
+      changePagination,
+      TeacherSystem,
+      createTeacherDialog,
+      valueChange,
+      validateField,
+      checkMenu,
+    };
+  },
+};
+</script>
+<style lang="scss" scoped>
+.example {
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.45);
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 999999;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.headers {
+  height: 73px;
+  border-bottom: 1px solid #e8e8e8;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  // background-color: red;
+  margin-bottom: 20px;
+
+  .headerTitle {
+    font-size: 18px;
+    font-weight: 600;
+    color: #333333;
+    line-height: 25px;
+    // margin-left: 24px;
+  }
+}
+.tableBox {
+  padding-bottom: 20px;
+  margin: 20px 38px 30px;
+  ::v-deep .ant-select-dropdown {
+    display: inline-block;
+  }
+  ::v-deep .ant-select-selection-item {
+    margin-left: 3px;
+  }
+  ::v-deep .ant-pagination-options-size-changer.ant-select {
+    width: 84px;
+  }
+  .pa {
+    width: 100%;
+    display: flex;
+    justify-content: right;
+  }
+}
+.add_content {
+  width: 40px;
+  height: 40px;
+  cursor: pointer;
+  border-radius: 50%;
+  background-color: #4ea6ff;
+  text-align: center;
+  line-height: 40px;
+  color: #ffffff;
+  font-size: 26px;
+}
+//导出按钮icon
+.daochu {
+  width: 16px;
+  height: 18px;
+  background-image: url("../../assets/images/coursewareManage/export1.png");
+}
+
+//弹窗内详情样式
+.display1 {
+  display: inline-block;
+  width: 200px;
+}
+
+// .display0{
+// display:inline-block ;
+// width:200px ;
+// text-align:center }
+//弹窗内确认取消按钮布局
+.del_btnbox {
+  display: flex;
+  margin: 30px auto;
+  justify-content: center;
+
+  .del_btn {
+    width: 100px;
+    height: 40px;
+    background: rgba(64, 158, 255, 0);
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+    cursor: pointer;
+
+    .btnText {
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 40px;
+    }
+  }
+
+  .btn1 {
+    border: 1px solid rgba(64, 158, 255, 1);
+    color: #4ea6ff;
+    margin-right: 14px;
+  }
+
+  .btn2 {
+    background-color: #4ea6ff;
+    color: #ffffff;
+  }
+}
+
+.ant-table-cell-fix-right {
+  width: 300px !important;
+}
+
+.ant-table-tbody > tr > td {
+  text-align: center;
+}
+
+.InsideLecturer {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  .filter {
+    margin-left: 38px;
+    margin-right: 38px;
+    margin-top: 30px;
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    .select {
+      margin-right: 20px;
+      margin-bottom: 20px;
+    }
+  }
+}
+
+.delete {
+  z-index: 9999;
+  width: 424px;
+  background: #ffffff;
+  box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+  border-radius: 4px;
+  position: absolute;
+  left: 30%;
+  top: 10%;
+  // transform: translate(-50%, -50%);
+
+  .del_header {
+    position: absolute;
+    width: calc(100%);
+    height: 40px;
+    background: linear-gradient(
+      rgba(78, 166, 255, 0.2) 0%,
+      rgba(78, 166, 255, 0) 100%
+    );
+  }
+
+  .del_main {
+    width: 100%;
+    position: relative;
+
+    .header {
+      display: flex;
+      align-items: center;
+      padding-top: 20px;
+      padding-left: 26px;
+      font-size: 16px;
+
+      .del-icon {
+        width: 16px;
+        height: 16px;
+        margin-right: 10px;
+        background-image: url(@/assets/images/coursewareManage/notice.png);
+        background-size: 100% 100%;
+      }
+
+      .icon {
+        width: 16px;
+        height: 16px;
+        margin-right: 10px;
+        background-image: url(@/assets/images/coursewareManage/QR.png);
+        background-size: 100% 100%;
+      }
+
+      .close_exit {
+        position: absolute;
+        right: 42px;
+        cursor: pointer;
+        width: 20px;
+        height: 20px;
+        background-image: url(@/assets/images/coursewareManage/close.png);
+        background-size: 100% 100%;
+      }
+    }
+
+    .body {
+      width: 100%;
+      margin: 34px auto 56px auto;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
+    .del_btnbox {
+      display: flex;
+      margin: 30px auto;
+      justify-content: center;
+
+      .del_btn {
+        width: 100px;
+        height: 40px;
+        background: rgba(64, 158, 255, 0);
+        border-radius: 8px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 14px;
+        flex-shrink: 0;
+        cursor: pointer;
+
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          line-height: 40px;
+        }
+      }
+
+      .btn1 {
+        border: 1px solid rgba(64, 158, 255, 1);
+        color: #4ea6ff;
+      }
+
+      .btn2 {
+        background-color: #4ea6ff;
+        color: #ffffff;
+      }
+    }
+  }
+}
+
+.CreatePath {
+  .out {
+    z-index: 9999;
+    display: block;
+    position: absolute;
+    top: 90px;
+    width: 1080px !important;
+    height: 650px;
+    overflow: auto;
+    background-color: #fff;
+
+    box-shadow: 0 0 10px rgba(118, 136, 166, 0.21);
+    left: 50%;
+    top: 300px;
+    transform: translate(-50%, -50%);
+
+    .top {
+      width: 100%;
+      height: 68px;
+
+      background: linear-gradient(
+        rgba(78, 166, 255, 0.2) 0%,
+        rgba(78, 166, 255, 0) 100%
+      );
+      display: flex;
+      align-items: center;
+
+      .topimg {
+        width: 18px;
+        height: 18px;
+        margin-left: 27px;
+        margin-top: -2px;
+      }
+
+      .topc {
+        color: #000000;
+        font-size: 16px;
+        margin-left: 8px;
+      }
+    }
+
+    .mid {
+      width: 100%;
+      height: 100%;
+      background-color: #fff;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
+      .d {
+        // margin-top: 8px;
+        // color: #ff4e4e;
+        margin-left: -5px;
+      }
+    }
+  }
+}
+
+// 重置样式
+.resetbtn {
+  width: 100px;
+  height: 40px;
+  border-radius: 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 14px;
+  flex-shrink: 0;
+  cursor: pointer;
+  .search {
+    width: 15px;
+    height: 16px;
+    margin-right: 5px;
+    background: url("../../assets/images/courseManage/add0.png") no-repeat;
+    background-size: 100% 100%;
+  }
+}
+.btnn {
+  padding: 0px 26px 0px 26px;
+  height: 40px;
+  background: #1890ff;
+  border-radius: 8px;
+  border: 1px solid #1890ff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 14px;
+  flex-shrink: 0;
+  cursor: pointer;
+
+  .btnText {
+    font-size: 14px;
+    font-weight: 400;
+    color: #fff;
+    line-height: 36px;
+    margin-left: 5px;
+  }
+  .daochu {
+    width: 16px;
+    height: 18px;
+    background-image: url("../../assets/images/coursewareManage/export1.png");
+  }
+}
+
+//展开收起样式
+.moreidbtn {
+  border: none;
+  color: #4ea6ff;
+  width: 80px;
+}
+
+//小竖线
+.line {
+  float: left;
+  width: 3px;
+  height: 25px;
+  background: #4ea6ff;
+  border-radius: 30%;
+  margin-right: 5px;
+}
+//抽屉功能
+.drawaer
+/* 改变所有 a-tree-select 输入框的高度 */
+.ant-tree-select .ant-select-selection {
+  height: 40px;
+  line-height: 40px;
+  /* 确保文字垂直居中 */
+}
+.draitem {
+  width: 100%;
+  height: 40px !important;
+  border-radius: 8px;
+  line-height: 40px;
+}
+.drabtn {
+  height: 40px;
+  width: 80px;
+  border-radius: 8px;
+  margin-right: 20px;
+}
+::v-deep .ant-select:not(.ant-select-customize-input) .ant-select-selector {
+  border-radius: 8px;
+  height: 40px;
+  line-height: 40px;
+  text-align: left;
+}
+.ant-col-12 {
+  height: 90px;
+}
+.item_inp {
+  flex: 1;
+  text-align: center;
+  .i_upload_img {
+    width: 100px;
+    height: 100px;
+    border-radius: 8px;
+  }
+
+  .i_upload {
+    width: 100px;
+    height: 100px;
+    border: 1px solid #4ea6ff;
+    border-radius: 50%;
+    text-align: center;
+    align-items: center;
+    cursor: pointer;
+
+    .addimg {
+      position: relative;
+
+      .heng {
+        position: absolute;
+        top: 50px;
+        left: 25px;
+        width: 50px;
+        border: 1px solid #4ea6ff;
+      }
+
+      .shu {
+        position: absolute;
+        top: 25px;
+        left: 50px;
+        height: 50px;
+        border: 1px solid #4ea6ff;
+      }
+    }
+  }
+
+  .ant-upload.ant-upload-select-picture-card {
+    border: 0px !important;
+    border-radius: 50% !important;
+  }
+}
+.ant-upload.ant-upload-select-picture-card {
+  border: 0px !important;
+  border-radius: 50% !important;
+}
+</style>

From 217cf6057c2039d7f855339586839754acb1605c Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 20:25:24 +0800
Subject: [PATCH 100/157] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/OrganizationApproval.vue | 2386 ++++++++++---------
 src/views/lecturer/OrganizationList.vue     |    1 +
 2 files changed, 1229 insertions(+), 1158 deletions(-)

diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue
index 01bdd8c6..017c1947 100644
--- a/src/views/lecturer/OrganizationApproval.vue
+++ b/src/views/lecturer/OrganizationApproval.vue
@@ -1,220 +1,162 @@
-<!-- 讲师费审批页面 -->
+<!-- 归属组织 -->
 <template>
-  <div>
-    <!-- 搜索框及按钮 -->
-    <div class="filter">
-      <a-form layout="inline" style="min-width: 1380px;">
-        <a-form-item class="select">
-          <a-select style="width: 235px" v-model:value="searchParam.trainOrgId" placeholder="培训发生组织" allowClear
-            :options="trainOrglist" v-on:keydown.enter="enterPressHadlerSearch">
-          </a-select>
-        </a-form-item>
-        <a-form-item class="select ">
-          <!-- <div class="select addTimeBox">
-            <div class="addTime" >汇总时间：</div> -->
-          <a-range-picker v-model:value="searchdate" style="width: 340px !important;" format="YYYY-MM-DD"
-            valueFormat="YYYY-MM-DD" separator="至" :placeholder="['汇总时间开始时间', '汇总时间结束时间']"
-            v-on:keydown.enter="enterPressHadlerSearch" />
-          <!-- </div> -->
-        </a-form-item>
-        <a-form-item class="select">
-          <a-select style="width: 200px ;margin-bottom:20px" v-model:value="searchParam.status" placeholder="请选择状态"
-            allowClear :options="AuthenticationStatusList" v-on:keydown.enter="enterPressHadlerSearch">
-          </a-select>
-        </a-form-item>
-        <div style="display: flex; margin-bottom: 20px">
-          <a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
-          <!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
-          <!-- <div class="search"></div> -->
-          <a-button class="resetbtn " @click="searchReset">重置</a-button>
-
-          <!-- 更多筛选-->
-          <!-- <div v-if="moreid == 1">
-              <a-button @click="handlemoreid()" class="moreidbtn" type="text"> 展开
-                <RightOutlined />
-              </a-button>
-            </div>
-            <div v-if="moreid == 2">
-              <a-button @click="handlemoreid()" class="moreidbtn"> 返回
-                <UpOutlined />
-              </a-button>
-            </div> -->
+  <!-- 搜索框及按钮 -->
+  <div class="filter" style="min-width: 1380px; margin: 20px">
+    <a-form layout="inline">
+      <a-form-item class="select">
+        <div>
+          <a-input
+            style="width: 235px; height: 40px; border-radius: 8px"
+            v-model:value="searchParam.name"
+            placeholder="请输入编号/名称进行搜索"
+            v-on:keydown.enter="enterPressHadlerSearch"
+          />
         </div>
-        <!-- <div style="width:100%"></div> -->
-        <!-- <a-form-item class="select" v-if="moreid == 2">
-            <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.courseType" placeholder="请选择费用类型" allowClear
-              :options="courseTypeList">
-            </a-select>
-          </a-form-item>
-          <a-form-item class="select" v-if="moreid == 2">
-            <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.type" placeholder="请选择课程类型" allowClear
-              :options="OnTheJobStatusList">
-            </a-select>
-          </a-form-item>
-          <a-form-item class="select" v-if="moreid == 2">
-            <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.status" placeholder="请选择状态" allowClear
-              :options="AuthenticationStatusList">
-            </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
-              :options="lecturerSystemList" @change="changetlevel">
-            </a-select>
-          </a-form-item>
-          <a-form-item class="select"  v-if="moreid == 2">
-            <a-select style="width: 230px ;margin-bottom:10px" v-model:value="searchParam.levelId" placeholder="请选择讲师级别" allowClear   :disabled="getLevelList.length!==0 ? false:true"
-              :options="getLevelList">
-            </a-select>
-          </a-form-item> -->
-      </a-form>
-      <!-- <div style="width: 100%;"></div>
-        <div style="display: flex; margin-bottom: 20px">
-          
-          <a-button @click="handleExport()" class="resetbtn">
-            <UploadOutlined /> 导出
-          </a-button>
-          <div  v-if="moreid == 2"   style="line-height: 40px;" >当前页面汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">1,230,490</span>元     当前总汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">9,230,490</span>元</div>
-        </div>  -->
-      <!-- 表格 -->
-      <div>
-        <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columns"
-          :data-source="tableData" :loading="tableLoading" @expand="expandTable" :pagination="false">
-          <template #bodyCell="{ record, column }">
-            <template v-if="column.key === 'operation'">
-              <a-space>
-                <a-button type="link" v-if="record.status != 2 && record.status != 3" @click="goDdit(record)">提交</a-button>
-                <a-button type="link" v-if="record.status != 1 && record.status != 5"
-                  @click="() => handleLook(record, String(record.courseform))">查看</a-button>
-                <!-- <a-button  type="link" @click="() => handleOperate(record, String(record.courseform))">审批</a-button> -->
-                <!-- TODO1 -->
-                <a-button v-if="record.status == 1 || record.status == 4" type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
-                <!-- <a-button v-if="record.status == 4" type="link" @click="submit(record)">提交</a-button> -->
-                <a-button v-if="record.status == 2 && false" type="link" @click="withdraw(record)">撤回</a-button>
-              </a-space>
-            </template>
-          </template>
-        </a-table>
+      </a-form-item>
+      <a-form-item class="select">
+        <div>
+          <a-select
+            style="width: 235px"
+            v-model:value="searchParam.isParent"
+            placeholder="请选择节点类型"
+            allowClear
+            :options="TrainOrglist"
+            v-on:keydown.enter="enterPressHadlerSearch"
+          />
+        </div>
+      </a-form-item>
+      <a-form-item class="select">
+        <div>
+          <a-input
+            style="width: 235px; height: 40px; border-radius: 8px"
+            v-model:value="searchParam.leaderName"
+            placeholder="请输入担当姓名/工号"
+            v-on:keydown.enter="enterPressHadlerSearch"
+          />
+        </div>
+      </a-form-item>
+      <div style="display: flex; margin-bottom: 20px">
+        <a-button @click="searchSubmit()" type="primary" class="resetbtn"
+          >查询
+        </a-button>
+        <!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
+        <!-- <div class="search"></div> -->
+        <a-button class="resetbtn" @click="searchReset">重置</a-button>
       </div>
-
-    </div>
-    <div class="tableBox ">
-      <div style="float: right;">
-        <a-pagination v-if="tableDataTotal > 10" :showSizeChanger="true" :showQuickJumper="false"
-          :hideOnSinglePage="false" :pageSize="searchParam.pageSize" :current="searchParam.pageNo"
-          :total="tableDataTotal" class="pagination" @change="changePagination" />
+    </a-form>
+    <div style="width: 100%"></div>
+    <div style="display: flex; margin-bottom: 20px">
+      <a-button
+        v-if="checkMenu('lecturerTrainOrgAdd')"
+        @click="addTeacher()"
+        type="primary"
+        class="resetbtn"
+        style="width: 164px"
+      >
+        <div class="search"></div>
+        新增培训发生组织
+      </a-button>
+      <div
+        class="btnn btn2"
+        @click="downOpen"
+        style="margin-right: 14px"
+        v-if="checkMenu('lecturerTrainOrgExport')"
+      >
+        <div class="daochu"></div>
+        <div class="btnText">导出</div>
       </div>
     </div>
-    <!-- 弹窗组件 -->
-    <!--查看讲师费详情 -->
-    <a-drawer class="largeDrawerInside" :closable="false" v-model:visible="teachingdialog" placement="right"
-      @closa="cancelTeachingDialog" width="60%" :title="false">
-      <div style="padding:24px;">
-        <div class="headers" style="margin-top:-24px;">
-          <div class="headerTitle">汇总讲师费详情</div>
-          <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-            @click="cancelTeachingDialog" />
-        </div>
-        <span class="line"></span>
-        <span style="font-weight:600;">基本信息</span>
-        <a-descriptions style="margin-top:16px" bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
-          <a-descriptions-item label="审批编号">
-            <div style="user-select:text">{{ formParam?.approvalNumber || '-' }}</div>
-          </a-descriptions-item>
-          <a-descriptions-item label="培训发生组织">
-            <div style="user-select:text">{{ formParam?.trainOrgName || '-' }}</div>
-          </a-descriptions-item>
-          <a-descriptions-item label="汇总时间">{{ formParam?.summaryTime || '-' }}</a-descriptions-item>
-          <a-descriptions-item
-            label="汇总金额">{{ formParam?.summaryTotal ? formParam?.summaryTotal + '元' : '-' }}</a-descriptions-item>
-          <a-descriptions-item label="提交时间">{{ formParam?.approvalSubmitTime || '-' }}</a-descriptions-item>
-          <a-descriptions-item label="状态">{{ {
-            0: '待确认', 1: '待提交', 2: '审核中', 3: '审核通过',
-            4: '审核拒绝', 5: '待提交'
-          }[formParam?.status]}}</a-descriptions-item>
-        </a-descriptions>
-        <!-- <span>审批详情</span> -->
-        <!-- <span class="line" style="margin-top:15px;"></span> -->
-        <a-tabs v-model:activeKey="activeKey" @change="tabsChange">
-          <a-tab-pane key="1" tab="讲师费列表">
-            <div style="padding: 10px 0;">
-              <div style="display: flex;margin-bottom: 20px;">
-                <div style="margin-right:20px;">
-                  <a-input @pressEnter="searchTeacherFeeApprovalList()" style="height:40px;border-radius:8px;"
-                    v-model:value="userNoOrName" placeholder="请输入工号/讲师名称进行搜索" />
-                </div>
-                <div style="margin-right:20px;">
-                  <a-range-picker style="height:40px;border-radius:8px;" @change="seeDateChange"
-                    valueFormat="YYYY-MM-DD" format="YYYY-MM-DD" v-model:value="seeDateValue" />
-                </div>
-                <div style="margin-right:20px;">
-                  <a-button style="margin-right:15px;height:40px;border-radius:8px;" type="primary"
-                    @click="searchTeacherFeeApprovalList()">搜索</a-button>
-                  <a-button style="margin-right:15px;height:40px;border-radius:8px;" type="primary"
-                    @click="resetSearch()">重置</a-button>
-                </div>
-              </div>
-              <div style="padding-bottom:70px">
-                <a-table :scroll="{ x: 'max-content' }" :header-cell-style="{ 'text-align': 'center' }"
-                  style="border: 1px solid #f2f6fe" :columns="columnsExamine" :data-source="tableDataExamine"
-                  :loading="examinetableLoading" @expand="expandTable" :pagination="pagination">
-                </a-table>
-              </div>
-            </div>
-          </a-tab-pane>
-          <a-tab-pane key="2" tab="讲师费审批记录" force-render v-if="false">
-            <div style="padding-bottom:70px">
-              <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe"
-                :columns="columnsExamineTwo" :data-source="tableDataExamineTwo" :loading="tableDataExamineLoading"
-                @expand="expandTable" :pagination="false">
-              </a-table>
-            </div>
-          </a-tab-pane>
-        </a-tabs>
-        <div v-if="formParam?.status == 1 || formParam?.status == 5" :style="{
-          position: 'absolute',
-          right: 0,
-          bottom: 0,
-          width: '100%',
-          borderTop: '1px solid #e9e9e9',
-          padding: '10px 16px',
-          background: '#fff',
-          textAlign: 'right',
-          zIndex: 1,
-        }">
-          <a-button class="drabtn" @click="cancelTeachingDialog">取消</a-button>
-          <a-button class="drabtn" type="primary" @click="cancelTeachingDialog(1)" :loading="buttonLoading">提交
-          </a-button>
-          <!-- <a-button  class="drabtn"  @click="cancelTeachingDialog" type="primary" danger>拒绝</a-button> -->
-        </div>
+    <!-- 数据处理 -->
+    <a-table
+      style="border: 1px solid #f2f6fe"
+      :columns="columns"
+      :data-source="tableData"
+      :loading="tableLoading"
+      @expand="expandTable"
+      :pagination="false"
+    >
+      <template #bodyCell="{ record, column }">
+        <template v-if="column.key === 'operation'">
+          <a-space>
+            <lockLecturer
+              :parentName="record.parentName"
+              :id="record.id"
+              :title="'培训发生组织详情'"
+              @searchList="searchList"
+            >
+              <div style="color: #1890ff; cursor: pointer">查看</div>
+            </lockLecturer>
+            <a-button
+              v-if="record.status != 2 && checkMenu('lecturerTrainOrgEdit')"
+              type="link"
+              @click="() => handleModify(record, String(record.courseform))"
+              >编辑</a-button
+            >
+            <a-button
+              v-if="record.status == 2 && false"
+              type="link"
+              @click="() => updateModal(record)"
+              >撤回</a-button
+            >
+            <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
+            <a-button
+              @click="isEnablePost(record, 0)"
+              v-if="record.enable && checkMenu('lecturerTrainOrgStop')"
+              type="link"
+              >启用</a-button
+            >
+            <a-button
+              @click="isEnablePost(record, 1)"
+              v-if="!record.enable && checkMenu('lecturerTrainOrgStop')"
+              type="link"
+              >停用</a-button
+            >
+          </a-space>
+        </template>
+      </template>
+    </a-table>
+    <div class="tableBox">
+      <div class="pa">
+        <a-pagination
+          v-if="tableDataTotal > 10"
+          :showSizeChanger="true"
+          :showQuickJumper="true"
+          :hideOnSinglePage="false"
+          :pageSize="searchParam.pageSize"
+          :current="searchParam.pageNo"
+          :total="tableDataTotal"
+          class="pagination"
+          @change="changePagination"
+        />
       </div>
-    </a-drawer>
-    <!-- 修改状态功能弹窗 -->
+    </div>
+    <!-- 删除功能弹窗 -->
     <div>
-      <a-modal v-model:visible="editTeacher" :footer="null" :closable="close" wrapClassName="" centered="true">
-        <div class="delete" style="width:500px">
+      <a-modal
+        v-model:visible="deleteInTeacherdialog"
+        :footer="null"
+        :closable="close"
+        centered="true"
+      >
+        <div class="delete">
           <div class="del_header"></div>
           <div class="del_main">
             <div class="header">
               <div class="icon1"></div>
               <span>提示</span>
             </div>
-            <a-form style="margin-left:20px; margin-top:10px ">
-              <a-form-item label="审批">
-                <a-radio-group v-model:value="formParamstatues.status">
-                  <a-radio value="S20">同意</a-radio>
-                  <a-radio value="E10">拒绝</a-radio>
-                </a-radio-group>
-              </a-form-item>
-              <a-form-item label="备注">
-                <a-textarea v-model:value="formParamstatues.remark"
-                  style="width: 90%; height: 100px; border-radius: 8px ;" placeholder="一旦拒绝 备注变为必填" />
-              </a-form-item>
-            </a-form>
+            <div class="body">
+              <span>您确定要删除当前组织吗</span>
+            </div>
             <div class="del_btnbox">
-              <div class="del_btn btn2" @click="cancelTeachingDialog" style="margin-right: 32px">
+              <div
+                class="del_btn btn2"
+                @click="cancelTeacherDialog"
+                style="margin-right: 32px"
+              >
                 <div class="btnText">取消</div>
               </div>
-              <div class="del_btn btn2" @click="closehandleOperate">
+              <div class="del_btn btn2" @click="closeDeleteTeacher">
                 <div class="btnText">确定</div>
               </div>
             </div>
@@ -222,368 +164,593 @@
         </div>
       </a-modal>
     </div>
-    <!-- <div> <Upload/> </div>         -->
-    <LecturerAppEdit @example="getExample" @successParams="successParams" v-model:visible="editTeacherDialog"
-      :id="editId">
-    </LecturerAppEdit>
+    <!-- 抽屉 -->
     <div class="example" v-if="example">
       <a-spin />
     </div>
+    <a-drawer
+      class="largeDrawerInside"
+      v-model:visible="teacherdialog"
+      :closable="false"
+      :title="false"
+      placement="right"
+      width="60%"
+      :maskClosable="false"
+    >
+      <div style="padding: 24px">
+        <div class="headers" style="margin-top: -24px">
+          <div class="headerTitle">{{ teacherdialogtitle }}</div>
+          <img
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="@/assets/images/basicinfo/close.png"
+            @click="cancelTeacherDialog"
+          />
+        </div>
+        <a-form :model="formParam" layout="vertical" ref="formRef">
+          <a-row :gutter="16">
+            <a-col :span="24">
+              <!-- <span class="line"></span><span>讲师体系基本信息</span> -->
+            </a-col>
+          </a-row>
+          <a-row :gutter="16">
+            <a-col :span="12">
+              <a-form-item name="affiliationCode">
+                <template v-slot:label>
+                  <img
+                    style="margin-right: 4px; width: 7px; height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
+                  培训发生组织编号：
+                </template>
+                <a-input
+                  disabled
+                  v-model:value="formParam.affiliationCode"
+                  class="draitem"
+                  placeholder="请输入讲师体系编号"
+                  allowClear
+                  showSearch
+                >
+                </a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item name="affiliationName">
+                <template v-slot:label>
+                  <img
+                    style="margin-right: 4px; width: 7px; height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
+                  培训发生组织名称：
+                </template>
+                <a-input
+                  :maxlength="30"
+                  show-count
+                  v-model:value="formParam.affiliationName"
+                  class="draitem"
+                  placeholder="请输入培训发生组织名称"
+                  allowClear
+                  showSearch
+                >
+                </a-input>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="16">
+            <a-col :span="12">
+              <a-form-item name="code">
+                <template v-slot:label>
+                  <img
+                    style="margin-right: 4px; width: 7px; height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
+                  是否为根节点：
+                </template>
+                <div style="display: flex; align-items: center">
+                  <a-radio-group
+                    :disabled="formParam.locking"
+                    style="min-width: 126px"
+                    @change="selectRadio"
+                    v-model:value="formParam.isParent"
+                    name="radioGroup"
+                  >
+                    <a-radio :value="1">否</a-radio>
+                    <a-radio :value="0">是</a-radio>
+                  </a-radio-group>
+                  <a-select
+                    :disabled="formParam.locking"
+                    v-model:value="formParam.code"
+                    :placeholder="
+                      !formParam.isParent ? '请选择审批层级' : '请选择根节点'
+                    "
+                    :options="
+                      !formParam.isParent ? PlaceOfPayList : PlaceOfPayListTwo
+                    "
+                    allowClear
+                    showSearch
+                  />
+                </div>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item name="actValue">
+                <template v-slot:label>
+                  <img
+                    style="margin-right: 4px; width: 7px; height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
+                  组织担当：
+                </template>
+                <!-- <a-select v-model:value="formParam.zzfzr" placeholder="请选择组织负责人"
+                    :options="PlaceOfPayList" allowClear showSearch/> -->
+                <!-- <ProjectManager :type="0" v-model:value="formParam.actValue" :placeholder="'请选择担当'" v-model:arrayList="formParam.actArray" ></ProjectManager> -->
+                <AddApprover
+                  :title="'组织担当'"
+                  v-model:arrayList="formParam.actArray"
+                  @valueChange="valueChange"
+                  :type="0"
+                >
+                  <a-select
+                    style="width: 100%"
+                    v-model:value="formParam.actValue"
+                    :open="false"
+                    :placeholder="'请选择担当'"
+                  ></a-select>
+                </AddApprover>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="16" v-if="formParam.isParent">
+            <a-col :span="12">
+              <a-form-item name="leveOneValue">
+                <template v-slot:label>
+                  <img
+                    style="margin-right: 4px; width: 7px; height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
+                  一级审批人
+                </template>
+                <!-- <a-select v-model:value="formParam.yjspr" placeholder="请选择一级审批人"
+                    :options="PlaceOfPayList" allowClear showSearch/> -->
+                <!-- <ProjectManager :type="1" v-model:value="formParam.leveOneValue" :placeholder="'请选择一级审批人'" v-model:arrayList="formParam.leveOneArray" ></ProjectManager> -->
+                <AddApprover
+                  :title="'一级审批人'"
+                  v-model:arrayList="formParam.leveOneArray"
+                  @valueChange="valueChange"
+                  :type="1"
+                >
+                  <a-select
+                    style="width: 100%"
+                    v-model:value="formParam.leveOneValue"
+                    :open="false"
+                    :placeholder="'请选择一级审批人'"
+                  ></a-select>
+                </AddApprover>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="二级审批人">
+                <!-- <a-select v-model:value="formParam.zzfzr" placeholder="请选择二级审批人"
+                    :options="PlaceOfPayList" allowClear showSearch/> -->
+                <!-- <ProjectManager :type="1" :placeholder="'请选择二级审批人'" v-model:arrayList="formParam.leveTwoArray" ></ProjectManager> -->
+                <AddApprover
+                  :title="'二级审批人'"
+                  v-model:arrayList="formParam.leveTwoArray"
+                  @valueChange="valueChange"
+                  :type="2"
+                >
+                  <a-select
+                    style="width: 100%"
+                    v-model:value="formParam.leveTwoValue"
+                    :open="false"
+                    :placeholder="'请选择二级审批人'"
+                  ></a-select>
+                </AddApprover>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="16">
+            <a-col :span="12" v-if="formParam.isParent">
+              <a-form-item label="三级审批人">
+                <!-- <a-select v-model:value="formParam.sjspr" placeholder="请选择三级审批人"
+                    :options="PlaceOfPayList" allowClear showSearch/> -->
+                <!-- <ProjectManager :type="1" :placeholder="'请选择三级审批人'" v-model:arrayList="formParam.leveThreeArray" ></ProjectManager> -->
+                <AddApprover
+                  :title="'三级审批人'"
+                  v-model:arrayList="formParam.leveThreeArray"
+                  @valueChange="valueChange"
+                  :type="3"
+                >
+                  <a-select
+                    style="width: 100%"
+                    v-model:value="formParam.leveThreeValue"
+                    :open="false"
+                    :placeholder="'请选择三级审批人'"
+                  ></a-select>
+                </AddApprover>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12" v-if="formParam.isParent == 0">
+              <a-form-item name="isContains">
+                <template v-slot:label>
+                  <img
+                    style="margin-right: 4px; width: 7px; height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
+                  审批流程是否加该担当
+                </template>
+                <a-select
+                  v-model:value="formParam.isContains"
+                  placeholder="请选择审批流程是否加担当"
+                  :options="isConSelect"
+                  allowClear
+                  showSearch
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="备注">
+                <a-input
+                  v-model:value="formParam.remark"
+                  showCount
+                  :maxlength="200"
+                  style="width: 100%; height: 40px; border-radius: 8px"
+                  placeholder="请输入"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-form-item name="orglistName">
+            <template v-slot:label>
+              <img
+                style="margin-right: 4px; width: 7px; height: 7px"
+                src="@/assets/images/coursewareManage/asterisk.png"
+                alt=""
+              />
+              选择管理组织
+            </template>
+            <a-row :gutter="50" style="margin-bottom: 10px">
+              <a-col :span="2">
+                <!-- <a-tag color="blue" style="line-height: 40px; ">管理业务</a-tag> -->
+                <a-button
+                  type="primary"
+                  @click="addContentData"
+                  style="width: 100px; height: 40px; border-radius: 8px"
+                  >添加组织</a-button
+                >
+              </a-col>
+              <!-- <a-col :span="20">
+        <div class="add_content" @click="addContentData" >+</div>
+        </a-col> -->
+            </a-row>
+          </a-form-item>
+          <!-- 备注 remark -->
+          <a-row :gutter="16" style="padding-bottom: 60px">
+            <a-col :span="24">
+              <a-form-item label="">
+                <!-- <a-textarea v-model:value="formParam.remark" showCount :maxlength="200"
+                  style="width: 100%; height: 100px; border-radius: 8px" placeholder="请输入" /> -->
+                <a-table
+                  :dataSource="formParam?.affiliationOrgList"
+                  :scroll="{ x: '600' }"
+                  :columns="orgColumns"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+        <!-- 交互按钮 -->
+        <div
+          :style="{
+            position: 'absolute',
+            right: 0,
+            bottom: 0,
+            width: '100%',
+            borderTop: '1px solid #e9e9e9',
+            padding: '10px 16px',
+            background: '#fff',
+            textAlign: 'right',
+            zIndex: 1,
+          }"
+        >
+          <a-button class="drabtn" @click="cancelTeacherDialog">取消</a-button>
+          <a-button
+            class="drabtn"
+            type="primary"
+            @click="createTeacherDialog(0)"
+            :loading="buttonLoading"
+            >保存</a-button
+          >
+          <a-button
+            v-if="editParams || editIndex > 1"
+            class="drabtn"
+            type="primary"
+            @click="createTeacherDialog(1)"
+            :loading="buttonLoading"
+            >提交</a-button
+          >
+        </div>
+      </div>
+    </a-drawer>
+    <AddOrgContent
+      :Addtitle="'选择组织'"
+      :isParent="formParam.isParent"
+      v-model:showContent="showContent"
+      :AddContentLists="formParam.affiliationOrgLists"
+      v-model:AddContentList="formParam.affiliationOrgList"
+    />
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch, watchEffect, computed, onMounted, onUpdated} from "vue";
-import { useRouter } from "vue-router";
+import { reactive, toRefs, ref, watch } from "vue";
+import { FolderAddOutlined } from "@ant-design/icons-vue";
 import { message } from "ant-design-vue";
-import dayjs from "dayjs";
-import dialog from '@/utils/dialog'
+import dialog from "@/utils/dialog";
+import ProjectManager from "@/components/project/ProjectManagerLecturer";
 import {
-  RightOutlined,
-  UpOutlined,
-  UploadOutlined,
-  FolderAddOutlined,
-  DownloadOutlined
-} from '@ant-design/icons-vue';
-import ProjectManager from "@/components/project/ProjectManagerNew";
-import { expenseBillList, queryById, queryExpnseByBillId, updateTeacherFee, updateStatusSubmit, approveTeacherFee, getTrainOrg, isConfirm , expenseBillDelById} from "../../api/lecturerFeeManagement";
-import { getTeacherSystemList, getApprovalResultByBusinessIdList } from "../../api/Lecturer";
-import { queryTrainOrgPor, } from "../../api/organization";
-// lecturerFeeManagement
-// import {getProjSt} from "../../api/indexProjStu";
-// import AddTeacher from "../../components/drawers/project/AddTeacher"
-import LecturerAppEdit from "./LecturerAPPEdit"
+  queryTrainOrg,
+  deleteTrainOrg,
+  addReviewer,
+  updateTrainOrg,
+} from "../../api/organization";
+import AddOrgContent from "../../components/project/AddOrgContent.vue";
+import * as lecturer from "../../api/Lecturer.js";
+import lockLecturer from "@/components/project/lockLecturer";
+import AddApprover from "@/components/project/AddApprover";
+import { checkMenu } from "@/utils/utils";
 export default {
-  name: "LecturerApproval",
+  name: "organizationList",
   components: {
-    RightOutlined, //图标--展开
-    UpOutlined,//图标--收起
-    UploadOutlined,//图标--导出
-    DownloadOutlined,//图标-导入
-    FolderAddOutlined,//图标--新增
     ProjectManager,
-    LecturerAppEdit,
+    FolderAddOutlined, //图标--新增
+    AddOrgContent,
+    lockLecturer,
+    AddApprover,
   },
-  props: {
-    activeKeyProps: String,
-  },
-  setup(props) {
-    onMounted(() => {
-      console.log("props.activeKeyProps",props.activeKeyProps)
-      // const search = sessionStorage.getItem('searchApprlval')
-      // console.log(search,'search')
-      // if(search){
-      //   state.searchParam = JSON.parse(search)
-      //   state.searchdate = state.searchParam.searchdate
-      // }
-      getTableDate()
-    })
-    const router = useRouter()
+  setup() {
+    const formRef = ref();
+
     const state = reactive({
       example: false,
-      editId: null,
-      editTeacherDialog: false,
-      tableDataExamineLoading: false,
-      tableDataExamineTwo: [],
-      tableDataParams: {
-        pageNo: 1,
-        pageSize: 10,
-        total: 0,
-      },
-      userNoOrName: null,
-      seeDateValue: [],
-      seeBegin: null,
-      seeEnd: null,
-      activeKey: '1',
-      moreid: 1,
-      byPid: null,
-      currentPage1: 1,
-      pageSize1: 10,
-      promotionrecordsLoading: false,  //晋级记录遮罩层
-      teacherrecordsLoading: false,// 授课记录遮罩层
+      editParams: true,
+      editIndex: 0,
+      tableDataTotal: 0,
+      vf: true,
+      showContent: false,
       tableLoading: false,
-      examinetableLoading: false,
-      tagsshow: "1",
-      delTeacherId: null, //删除id确认
-      newStatus: null, //修改状态码确认
-      id: null,    //内部讲师工号确认 
-      lookTeacherId: null, //内部讲师详情id确认
-      // deleteInTeacherdialog: false, //删除弹窗
-      editTeacher: false,   //修改状态弹窗
-      handleOperate1: null, //修改状态弹窗内容
-      teacherdialog1: null,
-      teachingdialog: false,  //控制讲师弹窗
-      teacherdialogtitle: '',//讲师弹框title内容
-      pageSizeOptions: ['10', '20', '30', '50'], //下拉选择每页显示多少条
-      pageSize: 10,
-      tableDataTotal: -1,//table列表总条数
-      formParam: {
-        beginTime: null,
-        defaultTeachingTime: "0",
-      },
-      formParamstatues: {
-        status: 'S20',
-        remark: null,
-        id: null,
-      },
-      searchdate: null, //选择时间
+      deleteInTeacherdialog: false,
+      teacherdialog: false,
+      teacherdialogtitle: null,
+      delId: null,
       searchParam: {
-        teacherNo: null,
-        teacherName: null,
-        trainOrgId: null,
-        id: null,
-        levelId: null,
-        courseType: null,
-        certStatus: null,
-        salaryName: null,
-        payrollPlaceId: null,
-        status: null,
+        name: null,
+        isParent: null,
+        leaderName: null,
         pageNo: "1",
         pageSize: "10",
-        beginTime: null,
-        endTime: null,
       },
-    })
-    //费用类型
-    const courseTypeList = ref([
-      { value: 1, label: "课程开发" },
-      { value: 2, label: "作业人员入模培训" },
-      { value: 3, label: "其他" },
-    ])
-
-    const lecturerSystemList = ref([
+      formParam: {
+        orglistName: null,
+        affiliationCode: null,
+        affiliationName: null,
+        isParent: 1,
+        remark: null,
+        actValue: null,
+        actArray: [],
+        leveOneValue: null,
+        leveTwoValue: null,
+        leveThreeValue: null,
+        leveOneArray: [],
+        leveTwoArray: [],
+        leveThreeArray: [],
+        code: null,
+        isContains: "0",
+        affiliationOrgList: [],
+        affiliationOrgLists: [],
+        locking: 1,
+      },
+    });
+    const PlaceOfPayList = ref([
+      { value: "1", label: "一级审批" },
+      { value: "2", label: "二级审批" },
+      { value: "3", label: "三级审批" },
     ]);
-    ///获取讲师体系列表
-    const LecturerSystemLista = () => {
-      // console.log('点击了LecturerSystemLista')
-      getTeacherSystemList().then((res) => {
-        if (res.data.code === 200) {
-          let arr = res.data.data;
-          let array = [];
-          arr?.map((value) => {
-            let obj = {
-              value: value.kid,
-              label: value.systemName,
-            };
-            array.push(obj);
-          });
-          lecturerSystemList.value = array;
-        }
-      })
-    }
-    // LecturerSystemLista()
-    const trainOrglist = ref([])
-    //获取培训发生组织
-    const trainOrglista = () => {
-      let obj = {
-        pageNo: "1",
-        pageSize: "10000"
-      }
-      queryTrainOrgPor(obj).then((res) => {
-        if (res.data.code === 200) {
-          let arr = res.data.data;
-          let array = [];
-          arr.map((value) => {
-            let obj = {
-              value: value.id,
-              label: value.affiliationName,
-            };
-            array.push(obj);
-          });
-          trainOrglist.value = array;
-          trainOrglist.value.unshift({
-            value: '',
-            label: "全部"
-          })
-        }
-      })
-    }
-    trainOrglista()
-
-    //课程类型
-    const OnTheJobStatusList = ref([
-      { value: 1, label: "项目开课" },
-      { value: 2, label: "路径开课" },
-      { value: 3, label: "面授开课" },
-    ])
-    //认证状态0待确认 1待提交 2审核中 3审核通过 4.审核拒绝
-    const AuthenticationStatusList = ref([
-      { value: '', label: "全部" },
-      { value: 1, label: "待提交" },
-      { value: 2, label: "审核中" },
-      { value: 4, label: "审核拒绝" },
-      { value: 3, label: "已审核" },
-    ])
-
-    //状态
-    const AccountStatusList = ref([
-      { value: "A10", label: "待审核", },
-      { value: "A20", label: "已提交", },
-      { value: "A30", label: "审核中", },
-      { value: "E10", label: "审核打回", },
-      { value: "S20", label: "审核通过", },
-    ])
-  
-    //切换筛选
-    const handlemoreid = () => {
-      if (state.moreid == 1) {
-        state.moreid = 2
-      }
-      else if (state.moreid == 2) {
-        state.moreid = 1
-        state.searchParam.certStatus = null
-        state.searchParam.salaryName = null
-        state.searchParam.payrollPlaceId = null
-        state.searchParam.status = null
-      }
-    }
-    //新增页面内部姓名
-    const infoteacherList = ref([
-      //   { value: 0, systemName: "讲师体系" },
+    const isConSelect = ref([
+      { value: "1", label: "是" },
+      { value: "0", label: "否" },
     ]);
-    const getinfoteacher = () => {
-      // state.tableLoading=true 
-      // ()
-      //   .then((res) => {
-      //     infoteacherList.value = res.data.data.records
-      // }) 
+    const placeData = () => {
+      lecturer.parentList().then((res) => {
+        if (res.data.code == 200) {
+          PlaceOfPayListTwo.value = res.data.data.map((item) => {
+            return {
+              value: item.affiliationCode,
+              label: item.affiliationName,
+            };
+          });
+        }
+      });
+    };
+    // placeData()
+    const PlaceOfPayListTwo = ref([]);
+    const selectRadio = (val) => {
+      if (val.target.value == 1) {
+        state.formParam.leveOneArray = [];
+        state.formParam.leveTwoArray = [];
+        state.formParam.leveThreeArray = [];
+        state.formParam.leveOneValue = null;
+        state.formParam.leveTwoValue = null;
+        state.formParam.leveThreeValue = null;
+      }
+      state.formParam.code = null;
     };
     const columns = ref([
-
+      // {
+      //   title: '培训发生组织编号 ',
+      //   dataIndex: 'affiliationCode',
+      //   key: 'affiliationCode',
+      //   ellipsis: true,
+      //   align: "center",
+      //   width: '100px',
+      // },
       {
-        title: '培训发生组织 ',
-        dataIndex: 'trainOrgName',
-        key: 'trainOrgName',
-        ellipsis: true, align: "center",
-        width: 200,
-        customCell: () => { return { style: { userSelect: 'text' } } }
+        title: "培训发生组织名称 ",
+        dataIndex: "affiliationName",
+        key: "affiliationName",
+        ellipsis: true,
+        align: "left",
+        width: "200px",
+        customCell: () => {
+          return { style: { userSelect: "text" } };
+        },
       },
       {
-        title: '汇总时间 ',
-        dataIndex: 'summaryTime',
-        key: 'summaryTime',
+        title: "状态",
+        dataIndex: "status",
+        key: "status",
         ellipsis: true,
         align: "center",
-        width: 200
-      },
-      {
-        title: '汇总金额 ',
-        dataIndex: 'summaryTotal',
-        key: 'summaryTotal',
-        ellipsis: true,
-        align: "center",
-        width: 200,
+        width: "100px",
         customRender: ({ text }) => {
-          return text ? text + '元' : '-'
-        }
-      },
-      {
-        title: '提交时间',
-        dataIndex: 'approvalSubmitTime',
-        key: 'approvalSubmitTime',
-        ellipsis: true, align: "center",
-        width: 200,
-        customRender: ({ text, record }) => {
-          return text ? text : '-'
-        }
-      },
-      {
-        title: '状态 ',
-        dataIndex: 'status',
-        key: 'status',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-        // customCell: (record) => {return{style:{color:['#67C23A','#F56C6C'][record.status]}}},
-        customRender: (value) => {
-          switch (value.record.status) {
-            case 0:
-              return "待确认 "
-            case 1:
-              return "待提交"
-            case 2:
-              return "审核中"
-            case 3:
-              return "审核通过"
-            case 4:
-              return "审核拒绝"
-            case 5:
-              return "待提交"
+          switch (text) {
+            case "1":
+              return <span>待提交</span>;
+            case "2":
+              return <span>审核中</span>;
+            case "3":
+              return <span>已完成</span>;
+            case "4":
+              return <span>审核失败</span>;
+            case "5":
+              return <span>待审核</span>;
             default:
-              return "-"
+              return <span>-</span>;
           }
-        }
+        },
       },
       {
-        title: '操作 ',
-        dataIndex: 'operation',
-        key: 'operation',
-        ellipsis: true, align: "center",
+        title: "是否为根节点",
+        dataIndex: "parentName",
+        key: "parentName",
+        align: "left",
+        width: "200px",
+        customRender: ({ text, record }) => {
+          return text ? (
+            <div>
+              <span style={{ marginRight: "10px" }}>否</span>({text})
+            </div>
+          ) : (
+            <div>
+              <span style={{ marginRight: "10px" }}>是</span>(
+              {{ 1: "一", 2: "二", 3: "三" }[record.code]}级审批)
+            </div>
+          );
+        },
+      },
+      {
+        title: "担当",
+        dataIndex: "leaderName",
+        key: "leaderName",
+        ellipsis: true,
+        align: "left",
+        width: "200px",
+        customCell: () => {
+          return { style: { userSelect: "text" } };
+        },
+      },
+
+      // {
+      //   title: '备注 ',
+      //   dataIndex: 'remark',
+      //   key: 'remark',
+      //   ellipsis: true, align: "center",
+      //   width: 160,
+      // },
+      {
+        title: "操作 ",
+        dataIndex: "operation",
+        key: "operation",
+        width: "120px",
+        align: "center",
         fixed: "right",
-        width: 120,
         scopedSlots: { customRender: "action" },
       },
-
-    ])
+    ]);
+    const orgColumns = ref([
+      {
+        title: "组织名称",
+        dataIndex: "orgName",
+        key: "orgName",
+        ellipsis: true,
+        width: "20%",
+        align: "center",
+      },
+      {
+        title: "是否被培训发生组织选择",
+        dataIndex: "isSelect",
+        key: "isSelect",
+        ellipsis: true,
+        align: "center",
+        width: "30%",
+        customRender: (text) => {
+          return (
+            <div>
+              {text.record.isSelect == 1
+                ? `是 (${text.record.affiliationName})`
+                : "否 (-)"}
+            </div>
+          );
+        },
+      },
+      {
+        title: "担当",
+        dataIndex: "leaders",
+        key: "leaders",
+        ellipsis: true,
+        align: "center",
+        width: "60%",
+        customRender: (text) => {
+          return <div>{text.record.leaders || "-"}</div>;
+        },
+      },
+    ]);
     //列表数据
-    const tableData = ref([
-    ])
+    const tableData = ref([]);
+    //  List接口数据
+    const getTableDate = (obj) => {
+      state.tableLoading = true;
+      let objA = { ...state.searchParam };
+      queryTrainOrg(objA).then((res) => {
+        tableData.value = res.data.data.records;
+        state.tableDataTotal = Number(res.data.data.total);
+        state.tableLoading = false;
+      });
+    };
+    getTableDate();
     // 搜索
     const searchSubmit = () => {
       state.searchParam.pageNo = 1;
       getTableDate();
-      // sessionStorage.removeItem('searchApprlval')
+    };
+    const searchList = (val) => {
+      getTableDate();
     };
     //重置
     const searchReset = () => {
-      state.searchdate = null,
-        state.searchParam = {
-          endTime: null,
-          beginTime: null,
-          teacherNo: null,
-          id: null,
-          levelId: null,
-          courseType: null,
-          certStatus: null,
-          salaryName: null,
-          payrollPlaceId: null,
-          status: null,
-          pageNo: 1,
-          pageSize: 10,
-        };
+      state.searchParam = {
+        name: null,
+        isParent: null,
+        leaderName: null,
+        pageNo: 1,
+        pageSize: 10,
+      };
       getTableDate();
-      // sessionStorage.removeItem('searchApprlval')
     };
-    //              //修改时间
-    //              function searchTimeChange(time, timeStr) {
-    //       let startTime = timeStr[0]
-    //       let endTime = timeStr[1] ;
-    //       state.startTime = new Date(startTime).getTime();
-    //       state.endTime = new Date(endTime).getTime();
-    //       // state.searchParam.beginTime = new Date(beginTime).getTime() ;
-    //       // state.searchParam.endTime = new Date(endTime).getTime() ;
-    //       state.searchParam.beginTime = state.startTime ? state.startTime : null,
-    //         state.searchParam.endTime = state.endTime ? state.endTime : null
-    // }
-    //  List接口数据
-    const getTableDate = (obj) => {
-      console.log("执行 getTableDate")
-      state.tableLoading = true
-      let objA = { ...state.searchParam };
-      objA.beginTime = state.searchdate ? dayjs(state.searchdate[0]).format("YYYY-MM-DD") : "",
-        objA.endTime = state.searchdate ? dayjs(state.searchdate[1]).format("YYYY-MM-DD") : "",
-        delete objA.searchdate
-      expenseBillList(objA)
-        .then((res) => {
-          tableData.value = res.data.data.records
-          state.tableDataTotal = Number(res.data.data.total);
-          state.tableLoading = false
-        }).catch(err => {
-          state.tableLoading = false
-          message.destroy()
-          message.error(err.data.msg)
-        })
-    };
-    // getTableDate()
     //   // 翻页
     const changePagination = (page, pageSize) => {
       state.searchParam.pageNo = page;
@@ -591,577 +758,448 @@ export default {
       state.searchParam.pageSize = pageSize;
       getTableDate();
     };
-    // 新增讲师
-    const addTeacher = () => {
-      state.teachingdialog = true;
-      state.teacherdialogtitle = '添加讲师费'
-
-    }
-    //修改状态窗口
-    const handleOperate = (record) => {
-      state.editTeacher = true
-      state.formParamstatues.id = record.id
+    const updateModal = (record) => {
+      dialog({
+        content: "是否确认撤回 ?",
+        ok: () => {
+          lecturer
+            .affiliatIsConfirm(record.id)
+            .then((res) => {
+              message.success("撤回成功");
+              getTableDate();
+            })
+            .catch((err) => {
+              message.destroy();
+              message.error(err.data.msg);
+            });
+        },
+      });
     };
-    //提交
-    const closehandleOperate = () => {
-      approveTeacherFee(state.formParamstatues).then((res) => {
-        message.success("审批成功");
-        state.editTeacher = false
-        getTableDate();
-      })
-    }
-    //取消按钮 清空输入的数据
-    const cancelTeachingDialog = (val) => {
-      if (state.teachingdialog = true) {
-        if (val == 1) {
-          submit(state.formParam)
-          return
+    //删除弹窗
+    const deleteModal = (record) => {
+      let contents = "";
+      (record.status == 1 || record.status == 4) &&
+        record.parentName &&
+        (contents = "是否确认进行删除?");
+      (record.status == 1 || record.status == 4) &&
+        !record.parentName &&
+        (contents = "是否确认进行删除?删除后关联的子节点将一并删除");
+      record.status == 2 && (contents = "该培训发生组织正在审核中，无法删除");
+      dialog({
+        content: contents || "是否确认进行删除?",
+        isCloseBtn: record.status == 2 ? false : true,
+        ok: () => {
+          lecturer
+            .affiliationDelById(record.id)
+            .then((res) => {
+              if (typeof res.data.data != "object") {
+                message.error(res.data.data);
+                return;
+              }
+              message.success("删除成功");
+              searchSubmit();
+            })
+            .catch((err) => {
+              message.destroy();
+              message.error(err.data.msg);
+            });
+        },
+      });
+    };
+    const isEnablePost = (record, status) => {
+      dialog({
+        content: `是否确认${!status ? "启用" : "停用"}该培训发生组织?`,
+        ok: () => {
+          lecturer
+            .isEnable({ id: record.id, status })
+            .then((res) => {
+              if (typeof res.data.data != "object") {
+                message.error(res.data.data);
+                return;
+              }
+              message.success(`${!status ? "启用" : "停用"}成功`);
+              searchSubmit();
+            })
+            .catch((err) => {
+              message.destroy();
+              message.error(err.data.msg);
+            });
+        },
+      });
+    };
+    //确认删除
+    const closeDeleteTeacher = () => {
+      //调用删除接口
+      deleteTrainOrg({ kid: state.delId }).then((res) => {
+        if (res.data.code == 200) {
+          // message.success("删除成功");
+          state.deleteInTeacherdialog = false;
+          searchSubmit();
         }
-        state.teachingdialog = false
-        cancel()
-      }
-      state.deleteInTeacherdialog = false
-      state.editTeacher = false
+      });
+    };
+    //取消按钮 清空输入的数据
+    const cancelTeacherDialog = () => {
+      if ((state.teacherdialog = true)) {
+        formRef.value.resetFields();
+        state.teacherdialog = false;
+      }
+      cancel();
+      state.deleteInTeacherdialog = false;
+      state.editTeacher = false;
+    };
+    watch(
+      () => state.teacherdialog,
+      (val) => {
+        if (val) {
+          placeData();
+        } else {
+          state.editParams = true;
+          state.editIndex = 0;
+        }
+      }
+    );
+    const addTeacher = () => {
+      (state.teacherdialog = true), (state.formParam.locking = 0);
+      state.teacherdialogtitle = "新增培训发生组织";
+      state.vf = true;
+      lecturer
+        .getAffiliationCode()
+        .then((res) => {
+          state.formParam.affiliationCode = res.data.data;
+        })
+        .catch(() => {
+          message.error("获取培训发生组织编号失败");
+        });
+    };
+    const downOpen = () => {
+      window.open(
+        `/manageApi/admin/export/exportTeacherAffiliation?name=${
+          state.searchParam.name || ""
+        }&isParent=${state.searchParam.isParent || ""}&leaderName=${
+          state.searchParam.leaderName || ""
+        }`
+      );
+    };
+    const addContentData = () => {
+      state.showContent = true;
+    };
+    watch(
+      () => state.formParam,
+      (val) => {
+        if (!state.editParams) {
+          state.editIndex++;
+        }
+      },
+      { deep: true }
+    );
+    //修改信息弹窗
+    const handleModify = (record) => {
+      lecturer.getAffiliationById(record.id).then((res) => {
+        res.data.data.status == 3 && (state.editParams = false);
+        state.formParam = res.data.data;
+        const actArray = res.data.data.affiliationUserList
+          .filter((item) => item.type == 0)
+          .reduce((accumulator, current) => {
+            if (!accumulator.some((item) => item.userId === current.userId)) {
+              accumulator.push(current);
+            }
+            return accumulator;
+          }, []);
+        const leveOneArray = res.data.data.affiliationUserList
+          .filter((item) => item.type == 1)
+          .reduce((accumulator, current) => {
+            if (!accumulator.some((item) => item.userId === current.userId)) {
+              accumulator.push(current);
+            }
+            return accumulator;
+          }, []);
+        const leveTwoArray = res.data.data.affiliationUserList
+          .filter((item) => item.type == 2)
+          .reduce((accumulator, current) => {
+            if (!accumulator.some((item) => item.userId === current.userId)) {
+              accumulator.push(current);
+            }
+            return accumulator;
+          }, []);
+        const leveThreeArray = res.data.data.affiliationUserList
+          .filter((item) => item.type == 3)
+          .reduce((accumulator, current) => {
+            if (!accumulator.some((item) => item.userId === current.userId)) {
+              accumulator.push(current);
+            }
+            return accumulator;
+          }, []);
+        state.formParam.actArray = actArray.map((item) => {
+          return {
+            label: item.userName + item.userNo,
+            value: item.userId,
+            realName: item.userName,
+            ...item,
+            id: item.userId,
+          };
+        });
+        state.formParam.actValue = state.formParam.actArray
+          .map((item) => item.label)
+          .join(",");
+        state.formParam.leveOneArray = leveOneArray.map((item) => {
+          return {
+            label: item.userName + item.userNo,
+            value: item.userId,
+            realName: item.userName,
+            ...item,
+          };
+        });
+        state.formParam.leveOneValue = state.formParam.leveOneArray
+          .map((item) => item.label)
+          .join(",");
+        state.formParam.leveTwoArray = leveTwoArray.map((item) => {
+          return {
+            label: item.userName + item.userNo,
+            value: item.userId,
+            realName: item.userName,
+            ...item,
+          };
+        });
+        state.formParam.leveTwoValue =
+          state.formParam.leveTwoArray.map((item) => item.label).join(",") ||
+          null;
+        state.formParam.leveThreeArray = leveThreeArray.map((item) => {
+          return {
+            label: item.userName + item.userNo,
+            value: item.userId,
+            realName: item.userName,
+            ...item,
+          };
+        });
+        state.formParam.leveThreeValue =
+          state.formParam.leveThreeArray.map((item) => item.label).join(",") ||
+          null;
+        state.formParam.orglistName = state.formParam.affiliationOrgList
+          ?.map((item) => item.id)
+          .join(",");
+        state.formParam.selectOrgList?.map((item) => {
+          state.formParam.affiliationOrgList.some((item2) => {
+            if (item.orgId == item2.orgId) {
+              item2 = Object.assign(item2, item);
+              return true;
+            }
+          });
+        });
+        state.formParam.affiliationOrgLists =
+          state.formParam.affiliationOrgList;
+        state.formParam.isContains = String(state.formParam.isContains);
+        state.teacherdialog = true;
+        state.teacherdialogtitle = "编辑培训发生组织";
+        state.vf = false;
+      });
+      // TeacherSystem(record)
+    };
+    const TeacherSystem = (record) => {
+      state.formParam.affiliationCode = record.affiliationCode;
+      state.formParam.affiliationName = record.affiliationName;
+      state.formParam.remark = record.remark;
     };
-    //清空数据
     const cancel = () => {
       state.formParam = {
-        teacher: null,
-        teacherNo: null,
-        departId: null,
-        id: null,
-        courseName: 0,
-        levelId: null,
-        payrollPlaceId: null,
-        // 费用类型 : null
-        teacherpayrollPlace: null,
-        teachingDate: null,
-        defaultTeachingTime: 0,
-        courseType: null,
-        studys: null,
-        teacherlevelPay: null,
-        score: null,
-        trainOrg: null,
-        payableExpense: null,
-        expense: null,
+        orglistName: null,
+        affiliationCode: null,
+        affiliationName: null,
+        isParent: 1,
         remark: null,
-      }
-    }
-    const goDdit = (record) => {
-      state.editTeacherDialog = true
-      state.editId = record.id
-      // state.searchParam.searchdate = state.searchdate
-      // sessionStorage.setItem('searchApprlval', JSON.stringify(state.searchParam))
-      // router.push({
-      //   path:'/LecturerAppEdit',
-      //   query:{
-      //     id: record.id
-      //   }
-      // })
-    }
-    //表格内查看数据操作
-    const handleLook = (record) => {
-      state.activeKey = '1'
-      state.teachingdialog = true;
-      state.id = record.id
-      TeacherSystem()
-      gettableDataExamine()
-    }
-    const params = reactive({
-      pageNo: 1,
-      pageSize: 10,
-      total: 0,
-      businessType: 1,
-      businessId: '366'
-    })
-    const paginations = computed(() => ({
-      total: params.total,
-      showSizeChanger: true,
-      showQuickJumper: true,
-      current: params.pageNo,
-      pageSize: params.pageSize,
-      onChange: paginationChanges,
-    }));
-    const paginationChanges = (e, pageSize) => {
-      params.pageNo = e;
-      params.pageSize = pageSize
-      // getListData()
+        actValue: null,
+        actArray: [],
+        leveOneValue: null,
+        leveTwoValue: null,
+        leveThreeValue: null,
+        leveOneArray: [],
+        leveTwoArray: [],
+        leveThreeArray: [],
+        code: null,
+        isContains: "0",
+        affiliationOrgList: [],
+        affiliationOrgLists: [],
+        locking: 1,
+      };
     };
-    const tabsChange = (val) => {
-      if (val == 2) {
-        getListData()
+    async function validateField(name) {
+      return new Promise((resolve) => {
+        formRef.value
+          .validateFields([name])
+          .then(() => {
+            resolve(false);
+          })
+          .catch(() => {
+            resolve(true);
+          });
+      });
+    }
+    const valueChange = (val, type) => {
+      if (type == 0) {
+        state.formParam.actValue =
+          val?.map((item) => item.label).join(",") || null;
+      } else if (type == 1) {
+        state.formParam.leveOneValue =
+          val?.map((item) => item.label).join(",") || null;
+      } else if (type == 2) {
+        state.formParam.leveTwoValue =
+          val?.map((item) => item.label).join(",") || null;
+      } else if (type == 3) {
+        state.formParam.leveThreeValue =
+          val?.map((item) => item.label).join(",") || null;
       }
-    }
-    const getListData = () => {
-      state.tableDataExamineLoading = true
-      getApprovalResultByBusinessIdList({
-        businessType: 1,
-        businessId: state.id
-      }).then(res => {
-        if (res.data.code == 200) {
-          state.tableDataExamineTwo = res.data.data
-          // params.total = res.data.data.total
-        }
-        state.tableDataExamineLoading = false
-      }).catch(err => {
-        message.destroy()
-        state.tableDataExamineLoading = false
-        message.error(err.data.msg)
-      })
-    }
-    const submit = (record) => {
-      dialog({
-        content: '请仔细核对讲师费信息，确认无误后，将自动进入(BPM系统)审批流程',
-        ok: () => {
-          isConfirm({
-            id: record.id,
-            status: 2
-          }).then(res => {
-            if (res.data.code == 200) {
-              message.success('提交成功')
-              getTableDate();
-              cancel()
-              state.teachingdialog = false
-            }
-          }).catch(err => {
-            message.destroy()
-            cancel()
-            state.teachingdialog = false
-            message.error(err.data.msg)
-          })
-        }
-      })
-    }
-    const successParams = () => {
-      getTableDate();
-    }
-    const getExample = (val) => {
-      state.example = val
-    }
-    const withdraw = (record) => {
-      dialog({
-        content: '确定要撤回此条数据吗？',
-        ok: () => {
-          isConfirm({
-            id: record.id,
-            status: 1
-          }).then(res => {
-            if (res.data.code == 200) {
-              message.success('撤回成功')
-              getTableDate();
-
-            }
-          }).catch(err => {
-            message.destroy()
-            message.error(err.data.msg)
-          })
-        }
-      })
-    }
-
-    //详情
-    const TeacherSystem = () => {
-      queryById({ id: state.id }).then((res) => {
-        // state.formParam=Object.assign({} ,res.data.data)
-        state.formParam = res.data.data
-      })
-        .catch((err) => {
-          console.log("详情", err);
-        });
-    }
-    const searchTeacherFeeApprovalList = () => {
-      state.tableDataParams.pageNo = 1
-      gettableDataExamine()
-    }
-    const resetSearch = () => {
-      state.userNoOrName = null
-      state.seeDateValue = []
-      state.seeBegin = null
-      state.seeEnd = null
-      searchTeacherFeeApprovalList()
-    }
-    const seeDateChange = (e) => {
-      if (e) {
-        state.seeBegin = e[0]
-        state.seeEnd = e[1]
+    };
+    //保存
+    const createTeacherDialog = async (val) => {
+      state.formParam.affiliationName = state.formParam.affiliationName?.trim();
+      state.formParam.affiliationUserList = [
+        ...state.formParam?.actArray,
+        ...state.formParam?.leveOneArray,
+        ...state.formParam?.leveTwoArray,
+        ...state.formParam?.leveThreeArray,
+      ];
+      state.formParam.orglistName = state.formParam.affiliationOrgList
+        ?.map((item) => item.id)
+        .join(",");
+      let formItemNames = Object.keys(rules);
+      if (state.formParam.isParent == 0) {
+        formItemNames = formItemNames.filter((item) => item != "leveOneValue");
       } else {
-        state.seeBegin = null
-        state.seeEnd = null
+        formItemNames = formItemNames.filter((item) => item != "isContains");
       }
-    }
-    const tableDataExamine = ref([])
-    const gettableDataExamine = () => {
-      state.examinetableLoading = true
-      queryExpnseByBillId({
-        billId: state.id,
-        pageNo: state.tableDataParams.pageNo,
-        pageSize: state.tableDataParams.pageSize,
-        name: state.userNoOrName,
-        startTime: state.seeBegin,
-        endTime: state.seeEnd
-      }).then((res) => {
-        tableDataExamine.value = res.data.data.records
-        state.tableDataParams.total = Number(res.data.data.total);
-        state.examinetableLoading = false
-      }).catch(err => {
-        state.examinetableLoading = false
-        message.error(err.data.msg)
-      })
-    };
-    const pagination = computed(() => ({
-      total: state.tableDataParams.total,
-      showSizeChanger: true,
-      showQuickJumper: true,
-      current: state.tableDataParams.pageNo,
-      pageSize: state.tableDataParams.pageSize,
-      onChange: paginationChange,
-    }));
-    const paginationChange = (e, pageSize) => {
-      state.tableDataParams.pageNo = e;
-      state.tableDataParams.pageSize = pageSize
-      gettableDataExamine();
-    };
-
-    //TODO1
-    const deleteModal = (record) => {
-      dialog({
-        content: '是否确认进行删除?',
-        ok: () => {
-          expenseBillDelById(record.id).then(res => {
-            if (typeof (res.data.data) != 'object') {
-              message.success('删除成功')
-              message.error(res.data.data)
-              return
-            }
-            message.success("删除成功");
-            searchSubmit()
-          }).catch(err => {
-            message.destroy()
-            message.error(err.data.msg)
-          })
-        }
-      })
-
-    }
-
-
-
-    const columnsExamineTwo = ref([
-      {
-        title: '审批层级 ',
-        dataIndex: 'levelName',
-        key: 'levelName',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-      },
-      {
-        title: '层级审批人 ',
-        dataIndex: 'employeeNames',
-        key: 'employeeNames',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-      },
-      {
-        title: '操作 ',
-        dataIndex: 'approvalStatus',
-        key: 'approvalStatus',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-        customRender: ({ text }) => {
-          switch (text) {
-            case -1:
-              return <span>未处理</span>;
-            case 3:
-              return <span>通过</span>;
-            case 4:
-              return <span>拒绝</span>;
-            default:
-              return <span>-</span>;
+      for (let i = 0; i < formItemNames.length; i++) {
+        // const result = await validateField(formItemNames[i]);
+        const result = state.formParam[formItemNames[i]];
+        if (!result) {
+          if (formItemNames[i] == "code" && !state.formParam.isParent) {
+            return message.error(rules[formItemNames[i]][0].log2);
+          } else {
+            return message.error(rules[formItemNames[i]][0].log);
           }
         }
-      },
-      {
-        title: '审批人 ',
-        dataIndex: 'employeeName',
-        key: 'employeeName',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-      },
-      {
-        title: '审批时间 ',
-        dataIndex: 'approvalTime',
-        key: 'approvalTime',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-      },
-      {
-        title: '审批建议 ',
-        dataIndex: 'approvalMsg',
-        key: 'approvalMsg',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-        customRender: ({ text }) => {
-          return text || '-'
-        }
-      },
-    ])
-    //二级页面
-    const columnsExamine = ref([
-      {
-        title: '讲师姓名 ',
-        dataIndex: 'name',
-        key: 'name',
-        ellipsis: true,
-        align: "center",
-        width: 180,
-        customRender: (value) => {
-          return (
-            <div style="user-select:text">
-              { value.record?.name }  /  { value.record?.userNo }
-            </div>
-          );
+      }
+      if (
+        !state.formParam.leveTwoValue &&
+        state.formParam.leveThreeValue &&
+        state.formParam.isParent
+      ) {
+        return message.error("请选择二级审批人");
+      }
+      state.formParam.remark = state.formParam?.remark?.trim();
+      state.formParam.submitStatus = val;
+      dialog({
+        content: val
+          ? "是否确认提交，一旦提交将进入（BPM系统）审核流程。"
+          : "是否确认保存？",
+        ok: () => {
+          state.example = true;
+          if (state.vf == false) {
+            updateTrainOrg(state.formParam)
+              .then((res) => {
+                if (res.data.code == 200) {
+                  message.success("修改成功");
+                  cancel();
+                  getTableDate();
+                } else {
+                  message.error(res.data.msg);
+                }
+                state.teacherdialog = false;
+                state.example = false;
+              })
+              .catch((err) => {
+                message.destroy();
+                message.error(err.data.msg);
+                state.teacherdialog = false;
+                state.example = false;
+                cancel();
+              });
+          } else {
+            addReviewer(state.formParam)
+              .then((res) => {
+                message.success("保存成功");
+                state.teacherdialog = false;
+                cancel();
+                searchSubmit();
+                state.example = false;
+              })
+              .catch((err) => {
+                message.destroy();
+                message.error(err.data.msg);
+                state.teacherdialog = false;
+                cancel();
+                state.example = false;
+              });
+          }
         },
-      },
-      // {
-      //   title: '讲师工号 ',
-      //   dataIndex: 'userNo',
-      //   key: 'userNo',
-      //   ellipsis: true,
-      //   align: "center",
-      //   width: 120,
-      // },
-      {
-        title: '课程名称 ',
-        dataIndex: 'courseName',
-        key: 'courseName',
-        ellipsis: true,
-        align: "center",
-        width: 200,
-        customCell: () => { return { style: { userSelect: 'text' } } }
-      },
-      {
-        title: '培训发生组织',
-        dataIndex: 'trainOrgName',
-        key: 'trainOrgName',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-        customCell: () => { return { style: { userSelect: 'text' } } }
-      },
-
-      {
-        title: '授课时长 ',
-        dataIndex: 'teachingTime',
-        key: 'teachingTime',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-        customRender: (value) => {
-          return (
-            <div>
-              { (value.record?.teachingTime / 60).toFixed(2) }小时
-            </div>
-          )
-        }
-      },
-      {
-        title: '授课时间 ',
-        dataIndex: 'teachingDate',
-        key: 'teachingDate',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-
-      },
-      {
-        title: '讲师体系',
-        dataIndex: 'tsystemName',
-        key: 'tsystemName',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-      },
-      {
-        title: '讲师级别 ',
-        dataIndex: 'tlevelName',
-        key: 'tlevelName',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-      },
-      {
-        title: '发薪地 ',
-        dataIndex: 'payrollPlace',
-        key: 'payrollPlace',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-        customRender: ({ text }) => {
-          return text || '-'
-        }
-      },
-      {
-        title: '基准课酬 ',
-        dataIndex: 'levelPay',
-        key: 'levelPay',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-        customRender: ({ text }) => {
-          return text || text == 0 ? text + '元' : '-';
-        }
-      },
-      {
-        title: '计划费用 ',
-        dataIndex: 'expense',
-        key: 'expense',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-        customRender: ({ text }) => {
-          return text ? text + '元' : '-';
-        }
-      },
-      {
-        title: '参训人数 ',
-        dataIndex: 'studys',
-        key: 'studys',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-        customRender: ({ text }) => {
-          return text ? text + '人' : '-';
-        }
-      },
-      {
-        title: '评分 ',
-        dataIndex: 'score',
-        key: 'score',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-        customRender: (value) => {
-          return (
-            <div>
-              { value.record.score ? Number(value.record.score).toFixed(0) == 0 ? '-' : Number(value.record.score).toFixed(2) + '分' : '-' }
-            </div>
-          )
-        }
-      },
-      {
-        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>
-          )
-        }
-      },
-    ])
-    function managerChange(e, l, d, t, orgName) {
-      state.searchParam.teacherNo = d;
-      state.searchParam.teacherName = t;
-      // state.searchParam.trainorgName=orgName
-    }
-    //导出功能
-    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 : ""}`
-      );
-      // this.download('lesson_records/export', {
-      //           ...state.searchParam
-      //       }, `project_${new Date().getTime()}.xlsx` )
-    }
+      });
+    };
+    const rules = {
+      affiliationCode: [
+        { required: true, message: "", log: "请选择培训发生组织编号" },
+      ],
+      affiliationName: [
+        { required: true, message: "", log: "请选择培训发生组织名称" },
+      ],
+      code: [
+        {
+          required: true,
+          message: "",
+          log: "请选择根节点",
+          log2: "请选择审批层级",
+        },
+      ],
+      actValue: [{ required: true, message: "", log: "请选择组织担当" }],
+      leveOneValue: [{ required: true, message: "", log: "请选择一级审批人" }],
+      isContains: [
+        { required: true, message: "", log: "请选择审批流程是否加担当" },
+      ],
+      orglistName: [{ required: true, message: "", log: "请选择管理组织" }],
+    };
+    const TrainOrglist = ref([
+      { label: "全部", value: "" },
+      { label: "根节点", value: "0" },
+      { label: "子节点", value: "1" },
+    ]);
     //回车
-    const enterPressHadlerSearch = e => {
+    const enterPressHadlerSearch = (e) => {
       if (e.keyCode === 13) {
-        searchSubmit()
-
+        searchSubmit();
       }
-    }
-
-    //TODO1
-    watchEffect(() => {
-      console.log('Item changed:', props.activeKeyProps);
-      if(props.activeKeyProps == 2){
-        state.searchParam.pageNo = 1;
-        getTableDate()
-      }
-      // 在这里你可以根据 props.item 进行一些操作
-    });
-
-
+    };
     return {
       ...toRefs(state),
       enterPressHadlerSearch,
-      // searchTimeChange,
-      gettableDataExamine,
-      courseTypeList,
-      managerChange,
-      trainOrglist,
-      trainOrglista,
-      handlemoreid,
-      handleExport,
-      lecturerSystemList,
-      OnTheJobStatusList,
-      AuthenticationStatusList,
-      AccountStatusList,
-      searchSubmit,
-      searchReset,
+      TrainOrglist,
+      rules,
+      formRef,
       columns,
-      columnsExamine,
-      columnsExamineTwo,
+      orgColumns,
       tableData,
-      tableDataExamine,
-      seeDateChange,
-      changePagination,
+      getTableDate,
+      searchSubmit,
+      selectRadio,
+      PlaceOfPayList,
+      isConSelect,
+      PlaceOfPayListTwo,
+      placeData,
+      searchReset,
+      searchList,
+      deleteModal,
+      isEnablePost,
+      updateModal,
+      cancelTeacherDialog,
       addTeacher,
-      cancelTeachingDialog,
-      handleLook,
-      submit,
-      getListData,
-      tabsChange,
-      withdraw,
-      successParams,
-      getExample,
-      goDdit,
-      cancel,
-      handleOperate,
-      closehandleOperate,
-      getTableDate, //list接口数据调用
-      // getStu
-      LecturerSystemLista,
+      downOpen,
+      addContentData,
+      handleModify,
+      closeDeleteTeacher,
+      changePagination,
       TeacherSystem,
-      infoteacherList,
-      getinfoteacher,
-      pagination,
-      paginationChange,
-      searchTeacherFeeApprovalList,
-      resetSearch,
-      paginations,
-      paginationChanges,
-      deleteModal
-    }
+      createTeacherDialog,
+      valueChange,
+      validateField,
+      checkMenu,
+    };
   },
 };
 </script>
@@ -1178,11 +1216,6 @@ export default {
   justify-content: center;
   align-items: center;
 }
-
-.select .ant-picker {
-  width: 410px !important;
-}
-
 .headers {
   height: 73px;
   border-bottom: 1px solid #e8e8e8;
@@ -1191,7 +1224,6 @@ export default {
   align-items: center;
   // background-color: red;
   margin-bottom: 20px;
-  flex-shrink: 0;
 
   .headerTitle {
     font-size: 18px;
@@ -1201,28 +1233,35 @@ export default {
     // margin-left: 24px;
   }
 }
-
-.addTimeBox {
-  position: relative;
-  display: flex;
-  align-items: center;
-
-  .addTime {
-    position: absolute;
-    z-index: 1;
-    margin-left: 10px;
-    color: rgba(0, 0, 0, 0.4);
+.tableBox {
+  padding-bottom: 20px;
+  margin: 20px 38px 30px;
+  ::v-deep .ant-select-dropdown {
+    display: inline-block;
   }
-
-  .ant-picker {
-    padding-left: 85px;
+  ::v-deep .ant-select-selection-item {
+    margin-left: 3px;
   }
-
-  ::v-deep .ant-picker-range .ant-picker-active-bar {
-    margin-left: 85px !important;
+  ::v-deep .ant-pagination-options-size-changer.ant-select {
+    width: 84px;
+  }
+  .pa {
+    width: 100%;
+    display: flex;
+    justify-content: right;
   }
 }
-
+.add_content {
+  width: 40px;
+  height: 40px;
+  cursor: pointer;
+  border-radius: 50%;
+  background-color: #4ea6ff;
+  text-align: center;
+  line-height: 40px;
+  color: #ffffff;
+  font-size: 26px;
+}
 //导出按钮icon
 .daochu {
   width: 16px;
@@ -1280,15 +1319,16 @@ export default {
   width: 300px !important;
 }
 
-.ant-table-tbody>tr>td {
+.ant-table-tbody > tr > td {
   text-align: center;
 }
 
-.InsideTeaching {
+.InsideLecturer {
   width: 100%;
   height: 100%;
-
-
+  display: flex;
+  flex-direction: column;
+  position: relative;
   .filter {
     margin-left: 38px;
     margin-right: 38px;
@@ -1296,10 +1336,9 @@ export default {
     display: flex;
     justify-content: space-between;
     flex-wrap: wrap;
-
     .select {
       margin-right: 20px;
-      margin-bottom: 10px;
+      margin-bottom: 20px;
     }
   }
 }
@@ -1319,8 +1358,10 @@ export default {
     position: absolute;
     width: calc(100%);
     height: 40px;
-    background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-        rgba(78, 166, 255, 0) 100%);
+    background: linear-gradient(
+      rgba(78, 166, 255, 0.2) 0%,
+      rgba(78, 166, 255, 0) 100%
+    );
   }
 
   .del_main {
@@ -1426,8 +1467,10 @@ export default {
       width: 100%;
       height: 68px;
 
-      background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-          rgba(78, 166, 255, 0) 100%);
+      background: linear-gradient(
+        rgba(78, 166, 255, 0.2) 0%,
+        rgba(78, 166, 255, 0) 100%
+      );
       display: flex;
       align-items: center;
 
@@ -1462,18 +1505,6 @@ export default {
   }
 }
 
-//添加样式
-.langbtn {
-  height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 14px;
-  flex-shrink: 0;
-  cursor: pointer;
-}
-
 // 重置样式
 .resetbtn {
   width: 100px;
@@ -1485,93 +1516,132 @@ export default {
   margin-right: 14px;
   flex-shrink: 0;
   cursor: pointer;
+  .search {
+    width: 15px;
+    height: 16px;
+    margin-right: 5px;
+    background: url("../../assets/images/courseManage/add0.png") no-repeat;
+    background-size: 100% 100%;
+  }
+}
+.btnn {
+  padding: 0px 26px 0px 26px;
+  height: 40px;
+  background: #1890ff;
+  border-radius: 8px;
+  border: 1px solid #1890ff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 14px;
+  flex-shrink: 0;
+  cursor: pointer;
+
+  .btnText {
+    font-size: 14px;
+    font-weight: 400;
+    color: #fff;
+    line-height: 36px;
+    margin-left: 5px;
+  }
+  .daochu {
+    width: 16px;
+    height: 18px;
+    background-image: url("../../assets/images/coursewareManage/export1.png");
+  }
 }
 
 //展开收起样式
 .moreidbtn {
   border: none;
   color: #4ea6ff;
-  width: 80px
+  width: 80px;
 }
 
 //小竖线
 .line {
   float: left;
   width: 3px;
-  height: 17px;
+  height: 25px;
   background: #4ea6ff;
   border-radius: 30%;
   margin-right: 5px;
-  margin-top: 3px;
 }
-
 //抽屉功能
-.drawaer // /* 改变所有 a-tree-select 输入框的高度 */
-//   ::v-deep  .ant-select:not(.ant-select-customize-input) .ant-select-selector{
-//   height: 40px;
-//   line-height: 40px;
-//   border-radius: 8px
-
-//   /* 确保文字垂直居中 */
-// }
-::v-deep .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
-  height: 40px !important;
+.drawaer
+/* 改变所有 a-tree-select 输入框的高度 */
+.ant-tree-select .ant-select-selection {
+  height: 40px;
   line-height: 40px;
-  border-radius: 8px
+  /* 确保文字垂直居中 */
 }
-
-// 抽屉内样式
 .draitem {
   width: 100%;
   height: 40px !important;
   border-radius: 8px;
   line-height: 40px;
 }
-
 .drabtn {
   height: 40px;
   width: 80px;
   border-radius: 8px;
-  margin-right: 20px
+  margin-right: 20px;
 }
-
 ::v-deep .ant-select:not(.ant-select-customize-input) .ant-select-selector {
   border-radius: 8px;
   height: 40px;
+  line-height: 40px;
+  text-align: left;
 }
-
 .ant-col-12 {
   height: 90px;
 }
-
-::v-deep .ant-select-selection-overflow-item {
-  margin-top: -2px;
-}
-
-::v-deep .ant-select-multiple .ant-select-selection-item {
-  height: 34px
-}
-
-.tableBox {
-  padding-bottom: 20px;
-  margin: 20px 38px 30px;
-
-  ::v-deep .ant-select-dropdown {
-    display: inline-block;
+.item_inp {
+  flex: 1;
+  text-align: center;
+  .i_upload_img {
+    width: 100px;
+    height: 100px;
+    border-radius: 8px;
   }
 
-  ::v-deep .ant-select-selection-item {
-    margin-left: 3px;
+  .i_upload {
+    width: 100px;
+    height: 100px;
+    border: 1px solid #4ea6ff;
+    border-radius: 50%;
+    text-align: center;
+    align-items: center;
+    cursor: pointer;
+
+    .addimg {
+      position: relative;
+
+      .heng {
+        position: absolute;
+        top: 50px;
+        left: 25px;
+        width: 50px;
+        border: 1px solid #4ea6ff;
+      }
+
+      .shu {
+        position: absolute;
+        top: 25px;
+        left: 50px;
+        height: 50px;
+        border: 1px solid #4ea6ff;
+      }
+    }
   }
 
-  ::v-deep .ant-pagination-options-size-changer.ant-select {
-    width: 84px;
-  }
-
-  .pa {
-    width: 100%;
-    display: flex;
-    justify-content: right;
+  .ant-upload.ant-upload-select-picture-card {
+    border: 0px !important;
+    border-radius: 50% !important;
   }
 }
-</style>
\ No newline at end of file
+.ant-upload.ant-upload-select-picture-card {
+  border: 0px !important;
+  border-radius: 50% !important;
+}
+</style>
diff --git a/src/views/lecturer/OrganizationList.vue b/src/views/lecturer/OrganizationList.vue
index 5bb3ec10..017c1947 100644
--- a/src/views/lecturer/OrganizationList.vue
+++ b/src/views/lecturer/OrganizationList.vue
@@ -66,6 +66,7 @@
         <div class="btnText">导出</div>
       </div>
     </div>
+    <!-- 数据处理 -->
     <a-table
       style="border: 1px solid #f2f6fe"
       :columns="columns"

From db7621691c91a52c259c7847ece6a4f82959963b Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 21:35:53 +0800
Subject: [PATCH 101/157] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/OrganizationApproval.vue | 25 ++++++++++++++++++++-
 src/views/lecturer/OrganizationList.vue     | 10 ++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue
index 017c1947..1dbd1db9 100644
--- a/src/views/lecturer/OrganizationApproval.vue
+++ b/src/views/lecturer/OrganizationApproval.vue
@@ -13,6 +13,22 @@
           />
         </div>
       </a-form-item>
+      <a-form-item class="select">
+        <div>
+          <!-- TODO GX03 -->
+          <a-select
+            style="width: 235px"
+            v-model:value="searchParam.isParent"
+            placeholder="请选择状态"
+            allowClear
+            v-on:keydown.enter="enterPressHadlerSearch"
+          >
+            <a-select-option :value="1">自由学习模式</a-select-option>
+            <a-select-option :value="2">闯关模式</a-select-option>
+            <a-select-option :value="3">闯关模式</a-select-option>
+            </a-select>
+        </div>
+      </a-form-item>
       <a-form-item class="select">
         <div>
           <a-select
@@ -531,6 +547,8 @@ export default {
         name: null,
         isParent: null,
         leaderName: null,
+        status: null,
+        approvalType: null,
         pageNo: "1",
         pageSize: "10",
       },
@@ -724,7 +742,12 @@ export default {
     //  List接口数据
     const getTableDate = (obj) => {
       state.tableLoading = true;
-      let objA = { ...state.searchParam };
+      let objA = { 
+        ...state.searchParam ,
+        //TODO GX03 
+        //审批未通过意外的数据
+        approvalType:1
+      };
       queryTrainOrg(objA).then((res) => {
         tableData.value = res.data.data.records;
         state.tableDataTotal = Number(res.data.data.total);
diff --git a/src/views/lecturer/OrganizationList.vue b/src/views/lecturer/OrganizationList.vue
index 017c1947..3d14a1df 100644
--- a/src/views/lecturer/OrganizationList.vue
+++ b/src/views/lecturer/OrganizationList.vue
@@ -531,6 +531,8 @@ export default {
         name: null,
         isParent: null,
         leaderName: null,
+        status: null,
+        approvalType: null,
         pageNo: "1",
         pageSize: "10",
       },
@@ -724,13 +726,19 @@ export default {
     //  List接口数据
     const getTableDate = (obj) => {
       state.tableLoading = true;
-      let objA = { ...state.searchParam };
+      let objA = { 
+        ...state.searchParam ,
+        //TODO GX03 加审核结束标记
+        //审核通过数据
+        approvalType:0
+       };
       queryTrainOrg(objA).then((res) => {
         tableData.value = res.data.data.records;
         state.tableDataTotal = Number(res.data.data.total);
         state.tableLoading = false;
       });
     };
+    //初始化数据
     getTableDate();
     // 搜索
     const searchSubmit = () => {

From 4d3a7343ca058b2c9d58f49df4e520746f978bcf Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 21:47:32 +0800
Subject: [PATCH 102/157] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/OrganizationApproval.vue | 23 ++++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue
index 1dbd1db9..bbb6188d 100644
--- a/src/views/lecturer/OrganizationApproval.vue
+++ b/src/views/lecturer/OrganizationApproval.vue
@@ -18,14 +18,17 @@
           <!-- TODO GX03 -->
           <a-select
             style="width: 235px"
-            v-model:value="searchParam.isParent"
+            v-model:value="searchParam.status"
             placeholder="请选择状态"
             allowClear
             v-on:keydown.enter="enterPressHadlerSearch"
           >
-            <a-select-option :value="1">自由学习模式</a-select-option>
-            <a-select-option :value="2">闯关模式</a-select-option>
-            <a-select-option :value="3">闯关模式</a-select-option>
+            <!-- 0正常数据 1待审核 2审核中 3审核通过 4拒绝 5撤回 -->
+            <a-select-option :value="0">正常数据</a-select-option>
+            <a-select-option :value="1">待审核</a-select-option>
+            <a-select-option :value="2">审核中</a-select-option>
+            <a-select-option :value="4">拒绝</a-select-option>
+            <a-select-option :value="5">撤回</a-select-option>
             </a-select>
         </div>
       </a-form-item>
@@ -61,8 +64,8 @@
       </div>
     </a-form>
     <div style="width: 100%"></div>
-    <div style="display: flex; margin-bottom: 20px">
-      <a-button
+    <!-- <div style="display: flex; margin-bottom: 20px"> -->
+      <!-- <a-button
         v-if="checkMenu('lecturerTrainOrgAdd')"
         @click="addTeacher()"
         type="primary"
@@ -71,8 +74,8 @@
       >
         <div class="search"></div>
         新增培训发生组织
-      </a-button>
-      <div
+      </a-button> -->
+      <!-- <div
         class="btnn btn2"
         @click="downOpen"
         style="margin-right: 14px"
@@ -80,8 +83,8 @@
       >
         <div class="daochu"></div>
         <div class="btnText">导出</div>
-      </div>
-    </div>
+      </div> -->
+    <!-- </div> -->
     <!-- 数据处理 -->
     <a-table
       style="border: 1px solid #f2f6fe"

From 1e6393f91ae17751dec233643170fcc45a1db4af Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Tue, 18 Feb 2025 22:03:22 +0800
Subject: [PATCH 103/157] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/Organization.vue     | 8 +++++++-
 src/views/lecturer/OrganizationList.vue | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index 805ab452..583411f8 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -2,7 +2,7 @@
 <template>
   <a-tabs v-model:activeKey="activeKey">
     <a-tab-pane key="1" tab="培训发僧组织列表"> 
-      <OrganizationList/>
+      <OrganizationList :activeKeyFn="activeKeyFn"/>
     </a-tab-pane>
     <!-- v-if="lecturerAdmin('lecturer-admin')" -->
     <a-tab-pane key="2" tab="审批中心"> 
@@ -38,8 +38,14 @@ export default {
       }
     })
 
+    
+    const activeKeyFn = () => {
+      state.activeKey = '2'
+    }
+
     return {
       ...toRefs(state),
+      activeKeyFn
     };
   },
 };
diff --git a/src/views/lecturer/OrganizationList.vue b/src/views/lecturer/OrganizationList.vue
index 3d14a1df..c130bb1f 100644
--- a/src/views/lecturer/OrganizationList.vue
+++ b/src/views/lecturer/OrganizationList.vue
@@ -512,7 +512,10 @@ export default {
     lockLecturer,
     AddApprover,
   },
-  setup() {
+  props: {
+    activeKeyFn: Function
+  },
+  setup(props) {
     const formRef = ref();
 
     const state = reactive({
@@ -1108,6 +1111,8 @@ export default {
                   message.success("修改成功");
                   cancel();
                   getTableDate();
+                  //TODO GX04 
+                  props.activeKeyFn();
                 } else {
                   message.error(res.data.msg);
                 }
@@ -1129,6 +1134,7 @@ export default {
                 cancel();
                 searchSubmit();
                 state.example = false;
+                props.activeKeyFn();
               })
               .catch((err) => {
                 message.destroy();

From b2da0a994cded2c0b389df145b2adfd192f91cd1 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Wed, 19 Feb 2025 09:38:54 +0800
Subject: [PATCH 104/157] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E5=8F=91=E7=94=9F?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/Organization.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index 583411f8..16242552 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -1,7 +1,7 @@
 <!-- 归属组织 -->
 <template>
   <a-tabs v-model:activeKey="activeKey">
-    <a-tab-pane key="1" tab="培训发僧组织列表"> 
+    <a-tab-pane key="1" tab="培训发生组织列表"> 
       <OrganizationList :activeKeyFn="activeKeyFn"/>
     </a-tab-pane>
     <!-- v-if="lecturerAdmin('lecturer-admin')" -->

From 8fcd79542152abcb672a9cda6d47cb42c7c777b8 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Wed, 19 Feb 2025 17:23:58 +0800
Subject: [PATCH 105/157] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/Organization.vue     | 294 +++++++++++++++++++++++-
 src/views/lecturer/OrganizationList.vue |   2 +-
 2 files changed, 286 insertions(+), 10 deletions(-)

diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index 16242552..153c2936 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -1,14 +1,19 @@
 <!-- 归属组织 -->
 <template>
-  <a-tabs v-model:activeKey="activeKey">
-    <a-tab-pane key="1" tab="培训发生组织列表"> 
-      <OrganizationList :activeKeyFn="activeKeyFn"/>
-    </a-tab-pane>
-    <!-- v-if="lecturerAdmin('lecturer-admin')" -->
-    <a-tab-pane key="2" tab="审批中心"> 
-      <OrganizationApproval/>
-    </a-tab-pane>
-  </a-tabs>
+  <div class="OrganizationManager">
+    <div style="margin: 20px;margin-top:0;">
+      <a-tabs v-model:activeKey="activeKey">
+        <a-tab-pane key="1" tab="培训发生组织列表"> 
+          <OrganizationList :activeKeyFn="activeKeyFn"/>
+        </a-tab-pane>
+        <!-- v-if="lecturerAdmin('lecturer-admin')" -->
+        <a-tab-pane key="2" tab="审批中心"> 
+          <OrganizationApproval/>
+        </a-tab-pane>
+      </a-tabs>
+    </div>
+  </div>
+
 
 
 </template>
@@ -51,5 +56,276 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.OrganizationManager {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
 
+  .filter {
+    margin-left: 38px;
+    margin-right: 38px;
+    margin-top: 30px;
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+
+    .filterItems {
+      display: flex;
+      flex-wrap: wrap;
+
+      .select {
+        margin-right: 20px;
+        margin-bottom: 20px;
+      }
+
+      .addTimeBox {
+        position: relative;
+        display: flex;
+        align-items: center;
+
+        .addTime {
+          position: absolute;
+          z-index: 10;
+          margin-left: 10px;
+          color: rgba(0, 0, 0, 0.4);
+        }
+
+        .ant-picker {
+          padding-left: 85px;
+        }
+
+        .ant-picker-range .ant-picker-active-bar {
+          margin-left: 85px;
+        }
+      }
+
+      .btn {
+        padding: 0px 26px 0px 26px;
+        height: 38px;
+        background: #4ea6ff;
+        border-radius: 8px;
+        border: 1px solid rgba(64, 158, 255, 1);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 14px;
+        flex-shrink: 0;
+        cursor: pointer;
+
+        .search {
+          background-size: 100%;
+        }
+
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          color: #fff;
+          line-height: 36px;
+          margin-left: 5px;
+        }
+      }
+
+      .btnn {
+        padding: 0px 26px 0px 26px;
+        height: 38px;
+        background: #4ea6ff;
+        border-radius: 8px;
+        border: 1px solid rgba(64, 158, 255, 1);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 14px;
+        flex-shrink: 0;
+        cursor: pointer;
+
+        .search {
+          background-size: 100%;
+        }
+
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          color: #ffffff;
+          line-height: 36px;
+          margin-left: 5px;
+        }
+      }
+
+      .btn1 {
+        .search {
+          width: 15px;
+          height: 17px;
+          background-image: url("../../assets/images/courseManage/search0.png");
+        }
+      }
+
+      .btn2 {
+        .search {
+          width: 16px;
+          height: 18px;
+          background-image: url("../../assets/images/courseManage/reset0.png");
+        }
+      }
+
+      .btn1:active {
+        background: #0982ff;
+      }
+
+      // .btn2:hover {
+      //   background: rgba(64, 158, 255, 0.1);
+      // }
+
+      .btn2:active {
+        background: #0982ff;
+      }
+    }
+
+    .btns {
+      display: flex;
+
+      // flex-wrap: wrap;
+      .btn {
+        padding: 0px 26px 0px 26px;
+        height: 38px;
+        background: #4ea6ff;
+        border-radius: 8px;
+        border: 1px solid rgba(64, 158, 255, 1);
+        display: flex;
+        align-items: center;
+        cursor: pointer;
+        justify-content: center;
+        margin-right: 14px;
+        flex-shrink: 0;
+
+        .search {
+          background-size: 100%;
+        }
+
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          color: #ffffff;
+          line-height: 36px;
+          margin-left: 5px;
+        }
+      }
+
+      .btn3 {
+        margin-right: 0px;
+
+        .search {
+          width: 17px;
+          height: 18px;
+          background-image: url("../../assets/images/courseManage/add0.png");
+        }
+      }
+
+      // .btn3:hover {
+      //   background: rgba(64, 158, 255, 0.76);
+      // }
+
+      .btn3:active {
+        background: #0982ff;
+      }
+    }
+  }
+
+  .tableBox {
+    margin: 20px 38px 30px;
+
+    .ant-table-thead>tr>th {
+      background-color: #eff4fc;
+    }
+
+    th {
+      background-color: #eff4fc !important;
+      text-align: center !important;
+    }
+  }
+
+  .tableBox {
+    padding-bottom: 20px;
+
+    .pa {
+      // position: absolute;
+      // bottom: 20px;
+      // left: 0;
+      width: 100%;
+      // height: 20px;
+      // background-color: red;
+      display: flex;
+      justify-content: center;
+      // margin-bottom: 10px;
+      // position: absolute;
+      // bottom: -40px;
+    }
+  }
+
+  .operation {
+    font-size: 14px;
+    font-weight: 400;
+    color: #4ea6ff;
+    margin-right: -45px;
+    display: flex;
+    justify-content: right;
+    margin-right: 18px;
+
+    // line-height: 36px;
+    .operation1 {
+      margin-left: 21px;
+      width: 28px;
+      display: inline-block;
+    }
+
+    .operation3 {
+      margin-left: 21px;
+      width: 70px;
+      display: inline-block;
+      text-align: center;
+    }
+
+    .more {
+      width: 50px;
+      display: inline-block;
+      margin-left: 21px;
+      position: relative;
+      text-align: left;
+
+      // z-index: 99999;
+      .moreArrow {
+        width: 13px;
+        height: 7px;
+        display: inline-block;
+        background-image: url("../../assets/images/navtop/down.png");
+        background-size: 100%;
+        margin: 2px;
+        margin-left: 7px;
+      }
+
+      .moreItems {
+        width: 80px;
+        padding: 5px;
+        display: none;
+        background: #ffffff;
+        box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05);
+        border-radius: 3px;
+        border: 0px solid #dcdcdc;
+        position: absolute;
+        left: 0px;
+        top: 28px;
+        z-index: 100;
+        text-align: center;
+      }
+    }
+
+    .more:hover .moreArrow {
+      background-image: url("../../assets/images/navtop/up.png");
+    }
+
+    .more:hover .moreItems {
+      display: block;
+    }
+  }
+}
 </style>
diff --git a/src/views/lecturer/OrganizationList.vue b/src/views/lecturer/OrganizationList.vue
index c130bb1f..6ce35e7a 100644
--- a/src/views/lecturer/OrganizationList.vue
+++ b/src/views/lecturer/OrganizationList.vue
@@ -1337,7 +1337,7 @@ export default {
   text-align: center;
 }
 
-.InsideLecturer {
+.InsideLecturerList {
   width: 100%;
   height: 100%;
   display: flex;

From 7b66b50da2208251441579975d317b29e8000b82 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 09:26:06 +0800
Subject: [PATCH 106/157] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/OrganizationApproval.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue
index bbb6188d..89ea8368 100644
--- a/src/views/lecturer/OrganizationApproval.vue
+++ b/src/views/lecturer/OrganizationApproval.vue
@@ -24,9 +24,9 @@
             v-on:keydown.enter="enterPressHadlerSearch"
           >
             <!-- 0正常数据 1待审核 2审核中 3审核通过 4拒绝 5撤回 -->
-            <a-select-option :value="0">正常数据</a-select-option>
             <a-select-option :value="1">待审核</a-select-option>
             <a-select-option :value="2">审核中</a-select-option>
+            <a-select-option :value="3">审核通过</a-select-option>
             <a-select-option :value="4">拒绝</a-select-option>
             <a-select-option :value="5">撤回</a-select-option>
             </a-select>
@@ -105,31 +105,31 @@
             >
               <div style="color: #1890ff; cursor: pointer">查看</div>
             </lockLecturer>
-            <a-button
+            <!-- <a-button
               v-if="record.status != 2 && checkMenu('lecturerTrainOrgEdit')"
               type="link"
               @click="() => handleModify(record, String(record.courseform))"
               >编辑</a-button
-            >
-            <a-button
+            > -->
+            <!-- <a-button
               v-if="record.status == 2 && false"
               type="link"
               @click="() => updateModal(record)"
               >撤回</a-button
-            >
+            > -->
             <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
-            <a-button
+            <!-- <a-button
               @click="isEnablePost(record, 0)"
               v-if="record.enable && checkMenu('lecturerTrainOrgStop')"
               type="link"
               >启用</a-button
-            >
-            <a-button
+            > -->
+            <!-- <a-button
               @click="isEnablePost(record, 1)"
               v-if="!record.enable && checkMenu('lecturerTrainOrgStop')"
               type="link"
               >停用</a-button
-            >
+            > -->
           </a-space>
         </template>
       </template>

From 28ea49904701ceddd667828b052d7d3e89890f70 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 10:12:17 +0800
Subject: [PATCH 107/157] =?UTF-8?q?=E5=AE=A1=E6=89=B9=20=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/OrganizationApproval.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue
index 89ea8368..bd80ee17 100644
--- a/src/views/lecturer/OrganizationApproval.vue
+++ b/src/views/lecturer/OrganizationApproval.vue
@@ -751,6 +751,12 @@ export default {
         //审批未通过意外的数据
         approvalType:1
       };
+
+      if(objA.status == 3){ //审核通过
+        objA.approvalType = 0
+      }
+
+
       queryTrainOrg(objA).then((res) => {
         tableData.value = res.data.data.records;
         state.tableDataTotal = Number(res.data.data.total);

From a3e8c7f3bb7ebdddaeed2d6e38756c93bdfe2562 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 10:18:01 +0800
Subject: [PATCH 108/157] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E8=BF=87=E7=A8=8B=20=EF=BC=8C=E6=92=A4=E9=94=80=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/lockLecturer.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/project/lockLecturer.vue b/src/components/project/lockLecturer.vue
index 068f5436..dc002032 100644
--- a/src/components/project/lockLecturer.vue
+++ b/src/components/project/lockLecturer.vue
@@ -78,11 +78,11 @@
           </a-tabs>
         </div>
       </div>
-      <div class="btnn" v-if="formData?.status==1||formData?.status==4">
+      <!-- <div class="btnn" v-if="formData?.status==1||formData?.status==4"> -->
         <!-- <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="closeDrawer">确定</button> -->
-        <button class="btn2" @click="confirm">撤销编辑内容</button>
-      </div>
+        <!-- <button class="btn2" @click="confirm">撤销编辑内容</button> -->
+      <!-- </div> -->
     </div>
     <a-modal :footer="null" width="800px" v-model:visible="visibleModal" title="审批记录详情">
       <div style="margin: 20px;padding-bottom: 20px;">

From 73e4bc429047f516a9173cbf4eb98c758027b049 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 10:28:22 +0800
Subject: [PATCH 109/157] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E8=BF=87=E7=A8=8B=20=EF=BC=8C=E5=88=A0=E9=99=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/OrganizationApproval.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue
index bd80ee17..f6ba3a14 100644
--- a/src/views/lecturer/OrganizationApproval.vue
+++ b/src/views/lecturer/OrganizationApproval.vue
@@ -111,12 +111,13 @@
               @click="() => handleModify(record, String(record.courseform))"
               >编辑</a-button
             > -->
-            <!-- <a-button
-              v-if="record.status == 2 && false"
+            <!-- TODO GX02 -->
+            <a-button
+              v-if="record.status == 1 || record.status == 4"
               type="link"
               @click="() => updateModal(record)"
-              >撤回</a-button
-            > -->
+              >删除</a-button
+            >
             <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
             <!-- <a-button
               @click="isEnablePost(record, 0)"
@@ -756,7 +757,6 @@ export default {
         objA.approvalType = 0
       }
 
-
       queryTrainOrg(objA).then((res) => {
         tableData.value = res.data.data.records;
         state.tableDataTotal = Number(res.data.data.total);
@@ -792,7 +792,7 @@ export default {
     };
     const updateModal = (record) => {
       dialog({
-        content: "是否确认撤回 ?",
+        content: "是否确认删除 ?",
         ok: () => {
           lecturer
             .affiliatIsConfirm(record.id)

From dd53e572e78db3c942e62e6ff2335c8231be2c32 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 13:23:30 +0800
Subject: [PATCH 110/157] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E8=BF=87=E7=A8=8B=20=EF=BC=8C=E5=88=A0=E9=99=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Lecturer.js                         | 7 +++++++
 src/views/lecturer/OrganizationApproval.vue | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js
index a2dc3415..cf92b45f 100644
--- a/src/api/Lecturer.js
+++ b/src/api/Lecturer.js
@@ -75,6 +75,13 @@ export const affiliationDelById = (id)=>http.post(`/admin/affiliation/delById?id
 export const isEnable = (obj) => http.post(`/admin/affiliation/isEnable`,obj)
 //撤回培训发生组织
 export const affiliatIsConfirm = (id) => http.post(`/admin/affiliation/isConfirm?id=${id}`)
+//删除 待提交 ，拒绝 的培训发生组织
+export const affiliatRemoveById = (id) => http.post(`/admin/affiliation/removeById?id=${id}`)
+
+
+
+
+
 //讲师费统计详情
 export const expenseSummaryById = (obj) => http.get( `/admin/expenseSummary/queryById?id=${obj.id}&name=${obj.name}&trainOrgId=${obj.trainOrgId||''}&pageNo=${obj.pageNo}&pageSize=${obj.pageSize}`)
 //撤回讲师费统计详情
diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue
index f6ba3a14..d58767b8 100644
--- a/src/views/lecturer/OrganizationApproval.vue
+++ b/src/views/lecturer/OrganizationApproval.vue
@@ -795,9 +795,9 @@ export default {
         content: "是否确认删除 ?",
         ok: () => {
           lecturer
-            .affiliatIsConfirm(record.id)
+            .affiliatRemoveById(record.id)
             .then((res) => {
-              message.success("撤回成功");
+              message.success("删除成功");
               getTableDate();
             })
             .catch((err) => {

From 7730ef8cff0354e0b2e21636552e27cddbaa4300 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 13:54:38 +0800
Subject: [PATCH 111/157] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E8=BF=87=E7=A8=8B=20=EF=BC=8C=E5=88=A0=E9=99=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideLecturer.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index aeaed22b..61d13853 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -122,9 +122,9 @@
     <!-- 弹窗组件 -->
     <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" placement="right" :closable="false"
       :maskClosable="false" width="700" :title="false">
-      <div style="padding-right: 200px;">
-        <div class="headers" style="margin-top:-24px;margin-left: -25px;width: 110%;">
-          <div class="headerTitle" style="margin-left: 14px;">{{ teacherdialogtitle }}</div>
+      <div style="padding: 24px;">
+        <div class="headers" style="margin-top:-24px;margin-left: -25px;width: 110%;margin-left: -24px;">
+          <div class="headerTitle">{{ teacherdialogtitle }}</div>
           <img style="width: 29px; height: 29px; cursor: pointer;margin-right: 24px;"
             src="@/assets/images/basicinfo/close.png" @click="cancelTeacherDialog" />
         </div>
@@ -1465,7 +1465,7 @@ export default {
     font-weight: 600;
     color: #333333;
     line-height: 25px;
-    // margin-left: 24px;
+    margin-left: 24px;
   }
 }
 

From 0093259b70df98cf246612ba9e1a84c5b745649e Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 14:53:30 +0800
Subject: [PATCH 112/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E6=8C=82=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index f00994b2..a315aba4 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -131,7 +131,6 @@
           <!--讲师名称  teacherName 内容分类 coursetypeid -->
           <a-row :gutter="16">
             <a-col :span="12">
-
               <a-form-item name="teacherName">
                 <template v-slot:label>
                   <img style="margin-right:4px;width: 7px;height: 7px"
@@ -141,9 +140,17 @@
                 <!-- TODO GX01 -->
                 <ProjectManagerOutTeacher v-model:value="formParam.name" v-model:name="formParam.teacherName"
                   placeholder="请输入工号/讲师姓名进行检索" @onChange="managerChange"></ProjectManagerOutTeacher>
-
-                <!-- <a-input v-model:value="formParam.teacherName" allowClear showSearch class="draitem"
-                  placeholder="请输入讲师姓名"></a-input> -->
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item name="supplier">
+                <template v-slot:label>
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  供应商
+                </template>
+                <a-input class="draitem" v-model:value="formParam.supplier" disabled :maxlength="20" showCount @blur="sendName" allowClear>
+                </a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">

From e28255f406712502af17740522abc8cd023c3e61 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 15:40:07 +0800
Subject: [PATCH 113/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E6=8C=82=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 26 +++++++++++--------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index a315aba4..26f45501 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -149,6 +149,7 @@
                     src="@/assets/images/coursewareManage/asterisk.png" alt="" />
                   供应商
                 </template>
+                <!-- TODO GX01 -->
                 <a-input class="draitem" v-model:value="formParam.supplier" disabled :maxlength="20" showCount @blur="sendName" allowClear>
                 </a-input>
               </a-form-item>
@@ -362,7 +363,7 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, computed, onMounted } from "vue";
+import { reactive, toRefs, ref, computed, onMounted ,watch} from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { useStore } from "vuex";
 import {
@@ -473,19 +474,14 @@ export default {
 
     //获取内容分类
     const sysTypeOptions = computed(() => store.state.content_type);
+    
     //TODO GX01
-    const FULL_NAME_SUPPLIER = computed(() => {
-        if(state.formParam.name){
-          let supplier =  state.formParam.supplier == null ? state.formParam.supplier:"";
-          if(supplier){
-            return state.formParam.name;
-          }else{
-            return state.formParam.name + "/" + supplier;
-          }
-          
-        }
-        return "";
-    });
+    watch(() => state.formParam.name ,
+      (newValue, oldValue) => {
+        console.log('教师姓名值 发生了变更', newValue, oldValue);
+      },
+      { immediate: true }
+  )
    
     const treetype = (val, lab) => {
       state.formParam.courseTypeName = lab.toString()
@@ -935,8 +931,8 @@ export default {
         state.formParam.teachingDate = state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : ""
         state.formParam.courseStatus = String(state.formParam.courseStatus)
       })
-        .catch((err) => {
-        });
+      .catch((err) => {
+      });
     }
     function managerChange(e, l, d, t, orgName) {
       // console.log(e, l, d, t, orgName,'e, l, d, t, orgName');

From 43d321403a61f8ac34b27ad518b75e2434270f6b Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 17:09:39 +0800
Subject: [PATCH 114/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/ProjectManagerOutTeacher.vue      | 158 +++++++++++-------
 src/views/lecturer/ExternalTeaching.vue       |  21 +--
 src/views/lecturer/InsideLecturer.vue         |   1 +
 3 files changed, 106 insertions(+), 74 deletions(-)

diff --git a/src/components/project/ProjectManagerOutTeacher.vue b/src/components/project/ProjectManagerOutTeacher.vue
index 04ebef97..1a16c7fd 100644
--- a/src/components/project/ProjectManagerOutTeacher.vue
+++ b/src/components/project/ProjectManagerOutTeacher.vue
@@ -1,10 +1,25 @@
 <template>
-  <a-select :getPopupContainer="(triggerNode) => {
-      return triggerNode.parentNode || document.body;
-    }
-    " v-model:value="managerArray" :placeholder="placeholder" :filterOption="false"
-    :options="isOpen ? options : selectOptions" allowClear showSearch :disabled="disabled" @popupScroll="memberScroll"
-    @search="searchMember" :open="isOpen" @change="change" @blur="blur" :show-arrow="false" style="width: 100%">
+  <a-select
+    :getPopupContainer="
+      (triggerNode) => {
+        return triggerNode.parentNode || document.body;
+      }
+    "
+    v-model:value="managerArray"
+    :placeholder="placeholder"
+    :filterOption="false"
+    :options="isOpen ? options : selectOptions"
+    allowClear
+    showSearch
+    :disabled="disabled"
+    @popupScroll="memberScroll"
+    @search="searchMember"
+    :open="isOpen"
+    @change="change"
+    @blur="blur"
+    :show-arrow="false"
+    style="width: 100%"
+  >
     <template v-if="loading" #notFoundContent>
       <a-spin size="small" />
     </template>
@@ -17,31 +32,38 @@ import { getTeacherList } from "@/api/Lecturer";
 const props = defineProps({
   value: {
     type: String,
-    default: ''
+    default: "",
   },
   name: {
     type: String,
-    default: ''
+    default: "",
+  },
+  supplier: {
+    type: String,
+    default: ""
   },
   mobile: {
     type: String,
-    default: ''
+    default: "",
   },
   disabled: Boolean,
   placeholder: {
     type: String,
     default: "请输入搜索关键字",
   },
-  mode: String
-})
+  mode: String,
+});
 
-const selectOptions = ref([])
+const selectOptions = ref([]);
 
-const managerArray = computed(() => props.value === '' ? null : props.value)
+const supplier = ref('')
 
-const emit = defineEmits({})
 
-const isOpen = ref(false)
+const managerArray = computed(() => (props.value === "" ? null : props.value));
+
+const emit = defineEmits({});
+
+const isOpen = ref(false);
 function debounce(func, wait) {
   let timeout;
   return function (...args) {
@@ -49,29 +71,36 @@ function debounce(func, wait) {
     timeout = setTimeout(() => func.apply(this, args), wait);
   };
 }
-const memberParam = ref({ name: '', pageNo: 1, pageSize: 999, teacherType: 2, status: 1 })
+const memberParam = ref({
+  name: "",
+  pageNo: 1,
+  pageSize: 999,
+  teacherType: 2,
+  status: 1,
+});
 
-const userList = ref([])
-const loading = ref(false)
+const userList = ref([]);
+const loading = ref(false);
 const getOutTeacher = () => {
-  getTeacherList(memberParam.value).then(res => {
+  getTeacherList(memberParam.value).then((res) => {
     if (res.data.code == 200) {
-      userList.value = res.data.data.records
-      loading.value = false
+      userList.value = res.data.data.records;
+      loading.value = false;
     }
-  })
-}
-const options = computed(() => 
-    userList.value.map(e => ({
-      // label: e.name + '(' + e.userNo + ')' + e.organizationName,
-      label: e.name + '/' + e.supplier,
-      value: e.name,
-      ...e,
-      audienceList: null
-    })
-))
+  });
+};
+const options = computed(() =>
+  userList.value.map((e) => ({
+    // label: e.name + '(' + e.userNo + ')' + e.organizationName,
+    label: e.name + "/" + e.supplier,
+    value: e.name,
+    supplier: e.supplier,
+    ...e,
+    audienceList: null,
+  }))
+);
 
-watch(props, init)
+watch(props, init);
 
 function init() {
   //第一次进来 编辑赋值
@@ -81,46 +110,47 @@ function init() {
 }
 
 onMounted(() => {
-  console.log('onMounted')
-  init()
-  getOutTeacher()
-})
+  console.log("onMounted");
+  init();
+  getOutTeacher();
+});
 
-
-const memberScroll = ({ target: { scrollHeight, scrollTop, clientHeight } }) => {
-  scrollHeight === (clientHeight + scrollTop) && memberParam.value.pageNo++
+const memberScroll = ({
+  target: { scrollHeight, scrollTop, clientHeight },
+}) => {
+  scrollHeight === clientHeight + scrollTop && memberParam.value.pageNo++;
 };
-const debounceObject = debounce(getOutTeacher, 1000)
+const debounceObject = debounce(getOutTeacher, 1000);
 //搜索学员
 const searchMember = (keyword) => {
-  console.log('searchMember', keyword)
-  loading.value = true
-  isOpen.value = true
-  userList.value = []
-  memberParam.value.pageNo = 1
-  memberParam.value.teacherType = 2
-  memberParam.value.name = keyword
-  console.log('searchMember', memberParam.value)
-  debounceObject()
+  console.log("searchMember", keyword);
+  loading.value = true;
+  isOpen.value = true;
+  userList.value = [];
+  memberParam.value.pageNo = 1;
+  memberParam.value.teacherType = 2;
+  memberParam.value.name = keyword;
+  console.log("searchMember", memberParam.value);
+  debounceObject();
 };
 
 function blur() {
-  isOpen.value = false
-  memberParam.value.name = ''
-  memberParam.value.pageNo = 1
-  memberParam.value.teacherType = 2
+  isOpen.value = false;
+  memberParam.value.name = "";
+  memberParam.value.pageNo = 1;
+  memberParam.value.teacherType = 2;
 }
 
 function change(e, l) {
-  memberParam.value.name = ''
-  memberParam.value.teacherType = 2
-  memberParam.value.pageNo = 1
-  isOpen.value = false
-  Array.isArray(l) && (selectOptions.value = l)
-  Array.isArray(selectOptions.value) && emit('onChange', e, l)
-  emit('update:name', l?.label)
-  emit('update:value', l?.value)
-  emit('update:mobile', l?.label)
+  memberParam.value.name = "";
+  memberParam.value.teacherType = 2;
+  memberParam.value.pageNo = 1;
+  isOpen.value = false;
+  Array.isArray(l) && (selectOptions.value = l);
+  Array.isArray(selectOptions.value) && emit("onChange", e, l);
+  emit("update:name", l?.label);
+  emit("update:value", l?.value);
+  emit("update:supplier", l?.supplier);
+  emit("update:mobile", l?.label);
 }
-
 </script>
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 26f45501..bdd80857 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -139,7 +139,8 @@
                 </template>
                 <!-- TODO GX01 -->
                 <ProjectManagerOutTeacher v-model:value="formParam.name" v-model:name="formParam.teacherName"
-                  placeholder="请输入工号/讲师姓名进行检索" @onChange="managerChange"></ProjectManagerOutTeacher>
+                  v-model:supplier="formParam.supplier"
+                placeholder="请输入工号/讲师姓名进行检索" @onChange="managerChange"></ProjectManagerOutTeacher>
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -474,15 +475,15 @@ export default {
 
     //获取内容分类
     const sysTypeOptions = computed(() => store.state.content_type);
-    
-    //TODO GX01
-    watch(() => state.formParam.name ,
-      (newValue, oldValue) => {
-        console.log('教师姓名值 发生了变更', newValue, oldValue);
-      },
-      { immediate: true }
-  )
-   
+
+    watch(() => state.formParam.name, (val) => {
+      console.log(val, 'name gx data')
+    })
+
+    watch(() => state.formParam.teacherName, (val) => {
+      console.log(val, 'teacherName gx data')
+    })
+
     const treetype = (val, lab) => {
       state.formParam.courseTypeName = lab.toString()
     }
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 61d13853..763088f1 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -172,6 +172,7 @@
                       src="@/assets/images/coursewareManage/asterisk.png" alt="" />
                     讲师姓名
                   </template>
+                  <!-- TODO GX01 -->
                   <SearchTeacher @tlevel="teacherTlevel" :lecturer="true" :disabled="!!id"
                     v-model:value="formParam.name" v-model:lable="formParam.orgNames" v-model:orgId="formParam.orgId"
                     v-model:id="formParam.id" v-model:system="tSystemNames" v-model:level="formParam.tlevelId">

From 4e9e45bc04581a88b3aa7db1367fd08d15b9de93 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 17:22:44 +0800
Subject: [PATCH 115/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index bdd80857..a9aedc62 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -428,6 +428,7 @@ export default {
       tableDataTotal: -1,//table列表总条数
       formParam: {
         name: null,
+        supplier: null,
         courseStatus: '1',
         createFrom: 1,
         teaching: null,
@@ -936,9 +937,11 @@ export default {
       });
     }
     function managerChange(e, l, d, t, orgName) {
+      console.log("managerChange e l",e,l)
       // console.log(e, l, d, t, orgName,'e, l, d, t, orgName');
-      state.formParam.mobile = e ? l.mobile : ''
-      state.formParam.teacherId = e ? l.id : ''
+      state.formParam.mobile = e ? l.mobile : '';
+      state.formParam.teacherId = e ? l.id : '';
+      state.formParam.supplier = e ? l.supplier : '';
       // state.searchParam.userNo = d;
       // state.searchParam.name = t;
       // state.searchParam.trainorgName=orgName

From ebf77871c9e8784d7ecd56685c1bce43d74bb2ba Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 17:29:49 +0800
Subject: [PATCH 116/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index a9aedc62..ef3fae04 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -139,7 +139,7 @@
                 </template>
                 <!-- TODO GX01 -->
                 <ProjectManagerOutTeacher v-model:value="formParam.name" v-model:name="formParam.teacherName"
-                  v-model:supplier="formParam.supplier"
+                
                 placeholder="请输入工号/讲师姓名进行检索" @onChange="managerChange"></ProjectManagerOutTeacher>
               </a-form-item>
             </a-col>
@@ -151,7 +151,7 @@
                   供应商
                 </template>
                 <!-- TODO GX01 -->
-                <a-input class="draitem" v-model:value="formParam.supplier" disabled :maxlength="20" showCount @blur="sendName" allowClear>
+                <a-input class="draitem" v-model:value="formParam.supplier" disabled :maxlength="20" showCount @blur="sendName">
                 </a-input>
               </a-form-item>
             </a-col>

From 6c5090503a254f6f4cec18bd70802805d5c94b18 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 17:34:44 +0800
Subject: [PATCH 117/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index ef3fae04..3cf7ef17 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -135,11 +135,10 @@
                 <template v-slot:label>
                   <img style="margin-right:4px;width: 7px;height: 7px"
                     src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  讲师名称
+                  讲师名称todo
                 </template>
                 <!-- TODO GX01 -->
                 <ProjectManagerOutTeacher v-model:value="formParam.name" v-model:name="formParam.teacherName"
-                
                 placeholder="请输入工号/讲师姓名进行检索" @onChange="managerChange"></ProjectManagerOutTeacher>
               </a-form-item>
             </a-col>
@@ -151,7 +150,7 @@
                   供应商
                 </template>
                 <!-- TODO GX01 -->
-                <a-input class="draitem" v-model:value="formParam.supplier" disabled :maxlength="20" showCount @blur="sendName">
+                <a-input class="draitem" v-model:value="formParam.name" disabled :maxlength="20" showCount @blur="sendName">
                 </a-input>
               </a-form-item>
             </a-col>

From f73b896d182d6a4e615627e00e05e88aa5d01886 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 17:55:58 +0800
Subject: [PATCH 118/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 3cf7ef17..4de1d741 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -135,10 +135,11 @@
                 <template v-slot:label>
                   <img style="margin-right:4px;width: 7px;height: 7px"
                     src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  讲师名称todo
+                  讲师名称
                 </template>
                 <!-- TODO GX01 -->
                 <ProjectManagerOutTeacher v-model:value="formParam.name" v-model:name="formParam.teacherName"
+                v-model:supplier="formParam.supplier"
                 placeholder="请输入工号/讲师姓名进行检索" @onChange="managerChange"></ProjectManagerOutTeacher>
               </a-form-item>
             </a-col>
@@ -147,10 +148,10 @@
                 <template v-slot:label>
                   <img style="margin-right:4px;width: 7px;height: 7px"
                     src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  供应商
+                  供应商1
                 </template>
                 <!-- TODO GX01 -->
-                <a-input class="draitem" v-model:value="formParam.name" disabled :maxlength="20" showCount @blur="sendName">
+                <a-input class="draitem" v-model:value="formParam.supplier" disabled :maxlength="20" showCount >
                 </a-input>
               </a-form-item>
             </a-col>

From 7d29b334cdc7b2017b9e27e749cf5bc970e8e0aa Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 20:14:31 +0800
Subject: [PATCH 119/157] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 4de1d741..f72ca4c5 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -155,6 +155,10 @@
                 </a-input>
               </a-form-item>
             </a-col>
+
+          </a-row>
+          <!-- 课程名称：name  开课状态 courseStatus-->
+          <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item name="courseTypeId">
                 <template v-slot:label>
@@ -173,9 +177,6 @@
                 </a-tree-select>
               </a-form-item>
             </a-col>
-          </a-row>
-          <!-- 课程名称：name  开课状态 courseStatus-->
-          <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item name="courseName">
                 <template v-slot:label>
@@ -196,6 +197,10 @@
                 </a-radio-group>
               </a-form-item>
             </a-col> -->
+
+          </a-row>
+          <!-- 授课日期 teachingDate  授课时长defaultTeachingTime-->
+          <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item name="teachingDate">
                 <template v-slot:label>
@@ -207,10 +212,6 @@
                   :show-time="{ format: 'HH:mm' }" placeholder="请选择课程日期" />
               </a-form-item>
             </a-col>
-          </a-row>
-          <!-- 授课日期 teachingDate  授课时长defaultTeachingTime-->
-          <a-row :gutter="16">
-
             <a-col :span="12">
               <a-form-item name="teaching">
                 <template v-slot:label>
@@ -226,6 +227,9 @@
                 <span style="margin-left: 5px ;" v-if="formParam.teaching == null">0.00小时</span> -->
               </a-form-item>
             </a-col>
+          </a-row>
+          <!-- 参训人数 studys评分  score-->
+          <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item name="studys">
                 <template v-slot:label>
@@ -238,10 +242,6 @@
                 </a-input>
               </a-form-item>
             </a-col>
-          </a-row>
-          <!-- 参训人数 studys评分  score-->
-          <a-row :gutter="16">
-
             <a-col :span="12">
               <a-form-item name="score">
                 <template v-slot:label>

From d209c29e3d0c1a934c699d0bba5f5a07d2911c8b Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 20:16:14 +0800
Subject: [PATCH 120/157] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index f72ca4c5..93920cd7 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -148,7 +148,7 @@
                 <template v-slot:label>
                   <img style="margin-right:4px;width: 7px;height: 7px"
                     src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  供应商1
+                  供应商
                 </template>
                 <!-- TODO GX01 -->
                 <a-input class="draitem" v-model:value="formParam.supplier" disabled :maxlength="20" showCount >

From c8385c8949099e086af6a606df8a7f0d9a757cc4 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 20:23:11 +0800
Subject: [PATCH 121/157] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 93920cd7..8594a8f5 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -155,7 +155,6 @@
                 </a-input>
               </a-form-item>
             </a-col>
-
           </a-row>
           <!-- 课程名称：name  开课状态 courseStatus-->
           <a-row :gutter="16">

From 08341efa127daa771c75b296b85f590dc0025831 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 20:28:18 +0800
Subject: [PATCH 122/157] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 8594a8f5..1f9d62f2 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -293,6 +293,7 @@
         </div>
         <a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="{ 'width': '160px' }">
           <a-descriptions-item label="讲师名称">{{ formParam.teacherName || '-' }}</a-descriptions-item>
+          <a-descriptions-item label="供应商">{{ formParam.supplier || '-' }}</a-descriptions-item>
           <a-descriptions-item label="手机号码">{{ formParam.mobile || '-' }}</a-descriptions-item>
           <a-descriptions-item label="课程类型">{{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' :
             formParam.type ==

From 62c3c7df7a526a6cc724e6a693434e917c054373 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 20:42:07 +0800
Subject: [PATCH 123/157] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E5=81=9C=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 502edeb5..20bb89a9 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -738,6 +738,7 @@ export default {
       { value: '2', label: "审核中" },
       { value: '4', label: "审核拒绝" },
       { value: '3', label: "审核通过" },
+      { value: '5', label: "已停用" },
     ])
 
     const lecturerSystemList = ref([

From fce24f07b13455a5363bafbd4c233e0471a15459 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 21:05:59 +0800
Subject: [PATCH 124/157] =?UTF-8?q?=E8=AF=BE=E9=85=AC=E5=9F=BA=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 20bb89a9..6d084690 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -376,7 +376,7 @@
                   评分
                 </template>
                 <a-input-number :disabled="formParam.createFrom == 0" class="draitem" v-model:value="formParam.score"
-                  :defaultValue="null" :max="100" :controls="false" :min="1" :precision="2" placeholder="请输入评分"
+                  :defaultValue="null" :max="100" :controls="false" :min="0" :precision="2" placeholder="请输入评分"
                   allowClear @change="scoreNumber">
                 </a-input-number>
               </a-form-item>

From 72d8c434b6a190619eb0e49e3aaa1fd2d240927b Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 21:17:29 +0800
Subject: [PATCH 125/157] =?UTF-8?q?=E8=AF=BE=E9=85=AC=E5=9F=BA=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 6d084690..d6c1adf5 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -376,7 +376,7 @@
                   评分
                 </template>
                 <a-input-number :disabled="formParam.createFrom == 0" class="draitem" v-model:value="formParam.score"
-                  :defaultValue="null" :max="100" :controls="false" :min="0" :precision="2" placeholder="请输入评分"
+                  :defaultValue="null" :max="100" :controls="false" :min="1" :precision="2" placeholder="请输入评分"
                   allowClear @change="scoreNumber">
                 </a-input-number>
               </a-form-item>
@@ -389,7 +389,7 @@
                   课酬基准
                 </template>
                 <a-input-number v-model:value="formParam.levelPay" placeholder="自动键入系统基准（可手动更改）" :max="99999999"
-                  :controls="false" :min="0" :precision="2" @change="clearlevelPayNumber" allowClear showSearch
+                  :controls="false" :min="0" :precision="0" @change="clearlevelPayNumber" allowClear showSearch
                   class="draitem">
                 </a-input-number>
               </a-form-item>

From 8e9b5a156cf9f045bb7713e13d9b624758723953 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 21:21:09 +0800
Subject: [PATCH 126/157] =?UTF-8?q?=E8=AF=BE=E9=85=AC=E5=9F=BA=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index d6c1adf5..aef4fd55 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -389,7 +389,7 @@
                   课酬基准
                 </template>
                 <a-input-number v-model:value="formParam.levelPay" placeholder="自动键入系统基准（可手动更改）" :max="99999999"
-                  :controls="false" :min="0" :precision="0" @change="clearlevelPayNumber" allowClear showSearch
+                  :controls="false" :min="0" :precision="2" @change="clearlevelPayNumber" allowClear showSearch
                   class="draitem">
                 </a-input-number>
               </a-form-item>
@@ -1549,7 +1549,7 @@ export default {
     const clearlevelPayNumber = () => {
       // state.formParam.levelPay = state.formParam.levelPay?.replace(/\D/g, '');
       // state.formParam.levelPay = state.formParam.levelPay?.slice(0,8);
-      state.formParam.levelPay == 0 && (state.formParam.levelPay = null);
+      // state.formParam.levelPay == 0;
       state.formParam.levelPay && state.formParam.teachingTime && (state.formParam.expense = (state.formParam.levelPay * (state.formParam.teachingTime / 60)).toFixed(2))
       state.formParam.levelPay && state.formParam.teachingTime && (state.formParam.payableExpense = (state.formParam.levelPay * (state.formParam.teachingTime / 60)).toFixed(2))
       state.formParam.levelPay && (state.formParam.levelPay = String(state.formParam.levelPay))

From 81d8040524528dc87385b5529df9cb245725f2b0 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Thu, 20 Feb 2025 21:30:29 +0800
Subject: [PATCH 127/157] =?UTF-8?q?=E8=AF=BE=E9=85=AC=E5=9F=BA=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/LecturerFee.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index aef4fd55..87966afe 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -1233,7 +1233,8 @@ export default {
       } else {
         state.formParam.score = null
       }
-      if (state.formParam.levelPay) {
+      console.log("state.formParam.levelPay",state.formParam.levelPay)
+      if (state.formParam.levelPay || state.formParam.levelPay == 0) {
         state.formParam.levelPay = String(state.formParam.levelPay)
       }
       if (state.formParam.payableExpense) {

From 23b94f5cb1fbf479da3b20ef1193b679daa4bafe Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 08:51:31 +0800
Subject: [PATCH 128/157] =?UTF-8?q?=E8=AF=BE=E9=85=AC=E5=9F=BA=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/lecturer/ImportWork.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/lecturer/ImportWork.vue b/src/components/lecturer/ImportWork.vue
index 3b3b1f4f..cc9876cc 100644
--- a/src/components/lecturer/ImportWork.vue
+++ b/src/components/lecturer/ImportWork.vue
@@ -31,7 +31,7 @@
                   <div class="text">上传：</div>
                   <div class="right">
                     <div style="height: 176px; margin-bottom: 20px">
-                      <a-upload-dragger v-model:fileList="fileList" :action="importHomeWork" name="uploadFile" 
+                      <a-upload-dragger v-model:fileList="fileList" name="uploadFile" 
                                         :headers="headers"
                         @change="handleChange" :showUploadList="false">
                         <p class="ant-upload-drag-icon">

From 9589e62593b8302cbb61a82ed1b8db5d42548d9d Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 09:17:39 +0800
Subject: [PATCH 129/157] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/lecturer/ImportWork.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/lecturer/ImportWork.vue b/src/components/lecturer/ImportWork.vue
index cc9876cc..3b3b1f4f 100644
--- a/src/components/lecturer/ImportWork.vue
+++ b/src/components/lecturer/ImportWork.vue
@@ -31,7 +31,7 @@
                   <div class="text">上传：</div>
                   <div class="right">
                     <div style="height: 176px; margin-bottom: 20px">
-                      <a-upload-dragger v-model:fileList="fileList" name="uploadFile" 
+                      <a-upload-dragger v-model:fileList="fileList" :action="importHomeWork" name="uploadFile" 
                                         :headers="headers"
                         @change="handleChange" :showUploadList="false">
                         <p class="ant-upload-drag-icon">

From d7196827e078dd13506ab9c3b6cc7284f31e760c Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 10:27:11 +0800
Subject: [PATCH 130/157] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/OrganizationApproval.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue
index d58767b8..bbb41dfa 100644
--- a/src/views/lecturer/OrganizationApproval.vue
+++ b/src/views/lecturer/OrganizationApproval.vue
@@ -24,6 +24,7 @@
             v-on:keydown.enter="enterPressHadlerSearch"
           >
             <!-- 0正常数据 1待审核 2审核中 3审核通过 4拒绝 5撤回 -->
+            <a-select-option :value="0">全部</a-select-option>
             <a-select-option :value="1">待审核</a-select-option>
             <a-select-option :value="2">审核中</a-select-option>
             <a-select-option :value="3">审核通过</a-select-option>
@@ -753,6 +754,10 @@ export default {
         approvalType:1
       };
 
+      if(objA.status == 0){
+        objA.approvalType = null; //全部数据
+      }
+
       if(objA.status == 3){ //审核通过
         objA.approvalType = 0
       }

From 30d6d5ffc13400bf4ebfeb4a79ac8aad541bae9c Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 11:01:54 +0800
Subject: [PATCH 131/157] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=85=A8=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/OrganizationApproval.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue
index bbb41dfa..3c46b15f 100644
--- a/src/views/lecturer/OrganizationApproval.vue
+++ b/src/views/lecturer/OrganizationApproval.vue
@@ -756,10 +756,12 @@ export default {
 
       if(objA.status == 0){
         objA.approvalType = null; //全部数据
+        objA.status = null;
       }
 
       if(objA.status == 3){ //审核通过
-        objA.approvalType = 0
+        objA.approvalType = 0;
+
       }
 
       queryTrainOrg(objA).then((res) => {

From 8c13cb99e50d37910a192bdf20b15ed19c808fc2 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 11:24:07 +0800
Subject: [PATCH 132/157] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E6=9C=88?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/MonthlyStatistics.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue
index 55dd25ff..8413e90b 100644
--- a/src/views/lecturer/MonthlyStatistics.vue
+++ b/src/views/lecturer/MonthlyStatistics.vue
@@ -64,10 +64,10 @@
           <a-button v-if="checkMenu('lecturerSummaryExport')" class="resetbtn" @click="handleFeeMonthly" type="primary">
             <UploadOutlined />导出
           </a-button>
-          <a-button v-if="checkMenu('lecturerMonthDown')" class="resetbtn" @click="handleFeeMonthlyDown" type="primary">
+          <a-button v-if="checkMenu('lecturerMonthDown')" class="resetbtn-mo" @click="handleFeeMonthlyDown" type="primary">
             <UploadOutlined />讲师月度费用下载
           </a-button>
-          <a-button v-if="checkMenu('lecturerMonthDetailDown')" class="resetbtn" @click="handleFeeMonthlyDetail" type="primary">
+          <a-button v-if="checkMenu('lecturerMonthDetailDown')" class="resetbtn-mo" @click="handleFeeMonthlyDetail" type="primary">
             <UploadOutlined />讲师费用详情下载
           </a-button>
         </div>
@@ -1140,6 +1140,18 @@ export default {
   cursor: pointer;
 }
 
+.resetbtn-mo {
+  width: 200px;
+  height: 40px;
+  border-radius: 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 14px;
+  flex-shrink: 0;
+  cursor: pointer;
+}
+
 //展开收起样式
 .moreidbtn {
   border: none;

From 2e90a8832fafc2c6aa9b33a86a03dd931c646669 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 11:35:53 +0800
Subject: [PATCH 133/157] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 1f9d62f2..60d3426e 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -297,7 +297,7 @@
           <a-descriptions-item label="手机号码">{{ formParam.mobile || '-' }}</a-descriptions-item>
           <a-descriptions-item label="课程类型">{{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' :
             formParam.type ==
-              2 ? '手动录入' : '-'
+              5 ? '手动录入' : '-'
             }}</a-descriptions-item>
           <a-descriptions-item label="课程名称">{{ formParam.courseName || '-' }}</a-descriptions-item>
           <a-descriptions-item label="开课状态">{{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1

From 6daf861bc873bc264089ca2b910ee0fbd79d8c4c Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 11:40:54 +0800
Subject: [PATCH 134/157] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 60d3426e..6bf91304 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -295,10 +295,9 @@
           <a-descriptions-item label="讲师名称">{{ formParam.teacherName || '-' }}</a-descriptions-item>
           <a-descriptions-item label="供应商">{{ formParam.supplier || '-' }}</a-descriptions-item>
           <a-descriptions-item label="手机号码">{{ formParam.mobile || '-' }}</a-descriptions-item>
-          <a-descriptions-item label="课程类型">{{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' :
-            formParam.type ==
-              5 ? '手动录入' : '-'
-            }}</a-descriptions-item>
+          <a-descriptions-item label="课程类型">
+            {{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 5 ? '手动录入' : '-'}}
+          </a-descriptions-item>
           <a-descriptions-item label="课程名称">{{ formParam.courseName || '-' }}</a-descriptions-item>
           <a-descriptions-item label="开课状态">{{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1
             ? '已开课' : '-' }}</a-descriptions-item>

From 1d53b59006d9bc0255007ba7b3b2e5f7d9000f0d Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 11:44:05 +0800
Subject: [PATCH 135/157] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 6bf91304..64e63faa 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -571,7 +571,7 @@ export default {
                 ? {
                   "0": "在线课",
                   "1": "面授课",
-                  "2": "手动录入",
+                  "5": "手动录入",
                 }[value.record.type + ""]
                 : "-" }
             </div>

From ef90925b891ef280d4bf12b716ea0d2c859d06fe Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 13:47:27 +0800
Subject: [PATCH 136/157] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/lecturer/ImportWork.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/lecturer/ImportWork.vue b/src/components/lecturer/ImportWork.vue
index 3b3b1f4f..d96b077f 100644
--- a/src/components/lecturer/ImportWork.vue
+++ b/src/components/lecturer/ImportWork.vue
@@ -295,7 +295,8 @@ import {getCookieForName} from "@/api/method";
         }
       };
       function downTemplate() {
-        window.open(`${process.env.VUE_APP_BOE_API_URL}/upload/template/${props.template}`);
+        // window.open(`${process.env.VUE_APP_BOE_API_URL}/upload/template/${props.template}`);
+        window.open(`${process.env.VUE_APP_BOE_API_URL}/admin/export/exportExpenseTemplate`);
       }
 
       return {

From 9ceaeb0eaf06d228888272b16c59c358028c0812 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 14:07:01 +0800
Subject: [PATCH 137/157] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index d07a8bc1..9f4d5fe7 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -431,8 +431,7 @@
           <a-descriptions-item label="讲师名称"><div style="user-select: text">{{ formParam.teacherName ||'-'}}/{{ formParam.userNo||'-' }}</div></a-descriptions-item>
           <a-descriptions-item label="课程名称"><div style="user-select: text">{{ formParam.courseName||'-' }}</div></a-descriptions-item>
           <a-descriptions-item label="课程类型">
-            {{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 5 ? '手动录入' : '-'
-          }}</a-descriptions-item>
+            {{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 5 ? '手动录入' : '-'}}</a-descriptions-item>
           <a-descriptions-item label="授课/课程日期"><div style="user-select: text">{{ formParam.teachingDate||'-' }}</div></a-descriptions-item>
           <a-descriptions-item label="开课状态">{{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1
             ? '已开课' : '-' }}</a-descriptions-item>

From 3c11652dabc13e793b622f4f7cd1f0b7e1c1229d Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 14:17:02 +0800
Subject: [PATCH 138/157] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 64e63faa..17ef566a 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -296,7 +296,7 @@
           <a-descriptions-item label="供应商">{{ formParam.supplier || '-' }}</a-descriptions-item>
           <a-descriptions-item label="手机号码">{{ formParam.mobile || '-' }}</a-descriptions-item>
           <a-descriptions-item label="课程类型">
-            {{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 5 ? '手动录入' : '-'}}
+            {{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 2 ? '培训课' : formParam.type == 5 ? '手动录入' : '-'}}
           </a-descriptions-item>
           <a-descriptions-item label="课程名称">{{ formParam.courseName || '-' }}</a-descriptions-item>
           <a-descriptions-item label="开课状态">{{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1
@@ -571,6 +571,7 @@ export default {
                 ? {
                   "0": "在线课",
                   "1": "面授课",
+                  "2": "培训课",
                   "5": "手动录入",
                 }[value.record.type + ""]
                 : "-" }

From d7738f023ad3a560ba5b138ccad6b27af61b9e90 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 15:35:30 +0800
Subject: [PATCH 139/157] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Teaching.js                    |   6 +
 src/components/lecturer/ImportWork.vue | 417 ++++++++++++++-----------
 2 files changed, 236 insertions(+), 187 deletions(-)

diff --git a/src/api/Teaching.js b/src/api/Teaching.js
index 497ef340..1fe4621c 100644
--- a/src/api/Teaching.js
+++ b/src/api/Teaching.js
@@ -23,8 +23,14 @@ export const importTeacherCourseRecord = (obj) => http.post('/importTeacherCours
 export const getAddress = (obj) => http.post('/admin/teacher/getAddress', obj)
 //讲师费发放情况
 export const getCharges = (obj) => http.post('/teacher/fee/getCharges', obj)
+
+//讲师费发放情况
+export const exportTeacherExpense = (obj) => http.get('/admin/export/exportTeacherExpense', {params: obj})
+
+
 //上传组件
 export const teacherUpload = (data) =>
   http.post("/admin/teacher/teacherUpload", data, {
     headers: { "Content-Type": "multipart/form-data",token:getCookieForName("token") },
   });
+
diff --git a/src/components/lecturer/ImportWork.vue b/src/components/lecturer/ImportWork.vue
index d96b077f..25f2e398 100644
--- a/src/components/lecturer/ImportWork.vue
+++ b/src/components/lecturer/ImportWork.vue
@@ -9,7 +9,7 @@
       :zIndex="9"
       @cancel="qr_exit"
     >
-    <div class="QR">
+      <div class="QR">
         <div class="qr_header"></div>
         <div class="qr_main">
           <div class="qrm_header">
@@ -22,7 +22,11 @@
               <div class="main">
                 <div class="minatitl">
                   <div class="up1">请下载</div>
-                  <div class="up2" @click="downTemplate" style="cursor: pointer">
+                  <div
+                    class="up2"
+                    @click="downTemplate"
+                    style="cursor: pointer"
+                  >
                     模板
                   </div>
                   <div class="up1">，按要求填写数据并导入</div>
@@ -31,18 +35,28 @@
                   <div class="text">上传：</div>
                   <div class="right">
                     <div style="height: 176px; margin-bottom: 20px">
-                      <a-upload-dragger v-model:fileList="fileList" :action="importHomeWork" name="uploadFile" 
-                                        :headers="headers"
-                        @change="handleChange" :showUploadList="false">
+                      <a-upload-dragger
+                        v-model:fileList="fileList"
+                        :action="importHomeWork"
+                        name="uploadFile"
+                        :headers="headers"
+                        @change="handleChange"
+                        :showUploadList="false"
+                      >
                         <p class="ant-upload-drag-icon">
                           <inbox-outlined></inbox-outlined>
                         </p>
-                        <p class="ant-upload-text">点击或将文件拖拽到此处上传</p>
+                        <p class="ant-upload-text">
+                          点击或将文件拖拽到此处上传
+                        </p>
                         <p class="ant-upload-hint">支持扩展名：.xls/.xlsx</p>
                       </a-upload-dragger>
                     </div>
                     <div class="loadstate">
-                      <div class="loadborder" v-if="uploadpercent < 100 && uploadpercent !== -1">
+                      <div
+                        class="loadborder"
+                        v-if="uploadpercent < 100 && uploadpercent !== -1"
+                      >
                         <div class="content">
                           <div class="img"></div>
                           <div class="timebox">
@@ -52,8 +66,7 @@
                             </div>
                             <a-progress :percent="uploadpercent" />
                           </div>
-                          <div class="curloading">
-                          </div>
+                          <div class="curloading"></div>
                         </div>
                       </div>
                       <div class="loadborder" v-if="uploadErr">
@@ -90,7 +103,11 @@
                             <a-progress :percent="uploadpercent" />
                           </div>
                           <div class="curloading">
-                            <div class="cancel" style="margin-left: 20px; cursor: pointer" @click="removeUpload">
+                            <div
+                              class="cancel"
+                              style="margin-left: 20px; cursor: pointer"
+                              @click="removeUpload"
+                            >
                               删除
                             </div>
                           </div>
@@ -101,23 +118,41 @@
                           </div>
                         </div>
                       </div>
-                      <div v-if="uploadpercent === 100" class="defeat" style="
-                            display: flex;
-                            align-items: center;
-                            width: 500px;
-                            height: 40px;" :style="{
-                              background: errNum
-                                ? 'rgba(255, 116, 116, 0.1)'
-                                : 'rgba(53, 174, 105, 0.1)',
-                              border: errNum ? '1px solid #ff7474' : '1px solid #35AE69',
-                            }">
-                        <img style="width: 14px; height: 14px; margin-left: 16px" :src="
-                          errNum
-                            ? require('../../assets/images/err.png')
-                            : require('../../assets/images/success.png')
-                        " />
-                        <div style="margin-left: 8px" :style="{ color: errNum ? '#ff7474' : 'rgba(0,0,0,0.65)' }">
-                          {{ succNum }}条数据导入成功，{{ errNum }}条数据导入失败
+                      <div
+                        v-if="uploadpercent === 100"
+                        class="defeat"
+                        style="
+                          display: flex;
+                          align-items: center;
+                          width: 500px;
+                          height: 40px;
+                        "
+                        :style="{
+                          background: errNum
+                            ? 'rgba(255, 116, 116, 0.1)'
+                            : 'rgba(53, 174, 105, 0.1)',
+                          border: errNum
+                            ? '1px solid #ff7474'
+                            : '1px solid #35AE69',
+                        }"
+                      >
+                        <img
+                          style="width: 14px; height: 14px; margin-left: 16px"
+                          :src="
+                            errNum
+                              ? require('../../assets/images/err.png')
+                              : require('../../assets/images/success.png')
+                          "
+                        />
+                        <div
+                          style="margin-left: 8px"
+                          :style="{
+                            color: errNum ? '#ff7474' : 'rgba(0,0,0,0.65)',
+                          }"
+                        >
+                          {{ succNum }}条数据导入成功，{{
+                            errNum
+                          }}条数据导入失败
                         </div>
                       </div>
                     </div>
@@ -137,179 +172,187 @@
 </template>
 
 <script>
-import { reactive, toRefs, watch,ref,computed } from "vue";
+import { reactive, toRefs, watch, ref, computed } from "vue";
+import { exportTeacherExpense } from "../../api/Teaching";
 import { message } from "ant-design-vue";
 import { useStore } from "vuex";
 import * as api from "../../api/index1";
-import {getCookieForName} from "@/api/method";
-  export default {
-    name: "importWork",
-    components: {
-
+import { getCookieForName } from "@/api/method";
+export default {
+  name: "importWork",
+  components: {},
+  props: {
+    showWork: {
+      type: Boolean,
+      default: false,
     },
-    props: {
-      showWork: {
-        type: Boolean,
-        default: false,
-      },
-      url: {
-        type: String,
-        default: null,
-      },
-      title:{
-        type: String,
-        default: null,
-      },
-      template:{
-        type: String,
-        default: null,
-      },
+    url: {
+      type: String,
+      default: null,
     },
-    setup(props, ctx) {
-      const state = reactive({
-        fileType: ["xls", "xlsx"],
-        importHomeWork:
-          process.env.VUE_APP_BASE_API + props.url,
-        uploadpercent: -1,
-        uploadErr: false, //上传失败
-        addLoading: false,
-        fileList: [],
-        succNum: 0, //成功数据数
-        errNum: 0, //失败数据数
-        downloadErrUrl: null, //下载失败数据
-        fileName: "",
-      });
-      const headers = { token: getCookieForName("token") };
+    title: {
+      type: String,
+      default: null,
+    },
+    template: {
+      type: String,
+      default: null,
+    },
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      fileType: ["xls", "xlsx"],
+      importHomeWork: process.env.VUE_APP_BASE_API + props.url,
+      uploadpercent: -1,
+      uploadErr: false, //上传失败
+      addLoading: false,
+      fileList: [],
+      succNum: 0, //成功数据数
+      errNum: 0, //失败数据数
+      downloadErrUrl: null, //下载失败数据
+      fileName: "",
+    });
+    const headers = { token: getCookieForName("token") };
 
-      const closeCodeModal = () => {
-        ctx.emit("update:showWork", false);
-        state.fileList = [];
-        state.uploadpercent = -1;
-        state.uploadErr = false; //上传失败
-      };
+    const closeCodeModal = () => {
+      ctx.emit("update:showWork", false);
+      state.fileList = [];
+      state.uploadpercent = -1;
+      state.uploadErr = false; //上传失败
+    };
 
-      //上传文件
-      const handleChange = (info) => {
-        if (info) {
-          var FileExt = info.file.name.replace(/.+\./, "");
-          if (["xls", "xlsx"].indexOf(FileExt.toLowerCase()) === -1) {
-            state.fileList = [];
-            state.uploadpercent = -1;
-            message.destroy();
-            message.error("请按模板格式上传文件");
-            return;
-          }
-        }
-        let isLt1M = info.file.size < 512000000;
-        if (!isLt1M) {
+    //上传文件
+    const handleChange = (info) => {
+      if (info) {
+        var FileExt = info.file.name.replace(/.+\./, "");
+        if (["xls", "xlsx"].indexOf(FileExt.toLowerCase()) === -1) {
           state.fileList = [];
           state.uploadpercent = -1;
           message.destroy();
-          message.error("文件大小超出500M,请重新上传");
+          message.error("请按模板格式上传文件");
           return;
         }
-
-        state.addLoading = true;
-        state.uploadpercent = parseInt(info.file.percent);
-        console.log("我是文件上传的进度---------->", info.file.percent);
-        const status = info.file.status;
-        console.log(info.file,'status')
-        if (status !== "uploading") {
-          // console.log(info.file, info.fileList);
-        }
-        if (status === "done") {
-          state.fileName = info.file.name;
-          if(info.file.response.code == 200){
-            state.succNum = Number(info.file.response.data.success);
-            state.errNum = Number(info.file.response.data.failed);
-            state.downloadErrUrl = info.file.response.data.path;
-          }else{
-            state.uploadErr = true;
-            state.fileList = [];
-            state.uploadpercent = -1
-            message.destroy();
-            message.error(info.file.response.msg);
-          }
-          
-          // let i = 0;
-          // let timeouts = setTimeout(() => {
-          //   // clearInterval(timer)
-          //   state.addLoading = false;
-          //   message.destroy(); 
-          //   message.error(`文件导入超时`);
-          // }, 30000);
-          // let timer = setInterval(() => {
-          //   let uid = info.file.response.data;
-          //   api
-          //     .getImportStatus(uid)
-          //     .then((res) => {
-          //       console.log("查询导入状态", res);
-          //       if (res.data.code === 200) {
-          //         if (res.data.data.status !== "START") {
-          //           i++;
-          //           if (i === 1) {
-          //             message.destroy();
-          //             message.success(`${info.file.name}上传成功`);
-          //             state.addLoading = false;
-          //             props.searchTaskList && props.searchTaskList();
-          //           }
-          //           state.succNum = res.data.data.successNum;
-          //           state.errNum = res.data.data.failedNum;
-          //           state.downloadErrUrl = res.data.data.url;
-          //           console.log("props.getStudent", props.getStudent);
-          //           clearInterval(timer);
-          //           clearTimeout(timeouts);
-          //         }
-          //       } else {
-          //         state.addLoading = false;
-          //         message.destroy();
-          //         clearTimeout(timeouts);
-          //       }
-          //     })
-          //     .catch((err) => {
-          //       state.addLoading = false;
-          //       clearInterval(timer);
-          //       clearTimeout(timeouts);
-          //       console.log("查询导入状态失败", err);
-          //     });
-          // }, 500);
-        } else if (status === "error") {
-          state.uploadErr = true;
-          message.error(`${info.file.name}上传失败`);
-        }
-      };
-      //删除
-      const removeUpload = () => {
+      }
+      let isLt1M = info.file.size < 512000000;
+      if (!isLt1M) {
         state.fileList = [];
         state.uploadpercent = -1;
-        state.uploadErr = false; //上传失败
-        state.succNum = 0;
-        state.errNum = 0;
-        state.downloadErrUrl = null;
-        state.addLoading = false;
-      };
-      // 下载失败数据
-      const downloadEeeorData = () => {
-        if (state.downloadErrUrl !== "") {
-          window.open(process.env.VUE_APP_FILE_PATH + state.downloadErrUrl);
-        }
-      };
-      function downTemplate() {
-        // window.open(`${process.env.VUE_APP_BOE_API_URL}/upload/template/${props.template}`);
-        window.open(`${process.env.VUE_APP_BOE_API_URL}/admin/export/exportExpenseTemplate`);
+        message.destroy();
+        message.error("文件大小超出500M,请重新上传");
+        return;
       }
 
-      return {
-        ...toRefs(state),
-        closeCodeModal,
-        handleChange,
-        downTemplate,
-        headers,
-        removeUpload,
-        downloadEeeorData,
-      };
-    },
-  }
+      state.addLoading = true;
+      state.uploadpercent = parseInt(info.file.percent);
+      console.log("我是文件上传的进度---------->", info.file.percent);
+      const status = info.file.status;
+      console.log(info.file, "status");
+      if (status !== "uploading") {
+        // console.log(info.file, info.fileList);
+      }
+      if (status === "done") {
+        state.fileName = info.file.name;
+        if (info.file.response.code == 200) {
+          state.succNum = Number(info.file.response.data.success);
+          state.errNum = Number(info.file.response.data.failed);
+          state.downloadErrUrl = info.file.response.data.path;
+        } else {
+          state.uploadErr = true;
+          state.fileList = [];
+          state.uploadpercent = -1;
+          message.destroy();
+          message.error(info.file.response.msg);
+        }
+
+        // let i = 0;
+        // let timeouts = setTimeout(() => {
+        //   // clearInterval(timer)
+        //   state.addLoading = false;
+        //   message.destroy();
+        //   message.error(`文件导入超时`);
+        // }, 30000);
+        // let timer = setInterval(() => {
+        //   let uid = info.file.response.data;
+        //   api
+        //     .getImportStatus(uid)
+        //     .then((res) => {
+        //       console.log("查询导入状态", res);
+        //       if (res.data.code === 200) {
+        //         if (res.data.data.status !== "START") {
+        //           i++;
+        //           if (i === 1) {
+        //             message.destroy();
+        //             message.success(`${info.file.name}上传成功`);
+        //             state.addLoading = false;
+        //             props.searchTaskList && props.searchTaskList();
+        //           }
+        //           state.succNum = res.data.data.successNum;
+        //           state.errNum = res.data.data.failedNum;
+        //           state.downloadErrUrl = res.data.data.url;
+        //           console.log("props.getStudent", props.getStudent);
+        //           clearInterval(timer);
+        //           clearTimeout(timeouts);
+        //         }
+        //       } else {
+        //         state.addLoading = false;
+        //         message.destroy();
+        //         clearTimeout(timeouts);
+        //       }
+        //     })
+        //     .catch((err) => {
+        //       state.addLoading = false;
+        //       clearInterval(timer);
+        //       clearTimeout(timeouts);
+        //       console.log("查询导入状态失败", err);
+        //     });
+        // }, 500);
+      } else if (status === "error") {
+        state.uploadErr = true;
+        message.error(`${info.file.name}上传失败`);
+      }
+    };
+    //删除
+    const removeUpload = () => {
+      state.fileList = [];
+      state.uploadpercent = -1;
+      state.uploadErr = false; //上传失败
+      state.succNum = 0;
+      state.errNum = 0;
+      state.downloadErrUrl = null;
+      state.addLoading = false;
+    };
+    // 下载失败数据
+    const downloadEeeorData = () => {
+      if (state.downloadErrUrl !== "") {
+        window.open(process.env.VUE_APP_FILE_PATH + state.downloadErrUrl);
+      }
+    };
+    function downTemplate() {
+      // window.open(`${process.env.VUE_APP_BOE_API_URL}/upload/template/${props.template}`);
+      exportTeacherExpense({})
+        .then((res) => {
+          console.log("exportTeacherExpense res",res)
+        })
+        .catch((err) => {
+          console.error("downTemplate err", err);
+        });
+
+      window.open(
+        `${process.env.VUE_APP_BOE_API_URL}/admin/export/exportExpenseTemplate`
+      );
+    }
+
+    return {
+      ...toRefs(state),
+      closeCodeModal,
+      handleChange,
+      downTemplate,
+      headers,
+      removeUpload,
+      downloadEeeorData,
+    };
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -361,12 +404,12 @@ import {getCookieForName} from "@/api/method";
                 background-size: 100% 100%;
               }
             }
-            .line{
+            .line {
               height: 1px;
               margin-top: 16px;
               background-color: #f0f0f0;
             }
-            .contents{
+            .contents {
               display: flex;
               min-height: 500px;
               .drawerMain {
@@ -652,4 +695,4 @@ import {getCookieForName} from "@/api/method";
     }
   }
 }
-</style>
\ No newline at end of file
+</style>

From cda14423acf39f7b8595312aed4d4c109666e387 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 16:04:13 +0800
Subject: [PATCH 140/157] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.test                              | 3 ++-
 src/components/lecturer/ImportWork.vue | 5 +----
 src/views/lecturer/InsideTeaching.vue  | 1 +
 src/views/lecturer/LecturerFee.vue     | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.env.test b/.env.test
index 8772bab7..610f30a7 100644
--- a/.env.test
+++ b/.env.test
@@ -1,2 +1,3 @@
 NODE_ENV=test
-VUE_APP_BOE_API_URL=//u-pre.boe.com
\ No newline at end of file
+VUE_APP_BOE_API_URL=//u-pre.boe.com
+VUE_APP_BASE_API=/manageApi
\ No newline at end of file
diff --git a/src/components/lecturer/ImportWork.vue b/src/components/lecturer/ImportWork.vue
index 25f2e398..b6a497c1 100644
--- a/src/components/lecturer/ImportWork.vue
+++ b/src/components/lecturer/ImportWork.vue
@@ -328,6 +328,7 @@ export default {
       }
     };
     function downTemplate() {
+      console.log("downTemplate gx")
       // window.open(`${process.env.VUE_APP_BOE_API_URL}/upload/template/${props.template}`);
       exportTeacherExpense({})
         .then((res) => {
@@ -336,10 +337,6 @@ export default {
         .catch((err) => {
           console.error("downTemplate err", err);
         });
-
-      window.open(
-        `${process.env.VUE_APP_BOE_API_URL}/admin/export/exportExpenseTemplate`
-      );
     }
 
     return {
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 9f4d5fe7..9ce60553 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -511,6 +511,7 @@
         </div>
       </a-modal>
     </div>
+    <!-- 导入01 -->
     <ImportWork v-model:showWork="showWork" :template="'内部讲师授课记录导入模版-20250115.xlsx'" :url="'/admin/export/importInTeacherRecord'" :title="title"></ImportWork>
     <!-- <div> <Upload/> </div>         -->
   </div>
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 87966afe..c2a69b8c 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -545,6 +545,7 @@
       </div> -->
       </div>
     </a-drawer>
+    <!-- TODO dr01 -->
     <ImportWork v-model:showWork="showWork" :template="'讲师费导入模版-20250115.xlsx'"
       :url="'/admin/export/importTeacherExpense'" :fileName="uploadFile" :title="title"></ImportWork>
   </div>

From aee1d64e81b71bf17dbd30d338485a58203c1054 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 16:10:15 +0800
Subject: [PATCH 141/157] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Teaching.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/Teaching.js b/src/api/Teaching.js
index 1fe4621c..067466eb 100644
--- a/src/api/Teaching.js
+++ b/src/api/Teaching.js
@@ -25,7 +25,7 @@ export const getAddress = (obj) => http.post('/admin/teacher/getAddress', obj)
 export const getCharges = (obj) => http.post('/teacher/fee/getCharges', obj)
 
 //讲师费发放情况
-export const exportTeacherExpense = (obj) => http.get('/admin/export/exportTeacherExpense', {params: obj})
+export const exportTeacherExpense = (obj) => http.get('/admin/export/exportExpenseTemplate', {params: obj})
 
 
 //上传组件

From ad7d10d540be80b0a55aef8f460a5f67efa0ebd0 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 16:16:52 +0800
Subject: [PATCH 142/157] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/lecturer/ImportWork.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/lecturer/ImportWork.vue b/src/components/lecturer/ImportWork.vue
index b6a497c1..2560c429 100644
--- a/src/components/lecturer/ImportWork.vue
+++ b/src/components/lecturer/ImportWork.vue
@@ -329,14 +329,12 @@ export default {
     };
     function downTemplate() {
       console.log("downTemplate gx")
+
+      window.open(
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportExpenseTemplate`
+      );
       // window.open(`${process.env.VUE_APP_BOE_API_URL}/upload/template/${props.template}`);
-      exportTeacherExpense({})
-        .then((res) => {
-          console.log("exportTeacherExpense res",res)
-        })
-        .catch((err) => {
-          console.error("downTemplate err", err);
-        });
+  
     }
 
     return {

From c010a91d18c2d2fc56f33944ad2900da4aefa433 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 16:21:48 +0800
Subject: [PATCH 143/157] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/lecturer/ImportWork.vue | 2 +-
 src/views/lecturer/LecturerFee.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/lecturer/ImportWork.vue b/src/components/lecturer/ImportWork.vue
index 2560c429..4fcf87d2 100644
--- a/src/components/lecturer/ImportWork.vue
+++ b/src/components/lecturer/ImportWork.vue
@@ -331,7 +331,7 @@ export default {
       console.log("downTemplate gx")
 
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/export/exportExpenseTemplate`
+        `${process.env.VUE_APP_BASE_API}${props.template}`
       );
       // window.open(`${process.env.VUE_APP_BOE_API_URL}/upload/template/${props.template}`);
   
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index c2a69b8c..a6877c57 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -546,7 +546,7 @@
       </div>
     </a-drawer>
     <!-- TODO dr01 -->
-    <ImportWork v-model:showWork="showWork" :template="'讲师费导入模版-20250115.xlsx'"
+    <ImportWork v-model:showWork="showWork" :template="'/admin/export/exportExpenseTemplate'"
       :url="'/admin/export/importTeacherExpense'" :fileName="uploadFile" :title="title"></ImportWork>
   </div>
   <div class="example" v-if="example">

From 4cfb11b911bb623c3045323f9e92663d876dcef7 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 16:25:06 +0800
Subject: [PATCH 144/157] =?UTF-8?q?=E5=86=85=E9=83=A8=E8=AE=B2=E5=B8=88=20?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 9ce60553..acaa5ce7 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -512,7 +512,7 @@
       </a-modal>
     </div>
     <!-- 导入01 -->
-    <ImportWork v-model:showWork="showWork" :template="'内部讲师授课记录导入模版-20250115.xlsx'" :url="'/admin/export/importInTeacherRecord'" :title="title"></ImportWork>
+    <ImportWork v-model:showWork="showWork" :template="'/admin/export/exportRecordTemplate'" :title="title"></ImportWork>
     <!-- <div> <Upload/> </div>         -->
   </div>
 </template>

From a3e4615ce40253377d458d6709d0072cc301476b Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 16:34:09 +0800
Subject: [PATCH 145/157] =?UTF-8?q?=E5=86=85=E9=83=A8=E8=AE=B2=E5=B8=88=20?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 17ef566a..4763104e 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -296,7 +296,7 @@
           <a-descriptions-item label="供应商">{{ formParam.supplier || '-' }}</a-descriptions-item>
           <a-descriptions-item label="手机号码">{{ formParam.mobile || '-' }}</a-descriptions-item>
           <a-descriptions-item label="课程类型">
-            {{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 2 ? '培训课' : formParam.type == 5 ? '手动录入' : '-'}}
+            {{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 2 ? '训练班' : formParam.type == 5 ? '手动录入' : '-'}}
           </a-descriptions-item>
           <a-descriptions-item label="课程名称">{{ formParam.courseName || '-' }}</a-descriptions-item>
           <a-descriptions-item label="开课状态">{{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1
@@ -571,7 +571,7 @@ export default {
                 ? {
                   "0": "在线课",
                   "1": "面授课",
-                  "2": "培训课",
+                  "2": "训练班",
                   "5": "手动录入",
                 }[value.record.type + ""]
                 : "-" }

From cf84a12ac5f25de76fddbb71d43cc6ef9c717e5f Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 17:28:25 +0800
Subject: [PATCH 146/157] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/OrganizationApproval.vue | 3 ++-
 src/views/lecturer/OrganizationList.vue     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue
index 3c46b15f..b4f29230 100644
--- a/src/views/lecturer/OrganizationApproval.vue
+++ b/src/views/lecturer/OrganizationApproval.vue
@@ -751,7 +751,8 @@ export default {
         ...state.searchParam ,
         //TODO GX03 
         //审批未通过意外的数据
-        approvalType:1
+        approvalType:1,
+        moduleType:1
       };
 
       if(objA.status == 0){
diff --git a/src/views/lecturer/OrganizationList.vue b/src/views/lecturer/OrganizationList.vue
index 6ce35e7a..63e1a62f 100644
--- a/src/views/lecturer/OrganizationList.vue
+++ b/src/views/lecturer/OrganizationList.vue
@@ -733,7 +733,8 @@ export default {
         ...state.searchParam ,
         //TODO GX03 加审核结束标记
         //审核通过数据
-        approvalType:0
+        approvalType:0,
+        moduleType:0
        };
       queryTrainOrg(objA).then((res) => {
         tableData.value = res.data.data.records;

From d74eab17fd4db47703ddc20dced80d7ca029fc68 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 17:35:28 +0800
Subject: [PATCH 147/157] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=BD=AC?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/OrganizationApproval.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue
index b4f29230..906da82d 100644
--- a/src/views/lecturer/OrganizationApproval.vue
+++ b/src/views/lecturer/OrganizationApproval.vue
@@ -508,7 +508,7 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch } from "vue";
+import { reactive, toRefs, ref, watch,onUnmounted } from "vue";
 import { FolderAddOutlined } from "@ant-design/icons-vue";
 import { message } from "ant-design-vue";
 import dialog from "@/utils/dialog";
@@ -612,6 +612,13 @@ export default {
       }
       state.formParam.code = null;
     };
+
+    onUnmounted(() => {
+      //初始化时
+      state.searchParam.status = 2
+    });
+
+
     const columns = ref([
       // {
       //   title: '培训发生组织编号 ',

From f971fc45f3aa6e57037ce845d090a2b6aa637a93 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 17:41:48 +0800
Subject: [PATCH 148/157] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=BD=AC?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/OrganizationApproval.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue
index 906da82d..1bf61130 100644
--- a/src/views/lecturer/OrganizationApproval.vue
+++ b/src/views/lecturer/OrganizationApproval.vue
@@ -508,7 +508,7 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch,onUnmounted } from "vue";
+import { reactive, toRefs, ref, watch, onMounted } from "vue";
 import { FolderAddOutlined } from "@ant-design/icons-vue";
 import { message } from "ant-design-vue";
 import dialog from "@/utils/dialog";
@@ -613,7 +613,7 @@ export default {
       state.formParam.code = null;
     };
 
-    onUnmounted(() => {
+    onMounted(() => {
       //初始化时
       state.searchParam.status = 2
     });

From bb60b214db38363f579b461ec15c9487ac6379fe Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Fri, 21 Feb 2025 18:51:15 +0800
Subject: [PATCH 149/157] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=BD=AC?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 364 ++++++++++++------------
 1 file changed, 189 insertions(+), 175 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 4763104e..6d7687ef 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -9,30 +9,34 @@
           <!-- <a-input v-model:value="searchParam.userNo" style="width: 276px; height: 40px; border-radius: 8px"
             placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
           </a-input> -->
-          <a-input style="width: 235px; height: 40px; border-radius: 8px" placeholder="请输入姓名进行检索" showSearch allowClear
-            v-model:value="searchParam.name" v-on:keydown.enter="enterPressHadlerSearch"></a-input>
+          <a-input style="width: 235px; height: 40px; border-radius: 8px" placeholder="请输入姓名/手机号进行检索" showSearch
+            allowClear v-model:value="searchParam.name"
+            v-on:keydown.enter="enterPressHadlerSearch"></a-input>
         </a-form-item>
         <a-form-item class="select">
-          <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.supplier" placeholder="请输入供应商"
-            :options="supperList" allowClear v-on:keydown.enter="enterPressHadlerSearch" showSearch>
+          <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.supplier" placeholder="请输入供应商" :options="supperList" allowClear
+           v-on:keydown.enter="enterPressHadlerSearch" showSearch > 
           </a-select>
         </a-form-item>
         <a-form-item class="select">
           <a-input v-model:value="searchParam.courseName" style="width: 235px; height: 40px; border-radius: 8px"
-            placeholder="请输入课程名称进行搜索" allowClear showSearch v-on:keydown.enter="enterPressHadlerSearch">
+            placeholder="请输入课程名称进行搜索" allowClear showSearch
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-input>
         </a-form-item>
         <a-form-item class="select ">
           <!-- <div class="select addTimeBox">
             <div class="addTime">授课日期：</div> -->
-          <a-range-picker v-model:value="searchdate" style="width: 340px !important;" format="YYYY-MM-DD"
-            valueFormat="YYYY-MM-DD" separator="至" :placeholder="['授课日期开始时间', '授课日期结束时间']
-              " v-on:keydown.enter="enterPressHadlerSearch" />
+            <a-range-picker v-model:value="searchdate" style="width: 340px !important;" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"
+              separator="至" :placeholder="['授课日期开始时间', '授课日期结束时间']
+              "
+               v-on:keydown.enter="enterPressHadlerSearch" />
           <!-- </div> -->
         </a-form-item>
         <a-form-item class="select">
           <a-select style="width: 200px ;margin-bottom:20px" v-model:value="searchParam.createFrom" placeholder="录入类型"
-            :options="entryTypeList" allowClear v-on:keydown.enter="enterPressHadlerSearch">
+            :options="entryTypeList" allowClear
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-select>
         </a-form-item>
         <a-form-item class="select">
@@ -43,12 +47,14 @@
           }" allow-clear :getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
             v-model:value="searchParam.courseTypeId" show-search
             :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择内容分类" tree-default-expand-all
-            :tree-data="sysTypeOptions" v-on:keydown.enter="enterPressHadlerSearch">
+            :tree-data="sysTypeOptions"
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-tree-select>
         </a-form-item>
         <a-form-item class="select">
           <a-select style="width: 200px" v-model:value="searchParam.courseStatus" placeholder="开课状态"
-            :options="AuthenticationStatusList" allowClear v-on:keydown.enter="enterPressHadlerSearch">
+            :options="AuthenticationStatusList" allowClear
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-select>
         </a-form-item>
         <div style="display: flex; margin-bottom: 20px">
@@ -71,7 +77,7 @@
           </div> -->
         </div>
         <div style="width:100%"></div>
-
+        
       </a-form>
       <div style="width: 100%;"></div>
       <div style="display: flex; margin-bottom: 20px">
@@ -99,10 +105,8 @@
             <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 && checkMenu('lecturerRecordsEdit')">编辑</a-button>
-                <a-button v-if="record.isSuperPermission === 'true' && checkMenu('lecturerRecordsDel')" type="link"
-                  @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
+                <a-button type="link" @click="() => handleModify(record, String(record.courseform))" v-if="record.createFrom == 1&&checkMenu('lecturerRecordsEdit')">编辑</a-button>
+                <a-button v-if="record.isSuperPermission==='true'&&checkMenu('lecturerRecordsDel')" type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
               </a-space>
             </template>
           </template>
@@ -112,57 +116,63 @@
     </div>
     <div class="tableBox ">
       <div class="pa">
-        <a-pagination v-if="tableDataTotal > 10" :showSizeChanger="true" :showQuickJumper="false"
-          :hideOnSinglePage="false" :pageSize="searchParam.pageSize" :current="searchParam.pageNo"
-          :total="tableDataTotal" class="pagination" @change="changePagination" />
-        <!--  :show-total="total => `共 ${total} 条数据`" -->
+        <a-pagination
+            v-if="tableDataTotal > 10"
+            :showSizeChanger="true"
+            :showQuickJumper="false"
+            :hideOnSinglePage="false"
+            :pageSize="searchParam.pageSize"
+            :current="searchParam.pageNo"
+            :total="tableDataTotal"
+            class="pagination"
+            @change="changePagination"
+          />
+          <!--  :show-total="total => `共 ${total} 条数据`" -->
       </div>
     </div>
     <!-- 弹窗组件 -->
-    <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" placement="right" :maskClosable="false"
-      :closable="false" width="60%" :title="false">
+    <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" placement="right" :maskClosable="false" :closable="false"
+      width="60%" :title="false">
       <div style="padding:24px;">
         <div class="headers" style="margin-top:-24px;">
           <div class="headerTitle">{{ teacherdialogtitle }}</div>
-          <img style="width: 29px; height: 29px; cursor: pointer" src="@/assets/images/basicinfo/close.png"
-            @click="cancelTeacherDialog" />
+          <img
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="@/assets/images/basicinfo/close.png"
+            @click="cancelTeacherDialog"
+          />
         </div>
         <a-form :model="formParam" layout="vertical" ref="formRef">
           <!--讲师名称  teacherName 内容分类 coursetypeid -->
           <a-row :gutter="16">
             <a-col :span="12">
+        
               <a-form-item name="teacherName">
                 <template v-slot:label>
-                  <img style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  <img
+                    style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
                   讲师名称
                 </template>
-                <!-- TODO GX01 -->
-                <ProjectManagerOutTeacher v-model:value="formParam.name" v-model:name="formParam.teacherName"
-                v-model:supplier="formParam.supplier"
-                placeholder="请输入工号/讲师姓名进行检索" @onChange="managerChange"></ProjectManagerOutTeacher>
+                    <ProjectManagerOutTeacher v-model:value="formParam.name" 
+          v-model:name="formParam.teacherName" 
+          placeholder="请输入工号/讲师姓名进行检索"
+                              @onChange="managerChange"></ProjectManagerOutTeacher> 
+                              
+                <!-- <a-input v-model:value="formParam.teacherName" allowClear showSearch class="draitem"
+                  placeholder="请输入讲师姓名"></a-input> -->
               </a-form-item>
             </a-col>
-            <a-col :span="12">
-              <a-form-item name="supplier">
-                <template v-slot:label>
-                  <img style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  供应商
-                </template>
-                <!-- TODO GX01 -->
-                <a-input class="draitem" v-model:value="formParam.supplier" disabled :maxlength="20" showCount >
-                </a-input>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <!-- 课程名称：name  开课状态 courseStatus-->
-          <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item name="courseTypeId">
                 <template v-slot:label>
-                  <img style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  <img
+                    style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
                   内容分类
                 </template>
                 <a-tree-select :fieldNames="{
@@ -171,20 +181,26 @@
                   value: 'code',
                 }" allow-clear :getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
                   v-model:value="formParam.courseTypeId" show-search
-                  :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择内容分类"
-                  tree-default-expand-all :tree-data="sysTypeOptions" @change="treetype">
+                  :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择内容分类" tree-default-expand-all
+                  :tree-data="sysTypeOptions"
+                  @change="treetype">
                 </a-tree-select>
               </a-form-item>
             </a-col>
+          </a-row>
+          <!-- 课程名称：name  开课状态 courseStatus-->
+          <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item name="courseName">
                 <template v-slot:label>
-                  <img style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  <img
+                    style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
                   课程名称
                 </template>
-                <a-input class="draitem" v-model:value="formParam.courseName" :maxlength="20" showCount
-                  placeholder="请输入课程名称" @blur="sendName" allowClear showSearch>
+                <a-input class="draitem" v-model:value="formParam.courseName"  :maxlength="20"   showCount  placeholder="请输入课程名称"  @blur="sendName" allowClear showSearch>
                 </a-input>
               </a-form-item>
             </a-col>
@@ -196,62 +212,76 @@
                 </a-radio-group>
               </a-form-item>
             </a-col> -->
-
-          </a-row>
-          <!-- 授课日期 teachingDate  授课时长defaultTeachingTime-->
-          <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item name="teachingDate">
                 <template v-slot:label>
-                  <img style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  <img
+                    style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
                   授课/课程日期 :
                 </template>
-                <a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" format="YYYY-MM-DD HH:mm"
-                  :show-time="{ format: 'HH:mm' }" placeholder="请选择课程日期" />
+                <a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" format="YYYY-MM-DD HH:mm" :show-time="{ format: 'HH:mm' }"
+                  placeholder="请选择课程日期" />
               </a-form-item>
             </a-col>
+          </a-row>
+          <!-- 授课日期 teachingDate  授课时长defaultTeachingTime-->
+          <a-row :gutter="16">
+            
             <a-col :span="12">
               <a-form-item name="teaching">
                 <template v-slot:label>
-                  <img style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  <img
+                    style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
                   授课时长
                 </template>
                 <a-input v-model:value="formParam.teaching" style="width:100%; height: 40px; border-radius: 8px; "
-                  placeholder="请输入授课时长" allowClear showSearch suffix="分钟" :maxLength="8" @change="clearNonNumber">
+                  placeholder="请输入授课时长" allowClear showSearch suffix="分钟" 
+                  :maxLength="8" @change="clearNonNumber">
                 </a-input>
                 <!-- <span style="margin-left: 5px ;" v-if="formParam.teaching != null">{{ (formParam.teaching / 60
                 ).toFixed(2) }}小时</span>
                 <span style="margin-left: 5px ;" v-if="formParam.teaching == null">0.00小时</span> -->
               </a-form-item>
             </a-col>
-          </a-row>
-          <!-- 参训人数 studys评分  score-->
-          <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item name="studys">
                 <template v-slot:label>
-                  <img style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  <img
+                    style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
                   参训人数
                 </template>
-                <a-input v-model:value="formParam.studys" class="draitem" placeholder="请输入参训人数" allowClear showSearch
-                  :maxLength="8" @blur="clearstudysNumber">
+                <a-input v-model:value="formParam.studys" class="draitem" placeholder="请输入参训人数" allowClear showSearch :maxLength="8"
+                  @blur="clearstudysNumber">
                 </a-input>
               </a-form-item>
             </a-col>
+          </a-row>
+          <!-- 参训人数 studys评分  score-->
+          <a-row :gutter="16">
+            
             <a-col :span="12">
               <a-form-item name="score">
                 <template v-slot:label>
-                  <img style="margin-right:4px;width: 7px;height: 7px"
-                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  <img
+                    style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
                   评分
                 </template>
                 <!-- <a-input class="draitem" v-model:value="formParam.score"  @blur="clearscoreNumber" placeholder="" allowClear showSearch>
                 </a-input> -->
-                <a-input-number @blur="blurScore" @focus="focusScore" v-model:value="formParam.score" :precision="2"
-                  :min="1" :max="100" style="width:100%; height: 40px; border-radius: 8px ; " placeholder="请输入评分" />
+                    <a-input-number @blur="blurScore" @focus="focusScore" v-model:value="formParam.score" :precision="2" :min="1" :max="100" 
+                style="width:100%; height: 40px; border-radius: 8px ; " placeholder="请输入评分" />
               </a-form-item>
             </a-col>
           </a-row>
@@ -259,7 +289,8 @@
           <a-row :gutter="16">
             <a-col :span="24">
               <a-form-item label="备注">
-                <a-textarea v-model:value="formParam.remark" showCount :maxlength="200" @blur="sendRemark"
+                <a-textarea v-model:value="formParam.remark" showCount :maxlength="200"
+                @blur="sendRemark"
                   style="width: 100%; height: 100px; border-radius: 8px" placeholder="请输入" />
               </a-form-item>
             </a-col>
@@ -283,36 +314,36 @@
       </div>
     </a-drawer>
     <!-- 查看授课记录 -->
-    <a-drawer class="largeDrawerInside" v-model:visible="teachingdialog" placement="right" :maskClosable="true"
-      :closable="false" width="60%" :title="false">
+    <a-drawer class="largeDrawerInside" v-model:visible="teachingdialog" placement="right" :maskClosable="true" :closable="false"
+      width="60%" :title="false">
       <div style="padding:24px;">
         <div class="headers" style="margin-top:-24px;">
           <div class="headerTitle">查看讲师授课记录</div>
-          <img style="width: 29px; height: 29px; cursor: pointer" src="@/assets/images/basicinfo/close.png"
-            @click="cancelTeachingDialog" />
+          <img
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="@/assets/images/basicinfo/close.png"
+            @click="cancelTeachingDialog"
+          />
         </div>
-        <a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="{ 'width': '160px' }">
-          <a-descriptions-item label="讲师名称">{{ formParam.teacherName || '-' }}</a-descriptions-item>
-          <a-descriptions-item label="供应商">{{ formParam.supplier || '-' }}</a-descriptions-item>
-          <a-descriptions-item label="手机号码">{{ formParam.mobile || '-' }}</a-descriptions-item>
-          <a-descriptions-item label="课程类型">
-            {{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 2 ? '训练班' : formParam.type == 5 ? '手动录入' : '-'}}
-          </a-descriptions-item>
-          <a-descriptions-item label="课程名称">{{ formParam.courseName || '-' }}</a-descriptions-item>
+        <a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="{'width':'160px'}">
+          <a-descriptions-item label="讲师名称">{{ formParam.teacherName ||'-'}}</a-descriptions-item>
+          <a-descriptions-item label="手机号码">{{ formParam.mobile  ||'-'}}</a-descriptions-item>
+          <a-descriptions-item label="课程类型">{{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 2 ? '手动录入' : '-'
+          }}</a-descriptions-item>
+          <a-descriptions-item label="课程名称">{{ formParam.courseName  ||'-'}}</a-descriptions-item>
           <a-descriptions-item label="开课状态">{{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1
             ? '已开课' : '-' }}</a-descriptions-item>
-          <a-descriptions-item label="内容分类  ">{{ formParam.courseTypeName || '-' }}</a-descriptions-item>
-          <a-descriptions-item label="授课/课程日期  ">{{ formParam.teachingDate || '-' }}
-
+          <a-descriptions-item label="内容分类  ">{{ formParam.courseTypeName  ||'-'}}</a-descriptions-item>
+          <a-descriptions-item label="授课/课程日期  ">{{ formParam.teachingDate ||'-' }}
+          
           </a-descriptions-item>
-          <a-descriptions-item label="授课时长  "> <span> {{ formParam.teaching }} 分钟</span>
+          <a-descriptions-item label="授课时长  ">  <span > {{ formParam.teaching  }} 分钟</span> 
             <span style="margin-left: 10px ;" v-if="formParam.teaching != '0'">({{ (formParam.teaching / 60
             ).toFixed(2) }}小时)</span>
           </a-descriptions-item>
-          <a-descriptions-item label="评分  ">{{
-            formParam.score ? Number(formParam.score).toFixed(0) == 0 ? '-' : Number(formParam.score).toFixed(2) +'分':'-'}}</a-descriptions-item>
-          <a-descriptions-item label="参训人数  ">{{ formParam.studys ? formParam.studys + '人' : '-' }}</a-descriptions-item>
-          <a-descriptions-item label="备注  " :span="2">{{ formParam.remark || '-' }}</a-descriptions-item>
+          <a-descriptions-item label="评分  ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(2)+'分':'-'}}</a-descriptions-item>
+          <a-descriptions-item label="参训人数  ">{{ formParam.studys ? formParam.studys+'人' :'-'}}</a-descriptions-item>
+          <a-descriptions-item label="备注  " :span="2">{{ formParam.remark ||'-' }}</a-descriptions-item>
         </a-descriptions>
         <!-- <div :style="{
           position: 'absolute',
@@ -358,13 +389,13 @@
       </a-modal>
     </div>
     <!-- <div> <ImageUpload/> </div>         -->
-    <ImportWork v-model:showWork="showWork" :template="'外部讲师授课记录导入模版-20250115.xlsx'"
+    <ImportWork v-model:showWork="showWork" :template="'/admin/export/exportRecordTemplate'"
       :url="'/admin/export/importOutTeacherRecord'" :title="title"></ImportWork>
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, computed, onMounted ,watch} from "vue";
-import { useRouter, useRoute } from "vue-router";
+import { reactive, toRefs, ref, computed,onMounted } from "vue";
+import { useRouter ,useRoute} from "vue-router";
 import { useStore } from "vuex";
 import {
   RightOutlined,
@@ -378,7 +409,7 @@ import { message } from "ant-design-vue";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import ProjectManagerOutTeacher from "@/components/project/ProjectManagerOutTeacher";
 import dayjs from "dayjs";
-import { getTeacherCourseList, updateInTeacherCourse, getNewInTeacherCourseList, deleteInTeacherCourse, insertInTeacherCourse, selectSupplier } from "../../api/Teaching";
+import { getTeacherCourseList, updateInTeacherCourse, getNewInTeacherCourseList, deleteInTeacherCourse, insertInTeacherCourse,selectSupplier } from "../../api/Teaching";
 // import {getProjSt} from "../../api/indexProjStu";
 import { checkMenu } from '@/utils/utils'
 // import AddTeacher from "../../components/drawers/project/AddTeacher"
@@ -397,7 +428,7 @@ export default {
   setup() {
     onMounted(() => {
       const search = sessionStorage.getItem('searchExter')
-      if (route.query.activeKey == 2 && search) {
+      if(route.query.activeKey == 2&&search){
         state.searchParam = JSON.parse(search)
       }
       searchSubmit()
@@ -426,14 +457,12 @@ export default {
       teachingDate: undefined, //选择时间
       tableDataTotal: -1,//table列表总条数
       formParam: {
-        name: null,
-        supplier: null,
         courseStatus: '1',
         createFrom: 1,
         teaching: null,
         teachingDate: null,
-        teacherId: null,
-        mobile: null,
+        teacherId:null,
+        mobile:null,
         score: null
       },
       searchdate: undefined, //选择时间
@@ -475,17 +504,8 @@ export default {
 
     //获取内容分类
     const sysTypeOptions = computed(() => store.state.content_type);
-
-    watch(() => state.formParam.name, (val) => {
-      console.log(val, 'name gx data')
-    })
-
-    watch(() => state.formParam.teacherName, (val) => {
-      console.log(val, 'teacherName gx data')
-    })
-
-    const treetype = (val, lab) => {
-      state.formParam.courseTypeName = lab.toString()
+    const treetype =(val,lab)=>{
+      state.formParam.courseTypeName =lab.toString()
     }
     const OnTheJobStatusList = ref([
       { value: 1, label: "项目开课" },
@@ -493,13 +513,13 @@ export default {
       { value: 3, label: "面授开课" },
     ])
     const supperList = ref([])
-    const getSupplier = () => {
-      selectSupplier().then(res => {
-        if (res.data.code == 200) {
-          supperList.value = res.data.data.map(item => {
+    const getSupplier = ()=>{
+      selectSupplier().then(res=>{
+        if(res.data.code == 200){
+          supperList.value = res.data.data.map(item=>{
             return {
-              value: item,
-              label: item
+              value:item,
+              label:item
             }
           })
           supperList.value.unshift({
@@ -510,12 +530,12 @@ export default {
       })
     }
     const AuthenticationStatusList = ref([
-      { value: '', label: "全部" },
+    { value: '', label: "全部" },
       { value: '0', label: "未开课" },
       { value: '1', label: "已开课" },
     ])
     const entryTypeList = ref([
-      { value: '', label: "全部" },
+    { value: '', label: "全部" },
       { value: '0', label: "系统生成" },
       { value: '1', label: "手动录入" },
     ])
@@ -541,7 +561,7 @@ export default {
         key: 'supplier',
         ellipsis: true, align: "center",
         width: 150,
-        customRender: ({ text }) => text || '-'
+        customRender: ({text})=> text||'-'
       },
       {
         title: '课程名称 ',
@@ -566,17 +586,16 @@ export default {
         width: 120,
         customRender: (value) => {
           return (
-            <div>
-              { String(value.record.type)
-                ? {
-                  "0": "在线课",
-                  "1": "面授课",
-                  "2": "训练班",
-                  "5": "手动录入",
-                }[value.record.type + ""]
-                : "-" }
-            </div>
-          )
+              <div>
+                {String(value.record.type)
+                  ? {
+                    "0": "在线课",
+                    "1": "面授课",
+                    "2": "手动录入",
+                  }[value.record.type + ""]
+                  : "-"}
+              </div>
+            )
         }
       },
       {
@@ -588,7 +607,7 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              { value.record?.teachingDate ? dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm") : '-' }
+              {value.record?.teachingDate?dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm"):'-'}
             </div>
           );
         },
@@ -609,12 +628,12 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              { value.record.courseStatus == 0 || value.record.courseStatus == 1
+              {value.record.courseStatus == 0 || value.record.courseStatus == 1
                 ? {
                   "0": "未开课",
                   "1": "已开课",
                 }[value.record.courseStatus + ""] || ""
-                : "-" }
+                : "-"}
             </div>
           )
         }
@@ -648,7 +667,7 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              { value.record?.teaching ? value.record.teaching + '分钟' : '-' }
+              {value.record?.teaching ? value.record.teaching + '分钟' : '-'}
             </div>
           );
         },
@@ -659,8 +678,8 @@ export default {
         key: 'studys',
         ellipsis: true, align: "center",
         width: 120,
-        customRender: ({ text }) => {
-          return text ? text + '人' : '-'
+        customRender: ({text})=>{
+          return text ? text+'人' : '-'
         }
       },
       {
@@ -672,7 +691,7 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              { value.record.score ? Number(value.record.score).toFixed(0) == 0 ? '-' : Number(value.record.score).toFixed(2) + '分' : '-' }
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(2)+'分' : '-'}
             </div>
           )
         }
@@ -686,12 +705,12 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              { value.record.createFrom == "0" || value.record.createFrom == "1"
+              {value.record.createFrom == "0" || value.record.createFrom == "1"
                 ? {
                   "0": "系统生成",
                   "1": "手动录入",
                 }[value.record.createFrom + ""] || ""
-                : "-" }
+                : "-"}
             </div>
           )
         }
@@ -767,9 +786,9 @@ export default {
             state.tableLoading = false
           })
           .catch(err => {
-            state.tableLoading = false
-            message.error(err.data.msg)
-          })
+          state.tableLoading = false
+          message.error(err.data.msg)
+        })
 
     };
     getTableDate()
@@ -784,7 +803,7 @@ export default {
       cancel()
       state.teacherdialog = true;
       state.teacherdialogtitle = '添加授课记录'
-      state.formParam.createFrom = '1'
+      state.formParam.createFrom='1'
       state.vf = true
 
     }
@@ -811,12 +830,12 @@ export default {
     //保存
     const createTeacherDialog = async () => {
       state.formParam.teachingDate = state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : ""
-      if (state.formParam.studys == 0) {
+      if(state.formParam.studys==0){
         state.formParam.studys = null
       }
-      if (state.formParam.score || state.formParam.score == 0) {
+      if(state.formParam.score||state.formParam.score==0){
         state.formParam.score = String(state.formParam.score)
-      } else {
+      }else{
         state.formParam.score = null
       }
       state.formParam.courseStatus = String(state.formParam.courseStatus)
@@ -897,7 +916,7 @@ export default {
         score: null,
         remark: null,
         teachingDate: null,
-        teacherId: null
+        teacherId:null
       }
       state.teachingDate = null
     }
@@ -919,7 +938,7 @@ export default {
       state.teachingdialog = true
       state.lookTeacherId = record.id
       TeacherSystem()
-    }
+    } 
     //取消查看
     const cancelTeachingDialog = () => {
       state.teachingdialog = false
@@ -928,20 +947,18 @@ export default {
     const TeacherSystem = () => {
       getTeacherCourseList({ id: state.lookTeacherId }).then((res) => {
         state.formParam = res.data.data
-        state.teachingDate = res.data.data.teachingDate ? dayjs(res.data.data.teachingDate, 'YYYY-MM-DD HH:mm') : '',
-          state.formParam.name = state.formParam.teacherName
+        state.teachingDate = res.data.data.teachingDate ? dayjs(res.data.data.teachingDate, 'YYYY-MM-DD HH:mm'):'',
+        state.formParam.name=state.formParam.teacherName
         state.formParam.teachingDate = state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : ""
         state.formParam.courseStatus = String(state.formParam.courseStatus)
       })
-      .catch((err) => {
-      });
+        .catch((err) => {
+        });
     }
     function managerChange(e, l, d, t, orgName) {
-      console.log("managerChange e l",e,l)
       // console.log(e, l, d, t, orgName,'e, l, d, t, orgName');
-      state.formParam.mobile = e ? l.mobile : '';
-      state.formParam.teacherId = e ? l.id : '';
-      state.formParam.supplier = e ? l.supplier : '';
+      state.formParam.mobile=e?l.mobile:''
+      state.formParam.teacherId=e?l.id:''
       // state.searchParam.userNo = d;
       // state.searchParam.name = t;
       // state.searchParam.trainorgName=orgName
@@ -956,7 +973,7 @@ export default {
     //导出功能
     const handleExport = () => {
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacherRecord?recordType=2&name=${state.searchParam.name || ""}&courseName=${state.searchParam.courseName || ""}&createFrom=${state.searchParam.createFrom || ""}&beginTime=${state.searchParam.beginTime || ""}&endTime=${state.searchParam.endTime || ""}&courseTypeId=${state.searchParam.courseTypeId || ""}&courseStatus=${state.searchParam.courseStatus || ""}&supplier=${state.searchParam.supplier || ""}`
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacherRecord?recordType=2&name=${state.searchParam.name || ""}&courseName=${state.searchParam.courseName || ""}&createFrom=${state.searchParam.createFrom || ""}&beginTime=${state.searchParam.beginTime|| ""}&endTime=${state.searchParam.endTime || ""}&courseTypeId=${state.searchParam.courseTypeId || ""}&courseStatus=${state.searchParam.courseStatus || ""}&supplier=${state.searchParam.supplier || ""}`
       );
     }
     const clearstudysNumber = () => {
@@ -965,14 +982,14 @@ export default {
     const clearscoreNumber = () => {
       state.formParam.score = state.formParam.score.replace(/\D/g, '');
     }
-    //回车
-    const enterPressHadlerSearch = e => {
-      if (e.keyCode === 13) {
-        searchSubmit()
+        //回车
+const enterPressHadlerSearch = e => {
+    if (e.keyCode === 13) {
+      searchSubmit()
 
-      }
-    };
-    const sendName = () => {
+    }
+};
+const sendName=()=>{
       state.formParam.courseName = state.formParam.courseName.replace(/\s/g, '');
     }
     const blurScore = () => {
@@ -981,7 +998,7 @@ export default {
     const focusScore = () => {
       // state.formParam.score == 0 && (state.formParam.score = null)
     }
-    const sendRemark = () => {
+    const sendRemark=()=>{
       state.formParam.remark = state.formParam.remark.replace(/\s/g, '');
     }
     return {
@@ -1034,11 +1051,10 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
+<style lang="scss" scoped >
 .select .ant-picker {
   width: 410px !important;
 }
-
 .headers {
   height: 73px;
   border-bottom: 1px solid #e8e8e8;
@@ -1057,7 +1073,6 @@ export default {
     // margin-left: 24px;
   }
 }
-
 .addTimeBox {
   position: relative;
   display: flex;
@@ -1329,7 +1344,6 @@ export default {
   margin-right: 14px;
   flex-shrink: 0;
   cursor: pointer;
-
   .search {
     width: 15px;
     height: 16px;

From 26c33caec49fdf27bf34f861a61662fbd3bb8c08 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Sat, 22 Feb 2025 17:49:53 +0800
Subject: [PATCH 150/157] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 5 +++--
 src/views/lecturer/InsideTeaching.vue   | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 6d7687ef..f2661aec 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -328,7 +328,7 @@
         <a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="{'width':'160px'}">
           <a-descriptions-item label="讲师名称">{{ formParam.teacherName ||'-'}}</a-descriptions-item>
           <a-descriptions-item label="手机号码">{{ formParam.mobile  ||'-'}}</a-descriptions-item>
-          <a-descriptions-item label="课程类型">{{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : formParam.type == 2 ? '手动录入' : '-'
+          <a-descriptions-item label="课程类型">{{ formParam.type == 0 ? '在线课' : formParam.type == 1 ?  '面授课' : formParam.type == 2 ? '训练班' : formParam.type == 5 ? '手动录入' : '-'
           }}</a-descriptions-item>
           <a-descriptions-item label="课程名称">{{ formParam.courseName  ||'-'}}</a-descriptions-item>
           <a-descriptions-item label="开课状态">{{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1
@@ -591,7 +591,8 @@ export default {
                   ? {
                     "0": "在线课",
                     "1": "面授课",
-                    "2": "手动录入",
+                    "2": "训练班",
+                    "5": "手动录入",
                   }[value.record.type + ""]
                   : "-"}
               </div>
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index acaa5ce7..d5226a23 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -723,7 +723,8 @@ export default {
       { value: '', label: "全部" },
       { value: '0', label: "在线课" },
       { value: '1', label: "面授课" },
-      { value: '2', label: "手动录入" },
+      { value: '2', label: "训练班" },
+      { value: '5', label: "手动录入" },
     ])
     const scoreList = ref([
       { value: '', label: "全部" },
@@ -821,6 +822,7 @@ export default {
                   ? {
                     "0": "在线课",
                     "1": "面授课",
+                    "2": "训练班",
                     "5": "手动录入",
                   }[value.record.type + ""]
                   : "-"}

From 7023a8bdd91bfbbc46f1b9ac0a158f2aa0672f85 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 24 Feb 2025 09:20:00 +0800
Subject: [PATCH 151/157] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 40 ++++++++++++++++---------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index f2661aec..aaa2325c 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -146,7 +146,6 @@
           <!--讲师名称  teacherName 内容分类 coursetypeid -->
           <a-row :gutter="16">
             <a-col :span="12">
-        
               <a-form-item name="teacherName">
                 <template v-slot:label>
                   <img
@@ -157,14 +156,30 @@
                   讲师名称
                 </template>
                     <ProjectManagerOutTeacher v-model:value="formParam.name" 
-          v-model:name="formParam.teacherName" 
-          placeholder="请输入工号/讲师姓名进行检索"
+                              v-model:name="formParam.teacherName" 
+                              v-model:supplier="formParam.supplier"
+                              placeholder="请输入工号/讲师姓名进行检索"
                               @onChange="managerChange"></ProjectManagerOutTeacher> 
                               
                 <!-- <a-input v-model:value="formParam.teacherName" allowClear showSearch class="draitem"
                   placeholder="请输入讲师姓名"></a-input> -->
               </a-form-item>
             </a-col>
+            <a-col :span="12">
+              <a-form-item name="supplier">
+                <template v-slot:label>
+                  <img style="margin-right:4px;width: 7px;height: 7px"
+                    src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                  供应商
+                </template>
+                <!-- TODO GX01 -->
+                <a-input class="draitem" v-model:value="formParam.supplier" disabled :maxlength="20" showCount >
+                </a-input>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <!-- 课程名称：name  开课状态 courseStatus-->
+          <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item name="courseTypeId">
                 <template v-slot:label>
@@ -187,9 +202,6 @@
                 </a-tree-select>
               </a-form-item>
             </a-col>
-          </a-row>
-          <!-- 课程名称：name  开课状态 courseStatus-->
-          <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item name="courseName">
                 <template v-slot:label>
@@ -212,6 +224,10 @@
                 </a-radio-group>
               </a-form-item>
             </a-col> -->
+            
+          </a-row>
+          <!-- 授课日期 teachingDate  授课时长defaultTeachingTime-->
+          <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item name="teachingDate">
                 <template v-slot:label>
@@ -226,10 +242,6 @@
                   placeholder="请选择课程日期" />
               </a-form-item>
             </a-col>
-          </a-row>
-          <!-- 授课日期 teachingDate  授课时长defaultTeachingTime-->
-          <a-row :gutter="16">
-            
             <a-col :span="12">
               <a-form-item name="teaching">
                 <template v-slot:label>
@@ -249,6 +261,9 @@
                 <span style="margin-left: 5px ;" v-if="formParam.teaching == null">0.00小时</span> -->
               </a-form-item>
             </a-col>
+          </a-row>
+          <!-- 参训人数 studys评分  score-->
+          <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item name="studys">
                 <template v-slot:label>
@@ -264,10 +279,6 @@
                 </a-input>
               </a-form-item>
             </a-col>
-          </a-row>
-          <!-- 参训人数 studys评分  score-->
-          <a-row :gutter="16">
-            
             <a-col :span="12">
               <a-form-item name="score">
                 <template v-slot:label>
@@ -327,6 +338,7 @@
         </div>
         <a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="{'width':'160px'}">
           <a-descriptions-item label="讲师名称">{{ formParam.teacherName ||'-'}}</a-descriptions-item>
+          <a-descriptions-item label="供应商">{{ formParam.supplier || '-' }}</a-descriptions-item>
           <a-descriptions-item label="手机号码">{{ formParam.mobile  ||'-'}}</a-descriptions-item>
           <a-descriptions-item label="课程类型">{{ formParam.type == 0 ? '在线课' : formParam.type == 1 ?  '面授课' : formParam.type == 2 ? '训练班' : formParam.type == 5 ? '手动录入' : '-'
           }}</a-descriptions-item>

From 80cca534c343418617e9c5957846b2a50db3e45e Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 24 Feb 2025 09:26:39 +0800
Subject: [PATCH 152/157] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ProjectManagerOutTeacher.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/project/ProjectManagerOutTeacher.vue b/src/components/project/ProjectManagerOutTeacher.vue
index 1a16c7fd..883d96cb 100644
--- a/src/components/project/ProjectManagerOutTeacher.vue
+++ b/src/components/project/ProjectManagerOutTeacher.vue
@@ -56,7 +56,7 @@ const props = defineProps({
 
 const selectOptions = ref([]);
 
-const supplier = ref('')
+// const supplier = ref('')
 
 
 const managerArray = computed(() => (props.value === "" ? null : props.value));

From 3814df00f689fe7585382d75f14c7f9bfdb5df19 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 24 Feb 2025 09:33:58 +0800
Subject: [PATCH 153/157] =?UTF-8?q?Bug=20=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ProjectManagerOutTeacher.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/project/ProjectManagerOutTeacher.vue b/src/components/project/ProjectManagerOutTeacher.vue
index 883d96cb..c1d0f6be 100644
--- a/src/components/project/ProjectManagerOutTeacher.vue
+++ b/src/components/project/ProjectManagerOutTeacher.vue
@@ -87,6 +87,8 @@ const getOutTeacher = () => {
       userList.value = res.data.data.records;
       loading.value = false;
     }
+  }).catch(error=>{
+    console.log("ProjectManagerOutTeacher getTeacherList error ",error);
   });
 };
 const options = computed(() =>

From 6911ebbcd545c4f46bc7a85d37c22e45b0f62154 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 24 Feb 2025 13:45:47 +0800
Subject: [PATCH 154/157] =?UTF-8?q?Bug=20=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index d5226a23..bed6bd73 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -512,7 +512,7 @@
       </a-modal>
     </div>
     <!-- 导入01 -->
-    <ImportWork v-model:showWork="showWork" :template="'/admin/export/exportRecordTemplate'" :title="title"></ImportWork>
+    <ImportWork v-model:showWork="showWork" :template="'/admin/export/exportRecordTemplate'" :url="'/admin/export/importInTeacherRecord'" :title="title"></ImportWork>
     <!-- <div> <Upload/> </div>         -->
   </div>
 </template>
@@ -1000,9 +1000,6 @@ export default {
           label: '全部', value: ''
         })
         state.filterOrgListSearch = state.orgListSearch;
-
-
-
       })
     }
     //TODO5

From 3dacecf10e9580868fc7922a1b9e4a43f4ff73c6 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 24 Feb 2025 14:59:03 +0800
Subject: [PATCH 155/157] =?UTF-8?q?=E5=A4=96=E9=83=A8=E8=AE=B2=E5=B8=88?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalLecturer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index bd033720..ffb25a52 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -815,7 +815,7 @@ export default {
     //导出功能
     const handleExport = () => {  
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacher?name=${state.searchParam.name || ""}&status=${state.searchParam.status || ""}`
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacher?name=${state.searchParam.name || ""}&status=${state.searchParam.status || ""}&teacherType=${state.searchParam.teacherType || ""}`
       );
       //   this.download('lesson_records/export', {
       //             ...state.searchParam

From 74b1c690cd50eb9cf25a334fc3c63bea911d6bcc Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 24 Feb 2025 15:06:11 +0800
Subject: [PATCH 156/157] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/lecturer/ImportWork.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/lecturer/ImportWork.vue b/src/components/lecturer/ImportWork.vue
index 4fcf87d2..a0fcca19 100644
--- a/src/components/lecturer/ImportWork.vue
+++ b/src/components/lecturer/ImportWork.vue
@@ -144,7 +144,7 @@
                               : require('../../assets/images/success.png')
                           "
                         />
-                        <div
+                        <!-- <div
                           style="margin-left: 8px"
                           :style="{
                             color: errNum ? '#ff7474' : 'rgba(0,0,0,0.65)',
@@ -153,7 +153,7 @@
                           {{ succNum }}条数据导入成功，{{
                             errNum
                           }}条数据导入失败
-                        </div>
+                        </div> -->
                       </div>
                     </div>
                   </div>

From 9742b2e4be8bd4069307ed1a0011d96ba76befc8 Mon Sep 17 00:00:00 2001
From: gengxin <gengxin@tojoy1.com>
Date: Mon, 24 Feb 2025 15:11:16 +0800
Subject: [PATCH 157/157] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/lecturer/ImportWork.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/lecturer/ImportWork.vue b/src/components/lecturer/ImportWork.vue
index a0fcca19..0bdf26f0 100644
--- a/src/components/lecturer/ImportWork.vue
+++ b/src/components/lecturer/ImportWork.vue
@@ -118,7 +118,7 @@
                           </div>
                         </div>
                       </div>
-                      <div
+                      <!-- <div
                         v-if="uploadpercent === 100"
                         class="defeat"
                         style="
@@ -143,7 +143,7 @@
                               ? require('../../assets/images/err.png')
                               : require('../../assets/images/success.png')
                           "
-                        />
+                        /> -->
                         <!-- <div
                           style="margin-left: 8px"
                           :style="{
@@ -154,7 +154,7 @@
                             errNum
                           }}条数据导入失败
                         </div> -->
-                      </div>
+                      <!-- </div> -->
                     </div>
                   </div>
                 </div>