讲师管理修改

src/views/lecturer/LecturerFee.vue

@@ -16,7 +16,7 @@
                   </div>
           </a-form-item>
           <a-form-item  class="select">
-              <a-input v-model:value="searchParam.trainorgId" style="width: 276px; height: 40px; border-radius: 8px"
+              <a-input v-model:value="searchParam.orgId" style="width: 276px; height: 40px; border-radius: 8px"
             placeholder="请输入培训发生组织进行搜索" allowClear showSearch>
           </a-input>
           </a-form-item>
@@ -154,8 +154,8 @@
           <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item label="讲师名称" name="name">
-               <SearchTeacher v-model:id="formParam.teacherId" v-model:value="formParam.name" v-model:orgId="formParam.trainOrgId" v-model:lable="formParam.trainOrgName" v-model:user="formParam.userNo"
+               <SearchTeacher v-model:id="formParam.teacherId" v-model:value="formParam.name" v-model:orgId="formParam.orgId" v-model:lable="formParam.orgName" v-model:user="formParam.userNo"
-                v-model:system="tSystemNames" v-model:level="formParam.tLevelId" ></SearchTeacher>
+                v-model:system="tSystemNames" v-model:level="formParam.tlevelId" ></SearchTeacher>
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -169,21 +169,21 @@
           <!--  讲师组织  departId 讲师体系  systemId   -->
           <a-row :gutter="16">
             <a-col :span="12">
-                <a-form-item label="讲师组织" name="trainOrgName">
+                <a-form-item label="讲师组织" name="orgName">
               <a-popover>
                 <template #content>
-                  {{ formParam.trainOrgName }}.
+                  {{ formParam.orgName }}.
                 </template>
 
-                <a-input disabled v-model:value="formParam.trainOrgName" class="draitem"
+                <a-input disabled v-model:value="formParam.orgName" class="draitem"
                   placeholder="自动带出讲师的组织,展示主要部分,鼠标浮上去展示所有" allowClear showSearch>
                 </a-input>
               </a-popover>
             </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="讲师体系" name="tSystemName">
+              <a-form-item label="讲师体系" name="tsystemName">
-              <!-- <a-select class="draitem" v-model:value="formParam.tSystemName" placeholder="请选择讲师体系" allowClear
+              <!-- <a-select class="draitem" v-model:value="formParam.tsystemName" placeholder="请选择讲师体系" allowClear
                 @change="changetlevel" .:options="LecturerSystemList">
               </a-select> -->
               <a-input disabled v-model:value="tSystemNames.systemName" class="draitem"
@@ -195,8 +195,8 @@
           <!-- 讲师级别 levelId   讲师发薪地  payrollPlaceName-->
           <a-row :gutter="16">
             <a-col :span="12">
-              <a-form-item label="讲师级别"  name="tLevelId">
+              <a-form-item label="讲师级别"  name="tlevelId">
-                <a-select class="draitem" v-model:value="formParam.tLevelId" placeholder="请选择讲师级别" allowClear
+                <a-select class="draitem" v-model:value="formParam.tlevelId" placeholder="请选择讲师级别" allowClear
                    :options="tSystemNames.levelVoList" @change="handleformlevel">
                 </a-select>
               </a-form-item>
@@ -469,14 +469,16 @@
           teachingDate:null ,
           teachingTime:null,
           name: null,
