From a47d0984dc6f105b7a3aa87c6f8802102d643d5f Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 19 Feb 2024 16:40:33 +0800
Subject: [PATCH] =?UTF-8?q?[issues/5755]vue=E4=BB=A3=E7=A0=81=E4=B8=8D?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=20[issue/#5711]=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=E5=9C=A8=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8E=E5=8F=98=E6=88=90=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=20[issue?=
 =?UTF-8?q?s/1022]=E6=88=91=E8=BF=99=E4=B8=AA=E6=8E=A7=E4=BB=B6=E6=98=AF?=
 =?UTF-8?q?=E5=93=AA=E9=87=8C=E8=AE=BE=E7=BD=AE=E6=B2=A1=E5=AF=B9=E5=90=97?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=BA=E4=BB=80=E4=B9=88=E6=89=93=E5=BC=80=E5=B7=B2?=
 =?UTF-8?q?=E6=9C=89=E7=9A=84=E8=AE=B0=E5=BD=95=EF=BC=8C=E4=BC=9A=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E6=8F=90=E7=A4=BA=E2=80=9C=E8=AF=B7=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E2=80=9D=E9=AA=8C=E8=AF=81=EF=BC=9F=20#1022=20fix=20=E5=B8=A6?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=AD=97=E5=85=B8=E5=AD=98=E5=9C=A8=E5=8D=95?=
 =?UTF-8?q?=E5=BC=95=E5=8F=B7=E5=AF=BC=E8=87=B4js=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/native/vue3NativeComponents.ftl      |  4 +-
 .../common/form/native/vue3NativeForm.ftl     |  8 +++-
 .../common/form/native/vue3NativeImport.ftl   |  4 +-
 .../common/form/native/vue3NativeSearch.ftl   |  8 +++-
 .../code-template-online/common/utils.ftl     |  4 +-
 .../vue3/${entityName}__data.tsi              | 24 ++++++++---
 .../vue3Native/${entityName}__data.tsi        | 24 ++++++++---
 .../components/${entityName}Form.vuei         |  2 +-
 .../vue3/${entityName}__data.tsi              | 24 ++++++++---
 .../vue3Native/${entityName}__data.tsi        | 24 ++++++++---
 .../components/${entityName}Form.vuei         |  2 +-
 .../vue3/${entityName}__data.tsi              | 36 ++++++++++++-----
 .../vue3Native/${entityName}__data.tsi        | 36 ++++++++++++-----
 .../components/${entityName}Form.vuei         |  2 +-
 .../vue3Native/components/[1-n]Form.vuei      |  2 +-
 .../vue3/${entityName}__data.tsi              | 40 ++++++++++++++-----
 .../vue3/${entityName}__data.tsi              | 40 ++++++++++++++-----
 .../vue3Native/${entityName}__data.tsi        | 40 ++++++++++++++-----
 .../components/${entityName}Form.vuei         |  2 +-
 .../vue3Native/components/[1-n]Form.vuei      |  2 +-
 .../vue3/${entityName}__data.tsi              | 40 ++++++++++++++-----
 21 files changed, 273 insertions(+), 95 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeComponents.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeComponents.ftl
index 60ad6824..d38ed369 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeComponents.ftl
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeComponents.ftl
@@ -20,7 +20,9 @@
       JSelectDept,
 </#if>
 <#if need_dept_user>
-      JSelectUserByDept,
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+      JSelectUser,
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
 </#if>
 <#if need_select_tree>
       JTreeSelect,
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl
index 53ae5848..0371ea0a 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl
@@ -1,5 +1,7 @@
 <#include "/common/utils.ftl">
-<#if po.isShow =='Y' && po.fieldName != 'id' && isNotPidField(tableVo, po.fieldDbName)>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName != 'id' && po.fieldName !='delFlag' && isNotPidField(tableVo, po.fieldDbName)>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -48,7 +50,9 @@
 	          <a-input-password v-model:value="formData.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled<#else>:disabled="disabled"</#if>/>
 			<#elseif po.classType =='sel_user'>
 	          <#assign need_dept_user = true>
