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/taskinfoPlan.js |   40 +++++++++++++++++++++++++++++-----------
 1 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/const/taskinfo/taskinfoPlan.js b/src/const/taskinfo/taskinfoPlan.js
index ad676b0..95a0343 100644
--- a/src/const/taskinfo/taskinfoPlan.js
+++ b/src/const/taskinfo/taskinfoPlan.js
@@ -39,6 +39,22 @@
       search: true,
     },
     {
+      label: "创建时间",
+      prop: "daterange",
+      type: "daterange",
+      format:'yyyy-MM-dd',
+      valueFormat:'yyyy-MM-dd',
+      startPlaceholder: '',
+      endPlaceholder: '',
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide:true,
+      search: true,
+      searchOrder:-99,
+      searchRange:true
+    },
+    {
       label: "执行周期",
       prop: "type",
       type: "select",
@@ -65,12 +81,25 @@
     {
       label: "内容",
       prop: "content",
+      span: 24,
       type: "textarea",
+    },
+    {
+      label: "是否启用",
+      prop: "status",
+      type: "radio",
+      dicUrl: "/api/blade-system/dict/dictionary?code=yes_no",
+      dataType: "number",
+      props: {
+        label: "dictValue",
+        value: "dictKey"
+      },
     },
     {
       label: "路线范围",
       prop: "routeRange",
       type: "input",
+      span: 24,
       hide: true
     },
     {
@@ -108,17 +137,6 @@
       editDisplay: false,
       viewDisplay: false,
       hide: true,
-    },
-    {
-      label: "是否启用",
-      prop: "status",
-      type: "radio",
-      dicUrl: "/api/blade-system/dict/dictionary?code=yes_no",
-      dataType: "number",
-      props: {
-        label: "dictValue",
-        value: "dictKey"
-      },
     },
     {
       label: "是否已删除",

--
Gitblit v1.9.3