From b2b4ff03eef667430942928185756f8ab1fd05ed Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 09 八月 2022 15:26:35 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut

---
 src/views/contingencyManagement/panManagement/index.vue |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/contingencyManagement/panManagement/index.vue b/src/views/contingencyManagement/panManagement/index.vue
index cc2ec1b..5667b4b 100644
--- a/src/views/contingencyManagement/panManagement/index.vue
+++ b/src/views/contingencyManagement/panManagement/index.vue
@@ -107,7 +107,7 @@
 							text
 							type="primary"
 							v-if="scope.row.approveStatus === 2 && scope.row.checkApprove === true"
-							@click="onApproval('修改',scope.row.approveId)"
+							@click="onApproval('修改',scope.row.approveId,scope.row.id)"
 						>
 							审批
 						</el-button>
@@ -116,7 +116,7 @@
 							text
 							type="primary"
 							v-if="scope.row.approveStatus === 2 && scope.row.checkApprove === false"
-							@click="onApproval('详情',scope.row.id)"
+							@click="onApproval('详情',scope.row.approveId,scope.row.id)"
 						>
               查看审批
 						</el-button>
@@ -471,17 +471,17 @@
 		};
 		// 审批
 		const approvalRef = ref();
-		const onApproval = (val: string,row: object) => {
+		const onApproval = (val: string,row: object,id) => {
       if(val=='详情'){
         approvalRef.value.openDialog('查看审批', row, true);
       } else {
-        approvalRef.value.openDialog('修改审批', row, false);
+        approvalRef.value.openDialog('审批', row, false,id);
       }
 		};
     // 审批流程
     const processRef = ref();
-    const onApprovalProcess = () => {
-      processRef.value.openDialog();
+    const onApprovalProcess = (row:object,id) => {
+      processRef.value.openDialog(row,id);
     };
 
 		//全屏

--
Gitblit v1.9.2