Merge branch 'master-20250428-shl' into test20250220

This commit is contained in:
joshen
2025-04-29 14:14:12 +08:00

View File

@@ -27,26 +27,31 @@
<div style="margin-top:20px;">
<el-table :data="pageData" border stripe>
<el-table-column
label="课程编号"
label="号"
prop="index"
width="100px">
<template v-slot="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
label="讲师工号"
prop="userNo"
width="100px">
</el-table-column>
<el-table-column
label="讲师姓名"
prop="teacherName"
width="200px">
</el-table-column>
<el-table-column
label="课程名称"
prop="courseName"
width="200px">
</el-table-column>
<el-table-column
label="课程日期"
prop="teachingDate"
width="200px">
</el-table-column>
<el-table-column
label="内容分类"
prop="courseTypeName"
label="培训发生组织"
prop="trainOrgName"
width="200px">
</el-table-column>
<el-table-column label="课程类型" prop="type" width="120px">
@@ -63,20 +68,16 @@
</template>
</el-table-column>
<el-table-column
label="学习总人数"
prop="studys"
width="120px"
></el-table-column>
label="授课/课程日期"
prop="teachingDate"
width="200px">
</el-table-column>
<el-table-column
label="授课时长(分钟)"
prop="teaching"
width="120px"
></el-table-column>
<el-table-column
label="评分"
prop="score"
width="100px"
></el-table-column>
label="内容分类"
prop="courseTypeName"
width="200px">
</el-table-column>
<el-table-column label="开课状态" width="100px" prop="courseStatus">
<template v-slot="scope">
<span>{{
@@ -87,6 +88,35 @@
}}</span>
</template>
</el-table-column>
<el-table-column
label="授课时长(分钟)"
prop="teaching"
width="120px"
></el-table-column>
<el-table-column
label="参训人数"
prop="studys"
width="120px"
></el-table-column>
<el-table-column
label="评分"
prop="score"
width="100px"
></el-table-column>
<el-table-column
label="是否生成讲师费"
prop="createdFee"
width="100px"
>
<template v-slot="scope">
<span>{{
{
"0": "否",
"1": "是",
}[scope.row.createdFee + '']
}}</span>
</template>
</el-table-column>
<el-table-column
label="备注"
width="200px"