From 2be0ef348c881796d66e112463f62be5ef374527 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 14 十一月 2023 11:46:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 2f60c90..ea31d7c 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -190,11 +190,11 @@
       let dictKeys = [];
       let slotColumnList = [];
       formItemList.forEach((formItem) => {
-        console.log('formItem',formItem)
+        // console.log('formItem',formItem)
         formItem = this.resetFormConfig(formItem);
-        if(formItem.type === "datetime"){
-          return;
-        }
+        // if(formItem.type === "datetime"){
+        //   return;
+        // }
         if (formItem.type === "line") {
           group.push({
             label: formItem.text,
@@ -257,7 +257,7 @@
           append: this.preOrSufFixShow("text", formItem.suffix),
           prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
           suffixIcon: this.preOrSufFixShow("icon", formItem.suffix),
-          valueFormat:formItem.dateFormate || "yyyy-MM-dd",
+          valueFormat:formItem.dateFormate || "yyyy-MM-dd HH:mm:ss",
           format: formItem.dateFormate,
           keyAttr: formItem.keyAttr,
           value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
@@ -324,7 +324,6 @@
 
       this.geDictData(dictKeys);
       this.getFormDetail();
-
     },
     //淇敼绾ц仈椤�
     changeChildItem(items,TreeValue) {
@@ -369,7 +368,7 @@
           append: this.preOrSufFixShow("text", formItem.suffix),
           prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
           suffixIcon: this.preOrSufFixShow("icon", formItem.suffix),
-          valueFormat: formItem.dateFormate || "yyyy-MM-dd",
+          valueFormat: formItem.dateFormate || "yyyy-MM-dd HH:mm:ss",
           format: formItem.dateFormate,
           keyAttr: formItem.keyAttr,
           value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||

--
Gitblit v1.9.3