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

接口联调

Browse Source
This commit is contained in:
wangxuemei
2024-08-02 18:50:40 +08:00
parent 95895d1d5a
commit 5723a20d5d
16 changed files with 597 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/api/Lecturer.js
View File

@@ -15,7 +15,7 @@ export const getTeacherList = (obj) => http.post('/admin/teacher/getInTeacherLis
//获取内部讲师发薪地 //获取内部讲师发薪地
export const getPayRollPlace = (obj) => http.post('/admin/teacher/getPayRollPlace', obj) export const getPayRollPlace = (obj) => http.post('/admin/teacher/getPayRollPlace', obj)
//获取内部讲师级别 //获取内部讲师级别
export const getLevel = (obj) => http.post('/admin/teacher/getLevel', obj) export const getLevel = (obj) => http.post('/admin/teacher/getNewLevel', obj)
//新增内部讲师 //新增内部讲师
export const insertTeacher = (obj) => http.post('/admin/teacher/insertInTeacher' ,obj) export const insertTeacher = (obj) => http.post('/admin/teacher/insertInTeacher' ,obj)
//修改 内部讲师 //修改 内部讲师
@@ -48,3 +48,4 @@ export const insertTeacherOutSide = (obj) => http.post('/admin/teacher/insertTea
//修改外部讲师 //修改外部讲师
export const updateOutTeacher = (obj) => http.post('/admin/teacher/updateOutTeacher', obj) export const updateOutTeacher = (obj) => http.post('/admin/teacher/updateOutTeacher', obj)
export const fileUp = (obj) => http.post('/file/upload', obj)

4
src/api/Teaching.js
View File

@@ -23,4 +23,6 @@ export const getOuterTeacherCourseList = (obj) => http.post('/admin/teacher/getO
//获取外部授课记录详情 //获取外部授课记录详情
export const getOuterTeacherCourseDetail = (obj) => http.post(`/admin/teacher/getOuterTeacherCourseDetail?id=${obj}`) export const getOuterTeacherCourseDetail = (obj) => http.post(`/admin/teacher/getOuterTeacherCourseDetail?id=${obj}`)
//新增外部授课记录 //新增外部授课记录
export const insertOutTeaherCourse = (obj) => http.post('/admin/teacher/insertOutTeaherCourse', obj) export const insertOutTeaherCourse = (obj) => http.post('/admin/teacher/insertOutTeaherCourse', obj)
//讲师费发放情况
export const getCharges = (obj) => http.post('/teacher/fee/getCharges', obj)

6
src/api/lecturerFeeManagement.js
View File

@@ -16,4 +16,8 @@ export const getTrainOrg= (obj) => http.post('/teacher/fee/getTrainOrg',obj)
//获取讲师级别 //获取讲师级别
export const getTeacherLevel= (obj) => http.post('/teacher/fee/getTeacherLevel',obj) export const getTeacherLevel= (obj) => http.post('/teacher/fee/getTeacherLevel',obj)
//列表查看讲师费审批(用于讲师费管理查看讲师费详情里面) //列表查看讲师费审批(用于讲师费管理查看讲师费详情里面)
export const getTeacherFeeApprovalList= (obj) => http.post('/teacher/fee/getTeacherFeeApprovalList',obj) export const getTeacherFeeApprovalList= (obj) => http.post('/teacher/fee/getTeacherFeeApprovalList',obj)
//列表查看讲师费统计
export const queryTeacherFeeTotalList= (obj) => http.post('/teacher/fee/queryTeacherFeeTotalList',obj)
//汇总上月讲师费
export const getPreviousTeacherFee= (obj) => http.post('/teacher/fee/getPreviousTeacherFee',obj)

20
src/api/organization.js
View File

@@ -1,7 +1,21 @@
import http from "./config"; import http from "./config";
// 列表分页查看归属组织 // 列表分页查看归属组织
export const queryTrainOrg = (obj) => http.post('/configuration/queryTrainOrg', obj) export const queryTrainOrg = (obj) => http.post( '/configuration/queryTrainOrg', obj)
//列表分页查看讲师体系
export const systemList = (obj) => http.get('/configuration/list',{params: obj})
// 根据体系id查看讲师体系对应的讲师等级详情
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 deleteTrainOrg = (obj) => http.post('/configuration/deleteTrainOrg', obj)
//列表分页查看讲师体系
export const systemList = (obj) => http.get('/configuration/list',{params: obj}) //新增讲师体系
export const addLecturerSystem = (obj) => http.post('/configuration/addLecturerSystem', obj)
//删除讲师体系
export const deleteLecturerSystem = (obj) => http.post('/configuration/deleteLecturerSystem', obj)
//修改讲师体系
export const updateSystem = (obj) => http.post('/configuration/updateSystem', obj)

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

@@ -7,7 +7,7 @@
<a-form-item class="select"> <a-form-item class="select">
<!-- v-model:value="searchParam.name" --> <!-- v-model:value="searchParam.name" -->
<div style="width: 276px; height: 40px; border-radius: 8px" > <div style="width: 276px; height: 40px; border-radius: 8px" >
<ProjectManager v-model:value="searchParam.managerId" <ProjectManager v-model:value="searchParam.managerId"
v-model:name="searchParam.manager" v-model:name="searchParam.manager"
placeholder="请输入工号/讲师姓名进行检索" placeholder="请输入工号/讲师姓名进行检索"
@onChange="managerChange" mode="multiple"></ProjectManager> @onChange="managerChange" mode="multiple"></ProjectManager>
@@ -106,10 +106,11 @@
<!-- 讲师名称 ,手机号码--> <!-- 讲师名称 ,手机号码-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师名称" name="name"> <a-form-item label="讲师名称" name="userNo">
<a-input v-model:value="searchParam.name " class="draitem" <ProjectManager v-model:value="formParam.userNo"
placeholder="请输入讲师姓名" allowClear showSearch> v-model:name="formParam.name"
</a-input> placeholder="请输入工号/讲师姓名进行检索"
@onChange="managerChange" mode="multiple"></ProjectManager>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@@ -124,8 +125,8 @@
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="供应商" name="levelId"> <a-form-item label="供应商" name="levelId">
<a-input v-model:value="formParam.userNo" class="draitem" <a-input v-model:value="formParam.levelId" class="draitem"
placeholder="请输入供应商" allowClear showSearch> placeholder="请输入供应商(未命名)" allowClear showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
@@ -148,7 +149,7 @@
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="24"> <a-col :span="24">
<a-form-item label="讲师介绍"> <a-form-item label="讲师介绍">
<Editor v-model="formParam.description "/> <Editor v-model:value="formParam.description "/>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@@ -285,6 +286,7 @@ export default {
tableDataTotal: -1,//table列表总条数 tableDataTotal: -1,//table列表总条数
teacherrecordstableDataTotal: -1,//授课记录列表总条数 teacherrecordstableDataTotal: -1,//授课记录列表总条数
formParam: { formParam: {
description:null,
}, },
searchParam: { searchParam: {
name: null,//姓名 name: null,//姓名
@@ -463,6 +465,7 @@ export default {
state.teacherdialog = true; state.teacherdialog = true;
state.teacherdialogtitle = '新增讲师' state.teacherdialogtitle = '新增讲师'
} }
//修改讲师信息弹窗 //修改讲师信息弹窗
const handleModify = (record) => { const handleModify = (record) => {
state.teacherdialog = true; state.teacherdialog = true;
@@ -551,6 +554,7 @@ export default {
mobile: null, mobile: null,
email: null, email: null,
teacherIntrofuce: null, teacherIntrofuce: null,
description:null,
remark: null, remark: null,
id:null id:null
} }
@@ -585,7 +589,12 @@ export default {
// state.formParam.id = record.id // state.formParam.id = record.id
// } // }
} }
function managerChange(e, l, d, t, orgName) {
console.log(e, l);
state.searchParam.userNo = d;
state.searchParam.name = t;
// state.searchParam.trainorgName=orgName
}
// getpromotionrecordstableData() // getpromotionrecordstableData()
//导出功能 //导出功能
const handleExport = () => { const handleExport = () => {
@@ -600,6 +609,7 @@ export default {
return { return {
...toRefs(state), ...toRefs(state),
rules, rules,
managerChange,
headers, headers,
beforeUpload, beforeUpload,
handleExport, handleExport,

70
src/views/lecturer/ExternalTeaching.vue
View File

@@ -10,14 +10,14 @@
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" >
<ProjectManager v-model:value="searchParam.managerId" <ProjectManager v-model:value="searchParam.userNo"
v-model:name="searchParam.manager" v-model:name="searchParam.teacher"
placeholder="请输入工号/讲师姓名进行检索" placeholder="请输入工号/讲师姓名进行检索"
@onChange="managerChange" mode="multiple"></ProjectManager> @onChange="managerChange" mode="multiple"></ProjectManager>
</div> </div>
</a-form-item> </a-form-item>
<a-form-item class="select"> <a-form-item class="select">
<a-input v-model:value="searchParam.teacherNo" style="width: 260px; height: 40px; border-radius: 8px" <a-input v-model:value="searchParam.name" style="width: 260px; height: 40px; border-radius: 8px"
placeholder="请输入课程名称进行搜索" allowClear showSearch> placeholder="请输入课程名称进行搜索" allowClear showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
@@ -46,17 +46,17 @@
<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.entryType" placeholder="录入类型" <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.entryType" placeholder="录入类型"
:options="entryTypeList"> :options="entryTypeList" allowClear >
</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.tlevelName" placeholder="内容分类" <a-select style="width: 230px" v-model:value="searchParam.id" placeholder="内容分类"
:options="getTeacherExpertiseList"> :options="getTeacherExpertiseList" allowClear>
</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.status" placeholder="开课状态" <a-select style="width: 230px" v-model:value="searchParam.status" placeholder="开课状态"
:options="AuthenticationStatusList"> :options="AuthenticationStatusList" allowClear>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-form> </a-form>
@@ -110,27 +110,28 @@
<a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true" <a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true"
dropdown-style="drawaer" width="60%" :title="teacherdialogtitle"> dropdown-style="drawaer" width="60%" :title="teacherdialogtitle">
<a-form :model="formParam" :rules="rules" layout="vertical"> <a-form :model="formParam" :rules="rules" layout="vertical">
<!--讲师名称 teacher 内容分类 tlevelName --> <!--讲师名称 teacher 内容分类 id -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师名称" name="teacher"> <a-form-item label="讲师名称" name="teacher">
<a-tree-select v-model:value="formParam.teacher" tree-data-simple-mode class="draitem" <ProjectManager v-model:value="formParam.userNo"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" :tree-data="treeData" placeholder="请输入讲师名称" /> v-model:name="formParam.teacher"
</a-form-item> placeholder="请输入工号/讲师姓名进行检索"
@onChange="managerChange" mode="multiple"></ProjectManager> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="内容分类" name="tlevelName"> <a-form-item label="内容分类" name="id">
<a-select class="draitem" v-model:value="searchParam.tlevelName" placeholder="内容分类" <a-select class="draitem" v-model:value="formParam.id" placeholder="内容分类"
:options="getTeacherExpertiseList"> :options="getTeacherExpertiseList" allowClear>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<!-- 课程名称：teacherNo 开课状态 status--> <!-- 课程名称：name 开课状态 status-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="课程名称" name="teacherNo"> <a-form-item label="课程名称" name="name">
<a-input class="draitem" v-model:value="searchParam.teacherNo" placeholder="请输入后搜索面授课" allowClear <a-input class="draitem" v-model:value="formParam.name" placeholder="请输入后搜索面授课" allowClear
showSearch> showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
@@ -338,8 +339,8 @@ export default {
]); ]);
const rules = { const rules = {
teacher: [{ required: true, message: '讲师不能为空' }], teacher: [{ required: true, message: '讲师不能为空' }],
tlevelName: [{ required: true, message: '内容分类不能为空' }], id: [{ required: true, message: '内容分类不能为空' }],
teacherNo: [{ required: true, message: '课程名称不能为空' }], name: [{ required: true, message: '课程名称不能为空' }],
status: [{ required: true, message: '讲开课状态不能为空' }], status: [{ required: true, message: '讲开课状态不能为空' }],
defaultTeachingTime: [{ required: true, message: '授课时长不能为空' }], defaultTeachingTime: [{ required: true, message: '授课时长不能为空' }],
beginTime: [{ required: true, message: '授课日期不能为空' }], beginTime: [{ required: true, message: '授课日期不能为空' }],
@@ -544,13 +545,14 @@ export default {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
managerId: null, managerId: null,
teacherNo: null, name: null,
manager:null, manager:null,
entryType: null, entryType: null,
status: null, status: null,
entryType:null, entryType:null,
systemId:null, systemId:null,
beginTime: null, endDate:null,
startDate:null,
entryType:null entryType:null
}; };
getTableDate(); getTableDate();
@@ -561,7 +563,7 @@ export default {
let objA = { ...state.searchParam }; let objA = { ...state.searchParam };
getOuterTeacherCourseList(objA) getOuterTeacherCourseList(objA)
.then((res) => { .then((res) => {
tableData.value = res.data.data tableData.value = res.data.data.records
state.tableDataTotal = Number(res.data.data.total); state.tableDataTotal = Number(res.data.data.total);
state.tableLoading = false state.tableLoading = false
console.log("获取tableData", tableData); console.log("获取tableData", tableData);
@@ -601,6 +603,7 @@ export default {
}).catch((err) => { }).catch((err) => {
console.log(err); console.log(err);
}); });
cancel()
} }
getTableDate(); getTableDate();
state.teacherdialog = false state.teacherdialog = false
@@ -675,7 +678,7 @@ export default {
state.moreid = 1 state.moreid = 1
state.searchParam.type = null state.searchParam.type = null
state.searchParam.status = null state.searchParam.status = null
state.searchParam.tlevelName = null state.searchParam.id = null
state.searchParam.entryType=null state.searchParam.entryType=null
} }
} }
@@ -701,21 +704,32 @@ export default {
.catch((err) => { .catch((err) => {
}); });
} }
function managerChange(e, l, d, t, orgName) {
console.log(e, l);
state.searchParam.userNo = d;
state.searchParam.name = t;
// state.searchParam.trainorgName=orgName
}
//导出功能 //导出功能
const handleExport = () => { const handleExport = () => {
window.open( window.open(
`${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${state.currentPage1 `${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${state.searchParam.currentPage
}&pageSize=${state.pageSize1} }&pageSize=${state.searchParam.pageSize}
&userNo=${state.searchParam.userNo ? state.searchParam.userNo : ""
}
&teacher=${state.searchParam.teacher ? state.searchParam.teacher : "" &teacher=${state.searchParam.teacher ? state.searchParam.teacher : ""
}&name=${state.searchParam.name ? state.searchParam.name : ""} }&name=${state.searchParam.name ? state.searchParam.name : ""}
&address=${state.searchParam.address ? state.searchParam.address : "" &startDate=${state.searchParam.startDate ? state.searchParam.startDate : ""}
}&status=${state.searchParam.status ? state.searchParam.status : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.certbeginTimeStatus : "" &endDate=${state.searchParam.endDate ? state.searchParam.endDate : ""}
}` &entryType=${state.searchParam.entryType ? state.searchParam.entryType : ""}
&id=${state.searchParam.id ? state.searchParam.id : ""
}&status=${state.searchParam.status ? state.searchParam.status : ""}`
); );
} }
return { return {
...toRefs(state), ...toRefs(state),
rules, rules,
managerChange,
entryTypeList, entryTypeList,
searchTimeChange, searchTimeChange,
cancelTeachingDialog, cancelTeachingDialog,

3
src/views/lecturer/ExternalTeachingDetail.vue
View File

@@ -138,7 +138,6 @@
import { reactive, toRefs, ref } from "vue"; import { reactive, toRefs, ref } from "vue";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import Editor from "@/components/project/Editor"; import Editor from "@/components/project/Editor";
import Upload from "@/components/project/Upload";
import {infoteacher,getLevel,deleteTeacher, } from "../../api/Lecturer"; import {infoteacher,getLevel,deleteTeacher, } from "../../api/Lecturer";
import { getNewInTeacherCourseList} from "../../api/Teaching"; import { getNewInTeacherCourseList} from "../../api/Teaching";
// import {getProjSt} from "../../api/indexProjStu"; // import {getProjSt} from "../../api/indexProjStu";
@@ -148,7 +147,7 @@ export default {
components: { components: {
// AddTeacher, // AddTeacher,
Editor, Editor,
Upload
}, },
setup() { setup() {
const router = useRouter(); const router = useRouter();

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

@@ -33,13 +33,13 @@
</a-tree-select> --> </a-tree-select> -->
</a-form-item> </a-form-item>
<a-form-item class="select"> <a-form-item class="select">
<a-select style="width: 276px" placeholder="请选择讲师体系" v-model:value="searchParam.tsystemName" <a-select style="width: 276px" placeholder="请选择讲师体系" v-model:value="searchParam.kid" allowClear
:options="LecturerSystemList" @change="changetlevel"> :options="LecturerSystemList" @change="changetlevel">
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item class="select"> <a-form-item class="select">
<a-select style="width: 276px" v-model:value="searchParam.tlevelId" placeholder="请选择讲师级别" <a-select style="width: 276px" v-model:value="searchParam.tlevelId" placeholder="请选择讲师级别" allowClear
:options="getLevelList"> :options="getLevelList" :disabled="getLevelList.length!==0 ? false:true" >
</a-select> </a-select>
</a-form-item> </a-form-item>
<div style="display: flex; margin-bottom: 20px"> <div style="display: flex; margin-bottom: 20px">
@@ -63,19 +63,19 @@
<div style="width:100%"></div> <div style="width:100%"></div>
<a-form-item v-if="moreid == 2" class="select"> <a-form-item v-if="moreid == 2" class="select">
<a-select style="width: 276px ;margin-bottom:20px" v-model:value="searchParam.waitStatus" placeholder="在职状态" <a-select style="width: 276px ;margin-bottom:20px" v-model:value="searchParam.waitStatus" placeholder="在职状态"
:options="OnTheJobStatusList"> :options="OnTheJobStatusList" allowClear>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item v-if="moreid == 2" class="select"> <a-form-item v-if="moreid == 2" class="select">
<a-select style="width: 276px ;margin-bottom:20px" v-model:value="searchParam.certStatus" placeholder="认证状态" <a-select style="width: 276px ;margin-bottom:20px" v-model:value="searchParam.certStatus" placeholder="认证状态" allowClear
:options="AuthenticationStatusList"> :options="AuthenticationStatusList">
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item v-if="moreid == 2" class="select"> <!-- <a-form-item v-if="moreid == 2" class="select">
<a-select style="width: 276px ;margin-bottom:20px" v-model:value="searchParam.payrollPlaceId" placeholder="发薪地" <a-select style="width: 276px ;margin-bottom:20px" v-model:value="searchParam.payrollPlaceId" placeholder="发薪地" allowClear
:options="PlaceOfPayList"> :options="PlaceOfPayList">
</a-select> </a-select>
</a-form-item> </a-form-item> -->
<!-- <div class="select"> <!-- <div class="select">
<a-select style="width: 276px" v-model:value="searchParam.status" placeholder="账号状态" <a-select style="width: 276px" v-model:value="searchParam.status" placeholder="账号状态"
:options="AccountStatusList"> :options="AccountStatusList">
@@ -195,15 +195,17 @@
<!-- 讲师级别 体系--> <!-- 讲师级别 体系-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师体系" name="systemId"> <a-form-item label="讲师体系" name="tsystemId">
<a-select class="draitem" v-model:value="formParam.systemId" placeholder="请选择讲师体系" <a-select class="draitem" v-model:value="formParam.tsystemId" placeholder="请选择讲师体系" allowClear
@change="changetlevel"
:options="LecturerSystemList"> :options="LecturerSystemList">
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师级别" name="levelId"> <a-form-item label="讲师级别" name="tlevelId">
<a-select class="draitem" v-model:value="formParam.levelId" placeholder="请选择讲师级别" <a-select class="draitem" v-model:value="formParam.tlevelId" placeholder="请选择讲师级别" allowClear
:disabled="getLevelList.length!==0 ? false:true"
:options="getLevelList"> :options="getLevelList">
</a-select> </a-select>
</a-form-item> </a-form-item>
@@ -221,7 +223,7 @@
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="认证状态" name="certStatus"> <a-form-item label="认证状态" name="certStatus">
<a-radio-group v-model:value="formParam.certStatus" <a-radio-group v-model:value="formParam.certStatus"
class="draitem"> class="draitem">
<a-radio :value="0">未认证</a-radio> <a-radio :value="0">未认证</a-radio>
@@ -410,7 +412,7 @@ export default {
searchParam: { searchParam: {
name:null, name:null,
userNo: null, userNo: null,
tsystemName: null, kid: null,
tlevelId: null, tlevelId: null,
waitStatus: null, waitStatus: null,
certStatus: null, certStatus: null,
@@ -520,7 +522,7 @@ export default {
]) ])
const changetlevel = (val) => { const changetlevel = (val) => {
console.log( "讲师体系id" +val); console.log( "讲师体系id" +val);
getLevel( {systemId:val}).then((res) => { getLevel( {kid:val}).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 = [];
@@ -569,59 +571,59 @@ console.log( "讲师体系id" +val);
{ value: 1, label: "启用" }, { value: 1, label: "启用" },
{ value: 2, label: "停用" }, { value: 2, label: "停用" },
]) ])
const teacheExpertiseList = ref([ // const teacheExpertiseList = ref([
]) // ])
//获取讲师父 专长 // //获取讲师父 专长
const TeacherExpertiseList = ref([ // const TeacherExpertiseList = ref([
]); // ]);
const getTeacherExpertisea = () => { // const getTeacherExpertisea = () => {
// console.log('点击了LecturerSystemLista') // // console.log('点击了LecturerSystemLista')
getTeacherExpertise().then((res) => { // getTeacherExpertise().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.id,
label: value.name, // label: value.name,
}; // };
array.push(obj); // array.push(obj);
}); // });
TeacherExpertiseList.value = array; // TeacherExpertiseList.value = array;
} // }
}) // })
} // }
getTeacherExpertisea() // getTeacherExpertisea()
const changeSelect = (val) => { // const changeSelect = (val) => {
state.byPid = val // state.byPid = val
getTeacherExpertiseByPida(val) // getTeacherExpertiseByPida(val)
state.formParam.expertise = getTeacherExpertiseByPidList[0] // state.formParam.expertise = getTeacherExpertiseByPidList[0]
} // }
//获取讲师子 专长 //获取讲师子 专长
const getTeacherExpertiseByPidList = ref([ // const getTeacherExpertiseByPidList = ref([
]); // ]);
const getTeacherExpertiseByPida = () => { // const getTeacherExpertiseByPida = () => {
// let pid = {id :val} // // let pid = {id :val}
// console.log('点击了LecturerSystemLista') // // console.log('点击了LecturerSystemLista')
let id = val // let id = val
getTeacherExpertiseByPid(state.byPid).then((res) => { // getTeacherExpertiseByPid(state.byPid).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.id,
label: value.name, // label: value.name,
}; // };
array.push(obj); // array.push(obj);
}); // });
getTeacherExpertiseByPidList.value = array; // getTeacherExpertiseByPidList.value = array;
} // }
}) // })
} // }
watch( // watch(
) // )
//新增页面内部姓名 //新增页面内部姓名
const infoteacherList = ref([ const infoteacherList = ref([
// { value: 0, systemName: "讲师体系" }, // { value: 0, systemName: "讲师体系" },
@@ -785,7 +787,7 @@ console.log( "讲师体系id" +val);
state.searchParam = { state.searchParam = {
name:null, name:null,
userNo: null, userNo: null,
tsystemName: null, kid: null,
tlevelId: null, tlevelId: null,
waitStatus: null, waitStatus: null,
certStatus: null, certStatus: null,
@@ -866,7 +868,7 @@ console.log( "讲师体系id" +val);
// departId:'8465784657', // departId:'8465784657',
// defaultTeachingTime:50, // defaultTeachingTime:50,
// leveId:1, // leveId:1,
// tsystemName:249, // kid:249,
// certStatus:1, // certStatus:1,
// description:'测试13.00', // description:'测试13.00',
// workExperience:'测试13.00', // workExperience:'测试13.00',
@@ -943,12 +945,12 @@ console.log( "讲师体系id" +val);
name: null, name: null,
// userNo:null, // userNo:null,
departId: null, departId: null,
levelId: null, tlevelId: null,
defaultTeachingTime: null, defaultTeachingTime: null,
// levelName:null, // levelName:null,
// leveName:null, // leveName:null,
systemId: null, tsystemId: null,
// tsystemName:null, // kid:null,
certStatus:0, certStatus:0,
description:null, description:null,
workExperience:null, workExperience:null,
@@ -958,8 +960,8 @@ console.log( "讲师体系id" +val);
const rules = { const rules = {
name: [{ required: true, message: '讲师不能为空' }], name: [{ required: true, message: '讲师不能为空' }],
departId: [{ required: true, message: '组织不能为空' }], departId: [{ required: true, message: '组织不能为空' }],
levelId: [{ required: true, message: '讲师级别不能为空' }], tlevelId: [{ required: true, message: '讲师级别不能为空' }],
systemId: [{ required: true, message: '讲师体系不能为空' }], tsystemId: [{ required: true, message: '讲师体系不能为空' }],
defaultTeachingTime: [{ required: true, message: '授课时长不能为空' }], defaultTeachingTime: [{ required: true, message: '授课时长不能为空' }],
certStatus: [{ required: true, message: '认证状态不能为空' }], certStatus: [{ required: true, message: '认证状态不能为空' }],
@@ -981,15 +983,25 @@ console.log( "讲师体系id" +val);
console.log("内部讲师详情", err); console.log("内部讲师详情", err);
}); });
} }
function managerChange(e, l, d, t, orgName) {
console.log(e, l);
state.searchParam.userNo = d;
state.searchParam.name = t;
// state.searchParam.trainorgName=orgName
}
//导出功能 //导出功能
const handleExport = () => { const handleExport = () => {
window.open( window.open(
`${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${state.currentPage1 `${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${state.currentPage1
}&pageSize=${state.pageSize1}&userNo=${state.searchParam.userNo ? state.searchParam.userNo : "" }&pageSize=${state.pageSize1}
}&tsystemName=${state.searchParam.tsystemName ? state.searchParam.tsystemName : ""}&tlevelId=${state.searchParam.tlevelId ? state.searchParam.tlevelId : "" &userNo=${state.searchParam.userNo ? state.searchParam.userNo : ""}
}&waitStatus=${state.searchParam.waitStatus ? state.searchParam.waitStatus : ""}&certStatus=${state.searchParam.certStatus ? state.searchParam.certStatus : "" &name=${state.searchParam.name ? state.searchParam.name : ""}
}&salaryName=${state.searchParam.salaryName ? state.searchParam.salaryName : ""}&payrollPlaceId=${state.searchParam.payrollPlaceId ? state.searchParam.payrollPlaceId : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}` &kid=${state.searchParam.kid ? state.searchParam.kid : ""}
&tlevelId=${state.searchParam.tlevelId ? state.searchParam.tlevelId : ""
}&waitStatus=${state.searchParam.waitStatus ? state.searchParam.waitStatus : ""}
&certStatus=${state.searchParam.certStatus ? state.searchParam.certStatus : ""
}&salaryName=${state.searchParam.salaryName ? state.searchParam.salaryName : ""}
&status=${state.searchParam.status ? state.searchParam.status : ""}`
); );
// this.download('lesson_records/export', { // this.download('lesson_records/export', {
// ...state.searchParam // ...state.searchParam
@@ -998,10 +1010,11 @@ console.log( "讲师体系id" +val);
return { return {
...toRefs(state), ...toRefs(state),
rules, rules,
managerChange,
headers, headers,
beforeUpload, beforeUpload,
handlemoreid, handlemoreid,
changeSelect, // changeSelect,
handleExport, handleExport,
LecturerSystemList, LecturerSystemList,
getLevelList, getLevelList,
@@ -1026,15 +1039,15 @@ console.log( "讲师体系id" +val);
createTeacherDialog, createTeacherDialog,
handleOperate, handleOperate,
closehandleOperate, closehandleOperate,
teacheExpertiseList, // teacheExpertiseList,
getTableDate, //list接口数据调用 getTableDate, //list接口数据调用
// getStu // getStu
LecturerSystemLista, LecturerSystemLista,
TeacherSystem, TeacherSystem,
TeacherExpertiseList, // TeacherExpertiseList,
getTeacherExpertisea, // getTeacherExpertisea,
getTeacherExpertiseByPidList, // getTeacherExpertiseByPidList,
getTeacherExpertiseByPida, // getTeacherExpertiseByPida,
infoteacherList, infoteacherList,
getinfoteacher, getinfoteacher,
addContentData, addContentData,

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

@@ -7,17 +7,17 @@
<a-form-item class="select"> <a-form-item class="select">
<!-- v-model:value="searchParam.name" --> <!-- v-model:value="searchParam.name" -->
<div style="width: 276px; height: 40px; border-radius: 8px" > <div style="width: 276px; height: 40px; border-radius: 8px" >
<ProjectManager v-model:value="searchParam.managerId" <ProjectManager v-model:value="searchParam.userNo"
v-model:name="searchParam.manager" v-model:name="searchParam.teacher"
placeholder="请输入工号/讲师姓名进行检索" placeholder="请输入工号/讲师姓名进行检索"
@onChange="managerChange" mode="multiple"></ProjectManager> @onChange="managerChange" mode="multiple"></ProjectManager>
</div> </div>
<!-- <a-select style="width: 276px" placeholder="请选择所属组织" v-model:value="searchParam.userNo" <!-- <a-select style="width: 276px" placeholder="请选择所属组织" v-model:value="searchParam.userNo"
:options="infoteacherList"> :options="infoteacherList">
</a-select> --> </a-select> -->
</a-form-item> </a-form-item>
<a-form-item class="select"> <a-form-item class="select">
<a-input v-model:value="searchParam.teacherNo" style="width: 260px; height: 40px; border-radius: 8px" <a-input v-model:value="searchParam.name" style="width: 260px; height: 40px; border-radius: 8px"
placeholder="请输入课程名称进行搜索" allowClear showSearch> placeholder="请输入课程名称进行搜索" allowClear showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
@@ -46,27 +46,27 @@
<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.entryType" placeholder="录入类型" <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.entryType" placeholder="录入类型"
:options="entryTypeList"> :options="entryTypeList" allowClear>
</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.status" placeholder="开课状态" <a-select style="width: 230px" v-model:value="searchParam.status" placeholder="开课状态"
:options="AuthenticationStatusList"> :options="AuthenticationStatusList" allowClear>
</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" placeholder="请选择所属组织" v-model:value="searchParam.entryType" <a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.trainorgId"
:options="getOrganizationList"> :options="getOrganizationList" allowClear>
</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" placeholder="请选择讲师体系" v-model:value="searchParam.systemId" <a-select style="width: 230px" placeholder="请选择讲师体系" v-model:value="searchParam.systemId"
:options="LecturerSystemList"> :options="LecturerSystemList" allowClear>
</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.tlevelName" placeholder="内容分类" <a-select style="width: 230px" v-model:value="searchParam.id" placeholder="内容分类"
:options="getTeacherExpertiseList"> :options="getTeacherExpertiseList" allowClear>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-form> </a-form>
@@ -127,9 +127,11 @@
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师名称" name="teacher"> <a-form-item label="讲师名称" name="teacher">
<a-tree-select v-model:value="formParam.teacher" tree-data-simple-mode
class="draitem" <ProjectManager v-model:value="formParam.userNo"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" :tree-data="treeData" placeholder="请输入讲师名称" /> v-model:name="formParam.teacher"
placeholder="请输入工号/讲师姓名进行检索"
@onChange="managerChange" mode="multiple"></ProjectManager>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@@ -149,31 +151,31 @@
<a-row :gutter="16"> <a-row :gutter="16">
<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.systemId" placeholder="请选择讲师体系" <a-select disabled class="draitem" v-model:value="formParam.systemId" allowClear placeholder="自动带出讲师体系"
:options="LecturerSystemList"> :options="LecturerSystemList">
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师级别" name="levelId"> <a-form-item label="讲师级别" name="levelId">
<a-select disabled class="draitem" v-model:value="formParam.levelId" placeholder="请选择讲师级别" <a-select disabled class="draitem" v-model:value="formParam.levelId" allowClear placeholder="自动带出讲师级别"
:options="getLevelList"> :options="getLevelList">
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<!-- 内容分类 tlevelName 课程名称 teacherNo --> <!-- 内容分类 id 课程名称 name -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="内容分类" name="tlevelName"> <a-form-item label="内容分类" name="id">
<a-select class="draitem" v-model:value="searchParam.tlevelName" placeholder="内容分类" <a-select class="draitem" allowClear v-model:value="formParam.id" placeholder="内容分类"
:options="getTeacherExpertiseList"> :options="getTeacherExpertiseList">
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="课程名称：" name="teacherNo"> <a-form-item label="课程名称：" name="name">
<a-input class="draitem" v-model:value="searchParam.teacherNo" <a-input class="draitem" v-model:value="formParam.name"
placeholder="请输入后搜索面授课" allowClear showSearch> placeholder="请输入后搜索面授课" allowClear showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
@@ -270,7 +272,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.teaching}}</a-descriptions-item> <a-descriptions-item label="内容分类 ">{{formParam.id}}</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>
<span class="line"></span> <span class="line"></span>
@@ -389,7 +391,8 @@ export default {
}, },
searchParam: { searchParam: {
userNo: null,//工号姓名 userNo: null,//工号姓名
teacherNo: null,//课程编号 teacher:null,
name: null,//课程编号
tsystemName: null,//讲师体系 tsystemName: null,//讲师体系
payrollPlaceName: null,//发薪地 payrollPlaceName: null,//发薪地
entryType:null, entryType:null,
@@ -413,8 +416,8 @@ export default {
let array = []; let array = [];
arr.map((value) => { arr.map((value) => {
let obj = { let obj = {
value: value.departId, value: value.trainorgId,
label: value.orgName, label: value.trainOrgName,
}; };
array.push(obj); array.push(obj);
}); });
@@ -657,11 +660,11 @@ export default {
} }
else if (state.moreid == 2) { else if (state.moreid == 2) {
state.moreid = 1 state.moreid = 1
state.searchParam.type = null state.searchParam.entryType = null
state.searchParam.status = null state.searchParam.status = null
state.searchParam.departId = null state.searchParam.trainorgId = null
state.searchParam.systemId = null state.searchParam.systemId = null
state.searchParam.tlevelName = null state.searchParam.id = null
} }
} }
// 搜索 // 搜索
@@ -682,15 +685,17 @@ export default {
//重置 //重置
const searchReset = () => { const searchReset = () => {
state.searchParam = { state.searchParam = {
pageNo: 1,
pageSize: 10, pageSize: 10,
managerId: null, managerId: null,
teacherNo: null, name: null,
manager:null, manager:null,
entryType: null, entryType: null,
status: null, status: null,
entryType:null, trainorgId:null,
systemId:null, systemId:null,
beginTime: null, endDate:null,
startDate:null,
entryType:null entryType:null
}; };
getTableDate(); getTableDate();
@@ -748,6 +753,7 @@ export default {
}).catch((err) => { }).catch((err) => {
console.log(err); console.log(err);
}); });
cancel()
} }
getTableDate(); getTableDate();
state.teacherdialog = false state.teacherdialog = false
@@ -787,9 +793,10 @@ export default {
departId: null, departId: null,
systemId:null, systemId:null,
levelId: null, levelId: null,
teacherNo:null, name:null,
defaultTeachingTime: 0, defaultTeachingTime:0,
beginTime: null, endDate:null,
startDate:null,
studys: null, studys: null,
score: null, score: null,
type: null, type: null,
@@ -845,7 +852,7 @@ export default {
levelId: record.levelId, levelId: record.levelId,
type: record.type, type: record.type,
name: record.name, name: record.name,
status:record.name, status:record.status,
beginTime: moment(record.beginTime, 'YYYY-MM-DD'), beginTime: moment(record.beginTime, 'YYYY-MM-DD'),
// ref< moment.Moment >(moment(record.beginTime,'YYYY-MM-DD')), // ref< moment.Moment >(moment(record.beginTime,'YYYY-MM-DD')),
// record.beginTime, // record.beginTime,
@@ -925,30 +932,38 @@ export default {
departId: [{ required: true, message: '讲师组织不能为空' }], departId: [{ required: true, message: '讲师组织不能为空' }],
levelId: [{ required: true, message: '讲师级别不能为空' }], levelId: [{ required: true, message: '讲师级别不能为空' }],
systemId: [{ required: true, message: '讲师体系不能为空' }], systemId: [{ required: true, message: '讲师体系不能为空' }],
tlevelName: [{ required: true, message: '内容分类不能为空' }], id: [{ required: true, message: '内容分类不能为空' }],
teacherNo: [{ required: true, message: '课程名称不能为空' }], name: [{ required: true, message: '课程名称不能为空' }],
beginTime: [{ required: true, message: '授课/课程日期不能为空' }], beginTime: [{ required: true, message: '授课/课程日期不能为空' }],
defaultTeachingTime: [{ required: true, message: '授课时长不能为空' }], defaultTeachingTime: [{ required: true, message: '授课时长不能为空' }],
certStatus: [{ required: true, message: '认证状态不能为空' }], certStatus: [{ required: true, message: '认证状态不能为空' }],
} }
function managerChange(e, l, d, t, orgName) {
console.log(e, l);
state.searchParam.userNo = d;
state.searchParam.name = t;
// state.searchParam.trainorgName=orgName
}
//导出功能 //导出功能
const handleExport = () => { const handleExport = () => {
window.open( window.open(
`${process.env.VUE_APP_BASE_API}/lesson_records/export?pageNo=${state.currentPage1 `${process.env.VUE_APP_BASE_API}/lesson_records/export?pageNo=${state.searchParam.currentPage
}&pageSize=${state.pageSize1} }&pageSize=${state.searchParam.pageSize}
&userNo=${state.searchParam.userNo ? state.searchParam.userNo : ""} &userNo=${state.searchParam.userNo ? state.searchParam.userNo : ""}
&teacherNo=${state.searchParam.teacherNo ? state.searchParam.teacherNo : ""} &name=${state.searchParam.name ? state.searchParam.name : ""}
&departId=${state.searchParam.departId ? state.searchParam.departId : ""} &departId=${state.searchParam.departId ? state.searchParam.departId : ""}
&systemId=${state.searchParam.systemId ? state.searchParam.systemId : ""} &systemId=${state.searchParam.systemId ? state.searchParam.systemId : ""}
&startDate=${state.searchParam.startDate ? state.searchParam.startDate : ""} &startDate=${state.searchParam.startDate ? state.searchParam.startDate : ""}
&endDate=${state.searchParam.endDate ? state.searchParam.endDate : ""} &endDate=${state.searchParam.endDate ? state.searchParam.endDate : ""}
&tlevelName=${state.searchParam.tlevelName ? state.searchParam.tlevelName : ""} &entryType=${state.searchParam.entryType ? state.searchParam.entryType : ""}
&id=${state.searchParam.id ? state.searchParam.id : ""}
&type=${state.searchParam.type ? state.searchParam.type : ""} &type=${state.searchParam.type ? state.searchParam.type : ""}
&status=${state.searchParam.status ? state.searchParam.status : ""}`) &status=${state.searchParam.status ? state.searchParam.status : ""}`)
} }
return { return {
...toRefs(state), ...toRefs(state),
managerChange,
rules, rules,
column, column,
tableDatas, tableDatas,

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

@@ -6,19 +6,18 @@
<a-form layout="inline" style="min-width: 1380px;"> <a-form layout="inline" style="min-width: 1380px;">
<a-form-item class="select"> <a-form-item class="select">
<!-- v-model:value="searchParam.name" --> <!-- v-model:value="searchParam.name" -->
<div style="width: 276px; height: 40px; border-radius: 8px" > <!-- <a-input v-model:value="searchParam.teacherNo" style="width: 276px; height: 40px; border-radius: 8px"
<ProjectManager v-model:value="searchParam.managerId" placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
v-model:name="searchParam.manager" </a-input>
--> <div style="width: 276px; height: 40px; border-radius: 8px" >
<ProjectManager v-model:value="searchParam.teacherNo"
v-model:name="searchParam.teacherName"
placeholder="请输入工号/讲师姓名进行检索" placeholder="请输入工号/讲师姓名进行检索"
@onChange="managerChange" mode="multiple"></ProjectManager> @onChange="managerChange" mode="multiple"></ProjectManager>
</div> </div>
<!-- <a-select style="width: 276px" placeholder="请选择所属组织" v-model:value="searchParam.userNo"
:options="infoteacherList">
</a-select> -->
</a-form-item> </a-form-item>
<a-form-item class="select"> <a-form-item class="select">
<a-select style="width: 276px" v-model:value="searchParam.trainOrgId" placeholder="培训发生组织" <a-select style="width: 276px" v-model:value="searchParam.trainorgId" placeholder="培训发生组织" allowClear
:options="trainOrglist"> :options="trainOrglist">
</a-select> </a-select>
</a-form-item> </a-form-item>
@@ -46,27 +45,27 @@
</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.type" placeholder="请选择费用类型(未命名)" <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.courseType" placeholder="请选择费用类型" allowClear
:options="PlaceOfPayList"> :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="请选择课程类型" <a-select style="width: 230px ;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="请选择状态" <a-select style="width: 230px ;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.tsystemName" <a-select style="width: 230px ;margin-bottom:20px" placeholder="请选择讲师体系" v-model:value="searchParam.kid" allowClear
:options="LecturerSystemList"> :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.tlevelId" placeholder="请选择讲师级别" <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.tlevelId" placeholder="请选择讲师级别" allowClear :disabled="getLevelList.length!==0 ? false:true"
:options="getLevelList"> :options="getLevelList">
</a-select> </a-select>
</a-form-item> </a-form-item>
@@ -263,7 +262,9 @@
}, },
searchParam: { searchParam: {
teacherNo:null, teacherNo:null,
tsystemName:null, teacherName:null,
trainorgId:null,
kid:null,
tlevelId:null, tlevelId:null,
courseType:null, courseType:null,
certStatus:null, certStatus:null,
@@ -276,12 +277,12 @@
endDate: null, endDate: null,
}, },
}) })
// 时间格式转换 //费用类型
const handleDate=()=>{ const courseTypeList=ref([
// state.formParam.beginTime=dayjs(new Date.getTime()).format("YYYY-MM-DD") { value: 1, label: "课程开发" },
{ value: 2, label: "作业人员入模培训" },
} { value: 3, label: "其他" },
handleDate() ])
//获取内容分类 //获取内容分类
const getTeacherExpertiseList = ref([ const getTeacherExpertiseList = ref([
// { value: 0, label: "未定级" }, // { value: 0, label: "未定级" },
@@ -327,14 +328,13 @@
const trainOrglist=ref([]) const trainOrglist=ref([])
//获取培训发生组织 //获取培训发生组织
const trainOrglista =() => { const trainOrglista =() => {
// console.log('点击了LecturerSystemLista')
getTrainOrg().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 = [];
arr.map((value) => { arr.map((value) => {
let obj = { let obj = {
value: value.trainOrgId, value: value.trainorgId,
label: value.trainOrg, label: value.trainOrg,
}; };
array.push(obj); array.push(obj);
@@ -575,11 +575,12 @@
} }
}, },
{ {
title: '讲师组织(未命名) ', title: '讲师组织',
dataIndex: 'certStatus', dataIndex: 'trainOrg',
key: 'certStatus', key: 'trainOrg',
elipsis: true, align: "center", elipsis: true, align: "center",
width: 120, width: 200,
scopedSlots: { customRender: "trainOrg" },
}, },
{ {
title: '操作 ', title: '操作 ',
@@ -599,11 +600,13 @@
const searchSubmit = () => { const searchSubmit = () => {
getTableDate(); getTableDate();
}; };
//重置 //重置
const searchReset = () => { const searchReset = () => {
state.searchParam = { state.searchParam = {
endDate:null,
startDate:null,
teacherNo:null, teacherNo:null,
tsystemName:null, kid:null,
tlevelId:null, tlevelId:null,
courseType:null, courseType:null,
certStatus:null, certStatus:null,
@@ -615,6 +618,17 @@
}; };
getTableDate(); getTableDate();
}; };
//修改时间
const searchTimeChange = (e, date) => {
let startTime = date[0] + " 00:00:00";
let endTime = date[1] + " 23:59:59";
state.startTime = new Date(startTime).getTime();
state.endTime = new Date(endTime).getTime();
// state.searchParam.startDate = new Date(startDate).getTime() ;
// state.searchParam.endDate = new Date(endDate).getTime() ;
state.searchParam.startDate = state.startTime ? state.startTime : null,
state.searchParam.endDate = state.endTime ? state.endTime : null
};
// List接口数据 // List接口数据
const getTableDate = (obj) => { const getTableDate = (obj) => {
state.tableLoading=true state.tableLoading=true
@@ -666,24 +680,26 @@
state.deleteInTeacherdialog = false state.deleteInTeacherdialog = false
state.editTeacher = false state.editTeacher = false
}; };
//清空数据
//清空数据 const cancel = () => {
const cancel = () => { state.formParam ={
state.formParam ={ teacher:null,
teacherName:null, teacherNo:null,
userNo:null, departId:null,
teacherOrg:null, kid:null,
systemName:null, courseName:0,
courseName:null, levelId:null,
trainOrg:null, payrollPlaceId:null,
teachingDate:null, // 费用类型 : null
teacherpayrollPlace:null, teacherpayrollPlace:null,
teachingTime:null, teachingDate:null,
levelName:null, defaultTeachingTime:0,
studentNum:null,
courseAssess:null,
courseType:null, courseType:null,
studys:null,
teacherlevelPay:null, teacherlevelPay:null,
score:null,
trainOrg:null,
payableExpense:null,
expense:null, expense:null,
remark:null, remark:null,
} }
@@ -761,6 +777,12 @@
width: 120, width: 120,
}, },
]) ])
function managerChange(e, l, d, t, orgName) {
console.log(e, l);
state.searchParam.teacherNo = d;
state.searchParam.teacherName = t;
// state.searchParam.trainorgName=orgName
}
//导出功能 //导出功能
const handleExport = ()=>{ const handleExport = ()=>{
window.open ( window.open (
@@ -780,8 +802,10 @@
} }
return { return {
...toRefs(state), ...toRefs(state),
searchTimeChange,
gettableDataExamine, gettableDataExamine,
handleDate, courseTypeList,
managerChange,
trainOrglist, trainOrglist,
trainOrglista, trainOrglista,
getTeacherExpertiseList, getTeacherExpertiseList,

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

@@ -6,18 +6,18 @@
<a-form layout="inline" style="min-width: 1380px;"> <a-form layout="inline" style="min-width: 1380px;">
<a-form-item class="select"> <a-form-item class="select">
<!-- v-model:value="searchParam.name" --> <!-- v-model:value="searchParam.name" -->
<!-- <a-input v-model:value="searchParam.userNo" style="width: 276px; height: 40px; border-radius: 8px" <!-- <a-input v-model:value="searchParam.teacherNo" style="width: 276px; height: 40px; border-radius: 8px"
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" >
<ProjectManager v-model:value="searchParam.managerId" <ProjectManager v-model:value="searchParam.teacherNo"
v-model:name="searchParam.manager" v-model:name="searchParam.teacherName"
placeholder="请输入工号/讲师姓名进行检索" placeholder="请输入工号/讲师姓名进行检索"
@onChange="managerChange" mode="multiple"></ProjectManager> @onChange="managerChange" mode="multiple"></ProjectManager>
</div> </div>
</a-form-item> </a-form-item>
<a-form-item class="select"> <a-form-item class="select">
<a-select style="width: 276px" v-model:value="searchParam.trainorgId" placeholder="培训发生组织" <a-select style="width: 276px" v-model:value="searchParam.trainorgId" placeholder="培训发生组织" allowClear
:options="trainOrglist"> :options="trainOrglist">
</a-select> </a-select>
</a-form-item> </a-form-item>
@@ -45,27 +45,27 @@
</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.type" placeholder="请选择费用类型(未命名)" <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.courseType" placeholder="请选择费用类型" allowClear
:options="PlaceOfPayList"> :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="请选择课程类型" <a-select style="width: 230px ;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="请选择状态" <a-select style="width: 230px ;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.tsystemName" <a-select style="width: 230px ;margin-bottom:20px" placeholder="请选择讲师体系" v-model:value="searchParam.kid" allowClear
:options="lecturerSystemList"> :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.tlevelId" placeholder="请选择讲师级别" <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.tlevelId" placeholder="请选择讲师级别" allowClear :disabled="getLevelList.length!==0 ? false:true"
:options="getLevelList"> :options="getLevelList">
</a-select> </a-select>
</a-form-item> </a-form-item>
@@ -101,13 +101,13 @@
<!-- <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>
</template> </template>
<template v-if="column.key === 'certStatus'"> <template v-if="column.key === 'trainOrg'">
<a-space style="display:flex ;justify-content: space-around; "> <a-space style="display:flex ;justify-content: space-around; ">
<a-popover> <a-popover>
<template #content> <template #content>
<p>{{ record.certStatus }}</p> <p>{{ record.trainOrg }}</p>
</template> </template>
<span>{{ record.certStatus }}</span> <span>{{ record.trainOrg }}</span>
</a-popover> </a-popover>
</a-space> </a-space>
</template> </template>
@@ -135,18 +135,20 @@
<a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true" dropdown-style="drawaer" <a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true" dropdown-style="drawaer"
width="60%" :title="teacherdialogtitle"> width="60%" :title="teacherdialogtitle">
<a-form :model="formParam" :rules="rules" layout="vertical"> <a-form :model="formParam" :rules="rules" layout="vertical">
<!-- 讲师姓名 name 讲师工号 user--> <!-- 讲师姓名 name 讲师工号 teacherNo-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师名称" name="teacher"> <a-form-item label="讲师名称" name="teacher">
<a-tree-select v-model:value="formParam.teacher" tree-data-simple-mode <ProjectManager v-model:value="searchParam.teacherNo"
class="draitem" v-model:name="searchParam.teacherName"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" :tree-data="treeData" placeholder="请输入讲师名称" /> placeholder="请输入工号/讲师姓名进行检索"
@onChange="managerChange" mode="multiple"></ProjectManager>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师工号" name="user"> <a-form-item label="讲师工号" name="teacherNo">
<a-input class="draitem" v-model:value="searchParam.user" disabled <a-input class="draitem" v-model:value="searchParam.teacherNo" disabled
placeholder="请输入后讲师工号" allowClear showSearch> placeholder="请输入后讲师工号" allowClear showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
@@ -168,7 +170,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.systemId" placeholder="请选择讲师体系" <a-select disabled class="draitem" v-model:value="formParam.kid" placeholder="请选择讲师体系"
:options="lecturerSystemList"> :options="lecturerSystemList">
</a-select> </a-select>
</a-form-item> </a-form-item>
@@ -177,16 +179,19 @@
<!-- 讲师级别 levelId 讲师发薪地 payrollPlaceId--> <!-- 讲师级别 levelId 讲师发薪地 payrollPlaceId-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师级别" name="levelId"> <a-form-item label="讲师级别" name="levelName">
<a-select disabled class="draitem" v-model:value="formParam.levelId" placeholder="请选择讲师级别" <!-- <a-select disabled class="draitem" v-model:value="formParam.levelId" placeholder="请选择讲师级别"
:options="getLevelList"> :options="getLevelList">
</a-select> </a-select> -->
<a-input disabled v-model:value="formParam.levelName" class="draitem"
placeholder="自动带出讲师的级别" allowClear showSearch>
</a-input>
</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="payrollPlaceId ">
<a-select v-model:value="formParam.payrollPlaceId" placeholder="发薪地" <a-select v-model:value="formParam.payrollPlaceId" placeholder="发薪地"
:options="PlaceOfPayList"> :options="PlaceOfPayList" allowClear>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
@@ -194,9 +199,9 @@
<!-- 费用类型 课程名称 courseName--> <!-- 费用类型 课程名称 courseName-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="费用类型(未命名)" name="levelId"> <a-form-item label="费用类型" name="levelId">
<a-select disabled class="draitem" v-model:value="formParam.levelId" placeholder="请选择费用类型" <a-select disabled class="draitem" v-model:value="formParam.courseType" placeholder="请选择费用类型"
:options="getLevelList"> :options="courseTypeList">
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
@@ -206,23 +211,23 @@
<a-radio :value="0">面授课</a-radio> <a-radio :value="0">面授课</a-radio>
<a-radio :value="1">在线课</a-radio> <a-radio :value="1">在线课</a-radio>
</a-radio-group> </a-radio-group>
<a-select class="draitem" v-model:value="formParam.levelId" placeholder="请选择输入或选择面授课(未命名)" style="width:63%" <a-select class="draitem" v-model:value="formParam.levelId" placeholder="请选择输入或选择面授课(未命名)" style="width:63%" allowClear
:options="getLevelList"> :options="getLevelList">
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<!-- 授课日期 beginTime 授课时长 defaultTeachingTime --> <!-- 授课日期 teachingDate 授课时长 defaultTeachingTime -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="授课/课程日期 :" name="beginTime"> <a-form-item label="授课/课程日期 :" name="teachingDate">
<a-input v-model:value="formParam.beginTime" disabled placeholder="" class="draitem"> <a-input v-model:value="formParam.teachingDate" disabled placeholder="" class="draitem">
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="授课时长" name="defaultTeachingTime"> <a-form-item label="授课时长" name="defaultTeachingTime">
<a-input v-model:value="formParam.defaultTeachingTime" class="draitem" placeholder="0" <a-input v-model:value="formParam.defaultTeachingTime" class="draitem" placeholder="0" style="width:80%"
allowClear showSearch suffix="分钟"> allowClear showSearch suffix="分钟">
</a-input> </a-input>
<span style="margin-left: 5px ;">{{ (formParam.defaultTeachingTime /60 ).toFixed(2)}}小时</span> <span style="margin-left: 5px ;">{{ (formParam.defaultTeachingTime /60 ).toFixed(2)}}小时</span>
@@ -267,8 +272,8 @@
<!-- 应发费用 --> <!-- 应发费用 -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="24"> <a-col :span="24">
<a-form-item label="应发费用(未命名)" name="studys"> <a-form-item label="应发费用" name="payableExpense">
<a-input v-model:value="formParam.studys" class="draitem" <a-input v-model:value="formParam.payableExpense" class="draitem"
placeholder="0 " allowClear showSearch> placeholder="0 " allowClear showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
@@ -316,7 +321,7 @@
<span v-if="handleOperate1== 'A20'">您确定要撤回此信息吗</span> <span v-if="handleOperate1== 'A20'">您确定要撤回此信息吗</span>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn2" @click="cancelTeacherDialog" style="margin-right: 32px"> <div class="del_btn btn2" @click="canceleditTeacherDialog" style="margin-right: 32px">
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2" @click="closehandleOperate"> <div class="del_btn btn2" @click="closehandleOperate">
@@ -328,6 +333,48 @@
</a-modal> </a-modal>
</div> </div>
<!-- <div> <Upload/> </div> --> <!-- <div> <Upload/> </div> -->
<a-drawer v-model:visible="teachingdialog" placement="right"
@closa="cancelTeachingDialog" :maskClosable="true" width="60%" title="查看讲师费用">
<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.teacherNo}}</a-descriptions-item>
<a-descriptions-item label="讲师组织" :span="2">{{formParam.teacherOrg}}</a-descriptions-item>
<a-descriptions-item label="讲师体系">{{formParam.systemName}}</a-descriptions-item>
<a-descriptions-item label="讲师级别">{{formParam.levelName }}</a-descriptions-item>
<a-descriptions-item label="发薪地">{{formParam.teacherpayrollPlace}}</a-descriptions-item>
<a-descriptions-item label="费用类型">"费用类型(未命名)"</a-descriptions-item>
<a-descriptions-item label="课程类型">{{formParam.courseType==1?'项目开课' :formParam.courseType==2 ?'路径开课':formParam.courseType==3 ?'面授开课':''}}</a-descriptions-item>
<a-descriptions-item label="课程名称">{{formParam.courseName}}</a-descriptions-item>
<a-descriptions-item label="授课时长 ">{{formParam.teachingTime}}</a-descriptions-item>
<a-descriptions-item label="授课/课程日期 ">{{formParam.teachingDate}}</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.teacherlevelPay}}</a-descriptions-item>
<a-descriptions-item label="计划费用 ">{{formParam.expense}}</a-descriptions-item>
<a-descriptions-item label="应发费用 ">{{formParam.payableExpense}}</a-descriptions-item>
<a-descriptions-item label="状态">{{formParam.status=="A10"?'待审核' :formParam.status=="A20"?'已提交':formParam.status== "A30" ?'审核中':formParam.status== "E10" ?'审核打回':formParam.status=="S20"?'审核通过':''}}</a-descriptions-item>
<a-descriptions-item label="备注 ">{{formParam.remark}}</a-descriptions-item>
</a-descriptions>
<span class="line"></span>
<div :style="{
position: 'absolute',
right: 0,
bottom: 0,
width: '100%',
borderTop: '1px solid #e9e9e9',
padding: '10px 16px',
background: '#fff',
textAlign: 'right',
zIndex: 1,
}">
<a-button class="drabtn" @click="cancelTeachingDialog">取消</a-button>
<a-button class="drabtn" type="primary" @click="cancelTeachingDialog" :loading="buttonLoading">返回
</a-button>
</div>
</a-drawer>
</div> </div>
</template> </template>
<script lang="jsx"> <script lang="jsx">
@@ -342,8 +389,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 {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,getTeacherLevel} from "../../api/lecturerFeeManagement";4
import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,updateTeacherFee,updateStatusSubmit,updateStatusWithDraw,getTrainOrg,getTeacherLevel} from "../../api/lecturerFeeManagement";import { getTeacherExpertise,getTeacherSystemList } from "../../api/Lecturer"; import { getTeacherExpertise,getTeacherSystemList,getLevel,getPayRollPlace } 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"
@@ -359,6 +406,7 @@
}, },
setup() { setup() {
const state = reactive({ const state = reactive({
teachingdialog:false,
moreid:1, moreid:1,
byPid:null, byPid:null,
currentPage1: 1, currentPage1: 1,
@@ -381,12 +429,15 @@
pageSize: 10, pageSize: 10,
tableDataTotal: -1,//table列表总条数 tableDataTotal: -1,//table列表总条数
formParam: { formParam: {
beginTime:null , teachingDate:null ,
defaultTeachingTime:"0", defaultTeachingTime:"0",
courseName:0
}, },
searchParam: { searchParam: {
teacherNo:null, teacherNo:null,
tsystemName:null, teacherName:null,
trainorgId:null,
kid:null,
tlevelId:null, tlevelId:null,
courseType:null, courseType:null,
certStatus:null, certStatus:null,
@@ -399,12 +450,23 @@
endDate: null, endDate: null,
}, },
}) })
// 时间格式转换 //费用类型
const handleDate=()=>{ const courseTypeList=ref([
// state.formParam.beginTime=dayjs(new Date.getTime()).format("YYYY-MM-DD") { value: 1, label: "课程开发" },
{ value: 2, label: "作业人员入模培训" },
} { value: 3, label: "其他" },
handleDate() ])
//课程类型
const OnTheJobStatusList = ref([
{ value: 1, label: "项目开课" },
{ value: 2, label: "路径开课" },
{ value: 3, label: "面授开课" },
])
//认证状态
const AuthenticationStatusList = ref([
{ value: 0, label: "未认证" },
{ value: 1, label: "已认证" },
])
//获取内容分类 //获取内容分类
const getTeacherExpertiseList = ref([ const getTeacherExpertiseList = ref([
// { value: 0, label: "未定级" }, // { value: 0, label: "未定级" },
@@ -446,6 +508,26 @@
} }
}) })
} }
const getLevelList = ref([
// { value: 0, label: "未定级" },
])
const changetlevel = (val) => {
console.log( "讲师体系id" +val);
getLevel( {kid:val}).then((res) => {
if (res.data.code === 200) {
let arr = res.data.data;
let array = [];
arr.map((value) => {
let obj = {
value: value.levelCode,
label: value.levelName,
};
array.push(obj);
});
getLevelList.value = array;
}
})
}
LecturerSystemLista() LecturerSystemLista()
const trainOrglist=ref([]) const trainOrglist=ref([])
//获取培训发生组织 //获取培训发生组织
@@ -456,7 +538,7 @@
let array = []; let array = [];
arr.map((value) => { arr.map((value) => {
let obj = { let obj = {
value: value.trainOrgId, value: value.trainorgId,
label: value.trainOrg, label: value.trainOrg,
}; };
array.push(obj); array.push(obj);
@@ -466,37 +548,6 @@
}) })
} }
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([
{ value: 1, label: "项目开课" },
{ value: 2, label: "路径开课" },
{ value: 3, label: "面授开课" },
])
//认证状态
const AuthenticationStatusList = ref([
{ value: 0, label: "未认证" },
{ value: 1, label: "已认证" },
])
//获取讲师发薪地列表 //获取讲师发薪地列表
const PlaceOfPayList = ref([ const PlaceOfPayList = ref([
// { value: 0, label: "发薪地B1" }, // { value: 0, label: "发薪地B1" },
@@ -542,17 +593,6 @@
state.searchParam.status=null state.searchParam.status=null
} }
} }
//新增页面内部姓名
const infoteacherList = ref([
// { value: 0, systemName: "讲师体系" },
]);
const getinfoteacher = () => {
// state.tableLoading=true
// ()
// .then((res) => {
// infoteacherList.value = res.data.data.records
// })
};
const columns = ref([ const columns = ref([
{ {
title: '讲师姓名 ', title: '讲师姓名 ',
@@ -576,7 +616,7 @@
width: 120, width: 120,
}, },
{ {
title: '培训发生组织(未命名) ', title: '培训发生组织',
dataIndex: 'trainOrg', dataIndex: 'trainOrg',
key: 'trainOrg', key: 'trainOrg',
elipsis: true, align: "center", elipsis: true, align: "center",
@@ -592,9 +632,9 @@
}, },
{ {
title: '讲师体系(未命名) ', title: '讲师体系',
dataIndex: 'teachingDate', dataIndex: 'systemName',
key: 'teachingDate', key: 'systemName',
elipsis: true, align: "center", elipsis: true, align: "center",
width: 120, width: 120,
}, },
@@ -697,12 +737,12 @@
} }
}, },
{ {
title: '讲师组织(未命名) ', title: '讲师组织',
dataIndex: 'certStatus', dataIndex: 'trainOrg',
key: 'certStatus', key: 'trainOrg',
elipsis: true, align: "center", elipsis: true, align: "center",
width: 200, width: 200,
scopedSlots: { customRender: "certStatus" }, scopedSlots: { customRender: "trainOrg" },
}, },
{ {
title: '操作 ', title: '操作 ',
@@ -727,8 +767,10 @@
//重置 //重置
const searchReset = () => { const searchReset = () => {
state.searchParam = { state.searchParam = {
endDate:null,
startDate:null,
teacherNo:null, teacherNo:null,
tsystemName:null, kid:null,
tlevelId:null, tlevelId:null,
courseType:null, courseType:null,
certStatus:null, certStatus:null,
@@ -740,6 +782,17 @@
}; };
getTableDate(); getTableDate();
}; };
//修改时间
const searchTimeChange = (e, date) => {
let startTime = date[0] + " 00:00:00";
let endTime = date[1] + " 23:59:59";
state.startTime = new Date(startTime).getTime();
state.endTime = new Date(endTime).getTime();
// state.searchParam.startDate = new Date(startDate).getTime() ;
// state.searchParam.endDate = new Date(endDate).getTime() ;
state.searchParam.startDate = state.startTime ? state.startTime : null,
state.searchParam.endDate = state.endTime ? state.endTime : null
};
// List接口数据 // List接口数据
const getTableDate = (obj) => { const getTableDate = (obj) => {
state.tableLoading=true state.tableLoading=true
@@ -803,7 +856,7 @@
//修改状态窗口 //修改状态窗口
const handleOperate = (record) => { const handleOperate = (record) => {
state.handleOperate1=null state.handleOperate1=null
state.handleOperate1 = record.status state.handleOperate1 = record.status
state.editTeacher = true state.editTeacher = true
state.kid= record.kid state.kid= record.kid
}; };
@@ -823,61 +876,64 @@
//调用接口 //调用接口
let ids ={ let ids ={
kid : state.kid kid : state.kid
} }
console.log( state.handleOperate1) console.log(state.handleOperate1)
console.log( state.handleOperate1 === 'A10');
if ( state.handleOperate1 === 'A10'){ if ( state.handleOperate1 === 'A10'){
updateStatusSubmit(ids).then((res) => { updateStatusSubmit(ids).then((res) => {
message.success("提交成功"); message.success("提交成功");
state.editTeacher = false
getTableDate(); getTableDate();
console.log(111);
}) })
} }
else if( state.handleOperate1 === 'A20'){ else{
updateStatusWithDraw(ids).then((res) => { approveTeacherFee(ids).then((res) => {
message.success("撤回成功"); message.success("撤回成功");
state.editTeacher = false
getTableDate(); getTableDate();
}) })
} }
// else if(state.handleOperate1 === 'A20'){
// approveTeacherFee(ids).then((res) => {
// message.success("撤回成功");
// getTableDate();
// })
// }
state.editTeacher =false
} }
//取消按钮 清空输入的数据 //取消按钮 清空输入的数据
const cancelTeacherDialog = () => { const cancelTeacherDialog = () => {
if(state.teacherdialog = true )
{
state.teacherdialog = false state.teacherdialog = false
cancel() cancel()
}
state.deleteInTeacherdialog = false
state.editTeacher = false
state.tagsshow= 1
}; };
const canceleditTeacherDialog=()=>{
state.editTeacher =false
}
//清空数据 //清空数据
const cancel = () => { const cancel = () => {
state.formParam ={ state.formParam ={
teacherName:null, teacher:null,
userNo:null, teacherNo:null,
teacherOrg:null, departId:null,
systemName:null, kid:null,
courseName:null, courseName:0,
trainOrg:null, levelId:null,
teachingDate:null, payrollPlaceId:null,
// 费用类型 : null
teacherpayrollPlace:null, teacherpayrollPlace:null,
teachingTime:null, teachingDate:null,
levelName:null, defaultTeachingTime:0,
studentNum:null,
courseAssess:null,
courseType:null, courseType:null,
studys:null,
teacherlevelPay:null, teacherlevelPay:null,
score:null,
trainOrg:null,
payableExpense:null,
expense:null, expense:null,
remark:null, remark:null,
} }
} }
//表格内查看数据操作 //表格内查看数据操作
const handleLook = (record) => { const handleLook = (record) => {
state.teacherdialog = true; state.teachingdialog = true;
state.teacherdialogtitle = '查看详情' state.teacherdialogtitle = '查看详情'
state.kid= record.kid state.kid= record.kid
// alert(record.grade) // alert(record.grade)
@@ -932,22 +988,26 @@
}, },
{ {
title: '备注 ', title: '备注 ',
dataIndex: 'teacherName', dataIndex: 'remark',
key: 'teacherName', key: 'remark',
elipsis: true, align: "center", elipsis: true, align: "center",
width: 150, width: 150,
} , } ,
]) ])
//取消按钮 清空输入的数据
const cancelTeachingDialog = () => {
state.teachingdialog = false
};
const rules = { const rules = {
name: [{ required: true, message: '讲师不能为空' }], teacherName: [{ required: true, message: '讲师不能为空' }],
user: [{ required: true, message: '讲师工号不能为空' }], teacherNo: [{ required: true, message: '讲师工号不能为空' }],
departId: [{ required: true, message: '讲师组织不能为空' }], departId: [{ required: true, message: '讲师组织不能为空' }],
systemId: [{ required: true, message: '讲师体系不能为空' }], systemId: [{ required: true, message: '讲师体系不能为空' }],
levelId: [{ required: true, message: ' 讲师级别 不能为空' }], levelName: [{ required: true, message: ' 讲师级别 不能为空' }],
payrollPlaceId: [{ required: true, message: '讲师发薪地 不能为空' }], payrollPlaceId: [{ required: true, message: '讲师发薪地 不能为空' }],
courseName: [{ required: true, message: '费用类型不能为空' }], courseName: [{ required: true, message: '费用类型不能为空' }],
courseName: [{ required: true, message: '课程名称不能为空' }], courseName: [{ required: true, message: '课程名称不能为空' }],
beginTime: [{ required: true, message: '授课日期不能为空' }], teachingDate: [{ required: true, message: '授课日期不能为空' }],
defaultTeachingTime: [{ required: true, message: ' 授课时长不能为空' }], defaultTeachingTime: [{ required: true, message: ' 授课时长不能为空' }],
studys: [{ required: true, message: ' 参训人数不能为空' }], studys: [{ required: true, message: ' 参训人数不能为空' }],
score: [{ required: true, message: ' 评分不能为空' }], score: [{ required: true, message: ' 评分不能为空' }],
@@ -955,6 +1015,12 @@
expense: [{ required: true, message: '计划费用不能为空' }], expense: [{ required: true, message: '计划费用不能为空' }],
} }
function managerChange(e, l, d, t, orgName) {
console.log(e, l);
state.searchParam.teacherNo = d;
state.searchParam.teacherName = t;
// state.searchParam.trainorgName=orgName
}
//导出功能 //导出功能
const handleExport = ()=>{ const handleExport = ()=>{
window.open ( window.open (
@@ -962,7 +1028,7 @@
state.currentPage1 state.currentPage1
}&pageSize=${state.pageSize1}&teacherNo=${ }&pageSize=${state.pageSize1}&teacherNo=${
state.searchParam.teacherNo ? state.searchParam.teacherNo : "" state.searchParam.teacherNo ? state.searchParam.teacherNo : ""
}&tsystemName=${ state.searchParam.tsystemName ? state.searchParam.tsystemName : ""}&tlevelId=${ }&kid=${ state.searchParam.kid ? state.searchParam.kid : ""}&tlevelId=${
state.searchParam.tlevelId ? state.searchParam.tlevelId : "" state.searchParam.tlevelId ? state.searchParam.tlevelId : ""
}&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 : ""
@@ -974,7 +1040,11 @@
} }
return { return {
...toRefs(state), ...toRefs(state),
rules,handleDate, rules,
cancelTeachingDialog,
managerChange,
courseTypeList,
searchTimeChange,
trainOrglist, trainOrglist,
trainOrglista, trainOrglista,
getTeacherExpertiseList, getTeacherExpertiseList,
@@ -984,7 +1054,6 @@
lecturerSystemList, lecturerSystemList,
getLevelList, getLevelList,
OnTheJobStatusList, OnTheJobStatusList,
getLevelLista,
PlaceOfPayLista, PlaceOfPayLista,
AuthenticationStatusList, AuthenticationStatusList,
PlaceOfPayList, PlaceOfPayList,
@@ -1009,8 +1078,8 @@
// getStu // getStu
LecturerSystemLista, LecturerSystemLista,
TeacherSystem, TeacherSystem,
infoteacherList, changetlevel,
getinfoteacher, canceleditTeacherDialog
} }
}, },
}; };

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

