diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java
index 37191ec9..0f7f73c6 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java
@@ -28,7 +28,7 @@ public enum CgformEnum {
     /**
      * 多表 (erp风格)
      */
-    ERP(2, "erp", "/jeecg/code-template-online", "erp.onetomany", "ERP风格" ,new String[]{"vue3","vue"}),
+    ERP(2, "erp", "/jeecg/code-template-online", "erp.onetomany", "ERP风格" ,new String[]{"vue3","vue","vue3Native"}),
     /**
      * 多表（内嵌子表风格）
      */
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl
index c34b0077..95421ca1 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl
@@ -50,7 +50,7 @@
 	          <#assign need_dept_user = true>
 	          <j-select-user-by-dept v-model:value="formData.${po.fieldName}" <#if po.readonly=='Y'>disabled<#else>:disabled="disabled"</#if>/>
 			<#elseif po.classType =='textarea'>
-	          <a-textarea v-model:value="formData.${autoStringSuffixForModel(po)}" rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled<#else>:disabled="disabled"</#if>/>
+	          <a-textarea v-model:value="formData.${autoStringSuffixForModel(po)}" :rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled<#else>:disabled="disabled"</#if>/>
 			<#elseif po.classType=='radio'>
 			 <#assign need_select_tag = true>
             <j-dict-select-tag type='radio' v-model:value="formData.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled<#else>:disabled="disabled"</#if>/>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl
index 41515bf8..8b30eb15 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl
@@ -13,8 +13,9 @@
 	    <#assign query_field_dictCode="${po.dictField}">
 	</#if>
 	<#if po.queryMode=='single'>
-          <#if query_field_no gt 1>  </#if><a-col :lg="8">
-            <#if query_field_no gt 1>  </#if><a-form-item label="${po.filedComment}" name="${po.fieldName}">
+          <#if query_field_no gt 1>  </#if><a-col :lg="6">
+            <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}">
+              <#if query_field_no gt 1>  </#if><template #label><span title="${po.filedComment}"><#if po.filedComment?default("")?trim?length gt 4>${po.filedComment?substring(0,4)}<#else>${po.filedComment}</#if></span></template>
             <#if po.classType=='sel_search'>
               <#if query_field_no gt 1>  </#if><j-search-select placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" dict="${po.dictTable},${po.dictText},${po.dictField}" />
             <#elseif po.classType=='sel_user'>
@@ -64,8 +65,9 @@
             <#if query_field_no gt 1>  </#if></a-form-item>
           <#if query_field_no gt 1>  </#if></a-col>
 	<#else>
-          <#if query_field_no gt 1>  </#if><a-col :lg="8">
-            <#if query_field_no gt 1>  </#if><a-form-item label="${po.filedComment}">
+          <#if query_field_no gt 1>  </#if><a-col :lg="6">
+            <#if query_field_no gt 1>  </#if><a-form-item>
+               <#if query_field_no gt 1>  </#if><template #label><span title="${po.filedComment}"><#if po.filedComment?default("")?trim?length gt 4>${po.filedComment?substring(0,4)}<#else>${po.filedComment}</#if></span></template>
       <#if po.classType=='date'>
                <#if query_field_no gt 1>  </#if><a-date-picker value-format="YYYY-MM-DD" placeholder="请选择开始时间" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust"/>
                <#if query_field_no gt 1>  </#if><span class="query-group-split-cust">~</span>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeInitValue.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeInitValue.ftl
new file mode 100644
index 00000000..a7b51839
--- /dev/null
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeInitValue.ftl
@@ -0,0 +1,11 @@
+<#list columns as po>
+ <#if po.isShow == 'Y' && po.fieldName != 'id'>
+  <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
+    ${po.fieldName}: <#if po.defaultVal??>${po.defaultVal}<#else>undefined</#if>,
+  <#elseif po.fieldDbType=='Blob'>
+    ${po.fieldName}String: <#if po.defaultVal??>${po.defaultVal}<#else>''</#if>,
+  <#else>
+    ${po.fieldName}: <#if po.defaultVal??>'${po.defaultVal}'<#else>''</#if>,   
+  </#if>
+ </#if>
+</#list>
\ No newline at end of file
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeMainInitValue.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeMainInitValue.ftl
new file mode 100644
index 00000000..f7c08282
--- /dev/null
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeMainInitValue.ftl
@@ -0,0 +1,11 @@
+<#list columns as po>
+ <#if po.isShow == 'Y' && po.fieldName != 'id'>
+  <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
+        ${po.fieldName}: <#if po.defaultVal??>${po.defaultVal}<#else>undefined</#if>,
+  <#elseif po.fieldDbType=='Blob'>
+        ${po.fieldName}String: <#if po.defaultVal??>${po.defaultVal}<#else>''</#if>,
+  <#else>
+        ${po.fieldName}: <#if po.defaultVal??>'${po.defaultVal}'<#else>''</#if>,   
+  </#if>
+ </#if>
+</#list>
\ No newline at end of file
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeSubInitValue.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeSubInitValue.ftl
new file mode 100644
index 00000000..1513c444
--- /dev/null
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/native/vue3NativeSubInitValue.ftl
@@ -0,0 +1,11 @@
+<#list sub.colums as po>
+ <#if po.isShow == 'Y' && po.fieldName != 'id'>
+  <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
+        ${po.fieldName}: <#if po.defaultVal??>${po.defaultVal}<#else>undefined</#if>,
+  <#elseif po.fieldDbType=='Blob'>
+        ${po.fieldName}String: <#if po.defaultVal??>${po.defaultVal}<#else>''</#if>,
+  <#else>
+        ${po.fieldName}: <#if po.defaultVal??>'${po.defaultVal}'<#else>''</#if>,   
+  </#if>
+ </#if>
+</#list>
\ No newline at end of file
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
index 643f3d6a..30d965c9 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="p-2">
 <#assign query_field_no=0>  
 <#assign need_category = false>
 <#assign need_pca = false>
