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] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E6=A1=86?=
 =?UTF-8?q?=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;