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

Merge remote-tracking branch 'yx/250507-bugfix-shl'

Browse Source 
# Conflicts:
#	src/views/lecturer/InsideLecturer.vue
#	src/views/lecturer/LecturerFee.vue
This commit is contained in:
joshen
2025-05-13 15:48:03 +08:00
parent f4ae3f5850 d927958f24
commit a995036b04
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,18 +76,18 @@
:pagination="false"> :pagination="false">
<template #bodyCell="{ record, column }"> <template #bodyCell="{ record, column }">
<template v-if="column.key === 'orgName'"> <!-- <template v-if="column.key === 'orgName'">
<a-space style="display:flex ;justify-content: left;"> <a-space style="display:flex ;justify-content: left;">
<!-- <a-popover> &lt;!&ndash; <a-popover>
<template #content> <template #content>
<p>{{ record.orgName}}</p> <p>{{ record.orgName}}</p>
</template> --> </template> &ndash;&gt;
<div <div
style="max-width: 180px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;user-select:text" style="max-width: 180px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;user-select:text"
:title="orgSplit(record.orgName)">{{ orgSplit(record.orgName) }}</div> >{{ record.orgName }}</div>
<!-- </a-popover> --> &lt;!&ndash; </a-popover> &ndash;&gt;
</a-space> </a-space>
</template> </template>-->
<template v-if="column.key === 'operation'"> <template v-if="column.key === 'operation'">
<a-space> <a-space>
<a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button> <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
@@ -814,8 +814,9 @@ export default {
title: '所属组织 ', title: '所属组织 ',
dataIndex: 'orgName', dataIndex: 'orgName',
key: 'orgName', key: 'orgName',
ellipsis: true, align: "left", ellipsis: true,
scopedSlots: { customRender: "orgName" }, align: "left",
// scopedSlots: { customRender: "orgName" },
width: 200, width: 200,
// customRender: (value, record) => { // customRender: (value, record) => {
// return ( // return (
@@ -982,13 +983,13 @@ export default {
.then((res) => { .then((res) => {
// tableData.value = res.data.data.records // tableData.value = res.data.data.records
let objA = res.data.data.records let objA = res.data.data.records
objA.map((item) => { // objA.map((item) => {
if (item.orgName !== null) { // if (item.orgName !== null) {
item.neworganizationName = item.orgName.split('/') // item.neworganizationName = item.orgName.split('/')
item.neworganizationName = item.neworganizationName[item.neworganizationName.length - 1] // item.neworganizationName = item.neworganizationName[item.neworganizationName.length - 1]
} // }
// console.log(item.orgName) // // console.log(item.orgName)
}) // })
tableData.value = objA tableData.value = objA
state.tableDataTotal = Number(res.data.data.total); state.tableDataTotal = Number(res.data.data.total);
state.tableLoading = false state.tableLoading = false

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

@@ -144,12 +144,12 @@
</a-space> </a-space>
</template> </template>
</template> </template>
<template #trainOrg="{ record }"> <!-- <template #trainOrg="{ record }">
<a-space style="display:flex ;justify-content: space-around;"> <a-space style="display:flex ;justify-content: space-around;">
<div style="max-width: 180px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" <div style="max-width: 180px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
:title="orgSplit(record.orgName)">{{ orgSplit(record.orgName) }}</div> >{{ record.orgName }}</div>
</a-space> </a-space>
</template> </template>-->
</a-table> </a-table>
</div> </div>
@@ -790,6 +790,7 @@ export default {
// { value: 0, label: "未定级" }, // { value: 0, label: "未定级" },
]) ])
const changetlevel = (id) => { const changetlevel = (id) => {
console.log("==============changetlevelId", id);
if(id){ if(id){
// 清空讲师级别 // 清空讲师级别
state.searchParam.tLevelName = null; state.searchParam.tLevelName = null;
@@ -1141,7 +1142,7 @@ export default {
ellipsis: true, ellipsis: true,
align: "center", align: "center",
width: 200, width: 200,
slots: { customRender: "trainOrg" }, // slots: { customRender: "trainOrg" },
}, },
{ {
title: '操作 ', title: '操作 ',