From e345ecd25716ed2d6cbed42d89995d733149abdd Mon Sep 17 00:00:00 2001
From: glj <13935964706@163.com>
Date: Sun, 17 Mar 2024 17:59:31 +0800
Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../responseManagement/userResponse/index.vue | 39 +++++++++++--------
.../systemManagement/administrator/index.vue | 13 ++++---
2 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index b8c66ce..ef1e982 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -88,8 +88,8 @@
-
+ >
+
@@ -126,9 +126,9 @@
- Assign
+ X
Assign
- Cancel
+ X
Cancel
Response ended
Delete
@@ -151,9 +151,9 @@
-
-
+
+
@@ -184,7 +184,7 @@
- agree
+ agree
reject
@@ -205,9 +205,9 @@
-
-
+
+
@@ -389,7 +389,7 @@
"
>Cancel
- reject
+ reject
@@ -618,15 +618,22 @@ const ApproveUserEnd = (row) => {
state.emailDialogVisibleNew = true;
};
-const ApproveUserEndData = (row) => {
+const ApproveUserEndData = (row, isEndApply) => {
+ console.log(row, '');
let data = {};
- data.id = state.disasterData.disasterId;
- data.email = state.disasterData.email;
+
+ if (row) {
+ data.id = row.disasterId;
+ data.email = row.email;
+ }else{
+ data.id = state.disasterData.disasterId;
+ data.email = state.disasterData.email;
+ }
if (state.reason) {
data.refuseReason = state.reason;
}
// data.email = "13935964706@163.com"
- data.isEndApply = row;
+ data.isEndApply = isEndApply;
examineDisasterInfoEnd(data).then((da) => {
ElMessage.success('success');
});
diff --git a/src/views/systemManagement/administrator/index.vue b/src/views/systemManagement/administrator/index.vue
index 441723f..4547d02 100644
--- a/src/views/systemManagement/administrator/index.vue
+++ b/src/views/systemManagement/administrator/index.vue
@@ -25,13 +25,14 @@
-
-
+
+
+
-
-
-
-
+
+
+
+