@@ -188,12 +188,14 @@
   });
   const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
   const labelCol = reactive({
-    xs: { span: 24 },
-    sm: { span: 7 },
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
   });
   const wrapperCol = reactive({
-    xs: { span: 24 },
-    sm: { span: 16 },
+    xs: 24,
+    sm: 20,
   });
 
   /**
@@ -385,6 +387,7 @@
 
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
+    padding: 0;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
index eaf31a40..c85652df 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -70,17 +70,7 @@
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
-<#list columns as po>
- <#if po.isShow == 'Y'>
-  <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
-    ${po.fieldName}: undefined,
-  <#elseif po.fieldDbType=='Blob'>
-    ${po.fieldName}String: '',
-  <#else>
-    ${po.fieldName}: '',   
-  </#if>
- </#if>
-</#list>
+    <#include "/common/init/native/vue3NativeInitValue.ftl">
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
index 0fb303b0..bfaf3db8 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@@ -1,6 +1,6 @@
 <#include "/common/utils.ftl">
 <template>
-  <div>
+  <div class="p-2">
 <#assign pidFieldName = "">
 <#assign hasChildrenField = "">
 <#list originalColumns as po>
@@ -177,6 +177,7 @@
       columns,
       canResize:false,
       useSearchForm: false,
+      isTreeTable: true,
       actionColumn: {
         width: 120,
         fixed: 'right',
@@ -196,12 +197,14 @@
   });
   const [registerTable, {reload, collapseAll, updateTableDataRecord, findTableDataRecord,getDataSource},{ rowSelection, selectedRowKeys }] = tableContext
   const labelCol = reactive({
-    xs: { span: 24 },
-    sm: { span: 7 },
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
   });
   const wrapperCol = reactive({
-    xs: { span: 24 },
-    sm: { span: 16 },
+    xs: 24,
+    sm: 20,
   });
 
   /**
@@ -541,6 +544,7 @@
 
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
+    padding: 0;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
index bd5bf071..2cdf4234 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -88,17 +88,7 @@
   let model: Nullable<Recordable> = null;
   const formData = reactive<Record<string, any>>({
     id: '',
-<#list columns as po>
- <#if po.isShow == 'Y'>
-  <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
-    ${po.fieldName}: undefined,
-  <#elseif po.fieldDbType=='Blob'>
-    ${po.fieldName}String: '',
-  <#else>
-    ${po.fieldName}: '',   
-  </#if>
- </#if>
-</#list>
+    <#include "/common/init/native/vue3NativeInitValue.ftl">
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
new file mode 100644
index 00000000..ca29961a
--- /dev/null
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@@ -0,0 +1,422 @@
+<#include "/common/utils.ftl">
+<template>
+  <div class="p-2">
+    <#assign query_field_no=0>
+    <#assign need_category = false>
+    <#assign need_pca = false>
+    <#assign need_search = false>
+    <#assign need_dept_user = false>
+    <#assign need_switch = false>
+    <#assign need_dept = false>
+    <#assign need_multi = false>
+    <#assign need_popup = false>
+    <#assign need_select_tag = false>
+    <#assign need_select_tree = false>
+    <#assign need_time = false>
+    <#assign bpm_flag=false>
+    <#assign need_markdown = false>
+    <#assign need_upload = false>
+    <#assign need_image_upload = false>
+    <#assign need_editor = false>
+    <#assign need_checkbox = false>
+    <#assign query_flag = false>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <#-- 开始循环 -->
+          <#list columns as po>
+            <#if po.fieldDbName=='bpm_status'>
+              <#assign bpm_flag=true>
+            </#if>
+            <#if po.isQuery=='Y'>
+              <#assign query_flag=true>
+            </#if>
+            <#if po.classType=='cat_tree' && po.dictText?default("")?trim?length == 0>
+              <#assign need_category=true>
+            </#if>
+            <#if po.classType=='pca'>
+              <#assign need_pca=true>
+            </#if>
+            <#if po.classType=='sel_search'>
+              <#assign need_search = true>
+            </#if>
+            <#if po.classType=='sel_user'>
+              <#assign need_dept_user = true>
+            </#if>
+            <#if po.classType=='sel_depart'>
+              <#assign need_dept = true>
+            </#if>
+            <#if po.classType=='switch'>
+              <#assign need_switch = true>
+            </#if>
+            <#if po.classType=='list_multi'>
+              <#assign need_multi = true>
+            </#if>
+            <#if po.classType=='popup'>
+              <#assign need_popup = true>
+            </#if>
+            <#if po.classType=='sel_tree'>
+              <#assign need_select_tree = true>
+            </#if>
+            <#if po.classType=='time'>
+              <#assign need_time = true>
+            </#if>
+            <#include "/common/form/native/vue3NativeSearch.ftl">
+          </#list>
+          <#if query_field_no gt 2>
+          </template>
+</#if>
+<#if query_flag>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
+                <a-button preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+</#if>
+        </a-row>
+      </a-form>
+    </div>
+<#-- 结束循环 -->
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+       <#list columns as po>
+        <#if po.classType=='umeditor' || po.classType=='pca' || po.classType=='file'>
+        <template v-if="column.dataIndex==='${po.fieldName}'">
+         <#if po.classType=='umeditor'>
+          <!--富文本件字段回显插槽-->
+          <div v-html="text"></div>
+         </#if>
+         <#if po.classType=='file'>
+          <!--文件字段回显插槽-->
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+         </#if>
+        </template>
+        </#if>
+       </#list>
+      </template>
+    </BasicTable>
+    <!--子表表格tab-->
+    <a-tabs defaultActiveKey="1">
+      <#assign sub_seq=1>
+      <#list subTables as sub>
+      <a-tab-pane tab="${sub.ftlDescription}" key="${sub_seq}" <#if sub_seq gt 1>forceRender</#if>>
+        <${sub.entityName}List />
+      </a-tab-pane>
+      <#assign sub_seq=sub_seq+1>
+      </#list>
+     </a-tabs>
+    <!-- 表单区域 -->
+    <${entityName}Modal ref="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+
+<script lang="ts" name="${entityPackage}-${entityName?uncap_first}" setup>
+  import { ref, reactive, computed, unref, provide } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import ${entityName}Modal from './components/${entityName}Modal.vue'
+  import { columns, searchFormSchema } from './${entityName}.data';
+  import { list, deleteOne, batchDelete, getImportUrl,getExportUrl } from './${entityName}.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  <#include "/common/form/native/vue3NativeImport.ftl">
+<#if need_pca>
+  import { getAreaTextByCode } from '/@/components/Form/src/utils/Area';
+</#if>
+  <#if need_category>
+  import { loadCategoryData } from '/@/api/common/api'
+  import { getAuthCache, setAuthCache } from '/@/utils/auth';
+  import { DB_DICT_DATA_KEY } from '/@/enums/cacheEnum';
+  </#if>
+  <#if bpm_flag==true>
+  import { startProcess } from '/@/api/common/api';
+  </#if>
+  <#list subTables as sub>
+  import ${sub.entityName}List from './${sub.entityName}List.vue'
+  </#list>
+  import { useUserStore } from '/@/store/modules/user';
+  
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  const registerModal = ref();
+  const userStore = useUserStore();
+   //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+    tableProps:{
+      title: '${tableVo.ftlDescription}',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      rowSelection: {type: 'radio'},
+      actionColumn: {
+        width: 120,
+        fixed:'right'
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name:"${tableVo.ftlDescription}",
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+    })
+
+  const [registerTable, { reload },{ rowSelection, selectedRowKeys }] = tableContext
+  const mainId = computed(() => (unref(selectedRowKeys).length > 0 ? unref(selectedRowKeys)[0] : ''));
+  //下发 mainId,子组件接收
+  provide('mainId', mainId);
+  
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+  
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+     registerModal.value.disableSubmit = false;
+     registerModal.value.edit(record);
+  }
+  
+  /**
+   * 详情事件
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+  
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({id: record.id}, handleSuccess);
+  }
+  
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ids: selectedRowKeys.value},handleSuccess);
+  }
+  
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+  
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+  
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record){
+    <#if bpm_flag==true>
+    let dropDownAction = [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ];
+    if(record.bpmStatus == '1' || !record.bpmStatus){
+      dropDownAction.push({
+        label: '发起流程',
+         popConfirm: {
+           title: '确认提交流程吗？',
+           confirm: handleProcess.bind(null, record),
+         }
+      })
+    }
+    return dropDownAction;
+    <#else>
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+   </#if>
+  }
+
+  <#if bpm_flag==true>
+  /**
+   * 提交流程
+   */
+  async function handleProcess(record) {
+    let params = {
+      flowCode: 'dev_${tableName}_001',
+      id: record.id,
+      formUrl: '${entityPackage}/components/${entityName}Form',
+      formUrlMobile: ''
+    }
+    await startProcess(params);
+    handleSuccess();
+  }
+  </#if>
+  
+  <#if need_category>
+  /**
+   * form点击事件
+   * @param value
+   */
+  function handleFormChange(key, value) {
+    queryParam[key] = value;
+  }
+  
+  /**
+   * 初始化字典配置
+   */
+  function initDictConfig(){
+  <#list columns as po>
+   <#if (po.isQuery=='Y' || po.isShowList=='Y') && po.classType!='popup'>
+    <#if po.classType=='cat_tree' && need_category==true>
+    loadCategoryData({code:'${po.dictField?default("")}'}).then((res) => {
+      if (res) {
+        const allDictDate = userStore.getAllDictItems;
+        if(!allDictDate['${po.dictField?default("")}']){
+          userStore.setAllDictItems({...allDictDate,'${po.dictField?default("")}':res});
+        }
+      }
+    })
+    </#if>
+   </#if>
+  </#list>
+  }
+  initDictConfig();
+ </#if>
+
+  /* ----------------------以下为原生查询需要添加的-------------------------- */
+  const toggleSearchStatus = ref<boolean>(false);
+  const labelCol = reactive({
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+  
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+  
+  <#if need_popup>
+  /**
+   *  popup组件值改变事件
+   */
+  function setFieldsValue(map) {
+    Object.keys(map).map((key) => {
+      queryParam[key] = map[key];
+    });
+  }
+  </#if>
+
+  <#if need_pca>
+  /**
+   * 省市区点击事件
+   * @param key
+   * @param value
+   */
+  function handleAreaChange(key, value) {
+    queryParam[key] = value.join(',');
+  }
+  </#if>
+</script>
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__api.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__api.tsi
new file mode 100644
index 00000000..26c7a1e7
--- /dev/null
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__api.tsi
@@ -0,0 +1,139 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/${entityPackage}/${entityName?uncap_first}/list',
+  save= '/${entityPackage}/${entityName?uncap_first}/add',
+  edit= '/${entityPackage}/${entityName?uncap_first}/edit',
+  deleteOne = '/${entityPackage}/${entityName?uncap_first}/delete',
+  deleteBatch = '/${entityPackage}/${entityName?uncap_first}/deleteBatch',
+  importExcel = '/${entityPackage}/${entityName?uncap_first}/importExcel',
+  exportXls = '/${entityPackage}/${entityName?uncap_first}/exportXls',
+<#list subTables as sub><#rt/>
+  ${sub.entityName?uncap_first}List = '/${entityPackage}/${entityName?uncap_first}/list${sub.entityName}ByMainId',
+  ${sub.entityName?uncap_first}Save= '/${entityPackage}/${entityName?uncap_first}/add${sub.entityName}',
+  ${sub.entityName?uncap_first}Edit= '/${entityPackage}/${entityName?uncap_first}/edit${sub.entityName}',
+  ${sub.entityName?uncap_first}Delete = '/${entityPackage}/${entityName?uncap_first}/delete${sub.entityName}',
+  ${sub.entityName?uncap_first}DeleteBatch = '/${entityPackage}/${entityName?uncap_first}/deleteBatch${sub.entityName}',
+</#list>
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params },{ isTransformResponse: false });
+}
+<#list subTables as sub><#rt/>
+  <#assign myForeignKeys=''>
+  <#list sub.foreignKeys as key>
+    <#assign myForeignKeys='${key?uncap_first}'>
+  </#list>
+  
+/**
+ * 列表接口
+ * @param params
+ */
+export const ${sub.entityName?uncap_first}List = (params) => {
+  if(params['${myForeignKeys}']){
+    return defHttp.get({ url: Api.${sub.entityName?uncap_first}List, params });
+  }
+  return Promise.resolve({});
+}
+
+/**
+ * 删除单个
+ */
+export const ${sub.entityName?uncap_first}Delete = (params,handleSuccess) => {
+  return defHttp.delete({ url: Api.${sub.entityName?uncap_first}Delete, params }, { joinParamsToUrl: true }).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ */
+export const ${sub.entityName?uncap_first}DeleteBatch = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({ url: Api.${sub.entityName?uncap_first}DeleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const  ${sub.entityName?uncap_first}SaveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.${sub.entityName?uncap_first}Edit : Api.${sub.entityName?uncap_first}Save;
+  return defHttp.post({ url: url, params },{ isTransformResponse: false });
+}
+
+/**
+ * 导入
+ */
+export const ${sub.entityName?uncap_first}ImportUrl = '/${entityPackage}/${entityName?uncap_first}/import${sub.entityName}'
+
+/**
+ * 导出
+ */
+export const ${sub.entityName?uncap_first}ExportXlsUrl = '/${entityPackage}/${entityName?uncap_first}/export${sub.entityName}'
+</#list>
\ No newline at end of file
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
new file mode 100644
index 00000000..eed9d3f7
--- /dev/null
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
@@ -0,0 +1,630 @@
+<#include "/common/utils.ftl">
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+ <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  {
+    title: '${po.filedComment}',
+    align:"center",
+    <#if po.sort=='Y'>
+    sorter: true,
+   </#if>
+    <#if po.classType=='date'>
+    dataIndex: '${po.fieldName}',
+    customRender:({text}) =>{
+      return !text?"":(text.length>10?text.substr(0,10):text)
+    },
+    <#elseif po.fieldDbType=='Blob'>
+    dataIndex: '${po.fieldName}String'
+    <#elseif po.classType=='umeditor'>
+    dataIndex: '${po.fieldName}',
+    <#elseif po.classType=='pca'>
+    dataIndex: '${po.fieldName}',
+   <#elseif po.classType=='file'>
+    dataIndex: '${po.fieldName}',
+   <#elseif po.classType=='image'>
+    dataIndex: '${po.fieldName}',
+    customRender:render.renderImage,
+   <#elseif po.classType=='switch'>
+    dataIndex: '${po.fieldName}',
+<#assign switch_extend_arr=['Y','N']>
+<#if po.dictField?default("")?contains("[")>
+<#assign switch_extend_arr=po.dictField?eval>
+</#if>
+<#list switch_extend_arr as a>
+<#if a_index == 0>
+<#assign switch_extend_arr1=a>
+<#else>
+<#assign switch_extend_arr2=a>
+</#if>
+</#list>
+    customRender:({text}) => {
+      return render.renderSwitch(text, [{text:'是',value:'${switch_extend_arr1}'},{text:'否',value:'${switch_extend_arr2}'}])
+    },
+   <#elseif po.classType == 'sel_tree' || po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox' || po.classType=='sel_depart' || po.classType=='sel_user'>
+    dataIndex: '${po.fieldName}_dictText'
+   <#elseif po.classType=='cat_tree'>
+    dataIndex: '${po.fieldName}',
+    <#if po.dictText?default("")?trim?length == 0>
+    customRender:({text}) => {
+      return render.renderCategoryTree(text,'${po.dictField?default("")}')
+   },
+   <#else>
+    customRender: (text, record) => (text ? record['${po.dictText}'] : '')
+   </#if>
+   <#else>
+    dataIndex: '${po.fieldName}'
+   </#if>
+  },
+   </#if>
+ </#list>
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+<#-- 开始循环 -->
+<#list columns as po>
+<#if po.isQuery=='Y'>
+<#assign query_flag=true>
+	<#assign query_field_dictCode="">
+	<#if po.dictTable?default("")?trim?length gt 1>
+	    <#assign query_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
+    <#elseif po.dictField?default("")?trim?length gt 1>
+        <#assign query_field_dictCode="${po.dictField}">
+    </#if>
+<#if po.queryMode=='single'>
+  {
+    label: "${po.filedComment}",
+    field: "${po.fieldName}",
+<#if po.classType=='sel_search'>
+    component: 'JSearchSelect',
+    componentProps:{
+      dict:"${po.dictTable},${po.dictText},${po.dictField}"
+    },
+<#elseif po.classType=='sel_user'>
+    component: 'JSelectUserByDept',
+<#elseif po.classType=='switch'>
+    component: 'JSwitch',
+    componentProps:{
+      query:true,
+      <#if po.dictField != 'is_open'>
+      options:${po.dictField}
+      </#if>
+    },
+ <#elseif po.classType=='sel_depart'>
+    component: 'JSelectDept',
+ <#elseif po.classType=='list_multi'>
+    component: 'JSelectMultiple',
+    componentProps:{
+     <#if po.dictTable?default("")?trim?length gt 1>
+      dictCode:"${po.dictTable},${po.dictText},${po.dictField}",
+     <#elseif po.dictField?default("")?trim?length gt 1>
+      dictCode:"${po.dictField}",
+     </#if>
+      triggerChange: true
+    },
+ <#elseif po.classType=='cat_tree'>
+    component: 'JCategorySelect',
+    componentProps:{
+      pcode:"${po.dictField?default("")}",//back和事件未添加，暂时有问题
+    },
+<#elseif po.classType=='date'>
+    component: 'DatePicker',
+<#elseif po.classType=='datetime'>
+    component: 'DatePicker',
+    componentProps: {
+      showTime:true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+<#elseif po.classType=='pca'>
+    component: 'JAreaLinkage',
+<#elseif po.classType=='popup'>
+    <#include "/common/form/vue3popup.ftl">
+<#elseif po.classType=='list' || po.classType=='radio' || po.classType=='checkbox'>
+<#--  ---------------------------下拉或是单选 判断数据字典是表字典还是普通字典------------------------------- -->
+    component: 'JDictSelectTag',
+    componentProps:{
+    <#if po.dictTable?default("")?trim?length gt 1>
+      dictCode:"${po.dictTable},${po.dictText},${po.dictField}"
+    <#elseif po.dictField?default("")?trim?length gt 1>
+      dictCode:"${po.dictField}"
+    </#if>
+    },
+<#else>
+    component: 'Input',
+</#if>
+    //colProps: {span: 6},
+  },
+<#else>
+  {
+    label: "${po.filedComment}",
+    field: "${po.fieldName}",
+<#if po.classType=='date'>
+    component: 'RangePicker',
+    componentProps: {
+      valueType: 'Date',
+    },
+<#elseif po.classType=='datetime'>
+    component: 'RangePicker',
+    componentProps: {
+      valueType: 'Date',
+      showTime:true
+    },
+<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
+    component: 'JRangeNumber',
+<#else>
+    component: 'Input', //TODO 范围查询
+</#if>
+    //colProps: {span: 6},
+  },
+</#if>
+</#if>
+</#list>
+<#-- 结束循环 -->
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+<#assign form_cat_tree = false>
+<#assign form_cat_back = "">
+<#assign bpm_flag=false>
+<#assign id_exists = false>
+<#list columns as po><#rt/>
+<#if po.fieldDbName=='bpm_status'>
+  <#assign bpm_flag=true>
+</#if>
+<#if po.fieldDbName == 'id'>
+	<#assign id_exists = true>
+</#if>
+<#if po.isShow =='Y'>
+<#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>
+		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
+	<#elseif po.dictField?default("")?trim?length gt 1>
+		<#assign form_field_dictCode="${po.dictField}">
+	</#if>
+  {
+    label: '${po.filedComment}',
+    field: ${autoStringSuffix(po)},
+<#-- update-begin-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
+  <#if po.defaultVal??>
+    <#if po.fieldDbType=="BigDecimal" || po.fieldDbType=="double" || po.fieldDbType=="int">
+    defaultValue: ${po.defaultVal},
+    <#else>
+    defaultValue: "${po.defaultVal}",
+    </#if>
+  </#if>
+<#-- update-end-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
+    <#if po.classType =='date'>
+    component: 'DatePicker',
+     <#elseif po.classType =='datetime'>
+    component: 'DatePicker',
+    componentProps: {
+       showTime:true,
+       valueFormat: 'YYYY-MM-DD HH:mm:ss'
+     },
+     <#elseif po.classType =='time'>
+    component: 'TimePicker',
+    componentProps: {
+      valueFormat: 'HH:mm:ss'
+    },
+    <#elseif po.classType =='popup'>
+    <#include "/common/form/vue3popup.ftl">
+    <#elseif po.classType =='sel_depart'>
+    component: 'JSelectDept',
+    <#elseif po.classType =='switch'>
+    component: 'JSwitch',
+    componentProps:{
+      <#if po.dictField != 'is_open'>
+      options:${po.dictField}
+      </#if>
+    },
+    <#elseif po.classType =='pca'>
+    component: 'JAreaLinkage',
+    <#elseif po.classType =='markdown'>
+    component: 'JMarkdownEditor',//注意string转换问题
+     <#elseif po.classType =='password'>
+    component: 'InputPassword',
+     <#elseif po.classType =='sel_user'>
+    component: 'JSelectUserByDept',
+    componentProps:{
+      labelKey:'realname',
+    },
+    <#elseif po.classType =='textarea'>
+    component: 'InputTextArea',//TODO 注意string转换问题
+    <#elseif po.classType=='list' || po.classType=='radio'>
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode:"${form_field_dictCode}"
+    },
+    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    component: 'JSelectMultiple',
+    componentProps:{
+      dictCode:"${form_field_dictCode}"
+    },
+    <#elseif po.classType=='sel_search'>
+    component: 'JSearchSelect',
+    componentProps:{
+      dict:"${form_field_dictCode}"
+    },
+<#elseif po.classType=='cat_tree'>
+    <#assign form_cat_tree = true>
+    component: 'JCategorySelect',
+    componentProps:{
+       pcode:"${po.dictField?default("")}", //TODO back和事件未添加，暂时有问题
+    },
+    <#if po.dictText?default("")?trim?length gt 1>
+    <#assign form_cat_back = "${po.dictText}">
+    </#if>
+    <#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
+    component: 'InputNumber',
+    <#elseif po.classType=='file'>
+    component: 'JUpload',
+    componentProps:{
+    <#if po.uploadnum??>
+      maxCount:${po.uploadnum}
+     </#if>
+    },
+ <#elseif po.classType=='image'>
+    component: 'JImageUpload',
+    componentProps:{
+     <#if po.uploadnum??>
+      fileMax:${po.uploadnum}
+    </#if>
+    },
+  <#elseif po.classType=='umeditor'>
+    component: 'JEditor',
+  <#elseif po.classType == 'sel_tree'>
+    component: 'JTreeSelect',
+    componentProps:{
+      <#if po.dictText??>
+      <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+      dict:"${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}",
+      <#elseif po.dictText?split(',')[1]??>
+      pidField:"${po.dictText?split(',')[1]}",
+      <#elseif po.dictText?split(',')[3]??>
+      hasChildField:"${po.dictText?split(',')[3]}",
+      </#if>
+      </#if>
+      pidValue:"${po.dictField}",
+    },
+   <#else>
+    component: 'Input',
+    </#if>
+     <#include "/common/utils.ftl">
+    <#if po.isShow == 'Y' && poHasCheck(po)>
+    dynamicRules: ({model,schema}) => {
+    <#if po.fieldName != 'id'>
+    <#assign fieldValidType = po.fieldValidType!''>
+      return [
+      <#-- 非空校验 -->
+      <#if po.nullable == 'N' || fieldValidType == '*'>
+        { required: true, message: '请输入${po.filedComment}!'},
+      <#elseif fieldValidType!=''>
+        { required: false},
+      </#if>
+       <#-- 唯一校验 -->
+        <#if fieldValidType == 'only'>
+        {...rules.duplicateCheckRule(<#if sub?default("")?trim?length gt 1>'${sub.tableName}'<#else>'${tableName}'</#if>, '${po.fieldDbName}',model,schema)[0]},
+        <#-- 6到16位数字 -->
+        <#elseif fieldValidType == 'n6-16'>
+        { pattern: /^\d{6,16}$/, message: '请输入6到16位数字!'},
+        <#-- 6到16位任意字符 -->
+        <#elseif fieldValidType == '*6-16'>
+        { pattern: /^.{6,16}$/, message: '请输入6到16位任意字符!'},
+        <#-- 6到18位字母 -->
+        <#elseif fieldValidType == 's6-18'>
+        { pattern:/^[a-z|A-Z]{6,18}$/, message: '请输入6到18位字母!'},
+        <#-- 网址 -->
+        <#elseif fieldValidType == 'url'>
+        { pattern: /^((ht|f)tps?):\/\/[\w\-]+(\.[\w\-]+)+([\w\-.,@?^=%&:\/~+#]*[\w\-@?^=%&\/~+#])?$/, message: '请输入正确的网址!'},
+        <#-- 电子邮件 -->
+        <#elseif fieldValidType == 'e'>
+        { pattern: /^([\w]+\.*)([\w]+)@[\w]+\.\w{3}(\.\w{2}|)$/, message: '请输入正确的电子邮件!'},
+        <#-- 手机号码 -->
+        <#elseif fieldValidType == 'm'>
+        { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
+        <#-- 邮政编码 -->
+        <#elseif fieldValidType == 'p'>
+        { pattern: /^[0-9]\d{5}$/, message: '请输入正确的邮政编码!'},
+        <#-- 字母 -->
+        <#elseif fieldValidType == 's'>
+        { pattern: /^[A-Z|a-z]+$/, message: '请输入字母!'},
+        <#-- 数字 -->
+        <#elseif fieldValidType == 'n'>
+        { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!'},
+        <#-- 整数 -->
+        <#elseif fieldValidType == 'z'>
+        { pattern: /^-?\d+$/, message: '请输入整数!'},
+        <#-- 金额 -->
+        <#elseif fieldValidType == 'money'>
+        { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},
+        <#-- 正则校验 -->
+        <#elseif fieldValidType != '' && fieldValidType != '*'>
+        { pattern: '${fieldValidType}', message: '不符合校验规则!'},
+        <#-- 无校验 -->
+        <#else>
+        <#t>
+        </#if>
+      ];
+     </#if>
+     },
+    </#if>
+    <#if po.readonly=='Y'>
+    dynamicDisabled:true,
+    </#if>
+  },
+</#if>
+</#list>
+<#if id_exists == false>
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+	field: 'id',
+	component: 'Input',
+	show: false
+  },
+</#if>
+];
+
+<#list subTables as sub>
+//子表列表数据
+export const ${sub.entityName?uncap_first}Columns: BasicColumn[] = [
+ <#list sub.originalColumns as po>
+   <#if po.isShowList =='Y' && po.fieldName !='id'>
+  {
+    title: '${po.filedComment}',
+    align:"center",
+    <#if po.sort=='Y'>
+    sorter: true,
+   </#if>
+    <#if po.classType=='date'>
+    dataIndex: '${po.fieldName}',
+    customRender:({text}) =>{
+      return !text?"":(text.length>10?text.substr(0,10):text)
+    },
+    <#elseif po.fieldDbType=='Blob'>
+    dataIndex: '${po.fieldName}String'
+    <#elseif po.classType=='umeditor'>
+    dataIndex: '${po.fieldName}',
+    <#elseif po.classType=='pca'>
+    dataIndex: '${po.fieldName}',
+   <#elseif po.classType=='file'>
+    dataIndex: '${po.fieldName}',
+   <#elseif po.classType=='image'>
+    dataIndex: '${po.fieldName}',
+    customRender:render.renderImage,
+   <#elseif po.classType=='switch'>
+    dataIndex: '${po.fieldName}',
+<#assign switch_extend_arr=['Y','N']>
+<#if po.dictField?default("")?contains("[")>
+<#assign switch_extend_arr=po.dictField?eval>
+</#if>
+<#list switch_extend_arr as a>
+<#if a_index == 0>
+<#assign switch_extend_arr1=a>
+<#else>
+<#assign switch_extend_arr2=a>
+</#if>
+</#list>
+    customRender:({text}) => {
+      return  render.renderSwitch(text, [{text:'是',value:'${switch_extend_arr1}'},{text:'否',value:'${switch_extend_arr2}'}])
+    },
+   <#elseif po.classType == 'sel_tree' || po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox' || po.classType=='sel_depart' || po.classType=='sel_user'>
+    dataIndex: '${po.fieldName}_dictText'
+   <#elseif po.classType=='cat_tree'>
+    dataIndex: '${po.fieldName}',
+    <#if po.dictText?default("")?trim?length == 0>
+    customRender:({text}) => {
+      return  render.renderCategoryTree(text,'${po.dictField?default("")}')
+    },
+   <#else>
+    customRender: ({text, record}) => (text ? record['${po.dictText}'] : '')
+   </#if>
+   <#else>
+    dataIndex: '${po.fieldName}'
+   </#if>
+  },
+   </#if>
+ </#list>
+];
+//子表表单数据
+export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
+<#assign form_cat_tree = false>
+<#assign form_cat_back = "">
+<#assign bpm_flag=false>
+<#list sub.originalColumns as po><#rt/>
+<#if po.fieldName == 'id'>
+  // TODO 子表隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false
+  },
+</#if>
+<#if po.isShow =='Y'>
+<#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>
+		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
+	<#elseif po.dictField?default("")?trim?length gt 1>
+		<#assign form_field_dictCode="${po.dictField}">
+	</#if>
+  {
+    label: '${po.filedComment}',
+    field: ${autoStringSuffix(po)},
+<#-- update-begin-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
+  <#if po.defaultVal??>
+    <#if po.fieldDbType=="BigDecimal" || po.fieldDbType=="double" || po.fieldDbType=="int">
+    defaultValue: ${po.defaultVal},
+    <#else>
+    defaultValue: "${po.defaultVal}",
+    </#if>
+  </#if>
+<#-- update-end-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
+    <#if po.classType =='date'>
+    component: 'DatePicker',
+     <#elseif po.classType =='datetime'>
+    component: 'DatePicker',
+    componentProps: {
+      showTime:true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    <#elseif po.classType =='time'>
+    component: 'TimePicker',
+    componentProps: {
+      valueFormat: 'HH:mm:ss'
+    },
+    <#elseif po.classType =='popup'>
+    <#include "/common/form/vue3popup.ftl">
+    <#elseif po.classType =='sel_depart'>
+    component: 'JSelectDept',
+    <#elseif po.classType =='switch'>
+    component: 'JSwitch',
+    componentProps:{
+      <#if po.dictField != 'is_open'>
+      options:${po.dictField}
+      </#if>
+    },
+    <#elseif po.classType =='pca'>
+    component: 'JAreaLinkage',
+    <#elseif po.classType =='markdown'>
+    component: 'JMarkdownEditor',//注意string转换问题
+     <#elseif po.classType =='password'>
+    component: 'InputPassword',
+     <#elseif po.classType =='sel_user'>
+    component: 'JSelectUserByDept',
+    componentProps:{
+      labelKey:'realname',
+    },
+    <#elseif po.classType =='textarea'>
+    component: 'InputTextArea',
+    <#elseif po.classType=='list' || po.classType=='radio'>
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode:"${form_field_dictCode}"
+    },
+    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    component: 'JSelectMultiple',
+    componentProps:{
+      dictCode:"${form_field_dictCode}"
+    },
+    <#elseif po.classType=='sel_search'>
+    component: 'JSearchSelect',
+    componentProps:{
+      dict:"${form_field_dictCode}"
+    },
+<#elseif po.classType=='cat_tree'>
+    <#assign form_cat_tree = true>
+    component: 'JCategorySelect',
+    componentProps:{
+      pcode:"${po.dictField?default("")}", //TODO back和事件未添加，暂时有问题
+    },
+    <#if po.dictText?default("")?trim?length gt 1>
+    <#assign form_cat_back = "${po.dictText}">
+    </#if>
+    <#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
+    component: 'InputNumber',
+    <#elseif po.classType=='file'>
+    component: 'JUpload',
+    componentProps:{
+    <#if po.uploadnum??>
+      maxCount:${po.uploadnum}
+   </#if>
+     },
+ <#elseif po.classType=='image'>
+     component: 'JImageUpload',
+     componentProps:{
+     <#if po.uploadnum??>
+      fileMax:${po.uploadnum}
+    </#if>
+      },
+  <#elseif po.classType=='umeditor'>
+    component: 'JEditor',
+  <#elseif po.classType == 'sel_tree'>
+    component: 'JTreeSelect',
+    componentProps:{
+      <#if po.dictText??>
+      <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+      dict:"${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}",
+      <#elseif po.dictText?split(',')[1]??>
+      pidField:"${po.dictText?split(',')[1]}",
+      <#elseif po.dictText?split(',')[3]??>
+      hasChildField:"${po.dictText?split(',')[3]}",
+      </#if>
+      </#if>
+      pidValue:"${po.dictField}",
+    },
+   <#else>
+    component: 'Input',
+    </#if>
+     <#include "/common/utils.ftl">
+    <#if po.isShow == 'Y' && poHasCheck(po)>
+    dynamicRules: ({model,schema}) => {
+    <#if po.fieldName != 'id'>
+    <#assign fieldValidType = po.fieldValidType!''>
+      return [
+        <#-- 非空校验 -->
+        <#if po.nullable == 'N' || fieldValidType == '*'>
+        { required: true, message: '请输入${po.filedComment}!'},
+        <#elseif fieldValidType!=''>
+        { required: false},
+        </#if>
+        <#-- 唯一校验 -->
+        <#if fieldValidType == 'only'>
+        {...rules.duplicateCheckRule(<#if sub?default("")?trim?length gt 1>'${sub.tableName}'<#else>'${tableName}'</#if>, '${po.fieldDbName}',model,schema)[0]},
+        <#-- 6到16位数字 -->
+        <#elseif fieldValidType == 'n6-16'>
+        { pattern: /^\d{6,16}$/, message: '请输入6到16位数字!'},
+        <#-- 6到16位任意字符 -->
+        <#elseif fieldValidType == '*6-16'>
+        { pattern: /^.{6,16}$/, message: '请输入6到16位任意字符!'},
+        <#-- 6到18位字母 -->
+        <#elseif fieldValidType == 's6-18'>
+        { pattern: /^[a-z|A-Z]{6,18}$/, message: '请输入6到18位字母!'},
+        <#-- 网址 -->
+        <#elseif fieldValidType == 'url'>
+        { pattern: /^((ht|f)tps?):\/\/[\w\-]+(\.[\w\-]+)+([\w\-.,@?^=%&:\/~+#]*[\w\-@?^=%&\/~+#])?$/, message: '请输入正确的网址!'},
+        <#-- 电子邮件 -->
+        <#elseif fieldValidType == 'e'>
+        { pattern: /^([\w]+\.*)([\w]+)@[\w]+\.\w{3}(\.\w{2}|)$/, message: '请输入正确的电子邮件!'},
+        <#-- 手机号码 -->
+        <#elseif fieldValidType == 'm'>
+        { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
+        <#-- 邮政编码 -->
+        <#elseif fieldValidType == 'p'>
+        { pattern: /^[0-9]\d{5}$/, message: '请输入正确的邮政编码!'},
+        <#-- 字母 -->
+        <#elseif fieldValidType == 's'>
+        { pattern: /^[A-Z|a-z]+$/, message: '请输入字母!'},
+        <#-- 数字 -->
+        <#elseif fieldValidType == 'n'>
+        { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!'},
+        <#-- 整数 -->
+        <#elseif fieldValidType == 'z'>
+        { pattern: /^-?\d+$/, message: '请输入整数!'},
+        <#-- 金额 -->
+        <#elseif fieldValidType == 'money'>
+        { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},
+        <#-- 正则校验 -->
+        <#elseif fieldValidType != '' && fieldValidType != '*'>
+        { pattern: '${fieldValidType}', message: '不符合校验规则!'},
+        <#-- 无校验 -->
+        <#else>
+        <#t>
+        </#if>
+      ];
+     </#if>
+    },
+    </#if>
+    <#if po.readonly=='Y'>
+    dynamicDisabled:true,
+    </#if>
+  },
+</#if>
+</#list>
+];
+</#list>
\ No newline at end of file
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}_menu_insert.sql b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}_menu_insert.sql
new file mode 100644
index 00000000..5396d5d5
--- /dev/null
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}_menu_insert.sql
@@ -0,0 +1 @@
+<#include "/common/sql/menu_insert.ftl">
\ No newline at end of file
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei
new file mode 100644
index 00000000..f861a448
--- /dev/null
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei
@@ -0,0 +1,240 @@
+<#list subTables as sub>
+#segment#${sub.entityName}List.vue
+<template>
+ <div class="p-2">
+   <#-- 结束循环 -->
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button>批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+       <#list sub.originalColumns as po>
+        <#if po.classType=='umeditor' || po.classType=='pca' || po.classType=='file'>
+        <template v-if="column.dataIndex==='${po.fieldName}'">
+         <#if po.classType=='umeditor'>
+          <!--富文本件字段回显插槽-->
+          <div v-html="text"></div>
+         </#if>
+         <#if po.classType=='file'>
+          <!--文件字段回显插槽-->
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+         </#if>
+        </template>
+        </#if>
+       </#list>
+      </template>
+    </BasicTable>
+
+    <${sub.entityName}Modal ref="registerModal" @success="handleSuccess"/>
+   </div>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, unref, inject, watch } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import ${sub.entityName}Modal from './components/${sub.entityName}Modal.vue'
+  import { ${sub.entityName?uncap_first}Columns } from './${entityName}.data';
+  import { ${sub.entityName?uncap_first}List, ${sub.entityName?uncap_first}Delete, ${sub.entityName?uncap_first}DeleteBatch, ${sub.entityName?uncap_first}ExportXlsUrl, ${sub.entityName?uncap_first}ImportUrl } from './${entityName}.api';
+  import { isEmpty } from "/@/utils/is";
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  
+  const toggleSearchStatus = ref<boolean>(false);
+  //接收主表id
+  const mainId = inject('mainId') || '';
+  //提示弹窗
+  const $message = useMessage()
+  const queryParam = {};
+  // 列表页面公共参数、方法
+  const { prefixCls, tableContext, onImportXls, onExportXls } = useListPage({
+    tableProps: {
+      api: ${sub.entityName?uncap_first}List,
+      columns: ${sub.entityName?uncap_first}Columns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 180,
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: '${sub.ftlDescription}',
+      url: ${sub.entityName?uncap_first}ExportXlsUrl,
+      params: {
+        <#list sub.foreignKeys as key>
+        '${key?uncap_first}': mainId
+         </#list>
+      }
+    },
+    importConfig: {
+      url: ()=>{
+        return ${sub.entityName?uncap_first}ImportUrl + '/' + unref(mainId)
+      }
+    }
+  });
+
+  //注册table数据
+  const [registerTable, { reload<#if sub.foreignRelationType =='1'>,getDataSource</#if>}, { rowSelection, selectedRowKeys }] = tableContext;
+  const registerModal = ref();
+  const formRef = ref();
+  const labelCol = reactive({
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+  
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    if (isEmpty(unref(mainId))) {
+        $message.createMessage.warning('请选择一个主表信息')
+        return;
+    }
+    <#if sub.foreignRelationType =='1'>
+    let dataSource = getDataSource();
+    if(dataSource.length >= 1){
+      $message.createMessage.warning('一对一子表只能添加一条数据')
+      return;
+    }
+    </#if>
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  async function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit();
+  }
+
+  /**
+   * 详情事件
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+  
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await ${sub.entityName?uncap_first}Delete({id: record.id}, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await ${sub.entityName?uncap_first}DeleteBatch({ids: selectedRowKeys.value}, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ]
+  }
+  
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record){
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
+  
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+  
+  watch(mainId, () => {
+    <#list sub.foreignKeys as key>
+    queryParam['${key?uncap_first}'] = unref(mainId);
+    </#list>
+    reload();
+  });
+</script>
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>
+</#list>
\ No newline at end of file
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
new file mode 100644
index 00000000..e3b2330b
--- /dev/null
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -0,0 +1,218 @@
+<#include "/common/utils.ftl">
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+<#assign need_category = false>
+<#assign bpm_flag=false>
+<#assign need_pca = false>
+<#assign need_search = false>
+<#assign need_dept_user = false>
+<#assign need_switch = false>
+<#assign need_dept = false>
+<#assign need_multi = false>
+<#assign need_popup = false>
+<#assign need_select_tag = false>
+<#assign need_select_tree = false>
+<#assign need_time = false>
+<#assign need_markdown = false>
+<#assign need_upload = false>
+<#assign need_image_upload = false>
+<#assign need_editor = false>
+<#assign need_checkbox = false>
+<#assign hasOnlyValidate = false> 
+<#assign form_span = 24>
+<#if tableVo.fieldRowNum==2>
+<#assign form_span = 12>
+<#elseif tableVo.fieldRowNum==3>
+<#assign form_span = 8>
+<#elseif tableVo.fieldRowNum==4>
+<#assign form_span = 6>
+</#if>
+<#list columns as po>
+<#if po.fieldDbName=='bpm_status'>
+  <#assign bpm_flag=true>
+</#if>        
+<#if po.isShow == 'Y' && po.fieldValidType?default("") == 'only'>
+      <#assign hasOnlyValidate = true>
+</#if>
+  <#include "/common/form/native/vue3NativeForm.ftl">
+</#list>
+        <#if bpm_flag>
+        <a-col v-if="showFlowSubmitButton" :span="24" style="width: 100%;text-align: center;">
+          <a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="submitForm">提 交</a-button>
+        </a-col>
+        </#if>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  <#include "/common/form/native/vue3NativeImport.ftl">
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../${entityName}.api';
+  import { Form } from 'ant-design-vue';
+  <#if hasOnlyValidate == true>
+  import { duplicateValidate } from '/@/utils/helper/validator'
+  </#if>
+  
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
+  });
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    <#include "/common/init/native/vue3NativeMainInitValue.ftl">
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+  <#include "/common/validatorRulesTemplate/native/vue3MainNative.ftl">
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+  const formRef = ref();
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  <#if bpm_flag>
+  onMounted(()=>{
+    initFormData();
+  });
+  //渲染流程表单数据
+  const queryByIdUrl = '/${entityPackage}/${entityName?uncap_first}/queryById';
+  async function initFormData(){
+    if(props.formBpm === true){
+      let params = {id: props.formData.dataId};
+      const data = await defHttp.get({url: queryByIdUrl, params});
+      //设置表单的值
+      edit({...data});
+    }
+  }
+  // 是否显示提交按钮
+  const showFlowSubmitButton = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return true
+      }
+    }
+    return false
+  });
+  </#if>
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formData, record);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+	<#if need_popup>
+  /**
+   *  popup组件值改变事件
+   */
+  function setFieldsValue(map) {
+    Object.keys(map).map((key) => {
+      formData[key] = map[key];
+    });
+  }
+	</#if>
+
+	<#if need_category || need_select_tree>
+  /**
+   * 值改变事件触发
+   * @param key
+   * @param value
+   */
+  function handleFormChange(key, value) {
+    formData[key] = value;
+  }
+  </#if>
+ <#list columns as po>
+  <#if po.isShow == 'Y' && po.fieldValidType?default("") == 'only'>
+  async function ${po.fieldName}Duplicatevalidate(_r, value) {
+    return duplicateValidate('${tableName}', '${po.fieldDbName}', value, formData.id || '')
+  }
+  </#if>
+  </#list>
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    min-height: 500px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+</style>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vuei
new file mode 100644
index 00000000..bc31abbd
--- /dev/null
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vuei
@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <${entityName}Form ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></${entityName}Form>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import ${entityName}Form from './${entityName}Form.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
\ No newline at end of file
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
new file mode 100644
index 00000000..1ded92d5
--- /dev/null
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
@@ -0,0 +1,194 @@
+<#list subTables as sub>
+#segment#${sub.entityName}Form.vue
+<#include "/common/utils.ftl">
+<#assign need_category = false>
+<#assign bpm_flag=false>
+<#assign need_pca = false>
+<#assign need_search = false>
+<#assign need_dept_user = false>
+<#assign need_switch = false>
+<#assign need_dept = false>
+<#assign need_multi = false>
+<#assign need_popup = false>
+<#assign need_select_tag = false>
+<#assign need_select_tree = false>
+<#assign need_time = false>
+<#assign need_markdown = false>
+<#assign need_upload = false>
+<#assign need_image_upload = false>
+<#assign need_editor = false>
+<#assign need_checkbox = false>
+<#assign form_span = 24>
+<#if tableVo.fieldRowNum==2>
+  <#assign form_span = 12>
+<#elseif tableVo.fieldRowNum==3>
+  <#assign form_span = 8>
+<#elseif tableVo.fieldRowNum==4>
+  <#assign form_span = 6>
+</#if>
+  <#assign hasOnlyValidate = false>
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form v-bind="formItemLayout" ref="formRef">
+      <a-row>
+        <#list sub.colums as po>
+          <#if po.isShow == 'Y' && po.fieldValidType?default("") == 'only'>
+            <#assign hasOnlyValidate = true>
+          </#if>
+          <#if po.fieldDbName=='bpm_status'>
+            <#assign bpm_flag=true>
+          </#if>
+          <#include "/common/form/native/vue3NativeForm.ftl">
+        </#list>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, onMounted, inject, defineProps, unref } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  <#include "/common/form/native/vue3NativeImport.ftl">
+  import { getValueType } from '/@/utils';
+  import { ${sub.entityName?uncap_first}SaveOrUpdate } from '../${entityName}.api';
+  import { Form } from 'ant-design-vue';
+  <#if hasOnlyValidate == true>
+  import { duplicateValidate } from '/@/utils/helper/validator'
+  </#if>
+
+  //接收主表id
+  const mainId = inject('mainId');
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    <#include "/common/init/native/vue3NativeSubInitValue.ftl">
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+   <#list sub.colums as po>
+   <#if po.isShow == 'Y' && poHasCheck(po)>
+    ${po.fieldName}: [<#include "/common/validatorRulesTemplate/native/vue3CoreNative.ftl">],
+   </#if>
+   </#list>
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+  const props = defineProps({
+    disabled: { type: Boolean, default: false },
+  });
+  const formItemLayout = {
+    labelCol: { xs: { span: 24 }, sm: { span: 5 } },
+    wrapperCol: { xs: { span: 24 }, sm: { span: 16 } },
+  };
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formData, record);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+   
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    if (unref(mainId)) {
+      <#list sub.foreignKeys as key>
+      model['${key?uncap_first}'] = unref(mainId);
+      </#list>
+    }
+    await ${sub.entityName?uncap_first}SaveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+  <#if need_popup>
+  /**`
+   *  popup组件值改变事件
+   */
+  function setFieldsValue(map) {
+    Object.keys(map).map((key) => {
+      formData[key] = map[key];
+    });
+  }
+  </#if>
+
+  <#if need_category || need_select_tree>
+  /**
+   * 值改变事件触发
+   * @param key
+   * @param value
+   */
+  function handleFormChange(key, value) {
+    formData[key] = value;
+  }
+  </#if>
+  <#list sub.colums as po>
+  <#if po.isShow == 'Y' && po.fieldValidType?default("") == 'only'>
+    async function ${po.fieldName}Duplicatevalidate(_r, value) {
+      return duplicateValidate('${sub.tableName}', '${po.fieldDbName}', value, formData.id || '')
+    }
+  </#if>
+  </#list>
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    min-height: 500px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+</style>
+</#list>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Modal.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Modal.vuei
new file mode 100644
index 00000000..f3270d4d
--- /dev/null
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Modal.vuei
@@ -0,0 +1,77 @@
+<#include "/common/utils.ftl">
+<#list subTables as sub>
+#segment#${sub.entityName}Modal.vue
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+      <${sub.entityName}Form ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></${sub.entityName}Form>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, computed, unref, inject, nextTick, defineExpose } from 'vue';
+  import ${sub.entityName}Form from './${sub.entityName}Form.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+  
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+  
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+  
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+  
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+<style lang="less" scoped>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
+</#list>
\ No newline at end of file
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
index cfd48412..8a0f60ee 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@@ -1,6 +1,6 @@
 <#include "/common/utils.ftl">
 <template>
-  <div>
+  <div class="p-2">
     <#assign query_field_no=0>
     <#assign need_category = false>
     <#assign need_pca = false>
@@ -345,12 +345,14 @@
   /* ----------------------以下为原生查询需要添加的-------------------------- */
   const toggleSearchStatus = ref<boolean>(false);
   const labelCol = reactive({
-    xs: { span: 24 },
-    sm: { span: 7 },
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
   });
   const wrapperCol = reactive({
-    xs: { span: 24 },
-    sm: { span: 16 },
+    xs: 24,
+    sm: 20,
   });
   /**
    * 重置
@@ -385,6 +387,7 @@
 </script>
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
+    padding: 0;
   .table-page-search-submitButtons {
     display: block;
     margin-bottom: 24px;
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
index 383d8001..ca4410e7 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -147,11 +147,7 @@
       const activeKey = ref('${subTabActiveKey}');
       const formData = reactive<Record<string, any>>({
         id: '',
-      <#list columns as po>
-      <#if po.isShow == 'Y'>
-        ${po.fieldName}: '',
-      </#if>
-      </#list>
+        <#include "/common/init/native/vue3NativeMainInitValue.ftl">
       });
 
       //表单验证
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
index b912d59e..dc018461 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
@@ -75,11 +75,7 @@
       const loading = ref(false);
       const formData = reactive<Record<string, any>>({
         id: '',
-    <#list sub.colums as po>
-    <#if po.isShow == 'Y'>
-        ${po.fieldName}: '',
-    </#if>
-    </#list>
+        <#include "/common/init/native/vue3NativeSubInitValue.ftl">
       });
       //表单验证
       const validatorRules = reactive({