@@ -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([])
diff --git a/src/views/lecturer/InsideTeachingDetail.vue b/src/views/lecturer/InsideTeachingDetail.vue
index f41f1180..2e97dcec 100644
--- a/src/views/lecturer/InsideTeachingDetail.vue
+++ b/src/views/lecturer/InsideTeachingDetail.vue
@@ -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" },
},
diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue
index 8ea3431a..dc7bf0f4 100644
--- a/src/views/lecturer/LecturerAPPEdit.vue
+++ b/src/views/lecturer/LecturerAPPEdit.vue
@@ -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,
diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index cfe8949a..aca14ed9 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -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) => {
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 4b0ffa82..5a744c1a 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -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" },
diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue
index aab01cca..630a078c 100644
--- a/src/views/lecturer/LecturerFeeStatistics.vue
+++ b/src/views/lecturer/LecturerFeeStatistics.vue
@@ -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" },
},
diff --git a/src/views/lecturer/LecturerSystem.vue b/src/views/lecturer/LecturerSystem.vue
index dcaaa5d5..381f95f2 100644
--- a/src/views/lecturer/LecturerSystem.vue
+++ b/src/views/lecturer/LecturerSystem.vue
@@ -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" },
diff --git a/src/views/lecturer/LookExternalLecturer.vue b/src/views/lecturer/LookExternalLecturer.vue
index 38b474bf..eedc73f5 100644
--- a/src/views/lecturer/LookExternalLecturer.vue
+++ b/src/views/lecturer/LookExternalLecturer.vue
@@ -35,7 +35,7 @@ ExternalLecturer
-
+
@@ -58,19 +58,7 @@ ExternalLecturer
-
-
-
-
-
-
- {{ record.remark }}
-
- {{ record.remark }}
-
-
-
-
+
@@ -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 (
- {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 + ""] || ""
: "-"}
@@ -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 (
- {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 + ""] || ""
: "-"}
)
@@ -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 (
+
+ {text.record.remark || "-"}
+
+ )
+ },
},
])
//授课记录列表数据
diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue
index 335695a0..53212d27 100644
--- a/src/views/lecturer/LookInsideLecturer.vue
+++ b/src/views/lecturer/LookInsideLecturer.vue
@@ -39,17 +39,18 @@
{{ (formParam.teaching /60 ).toFixed(2)}}小时-
-
{{formParam.payrollPlaceName||'-'}}
+
{{formParam.salaryName||'-'}}
{{formParam.waitStatus=='0'?'在职' :formParam.waitStatus=='1' ?'离职':'-'}}
-
{{formParam.status=='0'?'临时' :formParam.status=='1' ?'启用':formParam.status==1 ?'停用':'-'}}
-
{{formParam.entryType=='0'?'系统生成' :formParam.entryType=='1'?'手动录入':'-'}}
-
-
+ {{formParam.status=='0'?'临时' :formParam.status=='1' ?'启用':formParam.status==2 ?'停用':'-'}}
+ {{formParam.createFrom=='0'?'自动录入' :formParam.createFrom=='1'?'手动录入':'-'}}
+
+
+
+ {{ formParam.orgNames || '-' }}
+
@@ -77,11 +78,10 @@
-
-
-
+ :data-source="teacherrecordstableData" :loading="teacherrecordsLoading" :scroll="{ x: '1000' }" :pagination="false">
+