From 819555e61235251e3f6d105f11a61ec357e44db7 Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Sat, 13 Jul 2024 18:08:34 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=99=A8=E4=B8=93=E9=A1=B9=E4=BC=98=E5=8C=96=E3=80=91=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=B2=A1=E6=9C=89=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=89=8D=E7=AB=AF=E6=9D=83=E9=99=90=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?v-auth=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=96=B0=E7=BB=84=E4=BB=B6JPopupDict=E5=AD=97=E5=85=B8=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E8=8C=83=E5=9B=B4=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E6=9B=B4=E6=8D=A2=E7=BE=8E=E8=A7=82=E7=9A=84=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C:=20=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E8=8C=83=E5=9B=B4=E3=80=81=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E7=AD=89=20=E7=94=A8=E6=88=B7=E5=92=8C?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=BB=84=E4=BB=B6=EF=BC=8C=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=9A=84=E6=97=B6=E5=80=99=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AEOnline=E5=AD=98=E5=82=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=92=8C=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=9D=A5=20=E5=8E=9F=E7=94=9F=E8=A1=A8=E5=8D=95=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E4=B8=8D=E9=80=9A=E8=BF=87=EF=BC=8C=E6=9C=AA=E6=BB=9A?=
 =?UTF-8?q?=E5=88=B0=E6=9C=AA=E9=80=9A=E8=BF=87=E6=A0=A1=E9=AA=8C=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E9=9D=9E=E5=8E=9F=E7=94=9F=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=A0=A1=E9=AA=8C=E4=B8=8D=E9=80=9A=E8=BF=87=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=AA=E6=BB=9A=E5=88=B0=E6=9C=AA=E9=80=9A=E8=BF=87=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E7=9A=84=E5=AD=97=E6=AE=B5=20=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=A7=A6=E5=8F=91=E4=BA=86=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20ERP=E9=A3=8E=E6=A0=BC=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E6=B2=A1=E6=9C=89=E6=B5=AE=E5=8A=A8?=
 =?UTF-8?q?=20=E9=A1=B5=E9=9D=A2=E6=8E=A7=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=8B=E6=8B=89=E6=A1=86=E6=97=B6=EF=BC=8C=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E5=89=8D=E7=AB=AFvue=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=86=97=E4=BD=99","=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=20?=
 =?UTF-8?q?int=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E7=9A=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E6=88=90=E6=95=B0=E5=80=BC=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=20=E6=97=A0=E8=AE=BA=E6=98=AF=E5=8E=9F=E7=94=9Ferp=E8=BF=98?=
 =?UTF-8?q?=E6=98=AF=E9=9D=9E=E5=8E=9F=E7=94=9F=EF=BC=8C=E4=B8=8D=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E4=B8=BB=E8=A1=A8=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=AF=BC=E5=87=BA=E5=AD=90=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=91=E7=8E=B0=E5=AF=BC=E5=87=BA=E4=BA=86=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E4=B8=80=E5=AF=B9=E5=A4=9Aerp=EF=BC=8C?=
 =?UTF-8?q?=E4=B9=9F=E6=94=B9=E6=88=90=E7=82=B9=E5=87=BB=E8=A1=8C=E5=B0=B1?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=20=E4=B8=80=E5=AF=B9Tab=E9=A3=8E=E6=A0=BC?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BE=8E=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/native/vue3NativeComponents.ftl      |  3 +
 .../common/form/native/vue3NativeForm.ftl     | 15 ++-
 .../common/form/native/vue3NativeImport.ftl   |  6 ++
 .../common/form/native/vue3NativeSearch.ftl   | 65 ++++---------
 .../code-template-online/common/utils.ftl     | 17 ++++
 .../vue3/${entityName}List.vuei               | 17 ++--
 .../vue3/${entityName}__data.tsi              | 49 +++++++++-
 .../vue3/components/${entityName}Modal.vuei   | 12 ++-
 .../vue3Native/${entityName}List.vuei         | 64 +++++++++++--
 .../vue3Native/${entityName}__data.tsi        |  2 +-
 .../components/${entityName}Form.vuei         | 25 ++++-
 .../vue3/${entityName}List.vuei               | 22 +++--
 .../vue3/${entityName}__data.tsi              | 49 +++++++++-
 .../vue3/components/${entityName}Modal.vuei   | 12 ++-
 .../vue3Native/${entityName}List.vuei         | 57 +++++++++++-
 .../vue3Native/${entityName}__data.tsi        |  2 +-
 .../components/${entityName}Form.vuei         | 25 ++++-
 .../vue3/${entityName}List.vuei               | 19 ++--
 .../vue3/${entityName}__data.tsi              | 77 +++++++++++++++-
 .../${entityPackage}/vue3/[1-n]List.vuei      |  1 +
 .../vue3/components/${entityName}Modal.vuei   | 12 ++-
 .../vue3/components/[1-n]Modal.vuei           | 11 ++-
 .../vue3Native/${entityName}List.vuei         | 68 ++++++++++++--
 .../vue3Native/${entityName}__data.tsi        |  4 +-
 .../vue3Native/[1-n]List.vuei                 |  1 +
 .../components/${entityName}Form.vuei         | 19 +++-
 .../vue3Native/components/[1-n]Form.vuei      | 18 +++-
 .../vue3/${entityName}List.vuei               | 21 +++--
 .../vue3/${entityName}__data.tsi              | 91 +++++++++++++++++--
 .../vue3/components/${entityName}Modal.vuei   |  8 +-
 .../vue3/components/[1-n]Form.vuei            | 14 ++-
 .../vue3/${entityName}List.vuei               | 21 +++--
 .../vue3/${entityName}__data.tsi              | 72 ++++++++++++++-
 .../vue3/components/${entityName}Modal.vuei   |  8 +-
 .../vue3/components/[1-n]Form.vuei            | 16 +++-
 .../vue3Native/${entityName}List.vuei         | 67 ++++++++++++--
 .../vue3Native/${entityName}__data.tsi        |  2 +-
 .../components/${entityName}Form.vuei         | 23 ++++-
 .../vue3Native/components/[1-n]Form.vuei      | 28 +++++-
 .../vue3/${entityName}List.vuei               | 21 +++--
 .../vue3/${entityName}__data.tsi              | 89 +++++++++++++++++-
 .../vue3/components/${entityName}Modal.vuei   |  8 +-
 .../vue3/components/[1-n]Form.vuei            | 16 +++-
 43 files changed, 973 insertions(+), 204 deletions(-)

diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeComponents.ftl b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeComponents.ftl
index d38ed3694..30a4861f6 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeComponents.ftl
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeComponents.ftl
@@ -13,6 +13,9 @@
 <#if need_popup>
       JPopup,
 </#if>
+<#if need_popup_dict>
+      JPopupDict,
+</#if>
 <#if need_category>
       JCategorySelect,
 </#if>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl
index 79de5503b..eadf11b79 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl
@@ -9,7 +9,7 @@
 		<#assign form_field_dictCode="${po.dictField}">
 	</#if>
 						<a-col :span="${form_span}">
-							<a-form-item label="${po.filedComment}" v-bind="validateInfos.${autoStringSuffixForModel(po)}">
+							<a-form-item label="${po.filedComment}" v-bind="validateInfos.${autoStringSuffixForModel(po)}" id="${formEntityName}-${autoStringSuffixForModel(po)}" name="${autoStringSuffixForModel(po)}">
 					<#if po.classType =='date'>
 								<a-date-picker placeholder="请选择${po.filedComment}" <#if po.extendParams?exists && po.extendParams.picker?exists>picker="${po.extendParams.picker}"</#if> v-model:value="formData.${po.fieldName}" value-format="YYYY-MM-DD"  style="width: 100%" <#if po.readonly=='Y'>disabled</#if> allow-clear />
 					<#elseif po.classType =='datetime'>
@@ -33,9 +33,18 @@
 									:multi="${po.extendParams.popupMulti?c}"
 									:setFieldsValue="setFieldsValue"
 									<#if po.readonly=='Y'>disabled</#if><#rt> allow-clear />
+					<#elseif po.classType =='popup_dict'>
+								<#assign need_popup_dict = true>
+								<#assign sourceFields = po.dictField?default("")?trim?split(",")/>
+								<#assign targetFields = po.dictText?default("")?trim?split(",")/>
+								<j-popup-dict
+									placeholder="请选择${po.filedComment}"
+									v-model:value="formData.${po.fieldName}"
+									dictCode="${po.dictTable},${po.dictText},${po.dictField}"
+									:multi="${po.extendParams.popupMulti?c}" <#if po.readonly=='Y'>disabled</#if> />
 					<#elseif po.classType =='sel_depart'>
 								<#assign need_dept = true>
-								<j-select-dept v-model:value="formData.${po.fieldName}" :multiple="${po.extendParams.multi?default('true')}" checkStrictly <#if po.readonly=='Y'>disabled</#if> allow-clear />
+								<j-select-dept v-model:value="formData.${po.fieldName}"  <#if po.extendParams?exists && po.extendParams.text?exists>labelKey="${po.extendParams.text}"</#if> <#if po.extendParams?exists && po.extendParams.store?exists>rowKey="${po.extendParams.store}"</#if>   <#if po.readonly=='Y'>disabled</#if> :multiple="${po.extendParams.multi?default('true')}" checkStrictly <#if po.readonly=='Y'>disabled</#if> allow-clear />
 					<#elseif po.classType =='switch'>
 								<#assign need_switch = true>
 								<j-switch v-model:value="formData.${po.fieldName}" <#if po.dictField != 'is_open'>:options="${po.dictField}"</#if> <#if po.readonly=='Y'>disabled</#if>></j-switch>
@@ -50,7 +59,7 @@
 					<#elseif po.classType =='sel_user'>
 								<#assign need_dept_user = true>
 						<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
-						<j-select-user v-model:value="formData.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if> allow-clear />
+						<j-select-user v-model:value="formData.${po.fieldName}"  <#if po.extendParams?exists && po.extendParams.text?exists>labelKey="${po.extendParams.text}"</#if> <#if po.extendParams?exists && po.extendParams.store?exists>rowKey="${po.extendParams.store}"</#if>  <#if po.readonly=='Y'>disabled</#if> allow-clear />
 						<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
 					<#elseif po.classType =='textarea'>
 								<a-textarea v-model:value="formData.${autoStringSuffixForModel(po)}" :rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeImport.ftl b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeImport.ftl
index e2ea2d71d..5e0e88ef4 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeImport.ftl
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeImport.ftl
@@ -13,6 +13,9 @@
 <#if need_popup>
   import JPopup from '/@/components/Form/src/jeecg/components/JPopup.vue';
 </#if>
+<#if need_popup_dict>
+  import JPopupDict from '/@/components/Form/src/jeecg/components/JPopupDict.vue';
+</#if>
 <#if need_category>
   import JCategorySelect from '/@/components/Form/src/jeecg/components/JCategorySelect.vue';
 </#if>
@@ -47,4 +50,7 @@
 </#if>
 <#if need_checkbox>
   import JCheckbox from "/@/components/Form/src/jeecg/components/JCheckbox.vue";
+</#if>
+<#if need_range_number>
+  import JRangeNumber from "/@/components/Form/src/jeecg/components/JRangeNumber.vue";
 </#if>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl
index c85ef1a64..96352c34e 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl
@@ -56,66 +56,41 @@
                 <#if query_field_no gt 1>  </#if>]"
                 <#if query_field_no gt 1>  </#if>:multi="${po.extendParams.popupMulti?c}"
                 <#if query_field_no gt 1>  </#if>:setFieldsValue="setFieldsValue" allow-clear />
+            <#elseif po.classType=='popup_dict'>
+                <#if query_field_no gt 1>  </#if><j-popup-dict
+                <#if query_field_no gt 1>  </#if>placeholder="请选择${po.filedComment}"
+                <#if query_field_no gt 1>  </#if>v-model:value="queryParam.${po.fieldName}"
+                <#if query_field_no gt 1>  </#if>dictCode="${po.dictTable},${po.dictText},${po.dictField}"
+                <#if query_field_no gt 1>  </#if>:multi="${po.extendParams.popupMulti?c}"
+                <#if query_field_no gt 1>  </#if><#if po.readonly=='Y'>disabled</#if> />
             <#elseif po.classType=='list' || po.classType=='radio' || po.classType=='checkbox'>
