From 356f1528698df4a240c95883872242aa19a12928 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 7 Jan 2025 14:28:00 +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/views/lecturer/LecturerFeeManagement.vue |  2 +-
 src/views/lecturer/LecturerFeeStatistics.vue |  2 +-
 src/views/lecturer/MonthlyStatistics.vue     | 65 ++++++++++++++------
 3 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index 76f2aabb..04c827d8 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="LecturerFeeManagement">
     <div style="margin: 20px;margin-top:0;" >
-    <a-tabs v-model:activeKey="activeKey" :destroyInactiveTabPane="true">
+    <a-tabs v-model:activeKey="activeKey" >
   <a-tab-pane key="1" tab="讲师费管理">
 <LecturerFee />
      </a-tab-pane>
diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue
index 2f4d4237..7a7eeb3a 100644
--- a/src/views/lecturer/LecturerFeeStatistics.vue
+++ b/src/views/lecturer/LecturerFeeStatistics.vue
@@ -274,7 +274,7 @@ export default {
         width:'60px'
       },
       {
-        title: '汇总日期 ',
+        title: '汇总时间',
         dataIndex: 'summaryTime',
         key: 'summaryTime',
         ellipsis: true,
diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue
index 6ea4fc01..5ba7f779 100644
--- a/src/views/lecturer/MonthlyStatistics.vue
+++ b/src/views/lecturer/MonthlyStatistics.vue
@@ -266,16 +266,21 @@ export default {
         key: 'name',
         ellipsis: true,
         align: "center",
-        width: 120,
-      },
-      {
-        title: '讲师工号',
-        dataIndex: 'userNo',
-        key: 'userNo',
-        align: "center",
-        ellipsis: true,
-        width: 120,
+        width: 180,
+        customRender: (value)=>{
+          return (
+            <div>{value.record.name}  /  {value.record.userNo}</div>
+          )
+        }
       },
+      // {
+      //   title: '讲师工号',
+      //   dataIndex: 'userNo',
+      //   key: 'userNo',
+      //   align: "center",
+      //   ellipsis: true,
+      //   width: 120,
+      // },
       {
         title: '所属组织 ',
         dataIndex: 'orgName',
@@ -347,6 +352,7 @@ export default {
         ellipsis: true,
         align: "center",
         width: 120,
+        customCell:(text)=>{return{style:{color:colorSet(text)}}},
         customRender: ({text})=>{
           return text ? text+'元' : '-'
         }
@@ -365,6 +371,11 @@ export default {
     //列表数据
     const tableData = ref([
     ])
+    const colorSet = (val) => {
+      if(val.payableExpense!=val.expense){
+        return 'red'
+      }
+    }
     // 搜索
     const searchSubmit = () => {
       state.searchParam.pageNo = 1;
@@ -548,22 +559,36 @@ export default {
         key: 'name',
         ellipsis: true,
         align: "center",
-        width: 100,
-      },
-      {
-        title: '讲师工号',
-        dataIndex: 'userNo',
-        key: 'userNo',
-        align: "center",
-        ellipsis: true,
-        width: 100,
+        width: 180,
+        customRender: (value) => {
+          return (
+            <div>
+              {value.record?.name}  /  {value.record?.userNo}
+            </div>
+          );
+        },
       },
+      // {
+      //   title: '讲师工号',
+      //   dataIndex: 'userNo',
+      //   key: 'userNo',
+      //   align: "center",
+      //   ellipsis: true,
+      //   width: 100,
+      // },
       {
           title: '课程名称 ',
           dataIndex: 'courseName',
           key: 'courseName',
         ellipsis: true, align: "center",
-          width: 120,
+          width: 160,
+        },
+        {
+          title: '培训发生组织 ',
+          dataIndex: 'trainOrgName',
+          key: 'trainOrgName',
+        ellipsis: true, align: "center",
+          width: 160,
         },
         {
           title: '课程类型 ',
@@ -657,6 +682,7 @@ export default {
         ellipsis: true,
         align: "center",
         width: 100,
+        customCell:(text)=>{return{style:{color:colorSet(text)}}},
         customRender: ({text})=>{
           return text ? text+'元' : '-'
         }
@@ -704,6 +730,7 @@ export default {
       columns,
       PlaceOfPayList,
       PlaceOfPayLista,
+      colorSet,
       getOrganizationList,
       getOrganizationLista,
       searchResetdrawer,