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

Merge branch '121-teacher-manage' into master_1202

Browse Source 
# Conflicts:
#	src/api/Lecturer.js
#	src/views/lecturer/MonthlyStatistics.vue
This commit is contained in:
joshen
2025-01-08 18:34:24 +08:00
parent 557c337777 0e1bb584b0
commit 57dc292fbd
20 changed files with 579 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/Lecturer.js
View File

@@ -54,9 +54,9 @@ export const getSystemInfoByUserId = (id) => http.get(`/admin/system/getSystemIn
//讲师搜索
export const getUserList = (keyword) => http.get(`/admin/thirdApi/user/list?pageNo=${1}&pageSize=${30}&keyword=${keyword}`)
//查询弹框选择的组织信息
export const getSelectOrg = (id) => http.get(`/admin/affiliation/getSelectOrg?id=${id}`)
export const getSelectOrg = (id,isParent) => http.get(`/admin/affiliation/getSelectOrg?id=${id}&isParent=${isParent}`)
//查询弹框不可选择组织（审核中的组织）
export const getUnSelectOrg = () => http.get(`/admin/affiliation/getUnSelectOrg`)
export const getUnSelectOrg = (isParent) => http.get(`/admin/affiliation/getUnSelectOrg?isParent=${isParent}`)
//获取培训发生组织编号
export const getAffiliationCode = () => http.get('/admin/affiliation/getAffiliationCode')
//查看或编辑回显培训发生组织
@@ -79,6 +79,8 @@ export const affiliatIsConfirm = (id) => http.post(`/admin/affiliation/isConfirm
export const expenseSummaryById = (obj) => http.get( `/admin/expenseSummary/queryById?id=${obj.id}&name=${obj.name}&trainOrgId=${obj.trainOrgId||''}&pageNo=${obj.pageNo}&pageSize=${obj.pageSize}`)
//撤回讲师费统计详情
export const removeBySummaryId = (obj) => http.post(`/admin/expenseSummary/removeBySummaryId?summaryId=${obj.summaryId}`,obj)
//撤回讲师费统计详情二级页面
export const removeBySummaryDetailId = (obj) => http.post(`/admin/expenseSummary/removeBySummaryDetailId?detailId=${obj.detailId}`,obj)
//查看月度讲师费详情
export const queryDetailId = (obj) => http.get(`/admin/expenseSummary/queryDetailId?summaryId=${obj.summaryId}&name=${obj.name}&startTime=${obj.startTime}&endTime=${obj.endTime}`)
//查询未汇总的数据（批量确认弹框）

BIN
src/assets/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
src/assets/iconnot.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

1
src/components/project/AddApprover.vue
View File

@@ -240,6 +240,7 @@ function onLoadData(treeNode) {
}
const openDrawer = () => {
visiable.value = true;
props.arrayList.map(item=>item.id=item.userId)
stuSelectRows.value = props.arrayList
stuSelectRowKeys.value = props.arrayList.map(item=>item.userId)
};

26
src/components/project/AddOrgContent.vue
View File

@@ -77,6 +77,14 @@ import * as lecturerApi from "@/api/Lecturer.js";
AddContentList:{
type:Array,
default: ()=>[],
},
AddContentLists:{
type:Array,
default: ()=>[],
},
isParent:{
type:String,
default: '',
}
})
const emit = defineEmits({})
@@ -109,17 +117,18 @@ import * as lecturerApi from "@/api/Lecturer.js";
expandedKeys.value = []
selectedKeys.value = []
checkedKeys.value = []
orgLists.value = []
}else{
console.log(props.AddContentList,'xixiixix')
getNot()
console.log(props?.AddContentList,'props?.AddContentList')
treeAddData.value = props?.AddContentList
orgLists.value = props?.AddContentList
orgLists.value = props?.AddContentLists
checkedKeys.value = props?.AddContentList?.map(item=>item.orgId)
}
});
const notLists = ref([])
const getNot = () => {
lecturerApi.getUnSelectOrg().then(res=>{
lecturerApi.getUnSelectOrg(props.isParent).then(res=>{
if(res.data.code == 200){
notLists.value = res.data.data
}
@@ -130,7 +139,7 @@ import * as lecturerApi from "@/api/Lecturer.js";
if(i.orgId == item.id){
item.disabled = true
item.name = item.name + '(' + i.affiliationName + ')'
return true
// return true
}
})
return item
@@ -144,8 +153,11 @@ import * as lecturerApi from "@/api/Lecturer.js";
const onCheck = async (checkedKey, {checked: bool, checkedNodes, node, event}) => {
// "965356037047586816"
let length = treeAddData.value.length
if(checkedNodes.length > length){
await lecturerApi.getSelectOrg(node.id).then(res=>{
const checkedNodeIds = checkedNodes.map(item => item.id);
const treeAddDataOrgIds = treeAddData.value.map(item => item.orgId);
const combinedUniqueIds = [...new Set([...checkedNodeIds, ...treeAddDataOrgIds])];
if(combinedUniqueIds.length > length){
await lecturerApi.getSelectOrg(node.id,props.isParent).then(res=>{
const targetNode = checkedNodes.find(item=>item.id == res?.data?.data[0]?.orgId)
if(targetNode){
orgLists.value.push(Object.assign(targetNode,res?.data?.data[0]));
@@ -182,7 +194,7 @@ import * as lecturerApi from "@/api/Lecturer.js";
const isDuplicate = seen.has(item.orgId);
seen.add(item.orgId);
return !isDuplicate;
});
})
treeAddData.value = uniqueEndLists?.filter(item => checkedKeys.value?.checked?.includes(item.orgId));
// treeAddData.value = checkedNodes;
console.log(treeAddData.value,'checkedNodes',orgLists.value)

53
src/components/project/ConfirmLecturer.vue
View File

@@ -27,6 +27,7 @@
<div class="org" :title="item?.trainOrgName">{{item?.trainOrgName||'-'}}</div>
<div class="text org" :title="Number(item?.summaryTotal).toFixed(2)">{{item?.summaryTotal?Number(item?.summaryTotal).toFixed(2)+'元':'-'}}</div>
</div>
<div class="icon" :class="activeList.includes(item.trainOrgId)?'active':'not'" @click.stop="setList(item)"></div>
</div>
</div>
<div class="box">
@@ -140,16 +141,16 @@ const handleConfirm = () => {
// }
// numTime.value+=1
// localStorage.setItem('numTime',numTime.value)
const ids = forData.value.flatMap(item => item.expenseList.map(item => item.id));
// const ids = forData.value.flatMap(item => item.expenseList.map(item => item.id));
// let ids = []
// if(searchTrue.value){
// ids = timesList.value.map(item=>item.id)
// }else{
// ids = expenseList.value.map(item=>item.id)
// }
if(!ids.length){
return message.error('暂无可提交的数据')
}
// if(!ids.length){
// return message.error('暂无可提交的数据')
// }
modalVisible.value = false;
emit('example',true)
api.teacherExpenseConfirm({ids:ids?.join(',')}).then(res=>{
@@ -218,6 +219,7 @@ watch(()=>props.visible,(val)=>{
nameUserNo.value = null
dateValue.value = null
indexList.value = 0
activeList.value = []
drawerContent.value?.$el.querySelector('.ant-table-body')?.scrollTo({top:0,behavior: 'smooth'})
}
})
@@ -482,8 +484,20 @@ const columns = [
},
]
const closeDrawer = () => emit("update:visible", false);
const activeList = ref([])
const setList = (item) => {
const index = activeList.value.findIndex(listItem => listItem === item.trainOrgId);
if (index > -1) {
activeList.value.splice(index, 1);
} else {
activeList.value.push(item.trainOrgId);
}
}
const qureyDrawer = () => {
const ids = forData.value.flatMap(item => item.expenseList.map(item => item.id));
const filterList = forData.value.filter(item=>{
return activeList.value.includes(item.trainOrgId)
})
const ids = filterList?.flatMap(item => item.expenseList?.map(item => item.id));
// let ids = []
// if(searchTrue.value){
// ids = timesList.value.map(item=>item.id)
@@ -493,7 +507,6 @@ const qureyDrawer = () => {
if(!ids.length){
return message.error('暂无可提交的数据')
}
console.log(ids,'idssssss')
dialog({
content: '是否确认讲师费信息无误？提交后按“培训发生组织”汇总至审批中心，等待验证后“提交”进入审批流程。',
ok: () => {
@@ -515,7 +528,11 @@ const qureyDrawer = () => {
})
}
const config = () => {
if(!expenseList.value.length){
const filterList = forData.value.filter(item=>{
return activeList.value.includes(item.trainOrgId)
})
const ids = filterList?.flatMap(item => item.expenseList?.map(item => item.id));
if(!ids.length){
message.error('暂无可提交的数据')
return
}
@@ -679,7 +696,7 @@ const config = () => {
justify-content: space-between;
align-items: center;
// background-color: red;
margin-bottom: 20px;
// margin-bottom: 20px;
.headerTitle {
margin: 24px 0;
@@ -696,6 +713,7 @@ const config = () => {
display: flex;
align-items: center;
overflow-x: auto;
padding-top: 20px;
.list{
display: flex;
align-items: center;
@@ -706,6 +724,25 @@ const config = () => {
border-radius:6px;
margin-right: 20px;
margin-bottom: 20px;
position: relative;
.icon{
position: absolute;
right: -10px;
top: -10px;
width:24px;
height:24px;
cursor: pointer;
// background: url('@/assets/icon.png') no-repeat;
// background-size: 100% 100%;
}
.active{
background: url('@/assets/icon.png') no-repeat;
background-size: 100% 100%;
}
.not{
background: url('@/assets/iconnot.png') no-repeat;
background-size: 100% 100%;
}
.left{
width: 35%;
min-width: 86px;

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

@@ -25,10 +25,10 @@
:width="55" style="border-radius: 50%;width:55px;height:55px;"
:src=formParam.photo
/></a-descriptions-item>
<a-descriptions-item label="讲师姓名">{{formParam.name||'-'}}</a-descriptions-item>
<a-descriptions-item label="手机号码">{{formParam.mobile||'-'}}</a-descriptions-item>
<a-descriptions-item label="供应商">{{formParam.supplier||'-'}}</a-descriptions-item>
<a-descriptions-item label="讲师邮箱">{{formParam.email||'-'}}</a-descriptions-item>
<a-descriptions-item label="讲师姓名"><div style="user-select:text">{{formParam.name||'-'}}</div></a-descriptions-item>
<a-descriptions-item label="手机号码"><div style="user-select:text">{{formParam.mobile||'-'}}</div></a-descriptions-item>
<a-descriptions-item label="供应商"><div style="user-select:text">{{formParam.supplier||'-'}}</div></a-descriptions-item>
<a-descriptions-item label="讲师邮箱"><div style="user-select:text">{{formParam.email||'-'}}</div></a-descriptions-item>
<a-descriptions-item label="授课时长" :span="2">{{formParam.teaching||'-'}}
<span style="margin-left: 5px;" v-if="formParam.teaching != null">分钟</span>
<span style="margin-left: 10px ; padding: 2px;" v-if="formParam.teaching != null">({{
@@ -147,32 +147,33 @@ export default{
// ellipsis: true, align: "center",
// width: 120,
// },
{
title: '课程编号',
dataIndex: 'courseId',
key: 'courseId',
align: "center",
customRender: ({text, index})=>{
return index+1;
},
width: 120,
},
// {
// title: '课程编号',
// dataIndex: 'courseId',
// key: 'courseId',
// align: "center",
// customRender: ({text, index})=>{
// return index+1;
// },
// width: 120,
// },
{
title: '课程名称',
dataIndex: 'courseName',
key: 'courseName',
ellipsis: true, align: "center",
width: 120,
width: 180,
customCell:()=>{return{style:{userSelect: 'text'}}},
},
{
title: '课程日期',
dataIndex: 'teachingDate',
key: 'teachingDate',
ellipsis: true, align: "center",
width: 200,
width: 160,
customRender: (value) => {
return (
<div>
<div style="user-select: text">
{value.record?.teachingDate?dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm"):'-'}
</div>
);
@@ -208,7 +209,7 @@ export default{
}
},
{
title: '学习总人数',
title: '参训人数',
dataIndex: 'studys',
key: 'studys',
ellipsis: true, align: "center",
@@ -222,7 +223,7 @@ export default{
dataIndex: 'teaching',
key: 'teaching',
ellipsis: true, align: "center",
width: 120,
width: 130,
customRender: ({text})=>{
return text ? text+'分钟' : '-'
}
@@ -236,7 +237,7 @@ export default{
customRender: (value) => {
return (
<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>
)
}
@@ -265,7 +266,7 @@ export default{
dataIndex: 'remark',
key: 'remark',
ellipsis: true, align: "center",
width: 120,
width: 200,
customRender: (text)=>{
return (
<div>

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

@@ -22,8 +22,8 @@
<a-descriptions-item label="讲师头像">
<a-image :width="55" style="border-radius: 50%;width:55px;height:55px;" :src=formParam.photo />
</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="讲师姓名"><div style="user-select:text">{{formParam.name}} / {{formParam.userNo}}</div></a-descriptions-item>
<a-descriptions-item label="讲师体系"><div style="user-select:text">{{formParam.tsystemName || '-'}}</div></a-descriptions-item>
<!-- 二层 -->
<a-descriptions-item label="讲师级别">{{formParam.tlevelName||'-'}}</a-descriptions-item>
<a-descriptions-item label="认证状态">{{ formParam.certStatus==0?'未认证' :formParam.certStatus==1 ?'已认证':'-'}}
@@ -32,15 +32,15 @@
@click="handleup">查看认证资料</a-button>
</span>
</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 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==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="所属组织" >
<span :title="formParam.orgName">{{ formParam.orgNames || '-' }}</span>
<span :title="formParam.orgName" style="user-select:text">{{ formParam.orgName || '-' }}</span>
</a-descriptions-item>
</a-descriptions>
<div style="margin-top: 10px;"></div>
@@ -207,34 +207,35 @@ export default{
}
//授课记录列表
const teacherrecordsColumns = ref([
{
title: '课程编号',
dataIndex: 'courseId',
key: 'courseId',
align: "center",
customRender: ({text, index})=>{
return index+1;
},
// {
// title: '课程编号',
// dataIndex: 'courseId',
// key: 'courseId',
// align: "center",
// customRender: ({text, index})=>{
// return index+1;
// },
width: 120,
},
// width: 120,
// },
{
title: '课程名称',
dataIndex: 'courseName',
key: 'courseName',
ellipsis: true,
align: "center",
width: 120,
width: 180,
customCell:()=>{return{style:{userSelect: 'text'}}},
},
{
title: '课程日期',
dataIndex: 'teachingDate',
key: 'teachingDate',
ellipsis: true, align: "center",
width: 200,
width: 160,
customRender: (value) => {
return (
<div>
<div style="user-select: text">
{value.record?.teachingDate?dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm"):'-'}
</div>
);
@@ -271,7 +272,7 @@ export default{
}
},
{
title: '学习总人数',
title: '参训人数',
dataIndex: 'studys',
key: 'studys',
ellipsis: true, align: "center",
@@ -285,7 +286,7 @@ export default{
dataIndex: 'teaching',
key: 'teaching',
ellipsis: true, align: "center",
width: 120,
width: 130,
customRender: ({text})=>{
return text ? text+'分钟' : '-'
}
@@ -299,7 +300,7 @@ export default{
customRender: (value) => {
return (
<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>
)
}
@@ -329,7 +330,7 @@ export default{
key: 'remark ',
ellipsis: true,
align: "center",
width: 120,
width: 200,
customRender: (value) => {
return (
<div>{value.record.remark || '-'}</div>

4
src/components/project/lockLecturer.vue
View File

@@ -25,8 +25,8 @@
</div>
<div class="desc">
<a-descriptions :column="2" bordered>
<a-descriptions-item :labelStyle="{ width: '165px' }" label="培训发生组织编号">{{formData?.affiliationCode||'-'}}</a-descriptions-item>
<a-descriptions-item :labelStyle="{ width: '165px' }" label="培训发生组名称">{{formData?.affiliationName||'-'}}</a-descriptions-item>
<a-descriptions-item :labelStyle="{ width: '165px' }" label="培训发生组织编号"><div style="user-select:text">{{formData?.affiliationCode||'-'}}</div></a-descriptions-item>
<a-descriptions-item :labelStyle="{ width: '165px' }" label="培训发生组织名称"><div style="user-select:text">{{formData?.affiliationName||'-'}}</div></a-descriptions-item>
<a-descriptions-item label="是否为根节点">
<span v-if="formData?.parentName"><span style="margin-right:10px">否</span>({{ formData?.parentName }})</span>
<span v-else><span style="margin-right:10px">是</span>({{ {1:'一',2:'二',3:'三'}[formData?.code] }}级审批)</span>

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

@@ -417,6 +417,7 @@ export default {
key: 'name',
ellipsis: true, align: "center",
width: 200,
customCell:()=>{return{style:{userSelect: 'text'}}},
},
{
title: '供应商',
@@ -424,6 +425,7 @@ export default {
key: 'supplier',
ellipsis: true, align: "center",
width: 200,
customCell:()=>{return{style:{userSelect: 'text'}}},
},
{
title: '手机号码',
@@ -433,31 +435,31 @@ export default {
width: 200,
customRender: (value, record) => {
return (
<div>
<div style="user-select:text">
{value.record.mobile||'-'}
</div>
)
}
},
// {
// title: '讲师邮箱 ',
// dataIndex: 'email',
// key: 'email',
// ellipsis: true, align: "center",
// width: 200,
// },
{
title: '授课时长 ',
title: '讲师邮箱 ',
dataIndex: 'email',
key: 'email',
ellipsis: true, align: "center",
width: 200,
customCell:()=>{return{style:{userSelect: 'text'}}},
customRender: ({text})=>{
return text || '-'
}
},
{
title: '授课时长(分钟)',
dataIndex: 'teaching',
key: 'teaching',
ellipsis: true, align: "center",
width: 200,
customRender: (value, record) => {
return (
<div>
{value.record.teaching}分钟
</div>
)
customRender: ({text})=>{
return text ? text+'分钟' : '-'
}
},
{

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
).toFixed(2) }}小时)</span>
</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="备注 " :span="2">{{ formParam.remark ||'-' }}</a-descriptions-item>
</a-descriptions>
@@ -562,13 +562,20 @@ export default {
customRender: ({text})=> text||'-'
},
{
title: '手机号码 ',
dataIndex: 'mobile',
key: 'mobile',
title: '课程名称 ',
dataIndex: 'courseName',
key: 'courseName',
ellipsis: true, align: "center",
width: 150,
customRender: ({text}) => text||'-'
width: 200,
},
// {
// title: '手机号码 ',
// dataIndex: 'mobile',
// key: 'mobile',
// ellipsis: true, align: "center",
// width: 150,
// customRender: ({text}) => text||'-'
// },
{
title: '课程类型 ',
dataIndex: 'type',
@@ -592,33 +599,7 @@ export default {
}
},
{
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: '授课时间 ',
title: '授课/课程日期 ',
dataIndex: 'teachingDate',
key: 'teachingDate',
ellipsis: true, align: "center",
@@ -670,29 +651,29 @@ export default {
// //${getSysTypeMap(record.sysType3, record.sysTypeId)?'-'+getSysTypeMap//(record.sysType3) : ""}
// // `
// },
// {
// title: '内容分类',
// dataIndex: 'courseTypeName',
// key: 'courseTypeName',
// ellipsis: true, align: "center",
// width: 120,
// },
{
title: '内容分类',
dataIndex: 'courseTypeName',
key: 'courseTypeName',
ellipsis: true, align: "center",
width: 120,
},
{
title: '授课时长(H) ',
title: '授课/课程时长(分钟)',
dataIndex: 'teaching',
key: 'teaching',
ellipsis: true, align: "center",
width: 120,
width: 160,
customRender: (value) => {
return (
<div>
{(value.record?.teaching/60).toFixed(2)+'小时' || '-' }
{value.record?.teaching ? value.record.teaching + '分钟' : '-'}
</div>
);
},
},
{
title: '学习总人数',
title: '参训人数',
dataIndex: 'studys',
key: 'studys',
ellipsis: true, align: "center",
@@ -710,12 +691,30 @@ export default {
customRender: (value) => {
return (
<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: 'operation',

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

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

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

@@ -28,28 +28,37 @@
</a-form-item>
<!-- <div style="width:100%"></div> -->
<a-form-item class="select">
<a-select style="width: 200px ;margin-bottom:20px" v-model:value="searchParam.createFrom" placeholder="录入类型"
<a-select style="width: 200px ;margin-bottom:20px" v-model:value="searchParam.type" placeholder="课程类型"
:options="entryTypeList" allowClear v-on:keydown.enter="enterPressHadlerSearch">
</a-select>
</a-form-item>
<a-form-item class="select">
<a-select style="width: 200px;margin-bottom:20px" v-model:value="searchParam.courseStatus" placeholder="开课状态"
:options="AuthenticationStatusList" a llowClear showSearch v-on:keydown.enter="enterPressHadlerSearch">
:options="AuthenticationStatusList" allowClear v-on:keydown.enter="enterPressHadlerSearch">
</a-select>
</a-form-item>
<a-form-item class="select" v-if="moreid == 2">
<!-- <a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 235px;margin-bottom:20px" placeholder="请选择讲师体系" v-model:value="searchParam.tSystemId"
:options="LecturerSystemList" allowClear showSearch @change="changetlevel"
v-on:keydown.enter="enterPressHadlerSearch">
</a-select>
</a-form-item>
</a-form-item> -->
<a-form-item class="select" v-if="moreid == 2">
<!-- <a-select style="width: 235px" placeholder="请选择所属组织" v-model:value="searchParam.sourceBelongId"
:options="getOrganizationList" allowClear showSearch v-on:keydown.enter="enterPressHadlerSearch">
</a-select> -->
<OrgClass @enter="searchSubmit()" v-model:value="searchParam.orgId" :placeholder="'请选择讲师组织'"
<!-- <OrgClass @enter="searchSubmit()" v-model:value="searchParam.orgId" :placeholder="'请选择讲师组织'"
style="width: 235px"
></OrgClass>
></OrgClass> -->
<a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.trainOrgId" placeholder="请选择培训发生组织" allowClear
:options="orgListSearch"
v-on:keydown.enter="enterPressHadlerSearch">
</a-select>
</a-form-item>
<a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 200px;margin-bottom:20px" placeholder="是否生成讲师费" v-model:value="searchParam.createdFee"
:options="LecturerLevelList" allowClear v-on:keydown.enter="enterPressHadlerSearch">
</a-select>
</a-form-item>
<!-- <a-form-item class="select" v-if="moreid == 2">
<a-tree-select style="width: 235px;margin-bottom:20px" :fieldNames="{
@@ -64,14 +73,14 @@
</a-form-item> -->
<!-- <div style="width: 100%;"></div> -->
<a-form-item class="select" v-if="moreid == 2">
<a-select style="min-width: 200px ; height: auto ;margin-bottom:20px" v-model:value="score" placeholder="请选择评分" showArrow
:options="scoreList" allowClear showSearch mode="multiple" @change="scoreChange"
<a-select style="min-width: 200px ; height: auto ;margin-bottom:20px" v-model:value="score" placeholder="请选择评分"
:options="scoreList" allowClear mode="multiple" @change="scoreChange" :showSearch="false"
v-on:keydown.enter="enterPressHadlerSearch">
</a-select>
</a-form-item>
<a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 200px" v-model:value="searchParam.studys" placeholder="授课人数" :options="studysList"
allowClear showSearch v-on:keydown.enter="enterPressHadlerSearch">
allowClear v-on:keydown.enter="enterPressHadlerSearch">
</a-select>
<!-- <a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
placeholder="授课人数" allowClear showSearch>
@@ -403,28 +412,28 @@
<span class="line"></span>
<span style="font-weight:600;">讲师信息</span>
<a-descriptions style="margin-top:15px;" bordered :column="2" :contentStyle="{'maxWidth':'300px'}" :labelStyle="{'width':'160px'}">
<a-descriptions-item label="讲师名称">{{ formParam.teacherName ||'-'}}</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="讲师名称"><div style="user-select: text">{{ formParam.teacherName ||'-'}}/{{ formParam.userNo||'-' }}</div></a-descriptions-item>
<!-- <a-descriptions-item label="讲师组织">{{ formParam.orgName||'-' }}</a-descriptions-item> -->
<a-descriptions-item label="培训发生组织">{{ formParam.trainOrgName||'-' }}</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="录入方式">
<!-- <a-descriptions-item label="讲师体系">{{ formParam.tsystemName||'-' }}</a-descriptions-item> -->
<!-- <a-descriptions-item label="讲师级别">{{ formParam.tlevelName||'-'}}</a-descriptions-item> -->
<a-descriptions-item label="数据来源">
{{ formParam.createFrom == 0 ? '系统生成' : formParam.createFrom == 1 ? '手动录入' : '-' }}</a-descriptions-item>
<a-descriptions-item label="课程类型">{{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : '-'
<a-descriptions-item label="课程类型">{{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : '-'
}}</a-descriptions-item>
<a-descriptions-item label="课程名称">{{ formParam.courseName||'-' }}</a-descriptions-item>
<a-descriptions-item label="课程名称"><div style="user-select: text">{{ formParam.courseName||'-' }}</div></a-descriptions-item>
<a-descriptions-item label="开课状态">{{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1
? '已开课' : '-' }}</a-descriptions-item>
<a-descriptions-item label="授课时长 ">
<a-descriptions-item label="授课/课程时长 ">
<span> {{ formParam.teaching }} 分钟</span>
<span style="margin-left: 10px ;" v-if="formParam.teaching != '0'">({{ (formParam.teaching / 60
).toFixed(2) }}小时)</span> </a-descriptions-item>
<a-descriptions-item label="授课/课程日期 ">{{ formParam.teachingDate||'-' }}</a-descriptions-item>
<a-descriptions-item label="授课/课程日期"><div style="user-select: text">{{ formParam.teachingDate||'-' }}</div></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="是否生成讲师费">{{{0:'否',1:'是'}[formParam.createdFee]}}</a-descriptions-item>
<a-descriptions-item label="备注 ">{{ formParam.remark||'-' }}</a-descriptions-item>
</a-descriptions>
<div v-if="formParam.createFrom == '0'">
@@ -549,6 +558,7 @@ export default {
const formRef = ref();
const router = useRouter();
const state = reactive({
orgListSearch: [],
moreid: 1,
title: '导入内部授课记录',
vf: false,
@@ -598,7 +608,7 @@ export default {
pageSize: 10,
managerId: null,
name: null,
createFrom: null,
type: null,
courseStatus: null,
orgId: null,
sourceBelongFullName:null,
@@ -643,6 +653,11 @@ export default {
const LecturerSystemList = ref([
// { value: 0, systemName: "讲师体系" },
]);
const LecturerLevelList = ref([
{value:'',label:'全部'},
{value:'0',label:'否'},
{value:'1',label:'是'}
])
//获取讲师体系列表
const LecturerSystemLista = () => {
let obj = {
@@ -689,8 +704,8 @@ export default {
])
const entryTypeList = ref([
{ value: '', label: "全部" },
{ value: '0', label: "系统生成" },
{ value: '1', label: "手动录入" },
{ value: '0', label: "在线课" },
{ value: '1', label: "面授课" },
])
const scoreList = ref([
{ value: '', label: "全部" },
@@ -750,63 +765,31 @@ export default {
dataIndex: 'teacherName',
key: 'teacherName',
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师工号 ',
dataIndex: 'userNo',
key: 'userNo',
ellipsis: true, align: "center",
width: 120,
width: 180,
customRender: (value, record) => {
return (
<div style="user-select: text">
{value.record.teacherName||'-'} / {value.record.userNo||'-'}
</div>
)
}
},
// {
// title: '讲师工号 ',
// dataIndex: 'userNo',
// key: 'userNo',
// ellipsis: true, align: "center",
// width: 120,
// },
{
title: '课程名称 ',
dataIndex: 'courseName',
key: 'courseName ',
ellipsis: true, align: "left",
width: 200,
customCell:()=>{return{style:{userSelect: 'text'}}},
},
{
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: '课程类型 ',
dataIndex: 'type',
@@ -830,19 +813,27 @@ export default {
}
},
{
title: '授课时间',
title: '授课/课程日期',
dataIndex: 'teachingDate',
key: 'teachingDate',
ellipsis: true, align: "center",
width: 200,
width: 160,
customRender: (value) => {
return (
<div>
<div style="user-select: text">
{value.record?.teachingDate?dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm"):'-'}
</div>
);
},
},
// {
// title: '讲师体系 ',
// dataIndex: 'tsystemName',
// key: 'tsystemName',
// ellipsis: true, align: "left",
// width: 200,
// },
{
title: '开课状态 ',
dataIndex: 'courseStatus',
@@ -870,12 +861,12 @@ export default {
// width: 120,
// },
{
title: '授课时长(分钟) ',
title: '授课/课程时长(分钟)',
dataIndex: 'teaching',
key: 'teaching',
ellipsis: true, align: "center",
scopedSlots: { customRender: "teaching" },
width: 140,
width: 160,
},
{
title: '参训人数',
@@ -896,13 +887,46 @@ export default {
customRender: (value) => {
return (
<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: '是否生成课时费 ',
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>
)
}
},
{
title: '是否生成讲师费 ',
dataIndex: 'createdFee',
key: 'createdFee',
ellipsis: true, align: "center",
@@ -948,6 +972,15 @@ export default {
value: item.id
}
})
state.orgListSearch = res.data.data?.map(item=>{
return{
label: item.affiliationName,
value: item.id
}
})
state.orgListSearch.unshift({
label: '全部', value: ''
})
})
}
const changeOrg = (e,l) => {
@@ -975,8 +1008,10 @@ export default {
}
else if (state.moreid == 2) {
state.moreid = 1
state.searchParam.createFrom = null
state.searchParam.courseStatus = null
// state.searchParam.type = null
// state.searchParam.courseStatus = null
state.searchParam.trainOrgId = null
state.searchParam.createdFee = null
state.searchParam.orgId = null
state.searchParam.sourceBelongFullName = null
state.searchParam.tSystemId = null
@@ -1018,7 +1053,7 @@ export default {
managerId: null,
name: null,
courseName: null,
createFrom: null,
type: null,
courseStatus: null,
orgId: null,
sourceBelongFullName :null,
@@ -1048,7 +1083,7 @@ export default {
let findValue = false;
tableData.value.some(item=>{
if(item.createFrom == 1 && item.isSuperPermission === 'true'){
columns.value[14].width = 160
columns.value[columns.value.length-1].width = 160
findValue = true
return true
}
@@ -1056,9 +1091,9 @@ export default {
if(!findValue){
const text = tableData.value.find(item=>item.createFrom == 1)
if(text){
columns.value[14].width = 120
columns.value[columns.value.length-1].width = 120
}else{
columns.value[14].width = 100
columns.value[columns.value.length-1].width = 100
}
}
})
@@ -1400,7 +1435,7 @@ export default {
//导出功能
const handleExport = () => {
window.open(
`${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacherRecord?recordType=1&name=${state.searchParam.name || ''}&courseName=${state.searchParam.courseName || ''}&createFrom=${state.searchParam.createFrom || ''}&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, '参数')
}
@@ -1493,6 +1528,7 @@ export default {
handleExport,
handleImport,
LecturerSystemList,
LecturerLevelList,
scoreList,
studysList,
OnTheJobStatusList,

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

@@ -19,8 +19,8 @@
</div>
<div class="desc">
<a-descriptions :column="2" bordered>
<a-descriptions-item label="审批编号">{{formData?.approvalNumber||'-'}}</a-descriptions-item>
<a-descriptions-item label="培训发生组名称">{{formData?.trainOrgName||'-'}}</a-descriptions-item>
<a-descriptions-item label="审批编号"><div style="user-select:text">{{formData?.approvalNumber||'-'}}</div></a-descriptions-item>
<a-descriptions-item label="培训发生组名称"><div style="user-select:text">{{formData?.trainOrgName||'-'}}</div></a-descriptions-item>
<a-descriptions-item label="提交时间">{{formData?.approvalSubmitTime||'-'}}</a-descriptions-item>
<a-descriptions-item label="汇总金额">{{formData?.summaryTotal?formData?.summaryTotal+'元':'-'}}</a-descriptions-item>
<a-descriptions-item label="状态">
@@ -870,16 +870,21 @@ export default {
key: 'name',
ellipsis: true,
align: "center",
width: 120,
},
{
title: '讲师工号',
dataIndex: 'userNo',
key: 'userNo',
align: "center",
ellipsis: true,
width: 120,
width: 180,
customRender: (value)=>{
return (
<div style="user-select:text">{value.record.name} / {value.record.userNo}</div>
)
}
},
// {
// title: '讲师工号',
// dataIndex: 'userNo',
// key: 'userNo',
// align: "center",
// ellipsis: true,
// width: 120,
// },
{
title: '所属组织 ',
dataIndex: 'orgName',
@@ -946,6 +951,7 @@ export default {
ellipsis: true,
align: "center",
width: 160,
customCell:()=>{return{style:{userSelect: 'text'}}}
},
{
title: '授课/开发课程日期',

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

@@ -134,8 +134,8 @@
<span class="line"></span>
<span style="font-weight:600;">基本信息</span>
<a-descriptions style="margin-top:16px" bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
<a-descriptions-item label="审批编号">{{formParam?.approvalNumber||'-'}}</a-descriptions-item>
<a-descriptions-item label="培训发生组织">{{formParam?.trainOrgName||'-'}}</a-descriptions-item>
<a-descriptions-item label="审批编号"><div style="user-select:text">{{formParam?.approvalNumber||'-'}}</div></a-descriptions-item>
<a-descriptions-item label="培训发生组织"><div style="user-select:text">{{formParam?.trainOrgName||'-'}}</div></a-descriptions-item>
<a-descriptions-item label="汇总时间" >{{formParam?.summaryTime||'-'}}</a-descriptions-item>
<a-descriptions-item label="汇总金额">{{formParam?.summaryTotal?formParam?.summaryTotal+'元':'-'}}</a-descriptions-item>
<a-descriptions-item label="提交时间">{{formParam?.approvalSubmitTime||'-'}}</a-descriptions-item>
@@ -457,6 +457,7 @@
key: 'trainOrgName',
ellipsis: true, align: "center",
width: 200,
customCell:()=>{return{style:{userSelect: 'text'}}}
},
{
title: '汇总时间 ',
@@ -899,16 +900,23 @@
key: 'name',
ellipsis: true,
align: "center",
width: 120,
},
{
title: '讲师工号 ',
dataIndex: 'userNo',
key: 'userNo',
ellipsis: true,
align: "center",
width: 120,
width: 180,
customRender: (value) => {
return (
<div style="user-select:text">
{value.record?.name} / {value.record?.userNo}
</div>
);
},
},
// {
// title: '讲师工号 ',
// dataIndex: 'userNo',
// key: 'userNo',
// ellipsis: true,
// align: "center",
// width: 120,
// },
{
title: '课程名称 ',
dataIndex: 'courseName',
@@ -916,6 +924,7 @@
ellipsis: true,
align: "center",
width: 200,
customCell:()=>{return{style:{userSelect: 'text'}}}
},
{
title: '培训发生组织',
@@ -924,6 +933,7 @@
ellipsis: true,
align: "center",
width: 120,
customCell:()=>{return{style:{userSelect: 'text'}}}
},
{

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

@@ -125,16 +125,11 @@
<!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
</a-space>
</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 #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>
</a-table>
</div>
@@ -344,7 +339,7 @@
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
授课/课程日期 :
{{formParam.courseType==2?'课程':'授课'}}日期 :
</template>
<a-date-picker :locale="locale" class="draitem" v-model:value="teachingDate" style="width:100%" :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm" valueFormat="YYYY-MM-DD HH:mm"
placeholder="请选择课程日期" @select="handleSelect" />
@@ -361,7 +356,7 @@
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
授课时长
{{formParam.courseType==2?'课程时长':'授课时长'}}
</template>
<a-input v-model:value="formParam.teachingTime" style="width:100%; height: 40px; border-radius: 8px; "
@change="clearNonNumber" placeholder="请输入授课分钟数" allowClear showSearch suffix="分钟">
@@ -514,26 +509,27 @@
</div>
<span class="line"></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-item label="讲师名称">{{formParam.name}}</a-descriptions-item>
<a-descriptions-item label="讲师工号">{{formParam.userNo}}</a-descriptions-item>
<a-descriptions style="padding-bottom: 35px;margin-top:20px;" bordered :column="2" :contentStyle="{width:'300px',}" :labelStyle="{width:'166px'}">
<a-descriptions-item label="讲师姓名"><div style="user-select: text">{{formParam.name}}</div></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.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="课程名称"><div style="user-select: text">{{formParam.courseName || '-'}}</div></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.courseName || '-'}}</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.teachingTime || '-'}}分 <span v-if="formParam.teachingTime">({{(formParam.teachingTime/60).toFixed(2)}}小时)</span></a-descriptions-item>
<a-descriptions-item label="培训发生组织"><div style="user-select: text">{{formParam.trainOrgName || '-'}}</div></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.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.levelPay||formParam.levelPay==0?formParam.levelPay+'元' : '-'}}</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.expense?formParam.expense+'元': '-'}}</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="状态">{{{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="备注 ">{{formParam.remark || '-'}}</a-descriptions-item>
</a-descriptions>
<div style="margin-bottom: 20px;" v-if="false">
@@ -915,15 +911,22 @@ getAllLevelList().then((res) => {
dataIndex: 'name',
key: 'name',
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师工号 ',
dataIndex: 'userNo',
key: 'userNo',
ellipsis: true, align: "center",
width: 120,
width: 180,
customRender: (value, index) => {
return (
<div style="user-select: text;">
{value.record?.name} / {value.record?.userNo}
</div>
);
},
},
// {
// title: '讲师工号 ',
// dataIndex: 'userNo',
// key: 'userNo',
// ellipsis: true, align: "center",
// width: 120,
// },
{
title: '课程名称 ',
dataIndex: 'courseName',
@@ -931,6 +934,7 @@ getAllLevelList().then((res) => {
ellipsis: true,
align: "left",
width: 200,
customCell:()=>{return{style:{userSelect: 'text'}}}
},
{
title: '培训发生组织',
@@ -938,14 +942,45 @@ getAllLevelList().then((res) => {
key: 'trainOrgName',
ellipsis: true, align: "left",
width: 200,
customCell:()=>{return{style:{userSelect: 'text'}}}
},
{
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',
key: 'teachingTime',
ellipsis: true, align: "center",
width: 120,
width: 160,
customRender:(value)=>{
return (
<div>
@@ -954,44 +989,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: '基准课酬 ',
dataIndex: 'levelPay',
@@ -1031,34 +1028,12 @@ getAllLevelList().then((res) => {
customRender: (value) => {
return (
<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: ' 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: 'status',
@@ -1083,13 +1058,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: '讲师组织',
dataIndex: 'orgName',
key: 'orgName',
ellipsis: true, align: "center",
width: 200,
scopedSlots: { customRender: "trainOrg" },
slots: { customRender: "trainOrg" },
},
{
title: '操作 ',
@@ -1363,6 +1368,12 @@ getAllLevelList().then((res) => {
levelVoList: []
}
}
const orgSplit = (val) => {
if(val){
const org = val.split('/')
return org[org.length-1]
}
}
//表格内查看数据操作
const handleLook = (record) => {
state.teachingdialog = true;
@@ -1567,15 +1578,22 @@ const column = ref([
dataIndex: 'name',
key: 'name',
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师工号 ',
dataIndex: 'userNo',
key: 'userNo',
ellipsis: true, align: "center",
width: 120,
width: 180,
customRender: (value, index) => {
return (
<div>
{value.record?.name} / {value.record?.userNo}
</div>
);
},
},
// {
// title: '讲师工号 ',
// dataIndex: 'userNo',
// key: 'userNo',
// ellipsis: true, align: "center",
// width: 120,
// },
{
title: '课程名称 ',
dataIndex: 'courseName',
@@ -1846,6 +1864,7 @@ const column = ref([
addTeacher,
cancelTeacherDialog,
handleLook,
orgSplit,
cancel,
// deleteModal,
handleModify,

2
src/views/lecturer/LecturerFeeManagement.vue
View File

@@ -2,7 +2,7 @@
<template>
<div class="LecturerFeeManagement">
<div style="margin: 20px;margin-top:0;" >
<a-tabs v-model:activeKey="activeKey" :destroyInactiveTabPane="true">
<a-tabs v-model:activeKey="activeKey" >
<a-tab-pane key="1" tab="讲师费管理">
<LecturerFee />
</a-tab-pane>

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

@@ -264,6 +264,7 @@ export default {
ellipsis: true,
align: "left",
width: '200px',
customCell:()=>{return{style:{userSelect: 'text'}}},
},
{
title: '汇总周期 ',
@@ -274,7 +275,7 @@ export default {
width:'60px'
},
{
title: '汇总日期 ',
title: '汇总时间',
dataIndex: 'summaryTime',
key: 'summaryTime',
ellipsis: true,

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

@@ -63,7 +63,7 @@
<a-button class="resetbtn " @click="searchReset">重置</a-button>
</div>
</a-form>
<div style="width: 100%;"></div>
<div style="width: 100%;"></div>
<!-- <div style="display: flex; margin-bottom: 20px">
<a-button class="resetbtn" @click="handleFeeMonthly" type="primary"><UploadOutlined/>导出
</a-button>
@@ -133,7 +133,8 @@
</a-form>
<!-- <span>讲师费发放情况</span> -->
<a-table :columns="column" :scroll="{ x: '1000' }" :data-source="tableDatas" :loading="tableLoadings" :pagination="false">
<template #bodyCell="{ record, column }">
<template #action="{ record, column }">
<a-button type="link" @click="handleDetail(record)">撤回</a-button>
</template>
</a-table>
<!-- <div :style="{
@@ -163,7 +164,7 @@ import { useRouter,useRoute } from "vue-router";
import {
UploadOutlined,
} from '@ant-design/icons-vue';
import { getPayRollPlace,expenseSummaryById ,removeBySummaryId,queryDetailId} from "../../api/Lecturer";
import { getPayRollPlace,expenseSummaryById ,removeBySummaryId,removeBySummaryDetailId,queryDetailId} from "../../api/Lecturer";
import { getOrganization } from "../../api/Teaching";
import ProjectManager from "@/components/project/ProjectManagerNew";
import {queryTeacherFeeMonthly} from "../../api/lecturerFeeStatistics";
@@ -266,16 +267,21 @@ export default {
key: 'name',
ellipsis: true,
align: "center",
width: 120,
},
{
title: '讲师工号',
dataIndex: 'userNo',
key: 'userNo',
align: "center",
ellipsis: true,
width: 120,
width: 180,
customRender: (value)=>{
return (
<div style="user-select:text">{value.record.name} / {value.record.userNo}</div>
)
}
},
// {
// title: '讲师工号',
// dataIndex: 'userNo',
// key: 'userNo',
// align: "center",
// ellipsis: true,
// width: 120,
// },
{
title: '所属组织 ',
dataIndex: 'orgName',
@@ -347,6 +353,7 @@ export default {
ellipsis: true,
align: "center",
width: 120,
customCell:(text)=>{return{style:{color:colorSet(text)}}},
customRender: ({text})=>{
return text ? text+'元' : '-'
}
@@ -365,6 +372,11 @@ export default {
//列表数据
const tableData = ref([
])
const colorSet = (val) => {
if(val.payableExpense!=val.expense){
return 'red'
}
}
// 搜索
const searchSubmit = () => {
state.searchParam.pageNo = 1;
@@ -376,7 +388,7 @@ export default {
//获取讲师发薪地列表
const PlaceOfPayLista = () => {
getPayRollPlace().then((res) => {
if (res.data.code === 200) {
let arr = res.data.data;
let array = [];
@@ -407,7 +419,7 @@ export default {
message.error(err.data.msg)
})
};
//获取所属组织
const getOrganizationList = ref([
// { value: 0, systemName: "讲师体系" },
@@ -446,7 +458,6 @@ export default {
searchSubmitdrawer()
}
const handleLess = (record) => {
console.log(record,'record')
dialog({
content: '是否确认撤回 ?',
ok:()=>{
@@ -464,6 +475,26 @@ export default {
}
})
}
const handleDetail = (record) => {
dialog({
content: '是否确认撤回 ?',
ok:()=>{
removeBySummaryDetailId({detailId:record.detailId}).then(res=>{
if(res.data.code == 200){
message.success('撤回成功')
emits.emit('tableList',true)
searchSubmit()
searchSubmitdrawer()
}else{
message.error(res.data.msg)
}
}).catch(err=>{
message.destroy()
message.error(err.data.msg)
})
}
})
}
const searchTimeChange = (e) => {
console.log(e,'eeeee')
if(e){
@@ -473,7 +504,7 @@ export default {
state.drawer.startTime = ''
state.drawer.endTime = ''
}
}
const pagination = computed(() => ({
total: state.tableDataTotal,
@@ -499,7 +530,7 @@ export default {
}
//重置
const searchReset = () => {
state.searchParam = {
state.searchParam = {
pageNo: "1",
pageSize: "10",
id: props.id,
@@ -548,22 +579,38 @@ export default {
key: 'name',
ellipsis: true,
align: "center",
width: 100,
},
{
title: '讲师工号',
dataIndex: 'userNo',
key: 'userNo',
align: "center",
ellipsis: true,
width: 100,
width: 180,
customRender: (value) => {
return (
<div style="user-select: text">
{value.record?.name} / {value.record?.userNo}
</div>
);
},
},
// {
// title: '讲师工号',
// dataIndex: 'userNo',
// key: 'userNo',
// align: "center",
// ellipsis: true,
// width: 100,
// },
{
title: '课程名称 ',
dataIndex: 'courseName',
key: 'courseName',
ellipsis: true, align: "center",
width: 120,
width: 160,
customCell:()=>{return{style:{userSelect: 'text'}}}
},
{
title: '培训发生组织 ',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
ellipsis: true, align: "center",
width: 160,
customCell:()=>{return{style:{userSelect: 'text'}}}
},
{
title: '课程类型 ',
@@ -628,7 +675,7 @@ export default {
align: "center",
width: 120,
},
{
title: '基准课酬 ',
dataIndex: 'levelPay',
@@ -657,16 +704,26 @@ export default {
ellipsis: true,
align: "center",
width: 100,
customCell:(text)=>{return{style:{color:colorSet(text)}}},
customRender: ({text})=>{
return text ? text+'元' : '-'
}
},
{
title: '操作 ',
dataIndex: 'operation',
key: 'operation',
ellipsis: true,
align: "center",
fixed: "right",
width: 100,
slots: { customRender: "action" },
},
])
//取消按钮 清空输入的数据
const cancelTeachingDialog = () => {
state.opendrawer = false
state.drawer={
name: '',
drawersearchdate: [],
@@ -686,7 +743,7 @@ export default {
};
return {
...toRefs(state),
tableDatas,
tableDatas,
column,
enterPressHadlerSearch,
cancelTeachingDialog,
@@ -694,6 +751,7 @@ export default {
handleFeeMonthly,
handleLook,
handleLess,
handleDetail,
changePagination,
pagination,
searchTimeChange,
@@ -704,6 +762,7 @@ export default {
columns,
PlaceOfPayList,
PlaceOfPayLista,
colorSet,
getOrganizationList,
getOrganizationLista,
searchResetdrawer,

7
src/views/lecturer/Organization.vue
View File

@@ -293,7 +293,7 @@
</div>
</div>
</a-drawer>
<AddOrgContent :Addtitle="'选择组织'" v-model:showContent="showContent" v-model:AddContentList="formParam.affiliationOrgList" />
<AddOrgContent :Addtitle="'选择组织'" :isParent="formParam.isParent" v-model:showContent="showContent" :AddContentLists="formParam.affiliationOrgLists" v-model:AddContentList="formParam.affiliationOrgList"/>
</div>
</template>
<script lang="jsx">
@@ -354,6 +354,7 @@ export default{
code: null,
isContains: '0',
affiliationOrgList: [],
affiliationOrgLists: [],
locking: 1,
},
})
@@ -406,6 +407,7 @@ export default{
key: 'affiliationName',
ellipsis: true, align: "left",
width: '200px',
customCell:()=>{return{style:{userSelect: 'text'}}}
},
{
title: '状态',
@@ -449,6 +451,7 @@ export default{
ellipsis: true,
align: "left",
width: '200px',
customCell:()=>{return{style:{userSelect: 'text'}}}
},
// {
@@ -734,8 +737,8 @@ const getTableDate = (obj) => {
}
})
})
state.formParam.affiliationOrgLists = state.formParam.affiliationOrgList
state.formParam.isContains = String(state.formParam.isContains)
console.log(state.formParam.affiliationOrgList,'state.formParam.affiliationOrgList')
state.teacherdialog = true;
state.teacherdialogtitle = '编辑培训发生组织'
state.vf = false