讲师费统计

src/api/Lecturer.js

@@ -64,7 +64,7 @@ export const affiliationDelById = (id)=>http.post(`/admin/affiliation/delById?id
 //讲师费统计详情
 export const expenseSummaryById = (obj) => http.get( `/admin/expenseSummary/queryById?id=${obj.id}&name=${obj.name}&trainOrgId=${obj.trainOrgId}`)
 //查看月度讲师费详情
-export const queryDetailId = (obj) => http.get(`/admin/expenseSummary/queryDetailId?summaryId=${obj.summaryId}&name=${obj.name}`)
+export const queryDetailId = (obj) => http.get(`/admin/expenseSummary/queryDetailId?summaryId=${obj.summaryId}&name=${obj.name}&startTime=${obj.startTime}&endTime=${obj.endTime}`)
 //查询未汇总的数据（批量确认弹框）
 export const getListByStatus = (obj) => http.get(`/admin/teacherExpense/getListByStatus`)
 //根据发生组织查询汇总的数据（一键确认弹框使用）

src/views/lecturer/MonthlyStatistics.vue

@@ -101,7 +101,8 @@
           </a-input>
         </a-form-item>
         <a-form-item class="select ">
-          <a-range-picker style="width: 260px; height: 40px; margin-bottom: 20px; border-radius: 8px" v-model:value="drawersearchdate" separator="至"
+          <a-range-picker format="YYYY-MM-DD"
+          valueFormat="YYYY-MM-DD" style="width: 260px; height: 40px; margin-bottom: 20px; border-radius: 8px" v-model:value="drawersearchdate" separator="至"
             :placeholder="['      开始时间', '        结束时间']" @change="searchTimeChange" />
         </a-form-item>
         <div style="display: flex; margin-bottom: 20px">
@@ -110,7 +111,7 @@
 </div>
 </a-form>
 <span>讲师费发放情况</span>
-<a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="column"  :data-source="tableDatas" :loading="tableLoadings" :pagination="false">
+<a-table :scroll="{ x: 'max-content'}" :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="column"  :data-source="tableDatas" :loading="tableLoadings" :pagination="false">
             <template #bodyCell="{ record, column }">
             </template>
           </a-table>
@@ -139,7 +140,7 @@ import { useRouter,useRoute } from "vue-router";
 import {
     UploadOutlined,
   } from '@ant-design/icons-vue';
-  import { getPayRollPlace,expenseSummaryById } from "../../api/Lecturer";
+  import { getPayRollPlace,expenseSummaryById ,queryDetailId} from "../../api/Lecturer";
   import { getOrganization } from "../../api/Teaching";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import {queryTeacherFeeMonthly} from "../../api/lecturerFeeStatistics";
@@ -156,6 +157,7 @@ export default {
     const route = useRoute();
     const { query: { id }} = useRoute();
     const state = reactive({
+      tableLoadings: false,
       opendrawer:false,
       id,
       summaryDate: null,
@@ -174,20 +176,21 @@ export default {
       searchParam: {
         pageNo: "1",
         pageSize: "10",
-        name: null,
+        name: '',
         payrollPlaceId: null,
         departId: null,
         summaryDate:null,
-        id: route.query.id,
+        id: '2',
-        name: route.query.name,
+        trainOrgId: '',
-        trainOrgId: route.query.trainOrgId,
       },
       name:null,
       drawer: {
-        name: null,
+        name: '',
-        drawersearchdate: null,
+        drawersearchdate: '',
         pageNo: '1',
         pageSize: '10',
+        endTime: '',
+        startTime: '',
       }
     })
     watch(
@@ -214,8 +217,8 @@ export default {
       },
       {
         title: '所属组织 ',
-        dataIndex: 'teacherOrg',
+        dataIndex: 'orgName',
-        key: 'teacherOrg',
+        key: 'orgName',
         elipsis: true,
         align: "center",
         width: 300,
@@ -223,24 +226,24 @@ export default {
       },
       {
         title: '讲师发薪地 ',
-        dataIndex: 'teacherpayrollPlace',
+        dataIndex: 'trainOrgName',
-        key: 'teacherpayrollPlace',
+        key: 'trainOrgName',
         elipsis: true,
         align: "center",
         width: 200,
       },
       {
         title: '授课时长(系统 ) ',
-        dataIndex: 'teachingTime',
+        dataIndex: 'teachingSystem',
-        key: 'teachingTime',
+        key: 'teachingSystem',
         elipsis: true,
         align: "center",
         width: 200,
       },
       {
         title: '授课时长(录入) ',
-        dataIndex: 'teachingTime',
+        dataIndex: 'teachingEnter',
-        key: 'teachingTime',
+        key: 'teachingEnter',
         elipsis: true,
         align: "center",
         width: 200,
@@ -306,7 +309,7 @@ export default {
       expenseSummaryById(state.searchParam)
         .then((res) => {
           console.log(res,'resssss')
-          tableData.value = res.data.data.records
+          tableData.value = res.data.data
           state.tableDataTotal = Number(res.data.data.total);
           state.tableLoading = false
         })
@@ -338,7 +341,21 @@ export default {
     getOrganizationLista()
     //表格内查看数据操作
     const handleLook = (record) => {
+      state.drawer={
+        name: '',
+        drawersearchdate: '',
+        pageNo: '1',
+        pageSize: '10',
+        endTime: '',
+        startTime: '',
+      }
       state.opendrawer=true
+      searchSubmitdrawer()
+    }
+    const searchTimeChange = (e) => {
+      state.drawer.startTime = e[0]
+      state.drawer.endTime = e[1]
+      
     }
     const changePagination = (page, pageSize) => {
       state.searchParam.pageNo = page;
@@ -368,33 +385,47 @@ export default {
       //二级页面重置
       const searchResetdrawer =()=>{
         state.drawer={
-        name: null,
+          name: '',
-        drawersearchdate: null,
+          drawersearchdate: '',
           pageNo: '1',
           pageSize: '10',
+          endTime: '',
+          startTime: '',
         }
+        searchSubmitdrawer()
       }
       //二级页面查询
       const searchSubmitdrawer=()=>{
-
+        state.tableLoadings = true
+        const params = {
+          summaryId: '',
+          name: state.drawer.name,
+          endTime: state.drawer.endTime,
+          startTime: state.drawer.startTime,
         }
-      const  tableDatas = ref[{}]
+        queryDetailId(params).then(res=>{
+          console.log(res,'resss')
+          tableDatas.value = res.data.data
+          state.tableLoadings = false
+        })
+      }
+      const  tableDatas = ref([])
       const column = ref([
       {
         title: '讲师姓名 ',
-        dataIndex: 'teacherName',
+        dataIndex: 'name',
-        key: 'teacherName',
+        key: 'name',
         elipsis: true,
         align: "center",
-        width: 200,
+        width: 100,
       },
       {
         title: '讲师工号',
-        dataIndex: 'teacherNo',
+        dataIndex: 'userNo',
-        key: 'teacherNo',
+        key: 'userNo',
         align: "center",
         elipsis: true,
-        width: 200,
+        width: 100,
       },
       {
           title: '课程名称 ',
@@ -433,11 +464,11 @@ export default {
         },
       {
         title: '授课时间',
-        dataIndex: 'teacherOrg',
+        dataIndex: 'teachingDate',
-        key: 'teacherOrg',
+        key: 'teachingDate',
         elipsis: true,
         align: "center",
-        width: 300,
+        width: 120,
         scopedSlots: { customRender: "teacherOrg" },
       },
       {
@@ -460,7 +491,7 @@ export default {
         key: 'teacherpayrollPlace',
         elipsis: true,
         align: "center",
-        width: 200,
+        width: 120,
       },
     
       {
@@ -468,7 +499,7 @@ export default {
           dataIndex: 'teacherlevelPay',
           key: 'teacherlevelPay',
         elipsis: true, align: "center",
-          width: 120,
+          width: 100,
         },
       {
         title: '计划费用 ',
@@ -476,7 +507,7 @@ export default {
         key: 'expense',
         elipsis: true,
         align: "center",
-        width: 200,
+        width: 100,
       },
       {
         title: '应发费用 ',
@@ -484,13 +515,22 @@ export default {
         key: 'payableExpense',
         elipsis: true,
         align: "center",
-        width: 200,
+        width: 100,
       },
    
     ])
          //取消按钮 清空输入的数据
       const cancelTeachingDialog = () => {
         state.opendrawer = false
+        
+        state.drawer={
+          name: '',
+          drawersearchdate: '',
+          pageNo: '1',
+          pageSize: '10',
+          endTime: '',
+          startTime: '',
+        }
       };
     return {
       ...toRefs(state),
@@ -501,6 +541,8 @@ export default {
       handleFeeMonthly,
       handleLook,
       changePagination,
+      searchTimeChange,
+      searchSubmitdrawer,
       getTableDate,
       searchSubmit,
       tableData,