From 075cc6cdfe236118fcd25dbfa5285aa4c412d342 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 14 十一月 2023 11:21:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index f16ba65..99ac8d2 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -160,6 +160,7 @@
immediate: true,
handler(newV) {
this.$emit("getFormData", newV);
+ // console.log("getFormData", newV)
},
},
TreeValue:{
@@ -189,7 +190,11 @@
let dictKeys = [];
let slotColumnList = [];
formItemList.forEach((formItem) => {
+ // console.log('formItem',formItem)
formItem = this.resetFormConfig(formItem);
+ // if(formItem.type === "datetime"){
+ // return;
+ // }
if (formItem.type === "line") {
group.push({
label: formItem.text,
@@ -252,7 +257,7 @@
append: this.preOrSufFixShow("text", formItem.suffix),
prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
suffixIcon: this.preOrSufFixShow("icon", formItem.suffix),
- valueFormat:formItem.dateFormate,
+ valueFormat:formItem.dateFormate || "yyyy-MM-dd",
format: formItem.dateFormate,
keyAttr: formItem.keyAttr,
value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
@@ -319,7 +324,6 @@
this.geDictData(dictKeys);
this.getFormDetail();
-
},
//淇敼绾ц仈椤�
changeChildItem(items,TreeValue) {
@@ -328,6 +332,7 @@
let that=this;
items.forEach((item) => {
let formItem = this.resetFormConfig(item);
+
if (formItem.field == "lcstatus") {
formItem.field = formItem.field + "_text";
formItem.readOnly = true;
@@ -363,7 +368,7 @@
append: this.preOrSufFixShow("text", formItem.suffix),
prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
suffixIcon: this.preOrSufFixShow("icon", formItem.suffix),
- valueFormat: formItem.dateFormate,
+ valueFormat: formItem.dateFormate || "yyyy-MM-dd",
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