diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
index c86fbddcaddbb47c255d953d9a89cf75cd2109b4..0f7439960470db108de05f02513f50d8afff78e6 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
@@ -8,6 +8,7 @@
<#assign form_popup = false>
<#assign form_cat_tree = false>
<#assign form_cat_back = "">
+<#assign bpm_flag=false>
<#assign form_span = 24>
<#if tableVo.fieldRowNum==2>
<#assign form_span = 12>
@@ -17,6 +18,9 @@
<#assign form_span = 6>
#if>
<#list columns as po>
+<#if po.fieldDbName=='bpm_status'>
+ <#assign bpm_flag=true>
+#if>
<#if po.isShow =='Y' && po.fieldName != 'id'>
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
@@ -134,7 +138,9 @@
#if>
#list>
+ <#if bpm_flag>
提 交
+ #if>
@@ -379,6 +385,7 @@
}
},
props: {
+ <#if bpm_flag>
//流程表单data
formData: {
type: Object,
@@ -391,6 +398,7 @@
default: false,
required: false
},
+ #if>
//表单禁用
disabled: {
type: Boolean,
@@ -400,14 +408,17 @@
},
computed: {
formDisabled(){
+ <#if bpm_flag>
if(this.formBpm===true){
if(this.formData.disabled===false){
return false
}
return true
}
+ #if>
return this.disabled
},
+ <#if bpm_flag>
showFlowSubmitButton(){
if(this.formBpm===true){
if(this.formData.disabled===false){
@@ -416,10 +427,13 @@
}
return false
}
+ #if>
},
created () {
+ <#if bpm_flag>
//如果是流程中表单,则需要加载流程表单data
this.showFlowData();
+ #if>
},
methods: {
addBefore(){
@@ -497,6 +511,7 @@
#list>
}
},
+ <#if bpm_flag>
//渲染流程表单数据
showFlowData(){
if(this.formBpm === true){
@@ -508,6 +523,7 @@
})
}
},
+ #if>
validateError(msg){
this.$message.error(msg)
},
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
index 88b514e925c5139e11f9892def22848eaccb9136..f892a3671fa5ae70b2783413d0b58c6dfd401e70 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
@@ -8,8 +8,12 @@
<#assign form_popup = false>
<#assign form_cat_tree = false>
<#assign form_cat_back = "">
+<#assign bpm_flag=false>
<#assign form_span = 24>
<#list columns as po>
+<#if po.fieldDbName=='bpm_status'>
+ <#assign bpm_flag=true>
+#if>
<#if po.isShow =='Y' && po.fieldName != 'id'>
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
@@ -125,7 +129,9 @@
#if>
#list>
+ <#if bpm_flag>
提 交
+ #if>
@@ -362,6 +368,7 @@
}
},
props: {
+ <#if bpm_flag>
//流程表单data
formData: {
type: Object,
@@ -374,6 +381,7 @@
default: false,
required: false
},
+ #if>
//表单禁用
disabled: {
type: Boolean,
@@ -383,14 +391,17 @@
},
computed: {
formDisabled(){
+ <#if bpm_flag>
if(this.formBpm===true){
if(this.formData.disabled===false){
return false
}
return true
}
+ #if>
return this.disabled
},
+ <#if bpm_flag>
showFlowSubmitButton(){
if(this.formBpm===true){
if(this.formData.disabled===false){
@@ -399,10 +410,13 @@
}
return false
}
+ #if>
},
created () {
+ <#if bpm_flag>
//如果是流程中表单,则需要加载流程表单data
this.showFlowData();
+ #if>
},
methods: {
addBefore(){
@@ -475,6 +489,7 @@
#list>
}
},
+ <#if bpm_flag>
//渲染流程表单数据
showFlowData(){
if(this.formBpm === true){
@@ -486,6 +501,7 @@
})
}
},
+ #if>
validateError(msg){
this.$message.error(msg)
},
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
index 5cb83bf98e02a1f00799205cc368db0d5d0502a9..46b15fc4ca0f3d151dd1cab53317f4264582d041 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
@@ -8,6 +8,7 @@
<#assign form_popup = false>
<#assign form_cat_tree = false>
<#assign form_cat_back = "">
+<#assign bpm_flag=false>
<#assign form_span = 24>
<#if tableVo.fieldRowNum==2>
<#assign form_span = 12>
@@ -17,6 +18,9 @@
<#assign form_span = 6>
#if>
<#list columns as po>
+<#if po.fieldDbName=='bpm_status'>
+ <#assign bpm_flag=true>
+#if>
<#if po.isShow =='Y' && po.fieldName != 'id'>
<#assign form_field_dictCode="">
<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
@@ -134,7 +138,9 @@
#if>
#list>
+ <#if bpm_flag>
提 交
+ #if>
@@ -385,6 +391,7 @@
}
},
props: {
+ <#if bpm_flag>
//流程表单data
formData: {
type: Object,
@@ -397,6 +404,7 @@
default: false,
required: false
},
+ #if>
//表单禁用
disabled: {
type: Boolean,
@@ -406,14 +414,17 @@
},
computed: {
formDisabled(){
+ <#if bpm_flag>
if(this.formBpm===true){
if(this.formData.disabled===false){
return false
}
return true
}
+ #if>
return this.disabled
},
+ <#if bpm_flag>
showFlowSubmitButton(){
if(this.formBpm===true){
if(this.formData.disabled===false){
@@ -422,10 +433,13 @@
}
return false
}
+ #if>
},
created () {
+ <#if bpm_flag>
//如果是流程中表单,则需要加载流程表单data
this.showFlowData();
+ #if>
},
methods: {
addBefore(){
@@ -503,6 +517,7 @@
#list>
}
},
+ <#if bpm_flag>
//渲染流程表单数据
showFlowData(){
if(this.formBpm === true){
@@ -514,6 +529,7 @@
})
}
},
+ #if>
validateError(msg){
this.$message.error(msg)
},