From d2aee55ed256d3b9a01bb220223fe49cf0768e8d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 16 Nov 2023 23:48:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=BB=E5=AD=90=E8=A1=A8=20inner=20?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E7=9A=84=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vue3/views/components/list_sub_erp.vue.vm        | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm
index 1fb79dbf6..5ad208b3b 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm
@@ -7,6 +7,7 @@
 <template>
   <!-- 列表 -->
   <ContentWrap>
+#if ($table.templateType == 11)
     <el-button
       type="primary"
       plain
@@ -15,6 +16,7 @@
     >
       <Icon icon="ep:plus" class="mr-5px" /> 新增
     </el-button>
+#end
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       #foreach($column in $subColumns)
       #if ($column.listOperationResult)
@@ -22,7 +24,8 @@
         #set ($javaField = $column.javaField)
         #set ($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
         #set ($comment=$column.columnComment)
-        #if ($column.javaType == "LocalDateTime")## 时间类型
+        #if ( $column.id == $subJoinColumn.id) ## 特殊：忽略主子表的 join 字段，不用填写
+        #elseif ($column.javaType == "LocalDateTime")## 时间类型
       <el-table-column
         label="${comment}"
         align="center"
@@ -74,15 +77,18 @@
     />
     #end
   </ContentWrap>
-
+#if ($table.templateType == 11)
     <!-- 表单弹窗：添加/修改 -->
     <${subSimpleClassName}Form ref="formRef" @success="getList" />
+#end
 </template>
-
 <script setup lang="ts">
 import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
 import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${table.businessName}'
+#if ($table.templateType == 11)
 import ${subSimpleClassName}Form from './${subSimpleClassName}Form.vue'
+#end
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