From c08ddeb816977e8f252ff5450930f22c82b855f6 Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Sat, 6 May 2023 14:50:35 +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

---
 .../userResponse/component/selectUser.vue     |  2 +-
 .../responseManagement/userResponse/index.vue | 99 ++++++++++---------
 2 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/src/views/responseManagement/userResponse/component/selectUser.vue b/src/views/responseManagement/userResponse/component/selectUser.vue
index f69b716..464e074 100644
--- a/src/views/responseManagement/userResponse/component/selectUser.vue
+++ b/src/views/responseManagement/userResponse/component/selectUser.vue
@@ -82,7 +82,7 @@ const save = async () => {
 		return;
 	}
 	let params = {
-		id: state.rowData.id,
+		id: state.rowData.disasterId,
 		chiefId: state.selectData[0].id,
 		chiefName: state.selectData[0].name,
 	};
diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index 9e523ae..a795481 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -78,6 +78,55 @@
             </el-pagination>
           </el-tab-pane>
 
+          <el-tab-pane label="Rejected"
+                       name="firstNew">
+            <el-table :data="state.tableData.data"
+                      v-loading="state.tableData.loading"
+                      style="width: 100%">
+              <el-table-column prop="username"
+                               label="User name"
+                               show-overflow-tooltip
+                               sortable></el-table-column>
+              <el-table-column prop="organization"
+                               label="Organization"
+                               show-overflow-tooltip
+                               sortable></el-table-column>
+              <el-table-column prop="disasterType"
+                               label="Disaster type"
+                               show-overflow-tooltip
+                               sortable>
+                <!-- 在disasterType中获取dictKey 对应的dictValue -->
+                <template #default="scope">
+                  <el-tag type="info">{{ getValue(scope.row.disasterType) }}</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column prop="disasterKeyword"
+                               label="Disaster keyword"
+                               show-overflow-tooltip
+                               sortable></el-table-column>
+              <el-table-column prop="disasterTime"
+                               label="Disaster time"
+                               show-overflow-tooltip
+                               sortable>
+                <template #default="scope">
+                  <!-- 格式化去除时分秒 -->
+                  {{ dateFormat(scope.row.disasterTime) }}
+                </template>
+              </el-table-column>
+            </el-table>
+            <el-pagination @size-change="onHandleSizeChange"
+                           @current-change="onHandleCurrentChange"
+                           class="mt15"
+                           :pager-count="5"
+                           :page-sizes="[10, 20, 30]"
+                           v-model:current-page="state.tableData.param.current"
+                           background
+                           v-model:page-size="state.tableData.param.size"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="state.tableData.total">
+            </el-pagination>
+          </el-tab-pane>
+
           <el-tab-pane label="Approved"
                        name="second">
             <el-table :data="state.tableData.data"
@@ -170,55 +219,7 @@
             </el-pagination>
           </el-tab-pane>
 
-          <el-tab-pane label="Rejected"
-                       name="firstNew">
-            <el-table :data="state.tableData.data"
-                      v-loading="state.tableData.loading"
-                      style="width: 100%">
-              <el-table-column prop="username"
-                               label="User name"
-                               show-overflow-tooltip
-                               sortable></el-table-column>
-              <el-table-column prop="organization"
-                               label="Organization"
-                               show-overflow-tooltip
-                               sortable></el-table-column>
-              <el-table-column prop="disasterType"
-                               label="Disaster type"
-                               show-overflow-tooltip
-                               sortable>
-                <!-- 在disasterType中获取dictKey 对应的dictValue -->
-                <template #default="scope">
-                  <el-tag type="info">{{ getValue(scope.row.disasterType) }}</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column prop="disasterKeyword"
-                               label="Disaster keyword"
-                               show-overflow-tooltip
-                               sortable></el-table-column>
-              <el-table-column prop="disasterTime"
-                               label="Disaster time"
-                               show-overflow-tooltip
-                               sortable>
-                <template #default="scope">
-                  <!-- 格式化去除时分秒 -->
-                  {{ dateFormat(scope.row.disasterTime) }}
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-pagination @size-change="onHandleSizeChange"
-                           @current-change="onHandleCurrentChange"
-                           class="mt15"
-                           :pager-count="5"
-                           :page-sizes="[10, 20, 30]"
-                           v-model:current-page="state.tableData.param.current"
-                           background
-                           v-model:page-size="state.tableData.param.size"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="state.tableData.total">
-            </el-pagination>
-          </el-tab-pane>
-
+          
           <el-tab-pane label="Finish"
                        name="firstNewOne">
             <el-table :data="state.tableData.data"