From 011a8921ba81682c9c468a9cc42ddefbb0790385 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 13 十一月 2023 16:12:51 +0800
Subject: [PATCH] 密码策略校验bug
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 2 ++
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 5 ++++-
Source/UBCS-WEB/vue.config.js | 7 ++++---
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 7fd964d..eee1a97 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -192,6 +192,9 @@
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,
@@ -254,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) ||
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index d129e12..6b59ceb 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -421,6 +421,8 @@
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/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 3d31924..fcfbd7d 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,10 +26,11 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- target: 'http://127.0.0.1:37000',
+ // target: 'http://127.0.0.1:37000',
// target: 'http://192.168.1.51:37000',
- // target: 'http://dev.vci-tech.com:37000',
- // target: 'http://192.168.1.16:37000',
+ target: 'http://dev.vci-tech.com:37000',
+ //yxc
+ // target: 'http:// 192.168.0.104:37000',
// target: 'http://192.168.0.105:37000',
// target: 'http://192.168.0.103:37000',
// target: 'http://192.168.1.63:37000',
--
Gitblit v1.9.3