From c64c8f43ec1a3d88feb1f915fd488040b6358e7d Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 09 八月 2022 19:04:12 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/goalManagement/performanceAppraisal/index.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/views/goalManagement/performanceAppraisal/index.vue b/src/views/goalManagement/performanceAppraisal/index.vue
index 6d756d8..a1c9637 100644
--- a/src/views/goalManagement/performanceAppraisal/index.vue
+++ b/src/views/goalManagement/performanceAppraisal/index.vue
@@ -38,10 +38,10 @@
</div>
</template>
</el-table-column>
- <el-table-column property="examineDate" align="center" label="考核日期" sortable />
- <el-table-column property="beExaminedDepartmentId" align="center" label="考核部门" sortable />
+ <el-table-column property="examineDate" align="center" :formatter="timeDate" label="考核日期" sortable />
+ <el-table-column property="examineDepartmentName" align="center" label="考核部门" sortable />
<el-table-column property="examinePersonId" label="考核人" align="center" sortable show-overflow-tooltip />
- <el-table-column property="beExaminedDepartmentId" label="被考核部门" align="center" sortable show-overflow-tooltip />
+ <el-table-column property="beExaminedDepartmentName" label="被考核部门" align="center" sortable show-overflow-tooltip />
<el-table-column property="examineTotalNumber" label="总分" align="center" sortable show-overflow-tooltip />
<el-table-column property="numberDetailJson.number" label="考核结果" align="center" sortable show-overflow-tooltip />
<el-table-column property="extraFile" label="附件" align="center" sortable show-overflow-tooltip />
@@ -107,7 +107,7 @@
<el-table-column property="applyRange" align="center" label="适用范围" sortable />
<el-table-column property="setPersonId" label="设定人" align="center" sortable show-overflow-tooltip />
<el-table-column property="setPersonDepartmentId" label="设定人部门" align="center" sortable show-overflow-tooltip />
- <el-table-column property="createTime" label="设定日期" align="center" sortable show-overflow-tooltip />
+ <el-table-column property="setTimem" label="设定日期" align="center" :formatter="timeDate" sortable show-overflow-tooltip />
<el-table-column property="templateCode" label="模板分类编码" align="center" sortable show-overflow-tooltip />
<el-table-column property="acceptanceNumber" label="合格分数" align="center" sortable show-overflow-tooltip />
<el-table-column label="操作" align="center" width="250px">
@@ -137,6 +137,7 @@
</div>
</template>
<script lang="ts">
+import {timeDate} from '/@/assets/index.ts'
import DailogAq from './component/DailogAq.vue';
import DailogKh from './component/DailogKh.vue';
import { ref, toRefs, reactive, onMounted, defineComponent } from 'vue';
@@ -442,6 +443,7 @@
};
const data = ref();
return {
+ timeDate,
department,
propse,
data,
--
Gitblit v1.9.2