From c60ce7e35c2c4e2f4c8b2aa24aab839a931f3a62 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: Thu, 11 Aug 2022 15:11:14 +0800
Subject: [PATCH] 对接
---
src/views/goalManagement/IncentiveRecording/index.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/views/goalManagement/IncentiveRecording/index.vue b/src/views/goalManagement/IncentiveRecording/index.vue
index 4d922b1..e1dd080 100644
--- a/src/views/goalManagement/IncentiveRecording/index.vue
+++ b/src/views/goalManagement/IncentiveRecording/index.vue
@@ -4,7 +4,7 @@
<el-row>
<el-col :span="4">
<el-form-item size="default">
- <el-input v-model="ruleForm.searchParams.personId" placeholder="请选择被奖惩者">
+ <el-input v-model="ruleForm.searchParams.personName" placeholder="请选择被奖惩者">
<template #append>
<el-button :icon="Search" @click="openSearch" />
</template>
@@ -28,8 +28,8 @@
<div class="btns">
<div>
<el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</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>
+ <!-- <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="onDeleteAll">删除 </el-button>
</div>
<div>
<!-- <el-button size="default" :icon="Download"></el-button>
@@ -38,20 +38,20 @@
</div>
<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 property="createTime" align="center" label="奖惩日期" :formatter="timeDate" sortable />
<el-table-column label="奖惩类型" align="center" sortable>
<template #default="scope">
<span v-if="scope.row.standardType == 1">奖励</span>
<span v-if="scope.row.standardType == 2">惩罚</span>
</template>
</el-table-column>
- <el-table-column property="personId" align="center" label="被奖惩者" sortable />
+ <el-table-column property="personName" 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 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="View" @click="openD('查看', scope.row)">查看 </el-button>
+ <el-button link type="primary" size="default" :icon="EditPen" @click="openD('修改', scope.row)">修改</el-button>
<el-button link type="primary" size="default" :icon="Delete" @click="onDelete(scope.row.id)">删除 </el-button>
</template>
</el-table-column>
@@ -74,6 +74,7 @@
</template>
<script lang="ts">
import DailogAdd from './component/DailogAdd.vue';
+import {timeDate} from '/@/assets/index.ts'
import DailogSearchUser from '/@/components/DailogSearchUser/index.vue';
import { ref, toRefs, reactive, onMounted, defineComponent } from 'vue';
import { ElMessageBox, ElMessage, ElButton, ElInput, TabsPaneContext, FormInstance } from 'element-plus';
@@ -228,8 +229,10 @@
};
const userId = (val: any) => {
ruleForm.searchParams.personId = val.uid;
+ ruleForm.searchParams.personName = val.realName;
};
return {
+ timeDate,
ruleForm,
userId,
resetForm,
--
Gitblit v1.9.2