@@ -179,7 +179,7 @@ import dayjs from "dayjs";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import { getPayRollPlace } from "../../api/Lecturer"; 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 { queryTeacherFeeTotalList, queryTeacherFeeMonthly, getTeacherFeeDetailListByTeacherNo, getTeacherFeeListByTeacherNo ,getPreviousTeacherFee} from "../../api/lecturerFeeStatistics";
export default { export default {
name: "LecturerFeeStatistics", name: "LecturerFeeStatistics",
components: { components: {
@@ -320,7 +320,7 @@ export default {
//重新汇总上月数据 //重新汇总上月数据
const searchResetPrevious=()=>{ const searchResetPrevious=()=>{
state.tableLoading = true state.tableLoading = true
getPreviousTeacherfee().then((res)=>{ getPreviousTeacherFee().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
@@ -354,8 +354,8 @@ export default {
let array = []; let array = [];
arr.map((value) => { arr.map((value) => {
let obj = { let obj = {
value: value.payrollPlaceId, value: value.id,
label: value.payrollPlaceName, label: value.name,
}; };
array.push(obj); array.push(obj);
}); });

66
src/views/lecturer/LecturerSystem.vue
View File

@@ -37,8 +37,9 @@
<!-- 翻页 --> <!-- 翻页 -->
<div class="tableBox "> <div class="tableBox ">
<div style="float: right;"> <div style="float: right;">
<a-pagination <a-pagination
v-if="tableDataTotal > 10"
:showSizeChanger="false" :showSizeChanger="false"
:showQuickJumper="true" :showQuickJumper="true"
:hideOnSinglePage="true" :hideOnSinglePage="true"
@@ -86,8 +87,8 @@
</a-row> </a-row>
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师体系编号" name="systemCode"> <a-form-item label="讲师体系编号" name="kid">
<a-input disabled v-model:value="formParam.systemCode" class="draitem" placeholder="" allowClear showSearch> <a-input disabled v-model:value="formParam.kid" class="draitem" placeholder="" allowClear showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
@@ -186,7 +187,7 @@ import {
import dialog from "@/utils/dialog"; import dialog from "@/utils/dialog";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import ProjectManager from "@/components/project/ProjectManagerNew"; import ProjectManager from "@/components/project/ProjectManagerNew";
import { systemList, deleteTrainOrg } from "../../api/organization"; import { systemList,addLecturerSystem ,deleteLecturerSystem,updateSystem} from "../../api/organization";
export default { export default {
name: "LecturerSystem", name: "LecturerSystem",
components: { components: {
@@ -198,6 +199,7 @@ export default {
setup() { setup() {
const router = useRouter(); const router = useRouter();
const state = reactive({ const state = reactive({
tableDataTotal:-1,
tableLoading: false, tableLoading: false,
deleteInTeacherdialog: false, deleteInTeacherdialog: false,
teacherdialog: false, teacherdialog: false,
@@ -207,10 +209,11 @@ export default {
trainorgId: null, trainorgId: null,
userNo: null, userNo: null,
trainorgName: null, trainorgName: null,
pageNo: "1", pageNo: 1,
pageSize: "10" pageSize: 10
}, },
formParam: { formParam: {
kid:null,
systemCode: null, systemCode: null,
systemName: null, systemName: null,
remark: null, remark: null,
@@ -220,15 +223,7 @@ export default {
sort:1, sort:1,
levelPay:null, levelPay:null,
upperLimit:null upperLimit:null
}, }, ]
{
levelName:null,
levelTime:null,
sort:1,
levelPay:null,
upperLimit:null
},
]
} }
}) })
function managerChange(e, l, d, t, orgName) { function managerChange(e, l, d, t, orgName) {
@@ -312,7 +307,7 @@ export default {
//确认删除 //确认删除
const closeDeleteTeacher = () => { const closeDeleteTeacher = () => {
//调用删除接口 //调用删除接口
deleteTrainOrg(state.delTeacherId).then((res) => { deleteLecturerSystem({kid:state.delId}).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
// message.success("删除成功"); // message.success("删除成功");
state.deleteInTeacherdialog = false state.deleteInTeacherdialog = false
@@ -340,8 +335,22 @@ export default {
state.delId = record.kid state.delId = record.kid
TeacherSystem() TeacherSystem()
} }
//查看
const TeacherSystem=(record)=>{
let obj = {
kid : state.delId,
pageNo:1,
pageSize:1
}
systemList(obj).then((res) => {
state.formParam = res.data.data.records[0]
})
.catch((err) => {
});
}
const cancel = () => { const cancel = () => {
state.formParam = { state.formParam = {
kid:null,
systemCode: null, systemCode: null,
systemName: null, systemName: null,
remark: null, remark: null,
@@ -357,20 +366,35 @@ export default {
} }
//保存 //保存
const createTeacherDialog = () => { const createTeacherDialog = () => {
console.log(state.formParam); // let a ={
// kid:11111111,
// systemCode: 888,
// systemName: 'cesceshi',
// remark: 'cesceshi',
// levelList:[{
// levelName:'cesceshi',
// levelTime:'222',
// sort:1,
// levelPay:'56',
// upperLimit:'186'
// }, ]
// }
// console.log(a)
// console.log(state.formParam)
if (state.formParam.kid != undefined) { if (state.formParam.kid != undefined) {
updateInTeacher(state.formParam).then(response => { updateSystem(state.formParam).then(response => {
message.success("修改成功"); message.success("修改成功");
}); });
} }
else { else {
insertTeacher(state.formParam) addLecturerSystem(state.formParam)
.then((res) => { .then((res) => {
message.success("保存成功"); message.success("保存成功");
}).catch((err) => { }).catch((err) => {
console.log(err); console.log(err);
}); });
} }
cancel()
state.teacherdialog = false; state.teacherdialog = false;
getTableDate(); getTableDate();
}; };
@@ -417,7 +441,9 @@ export default {
handleModify, handleModify,
closeDeleteTeacher, closeDeleteTeacher,
changePagination, changePagination,
handleLook handleLook,
createTeacherDialog,
TeacherSystem,
} }
} }
} }

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

@@ -75,7 +75,7 @@ ExternalLecturer
<script lang ="jsx"> <script lang ="jsx">
import { useRouter,useRoute } from "vue-router"; import { useRouter,useRoute } from "vue-router";
import { reactive, toRefs, ref } from "vue" import { reactive, toRefs, ref } from "vue"
import {getTeacherById,getTeacherCourseList } from "../../api/Lecturer"; import {getOuterTeacherById,getTeacherCourseList } from "../../api/Lecturer";
export default{ export default{
name :"LookExternalLecturer", name :"LookExternalLecturer",
components:{ components:{
@@ -105,9 +105,9 @@ export default{
} }
}); });
//内部讲师详情 //外部讲师详情
const TeacherSystem = () => { const TeacherSystem = () => {
getTeacherById(state.id).then((res) => { getOuterTeacherById(state.id).then((res) => {
console.log("内部讲师详情", res.data); console.log("内部讲师详情", res.data);
state.formParam = res.data.data state.formParam = res.data.data
}) })

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

@@ -245,7 +245,7 @@ export default {
let array = []; let array = [];
arr.map((value) => { arr.map((value) => {
let obj = { let obj = {
value: value.trainOrgId, value: value.trainorgId,
label: value.trainOrg, label: value.trainOrg,
}; };
array.push(obj); array.push(obj);
@@ -265,8 +265,8 @@ export default {
let array = []; let array = [];
arr.map((value) => { arr.map((value) => {
let obj = { let obj = {
value: value.payrollPlaceId, value: value.id,
label: value.payrollPlaceName, label: value.name,
}; };
array.push(obj); array.push(obj);
}); });

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

@@ -5,8 +5,8 @@
<a-form layout="inline"> <a-form layout="inline">
<a-form-item class="select"> <a-form-item class="select">
<div style="width: 276px; height: 40px; border-radius: 8px" > <div style="width: 276px; height: 40px; border-radius: 8px" >
<ProjectManager v-model:value="searchParam.userNo" <ProjectManager v-model:value="searchParam.teacherNo"
v-model:name="searchParam.name" v-model:name="searchParam.teacherName"
placeholder="请输入工号/讲师姓名进行检索" placeholder="请输入工号/讲师姓名进行检索"
@onChange="managerChange" mode="multiple"></ProjectManager> @onChange="managerChange" mode="multiple"></ProjectManager>
</div> </div>
@@ -150,8 +150,10 @@ import { reactive, toRefs, ref, watch } from "vue";
import { import {
FolderAddOutlined FolderAddOutlined
} from '@ant-design/icons-vue'; } from '@ant-design/icons-vue';
import { message } from "ant-design-vue";
import ProjectManager from "@/components/project/ProjectManagerNew"; import ProjectManager from "@/components/project/ProjectManagerNew";
import { queryTrainOrg,deleteTrainOrg} from "../../api/organization"; import { queryTrainOrg,deleteTrainOrg,addReviewer,updateTrainOrg} from "../../api/organization";
import AddContent from "../../components/project/AddContent.vue" import AddContent from "../../components/project/AddContent.vue"
export default{ export default{
name:"organization", name:"organization",
@@ -185,8 +187,8 @@ export default{
}) })
function managerChange(e, l, d, t, orgName) { function managerChange(e, l, d, t, orgName) {
console.log(e, l); console.log(e, l);
state.searchParam.trainorgId = d; state.searchParam.teacherNo = d;
state.searchParam.name = t; state.searchParam.teacherName = t;
state.searchParam.trainorgName=orgName state.searchParam.trainorgName=orgName
} }
const columns = ref([ const columns = ref([
@@ -264,7 +266,7 @@ const getTableDate = (obj) => {
//确认删除 //确认删除
const closeDeleteTeacher = () => { const closeDeleteTeacher = () => {
//调用删除接口 //调用删除接口
deleteTrainOrg(state.delTeacherId).then((res) => { deleteTrainOrg({kid:state.delId}).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
// message.success("删除成功"); // message.success("删除成功");
state.deleteInTeacherdialog = false state.deleteInTeacherdialog = false
@@ -292,32 +294,39 @@ const getTableDate = (obj) => {
const handleModify = (record) => { const handleModify = (record) => {
state.teacherdialog = true; state.teacherdialog = true;
state.teacherdialogtitle = '修改归属组织' state.teacherdialogtitle = '修改归属组织'
state.delId= record.kid state.formParam.kid= record.kid
TeacherSystem() TeacherSystem(record)
}
const TeacherSystem =(record)=>{
state.formParam.trainorgId=record.trainorgId
state.formParam.trainorgName=record.trainorgName
state.formParam.remark=record.remark
} }
const cancel=()=>{ const cancel=()=>{
state.formParam={ state.formParam={
trainorgId:null, trainorgId:null,
trainorgName:null, trainorgName:null,
remark:null remark:null ,
kid:null
} }
} }
//保存 //保存
const createTeacherDialog = () => { const createTeacherDialog = () => {
console.log(state.formParam); console.log(state.formParam);
if (state.formParam.kid != undefined) { if (state.formParam.kid != undefined) {
updateInTeacher(state.formParam).then(response => { updateTrainOrg(state.formParam).then(response => {
message.success("修改成功"); message.success("修改成功");
}); });
} }
else { else {
insertTeacher(state.formParam) addReviewer(state.formParam)
.then((res) => { .then((res) => {
message.success("保存成功"); message.success("保存成功");
}).catch((err) => { }).catch((err) => {
console.log(err); console.log(err);
}); });
} }
cancel()
state.teacherdialog = false; state.teacherdialog = false;
getTableDate(); getTableDate();
}; };
@@ -342,7 +351,9 @@ const getTableDate = (obj) => {
addContentData, addContentData,
handleModify, handleModify,
closeDeleteTeacher, closeDeleteTeacher,
changePagination changePagination,
TeacherSystem,
createTeacherDialog,
} }
} }
} }