From 06dd89e20c026ed578dcbc7618f83c7b3d8f6e15 Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Fri, 29 Dec 2023 15:23:29 +0800
Subject: [PATCH] 考核任务任务配置完善

---
 src/option/evaluate/evaluateTask.js |   93 ++++++++++++++++------------------------------
 1 files changed, 32 insertions(+), 61 deletions(-)

diff --git a/src/option/evaluate/evaluateTask.js b/src/option/evaluate/evaluateTask.js
index 73d49d9..d94ac22 100644
--- a/src/option/evaluate/evaluateTask.js
+++ b/src/option/evaluate/evaluateTask.js
@@ -12,12 +12,14 @@
   searchMenuSpan: 6,
   border: true,
   index: true,
-  viewBtn: true,
+  viewBtn: false,
   addBtn: false,
   editBtn: false,
+  delBtn: false,
   selection: true,
   dialogClickModal: false,
   menuFixed: 'right',
+  labelWidth: '120',
   column: [
     {
       label: "主键",
@@ -59,28 +61,14 @@
     {
       label: "候选人数量",
       prop: "candidateNum",
-      type: "input",
+      type: "textarea",
       span: 24,
       minWidth: '100px',
       // prop: {
       //   label: "title",
       // },
       formatter: (row, value) => {
-        let num = 0
-        if (value === void 0) {
-          num = 0
-        } else {
-          if (!row.type) {
-            value.forEach(item => {
-              num += Number(item.val)
-            })
-          } else {
-            row.candidateNum.forEach(item => {
-              num += Number(item.users.length)
-            })
-          }
-        }
-        return num + '人'
+       return 0
       },
     },
     {
@@ -98,15 +86,7 @@
       }]
     },
     {
-      label: "候选人截止日期",
-      prop: "candidateCutoffTime",
-      type: "date",
-      format: "YYYY-MM-DD HH:mm:ss",
-      valueFormat: "YYYY-MM-DD HH:mm:ss",
-      minWidth: '200px'
-    },
-    {
-      label: "候选人状态",
+      label: "第一轮状态",
       prop: "candidateState",
       type: "input",
       addDisplay: false,
@@ -118,21 +98,19 @@
       minWidth: '100px'
     },
     {
+      label: "第一轮结束时间",
+      prop: "candidateCutoffTimeEnd",
+      type: "input",
+      minWidth: '170px'
+    },
+    {
       label: "评优数量",
       prop: "evaluateNum",
       type: "input",
       minWidth: '100px'
     },
     {
-      label: "评优评先截止时间",
-      prop: "evaluateCutoffTime",
-      type: "date",
-      format: "YYYY-MM-DD HH:mm:ss",
-      valueFormat: "YYYY-MM-DD HH:mm:ss",
-      minWidth: '200px'
-    },
-    {
-      label: "评优评选状态",
+      label: "第二轮状态",
       prop: "evaluateState",
       type: "input",
       addDisplay: false,
@@ -142,6 +120,12 @@
         return status[value]
       },
       minWidth: '100px'
+    },
+    {
+      label: "第二轮结束时间",
+      prop: "evaluateCutoffTimeEnd",
+      type: "input",
+      minWidth: '170px'
     },
     {
       label: "创建人",
@@ -217,12 +201,14 @@
   searchMenuSpan: 6,
   border: true,
   index: true,
-  viewBtn: true,
+  viewBtn: false,
   addBtn: false,
   editBtn: false,
+  delBtn: false,
   selection: true,
   dialogClickModal: false,
   menuFixed: 'right',
+  labelWidth: '120',
   column: [
     {
       label: "主键",
@@ -264,25 +250,13 @@
     {
       label: "评定人数量",
       prop: "candidateNum",
-      type: "input",
+      type: "textarea",
       span: 24,
       minWidth: '100px',
+      slot: 'true',
       formatter: (row, value) => {
-        let num = 0
-        if (value === void 0) {
-          num = 0
-        } else {
-          if (!row.type) {
-            value.forEach(item => {
-              num += Number(item.val)
-            })
-          } else {
-            row.candidateNum.forEach(item => {
-              num += Number(item.users.length)
-            })
-          }
-        }
-        return num + '人'
+        
+        return 0
       },
     },
     {
@@ -306,15 +280,7 @@
       minWidth: '100px'
     },
     {
-      label: "评优评先截止时间",
-      prop: "evaluateCutoffTime",
-      type: "date",
-      format: "YYYY-MM-DD HH:mm:ss",
-      valueFormat: "YYYY-MM-DD HH:mm:ss",
-      minWidth: '200px'
-    },
-    {
-      label: "评优评选状态",
+      label: "评选状态",
       prop: "evaluateState",
       type: "input",
       addDisplay: false,
@@ -326,6 +292,11 @@
       minWidth: '100px'
     },
     {
+      label: "截止时间",
+      prop: "candidateCutoffTimeEnd",
+      minWidth: '200px'
+    },
+    {
       label: "创建人",
       prop: "createUser",
       type: "input",

--
Gitblit v1.9.3