授课记录调整

This commit is contained in:
wangxuemei
2024-10-26 18:46:31 +08:00
parent b7842e24da
commit 1cc6a79e58
5 changed files with 40 additions and 28 deletions

View File

@@ -3,7 +3,7 @@ import {getCookieForName} from "@/api/method";
//列表查询授课记录
export const getNewInTeacherCourseList = (obj) => http.get('/admin/teacherRecord/list', {params: obj})
//新增授课记录
export const insertInTeacherCourse = (obj) => http.post('/admin/teacherRecord/addTeacher', obj)
export const insertInTeacherCourse = (obj) => http.post('/admin/teacherRecord/addTeacherRecord', obj)
//删除讲师授课记录
export const deleteInTeacherCourse= (obj) => http.post(`/admin/teacherRecord/delById?id=${obj}`)
//修改讲师授课记录

View File

@@ -23,7 +23,10 @@ export const withdrawRecord= (obj) => http.post('/admin/expenseBill/withdrawReco
export const confirm= (obj) => http.post('/admin/teacherExpense/confirm',obj)
//获取培训发生组织列表
export const getTrainOrg= (obj) => http.get('/admin/affiliation/list',{params: obj})
// 根据发生组织查询汇总的讲师费数据(一键确认弹框使用)
export const getListByIds= (obj) => http.get('/admin/teacherExpense/getListByIds',{params: obj})
//根据发生组织查询汇总的数据(一键确认弹框使用)
export const getListByAffiliation= (obj) => http.get('/admin/teacherExpense/getListByAffiliation',{params: obj})
//获取讲师级别

View File

@@ -410,7 +410,7 @@ export default {
dataIndex: 'operation',
key: 'operation',
elipsis: true, align: "right",
width: 400,
width: 200,
scopedSlots: { customRender: "action" },
},
])

View File

