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

讲师管理bug

Browse Source
This commit is contained in:
zhangsir
2024-11-17 17:35:41 +08:00
parent 26a377cb39
commit 35ea32332e
16 changed files with 378 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/project/SearchTeacher.vue
View File

@@ -214,7 +214,8 @@ const searchMember = (keyword) => {
const params = {
pageNo: 1,
pageSize: 50,
name: keyword
name: keyword,
status: 1,
}
!props.lecturer && getTeacherList(params).then(res=>{
console.log(res,'ressss')

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

@@ -35,18 +35,9 @@
</div>
<!-- 表格 -->
<div style="padding: 10px 0">
<a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columns"
:data-source="tableData" :loading="tableLoading" @expand="expandTable" :pagination="false">
<template #bodyCell="{ record, column }">
<template v-if="column.key === 'teaching'">
<a-space style="display:flex ;justify-content: space-around; ">
<!-- <template #content>
<p>{{ record.orgName}}</p>
</template> -->
<span>{{ record.teaching }} 分钟</span>
</a-space>
</template>
<template v-if="column.key === 'operation'">
<a-table :header-cell-style="{ 'text-align': 'center' }" :columns="columns"
:data-source="tableData" :loading="tableLoading" :scroll="{ x: '900' }" :pagination="false">
<template #action="{ record, column }">
<a-space >
<a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
<a-button type="link" v-if="record.isPermission==='true'||record.isSuperPermission==='true'" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
@@ -59,7 +50,6 @@
<!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))"
 v-if="lecturerAdmin('Lecturer-admin')">删除</a-button> -->
</a-space>
</template>
</template>
</a-table>
</div>
@@ -287,7 +277,7 @@ export default {
setup() {
onMounted(() => {
const search = sessionStorage.getItem('searchExter')
if(route.query.activeKey == 2){
if(route.query.activeKey == 2&&search){
state.searchParam = JSON.parse(search)
}
searchSubmit()
@@ -335,8 +325,8 @@ export default {
name: null,//姓名
status: null,//状态
tSystemName: null,
pageNo: "1",
pageSize: "10"
pageNo: 1,
pageSize: 10
},
activeName: 'first'
})
@@ -384,15 +374,15 @@ export default {
title: '讲师姓名 ',
dataIndex: 'name',
key: 'name',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 200,
},
{
title: '手机号码',
dataIndex: 'mobile',
key: 'mobile',
elipsis: true, align: "center",
width: 400,
ellipsis: true, align: "center",
width: 200,
// customRender: (value, record) => {
// return (
// <div>
@@ -405,29 +395,28 @@ export default {
title: '讲师邮箱 ',
dataIndex: 'email',
key: 'email',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 200,
},
{
title: '初始授课时长 ',
title: '授课时长 ',
dataIndex: 'teaching',
key: 'teaching',
elipsis: true, align: "center",
scopedSlots: { customRender: "teaching" },
width: 400,
// customRender: (value, record) => {
// return (
// <div>
// {value.record.orgName}
// </div>
// )
// }
ellipsis: true, align: "center",
width: 200,
customRender: (value, record) => {
return (
<div>
{value.record.teaching}分钟
</div>
)
}
},
{
title: '账号状态 ',
dataIndex: 'status',
key: 'status',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 200,
customRender: (value) => {
return (
@@ -447,9 +436,10 @@ export default {
title: '操作 ',
dataIndex: 'operation',
key: 'operation',
elipsis: true, align: "right",
align: "right",
width: 200,
scopedSlots: { customRender: "action" },
fixed: "right",
slots: { customRender: "action" },
},
])
//列表数据

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

@@ -429,28 +429,28 @@ export default {
// title: '课程编号 ',
// dataIndex: 'userNo',
// key: 'userNo',
// elipsis: true,
// ellipsis: true,
// width: 100,
// },
{
title: '讲师姓名 ',
dataIndex: 'teacherName',
key: 'teacherName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '手机号码 ',
dataIndex: 'mobile',
key: 'mobile',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '课程类型 ',
dataIndex: 'type',
key: 'type',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -469,14 +469,14 @@ export default {
title: '课程名称 ',
dataIndex: 'courseName',
key: 'courseName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '录入类型',
dataIndex: 'createFrom',
key: 'createFrom',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -495,21 +495,21 @@ export default {
title: '授课时间 ',
dataIndex: 'teachingDate',
key: 'teachingDate',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
// {
// title: '开课场地 ',
// dataIndex: 'address',
// key: 'address',
// elipsis: true, align: "center",
// ellipsis: true, align: "center",
// width: 100,
// },
{
title: '开课状态 ',
dataIndex: 'courseStatus',
key: 'courseStatus',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -541,28 +541,28 @@ export default {
title: '内容分类',
dataIndex: 'courseTypeName',
key: 'courseTypeName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '授课时长(H) ',
dataIndex: 'teaching',
key: 'teaching',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '学习总人数',
dataIndex: 'studys',
key: 'studys',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '评分',
dataIndex: 'score',
key: 'score',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
@@ -570,7 +570,7 @@ export default {
title: '操作 ',
dataIndex: 'operation',
key: 'operation',
elipsis: true,
ellipsis: true,
align: "right",
fixed: "right",
width: 400,

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

@@ -206,84 +206,84 @@ export default {
title: '课程编号 ',
dataIndex: 'userNo',
key: 'userNo',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '课程名称 ',
dataIndex: 'tlevelName',
key: 'tlevelName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '授课/课程日期 ',
dataIndex: 'payrollPlaceName',
key: 'payrollPlaceName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '授课/课程开发日期 ',
dataIndex: 'payrollPlaceName',
key: 'payrollPlaceName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '开课场地 ',
dataIndex: 'payrollPlaceName',
key: 'payrollPlaceName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '所属课程 ',
dataIndex: 'payrollPlaceName',
key: 'payrollPlaceName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '所属项目 ',
dataIndex: 'payrollPlaceName',
key: 'payrollPlaceName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '所属路径 ',
dataIndex: 'payrollPlaceName',
key: 'payrollPlaceName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '晶芯科技 ',
dataIndex: 'payrollPlaceName',
key: 'payrollPlaceName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '授课时长(H) ',
dataIndex: 'teaching',
key: 'teaching',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '内容分类',
dataIndex: 'teaching',
key: 'teaching',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '课程类型 ',
dataIndex: 'waitStatus',
key: 'waitStatus',
elipsis: true,
ellipsis: true,
width: 120,
customRender: (value) => {
return (
@@ -302,21 +302,21 @@ export default {
title: '参训学员人数',
dataIndex: 'teaching',
key: 'teaching',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '评分',
dataIndex: 'teaching',
key: 'teaching',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '开课状态 ',
dataIndex: 'certStatus',
key: 'certStatus',
elipsis: true,
ellipsis: true,
width: 120,
customRender: (value) => {
return (
@@ -335,7 +335,7 @@ export default {
title: '操作 ',
dataIndex: 'operation',
key: 'operation',
elipsis: true,
ellipsis: true,
width: 300,
scopedSlots: { customRender: "action" },
},

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

@@ -71,8 +71,8 @@
</div>
<!-- 表格 -->
<div style="padding: 10px 0">
<a-table style="border: 1px solid #f2f6fe" :columns="columns" :data-source="tableData" :loading="tableLoading"
@expand="expandTable" :pagination="false">
<a-table :columns="columns" :scroll="{ x: '1000' }" :data-source="tableData" :loading="tableLoading"
:pagination="false">
<template #bodyCell="{ record, column }">
<template v-if="column.key === 'orgName'">
@@ -710,7 +710,7 @@ export default {
title: '讲师工号 ',
dataIndex: 'userNo',
key: 'userNo',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -718,7 +718,7 @@ export default {
title: '讲师姓名 ',
dataIndex: 'name',
key: 'name',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -726,9 +726,9 @@ export default {
title: '所属组织 ',
dataIndex: 'orgName',
key: 'orgName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
scopedSlots: { customRender: "orgName" },
width: 400,
width: 200,
// customRender: (value, record) => {
// return (
// <div>
@@ -741,14 +741,14 @@ export default {
title: '讲师体系 ',
dataIndex: 'tsystemName',
key: 'tsystemName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '级别 ',
dataIndex: 'tlevelName',
key: 'tlevelName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 100,
},
@@ -756,14 +756,14 @@ export default {
title: '授课时长 ',
dataIndex: 'teaching',
key: 'teaching',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '在职状态 ',
dataIndex: 'waitStatus',
key: 'waitStatus',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -782,7 +782,7 @@ export default {
title: '认证状态 ',
dataIndex: 'certStatus',
key: 'certStatus',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -801,7 +801,7 @@ export default {
title: '账号状态 ',
dataIndex: 'status',
key: 'status',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -821,7 +821,7 @@ export default {
title: '录入方式 ',
dataIndex: 'createFrom',
key: 'createFrom',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -840,9 +840,10 @@ export default {
title: '操作 ',
dataIndex: 'operation',
key: 'operation',
elipsis: true,
ellipsis: true,
width: 200,
align: "right",
fixed: "right",
scopedSlots: { customRender: "action" },
},
])

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

@@ -135,13 +135,13 @@
<template #bodyCell="{ record, column }">
<template v-if="column.key === 'teaching'">
<a-space style="display:flex ;justify-content: space-around; ">
<span>{{ record.teaching }} 分钟</span>
<span>{{ (record?.teaching/60).toFixed(2) || '-' }}</span>
</a-space>
</template>
<template v-if="column.key === 'operation'">
<a-space>
<a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
<a-button type="link" @click="() => handleModify(record, String(record.courseform))" v-if="record.createFrom == 1 && record.courseStatus == 0 ">修改 </a-button>
<a-button type="link" @click="() => handleModify(record, String(record.courseform))" v-if="record.createFrom == 1 && record.courseStatus == 0 ">编辑 </a-button>
<a-button type="link" v-if="record.createFrom == 1" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
<!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
</a-space>
@@ -322,7 +322,7 @@
<a-descriptions-item label="讲师级别">{{ formParam.tlevelName
}}</a-descriptions-item>
<a-descriptions-item label="录入方式">
{{ formParam.createFrom == 0 ? '系统生成' : formParam.createFrom == 1 ? '手动录入' : '' }}</a-descriptions-item>
{{ formParam.createFrom == 0 ? '系统生成' : formParam.createFrom == 1 ? '手动录入' : '-' }}</a-descriptions-item>
<a-descriptions-item label="课程类型">{{ formParam.type == 1 ? '在线课' : formParam.type == 0 ? '面授课' : '' }}</a-descriptions-item>
<a-descriptions-item label="课程名称">{{ formParam.courseName }}</a-descriptions-item>
<a-descriptions-item label="开课状态">{{ formParam.courseStatus == 0? '未开课' : formParam.courseStatus == 1
@@ -626,29 +626,29 @@ export default {
title: '讲师姓名 ',
dataIndex: 'teacherName',
key: 'teacherName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师工号 ',
dataIndex: 'userNo',
key: 'userNo',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师体系 ',
dataIndex: 'tsystemName',
key: 'tsystemName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '所属组织 ',
dataIndex: 'orgName',
key: 'orgName',
elipsis: true, align: "center",
width: 400,
ellipsis: true, align: "center",
width: 200,
// customRender: (value, record) => {
// return (
// <div>
@@ -661,7 +661,7 @@ export default {
title: '数据来源',
dataIndex: 'createFrom',
key: 'createFrom',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -680,14 +680,14 @@ export default {
title: '课程名称 ',
dataIndex: 'courseName',
key: 'courseName ',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '课程类型 ',
dataIndex: 'type',
key: 'type',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -706,14 +706,14 @@ export default {
title: '授课时间',
dataIndex: 'teachingDate',
key: 'teachingDate',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '开课状态 ',
dataIndex: 'courseStatus',
key: 'courseStatus',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -732,36 +732,36 @@ export default {
title: '内容分类',
dataIndex: 'courseTypeName',
key: 'courseTypeName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '授课时长(H) ',
dataIndex: 'teaching',
key: 'teaching',
elipsis: true, align: "center",
ellipsis: true, align: "center",
scopedSlots: { customRender: "teaching" },
width: 400,
width: 120,
},
{
title: '参训人数',
dataIndex: 'studys',
key: 'studys',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '评分',
dataIndex: 'score',
key: 'score',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '是否生成课时费 ',
dataIndex: 'createdFee',
key: 'createdFee',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 150,
customRender: (value) => {
return (
@@ -780,8 +780,8 @@ export default {
title: '操作 ',
dataIndex: 'operation',
key: 'operation',
elipsis: true, align: "right",
width: 400,
ellipsis: true, align: "right",
width: 200,
fixed: "right",
scopedSlots: { customRender: "action" },
},
@@ -1124,27 +1124,27 @@ export default {
title: '基准课酬 ',
dataIndex: 'levelPay',
key: 'levelPay',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
}, {
title: '计划费用 ',
dataIndex: 'expense',
key: 'expense',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '应发费用 ',
dataIndex: 'payableExpense',
key: 'payableExpense',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '状态 ',
dataIndex: 'status',
key: 'status',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -1166,7 +1166,7 @@ export default {
// title: '操作 ',
// dataIndex: 'operation',
// key: 'operation',
// elipsis: true, align: "right",
// ellipsis: true, align: "right",
// width: 400,
// scopedSlots: { customRender: "action" },
// },
@@ -1177,6 +1177,9 @@ export default {
console.log(res)
tableDatas.value = res.data.data.records
state.tableDataTotal = Number(res.data.data.total);
}).catch(err=>{
message.destroy()
message.error(err.data.msg)
})
}
const tableDatas = ref([])

32
src/views/lecturer/InsideTeachingDetail.vue
View File

@@ -214,84 +214,84 @@ export default {
title: '课程编号 ',
dataIndex: 'userNo',
key: 'userNo',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '课程名称 ',
dataIndex: 'tlevelName',
key: 'tlevelName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '授课/课程日期 ',
dataIndex: 'payrollPlaceName',
key: 'payrollPlaceName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '授课/课程开发日期 ',
dataIndex: 'payrollPlaceName',
key: 'payrollPlaceName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '开课场地 ',
dataIndex: 'payrollPlaceName',
key: 'payrollPlaceName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '所属课程 ',
dataIndex: 'payrollPlaceName',
key: 'payrollPlaceName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '所属项目 ',
dataIndex: 'payrollPlaceName',
key: 'payrollPlaceName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '所属路径 ',
dataIndex: 'payrollPlaceName',
key: 'payrollPlaceName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '晶芯科技 ',
dataIndex: 'payrollPlaceName',
key: 'payrollPlaceName',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '授课时长(H) ',
dataIndex: 'teaching',
key: 'teaching',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '内容分类',
dataIndex: 'teaching',
key: 'teaching',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '课程类型 ',
dataIndex: 'waitStatus',
key: 'waitStatus',
elipsis: true,
ellipsis: true,
width: 120,
customRender: (value) => {
return (
@@ -310,21 +310,21 @@ export default {
title: '参训学员人数',
dataIndex: 'teaching',
key: 'teaching',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '评分',
dataIndex: 'teaching',
key: 'teaching',
elipsis: true,
ellipsis: true,
width: 120,
},
{
title: '开课状态 ',
dataIndex: 'certStatus',
key: 'certStatus',
elipsis: true,
ellipsis: true,
width: 120,
customRender: (value) => {
return (
@@ -343,7 +343,7 @@ export default {
title: '操作 ',
dataIndex: 'operation',
key: 'operation',
elipsis: true,
ellipsis: true,
width: 300,
scopedSlots: { customRender: "action" },
},

32
src/views/lecturer/LecturerAPPEdit.vue
View File

@@ -578,7 +578,7 @@ export default {
title: '讲师姓名 ',
dataIndex: 'name',
key: 'name',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -587,14 +587,14 @@ export default {
dataIndex: 'userNo',
key: 'userNo',
align: "center",
elipsis: true,
ellipsis: true,
width: 200,
},
{
title: '所属组织 ',
dataIndex: 'orgName',
key: 'orgName',
elipsis: true,
ellipsis: true,
align: "center",
width: 300,
scopedSlots: { customRender: "teacherOrg" },
@@ -603,7 +603,7 @@ export default {
title: '讲师体系',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -611,7 +611,7 @@ export default {
title: '讲师等级',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -619,7 +619,7 @@ export default {
title: '发薪地',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -627,7 +627,7 @@ export default {
title: '课程类型',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -635,7 +635,7 @@ export default {
title: '课程名称',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -643,7 +643,7 @@ export default {
title: '授课/开发课程日期',
dataIndex: 'teachingSystem',
key: 'teachingSystem',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -651,7 +651,7 @@ export default {
title: '授课/开发课程时长 ',
dataIndex: 'teachingEnter',
key: 'teachingEnter',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -659,7 +659,7 @@ export default {
title: '参训人数 ',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -667,7 +667,7 @@ export default {
title: '评分 ',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -675,7 +675,7 @@ export default {
title: '课程基准 ',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -683,7 +683,7 @@ export default {
title: '计划费用 ',
dataIndex: 'expense',
key: 'expense',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -691,7 +691,7 @@ export default {
title: '应发费用 ',
dataIndex: 'payableExpense',
key: 'payableExpense',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -699,7 +699,7 @@ export default {
title: '操作 ',
dataIndex: 'operation',
key: 'operation',
elipsis: true,
ellipsis: true,
align: "center",
fixed: "right",
width: 200,

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

@@ -417,14 +417,14 @@
title: '培训发生组织 ',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '汇总周期 ',
dataIndex: 'summaryDate',
key: 'summaryDate',
elipsis: true,
ellipsis: true,
align: "center",
width:200
},
@@ -432,7 +432,7 @@
title: '汇总金额 ',
dataIndex: 'summaryTotal',
key: 'summaryTotal',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -440,14 +440,14 @@
title: '提交时间',
dataIndex: 'summaryTime',
key: 'summaryTime',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 200,
},
{
title: '状态 ',
dataIndex: 'status',
key: 'status',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
customCell: (record) => {return{style:{color:['#67C23A','#F56C6C'][record.status]}}},
@@ -474,7 +474,7 @@
title: '操作 ',
dataIndex: 'operation',
key: 'operation',
elipsis: true, align: "right",
ellipsis: true, align: "right",
fixed: "right",
width: 200,
scopedSlots: { customRender: "action" },
@@ -529,7 +529,11 @@
tableData.value = res.data.data.records
state.tableDataTotal = Number(res.data.data.total);
state.tableLoading=false
})
}).catch(err=>{
state.tableLoading=false
message.destroy()
message.error(err.data.msg)
})
};
getTableDate()
// // 翻页
@@ -713,7 +717,7 @@
title: '审批层级 ',
dataIndex: 'name',
key: 'name',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -721,7 +725,7 @@
title: '层级审批人 ',
dataIndex: 'name',
key: 'name',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -729,7 +733,7 @@
title: '操作 ',
dataIndex: 'name',
key: 'name',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -737,7 +741,7 @@
title: '审批人 ',
dataIndex: 'name',
key: 'name',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -745,7 +749,7 @@
title: '审批时间 ',
dataIndex: 'name',
key: 'name',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -753,7 +757,7 @@
title: '审批建议 ',
dataIndex: 'name',
key: 'name',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -764,7 +768,7 @@
title: '讲师姓名 ',
dataIndex: 'name',
key: 'name',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -772,7 +776,7 @@
title: '讲师工号 ',
dataIndex: 'userNo',
key: 'userNo',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -780,7 +784,7 @@
title: '课程名称 ',
dataIndex: 'courseName',
key: 'courseName',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -788,7 +792,7 @@
title: '培训发生组织',
dataIndex: 'trainOrg',
key: 'trainOrg',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -797,7 +801,7 @@
title: '授课时长 ',
dataIndex: 'teachingTime',
key: 'teachingTime',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
@@ -806,7 +810,7 @@
title: '授课时间 ',
dataIndex: 'teachingTime',
key: 'teachingTime',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
@@ -815,7 +819,7 @@
title: '讲师体系',
dataIndex: 'systemName',
key: 'systemName',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -823,7 +827,7 @@
title: '讲师级别 ',
dataIndex: 'levelName',
key: 'levelName',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -831,7 +835,7 @@
title: '发薪地 ',
dataIndex: 'teacherpayrollPlace',
key: 'teacherpayrollPlace',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -839,7 +843,7 @@
title: '基准课酬 ',
dataIndex: 'teacherlevelPay',
key: 'teacherlevelPay',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -847,7 +851,7 @@
title: '计划费用 ',
dataIndex: 'expense',
key: 'expense',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -855,7 +859,7 @@
title: '参训人数 ',
dataIndex: 'studentNum',
key: 'studentNum',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -863,7 +867,7 @@
title: '评分 ',
dataIndex: 'courseAssess',
key: 'courseAssess',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -871,7 +875,7 @@
title: '课程类型 ',
dataIndex: ' courseType',
key: ' courseType',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
customRender: (value) => {

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

@@ -690,28 +690,28 @@ getAllLevelList().then((res) => {
title: '审批人 ',
dataIndex: 'name',
key: 'name',
elipsis: true,
ellipsis: true,
align: "center",
},
{
title: '审批状态 ',
dataIndex: 'name',
key: 'name',
elipsis: true,
ellipsis: true,
align: "center",
},
{
title: '审批时间 ',
dataIndex: 'name',
key: 'name',
elipsis: true,
ellipsis: true,
align: "center",
},
{
title: '备注 ',
dataIndex: 'name',
key: 'name',
elipsis: true,
ellipsis: true,
align: "center",
},
])
@@ -720,21 +720,21 @@ getAllLevelList().then((res) => {
title: '讲师姓名 ',
dataIndex: 'name',
key: 'name',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师工号 ',
dataIndex: 'userNo',
key: 'userNo',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '课程名称 ',
dataIndex: 'courseName',
key: 'courseName',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -742,7 +742,7 @@ getAllLevelList().then((res) => {
title: '培训发生组织',
dataIndex: 'trainOrg',
key: 'trainOrg',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
@@ -750,7 +750,7 @@ getAllLevelList().then((res) => {
title: '授课时长 ',
dataIndex: 'teachingTime',
key: 'teachingTime',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
@@ -758,7 +758,7 @@ getAllLevelList().then((res) => {
title: '授课时间 ',
dataIndex: 'teachingTime',
key: 'teachingTime',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
@@ -766,14 +766,14 @@ getAllLevelList().then((res) => {
title: '讲师体系',
dataIndex: 'systemName',
key: 'systemName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师级别 ',
dataIndex: 'levelName',
key: 'levelName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
// customRender: (value, record) => {
// return (
@@ -794,42 +794,42 @@ getAllLevelList().then((res) => {
title: '发薪地 ',
dataIndex: 'teacherpayrollPlace',
key: 'teacherpayrollPlace',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '基准课酬 ',
dataIndex: 'teacherlevelPay',
key: 'teacherlevelPay',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '计划费用 ',
dataIndex: 'expense',
key: 'expense',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '参训人数 ',
dataIndex: 'studentNum',
key: 'studentNum',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '评分 ',
dataIndex: 'courseAssess',
key: 'courseAssess',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '课程类型 ',
dataIndex: ' courseType',
key: ' courseType',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -849,7 +849,7 @@ getAllLevelList().then((res) => {
title: '状态 ',
dataIndex: 'status',
key: 'status',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -870,7 +870,7 @@ getAllLevelList().then((res) => {
title: '讲师组织',
dataIndex: 'trainOrg',
key: 'trainOrg',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 200,
scopedSlots: { customRender: "trainOrg" },
},
@@ -878,7 +878,7 @@ getAllLevelList().then((res) => {
title: '操作 ',
dataIndex: 'operation',
key: 'operation',
elipsis: true, align: "center",
ellipsis: true, align: "center",
fixed: "right",
width: 160,
scopedSlots: { customRender: "action" },
@@ -1163,21 +1163,21 @@ getAllLevelList().then((res) => {
title: '时间',
dataIndex: 'updatedAt',
key: 'updatedAt',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 150,
} ,
{
title: '操作人 ',
dataIndex: 'updatedBy',
key: 'updatedBy9',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 150,
} ,
{
title: '操作 ',
dataIndex: 'status',
key: 'status',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 150,
customRender: (value) => {
return (
@@ -1196,7 +1196,7 @@ getAllLevelList().then((res) => {
title: '备注 ',
dataIndex: 'remark',
key: 'remark',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 150,
} ,
])
@@ -1289,28 +1289,28 @@ const column = ref([
title: '讲师姓名 ',
dataIndex: 'name',
key: 'name',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师工号 ',
dataIndex: 'userNo',
key: 'userNo',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '课程名称 ',
dataIndex: 'courseName',
key: 'courseName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '培训发生组织',
dataIndex: 'trainOrg',
key: 'trainOrg',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
@@ -1318,7 +1318,7 @@ const column = ref([
title: '授课时长 ',
dataIndex: 'teachingTime',
key: 'teachingTime',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
@@ -1326,7 +1326,7 @@ const column = ref([
title: '授课时间 ',
dataIndex: 'teachingTime',
key: 'teachingTime',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
@@ -1334,14 +1334,14 @@ const column = ref([
title: '讲师体系',
dataIndex: 'systemName',
key: 'systemName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师级别 ',
dataIndex: 'levelName',
key: 'levelName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
// customRender: (value, record) => {
// return (
@@ -1362,42 +1362,42 @@ const column = ref([
title: '发薪地 ',
dataIndex: 'teacherpayrollPlace',
key: 'teacherpayrollPlace',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '基准课酬 ',
dataIndex: 'teacherlevelPay',
key: 'teacherlevelPay',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '计划费用 ',
dataIndex: 'expense',
key: 'expense',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '参训人数 ',
dataIndex: 'studentNum',
key: 'studentNum',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '评分 ',
dataIndex: 'courseAssess',
key: 'courseAssess',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '课程类型 ',
dataIndex: ' courseType',
key: ' courseType',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -1417,7 +1417,7 @@ const column = ref([
title: '状态 ',
dataIndex: 'status',
key: 'status',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -1438,7 +1438,7 @@ const column = ref([
title: '讲师组织',
dataIndex: 'trainOrg',
key: 'trainOrg',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 200,
scopedSlots: { customRender: "trainOrg" },
},
@@ -1446,7 +1446,7 @@ const column = ref([
title: '操作 ',
dataIndex: 'operation',
key: 'operation',
elipsis: true, align: "right",
ellipsis: true, align: "right",
fixed: "right",
width: 100,
scopedSlots: { customRender: "action" },

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

@@ -233,7 +233,7 @@ export default {
title: '编号 ',
dataIndex: 'trainOrgId',
key: 'trainOrgId',
elipsis: true,
ellipsis: true,
align: "center",
width:200,
},
@@ -241,31 +241,31 @@ export default {
title: '资源归属 ',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
elipsis: true,
ellipsis: true,
align: "center",
width: 400,
width: 200,
},
{
title: '汇总周期 ',
dataIndex: 'summaryDate',
key: 'summaryDate',
elipsis: true,
ellipsis: true,
align: "center",
width:300
width:200
},
{
title: '汇总日期 ',
dataIndex: 'summaryDate',
key: 'summaryDate',
elipsis: true,
ellipsis: true,
align: "center",
width: 300,
width: 200,
},
{
title: '汇总金额 ',
dataIndex: 'summaryTotal',
key: 'summaryTotal',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -273,9 +273,10 @@ export default {
title: '操作 ',
dataIndex: 'operation',
key: 'operation',
elipsis: true,
ellipsis: true,
align: "right",
width: 200,
fixed: "right",
width: 120,
scopedSlots: { customRender: "action" },
},
])
@@ -453,70 +454,70 @@ export default {
title: '讲师工号',
dataIndex: 'teacherNo',
key: 'teacherNo',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '讲师姓名 ',
dataIndex: 'teacherName',
key: 'teacherName',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '所属组织 ',
dataIndex: 'teacherOrg',
key: 'teacherOrg',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '讲师发薪地 ',
dataIndex: 'teacherpayrollPlace',
key: 'teacherpayrollPlace',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '授课时长(系统 , H) ',
dataIndex: 'teachingTime',
key: 'teachingTime',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '授课时长统计 ',
dataIndex: 'teachingTime',
key: 'teachingTime',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '课酬基准 ',
dataIndex: 'teacherlevelPay',
key: 'teacherlevelPay',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '计划费用 ',
dataIndex: 'expense',
key: 'expense',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '应发费用 ',
dataIndex: 'payableExpense',
key: 'payableExpense',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '操作 ',
dataIndex: 'operationa',
key: 'operationa',
elipsis: true,
ellipsis: true,
width: 300,
scopedSlots: { customRender: "action" },
},
@@ -553,70 +554,70 @@ export default {
title: '讲师工号',
dataIndex: 'teacherNo',
key: 'teacherNo',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '讲师姓名 ',
dataIndex: 'teacherName',
key: 'teacherName',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '培训发生组织 ',
dataIndex: 'trainOrg',
key: 'trainOrg',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '讲师发薪地 ',
dataIndex: 'teacherpayrollPlace',
key: 'teacherpayrollPlace',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '授课时长统计(系统 , H) ',
dataIndex: 'teachingTime',
key: 'teachingTime',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '授课时长统计(录入 , H) ',
dataIndex: 'inputteachingTime',
key: 'inputteachingTime',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '授课时长统计(导入 , H) ',
dataIndex: 'importteachingTime',
key: 'importteachingTime',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '课酬基准 ',
dataIndex: 'teacherlevelPay',
key: 'teacherlevelPay',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '计划费用 ',
dataIndex: 'expense',
key: 'expense',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '应发费用 ',
dataIndex: 'payableExpense',
key: 'payableExpense',
elipsis: true,
ellipsis: true,
width: 150,
},
])
@@ -635,14 +636,14 @@ export default {
title: '讲师级别',
dataIndex: 'levelName',
key: 'levelName',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '认证状态 ',
dataIndex: 'certStatus',
key: 'certStatus',
elipsis: true,
ellipsis: true,
width: 150,
customRender: (value) => {
return (
@@ -661,7 +662,7 @@ export default {
title: '费用类型 ',
dataIndex: 'courseType',
key: 'courseType',
elipsis: true,
ellipsis: true,
width: 150,
customRender: (value) => {
return (
@@ -683,63 +684,63 @@ export default {
title: '课程名称 ',
dataIndex: 'teachingDate',
key: 'teachingDate',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '授课日期 ',
dataIndex: 'teachingDate',
key: 'teachingDate',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '课程开发日期',
dataIndex: 'courseDevelopTime',
key: 'courseDevelopTime',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '培训发生组织',
dataIndex: 'trainOrg',
key: 'trainOrg',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '参训学员人数',
dataIndex: 'studentNum',
key: 'studentNum',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '授课满意度 ',
dataIndex: 'courseAssess',
key: 'courseAssess',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '授课时长(H) ',
dataIndex: 'teachingTime',
key: 'teachingTime',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '课程开发时长 ',
dataIndex: 'courseDevelopDate',
key: 'courseDevelopDate',
elipsis: true,
ellipsis: true,
width: 150,
},
{
title: '操作 ',
dataIndex: 'operationc',
key: 'operationc',
elipsis: true,
ellipsis: true,
width: 300,
scopedSlots: { customRender: "action" },
},

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

@@ -243,7 +243,7 @@ export default {
title: '讲师体系编号 ',
dataIndex: 'id',
key: 'id',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -251,21 +251,21 @@ export default {
title: '讲师体系名称 ',
dataIndex: 'systemName',
key: 'systemName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 600,
},
{
title: '备注 ',
dataIndex: 'remark',
key: 'remark',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 800,
},
{
title: '操作 ',
dataIndex: 'operation',
key: 'operation',
elipsis: true,
ellipsis: true,
width: 400,
align: "right",
scopedSlots: { customRender: "action" },

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

@@ -35,7 +35,7 @@ ExternalLecturer
<div style="margin-top: 10px;"></div>
<span class="line" ></span>
<!-- 记录 -->
<a-descriptions title="其他信息" bordered :column="4" :contentStyle="rowCenter" :labelStyle="rowCenter" >
<a-descriptions title="其他信息" bordered :column="4" :labelStyle="rowCenter" >
<!-- 一层 -->
<a-descriptions-item label="讲师介绍" :span="4" >
<div v-if="formParam.description !=null&&resp(formParam.description)" style="min-width: 500px;" v-html="formParam.description" ></div>
@@ -58,19 +58,7 @@ ExternalLecturer
<a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="teacherrecordsColumns"
:data-source="teacherrecordstableData" :loading="teacherrecordsLoading" @expand="expandTable" :pagination="false">
<template #bodyCell="{ record, column }" >
<!-- 鼠标悬停提示 -->
<template v-if="column.key === 'remark'">
<a-space style="display:flex ;justify-content: space-around; ">
<a-popover>
<template #content>
<p>{{ record.remark }}</p>
</template>
<span>{{ record.remark }}</span>
</a-popover>
</a-space>
</template>
</template>
</a-table>
<div style="float: right;">
@@ -153,7 +141,7 @@ export default{
// title: '课程编号',
// dataIndex: 'offcourseId',
// key: 'offcourseId',
// elipsis: true, align: "center",
// ellipsis: true, align: "center",
// width: 120,
// },
{
@@ -168,39 +156,39 @@ export default{
},
{
title: '课程名称',
dataIndex: 'name',
key: 'name',
elipsis: true, align: "center",
dataIndex: 'courseName',
key: 'courseName',
ellipsis: true, align: "center",
width: 120,
},
{
title: '课程日期',
dataIndex: 'beginTime',
key: 'beginTime',
elipsis: true, align: "center",
dataIndex: 'teachingDate',
key: 'teachingDate',
ellipsis: true, align: "center",
width: 120,
},
{
title: '内容分类',
dataIndex: 'nrfl',
key: 'nrfl',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '课程类型',
dataIndex: 'type',
key: 'type',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
<div>
{value.record.type == 1 || value.record.type == 2 || value.record.type == 3
{value.record.type == 1 || value.record.type == 2 || value.record.type == 0
? {
"1": "项目开课",
"1": "在线课",
"2": "路径开课",
"3": "面授开课",
"0": "面授课",
}[value.record.type + ""] || ""
: "-"}
</div>
@@ -209,39 +197,39 @@ export default{
},
{
title: '学习总人数',
dataIndex: 'projectMember',
key: 'projectMember',
elipsis: true, align: "center",
dataIndex: 'studys',
key: 'studys',
ellipsis: true, align: "center",
width: 120,
},
{
title: '授课时长(分钟)',
dataIndex: 'duration',
key: 'duration',
elipsis: true, align: "center",
dataIndex: 'teaching',
key: 'teaching',
ellipsis: true, align: "center",
width: 120,
},
{
title: '评分',
dataIndex: 'score',
key: 'score',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '开课状态',
dataIndex: 'status',
key: 'status',
elipsis: true, align: "center",
dataIndex: 'courseStatus',
key: 'courseStatus',
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
<div>
{value.record.status == 0 || value.record.status == 1
{value.record.courseStatus == 0 || value.record.courseStatus == 1
? {
"0": "未开课",
"1": "已开课",
}[value.record.status + ""] || ""
"1": "开课",
}[value.record.courseStatus + ""] || ""
: "-"}
</div>
)
@@ -251,9 +239,15 @@ export default{
title: '备注',
dataIndex: 'remark',
key: 'remark',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
scopedSlots: { customRender: "remark" },
customRender: (text)=>{
return (
<div>
{text.record.remark || "-"}
</div>
)
},
},
])
//授课记录列表数据

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

@@ -39,17 +39,18 @@
</a-descriptions-item>
<a-descriptions-item label="授课时长"> <span v-if="formParam.teaching!= null" >{{ (formParam.teaching /60 ).toFixed(2)}}小时</span><span v-else>-</span>
</a-descriptions-item>
<a-descriptions-item label="发薪地 ">{{formParam.payrollPlaceName||'-'}}</a-descriptions-item>
<a-descriptions-item label="发薪地 ">{{formParam.salaryName||'-'}}</a-descriptions-item>
<!-- 三层 -->
<a-descriptions-item label="在职状态">{{formParam.waitStatus=='0'?'在职' :formParam.waitStatus=='1' ?'离职':'-'}}</a-descriptions-item>
<a-descriptions-item label="账号状态">{{formParam.status=='0'?'临时' :formParam.status=='1' ?'启用':formParam.status==1 ?'停用':'-'}}</a-descriptions-item>
<a-descriptions-item label="创建方式">{{formParam.entryType=='0'?'系统生成' :formParam.entryType=='1'?'手动录入':'-'}}</a-descriptions-item>
<a-descriptions-item label="所属组织" > <a-popover title="所属组织">
<template #content>
<a-descriptions-item label="账号状态">{{formParam.status=='0'?'临时' :formParam.status=='1' ?'启用':formParam.status==2 ?'停用':'-'}}</a-descriptions-item>
<a-descriptions-item label="创建方式">{{formParam.createFrom=='0'?'自动录入' :formParam.createFrom=='1'?'手动录入':'-'}}</a-descriptions-item>
<a-descriptions-item style="max-width: 400px;" label="所属组织" >
<!-- <a-popover title="所属组织"> -->
<!-- <template #content>
{{ formParam.orgName }}
</template>
{{ formParam.neworgName || '-' }}
</a-popover>
</template> -->
<span :title="formParam.orgName">{{ formParam.orgNames || '-' }}</span>
<!-- </a-popover> -->
</a-descriptions-item>
</a-descriptions>
<div style="margin-top: 10px;"></div>
@@ -77,11 +78,10 @@
<div style="margin-top: 1px;"></div>
<a-tabs v-model:activeKey="activeKey">
<a-tab-pane key="1" tab="授课记录">
<a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="teacherrecordsColumns"
<a-table :header-cell-style="{ 'text-align': 'center' }" :columns="teacherrecordsColumns"
:data-source="teacherrecordstableData" :loading="teacherrecordsLoading" @expand="expandTable" :pagination="false">
<template #bodyCell="{ record, column }" >
<!-- 鼠标悬停提示 -->
:data-source="teacherrecordstableData" :loading="teacherrecordsLoading" :scroll="{ x: '1000' }" :pagination="false">
<!-- <template #bodyCell="{ record, column }" >
<template v-if="column.key === 'remark'">
<a-space style="display:flex ;justify-content: space-around; ">
<a-popover>
@@ -92,7 +92,7 @@
</a-popover>
</a-space>
</template>
</template>
</template> -->
</a-table>
<div style="float: right;">
<a-pagination
@@ -136,7 +136,7 @@
</template>
<script lang ="jsx">
import { useRouter,useRoute } from "vue-router";
import { reactive, toRefs, ref, computed } from "vue"
import { reactive, toRefs, ref, computed,watch } from "vue"
import { useStore } from "vuex";
import {getTeacherById ,getTeacherLogList} from "../../api/Lecturer";
import { getNewInTeacherCourseList } from "../../api/Teaching";
@@ -171,6 +171,13 @@ export default{
pageSize: "10",
}
});
watch(() => state.formParam.orgName, (val) => {
if(val){
const parts = val.split('/');
const reversedParts = parts.reverse();
state.formParam.orgNames = reversedParts.join('/');
}
})
//内部讲师详情
const TeacherSystem = () => {
@@ -182,7 +189,7 @@ export default{
state.teacherrepromo.userId=res.data.data.id
console.log(state.teacherrepromo.id);
getteacherrecordstableData()
promotionrecordstableData.value = res.data.data.records.levelLogList
promotionrecordstableData.value = res.data.data.levelLogList
// getpromotionrecordstableData()
})
.catch((err) => {
@@ -214,14 +221,15 @@ export default{
title: '课程名称',
dataIndex: 'courseName',
key: 'courseName',
elipsis: true, align: "center",
ellipsis: true,
align: "center",
width: 120,
},
{
title: '课程日期',
dataIndex: 'beginTime',
key: 'beginTime',
elipsis: true, align: "center",
dataIndex: 'teachingDate',
key: 'teachingDate',
ellipsis: true, align: "center",
width: 120,
},
{
@@ -241,16 +249,16 @@ export default{
title: '课程类型',
dataIndex: 'type',
key: 'type',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
<div>
{value.record.type == 1 || value.record.type == 2 || value.record.type == 3
{value.record.type == 1 || value.record.type == 2 || value.record.type == 0
? {
"1": "项目开课",
"2": "路径开课",
"3": "面授开课",
"1": "在线课",
"0": "面授课",
"2": "其他",
}[value.record.type + ""] || ""
: "-"}
</div>
@@ -259,30 +267,30 @@ export default{
},
{
title: '学习总人数',
dataIndex: 'studentNum',
key: 'studentNum',
elipsis: true, align: "center",
dataIndex: 'studys',
key: 'studys',
ellipsis: true, align: "center",
width: 120,
},
{
title: '授课时长(分钟)',
dataIndex: 'teaching',
key: 'teaching',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '评分',
dataIndex: 'score',
key: 'score',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '开课状态',
dataIndex: 'status ',
key: 'status ',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -290,7 +298,7 @@ export default{
{value.record.status == 0 || value.record.status == 1
? {
"0": "未开课",
"1": "已开课",
"1": "开课",
}[value.record.status + ""] || ""
: "-"}
</div>
@@ -301,9 +309,15 @@ export default{
title: '备注',
dataIndex: 'remark ',
key: 'remark ',
elipsis: true, align: "center",
ellipsis: true,
align: "center",
width: 120,
scopedSlots: { customRender: "remark" },
// scopedSlots: { customRender: "remark" },
customRender: (value) => {
return (
<div>{value.record.remark || '-'}</div>
)
}
},
])
//授课记录列表数据
@@ -338,30 +352,30 @@ export default{
const promotionrecordsColumns = ref([
{
title: '变更时间',
dataIndex: 'operatorTime',
key: 'operatorTime',
elipsis: true, align: "center",
dataIndex: 'updateTime',
key: 'updateTime',
ellipsis: true, align: "center",
width: 120,
},
{
title: '变更方式',
dataIndex: 'operatorType',
key: 'operatorType',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '变更结果',
dataIndex: 'levelName',
key: 'levelName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '操作人',
dataIndex: 'operatorId',
key: 'operatorId',
elipsis: true, align: "center",
dataIndex: 'updateName',
key: 'updateName',
ellipsis: true, align: "center",
width: 120,
},
])

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

@@ -105,42 +105,42 @@ export default{
title: '等级名称',
dataIndex: 'levelName',
key: 'levelName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '等级课时',
dataIndex: 'levelTime',
key: 'levelTime',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '排序',
dataIndex: 'sort',
key: 'sort',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '等级课酬',
dataIndex: 'levelPay',
key: 'levelPay',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '上线课时',
dataIndex: 'upperLimit',
key: 'upperLimit',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师数量',
dataIndex: 'teacherCount',
key: 'teacherCount',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
])

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

@@ -12,7 +12,7 @@
</router-link>
</a-layout-header>
<a-divider style="height: 1px; background-color: #b7b8b7 ;margin: 0;" />
<div class="filter" style="min-width: 1380px;">
<div class="filter">
<a-form layout="inline" >
<a-form-item class="select">
<a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
@@ -61,7 +61,7 @@
<!-- 表格 -->
<div style="padding: 10px 0">
<a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columns"
:data-source="tableData" :loading="tableLoading" @expand="expandTable" :pagination="false">
:data-source="tableData" :loading="tableLoading" :scroll="{ x: 600}" :pagination="false">
<template #bodyCell="{ record, column }">
<template v-if="column.key === 'operation'">
<a-space >
@@ -209,7 +209,7 @@ export default {
title: '讲师名称',
dataIndex: 'name',
key: 'name',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -218,23 +218,23 @@ export default {
dataIndex: 'userNo',
key: 'userNo',
align: "center",
elipsis: true,
ellipsis: true,
width: 200,
},
{
title: '所属组织 ',
dataIndex: 'orgName',
key: 'orgName',
elipsis: true,
ellipsis: true,
align: "center",
width: 300,
width: 200,
scopedSlots: { customRender: "teacherOrg" },
},
{
title: '发薪地',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -242,7 +242,7 @@ export default {
title: '授课时长(系统 ) ',
dataIndex: 'teachingSystem',
key: 'teachingSystem',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -250,7 +250,7 @@ export default {
title: '授课时长(录入) ',
dataIndex: 'teachingEnter',
key: 'teachingEnter',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -258,7 +258,7 @@ export default {
title: '开发课程时长 ',
dataIndex: 'expense',
key: 'expense',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -266,7 +266,7 @@ export default {
title: '计划费用 ',
dataIndex: 'expense',
key: 'expense',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -274,7 +274,7 @@ export default {
title: '应发费用 ',
dataIndex: 'payableExpense',
key: 'payableExpense',
elipsis: true,
ellipsis: true,
align: "center",
width: 200,
},
@@ -282,9 +282,10 @@ export default {
title: '操作 ',
dataIndex: 'operation',
key: 'operation',
elipsis: true,
ellipsis: true,
align: "right",
width: 400,
fixed: "right",
width: 120,
scopedSlots: { customRender: "action" },
},
])
@@ -433,7 +434,7 @@ export default {
title: '讲师姓名 ',
dataIndex: 'name',
key: 'name',
elipsis: true,
ellipsis: true,
align: "center",
width: 100,
},
@@ -442,21 +443,21 @@ export default {
dataIndex: 'userNo',
key: 'userNo',
align: "center",
elipsis: true,
ellipsis: true,
width: 100,
},
{
title: '课程名称 ',
dataIndex: 'courseName',
key: 'courseName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '课程类型 ',
dataIndex: ' courseType',
key: ' courseType',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
@@ -476,7 +477,7 @@ export default {
title: '授课时长 ',
dataIndex: 'teachingTime',
key: 'teachingTime',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
@@ -484,7 +485,7 @@ export default {
title: '授课时间',
dataIndex: 'teachingDate',
key: 'teachingDate',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
scopedSlots: { customRender: "teacherOrg" },
@@ -493,21 +494,21 @@ export default {
title: '讲师体系',
dataIndex: 'systemName',
key: 'systemName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师级别 ',
dataIndex: 'levelName',
key: 'levelName',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师发薪地 ',
dataIndex: 'teacherpayrollPlace',
key: 'teacherpayrollPlace',
elipsis: true,
ellipsis: true,
align: "center",
width: 120,
},
@@ -516,14 +517,14 @@ export default {
title: '基准课酬 ',
dataIndex: 'teacherlevelPay',
key: 'teacherlevelPay',
elipsis: true, align: "center",
ellipsis: true, align: "center",
width: 100,
},
{
title: '计划费用 ',
dataIndex: 'expense',
key: 'expense',
elipsis: true,
ellipsis: true,
align: "center",
width: 100,
},
@@ -531,7 +532,7 @@ export default {
title: '应发费用 ',
dataIndex: 'payableExpense',
key: 'payableExpense',
elipsis: true,
ellipsis: true,
align: "center",
width: 100,
},
@@ -595,9 +596,9 @@ export default {
margin-left: 38px;
margin-right: 38px;
margin-top: 30px;
display: flex;
justify-content: space-between;
flex-wrap: wrap;
// display: flex;
// justify-content: space-between;
// flex-wrap: wrap;
.select {
margin-right: 20px;
margin-bottom: 20px;