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/views/code/code.vue | 4 ++--
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 2 --
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 3 +--
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 13 ++++++-------
4 files changed, 9 insertions(+), 13 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) ||
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 6b59ceb..d129e12 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -421,8 +421,6 @@
resForm.codeClassifyOid = this.codeClassifyOid;
resForm.codeRuleOid = this.codeRuleOid;
resForm.templateOid = this.templateOid;
- // console.log('formValue',formValue)
- // console.log('resForm',resForm)
this.$emit("submit", resForm);
},
getDefaultValueAndFormValues(form) {
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 6baddfc..77ae0da 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -512,7 +512,6 @@
console.log('2')
},
addSaveHandler(){
-
this.$nextTick(() => {
this.addvisible = true;
});
@@ -877,7 +876,7 @@
},
//澧炲姞淇濆瓨
AddSumbit(val) {
- console.log('val',val)
+ // console.log('val',val)
if(func.notEmpty(val.ts)) {
val.ts = func.formattedDateTime(val.ts);
//console.log(val.ts);
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index a033f4e..05af43c 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -886,7 +886,7 @@
:referConfig="this.referConfig || {}"
:display="true"
:value="form.customCodeSerialClass"
- :text="form.customCodeSerialClass"
+ :text="form.customCodeSerialClassText"
@setReferValue="setReferValue"
></vciWebRefer>
<!-- <el-input-->
@@ -1367,7 +1367,7 @@
},
referConfig:{
title: '鑷畾涔夋祦姘村弬鐓�',
- showField: 'customCodeSerialClass',
+ showField: 'customCodeSerialClassText',
field: 'customCodeSerialClass',
fieldMap: {},
placeholder:'璇烽�夋嫨鑷畾涔夋祦姘�',
--
Gitblit v1.9.3