导入导出调整

src/api/lecturerFeeManagement.js

@@ -19,6 +19,10 @@ export const expenseBillList= (obj) => http.get('/admin/expenseBill/list',{param
 export const queryById= (obj) => http.get('/admin/expenseBill/queryById',{params: obj})
 //移除讲师费
 export const withdrawRecord= (obj) => http.post('/admin/expenseBill/withdrawRecord',obj)
+//确认讲师费
+export const confirm= (obj) => http.post('/admin/teacherExpense/confirm',obj)
+
+
 
 //获取培训发生组织列表
 export const getTrainOrg= (obj) => http.post('/teacher/fee/getTrainOrg',obj)

src/components/lecturer/ImportWork.vue

@@ -274,7 +274,22 @@ import {getCookieForName} from "@/api/method";
         }
       };
       function downTemplate() {
-        window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportHomeWorkTemplate?taskId=${props.id || ''}&type=${props.type || ''}&pid=${props.pid || ''}&thirdType=3`);
+        if (props.url=='/admin/export/importInTeacherRecord'){
+        window.open(
+        `${process.env.VUE_APP_BASE_API}/admin/export/importInTeacherRecord?
+        &name=${props.name||''}`
+      );}
+      else if(props.url=='/admin/export/importOutTeacherRecord'){
+        window.open(
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacherRecord?
+        &name=${props.name||''}`
+      );
+      }else {
+        window.open(
+        `${process.env.VUE_APP_BASE_API}/admin/export/importTeacherExpense?
+        &name=${props.name||''}`
+      );
+      }
       }
 
       return {

src/views/lecturer/ExternalLecturer.vue

@@ -647,7 +647,7 @@ export default {
     //导出功能
     const handleExport = () => {  
       window.open(
-        `${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${state.searchParam.pageNo
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacher?pageNo=${state.searchParam.pageNo
         }&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}`
       );
       //   this.download('lesson_records/export', {

src/views/lecturer/ExternalTeaching.vue

@@ -10,7 +10,7 @@
             placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
           </a-input> -->
           <a-input style="width: 276px; height: 40px; border-radius: 8px" placeholder="请输入工号/讲师姓名进行检索" showSearch
-            allowClear v-model:name="searchParam.teacherNameOrUserNo"></a-input>
+            allowClear v-model:name="searchParam.name"></a-input>
         </a-form-item>
         <a-form-item class="select">
           <a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
@@ -115,7 +115,7 @@
         <a-row :gutter="16">
           <a-col :span="12">
             <a-form-item label="讲师名称" name="teacher">
-              <ProjectManagerOutTeacher v-model:value="formParam.userNo" 
+              <ProjectManagerOutTeacher v-model:value="formParam.name" 
         v-model:name="formParam.teacher"
         placeholder="请输入工号/讲师姓名进行检索"
                             @onChange="managerChange"></ProjectManagerOutTeacher>    </a-form-item>
@@ -270,7 +270,7 @@
       </a-modal>
     </div>
     <!-- <div> <ImageUpload/> </div>         -->
-    <ImportWork v-model:showWork="showWork" :url="'/importTeacherCourseRecord'" :title="title "></ImportWork>
+    <ImportWork v-model:showWork="showWork" :url="'/admin/export/importOutTeacherRecord'" :title="title "></ImportWork>
   </div>
 </template>
 <script lang="jsx">
@@ -332,7 +332,7 @@ export default {
       },
       searchdate: null, //选择时间
       searchParam: {
-        teacherNameOrUserNo:null,
+        name:null,
         recordType:2,
         pageNo: 1,
         pageSize: 10,
@@ -776,7 +776,7 @@ const handleImport = () => {
     //导出功能
     const handleExport = () => {
       window.open(
-        `${process.env.VUE_APP_BASE_API}/lesson_records/export?pageNo=${state.searchParam.currentPage
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacherRecord?pageNo=${state.searchParam.pageNo
         }&pageSize=${state.searchParam.pageSize}
         &userNo=${state.searchParam.userNo ? state.searchParam.userNo : ""
         }

src/views/lecturer/InsideLecturer.vue

@@ -1121,7 +1121,7 @@ export default {
     //导出功能
     const handleExport = () => {
       window.open(
-        `${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""}&tSystemId=${state.searchParam.tSystemId ? state.searchParam.tSystemId : ""}&tLevelId=${state.searchParam.tLevelId ? state.searchParam.tLevelId : "" }&waitStatus=${state.searchParam.waitStatus ? state.searchParam.waitStatus : ""}&certStatus=${state.searchParam.certStatus ? state.searchParam.certStatus : ""}&courses=${state.searchParam.courses ? state.searchParam.courses : ""}`
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacher?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""}&tSystemId=${state.searchParam.tSystemId ? state.searchParam.tSystemId : ""}&tLevelId=${state.searchParam.tLevelId ? state.searchParam.tLevelId : "" }&waitStatus=${state.searchParam.waitStatus ? state.searchParam.waitStatus : ""}&certStatus=${state.searchParam.certStatus ? state.searchParam.certStatus : ""}&courses=${state.searchParam.courses ? state.searchParam.courses : ""}`
       );
       // this.download('lesson_records/export', {
       //           ...state.searchParam

src/views/lecturer/InsideTeaching.vue

@@ -379,7 +379,7 @@
         </div>
       </a-modal>
     </div>
-    <ImportWork v-model:showWork="showWork" :url="'/importTeacherCourseRecord'" :title="title"></ImportWork>
+    <ImportWork v-model:showWork="showWork" :url="'/admin/export/importInTeacherRecord'" :title="title"></ImportWork>
     <!-- <div> <Upload/> </div>         -->
   </div>
 </template>
@@ -404,6 +404,7 @@ import { getNewInTeacherCourseList, getOrganization, getTeacherCourseList, inser
 import ImportWork from "../../components/lecturer/ImportWork.vue";
 import { fileUp } from "../../api/Lecturer";
 import SearchTeacher from "@/components/project/SearchTeacher";
+import { useStore } from "vuex";
 export default {
   name: "InsideTeaching",
   components: {
@@ -512,6 +513,7 @@ export default {
     }
     LecturerSystemLista()
     //获取内容分类
+    const store = useStore();
     const sysTypeOptions = computed(() => store.state.content_type);
     const OnTheJobStatusList = ref([
       { value: 1, label: "项目开课" },
@@ -768,16 +770,16 @@ export default {
       getTableDate();
     };
      //修改时间
-    function searchTimeChange(time, timeStr) {
+//     function searchTimeChange(time, timeStr) {
-      // let startTime = timeStr[0]
+//       // let startTime = timeStr[0]
-      // let endTime = timeStr[1] ;
+//       // let endTime = timeStr[1] ;
-      // state.startTime = new Date(startTime).getTime();
+//       // state.startTime = new Date(startTime).getTime();
-      // state.endTime = new Date(endTime).getTime();
+//       // state.endTime = new Date(endTime).getTime();
-      // // state.searchParam.beginTime = new Date(beginTime).getTime() ;
+//       // // state.searchParam.beginTime = new Date(beginTime).getTime() ;
-      // // state.searchParam.endTime = new Date(endTime).getTime() ;
+//       // // state.searchParam.endTime = new Date(endTime).getTime() ;
-      // state.searchParam.beginTime = state.startTime ? state.startTime : null,
+//       // state.searchParam.beginTime = state.startTime ? state.startTime : null,
-      //   state.searchParam.endTime = state.endTime ? state.endTime : null
+//       //   state.searchParam.endTime = state.endTime ? state.endTime : null
-}
+// }
 
     const editTimeChange = (e, date) => {
       console.log(date);
@@ -1126,8 +1128,9 @@ export default {
     //导出功能
     const handleExport = () => {
       window.open(
-        `${process.env.VUE_APP_BASE_API}/lesson_records/export?pageNo=${state.searchParam.currentPage
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacherRecord?pageNo=${state.searchParam.pageNo
-        }&pageSize=${state.searchParam.pageSize}
+        }&pageSize=${state.searchParam.pageSize} 
+        &recordType=1
         &name=${state.searchParam.name ? state.searchParam.name : ""}
         &courseName=${state.searchParam.courseName ? state.searchParam.courseName : ""}
         &departId=${state.searchParam.departId ? state.searchParam.departId : ""}
@@ -1229,7 +1232,8 @@ export default {
       TeacherSystem,
       TeacherSystem1,
       getOrganizationLista,
-      getOrganizationList, searchTimeChange,
+      getOrganizationList, 
+      // searchTimeChange,
       cancelTeachingDialog,
       editTimeChange,
       scoreChange

src/views/lecturer/LecturerFee.vue

@@ -6,7 +6,7 @@
         <a-form layout="inline" style="min-width: 1380px;">
           <a-form-item class="select">
             <!--  v-model:value="searchParam.name" -->
-            <!-- <a-input v-model:value="searchParam.teacherNo" style="width: 276px; height: 40px; border-radius: 8px"
+            <!-- <a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
               placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
             </a-input>
    -->  <div  style="width: 276px; height: 40px; border-radius: 8px"  >
@@ -94,7 +94,7 @@
         <a-button @click="handleExport()" class="resetbtn">
           <UploadOutlined /> 导出
         </a-button>
-        <a-button @click="addTeacher()" type="primary" class="langbtn">
+        <a-button @click="handleTeacher()" type="primary" class="langbtn">
             一键确认讲师费
           </a-button>
           <a-button @click="allFee()" type="primary" class="langbtn">
@@ -353,7 +353,7 @@
 <span class="line"></span>
 <span>讲师费用详情</span>
 <a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
-    <a-descriptions-item label="讲师名称">{{formParam.teacherName}}</a-descriptions-item>
+    <a-descriptions-item label="讲师名称">{{formParam.name}}</a-descriptions-item>
     <a-descriptions-item label="讲师工号">{{formParam.teacherNo}}</a-descriptions-item>
     <a-descriptions-item label="讲师组织" :span="2">{{formParam.teacherOrg}}</a-descriptions-item>
     <a-descriptions-item label="讲师体系">{{formParam.systemName}}</a-descriptions-item>
@@ -429,7 +429,7 @@
         </a-button>
       </div>
 </a-drawer>
-<ImportWork v-model:showWork="showWork" :url="'/importTeacherCourseRecord'" :title="title"></ImportWork>
+<ImportWork v-model:showWork="showWork" :url="'/admin/export/exportTeacherExpense'" :title="title"></ImportWork>
     </div>
     
   </template>
@@ -446,7 +446,7 @@
   } from '@ant-design/icons-vue';
   import ImportWork from "../../components/project/ImportWork.vue";
   import SearchTeacher from "@/components/project/SearchTeacher";
-  import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,getTeacherLevel,deleteInTeacher} from "../../api/lecturerFeeManagement";4
+  import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,getTeacherLevel,deleteInTeacher,confirm} from "../../api/lecturerFeeManagement";4
   import { getTeacherExpertise,getTeacherSystemList,getLevel,getPayRollPlace,fileUp } from "../../api/Lecturer";
   // lecturerFeeManagement
   // import {getProjSt} from "../../api/indexProjStu";
@@ -499,7 +499,7 @@
         searchdate: null, //选择时间
         searchParam: {
           teacherNo:null,
-          teacherName:null,
+          name:null,
           trainorgId:null,
           tsystemid:null,
           levelId:null,
@@ -605,7 +605,11 @@ console.log( "讲师体系id" +val);
       const trainOrglist=ref([])
       //获取培训发生组织
       const trainOrglista =() => {
-        getTrainOrg().then((res)=>{
+        let obj = {
+                 pageNo: "1",
+                pageSize: "10000"
+      }
+        getTrainOrg(obj).then((res)=>{
           if (res.data.code === 200) {
               let arr = res.data.data;
               let array = [];
@@ -669,8 +673,8 @@ console.log( "讲师体系id" +val);
       const columns = ref([
         {
           title: '讲师姓名 ',
-          dataIndex: 'teacherName',
+          dataIndex: 'name',
-          key: 'teacherName',
+          key: 'name',
         elipsis: true, align: "center",
           width: 120,
         },
@@ -911,6 +915,23 @@ console.log( "讲师体系id" +val);
         state.id= record.id
         state.vf = false
         TeacherSystem()
+      }
+            //一键确认讲师费
+            const handleTeacher =()=>{
+              let array = []
+              tableData.value.map((item)=>{
+                let arr = {
+                  id:item.id
+                }
+                array.push(arr)
+              }) 
+        confirm(array)
+          .then((res) => {
+            if(res.data.code == 200 ){
+            message.success("一键确认讲师费成功");
+            getTableDate();
+          }
+        }) 
       }
       //保存
       const createTeacherDialog = () => {
@@ -1096,7 +1117,7 @@ console.log( "讲师体系id" +val);
       state.formParam.defaultTeachingTime = state.formParam.defaultTeachingTime.replace(/\D/g, '');
     }
       const rules = {
-        teacherName: [{ required: true, message: '讲师不能为空' }],
+        name: [{ required: true, message: '讲师不能为空' }],
         teacherNo: [{ required: true, message: '讲师工号不能为空' }],
         departId: [{ required: true, message: '讲师组织不能为空' }],
         systemId: [{ required: true, message: '讲师体系不能为空' }],
@@ -1154,8 +1175,8 @@ const tableDatas = ref([])
 const column = ref([
         {
           title: '讲师姓名 ',
-          dataIndex: 'teacherName',
+          dataIndex: 'name',
-          key: 'teacherName',
+          key: 'name',
         elipsis: true, align: "center",
           width: 120,
         },
@@ -1324,10 +1345,10 @@ const column = ref([
       //导出功能
       const handleExport = ()=>{
         window.open (
-          `${process.env.VUE_APP_BASE_API}/teacher/fee/exportTeacherFee?pageNo=${
+          `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherExpense?pageNo=${
-            state.currentPage1
+            state.searchParam.pageNo
-          }&pageSize=${state.pageSize1}&teacherNo=${
+          }&pageSize=${state.searchParam.pageSizess}&name=${
-            state.searchParam.teacherNo ? state.searchParam.teacherNo : ""
+            state.searchParam.name ? state.searchParam.name : ""
           }&tsystemid=${ state.searchParam.tsystemid ?  state.searchParam.tsystemid : ""}&levelId=${
             state.searchParam.levelId ? state.searchParam.levelId : ""
           }&courseType=${ state.searchParam.courseType ?  state.searchParam.courseType : ""}&certStatus=${
@@ -1371,6 +1392,7 @@ const column = ref([
     };
       return {
         ...toRefs(state),
+        handleTeacher,
         rules,
         formRef,
         clearNonNumber,