From 826aea3e74b01c1919b15f8c6a649d2602e7eeee Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 19 Dec 2024 16:05:16 +0800
Subject: [PATCH 01/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index ac423528..19e7724d 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -788,8 +788,7 @@ export default {
     //导出功能
     const handleExport = () => {  
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacher?pageNo=${state.searchParam.pageNo
-        }&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}`
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacher?name=${state.searchParam.name || ""}&status=${state.searchParam.status || ""}`
       );
       //   this.download('lesson_records/export', {
       //             ...state.searchParam
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index ffa71ada..c7993415 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -963,7 +963,7 @@ export default {
     //导出功能
     const handleExport = () => {
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacherRecord?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&recordType=2&name=${state.searchParam.name ? state.searchParam.name : ""}&courseName=${state.searchParam.courseName ? state.searchParam.courseName : ""}&createFrom=${state.searchParam.createFrom ? state.searchParam.createFrom : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}&courseTypeId=${state.searchParam.courseTypeId ? state.searchParam.courseTypeId : ""}&courseStatus=${state.searchParam.courseStatus ? state.searchParam.courseStatus : ""}`
+        `${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 = () => {
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 180d5409..75bcda76 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -1343,7 +1343,7 @@ export default {
     //导出功能
     const handleExport = () => {
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacher?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""}&tsystemId=${state.searchParam.tsystemId ? state.searchParam.tsystemId : ""}&tLevelName=${state.searchParam.tLevelName ? state.searchParam.tLevelName : "" }&waitStatus=${state.searchParam.waitStatus ? state.searchParam.waitStatus : ""}&certStatus=${state.searchParam.certStatus ? state.searchParam.certStatus : ""}&courses=${state.searchParam.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
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 1278b48e..72b40c60 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -1357,7 +1357,7 @@ export default {
     //导出功能
     const handleExport = () => {
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacherRecord?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&recordType=1&name=${state.searchParam.name ? state.searchParam.name : ''}&courseName=${state.searchParam.courseName ? state.searchParam.courseName : ''}&createFrom=${state.searchParam.createFrom ? state.searchParam.createFrom : ''}&courseStatus=${state.searchParam.courseStatus ? state.searchParam.courseStatus : ''}&tSystemId=${state.searchParam.tSystemId ? state.searchParam.tSystemId : ''}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ''}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ''}&orgId=${state.searchParam.orgId ? state.searchParam.orgId : ''}&courseTypeId=${state.searchParam.courseTypeId ? state.searchParam.courseTypeId : ''}&score=${state.searchParam.score ? state.searchParam.score : ''}&studys=${state.searchParam.studys ? state.searchParam.studys : ' '}
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacherRecord?recordType=1&name=${state.searchParam.name || ''}&courseName=${state.searchParam.courseName || ''}&createFrom=${state.searchParam.createFrom || ''}&courseStatus=${state.searchParam.courseStatus || ''}&tSystemId=${state.searchParam.tSystemId || ''}&beginTime=${state.searchParam.beginTime || ''}&endTime=${state.searchParam.endTime || ''}&orgId=${state.searchParam.orgId || ''}&courseTypeId=${state.searchParam.courseTypeId || ''}&score=${state.searchParam.score || ''}&studys=${state.searchParam.studys || ''}
       `)
       console.log(state.searchParam.name, state.searchParam, '参数')
     }
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 915fbbeb..d7ac9812 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -1726,8 +1726,8 @@ const column = ref([
       //导出功能
       const handleExport = ()=>{
         window.open (
-          `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherExpense?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""
-          }&trainOrgId=${ state.searchParam.trainOrgId ?  state.searchParam.trainOrgId : ""}&type=${state.searchParam.type ? state.searchParam.type : ""}&tsystemId=${ state.searchParam.tSystemId ?  state.searchParam.tSystemId : ""}&tLevelName=${ state.searchParam.tLevelName ? state.searchParam.tLevelName : ""}&beginTime=${state.searchParam.beginTime ?  state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ?  state.searchParam.endTime : ""}`
+          `${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 || ""}&tSystemId=${ state.searchParam.tSystemId || ""}&tLevelName=${ state.searchParam.tLevelName || ""}&beginTime=${state.searchParam.beginTime || ""}&endTime=${state.searchParam.endTime || ""}`
         );
         // this.download('lesson_records/export', {
         //           ...state.searchParam

From 67761e6a7fc2de1edf78778607fb530bef0f7012 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 19 Dec 2024 17:53:58 +0800
Subject: [PATCH 02/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/BatchLecturer.vue | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/components/project/BatchLecturer.vue b/src/components/project/BatchLecturer.vue
index b6dc7d5d..3feea00d 100644
--- a/src/components/project/BatchLecturer.vue
+++ b/src/components/project/BatchLecturer.vue
@@ -6,7 +6,7 @@
     placement="right"
     width="70%"
   >
-    <div class="drawerMains">
+    <div class="drawerMains" ref="drawerContent">
       <div class="headers" style="margin-top:-24px;">
         <div class="headerTitle">{{ name }}</div>
         <img
@@ -33,12 +33,13 @@
           <div class="table" style="padding-bottom:72px;">
             <a-table
               :columns="columns"
-              :data-source="searchTrue?searchList:tableData"
+              :data-source="tableData"
               :pagination="false"
               :scroll="{ x: 'max-content' }"
               row-key="id"
               :loading="loading"
               :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+              :custom-row="customRow"
             >
               <template #action="{ record }">
                 <div class="action">
@@ -71,6 +72,14 @@ const props = defineProps({
     default: ""
   }
 });
+const drawerContent = ref(null)
+const customRow = (record) => {
+  return {
+    style:{
+      backgroundColor: searchTrue.value && searchList.value.some(item => item.id === record.id) ? '#b1ffbd !important' : '',
+    }
+  };
+};
 watch(()=>props.visible,(val)=>{
   if(val){
     loading.value = true
@@ -100,6 +109,7 @@ const resetData = () => {
   searchData(false)
 }
 const searchData = (val) => {
+  // drawerContent.value.scrollTo({top:200,behavior: 'smooth'})
   searchTrue.value = val
   if(!nameUserNo.value&&!dateValue.value){
     searchList.value = tableData.value;
@@ -121,6 +131,11 @@ const searchData = (val) => {
     return isNameMatch || isDateInRange;
   });
   searchList.value = filteredList;
+  let scrollHeight = null
+  filteredList.length && (scrollHeight = tableData.value.findIndex(item => item.id === filteredList[0].id))
+  if(scrollHeight||scrollHeight==0){
+    drawerContent.value.scrollTo({top:(scrollHeight+1)*50+200,behavior: 'smooth'})
+  }
 }
 const loading = ref(false)
 const selectedRowKeys = ref([])
@@ -300,12 +315,12 @@ const queryDrawer = () => {
 
 <style lang="scss" scoped>
 
-
 .largeDrawerInside {
   .drawerMains {
     min-width: 600px;
     // margin: 0px 32px 0px 32px;
-    overflow-x: auto;
+    height:100%;
+    overflow: auto;
     display: flex;
     flex-direction: column;
     padding:24px;
@@ -319,6 +334,7 @@ const queryDrawer = () => {
       margin-bottom: 20px;
 
       .headerTitle {
+        margin: 24px 0;
         font-size: 18px;
         font-weight: 600;
         color: #333333;

From 03914f1cab00ef9106ebbd65595ceb4418971ce0 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Fri, 20 Dec 2024 09:03:33 +0800
Subject: [PATCH 03/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalLecturer.vue |  4 ++--
 src/views/lecturer/ExternalTeaching.vue |  8 ++++----
 src/views/lecturer/InsideLecturer.vue   |  8 ++++----
 src/views/lecturer/InsideTeaching.vue   |  8 ++++----
 src/views/lecturer/LecturerFee.vue      | 10 +++++-----
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index 19e7724d..7078b132 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -397,8 +397,8 @@ export default {
     };
     const AccountStatusList = ref([
     { value: '', label: "全部" },
-      { value: 1, label: "启用" },
-      { value: 2, label: "停用" },
+      { value: '1', label: "启用" },
+      { value: '2', label: "停用" },
     ])
     const columns = ref([
       {
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index c7993415..df3ed142 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -525,13 +525,13 @@ export default {
     }
     const AuthenticationStatusList = ref([
     { value: '', label: "全部" },
-      { value: 0, label: "未开课" },
-      { value: 1, label: "已开课" },
+      { value: '0', label: "未开课" },
+      { value: '1', label: "已开课" },
     ])
     const entryTypeList = ref([
     { value: '', label: "全部" },
-      { value: 0, label: "系统生成" },
-      { value: 1, label: "手动录入" },
+      { value: '0', label: "系统生成" },
+      { value: '1', label: "手动录入" },
     ])
     const columns = ref([
 
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 75bcda76..d50d3a7f 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -712,13 +712,13 @@ export default {
     changetlevel()
     const OnTheJobStatusList = ref([
       { value:"", label: "全部" },
-      { value: 0, label: "在职" },
-      { value: 1, label: "离职" },
+      { value: '0', label: "在职" },
+      { value: '1', label: "离职" },
     ])
     const AuthenticationStatusList = ref([
       { value: "", label: "全部" },
-      { value: 0, label: "未认证" },
-      { value: 1, label: "已认证" },
+      { value: '0', label: "未认证" },
+      { value: '1', label: "已认证" },
     ])
     // const PlaceOfPayList = ref([
     //   // { value: 0, label: "发薪地B1" },
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 72b40c60..482b10a8 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -678,13 +678,13 @@ export default {
     ])
     const AuthenticationStatusList = ref([
       { value: '', label: "全部" },
-      { value: 0, label: "未开课" },
-      { value: 1, label: "已开课" },
+      { value: '0', label: "未开课" },
+      { value: '1', label: "已开课" },
     ])
     const entryTypeList = ref([
       { value: '', label: "全部" },
-      { value: 0, label: "系统生成" },
-      { value: 1, label: "手动录入" },
+      { value: '0', label: "系统生成" },
+      { value: '1', label: "手动录入" },
     ])
     const scoreList = ref([
       { value: '', label: "全部" },
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index d7ac9812..9562437d 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -721,11 +721,11 @@
       ])
       //认证状态
       const AuthenticationStatusList = ref([
-        { value: 0, label: "待确认" },
-        { value: 1, label: "待审核" },
-        { value: 2, label: "审核中" },
-        { value: 4, label: "审核拒绝" },
-        { value: 3, label: "审核通过" },
+        { value: '0', label: "待确认" },
+        { value: '1', label: "待审核" },
+        { value: '2', label: "审核中" },
+        { value: '4', label: "审核拒绝" },
+        { value: '3', label: "审核通过" },
       ])
 
       const lecturerSystemList = ref([

From 541de94696afabcb2170748929a8da7264bac773 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Fri, 20 Dec 2024 14:46:49 +0800
Subject: [PATCH 04/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9=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/InsideTeaching.vue  | 2 +-
 src/views/lecturer/LecturerFee.vue     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/lecturer/ImportWork.vue b/src/components/lecturer/ImportWork.vue
index 30e51dbe..3b3b1f4f 100644
--- a/src/components/lecturer/ImportWork.vue
+++ b/src/components/lecturer/ImportWork.vue
@@ -295,7 +295,7 @@ import {getCookieForName} from "@/api/method";
         }
       };
       function downTemplate() {
-        window.open(`${process.env.VUE_APP_BASE}/template/${props.template}.xlsx`);
+        window.open(`${process.env.VUE_APP_BOE_API_URL}/upload/template/${props.template}`);
       }
 
       return {
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 482b10a8..e1c2c8a0 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -486,7 +486,7 @@
         </div>
       </a-modal>
     </div>
-    <ImportWork v-model:showWork="showWork" :template="'内部授课记录导入模板'" :url="'/admin/export/importInTeacherRecord'" :title="title"></ImportWork>
+    <ImportWork v-model:showWork="showWork" :template="'内部讲师授课记录导入模板-20241220.xlsx'" :url="'/admin/export/importInTeacherRecord'" :title="title"></ImportWork>
     <!-- <div> <Upload/> </div>         -->
   </div>
 </template>
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 9562437d..792ba759 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -561,7 +561,7 @@
       </div> -->
     </div>
 </a-drawer>
-<ImportWork v-model:showWork="showWork" :template="'讲师费导入模板'" :url="'/admin/export/importTeacherExpense'" :fileName="uploadFile" :title="title"></ImportWork>
+<ImportWork v-model:showWork="showWork" :template="'讲师费导入模板-20241220.xlsx'" :url="'/admin/export/importTeacherExpense'" :fileName="uploadFile" :title="title"></ImportWork>
     </div>
     <!-- 一键确认讲师费 -->
     <ConfirmLecturer @visibleFalse="visibleAll" :ids="selectsIds" v-model:visible="visibleConfirm" :name="'确认讲师费'" />

From ceb9c0cf5968cdd62b9a8bed1317d3b495684e08 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Fri, 20 Dec 2024 17:50:11 +0800
Subject: [PATCH 05/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ConfirmLecturer.vue |  6 +++---
 src/components/project/lockLecturer.vue    | 20 ++++++++++----------
 src/views/lecturer/LecturerAPPEdit.vue     |  2 +-
 src/views/lecturer/LecturerApproval.vue    |  8 ++++----
 src/views/lecturer/LecturerFee.vue         |  4 ++--
 src/views/lecturer/Organization.vue        |  2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index 6964f98f..2a59d042 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -60,8 +60,8 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1" @click="config">确认提交审批</button>
-        <button class="btn1" @click="qureyDrawer">确认至审批中心</button>
+        <button class="btn1" @click="config">提交审批</button>
+        <button class="btn1" @click="qureyDrawer">保存至审批中心</button>
         <button class="btn2" @click="closeDrawer">取消</button>
       </div>
     </div>
@@ -218,7 +218,7 @@ const removeId = (e,i) =>{
       }else{
         expenseList.value = expenseList.value.filter(item=>item.id !== e.id)
       }
-      forData.value[indexList.value].summaryTotal = forData.value[indexList.value]?.summaryTotal - e.payableExpense
+      forData.value[indexList.value].summaryTotal = (forData.value[indexList.value]?.summaryTotal - e.payableExpense).toFixed(2)
       if(!forData.value[indexList.value].expenseList.length){
         forData.value.splice(indexList.value,1)
         forData.value.length > 0 && clickItem(forData.value[0],0)
diff --git a/src/components/project/lockLecturer.vue b/src/components/project/lockLecturer.vue
index 65ece596..5adba2a3 100644
--- a/src/components/project/lockLecturer.vue
+++ b/src/components/project/lockLecturer.vue
@@ -64,11 +64,11 @@
             <a-tab-pane key="2" tab="审批记录" force-render>
               <div style="margin-bottom: 20px">
                 <a-table :columns="columnsTwo" :loading="formData?.loadingTwo" :data-source="formData?.tableDataTwo" :pagination="pagination">
-                  <template #action="{ record }">
+                  <!-- <template #action="{ record }">
                     <div class="action">
                       <div style="color: #1890ff;cursor: pointer;" class="btn" @click="lookList(record)">查看</div>
                     </div>
-                  </template>
+                  </template> -->
                 </a-table>
               </div>
               <!-- <div style="margin-bottom: 100px">
@@ -244,18 +244,18 @@ const columnsTwo = ref([
     }
   },
   {
-    title: '审批人',
+    title: '提交人',
     dataIndex: 'employeeName',
     key: 'employeeName',
     align: 'center',
   },
-  {
-    title: '操作',
-    dataIndex: 'address',
-    key:'age',
-    align: 'center',
-    slots: { customRender: "action" },
-  }
+  // {
+  //   title: '操作',
+  //   dataIndex: 'address',
+  //   key:'age',
+  //   align: 'center',
+  //   slots: { customRender: "action" },
+  // }
 ])
 const approvalData = ref(null)
 const threeList = ref(false)
diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue
index fae0ce32..47173fdd 100644
--- a/src/views/lecturer/LecturerAPPEdit.vue
+++ b/src/views/lecturer/LecturerAPPEdit.vue
@@ -837,7 +837,7 @@ export default {
           }).then(res=>{
             message.success('移除成功')
             search()
-            state.formData.summaryTotal = Number(state.formData.summaryTotal) - Number(record.expense)
+            state.formData.summaryTotal = (Number(state.formData.summaryTotal) - Number(record.expense)).toFixed(2)
           }).catch(err=>{
             message.error(err.msg)
           })
diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 09d31213..6b6673d6 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -95,7 +95,7 @@
                   <!-- <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" type="link" @click="withdraw(record)">撤回</a-button>
+                  <a-button v-if="record.status == 2&&false" type="link" @click="withdraw(record)">撤回</a-button>
                 </a-space>
               </template>
             </template>
@@ -136,9 +136,9 @@
 <a-descriptions style="margin-top:16px" bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
     <a-descriptions-item label="审批编号">{{formParam?.approvalNumber||'-'}}</a-descriptions-item>
     <a-descriptions-item label="培训发生组织">{{formParam?.trainOrgName||'-'}}</a-descriptions-item>
-    <a-descriptions-item v-if="activeKey==2" label="汇总周期" >{{formParam?.summaryDate||'-'}}</a-descriptions-item>
-    <a-descriptions-item label="提交时间">{{formParam?.approvalSubmitTime||'-'}}</a-descriptions-item>
+    <a-descriptions-item label="汇总时间" >{{formParam?.summaryTime||'-'}}</a-descriptions-item>
     <a-descriptions-item label="汇总金额">{{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> -->
@@ -165,7 +165,7 @@
       </div>
     </div>
   </a-tab-pane>
-  <a-tab-pane key="2" tab="讲师费审批记录" force-render>
+  <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">
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 792ba759..3cfb816c 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -536,11 +536,11 @@
     <a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'已完成', 4:'拒绝',5:'待提交'}[formParam?.status]}}</a-descriptions-item>
     <a-descriptions-item label="备注  ">{{formParam.remark || '-'}}</a-descriptions-item>
   </a-descriptions>
-  <div style="margin-bottom: 20px;">
+  <div style="margin-bottom: 20px;" v-if="false">
     <span class="line"></span>
     <span style="font-weight: 600;">讲师费审批</span>
   </div>
-  <div style="margin-bottom:32px;">
+  <div style="margin-bottom:32px;" v-if="false">
     <a-table :columns="columnSee" :loading="SeeLoading" :data-source="tableDataSee"  :pagination="false" />
   </div>
   <!-- <span class="line"></span> -->
diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index 72533d9e..279b8a05 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -39,7 +39,7 @@
                     <div style="color: #1890ff;cursor: pointer;">查看</div>
                 </lockLecturer>
                 <a-button v-if="record.status!=2" type="link" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
-                <a-button v-if="record.status==2" type="link" @click="() => updateModal(record)">撤回</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-space>
             </template>

From 9de8eb61d8335f3e649e7050cd44eeafc3f0c03c Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Sat, 21 Dec 2024 16:13:30 +0800
Subject: [PATCH 06/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/BatchLecturer.vue      | 10 +++++---
 src/components/project/ConfirmLecturer.vue    | 10 +++++---
 .../project/LookExternalLecturer.vue          |  7 ++++++
 src/components/project/LookInsideLecturer.vue |  7 ++++++
 src/views/courselibrary/CoursewareManage.vue  |  2 +-
 src/views/lecturer/ExternalLecturer.vue       | 24 ++++++++++++++++---
 src/views/lecturer/ExternalTeaching.vue       |  9 ++++++-
 src/views/lecturer/InsideTeaching.vue         | 13 +++++++---
 src/views/lecturer/LecturerAPPEdit.vue        | 11 +++++++--
 src/views/lecturer/LecturerApproval.vue       | 13 +++++++---
 src/views/lecturer/LecturerFee.vue            | 22 +++++++++++------
 11 files changed, 102 insertions(+), 26 deletions(-)

diff --git a/src/components/project/BatchLecturer.vue b/src/components/project/BatchLecturer.vue
index 3feea00d..8cfa4f2b 100644
--- a/src/components/project/BatchLecturer.vue
+++ b/src/components/project/BatchLecturer.vue
@@ -267,9 +267,13 @@ const columns = [
     dataIndex: 'score',
     key: 'score',
     align: 'center',
-    customRender: ({ text })=>{
-      return text||'-'
-    }
+    customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
+        }
   },
   {
     title: '课酬基准',
diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index 2a59d042..8025c755 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -362,9 +362,13 @@ const columns = [
     dataIndex: 'score',
     key: 'score',
     align: 'center',
-    customRender: ({ text })=>{
-      return text||'-'
-    }
+    customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
+        }
   },
   {
     title: '课酬基准',
diff --git a/src/components/project/LookExternalLecturer.vue b/src/components/project/LookExternalLecturer.vue
index 40f768be..6b70c534 100644
--- a/src/components/project/LookExternalLecturer.vue
+++ b/src/components/project/LookExternalLecturer.vue
@@ -227,6 +227,13 @@ export default{
         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(0) : '-'}
+            </div>
+          )
+        }
       },
       {
         title: '开课状态',
diff --git a/src/components/project/LookInsideLecturer.vue b/src/components/project/LookInsideLecturer.vue
index 989652e8..e1af1015 100644
--- a/src/components/project/LookInsideLecturer.vue
+++ b/src/components/project/LookInsideLecturer.vue
@@ -290,6 +290,13 @@ export default{
         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(0) : '-'}
+            </div>
+          )
+        }
       },
       {
         title: '开课状态',
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 1f7c1ea4..4180f2d9 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -4080,7 +4080,7 @@ function onFocusEnd(){
       editPlan(postData)
         .then((res) => {
           if(res.data.code == 200){
-            getTableDate3();
+            handleSearchTable();
             handleCancelStu();
             rest();
           }else{
diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index 7078b132..c0fce274 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -142,7 +142,7 @@
           <a-row :gutter="16">
             <a-col :span="24">
               <a-form-item label="手机号码" name="mobile" prop="mobile">
-                  <a-input  v-model:value.trim="formParam.mobile"  class="draitem"
+                  <a-input type="number" v-model:value.trim="formParam.mobile"  class="draitem"
                     placeholder="请输入手机号码" allowClear showSearch   :maxLength="11" @blur="sendPhone">
                   </a-input>
               </a-form-item>
@@ -316,6 +316,8 @@ export default {
     const router = useRouter();
     const userInfo = computed(() => store.state.userInfo);
     const state = reactive({
+      phoneEmil: 0,
+      phoneEmilTwo: 0,
       lookExternalVisi:false,
       lookExterId: null,
       currentPage1: 1,
@@ -527,6 +529,8 @@ export default {
     // 新增讲师
     const addTeacher = () => {
       cancel()
+      state.phoneEmil = 0
+      state.phoneEmilTwo = 0
       state.teacherdialog = true;
       state.teacherdialogtitle = '新增讲师'
       // state.formParam.photo =userInfo.value?.avatar
@@ -538,6 +542,8 @@ export default {
     
     //修改讲师信息弹窗
     const handleModify = (record) => {
+      state.phoneEmil = 0
+      state.phoneEmilTwo = 0
       state.teacherdialog = true;
       state.teacherdialogtitle = '编辑讲师'
       state.id = record.id
@@ -566,6 +572,14 @@ export default {
           return message.error(rules[formItemNames[i]][0].log)
         }
       }
+      if(state.phoneEmil){
+          message.destroy()
+          return message.warning( '手机号格式不正确')
+      }
+      if(state.phoneEmilTwo){
+         message.destroy()
+          return message.warning( '邮箱格式不正确')
+      }
       state.formParam.description = repl(state.formParam.description)
       state.formParam = {...state.formParam}
       if (state.vf == false) {
@@ -745,24 +759,28 @@ export default {
       state.formParam.name = state.formParam?.name?.replace(/\s/g, '');
     }
     const sendPhone=()=>{
+      state.phoneEmil = 0
       console.log(state.formParam.mobile)
       const reg = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/;
       if (!state.formParam.mobile) {
       } else if (!reg.test(state.formParam.mobile)) {
         message.warning( '手机号格式不正确')
-        state.formParam.mobile=''
+        // state.formParam.mobile=''
+        state.phoneEmil = 1
         // state.formParam.mobile = state.formParam.mobile.replace(/\D/g, '');
       }
       
     }
     const sendEmail=()=>{
+      state.phoneEmilTwo = 0
       const reg = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.\w{2,}$/;
       if(!state.formParam.email){
         return
       }
       if (!reg.test(state.formParam.email)) {
         message.warning( '邮箱格式不正确')
-        state.formParam.email=''
+        // state.formParam.email=''
+        state.phoneEmilTwo = 2
         // state.formParam.email = state.formParam.email.replace( /[\u4e00-\u9fa5]/g, '');
       }
     }
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index df3ed142..fd8ef57c 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -341,7 +341,7 @@
             <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  ||'-'}}</a-descriptions-item>
+          <a-descriptions-item label="评分  ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0):'-'}}</a-descriptions-item>
           <a-descriptions-item label="参训人数  ">{{ formParam.studys  ||'-'}}</a-descriptions-item>
           <a-descriptions-item label="备注  " :span="2">{{ formParam.remark ||'-' }}</a-descriptions-item>
         </a-descriptions>
@@ -700,6 +700,13 @@ export default {
         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(0) : '-'}
+            </div>
+          )
+        }
       },
 
       {
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index e1c2c8a0..bcec7113 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -423,7 +423,7 @@
             ).toFixed(2) }}小时)</span> </a-descriptions-item>
           <a-descriptions-item label="授课/课程日期  ">{{ formParam.teachingDate||'-' }}</a-descriptions-item>
           <a-descriptions-item label="参训人数  ">{{ formParam.studys||'-' }}</a-descriptions-item>
-          <a-descriptions-item label="评分  ">{{ formParam.score||'-' }}</a-descriptions-item>
+          <a-descriptions-item label="评分  ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0):'-' }}</a-descriptions-item>
           <a-descriptions-item label="内容分类">{{ formParam.courseTypeName||'-' }}</a-descriptions-item>
           <a-descriptions-item label="备注  ">{{ formParam.remark||'-' }}</a-descriptions-item>
         </a-descriptions>
@@ -881,6 +881,13 @@ export default {
         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(0) : '-'}
+            </div>
+          )
+        }
       },
       {
         title: '是否生成课时费 ',
@@ -1340,8 +1347,8 @@ export default {
       getExpenseByCourseId({ courseId: record.courseId })
         .then((res) => {
           console.log(res)
-          tableDatas.value = res.data.data.records
-          state.tableDataTotal = Number(res.data.data.total);
+          tableDatas.value = res.data.data
+          // state.tableDataTotal = Number(res.data.data.total);
         }).catch(err => {
           message.destroy()
         })
diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue
index 47173fdd..c2020f47 100644
--- a/src/views/lecturer/LecturerAPPEdit.vue
+++ b/src/views/lecturer/LecturerAPPEdit.vue
@@ -893,6 +893,9 @@ export default {
         ellipsis: true,
         align: "center",
         width: 160,
+        customRender: ({text}) => {
+          return text || '-'
+        }
       },
       {
         title: '课程类型',
@@ -966,8 +969,12 @@ export default {
         ellipsis: true,
         align: "center",
         width: 160,
-        customRender: ({text}) => {
-          return text || "-";
+        customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
         }
       },
       {
diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 6b6673d6..58ec5f0e 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -959,6 +959,9 @@
           ellipsis: true,
           align: "center",
           width: 120,
+          customRender: ({text}) => {
+          return text || '-'
+        }
         },
         {
           title: '基准课酬 ',
@@ -994,9 +997,13 @@
           ellipsis: true,
           align: "center",
           width: 120,
-          customRender: ({text}) => {
-            return text || "-";
-          }
+          customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
+        }
         },
         {
           title: '课程类型 ',
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 3cfb816c..c7c8eab7 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -528,7 +528,7 @@
     <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 || '-'}}</a-descriptions-item>
-    <a-descriptions-item label="评分  ">{{formParam.score || '-'}}</a-descriptions-item>
+    <a-descriptions-item label="评分  ">{{formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0):'-' }}</a-descriptions-item>
     <a-descriptions-item label="课酬基准  ">{{formParam.levelPay || '-'}}</a-descriptions-item>
     <a-descriptions-item label="计划费用  ">{{formParam.expense || '-'}}</a-descriptions-item>
     <!-- <a-descriptions-item label="应发费用  ">{{formParam.payableExpense || '-'}}</a-descriptions-item> -->
@@ -997,9 +997,13 @@ getAllLevelList().then((res) => {
           key: 'score',
         ellipsis: true, align: "center",
           width: 120,
-          customRender: ({ text })=>{
-            return text||'-'
-          }
+          customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
+        }
         },
         {
           title: '课程类型 ',
@@ -1640,9 +1644,13 @@ const column = ref([
           key: 'courseAssess',
         ellipsis: true, align: "center",
           width: 120,
-          customRender: ({ text })=>{
-            return text||'-'
-          }
+          customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
+        }
         },
         {
           title: '课程类型 ',

From f5bb824397b7a55e217aa70eb567a46feaf60ad5 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 23 Dec 2024 09:14:56 +0800
Subject: [PATCH 07/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 33 ++++++++++++++------
 src/views/lecturer/InsideTeaching.vue        | 29 ++++++++---------
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 4180f2d9..85747eed 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -4474,9 +4474,13 @@ function onFocusEnd(){
       dialog({
         content: "确定撤回吗？",
         ok: () => {
-          message.success("撤回成功");
-          record.publishStatus ? (state.tableData1[index].publishStatus = 0) : (state.tableData1[index].auditStatus = 0);
-          handle({ offcourseId: id, type: 0 });
+          handle({ offcourseId: id, type: 0 }).then(res=>{
+            message.success("撤回成功");
+            record.publishStatus ? (state.tableData1[index].publishStatus = 0) : (state.tableData1[index].auditStatus = 0);
+          }).catch(err=>{
+            message.destroy();
+            message.error(err.data.msg);
+          })
         },
       });
     };
@@ -4860,10 +4864,14 @@ function onFocusEnd(){
       dialog({
         content: "确定删除该课程吗？",
         ok: async () => {
-          message.success("删除成功");
-          state.tableLoading = true;
-          await handle({ offcourseId: id, type: -1 });
-          getTableDate();
+          await handle({ offcourseId: id, type: -1 }).then(res=>{
+            message.success("删除成功");
+            state.tableLoading = true;
+            getTableDate();
+          }).catch(err=>{
+            message.destroy()
+            message.error(err.data.msg)
+          })
         },
       });
     };
@@ -4912,9 +4920,14 @@ function onFocusEnd(){
       dialog({
         content: "确定停用该课程吗？",
         ok: () => {
-          message.success("停用成功");
-          record.status = 0;
-          handle({ offcourseId: record.id, type: -2 });
+          handle({ offcourseId: record.id, type: -2 }).then(res=>{
+            console.log(res,'handleStop')
+            message.success("停用成功");
+            record.status = 0;
+          }).catch(err=>{
+            message.destroy()
+            message.error(err.data.msg)
+          })
         },
       });
     };
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index bcec7113..bbf0c124 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -1305,13 +1305,13 @@ export default {
       ellipsis: true, align: "center",
       width: 120,
     },
-    {
-      title: '应发费用 ',
-      dataIndex: 'payableExpense',
-      key: 'payableExpense',
-      ellipsis: true, align: "center",
-      width: 120,
-    },
+    // {
+    //   title: '应发费用 ',
+    //   dataIndex: 'payableExpense',
+    //   key: 'payableExpense',
+    //   ellipsis: true, align: "center",
+    //   width: 120,
+    // },
     {
       title: '状态 ',
       dataIndex: 'status',
@@ -1320,14 +1320,15 @@ export default {
       width: 120,
       customRender: (value) => {
         return (
-          <div  >
-            {value.record.status == "A10" || value.record.status == "A20" || value.record.status == "A30" || value.record.status == "E10" || value.record.status == "S20"
+          <div>
+            {String(value.record.status)
               ? {
-                "A10": "待审核",
-                "A20": "已提交",
-                "A30": "审核中",
-                "E10": "审核打回",
-                "S20": "审核通过",
+                "0": "待确认",
+                "1": "待提交",
+                "2": "审核中",
+                "3": "审核通过",
+                '4': '审核拒绝',
+                '5': '待提交',
               }[value.record.status + ""] || ""
               : "-"}
           </div>

From e507bacddbfde7669d415f5dc99e09b1b9a30682 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 23 Dec 2024 09:51:05 +0800
Subject: [PATCH 08/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index c0fce274..c4622f2c 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -638,6 +638,7 @@ export default {
         }
       })
       .catch((err) => {
+        message.error(err.data.msg)
         state.deleteTeacherdialog = false
         });
     }

From ed2cbf426c07e427ef98928a973d417e398f3226 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 23 Dec 2024 10:35:48 +0800
Subject: [PATCH 09/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index c4622f2c..67f69410 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -155,8 +155,8 @@
               </a-form-item>
             </a-col>
           <a-col :span="24">
-            <a-form-item label="初始授课时长" name="teaching">
-                <a-input v-model:value="formParam.teaching" style="width:100%; height: 40px; border-radius: 8px ; "
+            <a-form-item label="初始授课时长" name="defaultTeachingTime">
+                <a-input v-model:value="formParam.defaultTeachingTime" style="width:100%; height: 40px; border-radius: 8px ; "
                   placeholder="0" allowClear showSearch suffix="分钟" @blur="clearNonNumber" @focus="focusTeaching">
                 </a-input>
                 <!-- <span style="margin-left: 5px ;" v-if="formParam.teaching !== null">{{ (formParam.teaching / 60
@@ -350,7 +350,7 @@ export default {
         teacherType:'2',
         photo:null,
         status:1,
-        teaching:0,
+        defaultTeachingTime:0,
       },
       vf:true,
       searchParam: {
@@ -564,6 +564,9 @@ export default {
     //保存
     const createTeacherDialog = async () => {
       state.formParam.supplier = state.formParam?.supplier?.trim()
+      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++){
         // const result = await validateField(formItemNames[i]);
@@ -684,7 +687,7 @@ export default {
         status:1,
         teacherType:2,
         photo:null,
-        teaching:0,
+        defaultTeachingTime:0,
         name: null,
         mobile: null,
         email: null,
@@ -699,6 +702,7 @@ export default {
     const rules = {
       name: [{ required: true, message: '',log: '讲师不能为空' }],
       supplier:[{ required: true,  message: '',log:'供应商不能为空' }],
+      defaultTeachingTime:[{ required: true,  message: '',log:'初始授课时长不能为空' }],
       // email:[
       //   {
       //     type: "email",
@@ -786,12 +790,12 @@ export default {
       }
     }
     const clearNonNumber = () => {
-      state.formParam.teaching = state.formParam.teaching?.replace(/\D/g, '');
-      state.formParam.teaching = state.formParam.teaching?.slice(0,8)
-      !state.formParam.teaching && (state.formParam.teaching = 0)
+      state.formParam.defaultTeachingTime = state.formParam.defaultTeachingTime?.replace(/\D/g, '');
+      state.formParam.defaultTeachingTime = state.formParam.defaultTeachingTime?.slice(0,8)
+      !state.formParam.defaultTeachingTime && (state.formParam.defaultTeachingTime = 0)
     }
     const focusTeaching = () => {
-      state.formParam.teaching == 0 && (state.formParam.teaching = null)
+      state.formParam.defaultTeachingTime == 0 && (state.formParam.defaultTeachingTime = null)
     }
     const sendRemark=()=>{
       state.formParam.remark = state.formParam.remark?.replace(/\s/g, '');

From 4ab81b307f063761013285f31842ca1aa77c6f76 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 23 Dec 2024 10:47:55 +0800
Subject: [PATCH 10/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue |  1 +
 src/views/lecturer/ExternalLecturer.vue      | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 85747eed..735d5fd1 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -4089,6 +4089,7 @@ function onFocusEnd(){
           state.addLoading = false;
         })
         .catch((err) => {
+          handleSearchTable();
           message.destroy()
           message.error(err.data.msg)
           state.addLoading = false;
diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index 67f69410..d93ed152 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -155,7 +155,15 @@
               </a-form-item>
             </a-col>
           <a-col :span="24">
-            <a-form-item label="初始授课时长" name="defaultTeachingTime">
+            <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=""
+                  />
+                  初始授课时长
+                </template>
                 <a-input v-model:value="formParam.defaultTeachingTime" style="width:100%; height: 40px; border-radius: 8px ; "
                   placeholder="0" allowClear showSearch suffix="分钟" @blur="clearNonNumber" @focus="focusTeaching">
                 </a-input>

From d722297b818799af7a248127db3075f51ca82348 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 23 Dec 2024 17:28:13 +0800
Subject: [PATCH 11/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/BatchLecturer.vue   | 40 +++++++++++++++++--
 src/components/project/ConfirmLecturer.vue | 45 +++++++++++++++++++---
 src/views/lecturer/InsideTeaching.vue      |  7 ++--
 src/views/lecturer/LecturerFee.vue         |  2 +-
 4 files changed, 80 insertions(+), 14 deletions(-)

diff --git a/src/components/project/BatchLecturer.vue b/src/components/project/BatchLecturer.vue
index 8cfa4f2b..38429d5f 100644
--- a/src/components/project/BatchLecturer.vue
+++ b/src/components/project/BatchLecturer.vue
@@ -76,8 +76,8 @@ const drawerContent = ref(null)
 const customRow = (record) => {
   return {
     style:{
-      backgroundColor: searchTrue.value && searchList.value.some(item => item.id === record.id) ? '#b1ffbd !important' : '',
-    }
+      backgroundColor: searchTrue.value && searchList.value.some(item => item.id === record.id) ? '#a6dff9' : '',
+    },
   };
 };
 watch(()=>props.visible,(val)=>{
@@ -91,12 +91,15 @@ watch(()=>props.visible,(val)=>{
       }
       loading.value = false
     }).catch(err=>{
-      message.error(err.data.msg)
       loading.value = false
+      tableData.value = []
+      message.error(err.data.msg)
     })
   }else{
     selectedRowKeys.value = []
     selectsData.value = []
+    drawerContent.value.scrollTo({top:0,behavior: 'smooth'})
+    resetData()
   }
 })
 const nameUserNo = ref(null)
@@ -112,7 +115,7 @@ const searchData = (val) => {
   // drawerContent.value.scrollTo({top:200,behavior: 'smooth'})
   searchTrue.value = val
   if(!nameUserNo.value&&!dateValue.value){
-    searchList.value = tableData.value;
+    // searchList.value = tableData.value;
     return
   }
   //搜索 数组expenseList.value  参数名字或者工号：nameUserNo.value 日期：dateValue.value
@@ -298,6 +301,7 @@ const columns = [
     align: 'center',
     fixed: 'right',
     width: 100,
+    customCell:()=>{return {style:{background:'#fff'}}},
     slots: { customRender: "action" },
   },
 ]
@@ -318,6 +322,34 @@ const queryDrawer = () => {
 </script>
 
 <style lang="scss" scoped>
+.ant-table-wrapper{
+  border-right: 1px solid #ecf5ff;
+}
+/* 重置表格行的悬停效果 */
+::v-deep .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td {
+  background: none;
+}
+// 选中鼠标划入
+::v-deep .ant-table-tbody > tr.ant-table-row-selected:hover > td{
+  background: none ;
+}
+/* 未选中行的鼠标划入样式 */
+::v-deep .ant-table-tbody > tr:not(.ant-table-row-selected):hover > td {
+  background: none;
+}
+/* 未选中行的鼠标划出样式 */
+::v-deep .ant-table-tbody > tr:not(.ant-table-row-selected):not(:hover) > td {
+  background: none;
+}
+// 选中
+::v-deep .ant-table-tbody > tr.ant-table-row-selected > td{
+  background: none ;
+}
+/* 重置表格行的选中效果 */
+::v-deep .ant-table-row-selected td {
+  // background: none !important;
+}
+
 
 .largeDrawerInside {
   .drawerMains {
diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index 8025c755..b276a057 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -7,7 +7,7 @@
     width="64%"
     :zIndex="1001"
   >
-    <div class="drawerMains">
+    <div class="drawerMains" ref="drawerContent">
       <div class="headers" style="margin-top:-24px;">
         <div class="headerTitle">{{ name }}</div>
         <img
@@ -30,7 +30,7 @@
           </div>
         </div>
         <div class="box">
-          <!-- <div class="top">
+          <div class="top">
             <div class="item">
               <a-input @pressEnter="searchData(true)" style="border-radius: 8px;width:240px;height: 40px;" v-model:value="nameUserNo" placeholder="请输入工号/讲师名称进行搜索" allowClear />
             </div>
@@ -41,14 +41,15 @@
               <a-button type="primary" @click="searchData(true)" style="margin-right:20px;border-radius:8px;width: 100px;height: 40px;">搜索</a-button>
               <a-button type="primary" @click="resetData()" style="border-radius:8px;width: 100px;height: 40px;">重置</a-button>
             </div>
-          </div> -->
+          </div>
           <div class="table">
             <a-table
               :columns="columns"
-              :data-source="searchTrue?searchList:expenseList"
+              :data-source="expenseList"
               :pagination="false"
               :scroll="{ x: 'max-content' }"
               :loading="loadingData"
+              :custom-row="customRow"
             >
               <template #action="{ record,index }">
                 <div class="action">
@@ -195,10 +196,13 @@ watch(()=>props.visible,(val)=>{
     }).catch(()=>{
       message.error('获取数据失败，请重新尝试')
       loadingData.value = false
+      forData.value = []
+      expenseList.value = []
     })
   }else{
     nameUserNo.value = null
     dateValue.value = null
+    drawerContent.value.scrollTo({top:0,behavior: 'smooth'})
   }
 })
 const removeId = (e,i) =>{
@@ -229,10 +233,18 @@ const removeId = (e,i) =>{
 const nameUserNo = ref(null)
 const dateValue = ref(null)
 const searchTrue = ref(false)
+const drawerContent = ref(null)
+const customRow = (record) => {
+  return {
+    style:{
+      backgroundColor: searchTrue.value && searchList.value.some(item => item.id === record.id) ? '#a6dff9' : '',
+    }
+  };
+};
 const searchData = (val) => {
   searchTrue.value = val
   if(!nameUserNo.value&&!dateValue.value){
-    searchList.value = expenseList.value;
+    // searchList.value = expenseList.value;
     return
   }
   //搜索 数组expenseList.value  参数名字或者工号：nameUserNo.value 日期：dateValue.value
@@ -251,6 +263,11 @@ const searchData = (val) => {
     return isNameMatch || isDateInRange;
   });
   searchList.value = filteredList;
+  let scrollHeight = null
+  filteredList.length && (scrollHeight = expenseList.value.findIndex(item => item.id === filteredList[0].id))
+  if(scrollHeight||scrollHeight==0){
+    drawerContent.value.scrollTo({top:(scrollHeight+1)*50+300,behavior: 'smooth'})
+  }
 }
 const resetData = () => {
   nameUserNo.value = null
@@ -392,6 +409,7 @@ const columns = [
     title: '操作',
     align: 'center',
     fixed: 'right',
+    customCell:()=>{return {style:{background:'#fff'}}},
     slots: { customRender: "action" },
   },
 ]
@@ -428,6 +446,19 @@ const config = () => {
 </script>
 
 <style lang="scss" scoped>
+/* 重置表格行的悬停效果 */
+::v-deep .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td {
+  background: none;
+}
+/* 未选中行的鼠标划入样式 */
+::v-deep .ant-table-tbody > tr:not(.ant-table-row-selected):hover > td {
+  background: none;
+}
+
+/* 未选中行的鼠标划出样式 */
+::v-deep .ant-table-tbody > tr:not(.ant-table-row-selected):not(:hover) > td {
+  background: none;
+}
 .delete {
   min-width: 424px;
   background: #ffffff;
@@ -545,7 +576,8 @@ const config = () => {
   .drawerMains {
     min-width: 600px;
     // margin: 0px 32px 0px 32px;
-    overflow-x: auto;
+    height:100%;
+    overflow: auto;
     display: flex;
     flex-direction: column;
     padding:24px;
@@ -559,6 +591,7 @@ const config = () => {
       margin-bottom: 20px;
 
       .headerTitle {
+        margin: 24px 0;
         font-size: 18px;
         font-weight: 600;
         color: #333333;
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index bbf0c124..9f2e7454 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -687,7 +687,7 @@ export default {
       { value: '1', label: "手动录入" },
     ])
     const scoreList = ref([
-      { value: '', label: "全部" },
+      // { value: '', label: "全部" },
       { value: '90-100', label: "90-100" },
       { value: '80-90', label: "80-90" },
       { value: '70-80', label: "70-80" },
@@ -703,9 +703,10 @@ export default {
       { value: '0-50', label: "0~50" },
       { value: '0-70', label: "0~70" },
       { value: '0-100', label: "0~100" },
-      { value: '0-150', label: "0~150" },
+      // { value: '0-150', label: "0~150" },
       { value: '0-200', label: "0~200" },
       { value: '0-300', label: "0~300 " },
+      { value: '300以上', label: "300以上" },
     ])
     const scoreChange = (e) => {
       if (e.length !== 0) {
@@ -1345,7 +1346,7 @@ export default {
       // },
     ])
     const gettableDatas = (record) => {
-      getExpenseByCourseId({ courseId: record.courseId })
+      getExpenseByCourseId({ courseId: record.courseId,teacherId:record.teacherId })
         .then((res) => {
           console.log(res)
           tableDatas.value = res.data.data
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index c7c8eab7..3d12e6a9 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -717,7 +717,7 @@
         { value: '0', label: "在线课" },
         { value: '2', label: "课程开发" },
         { value: '3', label: "作业员入模培训" },
-        { value: '4', label: "其他" },
+        // { value: '4', label: "其他" },
       ])
       //认证状态
       const AuthenticationStatusList = ref([

From bccb4913be2d4260f557990f21056bf86129c19e Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 24 Dec 2024 14:21:21 +0800
Subject: [PATCH 12/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Lecturer.js                           |  2 ++
 .../project/LookExternalLecturer.vue          |  2 +-
 src/components/project/LookInsideLecturer.vue |  2 +-
 src/views/lecturer/LecturerFee.vue            |  2 +-
 src/views/lecturer/Organization.vue           | 35 ++++++++++++++-----
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js
index 74398e73..fc503f9d 100644
--- a/src/api/Lecturer.js
+++ b/src/api/Lecturer.js
@@ -71,6 +71,8 @@ export const getApprovalResultByApprovalIdList = (approvalId) => http.post(`/adm
 export const recovery = (id) => http.post(`/admin/affiliation/recovery?id=${id}`)
 //删除培训发生组织
 export const affiliationDelById = (id)=>http.post(`/admin/affiliation/delById?id=${id}`)
+//停用启用培训发生组织
+export const isEnable = (obj) => http.post(`/admin/affiliation/isEnable?id=${obj.id}&status=${obj.status}`)
 //撤回培训发生组织
 export const affiliatIsConfirm = (id) => http.post(`/admin/affiliation/isConfirm?id=${id}`)
 //讲师费统计详情
diff --git a/src/components/project/LookExternalLecturer.vue b/src/components/project/LookExternalLecturer.vue
index 6b70c534..9bb35027 100644
--- a/src/components/project/LookExternalLecturer.vue
+++ b/src/components/project/LookExternalLecturer.vue
@@ -247,7 +247,7 @@ export default{
               {value.record.courseStatus == 0 || value.record.courseStatus == 1
                 ? {
                   "0": "未开课",
-                  "1": "开课",
+                  "1": "已开课",
                 }[value.record.courseStatus + ""] || ""
                 : "-"}
             </div>
diff --git a/src/components/project/LookInsideLecturer.vue b/src/components/project/LookInsideLecturer.vue
index e1af1015..bb60e044 100644
--- a/src/components/project/LookInsideLecturer.vue
+++ b/src/components/project/LookInsideLecturer.vue
@@ -310,7 +310,7 @@ export default{
               {value.record.courseStatus == 0 || value.record.courseStatus == 1
                 ? {
                   "0": "未开课",
-                  "1": "开课",
+                  "1": "已开课",
                 }[value.record.courseStatus + ""] || ""
                 : "-"}
             </div>
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 3d12e6a9..33701967 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -722,7 +722,7 @@
       //认证状态
       const AuthenticationStatusList = ref([
         { value: '0', label: "待确认" },
-        { value: '1', label: "待审核" },
+        { value: '1', label: "待提交" },
         { value: '2', label: "审核中" },
         { value: '4', label: "审核拒绝" },
         { value: '3', label: "审核通过" },
diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index 279b8a05..a1509e0c 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -40,7 +40,9 @@
                 </lockLecturer>
                 <a-button v-if="record.status!=2" 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 type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
+                 <a-button @click="isEnablePost(record,0)"  type="link" >启用</a-button>
+                 <a-button @click="isEnablePost(record,1)"  type="link" >停用</a-button>
               </a-space>
             </template>
             </template>
@@ -385,14 +387,14 @@ export default{
       state.formParam.code = null
     }
     const columns = ref([
-    {
-        title: '培训发生组织编号 ',
-        dataIndex: 'affiliationCode',
-        key: 'affiliationCode',
-        ellipsis: true,
-        align: "center",
-        width: '100px',
-      },
+      // {
+      //   title: '培训发生组织编号 ',
+      //   dataIndex: 'affiliationCode',
+      //   key: 'affiliationCode',
+      //   ellipsis: true,
+      //   align: "center",
+      //   width: '100px',
+      // },
       {
         title: '培训发生组织名称 ',
         dataIndex: 'affiliationName',
@@ -581,6 +583,20 @@ const getTableDate = (obj) => {
           }
         })
     };
+    const isEnablePost = (record,status) => {
+      dialog({
+        content: `是否确认${!status?'启用':'停用'}该培训发生组织?`,
+        ok: () => {
+          lecturer.isEnable({id:record.id,status}).then(res=>{
+            message.success("操作成功")
+            searchSubmit();
+          }).catch(err=>{
+            message.destroy()
+            message.error(err.data.msg)
+          })
+        }
+      })
+    }
      //确认删除
      const closeDeleteTeacher = () => {
       //调用删除接口
@@ -859,6 +875,7 @@ const getTableDate = (obj) => {
         searchReset,
         searchList,
         deleteModal,
+        isEnablePost,
         updateModal,
         cancelTeacherDialog,
         addTeacher,

From b9419dc7e302c82db41784091628e30164fd30bf Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 24 Dec 2024 16:14:18 +0800
Subject: [PATCH 13/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Lecturer.js                          |  2 +-
 src/views/lecturer/ExternalTeaching.vue      |  4 ++++
 src/views/lecturer/InsideLecturer.vue        |  8 ++++++++
 src/views/lecturer/InsideTeaching.vue        |  9 +++++++--
 src/views/lecturer/LecturerApproval.vue      |  6 +++++-
 src/views/lecturer/LecturerFee.vue           | 12 ++++++++++++
 src/views/lecturer/LecturerFeeStatistics.vue |  4 ++++
 src/views/lecturer/MonthlyStatistics.vue     |  4 ++--
 src/views/lecturer/Organization.vue          |  4 ++--
 9 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js
index fc503f9d..b40f7629 100644
--- a/src/api/Lecturer.js
+++ b/src/api/Lecturer.js
@@ -72,7 +72,7 @@ export const recovery = (id) => http.post(`/admin/affiliation/recovery?id=${id}`
 //删除培训发生组织
 export const affiliationDelById = (id)=>http.post(`/admin/affiliation/delById?id=${id}`)
 //停用启用培训发生组织
-export const isEnable = (obj) => http.post(`/admin/affiliation/isEnable?id=${obj.id}&status=${obj.status}`)
+export const isEnable = (obj) => http.post(`/admin/affiliation/isEnable`,obj)
 //撤回培训发生组织
 export const affiliatIsConfirm = (id) => http.post(`/admin/affiliation/isConfirm?id=${id}`)
 //讲师费统计详情
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index fd8ef57c..cbcb6ccd 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -520,6 +520,10 @@ export default {
               label:item
             }
           })
+          supperList.value.unshift({
+            value: '',
+            label: '全部'
+          })
         }
       })
     }
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index d50d3a7f..7e1a6533 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -674,6 +674,10 @@ export default {
             array.push(obj);
           });
           LecturerSystemList.value = array;
+          LecturerSystemList.value.unshift({
+            value: "",
+            label: "全部"
+          })
         }
       })
     }
@@ -706,6 +710,10 @@ export default {
             array.push(obj);
           });
           getLevelList.value = array;
+          getLevelList.value.unshift({
+            value: "",
+            label: "全部"
+          })
         }
       })
     }
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 9f2e7454..635cf95d 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -64,7 +64,7 @@
         </a-form-item>
         <!-- <div style="width: 100%;"></div> -->
         <a-form-item class="select" v-if="moreid == 2">
