Merge branch 'developer' of ssh://code.cyweb.top:30033/scj/zhxy/v3/cloud-ui into developer

This commit is contained in:
zhoutianchi
2026-02-06 14:24:44 +08:00

View File

@@ -375,7 +375,7 @@ const handleIframeMessage = (event: MessageEvent) => {
}; };
/** /**
<<<<<<< HEAD /**
* 打开查看对话框 * 打开查看对话框
* @param row - 当前行数据 * @param row - 当前行数据
*/ */
@@ -389,13 +389,15 @@ const handleView = (row: any) => {
*/ */
const handleEdit = (row: any) => { const handleEdit = (row: any) => {
formDialogRef.value?.openDialog('edit', row); formDialogRef.value?.openDialog('edit', row);
======= };
/**
* 履约验收 * 履约验收
* @param row - 当前行数据
*/ */
const handleAccept = (row: any) => { const handleAccept = (row: any) => {
acceptModalRef.value?.open(row); acceptModalRef.value?.open(row);
>>>>>>> 61380fa2bca0fe9fd37af1c494a51ba523501f7d };
};
/** /**
* 删除当前行 * 删除当前行