From cf99447e8e85d32f0d167e1a71ab33a0166bc935 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 16 八月 2022 09:24:48 +0800
Subject: [PATCH] 对接

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

diff --git a/src/views/goalManagement/targetEscalation/index.vue b/src/views/goalManagement/targetEscalation/index.vue
index 0c4efbe..22535be 100644
--- a/src/views/goalManagement/targetEscalation/index.vue
+++ b/src/views/goalManagement/targetEscalation/index.vue
@@ -33,16 +33,16 @@
 				<el-table-column v-if="activeName == 1" label="操作" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-button link type="primary" size="default" :icon="EditPen" v-if="scope.row.approveStatus==null" @click="TypeDailog('发起审批','检查',scope.row.id,1)">发起审批</el-button>
-						<el-button link type="primary" size="default" :icon="EditPen" v-if="scope.row.approveStatus==2&&scope.row.checkApprove==true"  @click="TypeDailog('审批','检查',scope.row.approveId,1)">审批</el-button>
-						<el-button link type="primary" size="default" :icon="EditPen" v-if="scope.row.approveStatus==2&&scope.row.checkApprove==false" @click="TypeDailog('查看审批','检查',scope.row.approveId,1)">查看审批</el-button>
+						<el-button link type="primary" size="default" :icon="EditPen" v-if="scope.row.approveStatus==2&&scope.row.checkApprove==true"  @click="TypeDailog('审批',scope.row.id,scope.row.approveId,1,scope.row)">审批</el-button>
+						<el-button link type="primary" size="default" :icon="EditPen" v-if="scope.row.approveStatus==2&&scope.row.checkApprove==false" @click="TypeDailog('查看审批',scope.row.id,scope.row.approveId,1,scope.row)">查看审批</el-button>
 						<el-button link type="primary" size="default" :icon="EditPen" v-if="scope.row.approveStatus==3" @click="openDai(scope.row.id,1)" >查看审批流程</el-button>
 					</template>
 				</el-table-column>
 				<el-table-column v-if="activeName == 2" label="操作" align="center" show-overflow-tooltip>
 					<template #default="scope">
 							<el-button link type="primary" size="default" :icon="EditPen" v-if="scope.row.approveStatus==null" @click="TypeDailog('发起审批','检查',scope.row.id,2)">发起审批</el-button>
-						<el-button link type="primary" size="default" :icon="EditPen" v-if="scope.row.approveStatus==2&&scope.row.checkApprove==true"  @click="TypeDailog('审批','检查',scope.row.approveId,2)">审批</el-button>
-						<el-button link type="primary" size="default" :icon="EditPen" v-if="scope.row.approveStatus==2&&scope.row.checkApprove==false" @click="TypeDailog('查看审批','检查',scope.row.approveId,2)">查看审批</el-button>
+						<el-button link type="primary" size="default" :icon="EditPen" v-if="scope.row.approveStatus==2&&scope.row.checkApprove==true"  @click="TypeDailog('审批',scope.row.id,scope.row.approveId,2,scope.row)">审批</el-button>
+						<el-button link type="primary" size="default" :icon="EditPen" v-if="scope.row.approveStatus==2&&scope.row.checkApprove==false" @click="TypeDailog('查看审批',scope.row.id,scope.row.approveId,2,scope.row)">查看审批</el-button>
 						<el-button link type="primary" size="default" :icon="EditPen" v-if="scope.row.approveStatus==3" @click="openDai(scope.row.id,2)" >查看审批流程</el-button>
 					</template>
 				</el-table-column>
@@ -140,8 +140,8 @@
 		};
 		// 发起审批弹窗
 		const TypeD = ref();
-		const TypeDailog = (title:string,name:string,id:number,type:number) => {
-			TypeD.value.openDialog(title,name,id,type);
+		const TypeDailog = (title:string,name:string,id:number,type:number,data:any) => {
+			TypeD.value.openDialog(title,name,id,type,data);
 		};
 		const typeAlign=()=>{
 			listApi();

--
Gitblit v1.9.2