From 9943989a23d963761abbe8d10375cf087f6511df Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 28 Nov 2024 19:03:34 +0800
Subject: [PATCH] =?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   | 4 +++-
 src/components/project/ConfirmLecturer.vue | 2 ++
 src/components/project/OrgClass.vue        | 1 -
 src/views/lecturer/LecturerApproval.vue    | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/project/BatchLecturer.vue b/src/components/project/BatchLecturer.vue
index 83dd29bd..7cc2a42e 100644
--- a/src/components/project/BatchLecturer.vue
+++ b/src/components/project/BatchLecturer.vue
@@ -16,7 +16,7 @@
       </div>
       <div class="content">
         <div class="box">
-          <div style="margin-bottom: 20px;font-size: 18px;font-weight: 700;">选择讲师费汇总:<span style="color:red;margin-left:20px;">{{payableExpense||0}}元</span></div>
+          <div style="margin-bottom: 20px;font-size: 18px;font-weight: 700;">选择讲师费汇总:<span style="color:red;margin-left:20px;">{{payableExpense.toFixed(2)||0}}元</span></div>
           <div class="table" style="padding-bottom:72px;">
             <a-table
               :columns="columns"
@@ -121,6 +121,8 @@ const columns = [
     dataIndex: 'orgName',
     key: 'orgName',
     align: 'center',
+    ellipsis: true,
+    customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
   },
   
   {
diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index 18116de5..a890c48d 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -271,6 +271,8 @@ const columns = [
     dataIndex: 'orgName',
     key: 'orgName',
     align: 'center',
+    ellipsis: true,
+    customCell  :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}},
   },
   
   {
diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index 911cb9df..56653ed1 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -18,7 +18,6 @@
     :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
     :placeholder="placeholder"
     :labelInValue="true"
-    allow-clear
     v-model:treeExpandedKeys="stuTreeExpandedKeys"
     :loading="orgLoading"
     :load-data="onLoadData"
diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 436e547a..73a6a11d 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -264,6 +264,7 @@
         const search = sessionStorage.getItem('searchApprlval')
         if(search){
           state.searchParam = JSON.parse(search)
+          state.searchdate = state.searchParam.searchdate
         }
         getTableDate()
       })
@@ -546,6 +547,7 @@
         let objA = { ...state.searchParam };
          objA.beginTime = state.searchdate ? dayjs(state.searchdate[0]).format("YYYY-MM-DD") : "",
         objA.endTime =  state.searchdate ? dayjs(state.searchdate[1]).format("YYYY-MM-DD") : "",
+        delete objA.searchdate
      expenseBillList(objA)
           .then((res) => {
             tableData.value = res.data.data.records
@@ -619,6 +621,7 @@
         }
       }
       const goDdit = (record) => {
+        state.searchParam.searchdate = state.searchdate
         sessionStorage.setItem('searchApprlval', JSON.stringify(state.searchParam))
         router.push({
           path:'/LecturerAppEdit',