-	          <j-select-user-by-dept v-model:value="formData.${po.fieldName}" <#if po.readonly=='Y'>disabled<#else>:disabled="disabled"</#if>/>
+			  <#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+			  <j-select-user v-model:value="formData.${po.fieldName}" <#if po.readonly=='Y'>disabled<#else>:disabled="disabled"</#if>/>
+			  <#-- 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<#else>:disabled="disabled"</#if>/>
 			<#elseif po.classType=='radio'>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeImport.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeImport.ftl
index 1a359154..caa2e6d6 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeImport.ftl
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeImport.ftl
@@ -20,7 +20,9 @@
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
 </#if>
 <#if need_dept_user>
-  import JSelectUserByDept from '/@/components/Form/src/jeecg/components/JSelectUserByDept.vue';
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+  import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
 </#if>
 <#if need_select_tree>
   import JTreeSelect from '/@/components/Form/src/jeecg/components/JTreeSelect.vue';
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl
index 577798a5..5a5903ed 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl
@@ -1,5 +1,7 @@
 <#include "/common/utils.ftl">
-<#if po.isQuery=='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign query_flag=true>
 	<#if query_field_no==2>
           <template v-if="toggleSearchStatus">
@@ -19,7 +21,9 @@
             <#if po.classType=='sel_search'>
               <#if query_field_no gt 1>  </#if><j-search-select placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" dict="${po.dictTable},${po.dictText},${po.dictField}" />
             <#elseif po.classType=='sel_user'>
-              <#if query_field_no gt 1>  </#if><j-select-user-by-dept placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" @change="(value)=>handleFormJoinChange('${po.fieldName}',value)"/>
+              <#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+              <#if query_field_no gt 1>  </#if><j-select-user placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" @change="(value)=>handleFormJoinChange('${po.fieldName}',value)"/>
+              <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
             <#elseif po.classType=='switch'>
               <#if query_field_no gt 1>  </#if><j-switch placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" <#if po.dictField!= 'is_open'>:options="${po.dictField}"</#if> query />
             <#elseif po.classType=='sel_depart'>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl
index b7cc7da0..89d8a3cc 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl
@@ -144,7 +144,9 @@
     <#assign extAttrs="">
     <#assign dictCode="">
     <#if po.dictTable?default('')?trim?length gt 1 && po.dictText?default('')?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
-        <#assign dictCode="dictTable: '${po.dictTable}', dictCode: '${po.dictField}', dictText: '${po.dictText}'">
+        <#-- update-begin---author:chenrui ---date:20231228  for:fix 带条件字典存在单引号导致js编译错误---------- -->
+        <#assign dictCode="dictTable: \"${po.dictTable}\", dictCode: '${po.dictField}', dictText: '${po.dictText}'">
+        <#-- update-begin---author:chenrui ---date:20231228  for:fix 带条件字典存在单引号导致js编译错误---------- -->
     <#elseif po.dictField?default("")?trim?length gt 1>
         <#assign dictCode="dictCode: '${po.dictField}'">
     </#if>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index a3eb5f3f..10f9782d 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -6,7 +6,9 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
  <#list columns as po>
