diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index ce3ee578..dfc22528 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -16,7 +16,7 @@
-
@@ -154,8 +154,8 @@
-
+
@@ -169,21 +169,21 @@
-
+
- {{ formParam.trainOrgName }}.
+ {{ formParam.orgName }}.
-
-
-
-
-
+
@@ -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.tSystemId = state.tSystemNames.systemId
+ state.formParam.tsystemName = state.tSystemNames.systemName
+ state.formParam.tsystemId = state.tSystemNames.systemId
const formItemNames = Object.keys(rules);
for(let i=0;i {
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;
diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue
index 35abb6e7..116f4758 100644
--- a/src/views/lecturer/MonthlyStatistics.vue
+++ b/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: '',
- trainOrgId: '',
+ name: route.query.name,
+ 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