-          <a-select style="min-width: 200px ; height: auto ;margin-bottom:20px" v-model:value="score" placeholder="请选择评分"
+          <a-select style="min-width: 200px ; height: auto ;margin-bottom:20px" v-model:value="score" placeholder="请选择评分" showArrow
             :options="scoreList" allowClear showSearch mode="multiple" @change="scoreChange"
             v-on:keydown.enter="enterPressHadlerSearch">
           </a-select>
@@ -659,6 +659,10 @@ export default {
             array.push(obj);
           });
           LecturerSystemList.value = array;
+          LecturerSystemList.value.unshift({
+            value: '',
+            label: '全部'
+          })
         }
         console.log("获取讲师", LecturerSystemList);
       })
@@ -687,7 +691,7 @@ export default {
       { value: '1', label: "手动录入" },
     ])
     const scoreList = ref([
-      // { value: '', label: "全部" },
+      { value: '', label: "全部" },
       { value: '90-100', label: "90-100" },
       { value: '80-90', label: "80-90" },
       { value: '70-80', label: "70-80" },
@@ -699,6 +703,7 @@ export default {
       { value: '10~20', label: "10~20" },
     ])
     const studysList = ref([
+      { value: '', label: "全部" },
       { value: '0-30', label: "0~30" },
       { value: '0-50', label: "0~50" },
       { value: '0-70', label: "0~70" },
diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 58ec5f0e..62a14aa4 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -387,6 +387,10 @@
                 array.push(obj);
               });
               trainOrglist.value = array;
+              trainOrglist.value.unshift({
+                value: '',
+                label: "全部"
+              })
             }
         }) 
       }