-   <#if po.isShowList =='Y' && po.fieldName !='id'>
+   <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+   <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+   <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
    {
     title: '${po.filedComment}',
     align:"center",
@@ -70,7 +72,9 @@ export const searchFormSchema: FormSchema[] = [
 <#if po.fieldDbName=='bpm_status'>
   <#assign bpm_flag=true>
 </#if>
-<#if po.isQuery=='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign query_flag=true>
 	<#assign query_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1>
@@ -88,7 +92,9 @@ export const searchFormSchema: FormSchema[] = [
          dict:"${po.dictTable},${po.dictText},${po.dictField}"
       },
 <#elseif po.classType=='sel_user'>
-      component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+      component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
 <#elseif po.classType=='switch'>
       component: 'JSwitch',
       componentProps:{
@@ -186,7 +192,9 @@ export const formSchema: FormSchema[] = [
 <#if po.fieldDbName == 'id'>
 	<#assign id_exists = true>
 </#if>
-<#if po.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -236,7 +244,9 @@ export const formSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+    <#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+    <#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
         labelKey:'realname',
      },
@@ -387,7 +397,9 @@ export const formSchema: FormSchema[] = [
 // 高级查询数据
 export const superQuerySchema = {
   <#list columns as po>
-  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+  <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+  <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
   ${superQueryFieldListForVue3(po,po_index)},
   </#if>
   </#list>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
index 4b22d264..f84c6e2d 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
@@ -6,7 +6,9 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
  <#list columns as po>
-   <#if po.isShowList =='Y' && po.fieldName !='id'>
+   <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+   <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+   <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
   {
     title: '${po.filedComment}',
     align: "center",
@@ -71,7 +73,9 @@ export const searchFormSchema: FormSchema[] = [
 <#if po.fieldDbName=='bpm_status'>
   <#assign bpm_flag=true>
 </#if>
-<#if po.isQuery=='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign query_flag=true>
 	<#assign query_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1>
@@ -89,7 +93,9 @@ export const searchFormSchema: FormSchema[] = [
       dict: "${po.dictTable},${po.dictText},${po.dictField}"
     },
 <#elseif po.classType=='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
 <#elseif po.classType=='switch'>
     component: 'JSwitch',
     componentProps:{
@@ -181,7 +187,9 @@ export const formSchema: FormSchema[] = [
 <#if po.fieldDbName == 'id'>
 	<#assign id_exists = true>
 </#if>
-<#if po.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -222,7 +230,9 @@ export const formSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
       labelKey: 'realname',
     },
@@ -373,7 +383,9 @@ export const formSchema: FormSchema[] = [
 // 高级查询数据
 export const superQuerySchema = {
   <#list columns as po>
-  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+  <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+  <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
   ${superQueryFieldListForVue3(po,po_index)},
   </#if>
   </#list>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
index 7dc1eba9..9d8b1112 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -80,7 +80,7 @@
   const validatorRules = {
   <#include "/common/validatorRulesTemplate/native/vue3MainNative.ftl">
   };
-  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 
   // 表单禁用
   const disabled = computed(()=>{
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index eef53571..61f78183 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -6,7 +6,9 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
  <#list columns as po>
-   <#if po.isShowList =='Y' && po.fieldName !='id'>
+   <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+   <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+   <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
    {
     title: '${po.filedComment}',
     <#if po.fieldDbName == tableVo.extendParams.textField>
@@ -74,7 +76,9 @@ export const searchFormSchema: FormSchema[] = [
 <#if po.fieldDbName=='bpm_status'>
   <#assign bpm_flag=true>
 </#if>
-<#if po.isQuery=='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign query_flag=true>
 	<#assign query_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1>
@@ -92,7 +96,9 @@ export const searchFormSchema: FormSchema[] = [
          dict:"${po.dictTable},${po.dictText},${po.dictField}"
       },
 <#elseif po.classType=='sel_user'>
-      component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+      component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
 <#elseif po.classType=='switch'>
       component: 'JSwitch',
       componentProps:{
@@ -204,7 +210,9 @@ export const formSchema: FormSchema[] = [
 <#if po.fieldDbName == 'id'>
 	<#assign id_exists = true>
 </#if>
-<#if po.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -262,7 +270,9 @@ export const formSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
         labelKey:'realname',
      },
@@ -416,7 +426,9 @@ export const formSchema: FormSchema[] = [
 // 高级查询数据
 export const superQuerySchema = {
   <#list columns as po>
-  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+  <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+  <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
   ${superQueryFieldListForVue3(po,po_index)},
   </#if>
   </#list>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
index d0325440..03e3b718 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
@@ -6,7 +6,9 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
  <#list columns as po>
-   <#if po.isShowList =='Y' && po.fieldName !='id'>
+   <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+   <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+   <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
   {
     title: '${po.filedComment}',
     <#if po.fieldDbName == tableVo.extendParams.textField>
@@ -75,7 +77,9 @@ export const searchFormSchema: FormSchema[] = [
 <#if po.fieldDbName=='bpm_status'>
   <#assign bpm_flag=true>
 </#if>
-<#if po.isQuery=='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign query_flag=true>
 	<#assign query_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1>
@@ -93,7 +97,9 @@ export const searchFormSchema: FormSchema[] = [
       dict:"${po.dictTable},${po.dictText},${po.dictField}"
     },
 <#elseif po.classType=='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
 <#elseif po.classType=='switch'>
     component: 'JSwitch',
     componentProps: {
@@ -203,7 +209,9 @@ export const formSchema: FormSchema[] = [
 <#if po.fieldDbName == 'id'>
 	<#assign id_exists = true>
 </#if>
-<#if po.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -252,7 +260,9 @@ export const formSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
         labelKey: 'realname',
      },
@@ -406,7 +416,9 @@ export const formSchema: FormSchema[] = [
 // 高级查询数据
 export const superQuerySchema = {
   <#list columns as po>
-  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+  <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+  <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
   ${superQueryFieldListForVue3(po,po_index)},
   </#if>
   </#list>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
index e916af2f..4130b6e7 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -98,7 +98,7 @@
   const validatorRules = {
   <#include "/common/validatorRulesTemplate/native/vue3MainNative.ftl">
   };
-  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
     formData: { type: Object, default: ()=>{} },
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index ccaf4d8d..9d28ed62 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -6,7 +6,9 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
  <#list columns as po>
-   <#if po.isShowList =='Y' && po.fieldName !='id'>
+   <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+   <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+   <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
    {
     title: '${po.filedComment}',
     align:"center",
@@ -67,7 +69,9 @@ export const columns: BasicColumn[] = [
 export const searchFormSchema: FormSchema[] = [
 <#-- 开始循环 -->
 <#list columns as po>
-<#if po.isQuery=='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign query_flag=true>
 	<#assign query_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1>
@@ -85,7 +89,9 @@ export const searchFormSchema: FormSchema[] = [
          dict:"${po.dictTable},${po.dictText},${po.dictField}"
       },
 <#elseif po.classType=='sel_user'>
-      component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+      component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
 <#elseif po.classType=='switch'>
       component: 'JSwitch',
       componentProps:{
@@ -179,7 +185,9 @@ export const formSchema: FormSchema[] = [
 <#if po.fieldDbName == 'id'>
 	<#assign id_exists = true>
 </#if>
-<#if po.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -229,7 +237,9 @@ export const formSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
         labelKey:'realname',
      },
@@ -381,7 +391,9 @@ export const formSchema: FormSchema[] = [
 //子表列表数据
 export const ${sub.entityName?uncap_first}Columns: BasicColumn[] = [
  <#list sub.originalColumns as po>
-   <#if po.isShowList =='Y' && po.fieldName !='id'>
+   <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+   <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+   <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
    {
     title: '${po.filedComment}',
     align:"center",
@@ -453,7 +465,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
     show: false
   },
 </#if>
-<#if po.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -503,7 +517,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
         labelKey:'realname',
      },
@@ -647,7 +663,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
 // 高级查询数据
 export const superQuerySchema = {
   <#list columns as po>
-  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+  <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+  <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
   ${superQueryFieldListForVue3(po,po_index)},
   </#if>
   </#list>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
index 2d93df2c..37a9e8d0 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
@@ -6,7 +6,9 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
  <#list columns as po>
-  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+  <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+  <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
   {
     title: '${po.filedComment}',
     align:"center",
@@ -67,7 +69,9 @@ export const columns: BasicColumn[] = [
 export const searchFormSchema: FormSchema[] = [
 <#-- 开始循环 -->
 <#list columns as po>
-<#if po.isQuery=='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign query_flag=true>
 	<#assign query_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1>
@@ -85,7 +89,9 @@ export const searchFormSchema: FormSchema[] = [
       dict:"${po.dictTable},${po.dictText},${po.dictField}"
     },
 <#elseif po.classType=='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
 <#elseif po.classType=='switch'>
     component: 'JSwitch',
     componentProps:{
@@ -179,7 +185,9 @@ export const formSchema: FormSchema[] = [
 <#if po.fieldDbName == 'id'>
 	<#assign id_exists = true>
 </#if>
-<#if po.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -229,7 +237,9 @@ export const formSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
       labelKey:'realname',
     },
@@ -381,7 +391,9 @@ export const formSchema: FormSchema[] = [
 //子表列表数据
 export const ${sub.entityName?uncap_first}Columns: BasicColumn[] = [
  <#list sub.originalColumns as po>
-   <#if po.isShowList =='Y' && po.fieldName !='id'>
+   <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+   <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+   <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
   {
     title: '${po.filedComment}',
     align:"center",
@@ -453,7 +465,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
     show: false
   },
 </#if>
-<#if po.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -503,7 +517,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
       labelKey:'realname',
     },
@@ -647,7 +663,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
 // 高级查询数据
 export const superQuerySchema = {
   <#list columns as po>
-  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+  <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+  <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
   ${superQueryFieldListForVue3(po,po_index)},
   </#if>
   </#list>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
index e652654e..e6d2002e 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -79,7 +79,7 @@
   const validatorRules = {
   <#include "/common/validatorRulesTemplate/native/vue3MainNative.ftl">
   };
-  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
   const formRef = ref();
   // 表单禁用
   const disabled = computed(()=>{
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
index 4681d737..ff23da0c 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
@@ -78,7 +78,7 @@
    </#if>
    </#list>
   };
-  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
   const props = defineProps({
     disabled: { type: Boolean, default: false },
   });
diff --git a/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-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index 403be417..2c893c10 100644
--- a/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-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -7,7 +7,9 @@ import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
 //列表数据
 export const columns: BasicColumn[] = [
  <#list columns as po>
-   <#if po.isShowList =='Y' && po.fieldName !='id'>
+   <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+   <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+   <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
    {
     title: '${po.filedComment}',
     align:"center",
@@ -71,7 +73,9 @@ export const searchFormSchema: FormSchema[] = [
 <#if po.fieldDbName=='bpm_status'>
   <#assign bpm_flag=true>
 </#if>
-<#if po.isQuery=='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign query_flag=true>
 	<#assign query_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1>
@@ -89,7 +93,9 @@ export const searchFormSchema: FormSchema[] = [
          dict:"${po.dictTable},${po.dictText},${po.dictField}"
       },
 <#elseif po.classType=='sel_user'>
-      component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+      component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
 <#elseif po.classType=='switch'>
       component: 'JSwitch',
       componentProps:{
@@ -182,7 +188,9 @@ export const formSchema: FormSchema[] = [
 <#if po.fieldDbName == 'id'>
 	<#assign id_exists = true>
 </#if>
-<#if po.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -232,7 +240,9 @@ export const formSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
         labelKey:'realname',
      },
@@ -384,7 +394,9 @@ export const formSchema: FormSchema[] = [
 //子表列表数据
 export const ${sub.entityName?uncap_first}Columns: BasicColumn[] = [
  <#list sub.originalColumns as po>
-   <#if po.isShowList =='Y' && po.fieldName !='id'>
+   <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+   <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+   <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
    {
     title: '${po.filedComment}',
     align:"center",
@@ -504,7 +516,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
         labelKey:'realname',
      },
@@ -660,7 +674,9 @@ export const ${sub.entityName?uncap_first}JVxeColumns: JVxeColumn[] = [
 
 <#-- 循环子表的列 开始 -->
 <#list sub.colums as col><#rt/>
-<#if col.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if col.isShow =='Y' && col.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#if col.filedComment !='外键' >
     {
       title: '${col.filedComment}',
@@ -812,7 +828,9 @@ export const ${sub.entityName?uncap_first}JVxeColumns: JVxeColumn[] = [
 // 高级查询数据
 export const superQuerySchema = {
   <#list columns as po>
-  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+  <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+  <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
   ${superQueryFieldListForVue3(po,po_index)},
   </#if>
   </#list>
@@ -823,7 +841,9 @@ export const superQuerySchema = {
     view: 'table',
     fields: {
       <#list sub.colums as subCol>
-        <#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
+        <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+        <#if subCol.isShowList =='Y' && subCol.fieldName !='id' && po.fieldName !='delFlag'>
+        <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
         ${superQueryFieldListForVue3(subCol,subCol_index)},
         </#if>
       </#list>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index af3d3421..6bb1577a 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -7,7 +7,9 @@ import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
 //列表数据
 export const columns: BasicColumn[] = [
  <#list columns as po>
-   <#if po.isShowList =='Y' && po.fieldName !='id'>
+   <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+   <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+   <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
    {
     title: '${po.filedComment}',
     align:"center",
@@ -71,7 +73,9 @@ export const searchFormSchema: FormSchema[] = [
 <#if po.fieldDbName=='bpm_status'>
   <#assign bpm_flag=true>
 </#if>
-<#if po.isQuery=='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign query_flag=true>
 	<#assign query_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1>
@@ -89,7 +93,9 @@ export const searchFormSchema: FormSchema[] = [
          dict:"${po.dictTable},${po.dictText},${po.dictField}"
       },
 <#elseif po.classType=='sel_user'>
-      component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+      component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
 <#elseif po.classType=='switch'>
       component: 'JSwitch',
       componentProps:{
@@ -182,7 +188,9 @@ export const formSchema: FormSchema[] = [
 <#if po.fieldDbName == 'id'>
 	<#assign id_exists = true>
 </#if>
-<#if po.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -232,7 +240,9 @@ export const formSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
     componentProps:{
         labelKey:'realname',
      },
@@ -394,7 +404,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
 <#if po.fieldDbName=='id'>
   <#assign sub_id_exists=true>
 </#if>
-<#if po.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -444,7 +456,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
     componentProps:{
         labelKey:'realname',
      },
@@ -600,7 +614,9 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
 
 <#-- 循环子表的列 开始 -->
 <#list sub.colums as col><#rt/>
-<#if col.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if col.isShow =='Y' && col.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#if col.filedComment !='外键' >
     {
       title: '${col.filedComment}',
@@ -753,7 +769,9 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
 // 高级查询数据
 export const superQuerySchema = {
   <#list columns as po>
-  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+  <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+  <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
   ${superQueryFieldListForVue3(po,po_index)},
   </#if>
   </#list>
@@ -764,7 +782,9 @@ export const superQuerySchema = {
     view: 'table',
     fields: {
       <#list sub.colums as subCol>
-        <#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
+        <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+        <#if subCol.isShowList =='Y' && subCol.fieldName !='id' && po.fieldName !='delFlag'>
+        <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
         ${superQueryFieldListForVue3(subCol,subCol_index)},
         </#if>
       </#list>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
index 1e1c5de8..fea38f38 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
@@ -7,7 +7,9 @@ import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
 //列表数据
 export const columns: BasicColumn[] = [
  <#list columns as po>
-   <#if po.isShowList =='Y' && po.fieldName !='id'>
+   <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+   <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+   <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
    {
     title: '${po.filedComment}',
     align:"center",
@@ -71,7 +73,9 @@ export const searchFormSchema: FormSchema[] = [
 <#if po.fieldDbName=='bpm_status'>
   <#assign bpm_flag=true>
 </#if>
-<#if po.isQuery=='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign query_flag=true>
 	<#assign query_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1>
@@ -89,7 +93,9 @@ export const searchFormSchema: FormSchema[] = [
          dict:"${po.dictTable},${po.dictText},${po.dictField}"
       },
 <#elseif po.classType=='sel_user'>
-      component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
+      component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
 <#elseif po.classType=='switch'>
       component: 'JSwitch',
       componentProps:{
@@ -177,7 +183,9 @@ export const formSchema: FormSchema[] = [
 <#if po.fieldDbName == 'id'>
 	<#assign id_exists = true>
 </#if>
-<#if po.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -218,7 +226,9 @@ export const formSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件------------- -->
     componentProps:{
         labelKey:'realname',
      },
@@ -380,7 +390,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
 <#if po.fieldDbName=='id'>
   <#assign sub_id_exists=true>
 </#if>
-<#if po.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -421,7 +433,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
         labelKey:'realname',
      },
@@ -577,7 +591,9 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
 
 <#-- 循环子表的列 开始 -->
 <#list sub.colums as col><#rt/>
-<#if col.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if col.isShow =='Y' && col.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#if col.filedComment !='外键' >
     {
       title: '${col.filedComment}',
@@ -729,7 +745,9 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
 // 高级查询数据
 export const superQuerySchema = {
   <#list columns as po>
-  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+  <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+  <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
   ${superQueryFieldListForVue3(po,po_index)},
   </#if>
   </#list>
@@ -740,7 +758,9 @@ export const superQuerySchema = {
     view: 'table',
     fields: {
       <#list sub.colums as subCol>
-        <#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
+        <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+        <#if subCol.isShowList =='Y' && subCol.fieldName !='id' && subCol.fieldName !='delFlag'>
+        <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
         ${superQueryFieldListForVue3(subCol,subCol_index)},
         </#if>
       </#list>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
index ca4410e7..ad91e8f3 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -158,7 +158,7 @@
       </#if>
       </#list>
       });
-      const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: true});
+      const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
       const dbData = {};
       const formItemLayout = {
         labelCol: {xs: {span: 24}, sm: {span: 5}},
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
index dc018461..b93289dd 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
@@ -85,7 +85,7 @@
     </#if>
     </#list>
       })
-      const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, {immediate: true});
+      const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, {immediate: false});
       const formItemLayout = {
         labelCol: { xs: { span: 24 }, sm: { span: 5 } },
         wrapperCol: { xs: { span: 24 }, sm: { span: 16 } },
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index 2eb28739..5d8dc5e7 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -7,7 +7,9 @@ import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
 //列表数据
 export const columns: BasicColumn[] = [
  <#list columns as po>
-   <#if po.isShowList =='Y' && po.fieldName !='id'>
+   <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+   <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+   <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
    {
     title: '${po.filedComment}',
     align:"center",
@@ -71,7 +73,9 @@ export const searchFormSchema: FormSchema[] = [
 <#if po.fieldDbName=='bpm_status'>
   <#assign bpm_flag=true>
 </#if>
-<#if po.isQuery=='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isQuery=='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign query_flag=true>
 	<#assign query_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1>
@@ -89,7 +93,9 @@ export const searchFormSchema: FormSchema[] = [
          dict:"${po.dictTable},${po.dictText},${po.dictField}"
       },
 <#elseif po.classType=='sel_user'>
-      component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+      component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
 <#elseif po.classType=='switch'>
       component: 'JSwitch',
       componentProps:{
@@ -182,7 +188,9 @@ export const formSchema: FormSchema[] = [
 <#if po.fieldDbName == 'id'>
 	<#assign id_exists = true>
 </#if>
-<#if po.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -229,7 +237,9 @@ export const formSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
         labelKey:'realname',
      },
@@ -391,7 +401,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
 <#if po.fieldDbName == 'id'>
 	<#assign sub_id_exists = true>
 </#if>
-<#if po.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if po.isShow =='Y' && po.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
@@ -438,7 +450,9 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
      <#elseif po.classType =='password'>
     component: 'InputPassword',
      <#elseif po.classType =='sel_user'>
-    component: 'JSelectUserByDept',
+<#-- update-begin---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
+    component: 'JSelectUser',
+<#-- update-end---author:chenrui ---date:20240102  for：[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件---------- -->
     componentProps:{
         labelKey:'realname',
      },
@@ -594,7 +608,9 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
 
 <#-- 循环子表的列 开始 -->
 <#list sub.colums as col><#rt/>
-<#if col.isShow =='Y'>
+<#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+<#if col.isShow =='Y' && col.fieldName !='delFlag'>
+<#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
 <#if col.filedComment !='外键' >
     {
       title: '${col.filedComment}',
@@ -746,7 +762,9 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
 // 高级查询数据
 export const superQuerySchema = {
   <#list columns as po>
-  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+  <#if po.isShowList =='Y' && po.fieldName !='id' && po.fieldName !='delFlag'>
+  <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
   ${superQueryFieldListForVue3(po,po_index)},
   </#if>
   </#list>
@@ -757,7 +775,9 @@ export const superQuerySchema = {
     view: 'table',
     fields: {
       <#list sub.colums as subCol>
-        <#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
+        <#-- update-begin---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
+        <#if subCol.isShowList =='Y' && subCol.fieldName !='id' && po.fieldName !='delFlag'>
+        <#-- update-end---author:chenrui ---date:20240108  for：[issues/5755]vue代码不加入逻辑删除字段---------- -->
         ${superQueryFieldListForVue3(subCol,subCol_index)},
         </#if>
       </#list>