讲师费统计页面调整

src/views/lecturer/LecturerApproval.vue

@@ -6,9 +6,12 @@
         <a-form layout="inline" style="min-width: 1380px;">
           <a-form-item class="select">
             <!--  v-model:value="searchParam.name" -->
-            <a-input v-model:value="searchParam.userNo" style="width: 276px; height: 40px; border-radius: 8px"
-              placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
-            </a-input>
+            <div  style="width: 276px; height: 40px; border-radius: 8px"  >
+          <ProjectManager v-model:value="searchParam.managerId" 
+        v-model:name="searchParam.manager"
+        placeholder="请输入工号/讲师姓名进行检索"
+                            @onChange="managerChange" mode="multiple"></ProjectManager>
+                            </div>
   
             <!-- <a-select style="width: 276px" placeholder="请选择所属组织" v-model:value="searchParam.userNo"
               :options="infoteacherList">
@@ -113,8 +116,9 @@
 <span class="line"></span>
 <span>讲师费用详情</span>
 <a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
-    <a-descriptions-item label="讲师名称">{{formParam.teacher}}</a-descriptions-item>
-    <a-descriptions-item label="讲师工号">{{formParam.userNo}}</a-descriptions-item>
+    <a-descriptions-item label="讲师名称">{{formParam.teacherName}}</a-descriptions-item>
+    <a-descriptions-item label="讲师工号">{{formParam.teacherId
+}}</a-descriptions-item>
     <a-descriptions-item label="讲师组织" :span="2">{{formParam.departId}}</a-descriptions-item>
     <a-descriptions-item label="讲师体系">{{formParam.systemId}}</a-descriptions-item>
     <a-descriptions-item label="讲师级别">{{formParam.levelId }}</a-descriptions-item>
@@ -123,7 +127,7 @@
     <a-descriptions-item label="课程类型">{{formParam.type==1?'项目开课' :formParam.type==2 ?'路径开课':formParam.type==3 ?'面授开课':''}}</a-descriptions-item>
     <a-descriptions-item label="课程名称">{{formParam.name}}</a-descriptions-item>
     <a-descriptions-item label="授课时长  ">{{formParam.duration}}</a-descriptions-item>
-    <a-descriptions-item label="授课/课程日期  ">{{formParam.beginTime}}</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.teacherlevelPay}}</a-descriptions-item>
@@ -136,8 +140,8 @@
   <span class="line"></span>
 <span>讲师费审批</span>
 <div style="padding: 10px 0">
-          <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columnsa"
-            :data-source="tableDataa" :loading="tableLoading" @expand="expandTable" :pagination="false">
+          <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columnsExamine"
+            :data-source="tableDataExamine" :loading="examinetableLoading" @expand="expandTable" :pagination="false">
             <template #bodyCell="{ record, column }">
             
             </template>
@@ -208,6 +212,7 @@
     FolderAddOutlined,
     DownloadOutlined
   } from '@ant-design/icons-vue';
+  import ProjectManager from "@/components/project/ProjectManagerNew";
   import {getPayRollPlace} from "../../api/Lecturer";
   import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,updateTeacherFee,updateStatusSubmit,updateStatusWithDraw,getTrainOrg,getTeacherLevel} from "../../api/lecturerFeeManagement";import { getTeacherExpertise,getTeacherSystemList } from "../../api/Lecturer";
   // lecturerFeeManagement
@@ -221,6 +226,7 @@
       UploadOutlined,//图标--导出
       DownloadOutlined,//图标-导入
       FolderAddOutlined,//图标--新增
+      ProjectManager,
     },
     setup() {
       const state = reactive({
@@ -231,6 +237,7 @@
         promotionrecordsLoading:false ,  //晋级记录遮罩层
         teacherrecordsLoading:false,// 授课记录遮罩层
         tableLoading:false,
+        examinetableLoading:false,
         tagsshow:"1",
         delTeacherId:null, //删除id确认
         newStatus:null , //修改状态码确认
@@ -330,7 +337,7 @@
                 };
                 array.push(obj);
               });
-              lecturerSystemList.value = array;
+              trainOrglist.value = array;
             }
         }) 
       }
@@ -432,7 +439,7 @@
         },
         {
           title: '讲师工号 ',
-          dataIndex: 'teacherNo',
+          dataIndex: 'teacherId',
           key: 'teacherNo',
         elipsis: true, align: "center",
           width: 120,
@@ -578,7 +585,7 @@
           key: 'operation',
         elipsis: true, align: "right",
         fixed: "right",
-          width: 300,
+          width: 400,
           scopedSlots: { customRender: "action" },
         },
         
@@ -750,21 +757,22 @@
         state.kid= record.kid
         TeacherSystem()
       }
-      const tableDataFeeDetail = ref([
-  ])
+      
       //详情
       const TeacherSystem=()=>{
         getTeacherFeeDetail({kid : state.kid}).then((res) => {
             // state.formParam=Object.assign({} ,res.data.data)
             state.formParam=res.data.data
-            tableDataFeeDetail.value = res.data.data.records
+            console.log( state.formParam)
         }) 
         .catch((err) => {
             console.log("详情", err);
           });
       }
+      const tableDataExamine = ref([
+  ])
       //二级页面
-      const columnsFeeDetail = ref([
+      const columnsExamine = ref([
       {
           title: '审批人 ',
           dataIndex: 'teacherName',
@@ -863,9 +871,9 @@
         searchSubmit,
         searchReset,
         columns,
-        columnsFeeDetail,
+        columnsExamine,
         tableData,
-        tableDataFeeDetail,
+        tableDataExamine,
         changePagination,
         addTeacher,
         cancelTeachingDialog,
@@ -1215,4 +1223,11 @@
   border-radius:8px;
   margin-right:20px
 }
+::v-deep  .ant-select:not(.ant-select-customize-input) .ant-select-selector{
+  border-radius:8px;
+  height:40px;
+}
+.ant-col-12{
+  height:80px;
+}
 </style>