hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-20 16:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

接口调整

Browse Source
This commit is contained in:
wangxuemei
2024-10-23 17:05:10 +08:00
parent 40246afe39
commit ca46e61d8d
5 changed files with 77 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/lecturerFeeManagement.js
View File

@@ -21,11 +21,11 @@ export const queryById= (obj) => http.get('/admin/expenseBill/queryById',{params
export const withdrawRecord= (obj) => http.post('/admin/expenseBill/withdrawRecord',obj) export const withdrawRecord= (obj) => http.post('/admin/expenseBill/withdrawRecord',obj)
//确认讲师费 //确认讲师费
export const confirm= (obj) => http.post('/admin/teacherExpense/confirm',obj) export const confirm= (obj) => http.post('/admin/teacherExpense/confirm',obj)
//获取培训发生组织列表 //获取培训发生组织列表
export const getTrainOrg= (obj) => http.post('/teacher/fee/getTrainOrg',obj) export const getTrainOrg= (obj) => http.get('/admin/affiliation/list',{params: obj})
//获取讲师级别 //获取讲师级别
export const getTeacherLevel= (obj) => http.post('/teacher/fee/getTeacherLevel',obj) export const getTeacherLevel= (obj) => http.post('/teacher/fee/getTeacherLevel',obj)
//列表查看讲师费审批(用于讲师费管理查看讲师费详情里面) //列表查看讲师费审批(用于讲师费管理查看讲师费详情里面)

4
src/components/NavLeft.vue
View File

@@ -675,7 +675,7 @@
></span> ></span>
<router-link to="/organization">归属组织管理</router-link> <router-link to="/organization">归属组织管理</router-link>
</a-menu-item> </a-menu-item>
<a-menu-item key="sub24-6"> <!-- <a-menu-item key="sub24-6">
<span <span
:class="{ :class="{
circleActive: selectedKeys[0] === 'sub24-6' ? true : false, circleActive: selectedKeys[0] === 'sub24-6' ? true : false,
@@ -683,7 +683,7 @@
}" }"
></span> ></span>
<router-link to="/lecturerSystem">讲师体系管理</router-link> <router-link to="/lecturerSystem">讲师体系管理</router-link>
</a-menu-item> </a-menu-item> -->
</a-sub-menu> </a-sub-menu>
</a-menu> </a-menu>
</div> </div>

83
src/views/lecturer/LecturerApproval.vue
View File

@@ -204,9 +204,8 @@
DownloadOutlined DownloadOutlined
} from '@ant-design/icons-vue'; } from '@ant-design/icons-vue';
import ProjectManager from "@/components/project/ProjectManagerNew"; import ProjectManager from "@/components/project/ProjectManagerNew";
import {getPayRollPlace} from "../../api/Lecturer"; import {expenseBillList,queryById,getTeacherFeeApprovalList ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg} from "../../api/lecturerFeeManagement";
import {expenseBillList,queryById,getTeacherFeeApprovalList ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,getTeacherLevel} from "../../api/lecturerFeeManagement"; import { getTeacherSystemList } from "../../api/Lecturer";
import { getTeacherExpertise,getTeacherSystemList } from "../../api/Lecturer";
// lecturerFeeManagement // lecturerFeeManagement
// import {getProjSt} from "../../api/indexProjStu"; // import {getProjSt} from "../../api/indexProjStu";
// import AddTeacher from "../../components/drawers/project/AddTeacher" // import AddTeacher from "../../components/drawers/project/AddTeacher"
@@ -277,27 +276,7 @@
{ value: 2, label: "作业人员入模培训" }, { value: 2, label: "作业人员入模培训" },
{ value: 3, label: "其他" }, { value: 3, label: "其他" },
]) ])
//获取内容分类
const getTeacherExpertiseList = ref([
// { value: 0, label: "未定级" },
])
const getTeacherExpertiseLista = () => {
getTeacherExpertise().then((res) => {
if (res.data.code === 200) {
let arr = res.data.data;
let array = [];
arr.map((value) => {
let obj = {
value: value.id,
label: value.name,
};
array.push(obj);
});
getTeacherExpertiseList.value = array;
}
})
}
getTeacherExpertiseLista()
const lecturerSystemList = ref([ const lecturerSystemList = ref([
]); ]);
///获取讲师体系列表 ///获取讲师体系列表
@@ -322,7 +301,11 @@
const trainOrglist=ref([]) const trainOrglist=ref([])
//获取培训发生组织 //获取培训发生组织
const trainOrglista =() => { const trainOrglista =() => {
getTrainOrg().then((res)=>{ let obj = {
pageNo: "1",
pageSize: "10000"
}
getTrainOrg(obj).then((res)=>{
if (res.data.code === 200) { if (res.data.code === 200) {
let arr = res.data.data; let arr = res.data.data;
let array = []; let array = [];
@@ -338,26 +321,7 @@
}) })
} }
trainOrglista() trainOrglista()
//获取讲师级别
const getLevelList = ref([
])
const getLevelLista =() => {
getTeacherLevel().then((res)=>{
if (res.data.code === 200) {
let arr = res.data.data;
let array = getLevelList.value;
arr.map((value) => {
let obj = {
value: value.levelId,
label: value.levelName,
};
array.push(obj);
});
getLevelList.value = array;
}
})
}
getLevelLista()
//课程类型 //课程类型
const OnTheJobStatusList = ref([ const OnTheJobStatusList = ref([
{ value: 1, label: "项目开课" }, { value: 1, label: "项目开课" },
@@ -369,28 +333,7 @@
{ value: 0, label: "未认证" }, { value: 0, label: "未认证" },
{ value: 1, label: "已认证" }, { value: 1, label: "已认证" },
]) ])
//获取讲师发薪地列表
const PlaceOfPayList = ref([
// { value: 0, label: "发薪地B1" },
])
const PlaceOfPayLista =() => {
getPayRollPlace().then((res)=>{
if (res.data.code === 200) {
let arr = res.data.data;
let array = [];
arr.map((value) => {
let obj = {
value: value.id,
label: value.name,
};
array.push(obj);
});
PlaceOfPayList.value = array;
}
console.log("获取发薪地", PlaceOfPayList);
})
}
PlaceOfPayLista()
//状态 //状态
const AccountStatusList = ref([ const AccountStatusList = ref([
{ value:"A10", label: "待审核", }, { value:"A10", label: "待审核", },
@@ -707,17 +650,11 @@
managerChange, managerChange,
trainOrglist, trainOrglist,
trainOrglista, trainOrglista,
getTeacherExpertiseList,
getTeacherExpertiseLista,
handlemoreid, handlemoreid,
handleExport, handleExport,
lecturerSystemList, lecturerSystemList,
getLevelList,
OnTheJobStatusList, OnTheJobStatusList,
getLevelLista,
PlaceOfPayLista,
AuthenticationStatusList, AuthenticationStatusList,
PlaceOfPayList,
AccountStatusList, AccountStatusList,
searchSubmit, searchSubmit,
searchReset, searchReset,

134
src/views/lecturer/LecturerFee.vue
View File

@@ -52,28 +52,28 @@
</div> </div>
</div> </div>
<div style="width:100%"></div> <div style="width:100%"></div>
<a-form-item class="select" v-if="moreid == 2"> <!-- <a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.courseType" placeholder="请选择费用类型" allowClear <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.courseType" placeholder="请选择费用类型" allowClear
:options="courseTypeList"> :options="courseTypeList">
</a-select> </a-select>
</a-form-item> </a-form-item> -->
<a-form-item class="select" v-if="moreid == 2"> <a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.type" placeholder="请选择课程类型" allowClear <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.type" placeholder="请选择课程类型" allowClear
:options="OnTheJobStatusList"> :options="OnTheJobStatusList">
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item class="select" v-if="moreid == 2"> <a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.status" placeholder="请选择状态" allowClear <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.status" placeholder="请选择状态" allowClear
:options="AuthenticationStatusList"> :options="AuthenticationStatusList">
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item class="select" v-if="moreid == 2"> <a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 230px ;margin-bottom:20px" placeholder="请选择讲师体系" v-model:value="searchParam.tsystemid" allowClear <a-select style="width: 235px ;margin-bottom:20px" placeholder="请选择讲师体系" v-model:value="searchParam.tsystemid" allowClear
:options="lecturerSystemList" @change="changetlevel"> :options="lecturerSystemList" @change="changetlevel">
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item class="select" v-if="moreid == 2"> <a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.levelId" placeholder="请选择讲师级别" allowClear :disabled="getLevelList.length!==0 ? false:true" <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.levelId" placeholder="请选择讲师级别" allowClear :disabled="getLevelList.length!==0 ? false:true"
:options="getLevelList"> :options="getLevelList">
</a-select> </a-select>
</a-form-item> </a-form-item>
@@ -189,7 +189,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<!-- 讲师级别 levelId 讲师发薪地 payrollPlaceId--> <!-- 讲师级别 levelId 讲师发薪地 payrollPlaceName-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师级别" name="levelName"> <a-form-item label="讲师级别" name="levelName">
@@ -202,10 +202,10 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师发薪地" name="payrollPlaceId "> <a-form-item label="讲师发薪地" name="payrollPlaceName ">
<a-select v-model:value="formParam.payrollPlaceId" placeholder="发薪地" disabled <a-input disabled v-model:value="formParam.payrollPlaceName" class="draitem"
:options="PlaceOfPayList" allowClear> placeholder="自动带出讲师发薪地" allowClear showSearch >
</a-select> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@@ -446,8 +446,8 @@
} from '@ant-design/icons-vue'; } from '@ant-design/icons-vue';
import ImportWork from "../../components/project/ImportWork.vue"; import ImportWork from "../../components/project/ImportWork.vue";
import SearchTeacher from "@/components/project/SearchTeacher"; import SearchTeacher from "@/components/project/SearchTeacher";
import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,getTeacherLevel,deleteInTeacher,confirm} from "../../api/lecturerFeeManagement";4 import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTeacherLevel,deleteInTeacher,confirm} from "../../api/lecturerFeeManagement";
import { getTeacherExpertise,getTeacherSystemList,getLevel,getPayRollPlace,fileUp } from "../../api/Lecturer"; import {getTeacherSystemList, getLevel,getPayRollPlace,fileUp } from "../../api/Lecturer";
// lecturerFeeManagement // lecturerFeeManagement
// import {getProjSt} from "../../api/indexProjStu"; // import {getProjSt} from "../../api/indexProjStu";
// import AddTeacher from "../../components/drawers/project/AddTeacher" // import AddTeacher from "../../components/drawers/project/AddTeacher"
@@ -506,7 +506,7 @@
courseType:null, courseType:null,
certStatus:null, certStatus:null,
salaryName:null, salaryName:null,
payrollPlaceId:null, payrollPlaceName:null,
status:null, status:null,
pageNo: "1", pageNo: "1",
pageSize: "10", pageSize: "10",
@@ -537,27 +537,7 @@
{ value: 0, label: "未认证" }, { value: 0, label: "未认证" },
{ value: 1, label: "已认证" }, { value: 1, label: "已认证" },
]) ])
//获取内容分类
const getTeacherExpertiseList = ref([
// { value: 0, label: "未定级" },
])
const getTeacherExpertiseLista = () => {
getTeacherExpertise().then((res) => {
if (res.data.code === 200) {
let arr = res.data.data;
let array = [];
arr.map((value) => {
let obj = {
value: value.id,
label: value.name,
};
array.push(obj);
});
getTeacherExpertiseList.value = array;
}
})
}
getTeacherExpertiseLista()
const lecturerSystemList = ref([ const lecturerSystemList = ref([
]); ]);
///获取讲师体系列表 ///获取讲师体系列表
@@ -602,51 +582,29 @@ console.log( "讲师体系id" +val);
}) })
} }
LecturerSystemLista() LecturerSystemLista()
const trainOrglist=ref([])
//获取培训发生组织 // //获取讲师发薪地列表
const trainOrglista =() => { // const PlaceOfPayList = ref([
let obj = { // // { value: 0, label: "发薪地B1" },
pageNo: "1", // ])
pageSize: "10000" // const PlaceOfPayLista =() => {
} // getPayRollPlace().then((res)=>{
getTrainOrg(obj).then((res)=>{ // if (res.data.code === 200) {
if (res.data.code === 200) { // let arr = res.data.data;
let arr = res.data.data; // let array = [];
let array = []; // arr.map((value) => {
arr.map((value) => { // let obj = {
let obj = { // value: value.id,
value: value.trainorgId, // label: value.name,
label: value.trainOrg, // };
}; // array.push(obj);
array.push(obj); // });
}); // PlaceOfPayList.value = array;
trainOrglist.value = array; // }
} // console.log("获取发薪地", PlaceOfPayList);
}) // })
} // }
trainOrglista() // PlaceOfPayLista()
//获取讲师发薪地列表
const PlaceOfPayList = ref([
// { value: 0, label: "发薪地B1" },
])
const PlaceOfPayLista =() => {
getPayRollPlace().then((res)=>{
if (res.data.code === 200) {
let arr = res.data.data;
let array = [];
arr.map((value) => {
let obj = {
value: value.id,
label: value.name,
};
array.push(obj);
});
PlaceOfPayList.value = array;
}
console.log("获取发薪地", PlaceOfPayList);
})
}
PlaceOfPayLista()
//状态 //状态
const AccountStatusList = ref([ const AccountStatusList = ref([
{ value:"A10", label: "待审核", }, { value:"A10", label: "待审核", },
@@ -666,7 +624,6 @@ console.log( "讲师体系id" +val);
state.moreid=1 state.moreid=1
state.searchParam.certStatus=null state.searchParam.certStatus=null
state.searchParam.salaryName=null state.searchParam.salaryName=null
state.searchParam.payrollPlaceId=null
state.searchParam.status=null state.searchParam.status=null
} }
} }
@@ -861,7 +818,6 @@ console.log( "讲师体系id" +val);
courseType:null, courseType:null,
certStatus:null, certStatus:null,
salaryName:null, salaryName:null,
payrollPlaceId:null,
status:null, status:null,
pageNo: 1, pageNo: 1,
pageSize: 10 , pageSize: 10 ,
@@ -1031,7 +987,7 @@ console.log( "讲师体系id" +val);
departId:null, departId:null,
tsystemid:null, tsystemid:null,
levelId:null, levelId:null,
payrollPlaceId:null, payrollPlaceName:null,
// 费用类型 : null // 费用类型 : null
teacherpayrollPlace:null, teacherpayrollPlace:null,
teachingDate:null, teachingDate:null,
@@ -1122,7 +1078,7 @@ console.log( "讲师体系id" +val);
departId: [{ required: true, message: '讲师组织不能为空' }], departId: [{ required: true, message: '讲师组织不能为空' }],
systemId: [{ required: true, message: '讲师体系不能为空' }], systemId: [{ required: true, message: '讲师体系不能为空' }],
levelName: [{ required: true, message: ' 讲师级别 不能为空' }], levelName: [{ required: true, message: ' 讲师级别 不能为空' }],
payrollPlaceId: [{ required: true, message: '讲师发薪地 不能为空' }], payrollPlaceName: [{ required: true, message: '讲师发薪地 不能为空' }],
courseType: [{ required: true, message: '费用类型不能为空' }], courseType: [{ required: true, message: '费用类型不能为空' }],
courseName: [{ required: true, message: '课程名称不能为空' }], courseName: [{ required: true, message: '课程名称不能为空' }],
teachingDate: [{ required: true, message: '授课日期不能为空' }], teachingDate: [{ required: true, message: '授课日期不能为空' }],
@@ -1353,7 +1309,7 @@ const column = ref([
state.searchParam.levelId ? state.searchParam.levelId : "" state.searchParam.levelId ? state.searchParam.levelId : ""
}&courseType=${ state.searchParam.courseType ? state.searchParam.courseType : ""}&certStatus=${ }&courseType=${ state.searchParam.courseType ? state.searchParam.courseType : ""}&certStatus=${
state.searchParam.certStatus ? state.searchParam.certStatus : "" state.searchParam.certStatus ? state.searchParam.certStatus : ""
}&salaryName=${state.searchParam.salaryName ? state.searchParam.salaryName : ""}&payrollPlaceId=${state.searchParam.payrollPlaceId ? state.searchParam.payrollPlaceId : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}` }&salaryName=${state.searchParam.salaryName ? state.searchParam.salaryName : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}`
); );
// this.download('lesson_records/export', { // this.download('lesson_records/export', {
// ...state.searchParam // ...state.searchParam
@@ -1403,18 +1359,14 @@ const column = ref([
managerChange, managerChange,
courseTypeList, courseTypeList,
// searchTimeChange, // searchTimeChange,
trainOrglist,
trainOrglista,
getTeacherExpertiseList,
getTeacherExpertiseLista,
handlemoreid, handlemoreid,
handleExport, handleExport,
lecturerSystemList, lecturerSystemList,
getLevelList, getLevelList,
OnTheJobStatusList, OnTheJobStatusList,
PlaceOfPayLista, // PlaceOfPayLista,
AuthenticationStatusList, AuthenticationStatusList,
PlaceOfPayList, // PlaceOfPayList,
AccountStatusList, AccountStatusList,
searchSubmit, searchSubmit,
searchReset, searchReset,

23
src/views/lecturer/LecturerFeeStatistics.vue
View File

@@ -180,9 +180,10 @@ import { reactive, toRefs, ref, watch } from "vue";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import { getPayRollPlace } from "../../api/Lecturer";
import { getOrganization } from "../../api/Teaching"; import { getOrganization } from "../../api/Teaching";
import { queryTeacherFeeTotalList, queryTeacherFeeMonthly, getTeacherFeeDetailListByTeacherNo, getTeacherFeeListByTeacherNo ,getPreviousTeacherFee} from "../../api/lecturerFeeStatistics"; import { queryTeacherFeeMonthly, getTeacherFeeDetailListByTeacherNo, getTeacherFeeListByTeacherNo} from "../../api/lecturerFeeStatistics"
;
import {getTeacherFeeList,getTrainOrg} from "../../api/lecturerFeeManagement";
export default { export default {
name: "LecturerFeeStatistics", name: "LecturerFeeStatistics",
components: { components: {
@@ -305,7 +306,7 @@ export default {
let objA = { ...state.searchParam }; let objA = { ...state.searchParam };
objA.searchdate=state.searchdate!==null? state.searchdate: "", objA.searchdate=state.searchdate!==null? state.searchdate: "",
console.log(objA) console.log(objA)
queryTeacherFeeTotalList(objA) getTeacherFeeList(objA)
.then((res) => { .then((res) => {
tableData.value = res.data.data.records tableData.value = res.data.data.records
state.tableDataTotal = Number(res.data.data.total); state.tableDataTotal = Number(res.data.data.total);
@@ -316,7 +317,19 @@ export default {
//重新汇总上月数据 //重新汇总上月数据
const searchResetPrevious=()=>{ const searchResetPrevious=()=>{
state.tableLoading = true state.tableLoading = true
getPreviousTeacherFee().then((res)=>{ const now = new Date();
const year = now.getFullYear();
const month = now.getMonth();
const lastMonthStart = new Date(year, month - 1, 1); // 上个月的月初
const lastMonthEnd = new Date(year, month, 1); // 上个月的月末
let obj = {
beginTime:'',
endTime:'',
}
obj.beginTime = lastMonthStart.toISOString().split('T')[0];
obj.endTime = lastMonthEnd.toISOString().split('T')[0];
getTeacherFeeList(obj).then((res)=>{
tableData.value = res.data.data tableData.value = res.data.data
state.tableDataTotal = Number(res.data.data.total); state.tableDataTotal = Number(res.data.data.total);
state.tableLoading = false state.tableLoading = false
@@ -355,7 +368,7 @@ export default {
]) ])
//获取培训发生组织 //获取培训发生组织
const TrainOrglista = () => { const TrainOrglista = () => {
getPayRollPlace().then((res) => { getTrainOrg().then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
let arr = res.data.data; let arr = res.data.data;
let array = []; let array = [];