From d13cebe7fbadd396e91a989af331df8a8e7b40f8 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Jan 2025 11:40:42 +0800
Subject: [PATCH] 考核结果查看详情

---
 src/option/evaluate/evaluateTask.js |  185 ++++-----------------------------------------
 1 files changed, 18 insertions(+), 167 deletions(-)

diff --git a/src/option/evaluate/evaluateTask.js b/src/option/evaluate/evaluateTask.js
index a407a7d..871687d 100644
--- a/src/option/evaluate/evaluateTask.js
+++ b/src/option/evaluate/evaluateTask.js
@@ -47,43 +47,13 @@
       minWidth: '120px'
     },
     {
-      label: "任务类别",
-      prop: "taskType",
-      type: "input",
-      minWidth: '100px'
-    },
-    {
-      label: "认定标准描述",
-      prop: "remark",
-      type: "input",
-      hide: true,
-    },
-    {
-      label: "候选人数量",
-      prop: "candidateNum",
-      type: "textarea",
-      span: 24,
-      minWidth: '100px',
-      // prop: {
-      //   label: "title",
-      // },
-      formatter: (row, value) => {
-       return value
-      },
-    },
-    {
-      label: "类型",
+      label: "任务类型",
       prop: 'type',
-      type: 'select',
-      hide: true,
-      dicData: [{
-        label: '个人评优',
-        value: 0,
-      },
-      {
-        label: '部门评优',
-        value: 1,
-      }]
+      type: 'input',
+      minWidth: '120px',
+      formatter: (row, value) => {
+        return value ? '部门评优' : '员工评优'
+      }
     },
     {
       label: "第一轮状态",
@@ -92,6 +62,7 @@
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
+      slot: true,
       formatter: (row, value) => {
         return status[value]
       },
@@ -105,25 +76,20 @@
       isSlot: true
     },
     {
-      label: "评优数量",
-      prop: "evaluateNum",
-      type: "input",
-      minWidth: '100px'
-    },
-    {
       label: "第二轮状态",
       prop: "evaluateState",
       type: "input",
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
+      slot: true,
       formatter: (row, value) => {
         return status[value]
       },
       minWidth: '100px'
     },
     {
-      label: "第二轮结束时间",
+      label: "第二轮时间",
       prop: "evaluateCutoffTimeEnd",
       type: "input",
       minWidth: '170px',
@@ -213,24 +179,6 @@
   labelWidth: '120',
   column: [
     {
-      label: "主键",
-      prop: "id",
-      type: "input",
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: "租户ID",
-      prop: "tenantId",
-      type: "input",
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
       label: "任务名称",
       prop: "taskName",
       type: "input",
@@ -238,48 +186,13 @@
       minWidth: '120px'
     },
     {
-      label: "任务类别",
-      prop: "taskType",
-      type: "input",
-      minWidth: '100px'
-    },
-    {
-      label: "认定标准描述",
-      prop: "remark",
-      type: "input",
-      hide: true,
-    },
-    {
-      label: "评定人数量",
-      prop: "candidateNum",
-      type: "textarea",
-      span: 24,
-      minWidth: '100px',
-      slot: 'true',
-      formatter: (row, value) => {
-        
-        return 0
-      },
-    },
-    {
-      label: "类型",
+      label: "任务类型",
       prop: 'type',
-      type: 'select',
-      hide: true,
-      dicData: [{
-        label: '个人评优',
-        value: 0,
-      },
-      {
-        label: '部门评优',
-        value: 1,
-      }]
-    },
-    {
-      label: "评优数量",
-      prop: "evaluateNum",
-      type: "input",
-      minWidth: '100px'
+      type: 'input',
+      minWidth: '120px',
+      formatter: (row, value) => {
+        return value ? '部门评优' : '员工评优'
+      }
     },
     {
       label: "评选状态",
@@ -288,6 +201,7 @@
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
+      slot: true,
       formatter: (row, value) => {
         return status[value]
       },
@@ -295,71 +209,8 @@
     },
     {
       label: "截止时间",
-      prop: "candidateCutoffTimeEnd",
+      prop: "evaluateCutoffTimeEnd",
       minWidth: '200px'
-    },
-    {
-      label: "创建人",
-      prop: "createUser",
-      type: "input",
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: "创建部门",
-      prop: "createDept",
-      type: "input",
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: "创建时间",
-      prop: "createTime",
-      type: "input",
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: "修改人",
-      prop: "updateUser",
-      type: "input",
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: "修改时间",
-      prop: "updateTime",
-      type: "input",
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: "状态",
-      prop: "status",
-      type: "input",
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: "是否已删除",
-      prop: "isDeleted",
-      type: "input",
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
+    }
   ]
 }

--
Gitblit v1.9.3