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

讲师管理bug

Browse Source
This commit is contained in:
zhangsir
2025-01-06 17:12:34 +08:00
parent 2a9fe9cfd7
commit 6a1cddf2a5
7 changed files with 293 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/components/project/LookExternalLecturer.vue
View File

@@ -147,29 +147,29 @@ export default{
// ellipsis: true, align: "center", // ellipsis: true, align: "center",
// width: 120, // width: 120,
// }, // },
{ // {
title: '课程编号', // title: '课程编号',
dataIndex: 'courseId', // dataIndex: 'courseId',
key: 'courseId', // key: 'courseId',
align: "center", // align: "center",
customRender: ({text, index})=>{ // customRender: ({text, index})=>{
return index+1; // return index+1;
}, // },
width: 120, // width: 120,
}, // },
{ {
title: '课程名称', title: '课程名称',
dataIndex: 'courseName', dataIndex: 'courseName',
key: 'courseName', key: 'courseName',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 120, width: 180,
}, },
{ {
title: '课程日期', title: '课程日期',
dataIndex: 'teachingDate', dataIndex: 'teachingDate',
key: 'teachingDate', key: 'teachingDate',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 200, width: 160,
customRender: (value) => { customRender: (value) => {
return ( return (
<div> <div>
@@ -208,7 +208,7 @@ export default{
} }
}, },
{ {
title: '学习总人数', title: '参训人数',
dataIndex: 'studys', dataIndex: 'studys',
key: 'studys', key: 'studys',
ellipsis: true, align: "center", ellipsis: true, align: "center",
@@ -222,7 +222,7 @@ export default{
dataIndex: 'teaching', dataIndex: 'teaching',
key: 'teaching', key: 'teaching',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 120, width: 130,
customRender: ({text})=>{ customRender: ({text})=>{
return text ? text+'分钟' : '-' return text ? text+'分钟' : '-'
} }
@@ -236,7 +236,7 @@ export default{
customRender: (value) => { customRender: (value) => {
return ( return (
<div> <div>
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'} {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(2)+'分' : '-'}
</div> </div>
) )
} }
@@ -265,7 +265,7 @@ export default{
dataIndex: 'remark', dataIndex: 'remark',
key: 'remark', key: 'remark',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 120, width: 200,
customRender: (text)=>{ customRender: (text)=>{
return ( return (
<div> <div>

40
src/components/project/LookInsideLecturer.vue
View File

@@ -22,7 +22,7 @@
<a-descriptions-item label="讲师头像"> <a-descriptions-item label="讲师头像">
<a-image :width="55" style="border-radius: 50%;width:55px;height:55px;" :src=formParam.photo /> <a-image :width="55" style="border-radius: 50%;width:55px;height:55px;" :src=formParam.photo />
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="讲师姓名">{{formParam.name}}/{{formParam.userNo}}</a-descriptions-item> <a-descriptions-item label="讲师姓名">{{formParam.name}} / {{formParam.userNo}}</a-descriptions-item>
<a-descriptions-item label="讲师体系">{{formParam.tsystemName || '-'}}</a-descriptions-item> <a-descriptions-item label="讲师体系">{{formParam.tsystemName || '-'}}</a-descriptions-item>
<!-- 二层 --> <!-- 二层 -->
<a-descriptions-item label="讲师级别">{{formParam.tlevelName||'-'}}</a-descriptions-item> <a-descriptions-item label="讲师级别">{{formParam.tlevelName||'-'}}</a-descriptions-item>
@@ -32,15 +32,15 @@
@click="handleup">查看认证资料</a-button> @click="handleup">查看认证资料</a-button>
</span> </span>
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="授课时长"> <span v-if="formParam.teaching!= null" >{{ (Number(formParam.teaching) /60 ).toFixed(2)}}小时</span><span v-else>-</span> <a-descriptions-item label="授课时长"> <span v-if="formParam.teaching!= null" >{{formParam.teaching}}分钟({{ (Number(formParam.teaching) /60 ).toFixed(2)}}小时)</span><span v-else>-</span>
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="发薪地 ">{{formParam.salaryName||'-'}}</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.waitStatus=='0'?'在职' :formParam.waitStatus=='1' ?'离职':'-'}}</a-descriptions-item>
<a-descriptions-item label="账号状态">{{formParam.status=='0'?'临时' :formParam.status=='1' ?'启用':formParam.status==2 ?'停用':'-'}}</a-descriptions-item> <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 label="录入方式">{{formParam.createFrom=='0'?'自动录入' :formParam.createFrom=='1'?'手动录入':'-'}}</a-descriptions-item>
<a-descriptions-item style="max-width: 400px;" label="所属组织" > <a-descriptions-item style="max-width: 400px;" label="所属组织" >
<span :title="formParam.orgName">{{ formParam.orgNames || '-' }}</span> <span :title="formParam.orgName">{{ formParam.orgName || '-' }}</span>
</a-descriptions-item> </a-descriptions-item>
</a-descriptions> </a-descriptions>
<div style="margin-top: 10px;"></div> <div style="margin-top: 10px;"></div>
@@ -207,31 +207,31 @@ export default{
} }
//授课记录列表 //授课记录列表
const teacherrecordsColumns = ref([ const teacherrecordsColumns = ref([
{ // {
title: '课程编号', // title: '课程编号',
dataIndex: 'courseId', // dataIndex: 'courseId',
key: 'courseId', // key: 'courseId',
align: "center", // align: "center",
customRender: ({text, index})=>{ // customRender: ({text, index})=>{
return index+1; // return index+1;
}, // },
width: 120, // width: 120,
}, // },
{ {
title: '课程名称', title: '课程名称',
dataIndex: 'courseName', dataIndex: 'courseName',
key: 'courseName', key: 'courseName',
ellipsis: true, ellipsis: true,
align: "center", align: "center",
width: 120, width: 180,
}, },
{ {
title: '课程日期', title: '课程日期',
dataIndex: 'teachingDate', dataIndex: 'teachingDate',
key: 'teachingDate', key: 'teachingDate',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 200, width: 160,
customRender: (value) => { customRender: (value) => {
return ( return (
<div> <div>
@@ -271,7 +271,7 @@ export default{
} }
}, },
{ {
title: '学习总人数', title: '参训人数',
dataIndex: 'studys', dataIndex: 'studys',
key: 'studys', key: 'studys',
ellipsis: true, align: "center", ellipsis: true, align: "center",
@@ -285,7 +285,7 @@ export default{
dataIndex: 'teaching', dataIndex: 'teaching',
key: 'teaching', key: 'teaching',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 120, width: 130,
customRender: ({text})=>{ customRender: ({text})=>{
return text ? text+'分钟' : '-' return text ? text+'分钟' : '-'
} }
@@ -299,7 +299,7 @@ export default{
customRender: (value) => { customRender: (value) => {
return ( return (
<div> <div>
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'} {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(2)+'分' : '-'}
</div> </div>
) )
} }
@@ -329,7 +329,7 @@ export default{
key: 'remark ', key: 'remark ',
ellipsis: true, ellipsis: true,
align: "center", align: "center",
width: 120, width: 200,
customRender: (value) => { customRender: (value) => {
return ( return (
<div>{value.record.remark || '-'}</div> <div>{value.record.remark || '-'}</div>

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

@@ -439,25 +439,24 @@ export default {
) )
} }
}, },
// {
// title: '讲师邮箱 ',
// dataIndex: 'email',
// key: 'email',
// ellipsis: true, align: "center",
// width: 200,
// },
{ {
title: '授课时长 ', title: '讲师邮箱 ',
dataIndex: 'email',
key: 'email',
ellipsis: true, align: "center",
width: 200,
customRender: ({text})=>{
return text || '-'
}
},
{
title: '授课时长(分钟)',
dataIndex: 'teaching', dataIndex: 'teaching',
key: 'teaching', key: 'teaching',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 200, width: 200,
customRender: (value, record) => { customRender: ({text})=>{
return ( return text ? text+'分钟' : '-'
<div>
{value.record.teaching}分钟
</div>
)
} }
}, },
{ {

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

@@ -341,7 +341,7 @@
<span style="margin-left: 10px ;" v-if="formParam.teaching != '0'">({{ (formParam.teaching / 60 <span style="margin-left: 10px ;" v-if="formParam.teaching != '0'">({{ (formParam.teaching / 60
).toFixed(2) }}小时)</span> ).toFixed(2) }}小时)</span>
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="评分 ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0)+'分':'-'}}</a-descriptions-item> <a-descriptions-item label="评分 ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(2)+'分':'-'}}</a-descriptions-item>
<a-descriptions-item label="参训人数 ">{{ formParam.studys ? formParam.studys+'人' :'-'}}</a-descriptions-item> <a-descriptions-item label="参训人数 ">{{ formParam.studys ? formParam.studys+'人' :'-'}}</a-descriptions-item>
<a-descriptions-item label="备注 " :span="2">{{ formParam.remark ||'-' }}</a-descriptions-item> <a-descriptions-item label="备注 " :span="2">{{ formParam.remark ||'-' }}</a-descriptions-item>
</a-descriptions> </a-descriptions>
@@ -562,13 +562,20 @@ export default {
customRender: ({text})=> text||'-' customRender: ({text})=> text||'-'
}, },
{ {
title: '手机号码 ', title: '课程名称 ',
dataIndex: 'mobile', dataIndex: 'courseName',
key: 'mobile', key: 'courseName',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 150, width: 200,
customRender: ({text}) => text||'-'
}, },
// {
// title: '手机号码 ',
// dataIndex: 'mobile',
// key: 'mobile',
// ellipsis: true, align: "center",
// width: 150,
// customRender: ({text}) => text||'-'
// },
{ {
title: '课程类型 ', title: '课程类型 ',
dataIndex: 'type', dataIndex: 'type',
@@ -592,33 +599,7 @@ export default {
} }
}, },
{ {
title: '课程名称 ', title: '授课/课程日期 ',
dataIndex: 'courseName',
key: 'courseName',
ellipsis: true, align: "center",
width: 150,
},
{
title: '录入类型',
dataIndex: 'createFrom',
key: 'createFrom',
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
<div>
{value.record.createFrom == "0" || value.record.createFrom == "1"
? {
"0": "系统生成",
"1": "手动录入",
}[value.record.createFrom + ""] || ""
: "-"}
</div>
)
}
},
{
title: '授课时间 ',
dataIndex: 'teachingDate', dataIndex: 'teachingDate',
key: 'teachingDate', key: 'teachingDate',
ellipsis: true, align: "center", ellipsis: true, align: "center",
@@ -670,29 +651,29 @@ export default {
// //${getSysTypeMap(record.sysType3, record.sysTypeId)?'-'+getSysTypeMap//(record.sysType3) : ""} // //${getSysTypeMap(record.sysType3, record.sysTypeId)?'-'+getSysTypeMap//(record.sysType3) : ""}
// // ` // // `
// }, // },
// {
// title: '内容分类',
// dataIndex: 'courseTypeName',
// key: 'courseTypeName',
// ellipsis: true, align: "center",
// width: 120,
// },
{ {
title: '内容分类', title: '授课/课程时长(分钟)',
dataIndex: 'courseTypeName',
key: 'courseTypeName',
ellipsis: true, align: "center",
width: 120,
},
{
title: '授课时长(H) ',
dataIndex: 'teaching', dataIndex: 'teaching',
key: 'teaching', key: 'teaching',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 120, width: 160,
customRender: (value) => { customRender: (value) => {
return ( return (
<div> <div>
{(value.record?.teaching/60).toFixed(2)+'小时' || '-' } {value.record?.teaching ? value.record.teaching + '分钟' : '-'}
</div> </div>
); );
}, },
}, },
{ {
title: '学习总人数', title: '参训人数',
dataIndex: 'studys', dataIndex: 'studys',
key: 'studys', key: 'studys',
ellipsis: true, align: "center", ellipsis: true, align: "center",
@@ -710,12 +691,30 @@ export default {
customRender: (value) => { customRender: (value) => {
return ( return (
<div> <div>
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'} {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(2)+'分' : '-'}
</div>
)
}
},
{
title: '数据来源',
dataIndex: 'createFrom',
key: 'createFrom',
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
<div>
{value.record.createFrom == "0" || value.record.createFrom == "1"
? {
"0": "系统生成",
"1": "手动录入",
}[value.record.createFrom + ""] || ""
: "-"}
</div> </div>
) )
} }
}, },
{ {
title: '操作 ', title: '操作 ',
dataIndex: 'operation', dataIndex: 'operation',

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

@@ -77,12 +77,12 @@
<template #bodyCell="{ record, column }"> <template #bodyCell="{ record, column }">
<template v-if="column.key === 'orgName'"> <template v-if="column.key === 'orgName'">
<a-space style="display:flex ;justify-content: left; "> <a-space style="display:flex ;justify-content: left;">
<!-- <a-popover> <!-- <a-popover>
<template #content> <template #content>
<p>{{ record.orgName}}</p> <p>{{ record.orgName}}</p>
</template> --> </template> -->
<span :title="record.orgName">{{ record.neworganizationName }}</span> <div style="max-width: 180px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" :title="record.orgName">{{ record.neworganizationName }}</div>
<!-- </a-popover> --> <!-- </a-popover> -->
</a-space> </a-space>
</template> </template>
@@ -771,21 +771,28 @@ export default {
} }
} }
const columns = ref([ const columns = ref([
{ // {
title: '讲师工号 ', // title: '讲师工号 ',
dataIndex: 'userNo', // dataIndex: 'userNo',
key: 'userNo', // key: 'userNo',
ellipsis: true, // ellipsis: true,
align: "center", // align: "center",
width: 120, // width: 120,
}, // },
{ {
title: '讲师姓名 ', title: '讲师姓名 ',
dataIndex: 'name', dataIndex: 'name',
key: 'name', key: 'name',
ellipsis: true, ellipsis: true,
align: "center", align: "center",
width: 120, width: 180,
customRender: (value, record) => {
return (
<div>
{value.record.name} / {value.record.userNo}
</div>
)
}
}, },
{ {
title: '所属组织 ', title: '所属组织 ',
@@ -822,7 +829,7 @@ export default {
dataIndex: 'teaching', dataIndex: 'teaching',
key: 'teaching', key: 'teaching',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 120, width: 130,
customRender: ({text})=>{ customRender: ({text})=>{
return text ? text+'分钟' : '-' return text ? text+'分钟' : '-'
} }

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

@@ -432,7 +432,7 @@
).toFixed(2) }}小时)</span> </a-descriptions-item> ).toFixed(2) }}小时)</span> </a-descriptions-item>
<a-descriptions-item label="授课时间">{{ formParam.teachingDate||'-' }}</a-descriptions-item> <a-descriptions-item label="授课时间">{{ formParam.teachingDate||'-' }}</a-descriptions-item>
<a-descriptions-item label="参训人数 ">{{ formParam.studys?formParam.studys+'人':'-' }}</a-descriptions-item> <a-descriptions-item label="参训人数 ">{{ formParam.studys?formParam.studys+'人':'-' }}</a-descriptions-item>
<a-descriptions-item label="评分 ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0)+'分':'-' }}</a-descriptions-item> <a-descriptions-item label="评分 ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(2)+'分':'-' }}</a-descriptions-item>
<!-- <a-descriptions-item label="内容分类">{{ formParam.courseTypeName||'-' }}</a-descriptions-item> --> <!-- <a-descriptions-item label="内容分类">{{ formParam.courseTypeName||'-' }}</a-descriptions-item> -->
<a-descriptions-item label="是否生成讲师费">{{{0:'否',1:'是'}[formParam.createdFee]}}</a-descriptions-item> <a-descriptions-item label="是否生成讲师费">{{{0:'否',1:'是'}[formParam.createdFee]}}</a-descriptions-item>
<a-descriptions-item label="备注 ">{{ formParam.remark||'-' }}</a-descriptions-item> <a-descriptions-item label="备注 ">{{ formParam.remark||'-' }}</a-descriptions-item>
@@ -766,15 +766,22 @@ export default {
dataIndex: 'teacherName', dataIndex: 'teacherName',
key: 'teacherName', key: 'teacherName',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 120, width: 180,
}, customRender: (value, record) => {
{ return (
title: '讲师工号 ', <div>
dataIndex: 'userNo', {value.record.teacherName||'-'} / {value.record.userNo||'-'}
key: 'userNo', </div>
ellipsis: true, align: "center", )
width: 120, }
}, },
// {
// title: '讲师工号 ',
// dataIndex: 'userNo',
// key: 'userNo',
// ellipsis: true, align: "center",
// width: 120,
// },
{ {
title: '课程名称 ', title: '课程名称 ',
dataIndex: 'courseName', dataIndex: 'courseName',
@@ -782,47 +789,7 @@ export default {
ellipsis: true, align: "left", ellipsis: true, align: "left",
width: 200, width: 200,
}, },
{
title: '讲师体系 ',
dataIndex: 'tsystemName',
key: 'tsystemName',
ellipsis: true, align: "left",
width: 200,
},
{
title: '培训发生组织 ',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
ellipsis: true, align: "left",
width: 200,
customRender: (value, record) => {
return (
<div>
{value.record.trainOrgName||'-'}
</div>
)
}
},
{
title: '数据来源',
dataIndex: 'createFrom',
key: 'createFrom',
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
<div>
{value.record.createFrom == "0" || value.record.createFrom == "1"
? {
"0": "系统生成",
"1": "手动录入",
}[value.record.createFrom + ""] || ""
: "-"}
</div>
)
}
},
{ {
title: '课程类型 ', title: '课程类型 ',
dataIndex: 'type', dataIndex: 'type',
@@ -846,11 +813,11 @@ export default {
} }
}, },
{ {
title: '授课时间', title: '授课/课程日期',
dataIndex: 'teachingDate', dataIndex: 'teachingDate',
key: 'teachingDate', key: 'teachingDate',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 200, width: 160,
customRender: (value) => { customRender: (value) => {
return ( return (
<div> <div>
@@ -859,6 +826,14 @@ export default {
); );
}, },
}, },
// {
// title: '讲师体系 ',
// dataIndex: 'tsystemName',
// key: 'tsystemName',
// ellipsis: true, align: "left",
// width: 200,
// },
{ {
title: '开课状态 ', title: '开课状态 ',
dataIndex: 'courseStatus', dataIndex: 'courseStatus',
@@ -886,12 +861,12 @@ export default {
// width: 120, // width: 120,
// }, // },
{ {
title: '授课时长(分钟) ', title: '授课/课程时长(分钟)',
dataIndex: 'teaching', dataIndex: 'teaching',
key: 'teaching', key: 'teaching',
ellipsis: true, align: "center", ellipsis: true, align: "center",
scopedSlots: { customRender: "teaching" }, scopedSlots: { customRender: "teaching" },
width: 140, width: 160,
}, },
{ {
title: '参训人数', title: '参训人数',
@@ -912,7 +887,40 @@ export default {
customRender: (value) => { customRender: (value) => {
return ( return (
<div> <div>
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'} {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(2)+'分' : '-'}
</div>
)
}
},
{
title: '数据来源',
dataIndex: 'createFrom',
key: 'createFrom',
ellipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
<div>
{value.record.createFrom == "0" || value.record.createFrom == "1"
? {
"0": "系统生成",
"1": "手动录入",
}[value.record.createFrom + ""] || ""
: "-"}
</div>
)
}
},
{
title: '培训发生组织 ',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
ellipsis: true, align: "left",
width: 200,
customRender: (value, record) => {
return (
<div>
{value.record.trainOrgName||'-'}
</div> </div>
) )
} }
@@ -1427,7 +1435,7 @@ export default {
//导出功能 //导出功能
const handleExport = () => { const handleExport = () => {
window.open( window.open(
`${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacherRecord?recordType=1&name=${state.searchParam.name || ''}&courseName=${state.searchParam.courseName || ''}&type=${state.searchParam.type || ''}&courseStatus=${state.searchParam.courseStatus || ''}&tSystemId=${state.searchParam.tSystemId || ''}&beginTime=${state.searchParam.beginTime || ''}&endTime=${state.searchParam.endTime || ''}&orgId=${state.searchParam.orgId || ''}&courseTypeId=${state.searchParam.courseTypeId || ''}&score=${state.searchParam.score || ''}&studys=${state.searchParam.studys || ''} `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacherRecord?recordType=1&name=${state.searchParam.name || ''}&courseName=${state.searchParam.courseName || ''}&type=${state.searchParam.type || ''}&courseStatus=${state.searchParam.courseStatus || ''}&createdFee=${state.searchParam.createdFee || ''}&beginTime=${state.searchParam.beginTime || ''}&endTime=${state.searchParam.endTime || ''}&trainOrgId=${state.searchParam.trainOrgId || ''}&score=${state.searchParam.score || ''}&studys=${state.searchParam.studys || ''}
`) `)
console.log(state.searchParam.name, state.searchParam, '参数') console.log(state.searchParam.name, state.searchParam, '参数')
} }

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

@@ -125,16 +125,11 @@
<!-- <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 === 'trainOrg'">
<a-space style="display:flex ;justify-content: space-around; ">
<a-popover>
<template #content>
<p>{{ record.trainOrg }}</p>
</template>
<span>{{ record.trainOrg }}</span>
</a-popover>
</a-space>
</template> </template>
<template #trainOrg="{ record }">
<a-space style="display:flex ;justify-content: space-around;">
<div style="max-width: 180px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" :title="record.orgName">{{ orgSplit(record.orgName) }}</div>
</a-space>
</template> </template>
</a-table> </a-table>
</div> </div>
@@ -514,27 +509,27 @@
</div> </div>
<span class="line"></span> <span class="line"></span>
<span style="font-weight: 600;">讲师费用详情</span> <span style="font-weight: 600;">讲师费用详情</span>
<a-descriptions style="padding-bottom: 35px;margin-top:20px;" bordered :column="2" :contentStyle="{width:'300px',}" :labelStyle="{width:'160px'}"> <a-descriptions style="padding-bottom: 35px;margin-top:20px;" bordered :column="2" :contentStyle="{width:'300px',}" :labelStyle="{width:'166px'}">
<a-descriptions-item label="讲师名称">{{formParam.name}}</a-descriptions-item> <a-descriptions-item label="讲师姓名">{{formParam.name}}</a-descriptions-item>
<!-- <a-descriptions-item label="讲师工号">{{formParam.userNo}}</a-descriptions-item> --> <!-- <a-descriptions-item label="讲师工号">{{formParam.userNo}}</a-descriptions-item> -->
<a-descriptions-item label="讲师组织">{{formParam.orgName}}</a-descriptions-item>
<a-descriptions-item label="讲师体系">{{formParam.tsystemName}}</a-descriptions-item> <a-descriptions-item label="讲师体系">{{formParam.tsystemName}}</a-descriptions-item>
<a-descriptions-item label="讲师级别">{{formParam.tlevelName }}</a-descriptions-item> <a-descriptions-item label="讲师级别">{{formParam.tlevelName }}</a-descriptions-item>
<a-descriptions-item label="讲师组织">{{formParam.orgName}}</a-descriptions-item> <a-descriptions-item label="讲师发薪地">{{formParam?.payrollPlace || '-'}}</a-descriptions-item>
<a-descriptions-item label="发薪地">{{formParam?.payrollPlace || '-'}}</a-descriptions-item> <a-descriptions-item label="课程名称">{{formParam.courseName || '-'}}</a-descriptions-item>
<a-descriptions-item label="费用类型">{{{0:'在线',1:'面授',2:'课程开发',3:'作业员入模培训',4:'其他'}[formParam?.courseType]}}</a-descriptions-item> <a-descriptions-item label="费用类型">{{{0:'在线',1:'面授',2:'课程开发',3:'作业员入模培训',4:'其他'}[formParam?.courseType]}}</a-descriptions-item>
<!-- <a-descriptions-item label="课程类型">{{formParam.courseType==1?'项目开课' :formParam.courseType==2 ?'路径开课':formParam.courseType==3 ?'面授开课':'-'}}</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.trainOrgName || '-'}}</a-descriptions-item> <a-descriptions-item label="培训发生组织">{{formParam.trainOrgName || '-'}}</a-descriptions-item>
<a-descriptions-item label="授课日期 ">{{(formParam.teachingDate) || '-'}}</a-descriptions-item> <a-descriptions-item label="授课/课程开发日期 ">{{(formParam.teachingDate) || '-'}}</a-descriptions-item>
<a-descriptions-item label="授课时长 ">{{formParam.teachingTime || '-'}}分 <span v-if="formParam.teachingTime">({{(formParam.teachingTime/60).toFixed(2)}}小时)</span></a-descriptions-item> <a-descriptions-item label="授课/课程开发时长 ">{{formParam.teachingTime || '-'}}分 <span v-if="formParam.teachingTime">({{(formParam.teachingTime/60).toFixed(2)}}小时)</span></a-descriptions-item>
<a-descriptions-item label="参训人数 ">{{formParam.studys?formParam.studys+'人' : '-'}}</a-descriptions-item> <a-descriptions-item label="参训人数 ">{{formParam.studys?formParam.studys+'人' : '-'}}</a-descriptions-item>
<a-descriptions-item label="评分 ">{{formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0)+'分':'-' }}</a-descriptions-item> <a-descriptions-item label="评分 ">{{formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(2)+'分':'-' }}</a-descriptions-item>
<a-descriptions-item label="基准课酬 ">{{formParam.levelPay||formParam.levelPay==0?formParam.levelPay+'元' : '-'}}</a-descriptions-item> <a-descriptions-item label="基准课酬 ">{{formParam.levelPay||formParam.levelPay==0?formParam.levelPay+'元' : '-'}}</a-descriptions-item>
<a-descriptions-item label="计划费用 ">{{formParam.expense?formParam.expense+'元': '-'}}</a-descriptions-item> <a-descriptions-item label="计划费用 ">{{formParam.expense?formParam.expense+'元': '-'}}</a-descriptions-item>
<!-- <a-descriptions-item label="应发费用 ">{{formParam.payableExpense || '-'}}</a-descriptions-item> --> <!-- <a-descriptions-item label="应发费用 ">{{formParam.payableExpense || '-'}}</a-descriptions-item> -->
<!-- <a-descriptions-item label="费用发放时间">{{formParam.payableExpenseTime || '-'}}</a-descriptions-item> --> <!-- <a-descriptions-item label="费用发放时间">{{formParam.payableExpenseTime || '-'}}</a-descriptions-item> -->
<a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'审核通过', 4:'审核拒绝',5:'待提交'}[formParam?.status]}}</a-descriptions-item> <a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'审核通过', 4:'审核拒绝',5:'待提交'}[formParam?.status]}}</a-descriptions-item>
<a-descriptions-item label="课程类型">{{{"0": "在线课","1": "面授课","2": "课程开发","3": "作业员入模培训","4": "其他",}[formParam.courseType + ""]}}</a-descriptions-item> <!-- <a-descriptions-item label="课程类型">{{{"0": "在线课","1": "面授课","2": "课程开发","3": "作业员入模培训","4": "其他",}[formParam.courseType + ""]}}</a-descriptions-item> -->
<a-descriptions-item label="备注 ">{{formParam.remark || '-'}}</a-descriptions-item> <a-descriptions-item label="备注 ">{{formParam.remark || '-'}}</a-descriptions-item>
</a-descriptions> </a-descriptions>
<div style="margin-bottom: 20px;" v-if="false"> <div style="margin-bottom: 20px;" v-if="false">
@@ -916,15 +911,22 @@ getAllLevelList().then((res) => {
dataIndex: 'name', dataIndex: 'name',
key: 'name', key: 'name',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 120, width: 180,
}, customRender: (value, index) => {
{ return (
title: '讲师工号 ', <div>
dataIndex: 'userNo', {value.record?.name} / {value.record?.userNo}
key: 'userNo', </div>
ellipsis: true, align: "center", );
width: 120, },
}, },
// {
// title: '讲师工号 ',
// dataIndex: 'userNo',
// key: 'userNo',
// ellipsis: true, align: "center",
// width: 120,
// },
{ {
title: '课程名称 ', title: '课程名称 ',
dataIndex: 'courseName', dataIndex: 'courseName',
@@ -940,13 +942,43 @@ getAllLevelList().then((res) => {
ellipsis: true, align: "left", ellipsis: true, align: "left",
width: 200, width: 200,
}, },
{ {
title: '授课时长 ', title: '课程类型 ',
dataIndex: ' courseType',
key: ' courseType',
ellipsis: true,
align: "center",
width: 120,
customRender: (value) => {
return (
<div>
{String(value.record.courseType)
? {
"0": "在线课",
"1": "面授课",
"2": "课程开发",
"3": "作业员入模培训",
"4": "其他",
}[value.record.courseType + ""]
: "-"}
</div>
)
}
},
{
title: '授课/课程开发日期',
dataIndex: 'teachingDate',
key: 'teachingDate',
ellipsis: true, align: "center",
width: 160,
},
{
title: '授课/课程开发时长 ',
dataIndex: 'teachingTime', dataIndex: 'teachingTime',
key: 'teachingTime', key: 'teachingTime',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 120, width: 160,
customRender:(value)=>{ customRender:(value)=>{
return ( return (
<div> <div>
@@ -955,44 +987,6 @@ getAllLevelList().then((res) => {
) )
} }
}, },
{
title: '授课日期',
dataIndex: 'teachingDate',
key: 'teachingDate',
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师体系',
dataIndex: 'tsystemName',
key: 'tsystemName',
ellipsis: true, align: "left",
width: 200,
customRender: ({ text })=>{
return text||'-'
}
},
{
title: '讲师级别 ',
dataIndex: 'tlevelName',
key: 'tlevelName',
ellipsis: true, align: "center",
width: 120,
customRender: ({ text })=>{
return text||'-'
}
},
{
title: '发薪地 ',
dataIndex: 'payrollPlace',
key: 'payrollPlace',
ellipsis: true, align: "center",
width: 120,
customRender: ({ text })=>{
return text||'-'
}
},
{ {
title: '基准课酬 ', title: '基准课酬 ',
dataIndex: 'levelPay', dataIndex: 'levelPay',
@@ -1032,34 +1026,12 @@ getAllLevelList().then((res) => {
customRender: (value) => { customRender: (value) => {
return ( return (
<div> <div>
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'} {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(2)+'分' : '-'}
</div> </div>
) )
} }
}, },
{
title: '课程类型 ',
dataIndex: ' courseType',
key: ' courseType',
ellipsis: true,
align: "center",
width: 120,
customRender: (value) => {
return (
<div>
{String(value.record.courseType)
? {
"0": "在线课",
"1": "面授课",
"2": "课程开发",
"3": "作业员入模培训",
"4": "其他",
}[value.record.courseType + ""]
: "-"}
</div>
)
}
},
{ {
title: '状态 ', title: '状态 ',
dataIndex: 'status', dataIndex: 'status',
@@ -1084,13 +1056,43 @@ getAllLevelList().then((res) => {
) )
} }
}, },
{
title: '发薪地 ',
dataIndex: 'payrollPlace',
key: 'payrollPlace',
ellipsis: true, align: "center",
width: 120,
customRender: ({ text })=>{
return text||'-'
}
},
{
title: '讲师体系',
dataIndex: 'tsystemName',
key: 'tsystemName',
ellipsis: true, align: "left",
width: 200,
customRender: ({ text })=>{
return text||'-'
}
},
{
title: '讲师级别 ',
dataIndex: 'tlevelName',
key: 'tlevelName',
ellipsis: true, align: "center",
width: 120,
customRender: ({ text })=>{
return text||'-'
}
},
{ {
title: '讲师组织', title: '讲师组织',
dataIndex: 'orgName', dataIndex: 'orgName',
key: 'orgName', key: 'orgName',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 200, width: 200,
scopedSlots: { customRender: "trainOrg" }, slots: { customRender: "trainOrg" },
}, },
{ {
title: '操作 ', title: '操作 ',
@@ -1364,6 +1366,12 @@ getAllLevelList().then((res) => {
levelVoList: [] levelVoList: []
} }
} }
const orgSplit = (val) => {
if(val){
const org = val.split('/')
return org[org.length-1]
}
}
//表格内查看数据操作 //表格内查看数据操作
const handleLook = (record) => { const handleLook = (record) => {
state.teachingdialog = true; state.teachingdialog = true;
@@ -1568,15 +1576,22 @@ const column = ref([
dataIndex: 'name', dataIndex: 'name',
key: 'name', key: 'name',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 120, width: 180,
}, customRender: (value, index) => {
{ return (
title: '讲师工号 ', <div>
dataIndex: 'userNo', {value.record?.name} / {value.record?.userNo}
key: 'userNo', </div>
ellipsis: true, align: "center", );
width: 120, },
}, },
// {
// title: '讲师工号 ',
// dataIndex: 'userNo',
// key: 'userNo',
// ellipsis: true, align: "center",
// width: 120,
// },
{ {
title: '课程名称 ', title: '课程名称 ',
dataIndex: 'courseName', dataIndex: 'courseName',
@@ -1847,6 +1862,7 @@ const column = ref([
addTeacher, addTeacher,
cancelTeacherDialog, cancelTeacherDialog,
handleLook, handleLook,
orgSplit,
cancel, cancel,
// deleteModal, // deleteModal,
handleModify, handleModify,