From 08264c4daaf32fc1d58543f575d0f4e28f196a46 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 07 九月 2023 15:01:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 69e0bc2..cefd61a 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -84,7 +84,7 @@
import FormTemplate from "./FormTemplate";
import ResembleQuery from "./ResembleQuery";
export default {
- name: "FormTemplateDialog",
+ name: "FormTemplateDialog",
components: { ResembleQuery, FormTemplate },
props: {
visible: {
@@ -123,6 +123,8 @@
},
data() {
return {
+ //鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
+ codeValueApplyStatus:'',
loading: false,
submitBtnLoading: false,
hasResemble: false,
@@ -244,7 +246,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
@@ -265,19 +267,21 @@
if (res.data && res.data.code === 200) {
this.codeRuleOid = res.data.data.oid;
const typeList = [
+ //灞炴�х爜娈� 鍙
+ "codeattrsec",
+ //鍙彉鐮佹
+ "codevariablesec",
//鍥哄畾鐮佹
"codefixedsec",
//鍒嗙被鐮佹
"codeclassifysec",
- //鍙彉鐮佹
- "codevariablesec",
+ //鏃ユ湡鐮佹 鍙
+ "codedatesec",
//寮曠敤鐮佹
"coderefersec",
- //灞炴�х爜娈�
- "codeattrsec",
- // "codelevelsec",
- //鏃ユ湡鐮佹
- "codedatesec",
+ //灞傜骇鐮佹 鍙
+ "codelevelsec",
+ //娴佹按鐮佹 闅愯棌
];
this.secVOList = (res.data.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
@@ -292,8 +296,8 @@
this.showCodeApply = false;
}
}
- console.log(' this.secVOList',this.secVOList)
- console.log(' res.data.data.secVOList',res.data.data.secVOList)
+ // console.log(' this.secVOList',this.secVOList)
+ // console.log(' res.data.data.secVOList',res.data.data.secVOList)
});
},
getFormData(form) {
--
Gitblit v1.9.3