From 86e88743adad26d87149524ae09e9daba75a6334 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 06 九月 2023 10:35:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 8e62607..8597543 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -138,6 +138,9 @@
codeclassifysec: "refer",//鍒嗙被鐮佹
codevariablesec: "text",//鍙彉鐮佹
coderefersec: "refer",//寮曠敤鐮佹
+ codeattrsec: "text",
+ codelevelsec: "text",
+ codedatesec: "date"
},
selfColumnConfig: {
function: {
@@ -156,6 +159,7 @@
label: "name",
maxlength: "codeSecLength",
data: "fixedValueVOList",
+ dateFormate: "codeDateFormatStr"
},
directVoluation: {
search: true,
@@ -240,7 +244,7 @@
} else {
this.showResembleQuery = false;
}
- console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
+ // console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
this.$nextTick(() => {
this.$refs.FormTemplate.templateRender(
res.data.formDefineVO.items
@@ -261,10 +265,20 @@
if (res.data && res.data.code === 200) {
this.codeRuleOid = res.data.data.oid;
const typeList = [
+ //鍥哄畾鐮佹
"codefixedsec",
+ //鍒嗙被鐮佹
"codeclassifysec",
+ //鍙彉鐮佹
"codevariablesec",
+ //寮曠敤鐮佹
"coderefersec",
+ //灞炴�х爜娈�
+ "codeattrsec",
+ //鏃ユ湡鐮佹
+ "codedatesec",
+ //灞傜骇鐮佹
+ "codelevelsec",
];
this.secVOList = (res.data.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
@@ -279,6 +293,8 @@
this.showCodeApply = false;
}
}
+ // console.log(' this.secVOList',this.secVOList)
+ // console.log(' res.data.data.secVOList',res.data.data.secVOList)
});
},
getFormData(form) {
--
Gitblit v1.10.0