From 998b75f0d4aaed03001ec4246cd4f3b4b0743b7e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 23 Nov 2022 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/const/taskinfo/taskinfo.js | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/const/taskinfo/taskinfo.js b/src/const/taskinfo/taskinfo.js
index 7a028de..7eaa553 100644
--- a/src/const/taskinfo/taskinfo.js
+++ b/src/const/taskinfo/taskinfo.js
@@ -6,7 +6,9 @@
searchMenuSpan: 6,
border: true,
index: true,
- viewBtn: true,
+ viewBtn: false,
+ delBtn: false,
+ editBtn: false,
selection: true,
dialogClickModal: false,
column: [
@@ -24,6 +26,7 @@
prop: "title",
type: "input",
search: true,
+ searchSpan:4,
span: 24,
rules: [{
required: true,
@@ -36,6 +39,7 @@
prop: "startTime",
type: "datetime",
search: true,
+ searchSpan:5,
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
value: new Date(),
@@ -50,6 +54,7 @@
prop: "endTime",
type: "datetime",
search: true,
+ searchSpan:5,
defaultTime: '23:59:59',
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
@@ -74,20 +79,28 @@
label: "巡检人员",
prop: "toUserId",
type: "select",
+ search: true,
+ searchSpan:4,
span: 24,
dicUrl: "/api/blade-user/user-list",
- dataType: "number",
props: {
label: "name",
value: "id"
},
+ rules:[{
+ required: true,
+ message: "请输入巡检人员",
+ trigger: "blur"
+ }]
},
{
label: "任务状态",
prop: "state",
type: "select",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=TACK_STATE",
- dataType: "number",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
props: {
label: "dictValue",
value: "dictKey"
@@ -97,7 +110,10 @@
label: "任务来源",
prop: "source",
type: "select",
- dicData: [{id:'WEB',name:'WEB'},{id:'APP',name:'APP'}],
+ dicData: [{id:'SYSTEMNEW',name:'系统创建'},{id:'SYSTEMAUTO',name:'计划任务新增'}],
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
props: {
label: "name",
value: "id"
@@ -108,6 +124,9 @@
prop: "routeRange",
type: "input",
hide: true,
+ span: 24,
+ display: true,
+ addDisplay: true
},
{
label: "创建人",
--
Gitblit v1.9.3