-            <#--  ---------------------------下拉或是单选 判断数据字典是表字典还是普通字典------------------------------- -->
-            <#if po.dictTable?default("")?trim?length gt 1>
+             <#--  ---------------------------下拉或是单选 判断数据字典是表字典还是普通字典------------------------------- -->
+             <#if po.dictTable?default("")?trim?length gt 1>
               <#if query_field_no gt 1>  </#if><j-dict-select-tag placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" dictCode="${po.dictTable},${po.dictText},${po.dictField}" allow-clear />
-            <#elseif po.dictField?default("")?trim?length gt 1>
+              <#elseif po.dictField?default("")?trim?length gt 1>
               <#if query_field_no gt 1>  </#if><j-dict-select-tag placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" dictCode="${po.dictField}" allow-clear />
-            <#else>
+              <#else>
               <#if query_field_no gt 1>  </#if><a-input placeholder="请输入${po.filedComment}" v-model:value="queryParam.${po.fieldName}" allow-clear ></a-input>
-            </#if>
+             </#if>
             <#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
               <#if query_field_no gt 1>  </#if><a-input-number placeholder="请输入${po.filedComment}" v-model:value="queryParam.${po.fieldName}"></a-input-number>           
-      <#else>
+            <#else>
               <#if query_field_no gt 1>  </#if><a-input placeholder="请输入${po.filedComment}" v-model:value="queryParam.${autoStringSuffixForModel(po)}" allow-clear ></a-input>
-      </#if>
+          </#if>
             <#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="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 query_field_no gt 1>  </#if><a-form-item name="${autoStringSuffixForModel(po)}">
+              <#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><div style="display: flex">
-                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_begin" style="margin-bottom: 0;">
-                   <#if query_field_no gt 1>  </#if><a-date-picker value-format="YYYY-MM-DD" placeholder="请选择开始日期" <#if po.extendParams?exists && po.extendParams.picker?exists>picker="${po.extendParams.picker}"</#if> v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust" allow-clear />
-                 <#if query_field_no gt 1>  </#if></a-form-item>  
-                 <#if query_field_no gt 1>  </#if><span class="query-group-split-cust">~</span>
-                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_end" style="margin-bottom: 0;">
-                   <#if query_field_no gt 1>  </#if><a-date-picker value-format="YYYY-MM-DD" placeholder="请选择结束日期" <#if po.extendParams?exists && po.extendParams.picker?exists>picker="${po.extendParams.picker}"</#if> v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust" allow-clear />
-                 <#if query_field_no gt 1>  </#if></a-form-item>
-               <#if query_field_no gt 1>  </#if></div>
+              <#if query_field_no gt 1>  </#if><a-range-picker value-format="YYYY-MM-DD" <#if po.extendParams?exists && po.extendParams.picker?exists>picker="${po.extendParams.picker}"</#if> v-model:value="queryParam.${po.fieldName}" class="query-group-cust"/>
       <#elseif po.classType=='time'>
-               <#if query_field_no gt 1>  </#if><div style="display: flex">
-                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_begin" style="margin-bottom: 0;">
-                   <#if query_field_no gt 1>  </#if><time-picker value-format="HH:mm:ss" placeholder="请选择开始时间" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust" allow-clear />
-                 <#if query_field_no gt 1>  </#if></a-form-item>
-                 <#if query_field_no gt 1>  </#if><span class="query-group-split-cust">~</span>
-                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_end" style="margin-bottom: 0;">
-                   <#if query_field_no gt 1>  </#if><time-picker value-format="HH:mm:ss" placeholder="请选择结束日期" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust" allow-clear />
-                 <#if query_field_no gt 1>  </#if></a-form-item>
-               <#if query_field_no gt 1>  </#if></div>
+              <#if query_field_no gt 1>  </#if><a-time-range-picker value-format="HH:mm:ss" v-model:value="queryParam.${po.fieldName}" class="query-group-cust" />
       <#elseif po.classType=='datetime'>
-               <#if query_field_no gt 1>  </#if><div style="display: flex">
-                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_begin" style="margin-bottom: 0;">
-                   <#if query_field_no gt 1>  </#if><a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust" allow-clear />
-                 <#if query_field_no gt 1>  </#if></a-form-item>
-                 <#if query_field_no gt 1>  </#if><span class="query-group-split-cust">~</span>
-                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_end" style="margin-bottom: 0;">
-                   <#if query_field_no gt 1>  </#if><a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust" allow-clear />
-                 <#if query_field_no gt 1>  </#if></a-form-item>
-               <#if query_field_no gt 1>  </#if></div>
+              <#if query_field_no gt 1>  </#if><a-range-picker showTime value-format="YYYY-MM-DD HH:mm:ss" v-model:value="queryParam.${po.fieldName}" class="query-group-cust"/>
       <#else>
-               <#if query_field_no gt 1>  </#if><div style="display: flex">
-                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_begin" style="margin-bottom: 0;">
-                   <#if query_field_no gt 1>  </#if><a-input placeholder="请输入最小值" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust" allow-clear ></a-input>
-                 <#if query_field_no gt 1>  </#if></a-form-item>       
-                 <#if query_field_no gt 1>  </#if><span class="query-group-left query-group-split-cust">~</span>
-                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_end" style="margin-bottom: 0;"> 
-                  <#if query_field_no gt 1>  </#if><a-input placeholder="请输入最大值" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust" allow-clear ></a-input>
-                 <#if query_field_no gt 1>  </#if></a-form-item>
-               <#if query_field_no gt 1>  </#if></div>
+              <#if query_field_no gt 1>  </#if><JRangeNumber v-model:value="queryParam.${po.fieldName}" class="query-group-cust"></JRangeNumber>
       </#if>
             <#if query_field_no gt 1>  </#if></a-form-item>
           <#if query_field_no gt 1>  </#if></a-col>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl
index f0dd8f0e6..b26a3bc75 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl
@@ -149,6 +149,8 @@
         <#-- update-begin---author:chenrui ---date:20231228  for:fix 带条件字典存在单引号导致js编译错误---------- -->
     <#elseif po.dictField?default("")?trim?length gt 1>
         <#assign dictCode="dictCode: '${po.dictField}'">
+    <#else>
+        <#assign dictCode="dictCode: ''">
     </#if>
 
     <#if po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='checkbox' || po.classType=='radio'>
@@ -229,4 +231,19 @@
     </#if>
   </#if>
   <#return flag>
+</#function>
+
+<#-- vue3 native 获取范围字段 -->
+<#function getRangeField(columns) >
+  <#assign rangeField = "">
+  <#list columns as po>
+      <#if po.isQuery=='Y'>
+          <#if po.queryMode!='single'>
+              <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal' || po.classType=='time' || po.classType=='date' || po.classType=='datetime'>
+                  <#assign rangeField = rangeField + "${po.fieldName},">
+              </#if>
+          </#if>
+      </#if>
+  </#list>
+  <#return rangeField>
 </#function>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
index c58235625..fc879096a 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@@ -21,9 +21,9 @@
    <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-button type="primary" v-auth="'${entityPackage}:${tableName}:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'${entityPackage}:${tableName}:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button type="primary" v-auth="'${entityPackage}:${tableName}:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
           <a-dropdown v-if="selectedRowKeys.length > 0">
               <template #overlay>
                 <a-menu>
@@ -33,7 +33,7 @@
                   </a-menu-item>
                 </a-menu>
               </template>
-              <a-button>批量操作
+              <a-button v-auth="'${entityPackage}:${tableName}:deleteBatch'">批量操作
                 <Icon icon="mdi:chevron-down"></Icon>
               </a-button>
         </a-dropdown>
@@ -229,6 +229,7 @@
          {
            label: '编辑',
            onClick: handleEdit.bind(null, record),
+           auth: '${entityPackage}:${tableName}:edit'
          }
        ]
    }
@@ -247,7 +248,8 @@
              title: '是否确认删除',
              confirm: handleDelete.bind(null, record),
              placement: 'topLeft',
-           }
+           },
+           auth: '${entityPackage}:${tableName}:delete'
          }
        ];
        if(record.bpmStatus == '1'){
@@ -272,7 +274,8 @@
              title: '是否确认删除',
              confirm: handleDelete.bind(null, record),
              placement: 'topLeft',
-           }
+           },
+           auth: '${entityPackage}:${tableName}:delete'
          }
        ]
 </#if>
@@ -318,6 +321,6 @@
     </#if>
 </script>
 
