From 1e6002d7d40ea4812bfd705e16735a20095cd1a3 Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 17 Feb 2023 10:37:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=AF=84=E4=BC=B0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BA=BA=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/examine/CourseReviewed.vue | 35 ++++++++++++++++++--------- src/views/research/ResearchManage.vue | 4 +-- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue index 737b8880..d1b64b31 100644 --- a/src/views/examine/CourseReviewed.vue +++ b/src/views/examine/CourseReviewed.vue @@ -137,11 +137,29 @@ export default { //审核记录的表 columnsAudit: [ { - title: "审核人", + title: "HRBP 审核", dataIndex: "createName", key: "createName", align: "center", - width: "20%", + // width: "20%", + ellipsis: true, + customRender: (text) => ( +
+ {text.record.createName} +
+ {/* 通过 */} + {{ 2: "审核通过", "-2": "审核拒绝" }[text.record.status + ""]} +
+ {text.record.createTime} +
+ ), + }, + { + title: "HRBP 备注", + dataIndex: "description", + key: "description", + align: "center", + // width: "30%", ellipsis: true, }, @@ -150,7 +168,7 @@ export default { dataIndex: "status", key: "status", align: "center", - width: "20%", + // width: "20%", customRender: ({ record: { status } }) => (
{{ 2: "审核通过", "-2": "审核拒绝" }[status + ""]}
), @@ -161,18 +179,11 @@ export default { dataIndex: "createTime", key: "createTime", align: "center", - width: "20%", + // width: "20%", ellipsis: true, }, - { - title: "备注", - dataIndex: "description", - key: "description", - align: "center", - width: "30%", - ellipsis: true, - }, + ], columns1: [ // { diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 5aafc594..96325a5c 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -367,8 +367,8 @@ export default { }, { title: "创建人", - dataIndex: "creater", - key: "creater", + dataIndex: "createName", + key: "createName", width: "10%", align: "center", className: "h",