Merge branch '250507-bugfix-shl' into test20250220

This commit is contained in:
joshen
2025-05-09 11:29:06 +08:00
2 changed files with 11 additions and 10 deletions

View File

@@ -76,18 +76,18 @@
:pagination="false">
<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-popover>
&lt;!&ndash; <a-popover>
<template #content>
<p>{{ record.orgName}}</p>
</template> -->
</template> &ndash;&gt;
<div
style="max-width: 180px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;user-select:text"
>{{ record.orgName }}</div>
<!-- </a-popover> -->
&lt;!&ndash; </a-popover> &ndash;&gt;
</a-space>
</template>
</template>-->
<template v-if="column.key === 'operation'">
<a-space>
<a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
@@ -814,8 +814,9 @@ export default {
title: '所属组织 ',
dataIndex: 'orgName',
key: 'orgName',
ellipsis: true, align: "left",
scopedSlots: { customRender: "orgName" },
ellipsis: true,
align: "left",
// scopedSlots: { customRender: "orgName" },
width: 200,
// customRender: (value, record) => {
// return (

View File

@@ -144,12 +144,12 @@
</a-space>
</template>
</template>
<template #trainOrg="{ record }">
<!-- <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;"
>{{ record.orgName }}</div>
</a-space>
</template>
</template>-->
</a-table>
</div>
@@ -1141,7 +1141,7 @@ export default {
ellipsis: true,
align: "center",
width: 200,
slots: { customRender: "trainOrg" },
// slots: { customRender: "trainOrg" },
},
{
title: '操作 ',