-<style scoped>
+<style lang="less" scoped>
 <#include "/common/form/vue3SearchStyle.ftl">
 </style>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index d53deb09c..c1bd44eff 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -57,7 +57,7 @@ export const columns: BasicColumn[] = [
     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'>
+   <#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' || po.classType=='popup_dict'>
     dataIndex: '${po.fieldName}_dictText'
    <#elseif po.classType=='cat_tree'>
     dataIndex: '${po.fieldName}',
@@ -104,6 +104,14 @@ export const searchFormSchema: FormSchema[] = [
 <#elseif po.classType=='sel_user'>
 <#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
       component: 'JSelectUser',
+      componentProps:{
+      <#if po.extendParams?exists && po.extendParams.text?exists>
+         labelKey: '${po.extendParams.text}',
+      </#if>
+      <#if po.extendParams?exists && po.extendParams.store?exists>
+          rowKey: '${po.extendParams.store}',
+      </#if>
+      },
 <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
 <#elseif po.classType=='switch'>
       component: 'JSwitch',
@@ -115,6 +123,14 @@ export const searchFormSchema: FormSchema[] = [
        },
  <#elseif po.classType=='sel_depart'>
       component: 'JSelectDept',
+      componentProps:{
+      <#if po.extendParams?exists && po.extendParams.text?exists>
+         labelKey: '${po.extendParams.text}',
+      </#if>
+      <#if po.extendParams?exists && po.extendParams.store?exists>
+          rowKey: '${po.extendParams.store}',
+      </#if>
+      },
  <#elseif po.classType=='list_multi'>
       component: 'JSelectMultiple',
       componentProps:{
@@ -156,6 +172,13 @@ export const searchFormSchema: FormSchema[] = [
       },
 <#elseif po.classType=='popup'>
     <#include "/common/form/vue3popup.ftl">
+<#elseif po.classType=='popup_dict'>
+      component: 'JPopupDict',
+      componentProps: {
+        placeholder: '请选择${po.filedComment}',
+        dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+        multi: ${po.extendParams.popupMulti?c}
+      },
 <#elseif po.classType=='list' || po.classType=='radio' || po.classType=='checkbox'>
 <#--  ---------------------------下拉或是单选 判断数据字典是表字典还是普通字典------------------------------- -->
       component: 'JDictSelectTag',
@@ -276,8 +299,23 @@ export const formSchema: FormSchema[] = [
     },
     <#elseif po.classType =='popup'>
     <#include "/common/form/vue3popup.ftl">
+    <#elseif po.classType=='popup_dict'>
+    component: 'JPopupDict',
+    componentProps: {
+      placeholder: '请选择${po.filedComment}',
+      dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+      multi: ${po.extendParams.popupMulti?c}
+    },
      <#elseif po.classType =='sel_depart'>
      component: 'JSelectDept',
+     componentProps:{
+      <#if po.extendParams?exists && po.extendParams.text?exists>
+         labelKey: '${po.extendParams.text}',
+      </#if>
+      <#if po.extendParams?exists && po.extendParams.store?exists>
+          rowKey: '${po.extendParams.store}',
+      </#if>
+      },
      <#elseif po.classType =='switch'>
      component: 'JSwitch',
      componentProps:{
@@ -299,8 +337,13 @@ export const formSchema: FormSchema[] = [
     component: 'JSelectUser',
     <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
-        labelKey:'realname',
-     },
+  <#if po.extendParams?exists && po.extendParams.text?exists>
+      labelKey: '${po.extendParams.text}',
+  </#if>
+  <#if po.extendParams?exists && po.extendParams.store?exists>
+      rowKey: '${po.extendParams.store}',
+  </#if>
+    },
     <#elseif po.classType =='textarea'>
     component: 'InputTextArea',
     <#elseif po.classType=='list'>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
index 5c1fa5c5d..8143675fb 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
@@ -1,7 +1,7 @@
 <#include "/common/utils.ftl">
 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="${getModalWidth(tableVo.fieldRowNum?default(1))}" @ok="handleSubmit">
-      <BasicForm @register="registerForm"/>
+      <BasicForm @register="registerForm" name="${entityName}Form" />
   </BasicModal>
 </template>
 
@@ -16,7 +16,7 @@
     const isUpdate = ref(true);
     const isDetail = ref(false);
     //表单配置
-    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+    const [registerForm, { setProps,resetFields, setFieldsValue, validate, scrollToField }] = useForm({
         //labelWidth: 150,
         schemas: formSchema,
         showActionButtonGroup: false,
@@ -51,6 +51,14 @@
             closeModal();
             //刷新列表
             emit('success');
+        } catch ({ errorFields }) {
+           if (errorFields) {
+             const firstField = errorFields[0];
+             if (firstField) {
+               scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+             }
+           }
+           return Promise.reject(errorFields);
         } finally {
             setModalProps({confirmLoading: false});
         }
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
index 77fee7a56..383b674d2 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@@ -1,3 +1,4 @@
+<#include "/common/utils.ftl">
 <template>
   <div class="p-2">
 <#assign query_field_no=0>  
@@ -9,6 +10,7 @@
 <#assign need_dept = false>
 <#assign need_multi = false>
 <#assign need_popup = false>
+<#assign need_popup_dict = false>
 <#assign need_select_tag = false>
 <#assign need_select_tree = false>
 <#assign need_time = false>
@@ -18,6 +20,8 @@
 <#assign need_image_upload = false>
 <#assign need_editor = false>
 <#assign need_checkbox = false>
+<#assign need_range_number = false>
+<#assign is_range = false>
 <#assign query_flag = false>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
@@ -52,11 +56,20 @@
 <#if po.classType=='popup'>
 <#assign need_popup = true>
 </#if>
+<#if po.classType=='popup_dict'>
+<#assign need_popup_dict = true>
+</#if>
 <#if po.classType=='sel_tree'>
 <#assign need_select_tree = true>
 </#if>
 <#if po.classType=='time'>
 <#assign need_time = true>
+</#if>
+<#if po.queryMode!='single' && (po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal')>
+<#assign need_range_number = true>
+</#if>
+<#if po.queryMode!='single'>
+<#assign is_range = true>
 </#if>
   <#include "/common/form/native/vue3NativeSearch.ftl">
 </#list>
@@ -85,9 +98,9 @@
     <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-button type="primary" v-auth="'${entityPackage}:${tableName}:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button  type="primary" v-auth="'${entityPackage}:${tableName}:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary" v-auth="'${entityPackage}:${tableName}:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -97,7 +110,7 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button v-auth="'${entityPackage}:${tableName}:deleteBatch'">批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
@@ -158,6 +171,9 @@
   <#if bpm_flag==true>
   import { startProcess } from '/@/api/common/api';
   </#if>
+  <#if is_range>
+  import { cloneDeep } from "lodash-es";
+  </#if>
 
   const formRef = ref();
   const queryParam = reactive<any>({});
@@ -176,8 +192,13 @@
         width: 120,
         fixed: 'right',
       },
-      beforeFetch: (params) => {
+      beforeFetch: async (params) => {
+       <#if is_range>
+        let rangerQuery = await setRangeQuery();
+        return Object.assign(params, rangerQuery);
+       <#else>
         return Object.assign(params, queryParam);
+       </#if>
       },
     },
     exportConfig: {
@@ -270,6 +291,7 @@
       {
         label: '编辑',
         onClick: handleEdit.bind(null, record),
+        auth: '${entityPackage}:${tableName}:edit'
       },
     ];
   }
@@ -289,7 +311,8 @@
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
           placement: 'topLeft',
-        }
+        },
+        auth: '${entityPackage}:${tableName}:delete'
       }
     ];
     if(record.bpmStatus == '1'){
@@ -314,7 +337,8 @@
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
           placement: 'topLeft',
-        }
+        },
+        auth: '${entityPackage}:${tableName}:delete'
       }
     ]
     </#if>
@@ -407,6 +431,32 @@
   }
   initDictConfig();
     </#if>
+  <#if is_range>
+  
+  let rangeField = '${getRangeField(columns)}'
+  
+  /**
+   * 设置范围查询条件
+   */
+  async function setRangeQuery(){
+    let queryParamClone = cloneDeep(queryParam);
+    if (rangeField) {
+      let fieldsValue = rangeField.split(',');
+      fieldsValue.forEach(item => {
+        if (queryParamClone[item]) {
+          let range = queryParamClone[item];
+          queryParamClone[item+'_begin'] = range[0];
+          queryParamClone[item+'_end'] = range[1];
+          delete queryParamClone[item];
+        } else {
+          queryParamClone[item+'_begin'] = '';
+          queryParamClone[item+'_end'] = '';
+        }
+      })
+    }
+    return queryParamClone;
+  }
+  </#if>
 </script>
 
 <style lang="less" scoped>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
index 45ed477d3..03bf054d2 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
@@ -57,7 +57,7 @@ export const columns: BasicColumn[] = [
     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'>
+   <#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' || po.classType=='popup_dict'>
     dataIndex: '${po.fieldName}_dictText'
    <#elseif po.classType=='cat_tree'>
     dataIndex: '${po.fieldName}',
diff --git a/jeecg-boot/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-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
index ce9d8f8a5..cd77f7d71 100644
--- a/jeecg-boot/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-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -3,7 +3,7 @@
   <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="${entityName}Form">
           <a-row>
 <#assign need_category = false>
 <#assign bpm_flag=false>
@@ -14,6 +14,7 @@
 <#assign need_dept = false>
 <#assign need_multi = false>
 <#assign need_popup = false>
+<#assign need_popup_dict = false>
 <#assign need_select_tag = false>
 <#assign need_select_tree = false>
 <#assign need_time = false>
@@ -23,6 +24,7 @@
 <#assign need_editor = false>
 <#assign need_checkbox = false>
 <#assign hasOnlyValidate = false> 
+<#assign need_range_number = false>
 <#assign form_span = 24>
 <#if tableVo.fieldRowNum==2>
 <#assign form_span = 12>
@@ -38,6 +40,7 @@
 <#if po.isShow == 'Y' && po.fieldValidType?default("") == 'only'>
       <#assign hasOnlyValidate = true>
 </#if>
+  <#assign formEntityName>${entityName}Form</#assign>
   <#include "/common/form/native/vue3NativeForm.ftl">
 </#list>
         <#if bpm_flag>
@@ -64,7 +67,10 @@
   <#if hasOnlyValidate == true>
   import { duplicateValidate } from '/@/utils/helper/validator'
   </#if>
-  
+  <#if bpm_flag>
+  import { usePermission } from '/@/hooks/web/usePermission';
+  const { isDisabledAuth, hasPermission, initBpmFormData } = usePermission();
+  </#if>
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
     formData: { type: Object, default: () => ({})},
@@ -101,6 +107,7 @@
 
   <#if bpm_flag>
   onMounted(()=>{
+    initBpmFormData(props.formData);
     initFormData();
   });
   //渲染流程表单数据
@@ -152,8 +159,18 @@
    * 提交数据
    */
   async function submitForm() {
-    // 触发表单验证
-    await validate();
+    try {
+      // 触发表单验证
+      await validate();
+    } catch ({ errorFields }) {
+      if (errorFields) {
+        const firstField = errorFields[0];
+        if (firstField) {
+          formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+        }
+      }
+      return Promise.reject(errorFields);
+    }
     confirmLoading.value = true;
     const isUpdate = ref<boolean>(false);
     //时间格式化
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
index 42fc9a0b0..b4cf4d8ef 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@@ -26,9 +26,9 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" @fetch-success="onFetchSuccess">
       <!--插槽:table标题-->
       <template #tableTitle>
-          <a-button type="primary" @click="handleCreate" 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-button type="primary" v-auth="'${entityPackage}:${tableName}:add'" @click="handleCreate" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'${entityPackage}:${tableName}:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" v-auth="'${entityPackage}:${tableName}:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
 
           <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
@@ -39,7 +39,7 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button  v-auth="'${entityPackage}:${tableName}:deleteBatch'">批量操作
             <Icon icon="ant-design:down-outlined"></Icon>
           </a-button>
         </a-dropdown>
@@ -371,6 +371,7 @@
       {
         label: '编辑',
         onClick: handleEdit.bind(null, record),
+        auth: '${entityPackage}:${tableName}:edit'
       },
       {
         label: '添加下级',
@@ -392,9 +393,9 @@
          popConfirm: {
            title: '是否确认删除',
            confirm: handleDelete.bind(null, record),
-           placement: 'topLeft',
-         }
-       }
+           placement: 'topLeft'
+         },
+         auth: '${entityPackage}:${tableName}:delete'
      ];
      if(record.bpmStatus == '1' || !record.bpmStatus){
        dropDownAction.push({
@@ -417,8 +418,9 @@
          popConfirm: {
            title: '确定删除吗?',
            confirm: handleDelete.bind(null, record),
-           placement: 'topLeft',
-         }
+           placement: 'topLeft'
+         },
+         auth: '${entityPackage}:${tableName}:delete'
        }
      ]
      </#if>
@@ -442,6 +444,6 @@
 
 </script>
 
