From d88c7daf794f41761d9d952280ae47d036b2bae8 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期四, 28 七月 2022 14:08:58 +0800
Subject: [PATCH] 对接

---
 src/views/goalManagement/IncentiveRecording/index.vue |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/views/goalManagement/IncentiveRecording/index.vue b/src/views/goalManagement/IncentiveRecording/index.vue
index 13a4b2c..0a2f8d9 100644
--- a/src/views/goalManagement/IncentiveRecording/index.vue
+++ b/src/views/goalManagement/IncentiveRecording/index.vue
@@ -28,15 +28,15 @@
 			<div class="btns">
 				<div>
 					<el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
-					<el-button size="default" type="warning" plain :icon="EditPen">修改</el-button>
-					<el-button size="default" type="danger" :icon="Delete" plain @click="handleSelectionChange">删除 </el-button>
+					<el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button>
+					<el-button size="default" :disabled="danger" type="danger" :icon="Delete" plain @click="handleSelectionChange">删除 </el-button>
 				</div>
 				<div>
 					<!-- <el-button size="default" :icon="Download"></el-button>
 					<el-button size="default" :icon="Refresh"></el-button> -->
 				</div>
 			</div>
-			<el-table ref="multipleTableRef" :data="tableData" style="width: 100%">
+			<el-table ref="multipleTableRef" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
 				<el-table-column type="selection" align="center" width="55" />
 				<el-table-column property="createTime" align="center" label="奖惩日期" sortable />
 				<el-table-column label="奖惩类型" align="center" sortable>
@@ -45,17 +45,14 @@
 					<span v-if="scope.row.standardType==2">惩罚</span>
 					</template>
 				</el-table-column>
-				<el-table-column property="personName" align="center" label="被奖惩者" sortable />
+				<el-table-column property="personId" align="center" label="被奖惩者" sortable />
 				<el-table-column property="content" label="奖惩内容" align="center" sortable show-overflow-tooltip />
 				<el-table-column property="reason" label="奖惩依据" align="center" sortable show-overflow-tooltip />
-				<!-- <el-table-column property="address" label="指标级别" align="center" sortable show-overflow-tooltip />
-			<el-table-column property="address" label="完成期限" align="center" sortable show-overflow-tooltip />
-			<el-table-column property="address" label="状态" align="center" sortable show-overflow-tooltip /> -->
-				<el-table-column label="操作" align="center" style="width: 300px">
-					<template #defaultt="scope">
-						<el-button link type="primary" size="default" :icon="View"  @click="openD('查看', scope.row.id)">查看</el-button>
+				<el-table-column label="操作" align="center" sortable show-overflow-tooltip>
+					<template #default="scope">
+						<el-button link type="primary" size="default" :icon="View" @click="openD('查看', scope.row.id)">查看 </el-button>
 						<el-button link type="primary" size="default" :icon="EditPen" @click="openD('修改', scope.row.id)">修改</el-button>
-						<el-button link type="primary" size="default" :icon="Delete" @click="onDelete(scope.row.id)">删除</el-button>
+						<el-button link type="primary" size="default" :icon="Delete" @click="onDelete(scope.row.id)">删除 </el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -70,7 +67,7 @@
 					@current-change="handleCurrentChange"
 				/>
 			</div>
-			<DailogAdd ref="openAdd"></DailogAdd>
+			<DailogAdd ref="openAdd" @navAddorUpdata="onAddorUpdata"></DailogAdd>
 			<DailogSearchUser ref="openUser"></DailogSearchUser>
 		</div>
 	</div>

--
Gitblit v1.9.2