@@ -400,7 +404,7 @@
       ])
       //认证状态0待确认 1待提交 2审核中 3审核通过 4.审核拒绝
       const AuthenticationStatusList = ref([
-        // { value: 0, label: "待确认" },
+        { value: '', label: "全部" },
         { value: 1, label: "待提交" },
         { value: 2, label: "审核中" },
         { value: 4, label: "审核拒绝" },
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 33701967..aa95871c 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -699,6 +699,9 @@
               value: item.id 
             }
           })
+          state.orgList.unshift({
+            label: '全部', value: ''
+          })
         })
       }
      //费用类型
@@ -721,6 +724,7 @@
       ])
       //认证状态
       const AuthenticationStatusList = ref([
+        { value: '', label: "全部" },
         { value: '0', label: "待确认" },
         { value: '1', label: "待提交" },
         { value: '2', label: "审核中" },
@@ -748,6 +752,10 @@
             array.push(obj);
           });
           lecturerSystemList.value = array;
+          lecturerSystemList.value.unshift({
+            value: '',
+            label: '全部'
+          })
         }
       })
     }
@@ -768,6 +776,10 @@ getAllLevelList().then((res) => {
             array.push(obj);
           });
           getLevelList.value = array;
+          getLevelList.value.unshift({
+            value: "",
+            label: "全部"
+          })
         }
       })
     }
diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue
index 6669d8e5..30eb8f49 100644
--- a/src/views/lecturer/LecturerFeeStatistics.vue
+++ b/src/views/lecturer/LecturerFeeStatistics.vue
@@ -378,6 +378,10 @@ export default {
             array.push(obj);
           });
           TrainOrglist.value = array;
+          TrainOrglist.value.unshift({
+            value: '',
+            label: "全部"
+          })
         }
         console.log("获取发薪地",TrainOrglist);
       })
diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue
index d234c097..7ee60546 100644
--- a/src/views/lecturer/MonthlyStatistics.vue
+++ b/src/views/lecturer/MonthlyStatistics.vue
@@ -305,8 +305,8 @@ export default {
       },
       {
         title: '开发课程时长 ',
-        dataIndex: 'expense',
-        key: 'expense',
+        dataIndex: 'teachingDevelop',
+        key: 'teachingDevelop',
         ellipsis: true,
         align: "center",
         width: 160,
diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index a1509e0c..bc1f9bfd 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -41,8 +41,8 @@
                 <a-button v-if="record.status!=2" 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)"  type="link" >启用</a-button>
-                 <a-button @click="isEnablePost(record,1)"  type="link" >停用</a-button>
+                 <a-button @click="isEnablePost(record,0)" v-if="record.enable" type="link" >启用</a-button>
+                 <a-button @click="isEnablePost(record,1)" v-if="!record.enable" type="link" >停用</a-button>
               </a-space>
             </template>
             </template>

