Merge branch 'zcwy-0415' into dev0223

This commit is contained in:
zhangsir
2024-05-14 15:34:41 +08:00

View File

@@ -2646,11 +2646,11 @@ export default {
ellipsis: true, ellipsis: true,
customRender: ({ record }) => ( customRender: ({ record }) => (
<div> <div>
{record.status == 0 {record.stuStatus == 2
? "未开始" ? "进行中"
: record.status == 1 : record.status == 1
? "已完成" ? "已完成"
: "进行中"} : "未开始"}
</div> </div>
), ),
}, },
@@ -3452,6 +3452,7 @@ export default {
}; };
//修改备注 //修改备注
const modifyRemarks = (record) => { const modifyRemarks = (record) => {
state.remarks = record.batch
state.remarksId = record.id state.remarksId = record.id
state.showRemarks = true; state.showRemarks = true;
} }