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

接口调整

Browse Source
This commit is contained in:
wangxuemei
2024-10-22 08:48:38 +08:00
parent afcc4a35cb
commit f84172b037
14 changed files with 316 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/Lecturer.js
View File

@@ -27,8 +27,6 @@ export const updateTeacherState = (obj) => http.post('/admin/teacher/updateTeach
//删除内部讲师
// export const deleteInTeacher= (obj) => http.post(`/admin/teacher/delById?id=${obj}`)
//获取内部讲师发薪地 //获取内部讲师发薪地
export const getPayRollPlace = (obj) => http.post('/admin/teacher/getPayRollPlace', obj) export const getPayRollPlace = (obj) => http.post('/admin/teacher/getPayRollPlace', obj)
@@ -36,23 +34,13 @@ export const getPayRollPlace = (obj) => http.post('/admin/teacher/getPayRollPlac
export const getTeacherCourseList = (obj) => http.post('/admin/teacher/getTeacherCourseList' ,obj) export const getTeacherCourseList = (obj) => http.post('/admin/teacher/getTeacherCourseList' ,obj)
//获取内部讲师晋升接口 //获取内部讲师晋升接口
export const getTeacherLogList = (obj) => http.post('/admin/teacher/queryTeacherLevelRecord' ,obj) export const getTeacherLogList = (obj) => http.post('/admin/teacher/queryTeacherLevelRecord' ,obj)
//导出内部讲师列表
// http://pretest.zcwytd.com/manageApi/lesson_records/export
export const exportteacher = (obj) => http.post('/admin/lesson_records/export' ,obj)
// 所有教师专长 // 所有教师专长
export const getTeacherExpertise = (obj) => http.post('/admin/teacher/getTeacherExpertise' ,obj) export const getTeacherExpertise = (obj) => http.post('/admin/teacher/getTeacherExpertise' ,obj)
//根据父级教师专长(pid)查找子级教师专长 //根据父级教师专长(pid)查找子级教师专长
export const getTeacherExpertiseByPid = (obj) => http.post(`/admin/teacher/deleteInTeacher?id=${obj}`) export const getTeacherExpertiseByPid = (obj) => http.post(`/admin/teacher/deleteInTeacher?id=${obj}`)
// 新增页面内部姓名 // 新增页面内部姓名
export const infoteacher = (obj) => http.get('/admin/thirdApi/org/info' ,{params: obj}) export const infoteacher = (obj) => http.get('/admin/thirdApi/org/info' ,{params: obj})
//外部讲师列表
export const getOutTeacherList = (obj) => http.post('/admin/teacher/getOutTeacherList', obj)
//外部讲师详情
export const getOuterTeacherById = (obj) => http.post(`/admin/teacher/getOuterTeacherById?id=${obj}`)
//新增外部讲师
export const insertTeacherOutSide = (obj) => http.post('/admin/teacher/insertTeacherOutSide', obj)
//修改外部讲师
export const updateOutTeacher = (obj) => http.post('/admin/teacher/updateOutTeacher', obj)
export const fileUp = (obj) => http.post('/file/upload', obj) export const fileUp = (obj) => http.post('/file/upload', obj)
//组织树查询讲师 //组织树查询讲师

6
src/api/Teaching.js
View File

@@ -20,12 +20,6 @@ export const getexport = (obj) => http.post('/lesson_records/export', obj)
export const importTeacherCourseRecord = (obj) => http.post('/importTeacherCourseRecord', obj) export const importTeacherCourseRecord = (obj) => http.post('/importTeacherCourseRecord', obj)
//获取开课场地 //获取开课场地
export const getAddress = (obj) => http.post('/admin/teacher/getAddress', obj) export const getAddress = (obj) => http.post('/admin/teacher/getAddress', obj)
//外部讲师授课记录
export const getOuterTeacherCourseList = (obj) => http.post('/admin/teacher/getOuterTeacherCourseList', obj)
//获取外部授课记录详情
export const getOuterTeacherCourseDetail = (obj) => http.post(`/admin/teacher/getOuterTeacherCourseDetail?id=${obj}`)
//新增外部授课记录
export const insertOutTeaherCourse = (obj) => http.post('/admin/teacher/insertOutTeaherCourse', obj)
//讲师费发放情况 //讲师费发放情况
export const getCharges = (obj) => http.post('/teacher/fee/getCharges', obj) export const getCharges = (obj) => http.post('/teacher/fee/getCharges', obj)
//上传组件 //上传组件

25
src/api/lecturerFeeManagement.js
View File

@@ -1,16 +1,25 @@
import http from "./config"; import http from "./config";
// 获取讲师费列表 // 获取讲师费列表
export const getTeacherFeeList = (obj) => http.post('/teacher/fee/getTeacherFeeList',obj) export const getTeacherFeeList = (obj) => http.get('/admin/teacherExpense/list', {params: obj})
//获取讲师费详情 //获取讲师费详情
export const getTeacherFeeDetail= (obj) => http.post('/teacher/fee/getTeacherFeeDetail',obj) export const getTeacherFeeDetail= (obj) => http.get('/admin/teacherExpense/queryById',{params: obj})
//添加讲师费 //添加讲师费
export const addTeacherFee= (obj) => http.post('/teacher/fee/addTeacherFee',obj) export const addTeacherFee= (obj) => http.post('/admin/teacherExpense/addTeacherExpense',obj)
//删除讲师费
export const deleteInTeacher= (obj) => http.post(`/admin/teacher/delByIdr?id=${obj}`)
//修改讲师费信息 //修改讲师费信息
export const updateTeacherFee= (obj) => http.post('/teacher/fee/updateTeacherFee',obj) export const updateTeacherFee= (obj) => http.post('/admin/teacherExpense/editTeacherExpense',obj)
//修改讲师费状态(已提交) //修改讲师费状态提交
export const updateStatusSubmit= (obj) => http.post('/teacher/fee/updateStatusSubmit',obj) export const updateStatusSubmit= (obj) => http.post('/admin/teacherExpense/confirm',obj)
//修改讲师费状态(已撤回) //修改讲师费状态撤回
export const approveTeacherFee= (obj) => http.post('/teacher/fee/approveTeacherFee',obj) export const approveTeacherFee= (obj) => http.post('/admin/teacherExpense/withdraw',obj)
//讲师费汇总审批列表
export const expenseBillList= (obj) => http.get('/admin/expenseBill/list',{params: obj})
//讲师费汇总审批详情
export const queryById= (obj) => http.get('/admin/expenseBill/queryById',{params: obj})
//移除讲师费
export const withdrawRecord= (obj) => http.post('/admin/expenseBill/withdrawRecord',obj)
//获取培训发生组织列表 //获取培训发生组织列表
export const getTrainOrg= (obj) => http.post('/teacher/fee/getTrainOrg',obj) export const getTrainOrg= (obj) => http.post('/teacher/fee/getTrainOrg',obj)
//获取讲师级别 //获取讲师级别

18
src/api/organization.js
View File

@@ -1,18 +1,18 @@
import http from "./config"; import http from "./config";
// 列表分页查看归属组织 // 列表查看归属组织
export const queryTrainOrg = (obj) => http.post( '/configuration/queryTrainOrg', obj) export const queryTrainOrg = (obj) => http.get( '/admin/affiliation/list', {params: obj})
//新增归属组织
export const addReviewer = (obj) => http.post('/admin/affiliation/addAffiliation', obj)
// 删除归属组织
export const deleteTrainOrg = (obj) => http.post(`/admin/affiliation/delById?id=${obj}`)
//修改归属组织
export const updateTrainOrg = (obj) => http.post('/admin/affiliation/editInfo', obj)
//列表分页查看讲师体系 //列表分页查看讲师体系
export const systemList = (obj) => http.get('/configuration/list',{params: obj}) export const systemList = (obj) => http.get('/configuration/list',{params: obj})
// 根据体系id查看讲师体系对应的讲师等级详情 // 根据体系id查看讲师体系对应的讲师等级详情
export const querySystemLevelByKid = (obj) => http.post('/configuration/querySystemLevelByKid', obj) export const querySystemLevelByKid = (obj) => http.post('/configuration/querySystemLevelByKid', obj)
//新增归属组织
export const addReviewer = (obj) => http.post('/configuration/addReviewer', obj)
//修改归属组织
export const updateTrainOrg = (obj) => http.post('/configuration/updateTrainOrg', obj)
// 删除归属组织
export const deleteTrainOrg = (obj) => http.post('/configuration/deleteTrainOrg', obj)
//新增讲师体系 //新增讲师体系
export const addLecturerSystem = (obj) => http.post('/configuration/addLecturerSystem', obj) export const addLecturerSystem = (obj) => http.post('/configuration/addLecturerSystem', obj)
//删除讲师体系 //删除讲师体系

26
src/views/lecturer/ExternalLecturer.vue
View File

@@ -1044,4 +1044,30 @@ export default {
border: 0px !important; border: 0px !important;
border-radius: 50%!important; border-radius: 50%!important;
} }
::v-deep .ant-select-selection-overflow-item {
margin-top: -2px;
}
::v-deep .ant-select-multiple .ant-select-selection-item {
height: 34px
}
.tableBox {
padding-bottom: 20px;
margin: 20px 38px 30px;
::v-deep .ant-select-dropdown{
display: inline-block;
}
::v-deep .ant-select-selection-item{
margin-left: 3px;
}
::v-deep .ant-pagination-options-size-changer.ant-select{
width: 84px;
}
.pa {
width: 100%;
display: flex;
justify-content: right;
}
}
</style> </style>

1
src/views/lecturer/InsideLecturer.vue
View File

@@ -551,7 +551,6 @@ export default {
}); });
LecturerSystemList.value = array; LecturerSystemList.value = array;
} }
console.log("获取讲师", LecturerSystemList);
}) })
} }
const isupload = (val) => { const isupload = (val) => {

72
src/views/lecturer/InsideTeaching.vue
View File

@@ -72,9 +72,23 @@
</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" v-model:value="searchParam.sysType1" placeholder="内容分类"
:options="getTeacherExpertiseList" allowClear showSearch>
</a-select> <a-tree-select
:fieldNames="{
children: 'children',
label: 'name',
value: 'code',
}"
allow-clear
:getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
v-model:value="searchParam.courseTypeId"
show-search
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
placeholder="请选择内容分类"
tree-default-expand-all
:tree-data="sysTypeOptions">
</a-tree-select>
</a-form-item> </a-form-item>
<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">
@@ -186,10 +200,22 @@
<!-- 内容分类 id 课程名称 name --> <!-- 内容分类 id 课程名称 name -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="内容分类" name="id"> <a-form-item label="内容分类" name="courseTypeId">
<a-select class="draitem" allowClear v-model:value="formParam.id" placeholder="内容分类" <a-tree-select
:options="getTeacherExpertiseList"> :fieldNames="{
</a-select> children: 'children',
label: 'name',
value: 'code',
}"
allow-clear
:getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
v-model:value="formParam.courseTypeId"
show-search
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
placeholder="请选择内容分类"
tree-default-expand-all
:tree-data="sysTypeOptions">
</a-tree-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@@ -294,7 +320,7 @@
<a-descriptions-item label="授课/课程日期 ">{{ formParam.beginTime }}</a-descriptions-item> <a-descriptions-item label="授课/课程日期 ">{{ formParam.beginTime }}</a-descriptions-item>
<a-descriptions-item label="参训人数 ">{{ formParam.studys }}</a-descriptions-item> <a-descriptions-item label="参训人数 ">{{ formParam.studys }}</a-descriptions-item>
<a-descriptions-item label="评分 ">{{ formParam.score }}</a-descriptions-item> <a-descriptions-item label="评分 ">{{ formParam.score }}</a-descriptions-item>
<a-descriptions-item label="内容分类 ">{{ formParam.sysType1 }}</a-descriptions-item> <a-descriptions-item label="内容分类 ">{{ formParam.courseTypeId }}</a-descriptions-item>
<a-descriptions-item label="备注 ">{{ formParam.remark }}</a-descriptions-item> <a-descriptions-item label="备注 ">{{ formParam.remark }}</a-descriptions-item>
</a-descriptions> </a-descriptions>
<div style="margin-top:20px ;line-height: 24px;" > <div style="margin-top:20px ;line-height: 24px;" >
@@ -358,7 +384,7 @@
</div> </div>
</template> </template>
<script lang="jsx"> <script lang="jsx">
import { reactive, toRefs, ref } from "vue"; import { reactive, toRefs, ref,computed } from "vue";
import moment, { Moment } from 'moment'; import moment, { Moment } from 'moment';
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import { import {
@@ -486,26 +512,7 @@ export default {
} }
LecturerSystemLista() LecturerSystemLista()
//获取内容分类 //获取内容分类
const getTeacherExpertiseList = ref([ const sysTypeOptions = computed(() => store.state.content_type);
// { 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 OnTheJobStatusList = ref([ const OnTheJobStatusList = ref([
{ value: 1, label: "项目开课" }, { value: 1, label: "项目开课" },
{ value: 2, label: "路径开课" }, { value: 2, label: "路径开课" },
@@ -681,8 +688,8 @@ export default {
}, },
{ {
title: '内容分类', title: '内容分类',
dataIndex: 'sysType1', dataIndex: 'courseTypeId',
key: 'sysType1', key: 'courseTypeId',
elipsis: true, align: "center", elipsis: true, align: "center",
width: 120, width: 120,
}, },
@@ -1181,6 +1188,7 @@ export default {
} }
return { return {
...toRefs(state), ...toRefs(state),
sysTypeOptions,
// managerChange, // managerChange,
clearNonNumber, clearNonNumber,
clearscoreNumber, clearscoreNumber,
@@ -1196,11 +1204,9 @@ export default {
handleExport, handleExport,
handleImport, handleImport,
LecturerSystemList, LecturerSystemList,
getTeacherExpertiseList,
scoreList, scoreList,
studysList, studysList,
OnTheJobStatusList, OnTheJobStatusList,
getTeacherExpertiseLista,
AuthenticationStatusList, AuthenticationStatusList,
entryTypeList, entryTypeList,
searchSubmit, searchSubmit,

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

@@ -11,11 +11,10 @@
</a-form-item> </a-form-item>
<a-form-item class="select "> <a-form-item class="select ">
<div class="select addTimeBox"> <div class="select addTimeBox">
<div class="addTime" >汇总周期：</div> <div class="addTime" >创建时间：</div>
<a-range-picker <a-range-picker
v-model:value="searchdate" v-model:value="searchdate"
style="width: 420px" style="width: 420px"
@change="searchTimeChange"
format="YYYY-MM-DD" format="YYYY-MM-DD"
valueFormat="YYYY-MM-DD" valueFormat="YYYY-MM-DD"
separator="至" separator="至"
@@ -206,7 +205,7 @@
} 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 {getPayRollPlace} from "../../api/Lecturer";
import {getTeacherFeeList,getTeacherFeeDetail,getTeacherFeeApprovalList ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,getTeacherLevel} from "../../api/lecturerFeeManagement"; import {expenseBillList,queryById,getTeacherFeeApprovalList ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,getTeacherLevel} from "../../api/lecturerFeeManagement";
import { getTeacherExpertise,getTeacherSystemList } from "../../api/Lecturer"; import { getTeacherExpertise,getTeacherSystemList } from "../../api/Lecturer";
// lecturerFeeManagement // lecturerFeeManagement
// import {getProjSt} from "../../api/indexProjStu"; // import {getProjSt} from "../../api/indexProjStu";
@@ -268,8 +267,8 @@
status:null, status:null,
pageNo: "1", pageNo: "1",
pageSize: "10", pageSize: "10",
startDate: null, beginTime: null,
endDate: null, endTime: null,
}, },
}) })
//费用类型 //费用类型
@@ -435,13 +434,6 @@
elipsis: true, align: "center", elipsis: true, align: "center",
width: 120, width: 120,
}, },
{
title: '提交时间(未命名)',
dataIndex: 'trainOrg',
key: 'trainOrg',
elipsis: true, align: "center",
width: 120,
},
{ {
title: '汇总周期 ', title: '汇总周期 ',
dataIndex: 'summaryDate', dataIndex: 'summaryDate',
@@ -458,6 +450,13 @@
align: "center", align: "center",
width: 200, width: 200,
}, },
{
title: '提交时间(未命名)',
dataIndex: 'trainOrg',
key: 'trainOrg',
elipsis: true, align: "center",
width: 120,
},
{ {
title: '状态 ', title: '状态 ',
dataIndex: 'status', dataIndex: 'status',
@@ -503,8 +502,8 @@
const searchReset = () => { const searchReset = () => {
state.searchdate= null, state.searchdate= null,
state.searchParam = { state.searchParam = {
endDate:null, endTime:null,
startDate:null, beginTime:null,
teacherNo:null, teacherNo:null,
id:null, id:null,
levelId:null, levelId:null,
@@ -518,24 +517,24 @@
}; };
getTableDate(); 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.startDate = new Date(startDate).getTime() ; // // state.searchParam.beginTime = new Date(beginTime).getTime() ;
// state.searchParam.endDate = new Date(endDate).getTime() ; // // state.searchParam.endTime = new Date(endTime).getTime() ;
state.searchParam.startDate = state.startTime ? state.startTime : null, // state.searchParam.beginTime = state.startTime ? state.startTime : null,
state.searchParam.endDate = state.endTime ? state.endTime : null // state.searchParam.endTime = state.endTime ? state.endTime : null
} // }
// List接口数据 // List接口数据
const getTableDate = (obj) => { const getTableDate = (obj) => {
state.tableLoading=true state.tableLoading=true
let objA = {...state.searchParam}; let objA = { ...state.searchParam };
objA.startDate= state.searchParam.startDate!==null? dayjs(new Date(state.searchParam.startDate).getTime()).format("YYYY-MM-DD"): "", objA.beginTime = state.searchdate ? dayjs(state.searchdate[0]).format("YYYY-MM-DD") : "",
objA.endDate=state.searchParam.endDate!==null? dayjs(new Date(state.searchParam.endDate).getTime()).format("YYYY-MM-DD"): "", objA.endTime = state.searchdate ? dayjs(state.searchdate[1]).format("YYYY-MM-DD") : "",
getTeacherFeeList(objA) expenseBillList(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);
@@ -614,7 +613,7 @@
//详情 //详情
const TeacherSystem=()=>{ const TeacherSystem=()=>{
getTeacherFeeDetail({id : state.id}).then((res) => { queryById({id : state.id}).then((res) => {
// state.formParam=Object.assign({} ,res.data.data) // state.formParam=Object.assign({} ,res.data.data)
state.formParam=res.data.data state.formParam=res.data.data
console.log( state.formParam) console.log( state.formParam)
@@ -694,7 +693,7 @@
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 : ""}&startDate=${state.searchParam.startDate ? state.searchParam.startDate : ""}&endDate=${state.searchParam.endDate ? state.searchParam.endDate : ""}` }&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 : ""}`
); );
// this.download('lesson_records/export', { // this.download('lesson_records/export', {
// ...state.searchParam // ...state.searchParam
@@ -702,7 +701,7 @@
} }
return { return {
...toRefs(state), ...toRefs(state),
searchTimeChange, // searchTimeChange,
gettableDataExamine, gettableDataExamine,
courseTypeList, courseTypeList,
managerChange, managerChange,
@@ -1086,4 +1085,29 @@
.ant-col-12{ .ant-col-12{
height:90px; height:90px;
} }
::v-deep .ant-select-selection-overflow-item {
margin-top: -2px;
}
::v-deep .ant-select-multiple .ant-select-selection-item {
height: 34px
}
.tableBox {
padding-bottom: 20px;
margin: 20px 38px 30px;
::v-deep .ant-select-dropdown{
display: inline-block;
}
::v-deep .ant-select-selection-item{
margin-left: 3px;
}
::v-deep .ant-pagination-options-size-changer.ant-select{
width: 84px;
}
.pa {
width: 100%;
display: flex;
justify-content: right;
}
}
</style> </style>

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

@@ -10,7 +10,7 @@
placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch> placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
</a-input> </a-input>
--> <div style="width: 276px; height: 40px; border-radius: 8px" > --> <div style="width: 276px; height: 40px; border-radius: 8px" >
<a-input v-model:value="searchParam.teacherNameOrUserNo" 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> placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
</a-input> </a-input>
</div> </div>
@@ -26,7 +26,6 @@
<a-range-picker <a-range-picker
v-model:value="searchdate" v-model:value="searchdate"
style="width: 420px" style="width: 420px"
@change="searchTimeChange"
format="YYYY-MM-DD" format="YYYY-MM-DD"
valueFormat="YYYY-MM-DD" valueFormat="YYYY-MM-DD"
separator="至" separator="至"
@@ -69,7 +68,7 @@
</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.id" allowClear <a-select style="width: 230px ;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>
@@ -136,8 +135,8 @@
<div style="float: right;"> <div style="float: right;">
<a-pagination <a-pagination
v-if="tableDataTotal > 10" v-if="tableDataTotal > 10"
:showSizeChanger="false" :showSizeChanger="true"
:showQuickJumper="true" :showQuickJumper="false"
:hideOnSinglePage="true" :hideOnSinglePage="true"
:pageSize="searchParam.pageSize" :pageSize="searchParam.pageSize"
:current="searchParam.pageNo" :current="searchParam.pageNo"
@@ -184,7 +183,7 @@
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师体系" name="systemId"> <a-form-item label="讲师体系" name="systemId">
<a-select disabled class="draitem" v-model:value="formParam.id" placeholder="请选择讲师体系" <a-select disabled class="draitem" v-model:value="formParam.tsystemid" placeholder="请选择讲师体系"
:options="lecturerSystemList"> :options="lecturerSystemList">
</a-select> </a-select>
</a-form-item> </a-form-item>
@@ -396,7 +395,7 @@
@closa="cancelallFeedialog" :maskClosable="true" width="60%" title="批量审核"> @closa="cancelallFeedialog" :maskClosable="true" width="60%" title="批量审核">
<a-form layout="inline"> <a-form layout="inline">
<a-form-item class="select"> <a-form-item class="select">
<a-input v-model:value="searchall.teacherNameOrUserNo" style="width: 276px; height: 40px; border-radius: 8px" <a-input v-model:value="searchall.name" style="width: 276px; height: 40px; border-radius: 8px"
placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch> placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
@@ -447,7 +446,7 @@
} 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} from "../../api/lecturerFeeManagement";4 import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,getTeacherLevel,deleteInTeacher} from "../../api/lecturerFeeManagement";4
import { getTeacherExpertise,getTeacherSystemList,getLevel,getPayRollPlace,fileUp } from "../../api/Lecturer"; import { getTeacherExpertise,getTeacherSystemList,getLevel,getPayRollPlace,fileUp } from "../../api/Lecturer";
// lecturerFeeManagement // lecturerFeeManagement
// import {getProjSt} from "../../api/indexProjStu"; // import {getProjSt} from "../../api/indexProjStu";
@@ -502,7 +501,7 @@
teacherNo:null, teacherNo:null,
teacherName:null, teacherName:null,
trainorgId:null, trainorgId:null,
id:null, tsystemid:null,
levelId:null, levelId:null,
courseType:null, courseType:null,
certStatus:null, certStatus:null,
@@ -511,11 +510,11 @@
status:null, status:null,
pageNo: "1", pageNo: "1",
pageSize: "10", pageSize: "10",
startDate: null, beginTime: null,
endDate: null, endTime: null,
}, },
searchall:{ searchall:{
teacherNameOrUserNo:null, name:null,
status:null, status:null,
pageNo: "1", pageNo: "1",
pageSize: "10", pageSize: "10",
@@ -562,20 +561,23 @@
const lecturerSystemList = ref([ const lecturerSystemList = ref([
]); ]);
///获取讲师体系列表 ///获取讲师体系列表
const LecturerSystemLista =() => { const LecturerSystemLista = () => {
// console.log('点击了LecturerSystemLista') let obj ={
getTeacherSystemList().then((res) => { pageNo:1,
pageSize:1000,
}
getTeacherSystemList(obj).then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
let arr = res.data.data; let arr = res.data.data.records;
let array = []; let array = [];
arr.map((value) => { arr.map((value) => {
let obj = { let obj = {
value: value.kid, value: value.id,
label: value.systemName, label: value.systemName,
}; };
array.push(obj); array.push(obj);
}); });
lecturerSystemList.value = array; LecturerSystemList.value = array;
} }
}) })
} }
@@ -847,10 +849,10 @@ console.log( "讲师体系id" +val);
const searchReset = () => { const searchReset = () => {
state.searchdate= null, state.searchdate= null,
state.searchParam = { state.searchParam = {
endDate:null, endTime:null,
startDate:null, beginTime:null,
teacherNo:null, teacherNo:null,
id:null, tsystemid:null,
levelId:null, levelId:null,
courseType:null, courseType:null,
certStatus:null, certStatus:null,
@@ -862,23 +864,23 @@ console.log( "讲师体系id" +val);
}; };
getTableDate(); getTableDate();
}; };
//修改时间 // //修改时间
function searchTimeChange(time, timeStr) { // function searchTimeChange(time, timeStr) {
let startTime = timeStr[0] // let startTime = timeStr[0]
let endTime = timeStr[1] ; // let beginTime = timeStr[1] ;
state.startTime = new Date(startTime).getTime(); // state.startTime = new Date(startTime).getTime();
state.endTime = new Date(endTime).getTime(); // state.beginTime = new Date(beginTime).getTime();
// state.searchParam.startDate = new Date(startDate).getTime() ; // // state.searchParam.beginTime = new Date(beginTime).getTime() ;
// state.searchParam.endDate = new Date(endDate).getTime() ; // // state.searchParam.endTime = new Date(endTime).getTime() ;
state.searchParam.startDate = state.startTime ? state.startTime : null, // state.searchParam.beginTime = state.startTime ? state.startTime : null,
state.searchParam.endDate = state.endTime ? state.endTime : null // state.searchParam.endTime = state.beginTime ? state.beginTime : null
} // }
// List接口数据 // List接口数据
const getTableDate = (obj) => { const getTableDate = (obj) => {
state.tableLoading=true state.tableLoading=true
let objA = {...state.searchParam}; let objA = { ...state.searchParam };
objA.startDate= state.searchParam.startDate!==null? dayjs(new Date(state.searchParam.startDate).getTime()).format("YYYY-MM-DD"): "", objA.beginTime = state.searchdate ? dayjs(state.searchdate[0]).format("YYYY-MM-DD") : "",
objA.endDate=state.searchParam.endDate!==null? dayjs(new Date(state.searchParam.endDate).getTime()).format("YYYY-MM-DD"): "", objA.endTime = state.searchdate ? dayjs(state.searchdate[1]).format("YYYY-MM-DD") : "",
getTeacherFeeList(objA) getTeacherFeeList(objA)
.then((res) => { .then((res) => {
tableData.value = res.data.data.records tableData.value = res.data.data.records
@@ -1006,7 +1008,7 @@ console.log( "讲师体系id" +val);
teacher:null, teacher:null,
teacherNo:null, teacherNo:null,
departId:null, departId:null,
id:null, tsystemid:null,
levelId:null, levelId:null,
payrollPlaceId:null, payrollPlaceId:null,
// 费用类型 : null // 费用类型 : null
@@ -1127,7 +1129,7 @@ const cancelallFeedialog= ()=>{
} }
const searchResetdrawer=()=>{ const searchResetdrawer=()=>{
state.searchall={ state.searchall={
teacherNameOrUserNo:null, name:null,
status:null, status:null,
pageNo: "1", pageNo: "1",
pageSize: "10", pageSize: "10",
@@ -1326,11 +1328,11 @@ const column = ref([
state.currentPage1 state.currentPage1
}&pageSize=${state.pageSize1}&teacherNo=${ }&pageSize=${state.pageSize1}&teacherNo=${
state.searchParam.teacherNo ? state.searchParam.teacherNo : "" state.searchParam.teacherNo ? state.searchParam.teacherNo : ""
}&id=${ state.searchParam.id ? state.searchParam.id : ""}&levelId=${ }&tsystemid=${ state.searchParam.tsystemid ? state.searchParam.tsystemid : ""}&levelId=${
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 : ""}&startDate=${state.searchParam.startDate ? state.searchParam.startDate : ""}&endDate=${state.searchParam.endDate ? state.searchParam.endDate : ""}` }&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 : ""}`
); );
// this.download('lesson_records/export', { // this.download('lesson_records/export', {
// ...state.searchParam // ...state.searchParam
@@ -1378,7 +1380,7 @@ const column = ref([
cancelTeachingDialog, cancelTeachingDialog,
managerChange, managerChange,
courseTypeList, courseTypeList,
searchTimeChange, // searchTimeChange,
trainOrglist, trainOrglist,
trainOrglista, trainOrglista,
getTeacherExpertiseList, getTeacherExpertiseList,
@@ -1769,4 +1771,30 @@ const column = ref([
.ant-col-12{ .ant-col-12{
height:90px; height:90px;
} }
::v-deep .ant-select-selection-overflow-item {
margin-top: -2px;
}
::v-deep .ant-select-multiple .ant-select-selection-item {
height: 34px
}
.tableBox {
padding-bottom: 20px;
margin: 20px 38px 30px;
::v-deep .ant-select-dropdown{
display: inline-block;
}
::v-deep .ant-select-selection-item{
margin-left: 3px;
}
::v-deep .ant-pagination-options-size-changer.ant-select{
width: 84px;
}
.pa {
width: 100%;
display: flex;
justify-content: right;
}
}
</style> </style>

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

@@ -6,12 +6,12 @@
<a-form layout="inline"> <a-form layout="inline">
<a-form-item class="select"> <a-form-item class="select">
<a-select style="width: 276px" v-model:value="searchParam.trainorgId" placeholder="请选择资源归属" allowClear <a-select style="width: 276px" v-model:value="searchParam.trainorgId" placeholder="请选择资源归属" allowClear
:options="trainOrglist" /> :options="TrainOrglist" />
</a-form-item> </a-form-item>
<a-form-item class="select " > <a-form-item class="select " >
<a-date-picker style="width: 260px; height: 40px; border-radius: 8px" v-model:value="searchdate" <a-date-picker style="width: 260px; height: 40px; border-radius: 8px" v-model:value="searchdate"
:placeholder="['请选择汇总周期']" @change="searchTimeChange" /> :placeholder="[ '请选择汇总周期']" @change="searchTimeChange" />
</a-form-item> </a-form-item >
<!-- <a-form-item class="select"> <!-- <a-form-item class="select">
<a-month-picker placeholder="重新汇总上月周期" @change="onChange" style="width: 260px; height: 40px; border-radius: 8px" v-model:value="searchdate" /> <a-month-picker placeholder="重新汇总上月周期" @change="onChange" style="width: 260px; height: 40px; border-radius: 8px" v-model:value="searchdate" />
</a-form-item> --> </a-form-item> -->

30
src/views/lecturer/LookExternalLecturer.vue
View File

@@ -66,8 +66,8 @@ ExternalLecturer
<a-pagination <a-pagination
v-if="tableDataTotal > 10" v-if="tableDataTotal > 10"
:showSizeChanger="false" :showSizeChanger="true"
:showQuickJumper="true" :showQuickJumper="false"
:hideOnSinglePage="true" :hideOnSinglePage="true"
:pageSize="searchParam.pageSize" :pageSize="searchParam.pageSize"
:current="searchParam.pageNo" :current="searchParam.pageNo"
@@ -329,4 +329,30 @@ export default{
font-size: 14px; font-size: 14px;
} }
} }
::v-deep .ant-select-selection-overflow-item {
margin-top: -2px;
}
::v-deep .ant-select-multiple .ant-select-selection-item {
height: 34px
}
.tableBox {
padding-bottom: 20px;
margin: 20px 38px 30px;
::v-deep .ant-select-dropdown{
display: inline-block;
}
::v-deep .ant-select-selection-item{
margin-left: 3px;
}
::v-deep .ant-pagination-options-size-changer.ant-select{
width: 84px;
}
.pa {
width: 100%;
display: flex;
justify-content: right;
}
}
</style> </style>

34
src/views/lecturer/LookInsideLecturer.vue
View File

@@ -87,8 +87,8 @@
<div style="float: right;"> <div style="float: right;">
<a-pagination <a-pagination
v-if="tableDataTotal > 10" v-if="tableDataTotal > 10"
:showSizeChanger="false" :showSizeChanger="true"
:showQuickJumper="true" :showQuickJumper="false"
:hideOnSinglePage="true" :hideOnSinglePage="true"
:pageSize="searchParam.pageSize" :pageSize="searchParam.pageSize"
:current="searchParam.pageNo" :current="searchParam.pageNo"
@@ -108,8 +108,8 @@
<div style="float: right;"> <div style="float: right;">
<a-pagination <a-pagination
v-if="teacherrepromotableDataTotal > 10" v-if="teacherrepromotableDataTotal > 10"
:showSizeChanger="false" :showSizeChanger="true"
:showQuickJumper="true" :showQuickJumper="false"
:hideOnSinglePage="true" :hideOnSinglePage="true"
:pageSize="teacherrepromo.pageSize" :pageSize="teacherrepromo.pageSize"
:current="teacherrepromo.pageNo" :current="teacherrepromo.pageNo"
@@ -461,4 +461,30 @@ const handleup = ()=>{
color: #4ea6ff; color: #4ea6ff;
width: 80px width: 80px
} }
::v-deep .ant-select-selection-overflow-item {
margin-top: -2px;
}
::v-deep .ant-select-multiple .ant-select-selection-item {
height: 34px
}
.tableBox {
padding-bottom: 20px;
margin: 20px 38px 30px;
::v-deep .ant-select-dropdown{
display: inline-block;
}
::v-deep .ant-select-selection-item{
margin-left: 3px;
}
::v-deep .ant-pagination-options-size-changer.ant-select{
width: 84px;
}
.pa {
width: 100%;
display: flex;
justify-content: right;
}
}
</style> </style>

28
src/views/lecturer/LookLecturerSystem.vue
View File

@@ -47,7 +47,7 @@ ExternalLecturer
<div style="float: right;"> <div style="float: right;">
<a-pagination <a-pagination
v-if="teacherrecordstableDataTotal > 10" v-if="teacherrecordstableDataTotal > 10"
:showSizeChanger="true" :showSizeChanger="true" :showQuickJumper="false"
:hideOnSinglePage="true" :hideOnSinglePage="true"
:pageSize="pageSize" :pageSize="pageSize"
v-model:current="teacherrecords.pageNo" v-model:current="teacherrecords.pageNo"
@@ -234,4 +234,30 @@ export default{
font-size: 14px; font-size: 14px;
} }
} }
::v-deep .ant-select-selection-overflow-item {
margin-top: -2px;
}
::v-deep .ant-select-multiple .ant-select-selection-item {
height: 34px
}
.tableBox {
padding-bottom: 20px;
margin: 20px 38px 30px;
::v-deep .ant-select-dropdown{
display: inline-block;
}
::v-deep .ant-select-selection-item{
margin-left: 3px;
}
::v-deep .ant-pagination-options-size-changer.ant-select{
width: 84px;
}
.pa {
width: 100%;
display: flex;
justify-content: right;
}
}
</style> </style>

1
src/views/lecturer/Organization.vue
View File

@@ -29,6 +29,7 @@
<template #bodyCell="{ record, column }"> <template #bodyCell="{ record, column }">
<template v-if="column.key === 'operation'"> <template v-if="column.key === 'operation'">
<a-space > <a-space >
<a-button type="link" @click="() => handleModify(record, String(record.courseform))">查看</a-button>
<a-button type="link" @click="() => handleModify(record, String(record.courseform))">编辑</a-button> <a-button type="link" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
<a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
</a-space> </a-space>