From 5b5751cf48e08f701d614acf01611a17ac7278f5 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 14 九月 2023 09:27:39 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 2 +-
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 2 +-
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 3ba7da9..9de85e8 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -221,7 +221,7 @@
format: formItem.dateFormate,
keyAttr: formItem.keyAttr,
value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
- (formItem.secType == "codedatesec"?formItem.codeDateFormatStr: null) || ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null),
+ ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null),
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
tip: formItem.tooltips,
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 0f09a76..04ea8ba 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -147,7 +147,7 @@
coderefersec: "refer",//寮曠敤鐮佹
codeattrsec: "text",
codelevelsec: "text",
- codedatesec: "text"
+ codedatesec: "date"
},
selfColumnConfig: {
function: {
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 9378a8b..2ef787b 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -4,7 +4,7 @@
<!-- 宸︿晶鑿滃崟-->
<el-aside>
<basic-container style="overflow:hidden;">
- <div style="overflow: hidden">
+ <div>
<div>
<div style="display: flex; flex-direction: column;">
<div style="display: flex;">
--
Gitblit v1.9.3