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 | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 203 insertions(+), 31 deletions(-)
diff --git a/src/option/evaluate/evaluateTask.js b/src/option/evaluate/evaluateTask.js
index c406616..d94ac22 100644
--- a/src/option/evaluate/evaluateTask.js
+++ b/src/option/evaluate/evaluateTask.js
@@ -1,23 +1,25 @@
const status = {
0: '未开始',
1: '进行中',
- 2: '已结束'
+ 2: '已完成'
}
-export default {
- height:'auto',
+export const option = {
+ height: 'auto',
calcHeight: 30,
tip: false,
searchShow: true,
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,35 +61,32 @@
{
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 {
- value.forEach(item => {
- num += Number(item.val)
- })
- }
- return num + '人'
+ return 0
},
-
},
{
- label: "候选人截止日期",
- prop: "candidateCutoffTime",
- type: "date",
- format: "YYYY-MM-DD HH:mm:ss",
- valueFormat: "YYYY-MM-DD HH:mm:ss",
- minWidth: '200px'
+ label: "类型",
+ prop: 'type',
+ type: 'select',
+ hide: true,
+ dicData: [{
+ label: '个人评优',
+ value: 0,
+ },
+ {
+ label: '部门评优',
+ value: 1,
+ }]
},
{
- label: "候选人状态",
+ label: "第一轮状态",
prop: "candidateState",
type: "input",
addDisplay: false,
@@ -99,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,
@@ -125,6 +122,181 @@
minWidth: '100px'
},
{
+ label: "第二轮结束时间",
+ prop: "evaluateCutoffTimeEnd",
+ type: "input",
+ minWidth: '170px'
+ },
+ {
+ 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,
+ },
+ ]
+}
+
+export const sectionOption = {
+ height: 'auto',
+ calcHeight: 30,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ viewBtn: false,
+ addBtn: false,
+ editBtn: false,
+ delBtn: false,
+ selection: true,
+ dialogClickModal: false,
+ menuFixed: 'right',
+ 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",
+ search: true,
+ 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: "类型",
+ prop: 'type',
+ type: 'select',
+ hide: true,
+ dicData: [{
+ label: '个人评优',
+ value: 0,
+ },
+ {
+ label: '部门评优',
+ value: 1,
+ }]
+ },
+ {
+ label: "评优数量",
+ prop: "evaluateNum",
+ type: "input",
+ minWidth: '100px'
+ },
+ {
+ label: "评选状态",
+ prop: "evaluateState",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ formatter: (row, value) => {
+ return status[value]
+ },
+ minWidth: '100px'
+ },
+ {
+ label: "截止时间",
+ prop: "candidateCutoffTimeEnd",
+ minWidth: '200px'
+ },
+ {
label: "创建人",
prop: "createUser",
type: "input",
--
Gitblit v1.9.3