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

src/views/finance/purchasingrequisition/index.vue

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