-<style scoped>
+<style lang="less" scoped>
 <#include "/common/form/vue3SearchStyle.ftl">
 </style>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index f2412e946..60774f4ff 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -61,7 +61,7 @@ export const columns: BasicColumn[] = [
     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'>
+   <#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' || po.classType=='popup_dict'>
     dataIndex: '${po.fieldName}_dictText'
    <#elseif po.classType=='cat_tree'>
     dataIndex: '${po.fieldName}',
@@ -109,6 +109,14 @@ export const searchFormSchema: FormSchema[] = [
 <#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
       component: 'JSelectUser',
 <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+      componentProps:{
+      <#if po.extendParams?exists && po.extendParams.text?exists>
+          labelKey: '${po.extendParams.text}',
+      </#if>
+      <#if po.extendParams?exists && po.extendParams.store?exists>
+          rowKey: '${po.extendParams.store}',
+      </#if>
+        },
 <#elseif po.classType=='switch'>
       component: 'JSwitch',
       componentProps:{
@@ -118,6 +126,14 @@ export const searchFormSchema: FormSchema[] = [
        },
  <#elseif po.classType=='sel_depart'>
       component: 'JSelectDept',
+      componentProps:{
+    <#if po.extendParams?exists && po.extendParams.text?exists>
+        labelKey: '${po.extendParams.text}',
+    </#if>
+    <#if po.extendParams?exists && po.extendParams.store?exists>
+        rowKey: '${po.extendParams.store}',
+    </#if>
+      },
  <#elseif po.classType=='list_multi'>
       component: 'JSelectMultiple',
        componentProps:{
@@ -159,6 +175,13 @@ export const searchFormSchema: FormSchema[] = [
       },
 <#elseif po.classType=='popup'>
     <#include "/common/form/vue3popup.ftl">
+<#elseif po.classType=='popup_dict'>
+      component: 'JPopupDict',
+      componentProps: {
+        placeholder: '请选择${po.filedComment}',
+        dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+        multi: ${po.extendParams.popupMulti?c}
+      },
 <#elseif po.classType == 'sel_tree'>
       component: 'JTreeSelect',
       componentProps:{
@@ -294,8 +317,23 @@ export const formSchema: FormSchema[] = [
     },
     <#elseif po.classType =='popup'>
     <#include "/common/form/vue3popup.ftl">
+    <#elseif po.classType=='popup_dict'>
+    component: 'JPopupDict',
+    componentProps: {
+      placeholder: '请选择${po.filedComment}',
+      dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+      multi: ${po.extendParams.popupMulti?c}
+    },
      <#elseif po.classType =='sel_depart'>
      component: 'JSelectDept',
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
+     },
      <#elseif po.classType =='switch'>
      component: 'JSwitch',
      componentProps:{
@@ -317,8 +355,13 @@ export const formSchema: FormSchema[] = [
     component: 'JSelectUser',
 <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
-        labelKey:'realname',
-     },
+  <#if po.extendParams?exists && po.extendParams.text?exists>
+      labelKey: '${po.extendParams.text}',
+  </#if>
+  <#if po.extendParams?exists && po.extendParams.store?exists>
+      rowKey: '${po.extendParams.store}',
+  </#if>
+    },
     <#elseif po.classType =='textarea'>
     component: 'InputTextArea',
     <#elseif po.classType=='list'>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
index a5dcd3a3e..e0e3759d8 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
@@ -11,7 +11,7 @@
 </#list>
 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :width="${getModalWidth(tableVo.fieldRowNum?default(1))}" :title="getTitle" @ok="handleSubmit">
-    <BasicForm @register="registerForm"/>
+    <BasicForm @register="registerForm" name="${entityName}Form" />
   </BasicModal>
 </template>
 <script lang="ts" setup>
@@ -29,7 +29,7 @@
   // 当前编辑的数据
   let model:Nullable<Recordable> = null;
   //表单配置
-  const [registerForm, {setProps,resetFields, setFieldsValue, validate, updateSchema}] = useForm({
+  const [registerForm, { setProps,resetFields, setFieldsValue, validate, updateSchema, scrollToField }] = useForm({
     schemas: formSchema,
     showActionButtonGroup: false,
     baseColProps: {span: ${getFormSpan(tableVo.fieldRowNum?default(1))}},
@@ -103,6 +103,14 @@
         // 是否更改了父级节点
         changeParent: model != null && (model['${pidFieldName}'] != values['${pidFieldName}']),
       });
+    } catch ({ errorFields }) {
+      if (errorFields) {
+        const firstField = errorFields[0];
+        if (firstField) {
+          scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+        }
+      }
+      return Promise.reject(errorFields);
     } finally {
       setModalProps({confirmLoading: false});
     }
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
index c7ce0c491..0e9a760c1 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@@ -20,6 +20,7 @@
 <#assign need_dept = false>
 <#assign need_multi = false>
 <#assign need_popup = false>
+<#assign need_popup_dict = false>
 <#assign need_select_tag = false>
 <#assign need_select_tree = false>
 <#assign need_time = false>
@@ -29,6 +30,8 @@
 <#assign need_image_upload = false>
 <#assign need_editor = false>
 <#assign need_checkbox = false>
+<#assign need_range_number = false>
+<#assign is_range = false>
 <#assign query_flag = false>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
@@ -63,11 +66,20 @@
 <#if po.classType=='popup'>
 <#assign need_popup = true>
 </#if>
+<#if po.classType=='popup_dict'>
+<#assign need_popup_dict = true>
+</#if>
 <#if po.classType=='sel_tree'>
 <#assign need_select_tree = true>
 </#if>
 <#if po.classType=='time'>
 <#assign need_time = true>
+</#if>
+<#if po.queryMode!='single' && (po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal')>
+<#assign need_range_number = true>
+</#if>
+<#if po.queryMode!='single'>
+<#assign is_range = true>
 </#if>
   <#include "/common/form/native/vue3NativeSearch.ftl">
 </#list>
@@ -96,7 +108,7 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" @fetch-success="onFetchSuccess">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" v-auth="'${entityPackage}:${tableName}:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -106,7 +118,7 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button
+          <a-button v-auth="'${entityPackage}:${tableName}:deleteBatch'"
             >批量操作
             <Icon icon="ant-design:down-outlined"></Icon>
           </a-button>
@@ -164,6 +176,9 @@
 </#if>
 <#if need_pca>
   import { getAreaTextByCode } from '/@/components/Form/src/utils/Area';
+</#if>
+<#if is_range>
+  import { cloneDeep } from "lodash-es";
 </#if>
   <#if bpm_flag==true>
   import { startProcess } from '/@/api/common/api';
@@ -186,8 +201,13 @@
         width: 120,
         fixed: 'right',
       },
-      beforeFetch: (params) => {
+      beforeFetch: async (params) => {
+       <#if is_range>
+        let rangerQuery = await setRangeQuery();
+        return Object.assign(params, rangerQuery);
+       <#else>
         return Object.assign(params, queryParam.value);
+       </#if>
       },
     },
     exportConfig: {
@@ -419,6 +439,7 @@
       {
         label: '编辑',
         onClick: handleEdit.bind(null, record),
+        auth: '${entityPackage}:${tableName}:edit'
       }
     ];
   }
@@ -443,8 +464,9 @@
         popConfirm: {
           title: '确定删除吗?',
           confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
+          placement: 'topLeft'
         },
+        auth: '${entityPackage}:${tableName}:delete'
       },
     ];
     if(record.bpmStatus == '1' || !record.bpmStatus){
@@ -475,6 +497,7 @@
           confirm: handleDelete.bind(null, record),
           placement: 'topLeft',
         },
+        auth: '${entityPackage}:${tableName}:delete'
       },
     ];
     </#if>
@@ -569,6 +592,32 @@
   }
   initDictConfig();
     </#if>
+  <#if is_range>
+  
+  let rangeField = '${getRangeField(columns)}'
+  
+  /**
+   * 设置范围查询条件
+   */
+  async function setRangeQuery(){
+    let queryParamClone = cloneDeep(queryParam.value);
+    if (rangeField) {
+      let fieldsValue = rangeField.split(',');
+      fieldsValue.forEach(item => {
+        if (queryParamClone[item]) {
+          let range = queryParamClone[item];
+          queryParamClone[item+'_begin'] = range[0];
+          queryParamClone[item+'_end'] = range[1];
+          delete queryParamClone[item];
+        } else {
+          queryParamClone[item+'_begin'] = '';
+          queryParamClone[item+'_end'] = '';
+        }
+      })
+    }
+    return queryParamClone;
+  }
+  </#if>
 </script>
 
 <style lang="less" scoped>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
index 64ef3b0c0..e6c344719 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
@@ -61,7 +61,7 @@ export const columns: BasicColumn[] = [
     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'>
+   <#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' || po.classType=='popup_dict'>
     dataIndex: '${po.fieldName}_dictText'
    <#elseif po.classType=='cat_tree'>
     dataIndex: '${po.fieldName}',
diff --git a/jeecg-boot/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-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
index 5ea178df2..7f0d70269 100644
--- a/jeecg-boot/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-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -3,7 +3,7 @@
   <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="${entityName}Form">
           <a-row>
 <#assign need_category = false>
 <#assign bpm_flag=false>
@@ -14,6 +14,7 @@
 <#assign need_dept = false>
 <#assign need_multi = false>
 <#assign need_popup = false>
+<#assign need_popup_dict = false>
 <#assign need_select_tag = false>
 <#assign need_select_tree = false>
 <#assign need_time = false>
@@ -22,6 +23,7 @@
 <#assign need_image_upload = false>
 <#assign need_editor = false>
 <#assign need_checkbox = false>
+<#assign need_range_number = false>
 <#assign pidFieldName = "">
 <#assign hasOnlyValidate = false>
 <#assign form_span = 24>
@@ -56,6 +58,7 @@
               </a-form-item>
             </a-col>
           </#if>    
+  <#assign formEntityName>${entityName}Form</#assign>
   <#include "/common/form/native/vue3NativeForm.ftl">
 </#list>
           <#if bpm_flag>
@@ -82,7 +85,10 @@
   <#if hasOnlyValidate == true>
   import { duplicateValidate } from '/@/utils/helper/validator'
   </#if>
-  
+  <#if bpm_flag>
+  import { usePermission } from '/@/hooks/web/usePermission';
+  const { isDisabledAuth, hasPermission, initBpmFormData } = usePermission();
+  </#if>
   const useForm = Form.useForm;
   const formRef = ref();
   const isUpdate = ref(true);
@@ -124,6 +130,7 @@
 
   <#if bpm_flag>
   onMounted(()=>{
+    initBpmFormData(props.formData);
     initFormData();
   });
   //渲染流程表单数据
@@ -196,8 +203,18 @@
    * 提交数据
    */
   async function submitForm() {
-    // 触发表单验证
-    await validate();
+    try {
+      // 触发表单验证
+      await validate();
+    } catch ({ errorFields }) {
+      if (errorFields) {
+        const firstField = errorFields[0];
+        if (firstField) {
+          formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+        }
+      }
+      return Promise.reject(errorFields);
+    }
     confirmLoading.value = true;
     const isUpdate = ref<boolean>(false);
     //时间格式化
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
index 8c2107816..6284ac6af 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@@ -22,9 +22,9 @@
       <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-button type="primary" v-auth="'${entityPackage}:${tableName}:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button type="primary" v-auth="'${entityPackage}:${tableName}:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button type="primary" v-auth="'${entityPackage}:${tableName}:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
           <a-dropdown v-if="selectedRowKeys.length > 0">
             <template #overlay>
               <a-menu>
@@ -34,7 +34,7 @@
                 </a-menu-item>
               </a-menu>
             </template>
-            <a-button>批量操作
+            <a-button  v-auth="'${entityPackage}:${tableName}:deleteBatch'">批量操作
               <Icon icon="mdi:chevron-down"></Icon>
             </a-button>
           </a-dropdown>
@@ -251,6 +251,7 @@
          {
            label: '编辑',
            onClick: handleEdit.bind(null, record),
+           auth: '${entityPackage}:${tableName}:edit'
          }
        ]
    }
@@ -285,8 +286,9 @@
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        }
+          placement: 'topLeft'
+        },
+        auth: '${entityPackage}:${tableName}:delete'
       }
     ];
     if(record.bpmStatus == '1'){
@@ -309,8 +311,9 @@
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        }
+          placement: 'topLeft'
+        },
+        auth: '${entityPackage}:${tableName}:delete'
       }
     ]
     </#if>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index c8387176a..b0101f81e 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -57,7 +57,7 @@ export const columns: BasicColumn[] = [
     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'>
+   <#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' || po.classType=='popup_dict'>
     dataIndex: '${po.fieldName}_dictText'
    <#elseif po.classType=='cat_tree'>
     dataIndex: '${po.fieldName}',
