Merge branch 'zcwy_0712_bug' into dev_master

This commit is contained in:
nisen
2024-09-03 10:59:18 +08:00
2 changed files with 24 additions and 21 deletions

View File

@@ -487,18 +487,20 @@ const columns = ref([
key: "teacher", key: "teacher",
width: "20%", width: "20%",
align: "center", align: "center",
ellipsis: true,
customRender: ({ record }) => { customRender: ({ record }) => {
const teachers = record.offteachers; // const teachers = record.offteachers;
return teachers.map((teacher, index) => { // return teachers.map((teacher, index) => {
// 如果需要显示为列表形式 // // 如果需要显示为列表形式
return ( // return (
<div key={index}> // <div key={index}>
{teacher.teacherName} // {teacher.teacherName}
{index !== teachers.length - 1 && ', '} // {index !== teachers.length - 1 && ', '}
</div> // </div>
); // );
}); // });
}, return record.offteachers.map(item=>item.teacherName).join(',')
},
}, },
{ {

View File

@@ -1993,16 +1993,17 @@ const columns6 = [
align: "center", align: "center",
ellipsis: true, ellipsis: true,
customRender: ({ record }) => { customRender: ({ record }) => {
const teachers = record.offteachers; // const teachers = record.offteachers;
return teachers.map((teacher, index) => { // return teachers.map((teacher, index) => {
// 如果需要显示为列表形式 // // 如果需要显示为列表形式
return ( // return (
<div key={index}> // <div key={index}>
{teacher.teacherName} // {teacher.teacherName}
{index !== teachers.length - 1 && ', '} // {index !== teachers.length - 1 && ', '}
</div> // </div>
); // );
}); // });
return record.offteachers.map(item=>item.teacherName).join(',')
} }
}, },