-          userNo: null
+          userNo: null,
+          payrollPlace: '北京',
+          payrollPlaceId: '1001',
         },
         searchdate: null, //选择时间
         allsearchdate: null, //选择时间
         searchParam: {
           userNo:null,
           name:null,
-          trainorgId:null,
+          orgId:null,
           tsystemId:null,
           levelId:null,
           courseType:null,
@@ -876,10 +878,13 @@ console.log( "讲师体系id" +val);
     }
     //保存
     const createTeacherDialog = async () => {
+      console.log(state.formParam,'formParam')
+      state.formParam.payrollPlace = '北京'
+      state.formParam.payrollPlaceId = '1001'
       state.formParam.expense = String(state.formParam.expense)
       state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD").toString() : ""
-      state.formParam.tSystemName = state.tSystemNames.systemName
+      state.formParam.tsystemName = state.tSystemNames.systemName
-      state.formParam.tSystemId = state.tSystemNames.systemId
+      state.formParam.tsystemId = state.tSystemNames.systemId
       const formItemNames = Object.keys(rules);
       for(let i=0;i<formItemNames.length;i++){
         const result = await validateField(formItemNames[i]);
@@ -974,9 +979,9 @@ console.log( "讲师体系id" +val);
         state.formParam ={
           name:null,
           userNo:null,
-          trainOrgName:null,
+          orgName:null,
-          tSystemName:null,
+          tsystemName:null,
-          tLevelId:null,
+          tlevelId:null,
           payrollPlace:null,
           courseType: null,
           courseName:null,
@@ -1081,9 +1086,9 @@ console.log( "讲师体系id" +val);
       const rules = {
         name: [{ required: true, message:'',log: '讲师不能为空' }],
         userNo: [{ required: true, message: '',log:'讲师工号不能为空' }],
-        trainOrgName: [{ required: true, message: '',log:'讲师组织不能为空' }],
+        orgName: [{ required: true, message: '',log:'讲师组织不能为空' }],
-        tSystemName: [{ required: true, message:'',log: '讲师体系不能为空' }],
+        tsystemName: [{ required: true, message:'',log: '讲师体系不能为空' }],
-        tLevelId: [{ required: true, message:'',log: ' 讲师级别 不能为空' }],
+        tlevelId: [{ required: true, message:'',log: ' 讲师级别 不能为空' }],
         payrollPlace: [{ required: true, message:'',log: '讲师发薪地 不能为空' }],
         courseType: [{ required: true, message: '',log:'费用类型不能为空' }],
         courseName: [{ required: true, message:'',log: '课程名称不能为空' }],

src/views/lecturer/LecturerFeeStatistics.vue

@@ -255,7 +255,7 @@ export default {
         key: 'summaryDate',
         elipsis: true,
         align: "center",
-        width: 200,
+        width: 300,
       },
       {
         title: '汇总金额 ',
@@ -271,7 +271,7 @@ export default {
         key: 'operation',
         elipsis: true,
         align: "right",
-        width: 400,
+        width: 200,
         scopedSlots: { customRender: "action" },
       },
     ])
@@ -418,7 +418,8 @@ export default {
     //表格内查看数据操作
     const handleLook = (record) => {
       let id = record.id
-      router.push({ path: '/MonthlyStatistics', query: { id } })
+      const trainOrgId = record.trainOrgId
+      router.push({ path: '/MonthlyStatistics', query: { id,trainOrgId,name:'' } })
       // state.teacherdialog = true;
       // state.teacherdialogtitle = '讲师费月度统计详情'
       // state.summaryDate = record.summaryDate;

src/views/lecturer/MonthlyStatistics.vue

@@ -139,7 +139,7 @@ import { useRouter,useRoute } from "vue-router";
 import {
     UploadOutlined,
   } from '@ant-design/icons-vue';
-  import { getPayRollPlace } from "../../api/Lecturer";
+  import { getPayRollPlace,expenseSummaryById } from "../../api/Lecturer";
   import { getOrganization } from "../../api/Teaching";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import {queryTeacherFeeMonthly} from "../../api/lecturerFeeStatistics";
@@ -179,8 +179,8 @@ export default {
         departId: null,
         summaryDate:null,
         id: route.query.id,
-        name: '',
+        name: route.query.name,
-        trainOrgId: '',
+        trainOrgId: route.query.trainOrgId,
       },
       name:null,
       drawer: {
@@ -303,7 +303,7 @@ export default {
     //  List接口数据
     const getTableDate = (obj) => {
       state.tableLoading = true
-      queryTeacherFeeMonthly(state.searchParam)
+      expenseSummaryById(state.searchParam)
         .then((res) => {
           console.log(res,'resssss')
           tableData.value = res.data.data.records