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

讲师管理bug

Browse Source
This commit is contained in:
zhangsir
2025-01-08 15:31:06 +08:00
parent cad23a1599
commit 1d3a700ced
14 changed files with 84 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/Lecturer.js
View File

@@ -54,7 +54,7 @@ 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 = (isParent) => http.get(`/admin/affiliation/getUnSelectOrg?isParent=${isParent}`)
//获取培训发生组织编号

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

@@ -152,7 +152,7 @@ import * as lecturerApi from "@/api/Lecturer.js";
const treeAddDataOrgIds = treeAddData.value.map(item => item.orgId);
const combinedUniqueIds = [...new Set([...checkedNodeIds, ...treeAddDataOrgIds])];
if(combinedUniqueIds.length > length){
await lecturerApi.getSelectOrg(node.id).then(res=>{
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]));

11
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">({{
@@ -163,6 +163,7 @@ export default{
key: 'courseName',
ellipsis: true, align: "center",
width: 180,
customCell:()=>{return{style:{userSelect: 'text'}}},
},
{
title: '课程日期',
@@ -172,7 +173,7 @@ export default{
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>
);

9
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 ?'已认证':'-'}}
@@ -40,7 +40,7 @@
<a-descriptions-item label="账号状态">{{formParam.status=='0'?'临时' :formParam.status=='1' ?'启用':formParam.status==2 ?'停用':'-'}}</a-descriptions-item>
<a-descriptions-item label="录入方式">{{formParam.createFrom=='0'?'自动录入' :formParam.createFrom=='1'?'手动录入':'-'}}</a-descriptions-item>
<a-descriptions-item style="max-width: 400px;" label="所属组织" >
<span :title="formParam.orgName">{{ formParam.orgName || '-' }}</span>
<span :title="formParam.orgName" style="user-select:text">{{ formParam.orgName || '-' }}</span>
</a-descriptions-item>
</a-descriptions>
<div style="margin-top: 10px;"></div>
@@ -225,6 +225,7 @@ export default{
ellipsis: true,
align: "center",
width: 180,
customCell:()=>{return{style:{userSelect: 'text'}}},
},
{
title: '课程日期',
@@ -234,7 +235,7 @@ export default{
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>
);

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>

5
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,7 +435,7 @@ export default {
width: 200,
customRender: (value, record) => {
return (
<div>
<div style="user-select:text">
{value.record.mobile||'-'}
</div>
)
@@ -445,6 +447,7 @@ export default {
key: 'email',
ellipsis: true, align: "center",
width: 200,
customCell:()=>{return{style:{userSelect: 'text'}}},
customRender: ({text})=>{
return text || '-'
}

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

@@ -82,7 +82,7 @@
<template #content>
<p>{{ record.orgName}}</p>
</template> -->
<div style="max-width: 180px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" :title="record.orgName">{{ record.neworganizationName }}</div>
<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>
@@ -788,7 +788,7 @@ export default {
width: 180,
customRender: (value, record) => {
return (
<div>
<div style="user-select:text">
{value.record.name} / {value.record.userNo}
</div>
)
@@ -815,6 +815,7 @@ export default {
key: 'tsystemName',
ellipsis: true, align: "left",
width: 200,
customCell:()=>{return{style:{userSelect: 'text'}}},
},
{
title: '级别 ',

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

@@ -412,25 +412,24 @@
<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 ||'-'}}/{{ formParam.userNo||'-' }}</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.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="讲师体系">{{ 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(2)+'分':'-' }}</a-descriptions-item>
<!-- <a-descriptions-item label="内容分类">{{ formParam.courseTypeName||'-' }}</a-descriptions-item> -->
@@ -769,7 +768,7 @@ export default {
width: 180,
customRender: (value, record) => {
return (
<div>
<div style="user-select: text">
{value.record.teacherName||'-'} / {value.record.userNo||'-'}
</div>
)
@@ -788,6 +787,7 @@ export default {
key: 'courseName ',
ellipsis: true, align: "left",
width: 200,
customCell:()=>{return{style:{userSelect: 'text'}}},
},
{
@@ -820,7 +820,7 @@ export default {
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>
);

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'}}}
},
{

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

@@ -510,16 +510,16 @@
<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:'166px'}">
<a-descriptions-item label="讲师姓名">{{formParam.name}}</a-descriptions-item>
<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?.payrollPlace || '-'}}</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="费用类型">{{{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.trainOrgName || '-'}}</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>
@@ -914,7 +914,7 @@ getAllLevelList().then((res) => {
width: 180,
customRender: (value, index) => {
return (
<div>
<div style="user-select: text;">
{value.record?.name} / {value.record?.userNo}
</div>
);
@@ -934,6 +934,7 @@ getAllLevelList().then((res) => {
ellipsis: true,
align: "left",
width: 200,
customCell:()=>{return{style:{userSelect: 'text'}}}
},
{
title: '培训发生组织',
@@ -941,6 +942,7 @@ getAllLevelList().then((res) => {
key: 'trainOrgName',
ellipsis: true, align: "left",
width: 200,
customCell:()=>{return{style:{userSelect: 'text'}}}
},
{
title: '课程类型 ',

1
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: '汇总周期 ',

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

@@ -270,7 +270,7 @@ export default {
width: 180,
customRender: (value)=>{
return (
<div>{value.record.name} / {value.record.userNo}</div>
<div style="user-select:text">{value.record.name} / {value.record.userNo}</div>
)
}
},
@@ -582,7 +582,7 @@ export default {
width: 180,
customRender: (value) => {
return (
<div>
<div style="user-select: text">
{value.record?.name} / {value.record?.userNo}
</div>
);
@@ -602,6 +602,7 @@ export default {
key: 'courseName',
ellipsis: true, align: "center",
width: 160,
customCell:()=>{return{style:{userSelect: 'text'}}}
},
{
title: '培训发生组织 ',
@@ -609,6 +610,7 @@ export default {
key: 'trainOrgName',
ellipsis: true, align: "center",
width: 160,
customCell:()=>{return{style:{userSelect: 'text'}}}
},
{
title: '课程类型 ',

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

@@ -406,6 +406,7 @@ export default{
key: 'affiliationName',
ellipsis: true, align: "left",
width: '200px',
customCell:()=>{return{style:{userSelect: 'text'}}}
},
{
title: '状态',
@@ -449,6 +450,7 @@ export default{
ellipsis: true,
align: "left",
width: '200px',
customCell:()=>{return{style:{userSelect: 'text'}}}
},
// {