@@ -102,6 +102,14 @@ export const searchFormSchema: FormSchema[] = [
 <#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
       component: 'JSelectUser',
 <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+      componentProps:{
+      <#if po.extendParams?exists && po.extendParams.text?exists>
+          labelKey: '${po.extendParams.text}',
+      </#if>
+      <#if po.extendParams?exists && po.extendParams.store?exists>
+          rowKey: '${po.extendParams.store}',
+      </#if>
+        },
 <#elseif po.classType=='switch'>
       component: 'JSwitch',
       componentProps:{
@@ -112,6 +120,14 @@ export const searchFormSchema: FormSchema[] = [
        },
  <#elseif po.classType=='sel_depart'>
       component: 'JSelectDept',
+      componentProps:{
+    <#if po.extendParams?exists && po.extendParams.text?exists>
+        labelKey: '${po.extendParams.text}',
+    </#if>
+    <#if po.extendParams?exists && po.extendParams.store?exists>
+        rowKey: '${po.extendParams.store}',
+    </#if>
+      },
  <#elseif po.classType=='list_multi'>
       component: 'JSelectMultiple',
       componentProps:{
@@ -148,6 +164,13 @@ export const searchFormSchema: FormSchema[] = [
       },
 <#elseif po.classType=='popup'>
     <#include "/common/form/vue3popup.ftl">
+<#elseif po.classType=='popup_dict'>
+      component: 'JPopupDict',
+      componentProps: {
+        placeholder: '请选择${po.filedComment}',
+        dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+        multi: ${po.extendParams.popupMulti?c}
+      },
 <#elseif po.classType=='list' || po.classType=='radio' || po.classType=='checkbox'>
 <#--  ---------------------------下拉或是单选 判断数据字典是表字典还是普通字典------------------------------- -->
       component: 'JDictSelectTag',
@@ -269,8 +292,23 @@ export const formSchema: FormSchema[] = [
     },
     <#elseif po.classType =='popup'>
     <#include "/common/form/vue3popup.ftl">
+    <#elseif po.classType=='popup_dict'>
+    component: 'JPopupDict',
+    componentProps: {
+      placeholder: '请选择${po.filedComment}',
+      dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+      multi: ${po.extendParams.popupMulti?c}
+    },
      <#elseif po.classType =='sel_depart'>
      component: 'JSelectDept',
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
+     },
      <#elseif po.classType =='switch'>
      component: 'JSwitch',
      componentProps:{
@@ -292,7 +330,14 @@ export const formSchema: FormSchema[] = [
     component: 'JSelectUser',
 <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
-        labelKey:'realname',
+    <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   <#else>
+       labelKey:'realname',
+    </#if>
+    <#if po.extendParams?exists && po.extendParams.store?exists>
+        rowKey: '${po.extendParams.store}',
+    </#if>
      },
     <#elseif po.classType =='textarea'>
     component: 'InputTextArea',//TODO 注意string转换问题
@@ -575,8 +620,23 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
     },
     <#elseif po.classType =='popup'>
     <#include "/common/form/vue3popup.ftl">
+    <#elseif po.classType=='popup_dict'>
+    component: 'JPopupDict',
+    componentProps: {
+      placeholder: '请选择${po.filedComment}',
+      dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+      multi: ${po.extendParams.popupMulti?c}
+    },
      <#elseif po.classType =='sel_depart'>
      component: 'JSelectDept',
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
+     },
      <#elseif po.classType =='switch'>
      component: 'JSwitch',
      componentProps:{
@@ -597,9 +657,16 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
 <#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     component: 'JSelectUser',
 <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
-    componentProps:{
-        labelKey:'realname',
-     },
+     componentProps:{
+        <#if po.extendParams?exists && po.extendParams.text?exists>
+           labelKey: '${po.extendParams.text}',
+       <#else>
+           labelKey:'realname',
+        </#if>
+        <#if po.extendParams?exists && po.extendParams.store?exists>
+            rowKey: '${po.extendParams.store}',
+        </#if>
+         },
     <#elseif po.classType =='textarea'>
     component: 'InputTextArea',
     <#elseif po.classType=='list' || po.classType=='radio'>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/[1-n]List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/[1-n]List.vuei
index 29c3d43f5..bd57ddd2b 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/[1-n]List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/[1-n]List.vuei
@@ -79,6 +79,7 @@
             useSearchForm: false,
             actionColumn: {
                 width: 180,
+                fixed:'right'
             },
             pagination:{
                 current: 1,
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
index 5c1fa5c5d..b6ac62ce5 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
@@ -1,7 +1,7 @@
 <#include "/common/utils.ftl">
 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="${getModalWidth(tableVo.fieldRowNum?default(1))}" @ok="handleSubmit">
-      <BasicForm @register="registerForm"/>
+      <BasicForm @register="registerForm" name="${entityName}Form" />
   </BasicModal>
 </template>
 
@@ -16,7 +16,7 @@
     const isUpdate = ref(true);
     const isDetail = ref(false);
     //表单配置
-    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+    const [registerForm, { setProps,resetFields, setFieldsValue, validate, scrollToField }] = useForm({
         //labelWidth: 150,
         schemas: formSchema,
         showActionButtonGroup: false,
@@ -51,6 +51,14 @@
             closeModal();
             //刷新列表
             emit('success');
+        } catch ({ errorFields }) {
+          if (errorFields) {
+            const firstField = errorFields[0];
+            if (firstField) {
+              scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+            }
+          }
+          return Promise.reject(errorFields);
         } finally {
             setModalProps({confirmLoading: false});
         }
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Modal.vuei
index 772b40724..aeaba17aa 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Modal.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Modal.vuei
@@ -3,7 +3,7 @@
 #segment#${sub.entityName}Modal.vue
 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="${getModalWidth(tableVo.fieldRowNum?default(1))}" @ok="handleSubmit">
-      <BasicForm @register="registerForm"/>
+      <BasicForm @register="registerForm" name="${sub.entityName}Form" />
   </BasicModal>
 </template>
 
@@ -21,7 +21,7 @@
     const isUpdate = ref(true);
     const isDetail = ref(false);
     //表单配置
-    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+    const [registerForm, { setProps,resetFields, setFieldsValue, validate, scrollToField }] = useForm({
         //labelWidth: 150,
         schemas: ${sub.entityName?uncap_first}FormSchema,
         showActionButtonGroup: false,
@@ -61,6 +61,13 @@
             closeModal();
             //刷新列表
             emit('success');
+        } catch ({ errorFields }) {
+          if (errorFields) {
+            const firstField = errorFields[0];
+            if (firstField) {
+              scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+            }
+          }
         } finally {
             setModalProps({confirmLoading: false});
         }
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
index e9170198d..7fe54e9f1 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@@ -10,6 +10,7 @@
     <#assign need_dept = false>
     <#assign need_multi = false>
     <#assign need_popup = false>
+    <#assign need_popup_dict = false>
     <#assign need_select_tag = false>
     <#assign need_select_tree = false>
     <#assign need_time = false>
@@ -20,6 +21,8 @@
     <#assign need_editor = false>
     <#assign need_checkbox = false>
     <#assign query_flag = false>
+    <#assign need_range_number = false>
+    <#assign is_range = false>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -56,12 +59,21 @@
             <#if po.classType=='popup'>
               <#assign need_popup = true>
             </#if>
+            <#if po.classType=='popup_dict'>
+              <#assign need_popup_dict = true>
+            </#if>
             <#if po.classType=='sel_tree'>
               <#assign need_select_tree = true>
             </#if>
             <#if po.classType=='time'>
               <#assign need_time = true>
             </#if>
+            <#if po.queryMode!='single' && (po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal')>
+              <#assign need_range_number = true>
+            </#if>
+            <#if po.queryMode!='single'>
+              <#assign is_range = true>
+            </#if>
             <#include "/common/form/native/vue3NativeSearch.ftl">
           </#list>
           <#if query_field_no gt 2>
@@ -90,9 +102,9 @@
     <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-button type="primary" v-auth="'${entityPackage}:${tableName}:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" v-auth="'${entityPackage}:${tableName}:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary"  v-auth="'${entityPackage}:${tableName}:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -102,7 +114,7 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button
+          <a-button  v-auth="'${entityPackage}:${tableName}:deleteBatch'"
             >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
@@ -160,7 +172,7 @@
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage'
   import ${entityName}Modal from './components/${entityName}Modal.vue'
-  import { columns, searchFormSchema, superQuerySchema } from './${entityName}.data';
+  import { columns, superQuerySchema } from './${entityName}.data';
   import { list, deleteOne, batchDelete, getImportUrl,getExportUrl } from './${entityName}.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   <#include "/common/form/native/vue3NativeImport.ftl">
@@ -179,7 +191,9 @@
   import ${sub.entityName}List from './${sub.entityName}List.vue'
   </#list>
   import { useUserStore } from '/@/store/modules/user';
-
+  <#if is_range>
+  import { cloneDeep } from "lodash-es";
+  </#if>
   const formRef = ref();
   const queryParam = reactive<any>({});
   const checkedKeys = ref<Array<string | number>>([]);
@@ -199,8 +213,13 @@
         width: 120,
         fixed:'right'
       },
-      beforeFetch: (params) => {
+      beforeFetch: async (params) => {
+       <#if is_range>
+        let rangerQuery = await setRangeQuery();
+        return Object.assign(params, rangerQuery);
+       <#else>
         return Object.assign(params, queryParam);
+       </#if>
       },
       pagination: {
         current: 1,
@@ -292,6 +311,7 @@
       {
         label: '编辑',
         onClick: handleEdit.bind(null, record),
+        auth: '${entityPackage}:${tableName}:edit'
       },
     ];
   }
@@ -310,8 +330,9 @@
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        }
+          placement: 'topLeft'
+        },
+        auth: '${entityPackage}:${tableName}:delete'
       }
     ];
     if(record.bpmStatus == '1' || !record.bpmStatus){
@@ -336,8 +357,9 @@
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
+          placement: 'topLeft'
         },
+        auth: '${entityPackage}:${tableName}:delete'
       },
     ];
    </#if>
@@ -436,6 +458,32 @@
     }
   }
   </#if>
+  <#if is_range>
+  
+  let rangeField = '${getRangeField(columns)}'
+  
+  /**
+   * 设置范围查询条件
+   */
+  async function setRangeQuery(){
+    let queryParamClone = cloneDeep(queryParam);
+    if (rangeField) {
+      let fieldsValue = rangeField.split(',');
+      fieldsValue.forEach(item => {
+        if (queryParamClone[item]) {
+          let range = queryParamClone[item];
+          queryParamClone[item+'_begin'] = range[0];
+          queryParamClone[item+'_end'] = range[1];
+          delete queryParamClone[item];
+        } else {
+          queryParamClone[item+'_begin'] = '';
+          queryParamClone[item+'_end'] = '';
+        }
+      })
+    }
+    return queryParamClone;
+  }
+  </#if>
 </script>
 <style lang="less" scoped>
 <#include "/common/form/native/vueNativeSearchStyle.ftl">
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
index 64835600e..bd01e2789 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
@@ -57,7 +57,7 @@ export const columns: BasicColumn[] = [
     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'>
+   <#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' || po.classType=='popup_dict'>
     dataIndex: '${po.fieldName}_dictText'
    <#elseif po.classType=='cat_tree'>
     dataIndex: '${po.fieldName}',
@@ -121,7 +121,7 @@ export const ${sub.entityName?uncap_first}Columns: BasicColumn[] = [
     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'>
+   <#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' || po.classType=='popup_dict'>
     dataIndex: '${po.fieldName}_dictText'
    <#elseif po.classType=='cat_tree'>
     dataIndex: '${po.fieldName}',
diff --git a/jeecg-boot/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-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei
index 6df0d580e..36e43bd9f 100644
--- a/jeecg-boot/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-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei
@@ -87,6 +87,7 @@
       useSearchForm: false,
       actionColumn: {
         width: 180,
+        fixed:'right'
       },
       beforeFetch: (params) => {
         return Object.assign(params, queryParam);
diff --git a/jeecg-boot/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-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
index 9895d074a..b85215cda 100644
--- a/jeecg-boot/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-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -3,7 +3,7 @@
   <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="${entityName}Form">
           <a-row>
 <#assign need_category = false>
 <#assign bpm_flag=false>
@@ -14,6 +14,7 @@
 <#assign need_dept = false>
 <#assign need_multi = false>
 <#assign need_popup = false>
+<#assign need_popup_dict = false>
 <#assign need_select_tag = false>
 <#assign need_select_tree = false>
 <#assign need_time = false>
@@ -23,6 +24,7 @@
 <#assign need_editor = false>
 <#assign need_checkbox = false>
 <#assign hasOnlyValidate = false> 
+<#assign need_range_number = false>
 <#assign form_span = 24>
 <#if tableVo.fieldRowNum==2>
 <#assign form_span = 12>
@@ -38,6 +40,7 @@
 <#if po.isShow == 'Y' && po.fieldValidType?default("") == 'only'>
       <#assign hasOnlyValidate = true>
 </#if>
+  <#assign formEntityName>${entityName}Form</#assign>
   <#include "/common/form/native/vue3NativeForm.ftl">
 </#list>
             <#if bpm_flag>
@@ -151,8 +154,18 @@
    * 提交数据
    */
   async function submitForm() {
-    // 触发表单验证
-    await validate();
+    try {
+      // 触发表单验证
+      await validate();
+    } catch ({ errorFields }) {
+      if (errorFields) {
+        const firstField = errorFields[0];
+        if (firstField) {
+          formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+        }
+      }
+      return Promise.reject(errorFields);
+    }
     confirmLoading.value = true;
     const isUpdate = ref<boolean>(false);
     //时间格式化
diff --git a/jeecg-boot/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-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
index 4a702444a..fd2c2ec17 100644
--- a/jeecg-boot/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-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
@@ -10,6 +10,7 @@
 <#assign need_dept = false>
 <#assign need_multi = false>
 <#assign need_popup = false>
+<#assign need_popup_dict = false>
 <#assign need_select_tag = false>
 <#assign need_select_tree = false>
 <#assign need_time = false>
@@ -18,6 +19,7 @@
 <#assign need_image_upload = false>
 <#assign need_editor = false>
 <#assign need_checkbox = false>
+<#assign need_range_number = false>
 <#assign form_span = 24>
 <#if tableVo.fieldRowNum==2>
   <#assign form_span = 12>
@@ -31,7 +33,7 @@
   <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form class="antd-modal-form" v-bind="formItemLayout" ref="formRef">
+        <a-form class="antd-modal-form" v-bind="formItemLayout" ref="formRef" name="${sub.entityName}Form">
           <a-row>
             <#list sub.colums as po>
               <#if po.isShow == 'Y' && po.fieldValidType?default("") == 'only'>
@@ -40,6 +42,7 @@
               <#if po.fieldDbName=='bpm_status'>
                 <#assign bpm_flag=true>
               </#if>
+              <#assign formEntityName>${sub.entityName}</#assign>
               <#include "/common/form/native/vue3NativeForm.ftl">
             </#list>
           </a-row>
@@ -121,7 +124,18 @@
    */
   async function submitForm() {
     // 触发表单验证
-    await validate();
+    try {
+      // 触发表单验证
+      await validate();
+    } catch ({ errorFields }) {
+      if (errorFields) {
+        const firstField = errorFields[0];
+        if (firstField) {
+          formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+        }
+      }
+      return Promise.reject(errorFields);
+    }
     confirmLoading.value = true;
     const isUpdate = ref<boolean>(false);
     //时间格式化
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
index 99f8647db..eafab3580 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@@ -35,9 +35,9 @@
      <!-- 内嵌table区域 end -->
      <!--插槽: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-button type="primary" v-auth="'${entityPackage}:${tableName}:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'${entityPackage}:${tableName}:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" v-auth="'${entityPackage}:${tableName}:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
           <a-dropdown v-if="selectedRowKeys.length > 0">
               <template #overlay>
                 <a-menu>
@@ -47,7 +47,7 @@
                   </a-menu-item>
                 </a-menu>
               </template>
-              <a-button>批量操作
+              <a-button  v-auth="'${entityPackage}:${tableName}:deleteBatch'">批量操作
                 <Icon icon="mdi:chevron-down"></Icon>
               </a-button>
         </a-dropdown>
@@ -257,6 +257,7 @@
          {
            label: '编辑',
            onClick: handleEdit.bind(null, record),
+           auth: '${entityPackage}:${tableName}:edit'
          }
        ]
    }
@@ -291,8 +292,9 @@
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        }
+          placement: 'topLeft'
+        },
+        auth: '${entityPackage}:${tableName}:delete'
       }
     ];
     if(record.bpmStatus == '1' || !record.bpmStatus){
@@ -316,8 +318,9 @@
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        }
+          placement: 'topLeft'
+        },
+        auth: '${entityPackage}:${tableName}:delete'
       }
     ]
     </#if>
