From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/contingencyManagement/emergencyPlanStartRecord/index.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/contingencyManagement/emergencyPlanStartRecord/index.vue b/src/views/contingencyManagement/emergencyPlanStartRecord/index.vue
index 29f589c..54794f7 100644
--- a/src/views/contingencyManagement/emergencyPlanStartRecord/index.vue
+++ b/src/views/contingencyManagement/emergencyPlanStartRecord/index.vue
@@ -28,7 +28,7 @@
</div>
<div class="button_Line">
<div class="button_Left">
- <el-button size="default" type="warning" plain :disabled="warning">
+ <el-button size="default" type="warning" plain :disabled="warning" @click="onEdit('修改',deleteAll[0])">
<el-icon>
<Edit />
</el-icon>修改
@@ -157,12 +157,15 @@
// 请求列表数据
const onSubmit = async () => {
+ var planName = listQuery.searchParams.planName
+ delete listQuery.searchParams.planName
let res = await emergencyPlanLogApi().getEmergencyPlanLogList(listQuery);
if (res.data.code == 200) {
tableData.value = res.data.data;
pageIndex.value = res.data.pageIndex;
pageSize.value = res.data.pageSize;
total.value = res.data.total;
+ listQuery.searchParams.planName = planName
} else {
ElMessage.error(res.data.msg);
}
@@ -402,4 +405,4 @@
min-width: 30px;
border-radius: 2px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2