diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index aaa2325c..2fbb1f7f 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -28,7 +28,7 @@ @@ -106,7 +106,7 @@ 查看 编辑 - 删除 + 删除 @@ -709,25 +709,25 @@ export default { ) } }, - { - title: '数据来源', - dataIndex: 'createFrom', - key: 'createFrom', - ellipsis: true, align: "center", - width: 120, - customRender: (value) => { - return ( -
- {value.record.createFrom == "0" || value.record.createFrom == "1" - ? { - "0": "系统生成", - "1": "手动录入", - }[value.record.createFrom + ""] || "" - : "-"} -
- ) - } - }, + // { + // title: '数据来源', + // dataIndex: 'createFrom', + // key: 'createFrom', + // ellipsis: true, align: "center", + // width: 120, + // customRender: (value) => { + // return ( + //
+ // {value.record.createFrom == "0" || value.record.createFrom == "1" + // ? { + // "0": "系统生成", + // "1": "手动录入", + // }[value.record.createFrom + ""] || "" + // : "-"} + //
+ // ) + // } + // }, { title: '操作 ', dataIndex: 'operation', diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 77853041..390851f4 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -84,7 +84,7 @@ -->
{{ record.neworganizationName }}
+ :title="orgSplit(record.orgName)">{{ orgSplit(record.orgName) }} @@ -1390,6 +1390,14 @@ export default { return roleCode.some(t => t == admin) } } + const orgSplit = (val) => { + if (val) { + const org = val.split('/'); + const reversedParts = org.reverse(); + return reversedParts.join('/'); + } + return ''; + } return { ...toRefs(state), lecturerAdmin, @@ -1456,6 +1464,7 @@ export default { createupdialog, removeList, checkMenu, + orgSplit, } }, }; diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index bed6bd73..84a66658 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -22,7 +22,7 @@ + separator="至" :placeholder="['授课/开发日期开始时间', '授课/开发日期结束时间']" v-on:keydown.enter="enterPressHadlerSearch" /> @@ -299,7 +299,7 @@ allowClear showSearch :filter-option="false" - :options="filterOrgListSearch" + :options="filterOrgListSearch2" @search="handleOrgSearch" @change="changeOrg"> @@ -578,6 +578,7 @@ export default { const state = reactive({ orgListSearch: [], filterOrgListSearch: [], + filterOrgListSearch2: [], moreid: 1, title: '导入内部授课记录', vf: false, @@ -935,10 +936,11 @@ export default { key: 'trainOrgName', ellipsis: true, align: "left", width: 200, - customRender: (value, record) => { + customRender: (value) => { + const orgName = value.record.trainOrgName ? value.record.trainOrgName.split('/').reverse().join('/') : '-'; return (
- {value.record.trainOrgName||'-'} + {orgName}
) } @@ -996,6 +998,9 @@ export default { value: item.id } }) + + state.filterOrgListSearch2 = state.orgListSearch; + state.orgListSearch.unshift({ label: '全部', value: '' }) diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue index 30dacaf2..82a66fd7 100644 --- a/src/views/lecturer/LookInsideLecturer.vue +++ b/src/views/lecturer/LookInsideLecturer.vue @@ -416,6 +416,11 @@ export default{ key: 'updateName', ellipsis: true, align: "center", width: 120, + customRender: (value) => { + return ( +
{value.record.updateName || '-'}
+ ) + } }, ]) //晋级记录列表数据