@@ -347,6 +350,6 @@
     </#if>
 </script>
 
-<style scoped>
+<style lang="less" scoped>
 <#include "/common/form/vue3SearchStyle.ftl">
 </style>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index ca20f9713..c6bc1c5f1 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -58,7 +58,7 @@ export const columns: BasicColumn[] = [
     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'>
+   <#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' || po.classType=='popup_dict'>
     dataIndex: '${po.fieldName}_dictText'
    <#elseif po.classType=='cat_tree'>
     dataIndex: '${po.fieldName}',
@@ -106,6 +106,14 @@ export const searchFormSchema: FormSchema[] = [
 <#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
       component: 'JSelectUser',
 <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
+     },
 <#elseif po.classType=='switch'>
       component: 'JSwitch',
       componentProps:{
@@ -116,6 +124,14 @@ export const searchFormSchema: FormSchema[] = [
        },
  <#elseif po.classType=='sel_depart'>
       component: 'JSelectDept',
+      componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
+      },
  <#elseif po.classType=='list_multi'>
       component: 'JSelectMultiple',
        componentProps:{
@@ -152,6 +168,13 @@ export const searchFormSchema: FormSchema[] = [
       },
 <#elseif po.classType=='popup'>
     <#include "/common/form/vue3popup.ftl">
+<#elseif po.classType=='popup_dict'>
+      component: 'JPopupDict',
+      componentProps: {
+        placeholder: '请选择${po.filedComment}',
+        dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+        multi: ${po.extendParams.popupMulti?c}
+      },
 <#elseif po.classType=='list' || po.classType=='radio' || po.classType=='checkbox'>
 <#--  ---------------------------下拉或是单选 判断数据字典是表字典还是普通字典------------------------------- -->
       component: 'JDictSelectTag',
@@ -272,8 +295,23 @@ export const formSchema: FormSchema[] = [
     },
     <#elseif po.classType =='popup'>
     <#include "/common/form/vue3popup.ftl">
+    <#elseif po.classType=='popup_dict'>
+    component: 'JPopupDict',
+    componentProps: {
+      placeholder: '请选择${po.filedComment}',
+      dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+      multi: ${po.extendParams.popupMulti?c}
+    },
     <#elseif po.classType =='sel_depart'>
      component: 'JSelectDept',
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
+     },
      <#elseif po.classType =='switch'>
      component: 'JSwitch',
      componentProps:{
@@ -294,8 +332,13 @@ export const formSchema: FormSchema[] = [
 <#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     component: 'JSelectUser',
 <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
-    componentProps:{
-        labelKey:'realname',
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
      },
     <#elseif po.classType =='textarea'>
     component: 'InputTextArea',
@@ -494,7 +537,7 @@ export const ${sub.entityName?uncap_first}Columns: BasicColumn[] = [
     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'>
+   <#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' || po.classType=='popup_dict'>
     dataIndex: '${po.fieldName}_dictText'
    <#elseif po.classType=='cat_tree'>
     dataIndex: '${po.fieldName}',
@@ -565,8 +608,23 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
     },
     <#elseif po.classType =='popup'>
     <#include "/common/form/vue3popup.ftl">
+    <#elseif po.classType=='popup_dict'>
+    component: 'JPopupDict',
+    componentProps: {
+      placeholder: '请选择${po.filedComment}',
+      dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+      multi: ${po.extendParams.popupMulti?c}
+    },
      <#elseif po.classType =='sel_depart'>
      component: 'JSelectDept',
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
+     },
      <#elseif po.classType =='switch'>
      component: 'JSwitch',
      componentProps:{
@@ -587,8 +645,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
 <#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     component: 'JSelectUser',
 <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
-    componentProps:{
-        labelKey:'realname',
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
      },
     <#elseif po.classType =='textarea'>
     component: 'InputTextArea',
@@ -822,11 +885,27 @@ export const ${sub.entityName?uncap_first}JVxeColumns: JVxeColumn[] = [
       </#if>
 <#elseif col.classType =='sel_depart'>
       type: JVxeTypes.departSelect,
+      props:{
+    <#if col.extendParams?exists && col.extendParams.text?exists>
+        labelKey: '${col.extendParams.text}',
+    </#if>
+    <#if col.extendParams?exists && col.extendParams.store?exists>
+        rowKey: '${col.extendParams.store}',
+    </#if>
+      },
       <#if col.readonly=='Y'>
       disabled:true,
       </#if>
 <#elseif col.classType =='sel_user'>
       type: JVxeTypes.userSelect,
+      props:{
+    <#if col.extendParams?exists && col.extendParams.text?exists>
+        labelKey: '${col.extendParams.text}',
+    </#if>
+    <#if col.extendParams?exists && col.extendParams.store?exists>
+        rowKey: '${col.extendParams.store}',
+    </#if>
+      },
       <#if col.readonly=='Y'>
       disabled:true,
       </#if>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
index 00c89cf46..49accbf21 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
@@ -1,7 +1,7 @@
 <#include "/common/utils.ftl">
 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="${getModalWidth(tableVo.fieldRowNum?default(1))}" @ok="handleSubmit">
-      <BasicForm @register="registerForm" ref="formRef"/>
+      <BasicForm @register="registerForm" ref="formRef" name="${entityName}Form" />
       <!-- 子表单区域 -->
       <a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs">
   <#list subTables as sub><#rt/>
@@ -157,6 +157,12 @@
                  if (e.error === VALIDATE_FAILED) {
                      // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
                      activeKey.value = e.index == null ? unref(activeKey) : refKeys.value[e.index]
+                     if (e.errorFields) {
+                       const firstField = e.errorFields[0];
+                       if (firstField) {
+                         e.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+                       }
+                     }
                  } else {
                      console.error(e)
                  }
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei
index cc077e83f..cb5b1f5e4 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei
@@ -3,7 +3,7 @@
 <#if sub.foreignRelationType=='1'>
 #segment#${sub.entityName}Form.vue
 <template>
-    <BasicForm @register="registerForm"/>
+    <BasicForm @register="registerForm" name="${sub.entityName}Form" class="basic-modal-form" />
 </template>
 <script lang="ts">
     import {defineComponent} from 'vue';
@@ -23,7 +23,7 @@
             }
         },
         setup(props,{emit}) {
-            const [registerForm, {setProps, resetFields, setFieldsValue,getFieldsValue,validate}] = useForm({
+            const [registerForm, { setProps, resetFields, setFieldsValue, getFieldsValue, validate, scrollToField }] = useForm({
                 //labelWidth: 150,
                 schemas: ${sub.entityName?uncap_first}FormSchema,
                 showActionButtonGroup: false,
@@ -62,8 +62,8 @@
                     // 验证子表表单
                     validate().then(()=>{
                         return resolve()
-                    }).catch(()=> {
-                        return reject({ error: VALIDATE_FAILED ,index})
+                    }).catch(({ errorFields })=> {
+                        return reject({ error: VALIDATE_FAILED ,index, errorFields: errorFields, scrollToField: scrollToField })
                     })
                 })
             }
@@ -77,5 +77,11 @@
         }
     })
 </script>
+<style lang="less" scoped>
+  .basic-modal-form {
+    overflow: auto;
+    height: 340px;
+  }
+</style>
 </#if>
 </#list>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
index 63aea005f..ac8301a78 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@@ -21,9 +21,9 @@
    <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-button type="primary" v-auth="'${entityPackage}:${tableName}:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'${entityPackage}:${tableName}:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" v-auth="'${entityPackage}:${tableName}:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
           <a-dropdown v-if="selectedRowKeys.length > 0">
               <template #overlay>
                 <a-menu>
@@ -33,7 +33,7 @@
                   </a-menu-item>
                 </a-menu>
               </template>
-              <a-button>批量操作
+              <a-button v-auth="'${entityPackage}:${tableName}:deleteBatch'">批量操作
                 <Icon icon="mdi:chevron-down"></Icon>
               </a-button>
         </a-dropdown>
@@ -230,6 +230,7 @@
          {
            label: '编辑',
            onClick: handleEdit.bind(null, record),
+           auth: '${entityPackage}:${tableName}:edit'
          }
        ]
    }
@@ -264,8 +265,9 @@
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        }
+          placement: 'topLeft'
+        },
+        auth: '${entityPackage}:${tableName}:delete'
       }
     ];
     if(record.bpmStatus == '1' || !record.bpmStatus){
@@ -289,8 +291,9 @@
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        }
+          placement: 'topLeft'
+        },
+        auth: '${entityPackage}:${tableName}:delete'
       }
     ]
     </#if>
@@ -320,6 +323,6 @@
     </#if>
 </script>
 
