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 @@
 
 					<el-tab-pane label="Approved" name="second">
 						<el-form-item label="vordmId"
-							><el-input style="width: 200px;" size="default" placeholder="vordmId" v-model="state.tableData.param.vordmId"> </el-input>
-							<el-button size="default" type="primary" @click="getTableData" style="margin-left: 30px;">
+							><el-input style="width: 200px" size="default" placeholder="vordmId" v-model="state.tableData.param.vordmId"> </el-input>
+							<el-button size="default" type="primary" @click="getTableData" style="margin-left: 30px">
 								<el-icon>
 									<ele-Search />
 								</el-icon>
@@ -126,9 +126,9 @@
 							</el-table-column>
 							<el-table-column width="300" prop="Operate" label="Operate" show-overflow-tooltip sortable>
 								<template #default="scope">
-									<el-button size="small" text v-if="scope.row.chiefName" type="info">Assign</el-button>
+									<el-button size="small" text v-if="scope.row.chiefName" type="info" style="width: 36px">X</el-button>
 									<el-button size="small" text v-if="!scope.row.chiefName" type="primary" @click="onAllocation(scope.row)">Assign</el-button>
-									<el-button size="small" text v-if="!scope.row.chiefName" type="info">Cancel</el-button>
+									<el-button size="small" text v-if="!scope.row.chiefName" type="info" style="width: 36px">X</el-button>
 									<el-button size="small" text v-if="scope.row.chiefName" type="primary" @click="deleteManage(scope.row)">Cancel</el-button>
 									<el-button size="small" text type="danger" @click="responseEnded(scope.row)">Response ended</el-button>
 									<el-button size="small" text type="danger" @click="remove(scope.row)" v-auth-role="'admin'">Delete</el-button>
@@ -151,9 +151,9 @@
 					</el-tab-pane>
 
 					<el-tab-pane label="End - Apply" name="firstEndExamine">
-            <el-form-item label="vordmId"
-							><el-input style="width: 200px;" size="default" placeholder="vordmId" v-model="state.tableData.param.vordmId"> </el-input>
-							<el-button size="default" type="primary" @click="getTableData" style="margin-left: 30px;">
+						<el-form-item label="vordmId"
+							><el-input style="width: 200px" size="default" placeholder="vordmId" v-model="state.tableData.param.vordmId"> </el-input>
+							<el-button size="default" type="primary" @click="getTableData" style="margin-left: 30px">
 								<el-icon>
 									<ele-Search />
 								</el-icon>
@@ -184,7 +184,7 @@
 							</el-table-column>
 							<el-table-column prop="Operate" label="Operate" show-overflow-tooltip sortable>
 								<template #default="scope">
-									<el-button size="small" text type="primary" @click="ApproveUserEndData(2)">agree</el-button>
+									<el-button size="small" text type="primary" @click="ApproveUserEndData(scope.row, 2)">agree</el-button>
 									<el-button size="small" text type="primary" @click="ApproveUserEnd(scope.row)">reject</el-button>
 								</template>
 							</el-table-column>
@@ -205,9 +205,9 @@
 					</el-tab-pane>
 
 					<el-tab-pane label="Completed" name="firstNewOne">
-            <el-form-item label="vordmId"
-							><el-input style="width: 200px;" size="default" placeholder="vordmId" v-model="state.tableData.param.vordmId"> </el-input>
-							<el-button size="default" type="primary" @click="getTableData" style="margin-left: 30px;">
+						<el-form-item label="vordmId"
+							><el-input style="width: 200px" size="default" placeholder="vordmId" v-model="state.tableData.param.vordmId"> </el-input>
+							<el-button size="default" type="primary" @click="getTableData" style="margin-left: 30px">
 								<el-icon>
 									<ele-Search />
 								</el-icon>
@@ -389,7 +389,7 @@
 							"
 							>Cancel</el-button
 						>
-						<el-button type="primary" @click="ApproveUserEndData(3)"> reject </el-button>
+						<el-button type="primary" @click="ApproveUserEndData(null,3)"> reject </el-button>
 					</span>
 				</template>
 			</el-dialog>
@@ -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 @@
         </div>
         <el-table :data="state.tableData.data" v-loading="state.tableData.loading"
           @selection-change="handleSelectionChange" style="width: 100%">
-          <el-table-column prop="disasterType" label="Disaster Type" show-overflow-tooltip sortable></el-table-column>
-          <el-table-column prop="disasterCountry" label="Affected Country" show-overflow-tooltip sortable></el-table-column>
+          <el-table-column prop="vordmId" label="Vordm Id" show-overflow-tooltip sortable></el-table-column>
+          <el-table-column prop="disasterType" label="Disaster Type" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="disasterCountry" label="Affected Country" show-overflow-tooltip></el-table-column>
           <el-table-column prop="disasterTime" label="Disaster Time" show-overflow-tooltip sortable></el-table-column>
-          <el-table-column prop="managerName" label="Manager" show-overflow-tooltip sortable></el-table-column>
-          <el-table-column prop="sponsorOrganization" label="Sponsor Organization" show-overflow-tooltip sortable></el-table-column>
-          <el-table-column prop="researchField" label="Research Field" show-overflow-tooltip sortable></el-table-column>
-          <el-table-column prop="occupation" label="Occupation" show-overflow-tooltip sortable></el-table-column>
+          <el-table-column prop="managerName" label="Manager" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="sponsorOrganization" label="Sponsor Organization" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="researchField" label="Research Field" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="occupation" label="Occupation" show-overflow-tooltip></el-table-column>
           <el-table-column prop="applyTime" label="Apply Time" show-overflow-tooltip sortable></el-table-column>
           <el-table-column v-if="state.status == '1'" prop="reviewTime" label="Review Time" show-overflow-tooltip sortable></el-table-column>
           <el-table-column v-if="state.status == '0'" prop="Operate" label="Operate" show-overflow-tooltip>