diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js index ffe4cebc..3cb7cfcd 100644 --- a/src/api/Lecturer.js +++ b/src/api/Lecturer.js @@ -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}`) //获取培训发生组织编号 diff --git a/src/components/project/AddOrgContent.vue b/src/components/project/AddOrgContent.vue index d5769b02..2149781e 100644 --- a/src/components/project/AddOrgContent.vue +++ b/src/components/project/AddOrgContent.vue @@ -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])); diff --git a/src/components/project/LookExternalLecturer.vue b/src/components/project/LookExternalLecturer.vue index c6501128..facdd144 100644 --- a/src/components/project/LookExternalLecturer.vue +++ b/src/components/project/LookExternalLecturer.vue @@ -25,10 +25,10 @@ :width="55" style="border-radius: 50%;width:55px;height:55px;" :src=formParam.photo /> - {{formParam.name||'-'}} - {{formParam.mobile||'-'}} - {{formParam.supplier||'-'}} - {{formParam.email||'-'}} +
{{formParam.name||'-'}}
+
{{formParam.mobile||'-'}}
+
{{formParam.supplier||'-'}}
+
{{formParam.email||'-'}}
{{formParam.teaching||'-'}} 分钟 ({{ @@ -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 ( -
+
{value.record?.teachingDate?dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm"):'-'}
); diff --git a/src/components/project/LookInsideLecturer.vue b/src/components/project/LookInsideLecturer.vue index de9d63d6..94191910 100644 --- a/src/components/project/LookInsideLecturer.vue +++ b/src/components/project/LookInsideLecturer.vue @@ -22,8 +22,8 @@ - {{formParam.name}} / {{formParam.userNo}} - {{formParam.tsystemName || '-'}} +
{{formParam.name}} / {{formParam.userNo}}
+
{{formParam.tsystemName || '-'}}
{{formParam.tlevelName||'-'}} {{ formParam.certStatus==0?'未认证' :formParam.certStatus==1 ?'已认证':'-'}} @@ -40,7 +40,7 @@ {{formParam.status=='0'?'临时' :formParam.status=='1' ?'启用':formParam.status==2 ?'停用':'-'}} {{formParam.createFrom=='0'?'自动录入' :formParam.createFrom=='1'?'手动录入':'-'}} - {{ formParam.orgName || '-' }} + {{ formParam.orgName || '-' }}
@@ -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 ( -
+
{value.record?.teachingDate?dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm"):'-'}
); diff --git a/src/components/project/lockLecturer.vue b/src/components/project/lockLecturer.vue index def387c7..742c9895 100644 --- a/src/components/project/lockLecturer.vue +++ b/src/components/project/lockLecturer.vue @@ -25,8 +25,8 @@
- {{formData?.affiliationCode||'-'}} - {{formData?.affiliationName||'-'}} +
{{formData?.affiliationCode||'-'}}
+
{{formData?.affiliationName||'-'}}
({{ formData?.parentName }}) ({{ {1:'一',2:'二',3:'三'}[formData?.code] }}级审批) diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue index 6d936665..645a6277 100644 --- a/src/views/lecturer/ExternalLecturer.vue +++ b/src/views/lecturer/ExternalLecturer.vue @@ -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 ( -
+
{value.record.mobile||'-'}
) @@ -445,6 +447,7 @@ export default { key: 'email', ellipsis: true, align: "center", width: 200, + customCell:()=>{return{style:{userSelect: 'text'}}}, customRender: ({text})=>{ return text || '-' } diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index ae75b0aa..b84cb365 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -82,7 +82,7 @@ --> -
{{ record.neworganizationName }}
+
{{ record.neworganizationName }}
@@ -788,7 +788,7 @@ export default { width: 180, customRender: (value, record) => { return ( -
+
{value.record.name} / {value.record.userNo}
) @@ -815,6 +815,7 @@ export default { key: 'tsystemName', ellipsis: true, align: "left", width: 200, + customCell:()=>{return{style:{userSelect: 'text'}}}, }, { title: '级别 ', diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index e7e76045..5f313e4a 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -412,25 +412,24 @@ 讲师信息 - {{ formParam.teacherName ||'-'}}/{{ formParam.userNo||'-' }} +
{{ formParam.teacherName ||'-'}}/{{ formParam.userNo||'-' }}
- {{ formParam.orgName||'-' }} + {{ formParam.trainOrgName||'-' }} - {{ formParam.tsystemName||'-' }} - {{ formParam.tlevelName||'-' - }} + + {{ formParam.createFrom == 0 ? '系统生成' : formParam.createFrom == 1 ? '手动录入' : '-' }} - {{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : '-' + {{ formParam.type == 0 ? '在线课' : formParam.type == 1 ? '面授课' : '-' }} - {{ formParam.courseName||'-' }} +
{{ formParam.courseName||'-' }}
{{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1 ? '已开课' : '-' }} - + {{ formParam.teaching }} 分钟 ({{ (formParam.teaching / 60 ).toFixed(2) }}小时) - {{ formParam.teachingDate||'-' }} +
{{ formParam.teachingDate||'-' }}
{{ formParam.studys?formParam.studys+'人':'-' }} {{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(2)+'分':'-' }} @@ -769,7 +768,7 @@ export default { width: 180, customRender: (value, record) => { return ( -
+
{value.record.teacherName||'-'} / {value.record.userNo||'-'}
) @@ -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 ( -
+
{value.record?.teachingDate?dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm"):'-'}
); diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue index 6e15bcc6..22b35f19 100644 --- a/src/views/lecturer/LecturerAPPEdit.vue +++ b/src/views/lecturer/LecturerAPPEdit.vue @@ -19,8 +19,8 @@
- {{formData?.approvalNumber||'-'}} - {{formData?.trainOrgName||'-'}} +
{{formData?.approvalNumber||'-'}}
+
{{formData?.trainOrgName||'-'}}
{{formData?.approvalSubmitTime||'-'}} {{formData?.summaryTotal?formData?.summaryTotal+'元':'-'}} @@ -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 ( +
{value.record.name} / {value.record.userNo}
+ ) + } }, + // { + // 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: '授课/开发课程日期', diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index 56acd253..d177d010 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -134,8 +134,8 @@ 基本信息 - {{formParam?.approvalNumber||'-'}} - {{formParam?.trainOrgName||'-'}} +
{{formParam?.approvalNumber||'-'}}
+
{{formParam?.trainOrgName||'-'}}
{{formParam?.summaryTime||'-'}} {{formParam?.summaryTotal?formParam?.summaryTotal+'元':'-'}} {{formParam?.approvalSubmitTime||'-'}} @@ -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 ( +
+ {value.record?.name} / {value.record?.userNo} +
+ ); + }, }, + // { + // 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'}}} }, { diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index be7920a5..656198b9 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -510,16 +510,16 @@ 讲师费用详情 - {{formParam.name}} +
{{formParam.name}}
{{formParam.orgName}} {{formParam.tsystemName}} {{formParam.tlevelName }} {{formParam?.payrollPlace || '-'}} - {{formParam.courseName || '-'}} +
{{formParam.courseName || '-'}}
{{{0:'在线',1:'面授',2:'课程开发',3:'作业员入模培训',4:'其他'}[formParam?.courseType]}} - {{formParam.trainOrgName || '-'}} +
{{formParam.trainOrgName || '-'}}
{{(formParam.teachingDate) || '-'}} {{formParam.teachingTime || '-'}}分 ({{(formParam.teachingTime/60).toFixed(2)}}小时) {{formParam.studys?formParam.studys+'人' : '-'}} @@ -914,7 +914,7 @@ getAllLevelList().then((res) => { width: 180, customRender: (value, index) => { return ( -
+
{value.record?.name} / {value.record?.userNo}
); @@ -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: '课程类型 ', diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue index 7a7eeb3a..aeaae274 100644 --- a/src/views/lecturer/LecturerFeeStatistics.vue +++ b/src/views/lecturer/LecturerFeeStatistics.vue @@ -264,6 +264,7 @@ export default { ellipsis: true, align: "left", width: '200px', + customCell:()=>{return{style:{userSelect: 'text'}}}, }, { title: '汇总周期 ', diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue index 8ca19765..3151ab0d 100644 --- a/src/views/lecturer/MonthlyStatistics.vue +++ b/src/views/lecturer/MonthlyStatistics.vue @@ -270,7 +270,7 @@ export default { width: 180, customRender: (value)=>{ return ( -
{value.record.name} / {value.record.userNo}
+
{value.record.name} / {value.record.userNo}
) } }, @@ -582,7 +582,7 @@ export default { width: 180, customRender: (value) => { return ( -
+
{value.record?.name} / {value.record?.userNo}
); @@ -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: '课程类型 ', diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue index 3d5cf2a0..a79d1896 100644 --- a/src/views/lecturer/Organization.vue +++ b/src/views/lecturer/Organization.vue @@ -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'}}} }, // {