-<style scoped>
+<style lang="less" scoped>
 <#include "/common/form/vue3SearchStyle.ftl">
 </style>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index 66f5ec627..539010ef5 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -58,7 +58,7 @@ export const columns: BasicColumn[] = [
     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'>
+   <#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' || po.classType=='popup_dict'>
     dataIndex: '${po.fieldName}_dictText'
    <#elseif po.classType=='cat_tree'>
     dataIndex: '${po.fieldName}',
@@ -106,6 +106,14 @@ export const searchFormSchema: FormSchema[] = [
 <#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
       component: 'JSelectUser',
 <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
+     },
 <#elseif po.classType=='switch'>
       component: 'JSwitch',
       componentProps:{
@@ -116,6 +124,14 @@ export const searchFormSchema: FormSchema[] = [
        },
  <#elseif po.classType=='sel_depart'>
       component: 'JSelectDept',
+      componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
+      },
  <#elseif po.classType=='list_multi'>
       component: 'JSelectMultiple',
       componentProps:{
@@ -152,6 +168,13 @@ export const searchFormSchema: FormSchema[] = [
       },
 <#elseif po.classType=='popup'>
     <#include "/common/form/vue3popup.ftl">
+<#elseif po.classType=='popup_dict'>
+    component: 'JPopupDict',
+    componentProps: {
+      placeholder: '请选择${po.filedComment}',
+      dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+      multi: ${po.extendParams.popupMulti?c}
+    },
 <#elseif po.classType=='list' || po.classType=='radio' || po.classType=='checkbox'>
 <#--  ---------------------------下拉或是单选 判断数据字典是表字典还是普通字典------------------------------- -->
       component: 'JDictSelectTag',
@@ -272,8 +295,23 @@ export const formSchema: FormSchema[] = [
     },
     <#elseif po.classType =='popup'>
     <#include "/common/form/vue3popup.ftl">
+    <#elseif po.classType=='popup_dict'>
+    component: 'JPopupDict',
+    componentProps: {
+      placeholder: '请选择${po.filedComment}',
+      dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+      multi: ${po.extendParams.popupMulti?c}
+    },
      <#elseif po.classType =='sel_depart'>
      component: 'JSelectDept',
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
+     },
      <#elseif po.classType =='switch'>
      component: 'JSwitch',
      componentProps:{
@@ -294,8 +332,13 @@ export const formSchema: FormSchema[] = [
 <#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
     component: 'JSelectUser',
 <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
-    componentProps:{
-        labelKey:'realname',
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
      },
     <#elseif po.classType =='textarea'>
     component: 'InputTextArea',
@@ -505,6 +548,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
     },
     <#elseif po.classType =='popup'>
     <#include "/common/form/vue3popup.ftl">
+    <#elseif po.classType=='popup_dict'>
+    component: 'JPopupDict',
+    componentProps: {
+      placeholder: '请选择${po.filedComment}',
+      dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+      multi: ${po.extendParams.popupMulti?c}
+    },
      <#elseif po.classType =='sel_depart'>
      component: 'JSelectDept',
      <#elseif po.classType =='switch'>
@@ -762,11 +812,27 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
       </#if>
 <#elseif col.classType =='sel_depart'>
       type: JVxeTypes.departSelect,
+      props:{
+    <#if col.extendParams?exists && col.extendParams.text?exists>
+        labelKey: '${col.extendParams.text}',
+    </#if>
+    <#if col.extendParams?exists && col.extendParams.store?exists>
+        rowKey: '${col.extendParams.store}',
+    </#if>
+      },
       <#if col.readonly=='Y'>
       disabled:true,
       </#if>
 <#elseif col.classType =='sel_user'>
       type: JVxeTypes.userSelect,
+      props:{
+    <#if col.extendParams?exists && col.extendParams.text?exists>
+        labelKey: '${col.extendParams.text}',
+    </#if>
+    <#if col.extendParams?exists && col.extendParams.store?exists>
+        rowKey: '${col.extendParams.store}',
+    </#if>
+      },
       <#if col.readonly=='Y'>
       disabled:true,
       </#if>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
index 8897db8c6..c41784ad2 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
@@ -1,7 +1,7 @@
 <#include "/common/utils.ftl">
 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="${getModalWidth(tableVo.fieldRowNum?default(1))}" @ok="handleSubmit">
-    <BasicForm @register="registerForm" ref="formRef"/>
+    <BasicForm @register="registerForm" ref="formRef" name="${entityName}Form"/>
     <!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs">
 <#list subTables as sub><#rt/>
@@ -157,6 +157,12 @@
                  if (e.error === VALIDATE_FAILED) {
                      // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
                      activeKey.value = e.index == null ? unref(activeKey) : refKeys.value[e.index]
+                     if (e.errorFields) {
+                       const firstField = e.errorFields[0];
+                       if (firstField) {
+                         e.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+                       }
+                     }
                  } else {
                      console.error(e)
                  }
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei
index 2150db047..9fd59cbbc 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei
@@ -3,7 +3,7 @@
 <#if sub.foreignRelationType=='1'>
 #segment#${sub.entityName}Form.vue
 <template>
-    <BasicForm @register="registerForm"/>
+    <BasicForm @register="registerForm" name="${sub.entityName}Form" class="basic-modal-form"/>
 </template>
 <script lang="ts">
     import {defineComponent} from 'vue';
@@ -23,7 +23,7 @@
             }
         },
         setup(props,{emit}) {
-            const [registerForm, {setProps, resetFields, setFieldsValue,getFieldsValue,validate}] = useForm({
+            const [registerForm, { setProps, resetFields, setFieldsValue, getFieldsValue, validate, scrollToField }] = useForm({
                 //labelWidth: 150,
                 schemas: ${sub.entityName?uncap_first}FormSchema,
                 showActionButtonGroup: false,
@@ -60,9 +60,9 @@
                     // 验证子表表单
                     validate().then(()=>{
                         return resolve()
-                    }).catch(()=> {
-                        return reject({ error: VALIDATE_FAILED ,index})
-                    })
+                    }).catch(({ errorFields }) => {
+                      return reject({ error: VALIDATE_FAILED, index, errorFields: errorFields, scrollToField: scrollToField });
+                    });
                 })
             }
             return {
@@ -75,5 +75,11 @@
         }
     })
 </script>
+<style lang="less" scoped>
+  .basic-modal-form {
+    overflow: auto;
+    height: 340px;
+  }
+</style>
 </#if>
 </#list>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
index c10f5fac9..8d5f81b3e 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@@ -10,6 +10,7 @@
     <#assign need_dept = false>
     <#assign need_multi = false>
     <#assign need_popup = false>
+    <#assign need_popup_dict = false>
     <#assign need_select_tag = false>
     <#assign need_select_tree = false>
     <#assign need_time = false>
@@ -20,6 +21,8 @@
     <#assign need_editor = false>
     <#assign need_checkbox = false>
     <#assign query_flag = false>
+    <#assign need_range_number = false>
+    <#assign is_range = false>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -56,12 +59,21 @@
             <#if po.classType=='popup'>
               <#assign need_popup = true>
             </#if>
+            <#if po.classType=='popup_dict'>
+              <#assign need_popup_dict = true>
+            </#if>
             <#if po.classType=='sel_tree'>
               <#assign need_select_tree = true>
             </#if>
             <#if po.classType=='time'>
               <#assign need_time = true>
             </#if>
+            <#if po.queryMode!='single' && (po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal')>
+              <#assign need_range_number = true>
+            </#if>
+            <#if po.queryMode!='single'>
+              <#assign is_range = true>
+            </#if>
             <#include "/common/form/native/vue3NativeSearch.ftl">
           </#list>
           <#if query_field_no gt 2>
@@ -89,9 +101,9 @@
    <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-button type="primary" v-auth="'${entityPackage}:${tableName}:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'${entityPackage}:${tableName}:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" v-auth="'${entityPackage}:${tableName}:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
           <a-dropdown v-if="selectedRowKeys.length > 0">
               <template #overlay>
                 <a-menu>
@@ -101,7 +113,7 @@
                   </a-menu-item>
                 </a-menu>
               </template>
-              <a-button>批量操作
+              <a-button v-auth="'${entityPackage}:${tableName}:deleteBatch'">批量操作
                 <Icon icon="mdi:chevron-down"></Icon>
               </a-button>
         </a-dropdown>
@@ -163,6 +175,9 @@
   <#if bpm_flag==true>
   import { startProcess } from '/@/api/common/api';
   </#if>
+  <#if is_range>
+  import { cloneDeep } from "lodash-es";
+  </#if>
   import { useUserStore } from '/@/store/modules/user';
   const formRef = ref();
   const queryParam = reactive<any>({});
@@ -182,8 +197,13 @@
                width: 120,
                fixed:'right'
            },
-           beforeFetch: (params) => {
+           beforeFetch: async (params) => {
+            <#if is_range>
+             let rangerQuery = await setRangeQuery();
+             return Object.assign(params, rangerQuery);
+            <#else>
              return Object.assign(params, queryParam);
+            </#if>
            },
         },
         exportConfig: {
@@ -269,6 +289,7 @@
          {
            label: '编辑',
            onClick: handleEdit.bind(null, record),
+           auth: '${entityPackage}:${tableName}:edit'
          }
        ]
    }
@@ -285,8 +306,9 @@
            label: '删除',
            popConfirm: {
              title: '是否确认删除',
-             confirm: handleDelete.bind(null, record),
-           }
+             confirm: handleDelete.bind(null, record)
+           },
+           auth: '${entityPackage}:${tableName}:delete'
          }
        ];
        if(record.bpmStatus == '1' || !record.bpmStatus){
@@ -310,8 +332,9 @@
            popConfirm: {
              title: '是否确认删除',
              confirm: handleDelete.bind(null, record),
-             placement: 'topLeft',
-           }
+             placement: 'topLeft'
+           },
+           auth: '${entityPackage}:${tableName}:delete'
          }
        ]
        </#if>
@@ -407,6 +430,32 @@
     }
   }
   </#if>
+  <#if is_range>
+  
+  let rangeField = '${getRangeField(columns)}'
+  
+  /**
+   * 设置范围查询条件
+   */
+  async function setRangeQuery(){
+    let queryParamClone = cloneDeep(queryParam);
+    if (rangeField) {
+      let fieldsValue = rangeField.split(',');
+      fieldsValue.forEach(item => {
+        if (queryParamClone[item]) {
+          let range = queryParamClone[item];
+          queryParamClone[item+'_begin'] = range[0];
+          queryParamClone[item+'_end'] = range[1];
+          delete queryParamClone[item];
+        } else {
+          queryParamClone[item+'_begin'] = '';
+          queryParamClone[item+'_end'] = '';
+        }
+      })
+    }
+    return queryParamClone;
+  }
+  </#if>
 </script>
 <style lang="less" scoped>
 <#include "/common/form/native/vueNativeSearchStyle.ftl">
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
index fbc86d11d..30bb426d0 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
@@ -58,7 +58,7 @@ export const columns: BasicColumn[] = [
     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'>
+   <#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' || po.classType=='popup_dict'>
     dataIndex: '${po.fieldName}_dictText'
    <#elseif po.classType=='cat_tree'>
     dataIndex: '${po.fieldName}',
diff --git a/jeecg-boot/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-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
index de3191b2b..fb9829240 100644
--- a/jeecg-boot/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-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -8,6 +8,7 @@
 <#assign need_dept = false>
 <#assign need_multi = false>
 <#assign need_popup = false>
+<#assign need_popup_dict = false>
 <#assign need_select_tag = false>
 <#assign need_select_tree = false>
 <#assign need_time = false>
@@ -16,6 +17,7 @@
 <#assign need_image_upload = false>
 <#assign need_editor = false>
 <#assign need_checkbox = false>
+<#assign need_range_number = false>
 <#assign form_span = 24>
 <#if tableVo.fieldRowNum==2>
     <#assign form_span = 12>
@@ -33,7 +35,7 @@
   <a-spin :spinning="loading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form v-bind="formItemLayout">
+        <a-form v-bind="formItemLayout" name="${entityName}Form" ref="formRef">
           <a-row>
             <#list columns as po>
               <#if po.isShow == 'Y' && po.fieldValidType?default("") == 'only'>
@@ -42,6 +44,7 @@
               <#if po.fieldDbName=='bpm_status'>
                   <#assign bpm_flag=true>
               </#if>
+      <#assign formEntityName>${entityName}Form</#assign>
       <#include "/common/form/native/vue3NativeForm.ftl">
             </#list>
           </a-row>
@@ -135,6 +138,7 @@
     emits:['success'],
     setup(props, {emit}) {
       const loading = ref(false);
+      const formRef = ref();
       <#list subTables as sub>
       <#if sub_index == 0>
       <#assign subTabActiveKey = '${sub.entityName?uncap_first}'>
@@ -247,6 +251,7 @@
 
       async function queryMainData(id) {
         const row = await queryDataById(id);
+        resetFields();
         const tmpData = {};
         Object.keys(formData).forEach((key) => {
           if(row.hasOwnProperty(key)){
@@ -268,7 +273,18 @@
       });
 
       async function getFormData() {
-        await validate();
+        try {
+          // 触发表单验证
+          await validate();
+        } catch ({ errorFields }) {
+          if (errorFields) {
+            const firstField = errorFields[0];
+            if (firstField) {
+              formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+            }
+          }
+          return Promise.reject(errorFields);
+        }
         return transformData(toRaw(formData))
       }
 
@@ -332,7 +348,8 @@
         getFormData,
         submitForm,
         add,
-        edit
+        edit,
+        formRef,
       }
     }
   });
