From 4e963fc9cf173c1502afd3b52369a8589125df48 Mon Sep 17 00:00:00 2001
From: wangxuemei <283912718@qq.com>
Date: Tue, 6 Aug 2024 18:47:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalLecturer.vue      |  2 +-
 src/views/lecturer/InsideLecturer.vue        | 33 +++++++++++++++++---
 src/views/lecturer/InsideTeaching.vue        |  2 +-
 src/views/lecturer/LecturerApproval.vue      |  8 ++---
 src/views/lecturer/LecturerFee.vue           |  8 ++---
 src/views/lecturer/LecturerFeeStatistics.vue |  8 ++---
 src/views/lecturer/LecturerSystem.vue        | 10 ++++--
 src/views/lecturer/LookExternalLecturer.vue  | 22 +++++++------
 src/views/lecturer/MonthlyStatistics.vue     |  2 +-
 src/views/lecturer/Organization.vue          |  2 +-
 10 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index 0898461a..9ce2ae73 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -924,7 +924,7 @@ export default {
   height:40px;
 }
 .ant-col-12{
-  height:80px;
+  height:90px;
 }
 .item_inp {
             flex: 1;
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 1ae14e03..aa0a36cb 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -2,7 +2,7 @@
 <template>
   <div >
     <!-- 搜索框及按钮 -->
-    <div class="filter" style="min-width: 1380px;">
+    <div class="filter" style="min-width: 1270px;">
       <a-form   layout="inline">
         <a-form-item class="select">
           <div  style="width: 276px; height: 40px; border-radius: 8px"  >
@@ -67,7 +67,12 @@
           </a-select>
         </a-form-item>
         <a-form-item v-if="moreid == 2" class="select">
-          <a-select style="width: 276px ;margin-bottom:20px" v-model:value="searchParam.certStatus" placeholder="认证状态" allowClear
+          <a-select style="width: 276px ;" v-model:value="searchParam.certStatus" placeholder="认证状态" allowClear
+            :options="AuthenticationStatusList">
+          </a-select>
+        </a-form-item>
+        <a-form-item v-if="moreid == 2" class="select">
+          <a-select style="width: 276px " v-model:value="searchParam.certStatus" placeholder="擅长课程" allowClear
             :options="AuthenticationStatusList">
           </a-select>
         </a-form-item>
@@ -490,6 +495,26 @@ export default {
     }
     const AddContentList = (data) => {
       console.log(data,'treedatalist')
+   [   {
+    title: 'parent 1',
+    key: '0-0',
+    children: [
+      {
+        title: 'parent 1-0',
+        key: '0-0-0',
+        disabled: true,
+        children: [
+          { title: 'leaf', key: '0-0-0-0', disableCheckbox: true },
+          { title: 'leaf', key: '0-0-0-1' },
+        ],
+      },
+      {
+        title: 'parent 1-1',
+        key: '0-0-1',
+        children: [{ key: '0-0-1-0', slots: { title: 'title0010' } }],
+      },
+    ],
+  }]
       //组件获取返回的所有值，调用以前接口，现环境不可用，示例：
       // [{
       //   "id": "966459050400600064",
@@ -522,7 +547,7 @@ export default {
     ])
     const changetlevel = (val) => {
 console.log( "讲师体系id" +val);
-      getLevel( {systemid:val}).then((res) => {
+      getLevel( {kid:val}).then((res) => {
         if (res.data.code === 200) {
           let arr = res.data.data;
           let array = [];
@@ -1357,7 +1382,7 @@ position: relative;
   line-height: 40px;
 }
 .ant-col-12{
-  height:80px;
+  height:90px;
 }
 .item_inp {
             flex: 1;
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 7b43fdce..bff7e9c6 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -1356,6 +1356,6 @@ export default {
   height:40px;
 }
 .ant-col-12{
-  height:80px;
+  height:90px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index e004c997..4909cf41 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -65,7 +65,7 @@
             </a-select>
           </a-form-item>
           <a-form-item class="select"  v-if="moreid == 2">
-            <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.tlevelId" placeholder="请选择讲师级别" allowClear   :disabled="getLevelList.length!==0 ? false:true"
+            <a-select style="width: 230px ;margin-bottom:10px" v-model:value="searchParam.tlevelId" placeholder="请选择讲师级别" allowClear   :disabled="getLevelList.length!==0 ? false:true"
               :options="getLevelList">
             </a-select>
           </a-form-item>
@@ -76,7 +76,7 @@
           <a-button @click="handleExport()" class="resetbtn">
             <UploadOutlined /> 导出
           </a-button>
-          <div  v-if="moreid == 2"   style="line-height: 40px;" >当前页面汇总金额：<span style="line-height: 40px; font-size: 26px; color: rgb(207, 34, 34) ;font-weight: 600;">1,230,490</span>元     当前总汇总金额：<span style="line-height: 40px; font-size: 26px; color: rgb(207, 34, 34) ;font-weight: 600;">9,230,490</span>元</div>
+          <div  v-if="moreid == 2"   style="line-height: 40px;" >当前页面汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">1,230,490</span>元     当前总汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">9,230,490</span>元</div>
         </div>
         <!-- 表格 -->
         <div style="padding: 10px 0">
@@ -940,7 +940,7 @@
 
     .select {
       margin-right: 20px;
-      margin-bottom: 20px;
+      margin-bottom: 10px;
     }
   }
 }
@@ -1179,6 +1179,6 @@
   height:40px;
 }
 .ant-col-12{
-  height:80px;
+  height:90px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 7b0c7466..cd80364d 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -87,7 +87,7 @@
             <UploadOutlined /> 导出
           </a-button>
        
-          <div  v-if="moreid == 2"   style="line-height: 40px;" >当前页面汇总金额：<span style="line-height: 40px; font-size: 26px; color: rgb(207, 34, 34) ;font-weight: 600;">1,230,490</span>元     当前总汇总金额：<span style="line-height: 40px; font-size: 26px; color: rgb(207, 34, 34) ;font-weight: 600;">9,230,490</span>元</div>
+          <div  v-if="moreid == 2"   style="line-height: 40px;" >当前页面汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">1,230,490</span>元     当前总汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">9,230,490</span>元</div>
          </div>
         <!-- 表格 -->
         <div style="padding: 10px 0">
@@ -432,7 +432,7 @@
         tableDataTotal: -1,//table列表总条数
         formParam: {
           teachingDate:null ,
-          defaultTeachingTime:"0",
+          defaultTeachingTime:0,
           courseName:0
         },
         searchParam: {
@@ -1181,7 +1181,7 @@ console.log( "讲师体系id" +val);
 
     .select {
       margin-right: 20px;
-      margin-bottom: 20px;
+      margin-bottom: 10px;
     }
   }
 }
@@ -1420,6 +1420,6 @@ console.log( "讲师体系id" +val);
   height:40px;
 }
 .ant-col-12{
-  height:80px;
+  height:90px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue
index 5b8e72ca..8c4549c7 100644
--- a/src/views/lecturer/LecturerFeeStatistics.vue
+++ b/src/views/lecturer/LecturerFeeStatistics.vue
@@ -2,7 +2,7 @@
 <template>
     <div style="margin: 20px;">
     <!-- 搜索框及按钮 -->
-    <div class="filter" style="min-width: 1380px;">
+    <div class="filter" >
       <a-form layout="inline">
           <a-form-item  class="select">
             <a-select style="width: 276px" v-model:value="searchParam.payrollPlaceId" placeholder="发薪地"
@@ -28,7 +28,7 @@
           <a-button @click="searchResetPrevious()" type="primary" class="langbtn" style="width: 150px; height: 40px; border-radius: 8px" >
             <FolderAddOutlined /> 重新汇总上月讲师费
           </a-button>
-          <div   style="line-height: 40px;" >当前页面汇总金额：<span style="line-height: 40px; font-size: 26px; color: rgb(207, 34, 34) ;font-weight: 600;">1,230,490</span>元     当前总汇总金额：<span style="line-height: 40px; font-size: 26px; color: rgb(207, 34, 34) ;font-weight: 600;">9,230,490</span>元</div>
+          <div     style="line-height: 40px; margin-left: 14px;" >当前页面汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">1,230,490</span>元     当前总汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">9,230,490</span>元</div>
         </div>
       <!-- 表格 -->
       <div style="padding: 10px 0">
@@ -870,7 +870,7 @@ export default {
     flex-wrap: wrap;
       .select {
         margin-right: 20px;
-        margin-bottom: 20px;
+        margin-bottom: 10px;
       }
     }}
 
@@ -1081,7 +1081,7 @@ export default {
   height:40px;
 }
 .ant-col-12{
-  height:80px;
+  height:90px;
 }
 .item_inp {
             flex: 1;
diff --git a/src/views/lecturer/LecturerSystem.vue b/src/views/lecturer/LecturerSystem.vue
index 1e6538b2..e157ea5f 100644
--- a/src/views/lecturer/LecturerSystem.vue
+++ b/src/views/lecturer/LecturerSystem.vue
@@ -393,8 +393,8 @@ export default {
       getTableDate();
     };
     const rules = {
-      trainorgId: [{ required: true, message: '讲师体系编号不能为空' }],
-      trainorgName: [{ required: true, message: '讲师体系名称不能为空' }],
+      kid: [{ required: true, message: '讲师体系编号不能为空' }],
+      systemName: [{ required: true, message: '讲师体系名称不能为空' }],
     }
     const handleLook =(record)=>{
       let id = record.kid 
@@ -827,4 +827,8 @@ export default {
           height: 100%;
           font-size: 33px;
         }
-      }</style>
\ No newline at end of file
+      }
+      .ant-col-12{
+  height:90px;
+}
+      </style>
\ No newline at end of file
diff --git a/src/views/lecturer/LookExternalLecturer.vue b/src/views/lecturer/LookExternalLecturer.vue
index ee12758f..80e56295 100644
--- a/src/views/lecturer/LookExternalLecturer.vue
+++ b/src/views/lecturer/LookExternalLecturer.vue
@@ -54,16 +54,18 @@ ExternalLecturer
         </template>
       </a-table>
       <div style="float: right;">
-      <a-pagination
-            v-if="teacherrecordstableDataTotal > 10"
-            :showSizeChanger="true"
-            :hideOnSinglePage="true"
-            :pageSize="pageSize"
-            v-model:current="teacherrecords.pageNo"
-            :total="teacherrecordstableDataTotal"
-            class="pagination"
-            @change="teacherchangePagination"
-          />
+    
+          <a-pagination
+          v-if="tableDataTotal > 10"
+        :showSizeChanger="false"
+        :showQuickJumper="true"
+        :hideOnSinglePage="true"
+        :pageSize="searchParam.pageSize"
+        :current="searchParam.pageNo"
+        :total="tableDataTotal"
+        class="pagination"
+        @change="changePagination"
+      />
           </div>
        </a-tab-pane>
    
diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue
index d2ec4b73..04a3a17f 100644
--- a/src/views/lecturer/MonthlyStatistics.vue
+++ b/src/views/lecturer/MonthlyStatistics.vue
@@ -865,7 +865,7 @@ export default {
   height:40px;
 }
 .ant-col-12{
-  height:80px;
+  height:90px;
 }
 .goback {
         float: right;
diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index c05766ab..f6be6353 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -691,7 +691,7 @@ position: relative;
   line-height: 40px;
 }
 .ant-col-12{
-  height:80px;
+  height:90px;
 }
 .item_inp {
             flex: 1;