From 463eefc864e6c74eb630054f0dfbd232c3aae5c8 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 24 Dec 2024 17:16:49 +0800
Subject: [PATCH 14/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index bc1f9bfd..b8a3acee 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -588,7 +588,11 @@ const getTableDate = (obj) => {
         content: `是否确认${!status?'启用':'停用'}该培训发生组织?`,
         ok: () => {
           lecturer.isEnable({id:record.id,status}).then(res=>{
-            message.success("操作成功")
+            if(typeof (res.data.data) != 'object'){
+              message.error(res.data.data)
+              return
+            }
+            message.success(`${!status?'启用':'停用'}成功`)
             searchSubmit();
           }).catch(err=>{
             message.destroy()

From 94bb350eee5d5bc1fb510415b764f3508da94294 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Wed, 25 Dec 2024 14:38:18 +0800
Subject: [PATCH 15/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 7e1a6533..9e0741db 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -77,7 +77,7 @@
           <template #bodyCell="{ record, column }">
 
             <template v-if="column.key === 'orgName'">
-              <a-space style="display:flex ;justify-content: space-around;  ">
+              <a-space style="display:flex ;justify-content: left;  ">
                 <!-- <a-popover>
                   <template #content>
                     <p>{{ record.orgName}}</p>
@@ -791,7 +791,7 @@ export default {
         title: '所属组织 ',
         dataIndex: 'orgName',
         key: 'orgName',
-        ellipsis: true, align: "center",
+        ellipsis: true, align: "left",
         scopedSlots: { customRender: "orgName" },
         width: 200,
         //  customRender: (value, record) => {
@@ -806,7 +806,7 @@ export default {
         title: '讲师体系 ',
         dataIndex: 'tsystemName',
         key: 'tsystemName',
-        ellipsis: true, align: "center",
+        ellipsis: true, align: "left",
         width: 200,
       },
       {

From 148f3012916ad0c9cc43b178630da1a6ef088830 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Wed, 25 Dec 2024 15:13:30 +0800
Subject: [PATCH 16/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/project/AddOrgContent.vue b/src/components/project/AddOrgContent.vue
index 7ec7505d..8fffb02f 100644
--- a/src/components/project/AddOrgContent.vue
+++ b/src/components/project/AddOrgContent.vue
@@ -93,7 +93,7 @@ import * as lecturerApi from "@/api/Lecturer.js";
           notLists?.value?.some(i=>{
             if(i.orgId == item.id){
               item.disabled = true
-              item.name = item.name + '(' + i.orgName + ')'
+              item.name = item.name + '(' + i.affiliationName + ')'
               return true
             }
           })
@@ -129,7 +129,7 @@ import * as lecturerApi from "@/api/Lecturer.js";
           notLists.value.some(i=>{
             if(i.orgId == item.id){
               item.disabled = true
-              item.name = item.name + '(' + i.orgName + ')'
+              item.name = item.name + '(' + i.affiliationName + ')'
               return true
             }
           })

From 51022077b24bd34199191cfdff085e83bb1667f2 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Wed, 25 Dec 2024 17:01:24 +0800
Subject: [PATCH 17/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 635cf95d..d56bb751 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -918,8 +918,9 @@ export default {
         title: '操作 ',
         dataIndex: 'operation',
         key: 'operation',
-        ellipsis: true, align: "right",
-        width: 200,
+        // ellipsis: true,
+        align: "center",
+        width: 100,
         fixed: "right",
         scopedSlots: { customRender: "action" },
       },
@@ -1037,7 +1038,23 @@ export default {
             tableData.value = res.data.data.records
             state.tableDataTotal = Number(res.data.data.total);
             state.tableLoading = false
-            console.log("获取tableData", tableData);
+            // console.log("获取tableData", tableData);
+            let findValue = false;
+            tableData.value.some(item=>{
+              if(item.createFrom == 1 && item.isSuperPermission === 'true'){
+                columns.value[14].width = 160
+                findValue = true
+                return true
+              }
+            })
+            if(!findValue){
+              const text = tableData.value.find(item=>item.createFrom == 1)
+              if(text){
+                columns.value[14].width = 120
+              }else{
+                columns.value[14].width = 100
+              }
+            }
           })
           .catch(err => {
             state.tableLoading = false
diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue
index c2020f47..33502202 100644
--- a/src/views/lecturer/LecturerAPPEdit.vue
+++ b/src/views/lecturer/LecturerAPPEdit.vue
@@ -62,7 +62,7 @@
                 text-overflow: ellipsis;">{{flipData(record.orgName)||'-'}}</div>
             </template>
             <template #appEdit="{ record }">
-              <a-button type="link" :disabled="record.createFrom==1  ?false :true" @click="edit(record)">编辑</a-button>
+              <a-button type="link" v-if="record.createFrom" @click="edit(record)">编辑</a-button>
               <a-button type="link" @click="recome(record)">移除</a-button>
             </template>
           </a-table>
diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 62a14aa4..53295d5f 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -452,7 +452,7 @@
           dataIndex: 'trainOrgName',
           key: 'trainOrgName',
         ellipsis: true, align: "center",
-          width: 120,
+          width: 200,
         },
         {
         title: '汇总时间 ',
@@ -513,7 +513,7 @@
           key: 'operation',
         ellipsis: true, align: "right",
         fixed: "right",
-          width: 200,
+          width: 120,
           scopedSlots: { customRender: "action" },
         },
         

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

---
 src/api/lecturerFeeManagement.js             |  2 +
 src/components/project/BatchLecturer.vue     | 43 +++++++++++++++-----
 src/components/project/ConfirmLecturer.vue   | 43 ++++++++++++++++----
 src/views/lecturer/InsideTeaching.vue        | 19 +++++----
 src/views/lecturer/LecturerAPPEdit.vue       | 30 +++++++-------
 src/views/lecturer/LecturerApproval.vue      |  2 +-
 src/views/lecturer/LecturerFee.vue           | 19 ++++++---
 src/views/lecturer/LecturerFeeStatistics.vue | 23 ++++++++---
 src/views/lecturer/MonthlyStatistics.vue     | 20 ++++-----
 src/views/lecturer/Organization.vue          | 12 +++---
 10 files changed, 143 insertions(+), 70 deletions(-)

diff --git a/src/api/lecturerFeeManagement.js b/src/api/lecturerFeeManagement.js
index 08ae7b91..fdd837ad 100644
--- a/src/api/lecturerFeeManagement.js
+++ b/src/api/lecturerFeeManagement.js
@@ -43,6 +43,8 @@ export const queryTeacherFeeTotalList= (obj) => http.post('/teacher/fee/queryTea
 export const getPreviousTeacherFee= (obj) => http.post('/teacher/fee/getPreviousTeacherFee',obj)
 //汇总上月讲师费月度数据
 export const CreateMonthSummary= (obj) => http.post('/admin/expenseSummary/createMonthSummary',obj)
+//是否显示重汇按钮
+export const isShowReimport= () => http.get('/admin/expenseSummary/isAdmin')
 //讲师费统计列表
 export const expenseSummaryList= (obj) => http.get('/admin/expenseSummary/list',{params:obj})
 //提交/撤回
diff --git a/src/components/project/BatchLecturer.vue b/src/components/project/BatchLecturer.vue
index 38429d5f..42797a83 100644
--- a/src/components/project/BatchLecturer.vue
+++ b/src/components/project/BatchLecturer.vue
@@ -4,9 +4,9 @@
     :closable="false"
      class="largeDrawerInside"
     placement="right"
-    width="70%"
+    width="80%"
   >
-    <div class="drawerMains" ref="drawerContent">
+    <div class="drawerMains">
       <div class="headers" style="margin-top:-24px;">
         <div class="headerTitle">{{ name }}</div>
         <img
@@ -22,9 +22,9 @@
             <div class="item">
               <a-input @pressEnter="searchData(true)" style="border-radius: 8px;width:240px;height: 40px;" v-model:value="nameUserNo" placeholder="请输入工号/讲师名称进行搜索" allowClear />
             </div>
-            <div class="item">
+            <!-- <div class="item">
               <a-range-picker format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" style="border-radius: 8px;width:360px;height: 40px;" v-model:value="dateValue" />
-            </div>
+            </div> -->
             <div class="item">
               <a-button type="primary" @click="searchData(true)" style="margin-right:20px;border-radius:8px;width: 100px;height: 40px;">搜索</a-button>
               <a-button type="primary" @click="resetData()" style="border-radius:8px;width: 100px;height: 40px;">重置</a-button>
@@ -32,10 +32,11 @@
           </div>
           <div class="table" style="padding-bottom:72px;">
             <a-table
+              ref="drawerContent"
               :columns="columns"
               :data-source="tableData"
               :pagination="false"
-              :scroll="{ x: 'max-content' }"
+              :scroll="{ x: 'max-content',y:tableData.length? pageHeight : null }"
               row-key="id"
               :loading="loading"
               :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -80,6 +81,9 @@ const customRow = (record) => {
     },
   };
 };
+const pageHeight = computed(() => {
+  return window.innerHeight - 360
+});
 watch(()=>props.visible,(val)=>{
   if(val){
     loading.value = true
@@ -98,7 +102,7 @@ watch(()=>props.visible,(val)=>{
   }else{
     selectedRowKeys.value = []
     selectsData.value = []
-    drawerContent.value.scrollTo({top:0,behavior: 'smooth'})
+    drawerContent.value?.$el.querySelector('.ant-table-body')?.scrollTo({top:0,behavior: 'smooth'})
     resetData()
   }
 })
@@ -115,7 +119,7 @@ const searchData = (val) => {
   // drawerContent.value.scrollTo({top:200,behavior: 'smooth'})
   searchTrue.value = val
   if(!nameUserNo.value&&!dateValue.value){
-    // searchList.value = tableData.value;
+    searchList.value = [];
     return
   }
   //搜索 数组expenseList.value  参数名字或者工号：nameUserNo.value 日期：dateValue.value
@@ -137,7 +141,7 @@ const searchData = (val) => {
   let scrollHeight = null
   filteredList.length && (scrollHeight = tableData.value.findIndex(item => item.id === filteredList[0].id))
   if(scrollHeight||scrollHeight==0){
-    drawerContent.value.scrollTo({top:(scrollHeight+1)*50+200,behavior: 'smooth'})
+    drawerContent.value?.$el.querySelector('.ant-table-body')?.scrollTo({top:scrollHeight*55,behavior: 'smooth'})
   }
 }
 const loading = ref(false)
@@ -172,12 +176,14 @@ const columns = [
     dataIndex: 'name',
     key: 'name',
     align: 'center',
+    width:120,
   },
   {
     title: '讲师工号',
     dataIndex: 'userNo',
     key: 'userNo',
     align: 'center',
+    width:120
   },
   {
     title: '所属组织',
@@ -185,6 +191,7 @@ const columns = [
     key: 'orgName',
     align: 'center',
     ellipsis: true,
+    width:100,
     customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
   },
   
@@ -193,12 +200,15 @@ const columns = [
     dataIndex: 'tsystemName',
     key: 'tsystemName',
     align: 'center',
+    width:100,
+    customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
   },
   {
     title: '讲师等级',
     dataIndex: 'tlevelName',
     key: 'tlevelName',
     align: 'center',
+    width:100,
     customRender: ({ text })=>{
       return text||'-'
     }
@@ -208,6 +218,7 @@ const columns = [
     dataIndex: 'payrollPlace',
     key: 'payrollPlace',
     align: 'center',
+    width:120,
     customRender: ({ text })=>{
       return text||'-'
     }
@@ -218,6 +229,7 @@ const columns = [
     dataIndex: 'courseType',
     key: 'courseType',
     align: 'center',
+    width:120,
     customRender: ({ text,record })=>{
       switch (text) {
         case 0:
@@ -240,18 +252,22 @@ const columns = [
     dataIndex: 'courseName',
     key: 'courseName',
     align: 'center',
+    width:100,
+    customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
   },
   {
     title: '授课/开发课程日期',
     dataIndex: 'teachingDate',
     key: 'teachingDate',
     align: 'center',
+    width:150
   },
   {
     title: '授课/开发课程时长',
     dataIndex: 'teachingTime',
     key: 'teachingTime',
     align: 'center',
+    width:150,
     customRender: ({ text,record })=>{
       return (text/60).toFixed(2)+'小时'
     }
@@ -261,6 +277,7 @@ const columns = [
     dataIndex: 'studys',
     key: 'studys',
     align: 'center',
+    width:100,
     customRender: ({ text })=>{
       return text||'0'
     }
@@ -270,6 +287,7 @@ const columns = [
     dataIndex: 'score',
     key: 'score',
     align: 'center',
+    width:100,
     customRender: (value) => {
           return (
             <div>
@@ -283,12 +301,14 @@ const columns = [
     dataIndex: 'levelPay',
     key: 'levelPay',
     align: 'center',
+    width:100
   },
   {
     title: '计划费用',
     dataIndex: 'expense',
     key: 'expense',
     align: 'center',
+    width:100
   },
   // {
   //   title: '应发费用',
@@ -349,7 +369,10 @@ const queryDrawer = () => {
 ::v-deep .ant-table-row-selected td {
   // background: none !important;
 }
-
+::v-deep .ant-table-thead > tr > th {
+    background-color: #eff4fc !important;
+    text-align: center !important;
+}
 
 .largeDrawerInside {
   .drawerMains {
@@ -425,7 +448,7 @@ const queryDrawer = () => {
         }
         .table{
           ::v-deep .ant-table-cell-fix-right {
-            width: 160px !important;
+            width: 120px !important;
           }
         }
       }
diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index b276a057..2cd02f7d 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -4,10 +4,10 @@
     :closable="false"
     class="largeDrawerInside"
     placement="right"
-    width="64%"
+    width="76%"
     :zIndex="1001"
   >
-    <div class="drawerMains" ref="drawerContent">
+    <div class="drawerMains">
       <div class="headers" style="margin-top:-24px;">
         <div class="headerTitle">{{ name }}</div>
         <img
@@ -34,9 +34,9 @@
             <div class="item">
               <a-input @pressEnter="searchData(true)" style="border-radius: 8px;width:240px;height: 40px;" v-model:value="nameUserNo" placeholder="请输入工号/讲师名称进行搜索" allowClear />
             </div>
-            <div class="item">
+            <!-- <div class="item">
               <a-range-picker format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" style="border-radius: 8px;width:360px;height: 40px;" v-model:value="dateValue" />
-            </div>
+            </div> -->
             <div class="item">
               <a-button type="primary" @click="searchData(true)" style="margin-right:20px;border-radius:8px;width: 100px;height: 40px;">搜索</a-button>
               <a-button type="primary" @click="resetData()" style="border-radius:8px;width: 100px;height: 40px;">重置</a-button>
@@ -44,10 +44,11 @@
           </div>
           <div class="table">
             <a-table
+              ref="drawerContent"
               :columns="columns"
               :data-source="expenseList"
               :pagination="false"
-              :scroll="{ x: 'max-content' }"
+              :scroll="{ x: 'max-content',y:expenseList.length? pageHeight : null }"
               :loading="loadingData"
               :custom-row="customRow"
             >
@@ -175,6 +176,9 @@ const clickItem = (item,i) => {
   indexList.value = i
   resetData()
 }
+const pageHeight = computed(() => {
+  return window.innerHeight - 450
+});
 watch(()=>props.visible,(val)=>{
   if(val){
     loadingData.value = true
@@ -202,7 +206,7 @@ watch(()=>props.visible,(val)=>{
   }else{
     nameUserNo.value = null
     dateValue.value = null
-    drawerContent.value.scrollTo({top:0,behavior: 'smooth'})
+    drawerContent.value?.$el.querySelector('.ant-table-body')?.scrollTo({top:0,behavior: 'smooth'})
   }
 })
 const removeId = (e,i) =>{
@@ -244,7 +248,7 @@ const customRow = (record) => {
 const searchData = (val) => {
   searchTrue.value = val
   if(!nameUserNo.value&&!dateValue.value){
-    // searchList.value = expenseList.value;
+    searchList.value = [];
     return
   }
   //搜索 数组expenseList.value  参数名字或者工号：nameUserNo.value 日期：dateValue.value
@@ -266,7 +270,7 @@ const searchData = (val) => {
   let scrollHeight = null
   filteredList.length && (scrollHeight = expenseList.value.findIndex(item => item.id === filteredList[0].id))
   if(scrollHeight||scrollHeight==0){
-    drawerContent.value.scrollTo({top:(scrollHeight+1)*50+300,behavior: 'smooth'})
+    drawerContent.value?.$el.querySelector('.ant-table-body')?.scrollTo({top:scrollHeight*55,behavior: 'smooth'})
   }
 }
 const resetData = () => {
@@ -281,12 +285,14 @@ const columns = [
     dataIndex: 'name',
     key: 'name',
     align: 'center',
+    width:120,
   },
   {
     title: '讲师工号',
     dataIndex: 'userNo',
     key: 'userNo',
     align: 'center',
+    width:120,
   },
   {
     title: '所属组织',
@@ -294,6 +300,7 @@ const columns = [
     key: 'orgName',
     align: 'center',
     ellipsis: true,
+    width:100,
     customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
   },
   
@@ -302,12 +309,15 @@ const columns = [
     dataIndex: 'tsystemName',
     key: 'tsystemName',
     align: 'center',
+    width:100,
+    customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
   },
   {
     title: '讲师等级',
     dataIndex: 'tlevelName',
     key: 'tlevelName',
     align: 'center',
+    width:100,
     customRender: ({ text })=>{
       return text||'-'
     }
@@ -317,6 +327,7 @@ const columns = [
     dataIndex: 'payrollPlace',
     key: 'payrollPlace',
     align: 'center',
+    width:120,
     customRender: ({ text })=>{
       return text||'-'
     }
@@ -327,6 +338,7 @@ const columns = [
     dataIndex: 'courseType',
     key: 'courseType',
     align: 'center',
+    width:120,
     customRender: ({ text,record })=>{
       switch (text) {
         case 0:
@@ -349,18 +361,22 @@ const columns = [
     dataIndex: 'courseName',
     key: 'courseName',
     align: 'center',
+    width:100,
+    customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
   },
   {
     title: '授课/开发课程日期',
     dataIndex: 'teachingDate',
     key: 'teachingDate',
     align: 'center',
+    width:150,
   },
   {
     title: '授课/开发课程时长',
     dataIndex: 'teachingTime',
     key: 'teachingTime',
     align: 'center',
+    width:150,
     customRender: ({ text,record })=>{
       return (text/60).toFixed(2)+'小时'
     }
@@ -370,6 +386,7 @@ const columns = [
     dataIndex: 'studys',
     key: 'studys',
     align: 'center',
+    width:100,
     customRender: ({ text })=>{
       return text||'0'
     }
@@ -379,6 +396,7 @@ const columns = [
     dataIndex: 'score',
     key: 'score',
     align: 'center',
+    width:100,
     customRender: (value) => {
           return (
             <div>
@@ -392,12 +410,14 @@ const columns = [
     dataIndex: 'levelPay',
     key: 'levelPay',
     align: 'center',
+    width:100,
   },
   {
     title: '计划费用',
     dataIndex: 'expense',
     key: 'expense',
     align: 'center',
+    width:100,
   },
   // {
   //   title: '应发费用',
@@ -409,6 +429,7 @@ const columns = [
     title: '操作',
     align: 'center',
     fixed: 'right',
+    width:100,
     customCell:()=>{return {style:{background:'#fff'}}},
     slots: { customRender: "action" },
   },
@@ -459,6 +480,10 @@ const config = () => {
 ::v-deep .ant-table-tbody > tr:not(.ant-table-row-selected):not(:hover) > td {
   background: none;
 }
+::v-deep .ant-table-thead > tr > th {
+    background-color: #eff4fc !important;
+    text-align: center !important;
+}
 .delete {
   min-width: 424px;
   background: #ffffff;
@@ -661,7 +686,7 @@ const config = () => {
         }
         .table{
           ::v-deep .ant-table-cell-fix-right {
-            width: 160px !important;
+            width: 120px !important;
           }
         }
       }
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index d56bb751..80c5d2ca 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -757,18 +757,25 @@ export default {
         ellipsis: true, align: "center",
         width: 120,
       },
+      {
+        title: '课程名称 ',
+        dataIndex: 'courseName',
+        key: 'courseName ',
+        ellipsis: true, align: "left",
+        width: 200,
+      },
       {
         title: '讲师体系 ',
         dataIndex: 'tsystemName',
         key: 'tsystemName',
-        ellipsis: true, align: "center",
+        ellipsis: true, align: "left",
         width: 200,
       },
       {
         title: '培训发生组织 ',
         dataIndex: 'trainOrgName',
         key: 'trainOrgName',
-        ellipsis: true, align: "center",
+        ellipsis: true, align: "left",
         width: 200,
          customRender: (value, record) => {
           return (
@@ -797,13 +804,7 @@ export default {
           )
         }
       },
-      {
-        title: '课程名称 ',
-        dataIndex: 'courseName',
-        key: 'courseName ',
-        ellipsis: true, align: "center",
-        width: 120,
-      },
+
       {
         title: '课程类型 ',
         dataIndex: 'type',
diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue
index 33502202..83221639 100644
--- a/src/views/lecturer/LecturerAPPEdit.vue
+++ b/src/views/lecturer/LecturerAPPEdit.vue
@@ -851,7 +851,7 @@ export default {
         key: 'name',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 120,
       },
       {
         title: '讲师工号',
@@ -859,7 +859,7 @@ export default {
         key: 'userNo',
         align: "center",
         ellipsis: true,
-        width: 160,
+        width: 120,
       },
       {
         title: '所属组织 ',
@@ -867,7 +867,7 @@ export default {
         key: 'orgName',
         ellipsis: true,
         align: "center",
-        width: 200,
+        width: 160,
         slots: { customRender: "orgName" },
       },
       {
@@ -876,7 +876,7 @@ export default {
         key: 'tsystemName',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 120,
       },
       {
         title: '讲师级别',
@@ -884,7 +884,7 @@ export default {
         key: 'tlevelName',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 100,
       },
       {
         title: '发薪地',
@@ -892,7 +892,7 @@ export default {
         key: 'payrollPlace',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 100,
         customRender: ({text}) => {
           return text || '-'
         }
@@ -903,7 +903,7 @@ export default {
         key: 'courseType',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 100,
         customRender: (value) => {
           return (
             <div>
@@ -926,7 +926,7 @@ export default {
         key: 'courseName',
         ellipsis: true,
         align: "center",
-        width: 200,
+        width: 160,
       },
       {
         title: '授课/开发课程日期',
@@ -934,7 +934,7 @@ export default {
         key: 'teachingDate',
         ellipsis: true,
         align: "center",
-        width: 200,
+        width: 160,
       },
       {
         title: '授课/开发课程时长 ',
@@ -957,7 +957,7 @@ export default {
         key: 'studys',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 100,
         customRender: ({text}) => {
           return text || "0";
         }
@@ -968,7 +968,7 @@ export default {
         key: 'score',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 100,
         customRender: (value) => {
           return (
             <div>
@@ -983,7 +983,7 @@ export default {
         key: 'levelPay',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 120,
       },
       {
         title: '计划费用 ',
@@ -991,7 +991,7 @@ export default {
         key: 'expense',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 120,
       },
       // {
       //   title: '应发费用 ',
@@ -1008,7 +1008,7 @@ export default {
         ellipsis: true,
         align: "center",
         fixed: "right",
-        width: 160,
+        width: 120,
         slots: { customRender: "appEdit" },
       },
     ])
@@ -1259,7 +1259,7 @@ export default {
       .table{
         padding-bottom: 70px;
         ::v-deep .ant-table-cell-fix-right {
-          width: 160px !important;
+          width: 120px !important;
         }
       }
     }
diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 53295d5f..c81bf68e 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -511,7 +511,7 @@
           title: '操作 ',
           dataIndex: 'operation',
           key: 'operation',
-        ellipsis: true, align: "right",
+        ellipsis: true, align: "center",
         fixed: "right",
           width: 120,
           scopedSlots: { customRender: "action" },
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index aa95871c..63bb649c 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -18,7 +18,7 @@
           </a-form-item>
           <a-form-item  class="select">
             <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.trainOrgId" placeholder="请选择培训发生组织" allowClear
-              :options="orgList" 
+              :options="orgListSearch" 
               v-on:keydown.enter="enterPressHadlerSearch">
             </a-select>
           </a-form-item>
@@ -611,6 +611,7 @@
         tableDataSee: [],
         SeeLoading: false,
         orgList: [],
+        orgListSearch: [],
         selectsIds: '',
         visibleConfirm: false,
         title:'导入讲师费记录',
@@ -699,7 +700,13 @@
               value: item.id 
             }
           })
-          state.orgList.unshift({
+          state.orgListSearch = res.data.data?.map(item=>{
+            return{
+              label: item.affiliationName,
+              value: item.id 
+            }
+          })
+          state.orgListSearch.unshift({
             label: '全部', value: ''
           })
         })
@@ -916,14 +923,14 @@ getAllLevelList().then((res) => {
           dataIndex: 'courseName',
           key: 'courseName',
           ellipsis: true,
-          align: "center",
+          align: "left",
           width: 200,
         },
         {
           title: '培训发生组织',
           dataIndex: 'trainOrgName',
           key: 'trainOrgName',
-        ellipsis: true, align: "center",
+        ellipsis: true, align: "left",
           width: 200,
         },
         
@@ -953,8 +960,8 @@ getAllLevelList().then((res) => {
           title: '讲师体系',
           dataIndex: 'tsystemName',
           key: 'tsystemName',
-        ellipsis: true, align: "center",
-          width: 120,
+        ellipsis: true, align: "left",
+          width: 200,
           customRender: ({ text })=>{
             return text||'-'
           }
diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue
index 30eb8f49..9396dab7 100644
--- a/src/views/lecturer/LecturerFeeStatistics.vue
+++ b/src/views/lecturer/LecturerFeeStatistics.vue
@@ -25,7 +25,7 @@
           </div>
         </a-form>
         <div style="width: 100%;"></div>   
-        <div style="display: flex; margin-bottom: 20px">
+        <div v-if="isAdmin" style="display: flex; margin-bottom: 20px">
           <a-button @click="searchResetPrevious()" type="primary" class="langbtn" style="width: 150px; height: 40px; border-radius: 8px" >
             <FolderAddOutlined /> 重新汇总上月讲师费
           </a-button>
@@ -171,7 +171,7 @@
   <MonthlyStatistics v-model:visible="opendrawer" :id="drawerId" ></MonthlyStatistics>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch } from "vue";
+import { reactive, toRefs, ref, watch,onMounted } from "vue";
 import { message } from "ant-design-vue";
 import dayjs from "dayjs";
 import { useStore } from "vuex";
@@ -179,7 +179,7 @@ import { useRouter } from "vue-router";
 import { getOrganization } from "../../api/Teaching";
 import {  queryTeacherFeeMonthly, getTeacherFeeDetailListByTeacherNo, getTeacherFeeListByTeacherNo,TeacherFeeTotalList,createMonthSummary} from "../../api/lecturerFeeStatistics"
 ;
-import {expenseSummaryList,getTrainOrg,CreateMonthSummary} from "../../api/lecturerFeeManagement";
+import {expenseSummaryList,getTrainOrg,CreateMonthSummary,isShowReimport} from "../../api/lecturerFeeManagement";
 import dialog from '@/utils/dialog'
 import MonthlyStatistics from './MonthlyStatistics'
 export default {
@@ -188,9 +188,22 @@ export default {
     MonthlyStatistics,
   },
   setup() {
+    onMounted(() => {
+      isShowReimport().then(res=>{
+        if(res.data.code == 200){
+          state.isAdmin = res.data.data
+        }else{
+          state.isAdmin = false
+        }
+      }).catch(err=>{
+        state.isAdmin = false
+        message.error(err.data.msg)
+      })
+    })
     const store = useStore();
     const router = useRouter();
     const state = reactive({
+      isAdmin: false,
       opendrawer: false,
       drawerId: '',
       summaryDate: null,
@@ -243,11 +256,11 @@ export default {
         width:'100px',
       },
       {
-        title: '资源归属 ',
+        title: '培训发生组织 ',
         dataIndex: 'trainOrgName',
         key: 'trainOrgName',
         ellipsis: true,
-        align: "center",
+        align: "left",
         width: '200px',
       },
       {
diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue
index 7ee60546..9040bb50 100644
--- a/src/views/lecturer/MonthlyStatistics.vue
+++ b/src/views/lecturer/MonthlyStatistics.vue
@@ -258,7 +258,7 @@ export default {
         key: 'name',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 120,
       },
       {
         title: '讲师工号',
@@ -266,7 +266,7 @@ export default {
         key: 'userNo',
         align: "center",
         ellipsis: true,
-        width: 160,
+        width: 120,
       },
       {
         title: '所属组织 ',
@@ -274,7 +274,7 @@ export default {
         key: 'orgName',
         ellipsis: true,
         align: "center",
-        width: 200,
+        width: 160,
         customRender: ({text})=>{
           return endOrg(text)
         }
@@ -285,7 +285,7 @@ export default {
         key: 'payrollPlace',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 120,
       },
       {
         title: '授课时长(系统 ) ',
@@ -293,7 +293,7 @@ export default {
         key: 'teachingSystem',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 140,
       },
       {
         title: '授课时长(录入) ',
@@ -301,7 +301,7 @@ export default {
         key: 'teachingEnter',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 140,
       },
       {
         title: '开发课程时长 ',
@@ -309,7 +309,7 @@ export default {
         key: 'teachingDevelop',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 120,
       },
       {
         title: '计划费用 ',
@@ -317,7 +317,7 @@ export default {
         key: 'expense',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 120,
       },
       {
         title: '应发费用 ',
@@ -325,7 +325,7 @@ export default {
         key: 'payableExpense',
         ellipsis: true,
         align: "center",
-        width: 160,
+        width: 120,
       },
       {
         title: '操作 ',
@@ -334,7 +334,7 @@ export default {
         ellipsis: true,
         align: "center",
         fixed: "right",
-        width: 160,
+        width: 100,
         scopedSlots: { customRender: "action" },
       },
     ])
diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index b8a3acee..c96bb9c7 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -150,11 +150,11 @@
                   是否为根节点：
                 </template>
                 <div style="display: flex;align-items: center;">
-                  <a-radio-group style="min-width:126px;" @change="selectRadio" v-model:value="formParam.isParent" name="radioGroup">
+                  <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 v-model:value="formParam.code" :placeholder="!formParam.isParent?'请选择审批层级':'请选择根节点'"
+                <a-select :disabled="!formParam.locking" v-model:value="formParam.code" :placeholder="!formParam.isParent?'请选择审批层级':'请选择根节点'"
                   :options="!formParam.isParent?PlaceOfPayList:PlaceOfPayListTwo" allowClear showSearch/>
                 </div>
             </a-form-item>
@@ -350,6 +350,7 @@ export default{
         code: null,
         isContains: '0',
         affiliationOrgList: [],
+        locking: 1,
       },
     })
     const PlaceOfPayList = ref([
@@ -399,7 +400,7 @@ export default{
         title: '培训发生组织名称 ',
         dataIndex: 'affiliationName',
         key: 'affiliationName',
-        ellipsis: true, align: "center",
+        ellipsis: true, align: "left",
         width: '200px',
       },
       {
@@ -429,7 +430,7 @@ export default{
         title: '是否为根节点名称',
         dataIndex: 'parentName',
         key: 'parentName',
-        align: "center",
+        align: "left",
         width: '200px',
         customRender: ({text,record})=>{
           return (
@@ -442,7 +443,7 @@ export default{
         dataIndex: 'leaderName',
         key: 'leaderName',
         ellipsis: true,
-        align: "center",
+        align: "left",
         width: '200px',
       },
 
@@ -759,6 +760,7 @@ const getTableDate = (obj) => {
         code: null,
         isContains: '0',
         affiliationOrgList: [],
+        locking: 1,
       }
     }
     async function validateField(name) {

From 657ca6b112562fdbcdd5060f83ad9c97f943b70e Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 26 Dec 2024 17:20:06 +0800
Subject: [PATCH 19/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=AE=9A=E4=BD=8D0?=
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 2cd02f7d..62dda9ab 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -206,6 +206,7 @@ watch(()=>props.visible,(val)=>{
   }else{
     nameUserNo.value = null
     dateValue.value = null
+    indexList.value = 0
     drawerContent.value?.$el.querySelector('.ant-table-body')?.scrollTo({top:0,behavior: 'smooth'})
   }
 })

From c9adb8d664a5562be2291d14c3e8b45833c21c0f Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 26 Dec 2024 17:31:19 +0800
Subject: [PATCH 20/22] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=B7=9F=E5=87=8F?=
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 62dda9ab..01cd445b 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -227,7 +227,7 @@ const removeId = (e,i) =>{
       }else{
         expenseList.value = expenseList.value.filter(item=>item.id !== e.id)
       }
-      forData.value[indexList.value].summaryTotal = (forData.value[indexList.value]?.summaryTotal - e.payableExpense).toFixed(2)
+      forData.value[indexList.value].summaryTotal = (forData.value[indexList.value]?.summaryTotal - e.expense).toFixed(2)
       if(!forData.value[indexList.value].expenseList.length){
         forData.value.splice(indexList.value,1)
         forData.value.length > 0 && clickItem(forData.value[0],0)

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

---
 src/components/project/BatchLecturer.vue   | 24 +++++++++++-----------
 src/components/project/ConfirmLecturer.vue | 24 +++++++++++-----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/components/project/BatchLecturer.vue b/src/components/project/BatchLecturer.vue
index 42797a83..482a2adb 100644
--- a/src/components/project/BatchLecturer.vue
+++ b/src/components/project/BatchLecturer.vue
@@ -176,20 +176,28 @@ const columns = [
     dataIndex: 'name',
     key: 'name',
     align: 'center',
-    width:120,
+    width:100,
   },
   {
     title: '讲师工号',
     dataIndex: 'userNo',
     key: 'userNo',
     align: 'center',
-    width:120
+    width:100
+  },
+  {
+    title: '课程名称',
+    dataIndex: 'courseName',
+    key: 'courseName',
+    align: 'left',
+    width:160,
+    customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
   },
   {
     title: '所属组织',
     dataIndex: 'orgName',
     key: 'orgName',
-    align: 'center',
+    align: 'left',
     ellipsis: true,
     width:100,
     customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
@@ -199,7 +207,7 @@ const columns = [
     title: '讲师体系',
     dataIndex: 'tsystemName',
     key: 'tsystemName',
-    align: 'center',
+    align: 'left',
     width:100,
     customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
   },
@@ -247,14 +255,6 @@ const columns = [
       }
     }
   },
-  {
-    title: '课程名称',
-    dataIndex: 'courseName',
-    key: 'courseName',
-    align: 'center',
-    width:100,
-    customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
-  },
   {
     title: '授课/开发课程日期',
     dataIndex: 'teachingDate',
diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index 01cd445b..68d48fff 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -286,20 +286,28 @@ const columns = [
     dataIndex: 'name',
     key: 'name',
     align: 'center',
-    width:120,
+    width:100,
   },
   {
     title: '讲师工号',
     dataIndex: 'userNo',
     key: 'userNo',
     align: 'center',
-    width:120,
+    width:100,
+  },
+  {
+    title: '课程名称',
+    dataIndex: 'courseName',
+    key: 'courseName',
+    align: 'left',
+    width:160,
+    customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
   },
   {
     title: '所属组织',
     dataIndex: 'orgName',
     key: 'orgName',
-    align: 'center',
+    align: 'left',
     ellipsis: true,
     width:100,
     customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
@@ -309,7 +317,7 @@ const columns = [
     title: '讲师体系',
     dataIndex: 'tsystemName',
     key: 'tsystemName',
-    align: 'center',
+    align: 'left',
     width:100,
     customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
   },
@@ -357,14 +365,6 @@ const columns = [
       }
     }
   },
-  {
-    title: '课程名称',
-    dataIndex: 'courseName',
-    key: 'courseName',
-    align: 'center',
-    width:100,
-    customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
-  },
   {
     title: '授课/开发课程日期',
     dataIndex: 'teachingDate',

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

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

diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index c96bb9c7..c6dc6bb6 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -710,7 +710,7 @@ const getTableDate = (obj) => {
               ...item
             };
           });
-          state.formParam.leveTwoValue = state.formParam.leveTwoArray.map(item => item.label).join(',');
+          state.formParam.leveTwoValue = state.formParam.leveTwoArray.map(item => item.label).join(',')||null;
           state.formParam.leveThreeArray = leveThreeArray.map(item => {
             return {
               label: item.userName + item.userNo,
@@ -719,7 +719,7 @@ const getTableDate = (obj) => {
               ...item
             };
           });
-          state.formParam.leveThreeValue = state.formParam.leveThreeArray.map(item => item.label).join(',');
+          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=>{
@@ -808,6 +808,9 @@ const getTableDate = (obj) => {
         }
       }
     }
+    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({