diff --git a/jeecg-boot/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-boot/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 104bf850f..ca9d70bd5 100644
--- a/jeecg-boot/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-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
@@ -12,6 +12,7 @@
 <#assign need_dept = false>
 <#assign need_multi = false>
 <#assign need_popup = false>
+<#assign need_popup_dict = false>
 <#assign need_select_tag = false>
 <#assign need_select_tree = false>
 <#assign need_time = false>
@@ -20,6 +21,7 @@
 <#assign need_image_upload = false>
 <#assign need_editor = false>
 <#assign need_checkbox = false>
+<#assign need_range_number = false>
 <#assign form_span = 24>
 <#if tableVo.fieldRowNum==2>
   <#assign form_span = 12>
@@ -33,7 +35,7 @@
   <a-spin :spinning="loading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form v-bind="formItemLayout">
+        <a-form v-bind="formItemLayout" name="${sub.entityName}Form" ref="formRef" class="antd-modal-form">
           <a-row>
             <#list sub.colums as po>
               <#if po.isShow == 'Y' && po.fieldValidType?default("") == 'only'>
@@ -42,6 +44,7 @@
               <#if po.fieldDbName=='bpm_status'>
                 <#assign bpm_flag=true>
               </#if>
+              <#assign formEntityName>${sub.entityName}Form</#assign>
               <#include "/common/form/native/vue3NativeForm.ftl">
             </#list>
           </a-row>
@@ -79,6 +82,7 @@
       const { createMessage } = useMessage();
       const isForm = true;
       const loading = ref(false);
+      const formRef = ref();
       const formData = reactive<Record<string, any>>({
         id: '',
         <#include "/common/init/native/vue3NativeSubInitValue.ftl">
@@ -116,7 +120,18 @@
       }
 
       async function getFormData() {
-        await validate();
+        try {
+          // 触发表单验证
+          await validate();
+        } catch ({ errorFields }) {
+          if (errorFields) {
+            const firstField = errorFields[0];
+            if (firstField) {
+              formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+            }
+          }
+          return Promise.reject(errorFields);
+        }
         let subFormData = toRaw(formData);
         if(Object.keys(subFormData).length>0){
           return subFormData
@@ -158,10 +173,17 @@
         setFieldsValue,
         handleFormChange,
         isForm,
-        validateInfos
+        validateInfos,
+        formRef,
       }
     }
   });
 </script>
+<style lang="less" scoped>
+  .antd-modal-form {
+    max-height: 340px;
+    overflow: auto;
+  }
+</style>
 </#if>
 </#list>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
index 12ba0c0f0..b7ccc9a6a 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@@ -21,9 +21,9 @@
    <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-button type="primary" v-auth="'${entityPackage}:${tableName}:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'${entityPackage}:${tableName}:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" v-auth="'${entityPackage}:${tableName}:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
           <a-dropdown v-if="selectedRowKeys.length > 0">
               <template #overlay>
                 <a-menu>
@@ -33,7 +33,7 @@
                   </a-menu-item>
                 </a-menu>
               </template>
-              <a-button>批量操作
+              <a-button v-auth="'${entityPackage}:${tableName}:deleteBatch'">批量操作
                 <Icon icon="mdi:chevron-down"></Icon>
               </a-button>
         </a-dropdown>
@@ -229,6 +229,7 @@
          {
            label: '编辑',
            onClick: handleEdit.bind(null, record),
+           auth: '${entityPackage}:${tableName}:edit'
          }
        ]
    }
@@ -263,8 +264,9 @@
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        }
+          placement: 'topLeft'
+        },
+        auth: '${entityPackage}:${tableName}:delete'
       }
     ];
     if(record.bpmStatus == '1' || !record.bpmStatus){
@@ -288,8 +290,9 @@
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        }
+          placement: 'topLeft'
+        },
+        auth: '${entityPackage}:${tableName}:delete'
       }
     ]
     </#if>
@@ -319,6 +322,6 @@
     </#if>
 </script>
 
-<style scoped>
+<style lang="less" scoped>
 <#include "/common/form/vue3SearchStyle.ftl">
 </style>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index 34515204b..cf9d4ea43 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -58,7 +58,7 @@ export const columns: BasicColumn[] = [
     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'>
+   <#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' || po.classType=='popup_dict'>
     dataIndex: '${po.fieldName}_dictText'
    <#elseif po.classType=='cat_tree'>
     dataIndex: '${po.fieldName}',
@@ -106,6 +106,14 @@ export const searchFormSchema: FormSchema[] = [
 <#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
       component: 'JSelectUser',
 <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
+     },
 <#elseif po.classType=='switch'>
       component: 'JSwitch',
       componentProps:{
@@ -116,6 +124,14 @@ export const searchFormSchema: FormSchema[] = [
        },
  <#elseif po.classType=='sel_depart'>
       component: 'JSelectDept',
+      componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
+      },
  <#elseif po.classType=='list_multi'>
       component: 'JSelectMultiple',
       componentProps:{
@@ -152,6 +168,13 @@ export const searchFormSchema: FormSchema[] = [
       },
 <#elseif po.classType=='popup'>
     <#include "/common/form/vue3popup.ftl">
+<#elseif po.classType=='popup_dict'>
+      component: 'JPopupDict',
+      componentProps: {
+        placeholder: '请选择${po.filedComment}',
+        dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+        multi: ${po.extendParams.popupMulti?c}
+      },
 <#elseif po.classType=='list' || po.classType=='radio' || po.classType=='checkbox'>
 <#--  ---------------------------下拉或是单选 判断数据字典是表字典还是普通字典------------------------------- -->
       component: 'JDictSelectTag',
@@ -272,8 +295,23 @@ export const formSchema: FormSchema[] = [
     },    
     <#elseif po.classType =='popup'>
     <#include "/common/form/vue3popup.ftl">
+    <#elseif po.classType=='popup_dict'>
+    component: 'JPopupDict',
+    componentProps: {
+      placeholder: '请选择${po.filedComment}',
+      dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+      multi: ${po.extendParams.popupMulti?c}
+    },
      <#elseif po.classType =='sel_depart'>
      component: 'JSelectDept',
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
+     },
      <#elseif po.classType =='switch'>
      component: 'JSwitch',
      componentProps:{
@@ -294,8 +332,13 @@ export const formSchema: FormSchema[] = [
 <#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     component: 'JSelectUser',
 <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
-    componentProps:{
-        labelKey:'realname',
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
      },
     <#elseif po.classType =='textarea'>
     component: 'InputTextArea',
@@ -505,8 +548,23 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
     },
     <#elseif po.classType =='popup'>
     <#include "/common/form/vue3popup.ftl">
+    <#elseif po.classType=='popup_dict'>
+    component: 'JPopupDict',
+    componentProps: {
+      placeholder: '请选择${po.filedComment}',
+      dictCode: '${po.dictTable},${po.dictText},${po.dictField}',
+      multi: ${po.extendParams.popupMulti?c}
+    },
      <#elseif po.classType =='sel_depart'>
      component: 'JSelectDept',
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
+     },
      <#elseif po.classType =='switch'>
      component: 'JSwitch',
      componentProps:{
@@ -527,8 +585,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
 <#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     component: 'JSelectUser',
 <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
-    componentProps:{
-        labelKey:'realname',
+     componentProps:{
+   <#if po.extendParams?exists && po.extendParams.text?exists>
+       labelKey: '${po.extendParams.text}',
+   </#if>
+   <#if po.extendParams?exists && po.extendParams.store?exists>
+       rowKey: '${po.extendParams.store}',
+   </#if>
      },
     <#elseif po.classType =='textarea'>
     component: 'InputTextArea',
@@ -762,11 +825,27 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
       </#if>
 <#elseif col.classType =='sel_depart'>
       type: JVxeTypes.departSelect,
+      props:{
+    <#if col.extendParams?exists && col.extendParams.text?exists>
+        labelKey: '${col.extendParams.text}',
+    </#if>
+    <#if col.extendParams?exists && col.extendParams.store?exists>
+        rowKey: '${col.extendParams.store}',
+    </#if>
+      },
       <#if col.readonly=='Y'>
       disabled:true,
       </#if>
 <#elseif col.classType =='sel_user'>
       type: JVxeTypes.userSelect,
+      props:{
+    <#if col.extendParams?exists && col.extendParams.text?exists>
+        labelKey: '${col.extendParams.text}',
+    </#if>
+    <#if col.extendParams?exists && col.extendParams.store?exists>
+        rowKey: '${col.extendParams.store}',
+    </#if>
+      },
       <#if col.readonly=='Y'>
       disabled:true,
       </#if>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
index c441d8fea..6d9336536 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
@@ -17,7 +17,7 @@
      <!--表单区域 -->
      <div class="contentArea">
        <!--主表区域 -->
-        <BasicForm @register="registerForm" ref="formRef" v-show="activeKey == refKeys[0]"/>
+        <BasicForm @register="registerForm" ref="formRef" v-show="activeKey == refKeys[0]" name="${entityName}Form"/>
        <!--子表区域 -->
      <#list subTables as sub><#rt/>
        <#assign refKey = sub.entityName?uncap_first/>
@@ -192,6 +192,12 @@
                  if (e.error === VALIDATE_FAILED) {
                      // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
                      activeKey.value = e.index == null ? unref(activeKey) : refKeys.value[e.index]
+                     if (e.errorFields) {
+                       const firstField = e.errorFields[0];
+                       if (firstField) {
+                         e.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+                       }
+                     }
                  } else {
                      console.error(e)
                  }
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei
index b4588d8ca..712c35971 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei
@@ -3,7 +3,7 @@
 <#if sub.foreignRelationType=='1'>
 #segment#${sub.entityName}Form.vue
 <template>
-    <BasicForm @register="registerForm"/>
+    <BasicForm @register="registerForm" name="${sub.entityName}Form" class="basic-modal-form" />
 </template>
 <script lang="ts">
     import {defineComponent} from 'vue';
@@ -23,7 +23,7 @@
             }
         },
         setup(props,{emit}) {
-            const [registerForm, {setProps, resetFields, setFieldsValue,getFieldsValue,validate}] = useForm({
+            const [registerForm, { setProps, resetFields, setFieldsValue, getFieldsValue, validate, scrollToField }] = useForm({
                 //labelWidth: 150,
                 schemas: ${sub.entityName?uncap_first}FormSchema,
                 showActionButtonGroup: false,
@@ -60,9 +60,9 @@
                     // 验证子表表单
                     validate().then(()=>{
                         return resolve()
-                    }).catch(()=> {
-                        return reject({ error: VALIDATE_FAILED ,index})
-                    })
+                    }).catch(({ errorFields }) => {
+                      return reject({ error: VALIDATE_FAILED , index, errorFields: errorFields, scrollToField: scrollToField });
+                    });
                 })
             }
             return {
@@ -75,5 +75,11 @@
         }
     })
 </script>
+<style lang="less" scoped>
+  .basic-modal-form {
+    overflow: auto;
+    height: 340px;
+  }
+</style>
 </#if>
 </#list>