From 70d2ec3a55ade194b5473fa546410d62018dc45b Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期一, 18 七月 2022 17:55:27 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue b/src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue
index f64d99a..eb03853 100644
--- a/src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue
+++ b/src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue
@@ -52,7 +52,7 @@
<EditPen />
</el-icon>评价
</el-button>
- <el-button size="small" text type="primary" @click="onApprovalProgress(scope.row)">
+ <el-button size="small" text type="primary" @click="onFlowChart(scope.row)">
审批进度
</el-button>
<el-button size="small" text type="primary" @click="onApprovalProgress(scope.row)">
@@ -91,6 +91,7 @@
</el-tabs>
</el-card>
<ApprovalProgress ref="approvalRef" />
+ <FlowChart ref="flowRef" />
<RectificationDialog ref="rectificationRef" />
<OpenEdit ref="editRef" />
<upData ref="upShow"></upData>
@@ -116,6 +117,7 @@
Refresh,
EditPen,
} from '@element-plus/icons-vue'
+import FlowChart from '/@/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/component/flowChart.vue'
import ApprovalProgress from '/@/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/component/approvalProgress.vue';
import OpenEdit from '/@/views/contingencyManagement/panManagement/component/openEdit.vue';
import UpData from '/@/views/contingencyManagement/panManagement/component/upData.vue';
@@ -160,7 +162,8 @@
Refresh,
UpData,
ApprovalProgress,
- RectificationDialog
+ RectificationDialog,
+ FlowChart
},
setup() {
const activeName = ref('first')
@@ -231,7 +234,11 @@
teamLeader: '王磊',
}
]
-
+ // 审批进度弹窗
+ const flowRef = ref();
+ const onFlowChart = (row: TableDataRow) => {
+ flowRef.value.openDialog(row);
+ };
// 打开修改用户弹窗
const editRef = ref();
const onOpenEdit = (row: TableDataRow) => {
@@ -275,6 +282,8 @@
approvalRef,
onRectificationDialog,
rectificationRef,
+ onFlowChart,
+ flowRef,
};
},
});
--
Gitblit v1.9.2