@@ -123,14 +123,17 @@
<a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true"
dropdown-style="drawaer" width="60%" :title="teacherdialogtitle">
<a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef">
<!--讲师名称 teacher 内容分类 coursetypeid -->
<!--讲师名称 teachername 内容分类 coursetypeid -->
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="讲师名称" name="teacher">
<ProjectManagerOutTeacher v-model:value="formParam.name"
v-model:name="formParam.teacher"
<!-- <ProjectManagerOutTeacher v-model:value="formParam.name"
v-model:name="formParam.teachername"
placeholder="请输入工号/讲师姓名进行检索"
@onChange="managerChange"></ProjectManagerOutTeacher> </a-form-item>
@onChange="managerChange"></ProjectManagerOutTeacher> -->
<a-form-item label="讲师名称" name="teacherName">
<a-input v-model:name="formParam.teacherName" allowClear
showSearch class="draitem" placeholder="请输入讲师姓名"></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="内容分类" name="courseTypeId">
@@ -234,7 +237,7 @@
<a-drawer v-model:visible="teachingdialog" placement="right" @closa="cancelTeachingDialog" :maskClosable="true"
width="60%" title="查看讲师授课记录">
<a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
<a-descriptions-item label="讲师名称">{{ formParam.teacher }}</a-descriptions-item>
<a-descriptions-item label="讲师名称">{{ formParam.teachername }}</a-descriptions-item>
<a-descriptions-item label="手机号码">{{ formParam.mobile }}</a-descriptions-item>
<a-descriptions-item label="课程类型">{{ formParam.type == 1 ? '项目开课' : formParam.type == 2 ? '路径开课' : formParam.type == 3
? '面授开课' : '' }}</a-descriptions-item>
@@ -362,7 +365,7 @@ export default {
recordType:2,
pageNo: 1,
pageSize: 10,
teacher: null,
teachername: null,
name: null,
address: null,
status: null,
@@ -731,7 +734,7 @@ export default {
state.formParam = {
status: 1,
recordType:2,
teacher: null,
teachername: null,
mobile: null,
name: null,
type: null,

View File

@@ -153,7 +153,7 @@
<a-col :span="12">
<a-form-item label="讲师名称" name="name">
<SearchTeacher v-model:value="formParam.name" v-model:lable="formParam.orgName"
v-model:system="tSystemNames" v-model:level="formParam.tLevelId"></SearchTeacher>
v-model:system="tSystemNames" v-model:level="formParam.tlevelId"></SearchTeacher>
</a-form-item>
</a-col>
<a-col :span="12">
@@ -170,18 +170,18 @@
</a-form-item>
</a-col>
</a-row>
<!-- 讲师体系 tSystemName 级别 levelId -->
<!-- 讲师体系 tsystemName 级别 tlevelId -->
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="讲师体系" name="tSystemName">
<a-form-item label="讲师体系" name="tsystemName">
<a-input disabled v-model:value="tSystemNames.systemName" class="draitem"
placeholder="自动带出讲师的体系" allowClear showSearch>
</a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="讲师级别" name="tLevelId">
<a-select class="draitem" v-model:value="formParam.tLevelId" placeholder="请选择讲师级别" allowClear
<a-form-item label="讲师级别" name="tlevelId">
<a-select class="draitem" v-model:value="formParam.tlevelId" placeholder="请选择讲师级别" allowClear
:options="tSystemNames.levelVoList" @change="handleformlevel">
</a-select>
</a-form-item>
@@ -375,7 +375,7 @@
</div>
</template>
<script lang="jsx">
import { reactive, toRefs, ref,computed } from "vue";
import { reactive, toRefs, ref,computed ,watch} from "vue";
import moment, { Moment } from 'moment';
import { useRouter } from "vue-router";
import {
@@ -438,7 +438,7 @@ export default {
pageSize: 10,
tableDataTotal: -1,//table列表总条数
searchdate: undefined, //选择时间
teachingDate: undefined, //选择时间
teachingDate: null, //选择时间
beginTime: null, //开始时间
endTime: null, //结束时间
tSystemNames:{
@@ -449,12 +449,17 @@ export default {
courseStatus: 1,
createFrom: 1,
duration: null,
name:null,
teacherName: null
},
startTime:null,
searchParam:
{ "recordType": 1, "pageNo": 1, "pageSize": 10, "managerId": null, "name": null, "createFrom": null, "courseStatus": null, "orgId": null, "tSystemId": null, "endTime": null, "beginTime":null, "studysranges": [], "score": null }
})
// watch(()=>state.formParam.name,(val)=>{
// state.formParam.teacherName = val?.split('/')[1]
// }
// )
//获取所属组织
const getOrganizationList = ref([
// { value: 0, systemName: "讲师体系" },
@@ -579,8 +584,8 @@ export default {
{
title: '讲师姓名 ',
dataIndex: 'name',
key: 'name',
dataIndex: 'teacherName',
key: 'teacherName',
elipsis: true, align: "center",
width: 120,
},
@@ -857,9 +862,10 @@ export default {
}
//保存
const createTeacherDialog = async () => {
state.formParam.tSystemName = state.tSystemNames.systemName
state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD").toString() : ""
state.formParam.teacherName = state.formParam.name?.split('/')[0]
state.formParam.userNo =state.formParam.name?.split('/')[1]
state.formParam.tsystemName = state.tSystemNames.systemName
state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD").toString() : " "
const formItemNames = Object.keys(rules);
for(let i=0;i<formItemNames.length;i++){
const result = await validateField(formItemNames[i]);
@@ -931,7 +937,7 @@ export default {
courseStatus:1,
teacher: null,
orgName: null,
tSystemName: null,
tsystemName: null,
levelId: null,
courseName: null,
duration:null,
@@ -987,7 +993,7 @@ export default {
// name: record.name,
// userNo: record.userNo,
// orgName: record.orgName,
// tSystemName: record.tSystemName,
// tsystemName: record.tsystemName,
// levelId: record.levelId,
// type: record.type,
// courseName: record.courseName,
@@ -1007,7 +1013,7 @@ export default {
const TeacherSystem1 = (record) => {
getTeacherCourseList({id:record.id}).then((res) => {
state.formParam = res.data.data
state.tSystemNames.systemName = res.data.data.tSystemName
state.tSystemNames.systemName = res.data.data.tsystemName
state.tSystemNames.systemCode = res.data.data.systemCode
state.tSystemNames.systemId = res.data.data.systemId
state.tSystemNames.levelVoList = res.data.data.levelVoList
@@ -1100,7 +1106,7 @@ export default {
name: [{ required: true, message:'',log: '讲师不能为空' }],
orgName: [{ required: true, message: '',log:'讲师组织不能为空' }],
levelId: [{ required: true, message: '',log:'讲师级别不能为空' }],
tSystemName: [{ required: true, message: '',log:'讲师体系不能为空' }],
tsystemName: [{ required: true, message: '',log:'讲师体系不能为空' }],
courseTypeId: [{ required: true, message: '',log:'内容分类不能为空' }],
courseName: [{ required: true, message: '',log:'课程名称不能为空' }],
teachingDate: [{ required: true, message: '',log:'授课/课程日期不能为空' }],