diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm index b42c2e011..4cceaa5bd 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm @@ -4,11 +4,11 @@ export interface ${simpleClassName}VO { #foreach ($column in $columns) #if ($column.createOperation || $column.updateOperation) #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer") - ${column.javaField}?: number + ${column.javaField}: number #elseif(${column.javaType.toLowerCase()} == "date") - ${column.javaField}?: string + ${column.javaField}: string #else - ${column.javaField}?: ${column.javaType.toLowerCase()} + ${column.javaField}: ${column.javaType.toLowerCase()} #end #end #end @@ -18,28 +18,28 @@ export interface ${simpleClassName}PageReqVO extends PageParam { #foreach ($column in $columns) #if (${column.listOperation})##查询操作 #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer") - ${column.javaField}?: number + ${column.javaField}?: number #elseif(${column.javaType.toLowerCase()} == "date") - ${column.javaField}?: string + ${column.javaField}?: string[] #else - ${column.javaField}?: ${column.javaType.toLowerCase()} + ${column.javaField}?: ${column.javaType.toLowerCase()} #end #end #end } export interface ${simpleClassName}ExcelReqVO { - #foreach ($column in $columns) - #if (${column.listOperation})##查询操作 - #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer") - ${column.javaField}: number - #elseif(${column.javaType.toLowerCase()} == "date") - ${column.javaField}: string - #else - ${column.javaField}: ${column.javaType.toLowerCase()} - #end - #end - #end +#foreach ($column in $columns) +#if (${column.listOperation})##查询操作 +#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer") + ${column.javaField}?: number +#elseif(${column.javaType.toLowerCase()} == "date") + ${column.javaField}?: string[] +#else + ${column.javaField}?: ${column.javaType.toLowerCase()} +#end +#end +#end } #set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}") diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm index 5c25f9a76..492f442e7 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm @@ -165,7 +165,7 @@ const submitForm = async () => { await ${simpleClassName}Api.update${simpleClassName}Api(data) message.success(t('common.updateSuccess')) } - dialogVisible.value = false + modelVisible.value = false } finally { actionLoading.value = false // 刷新列表 @@ -174,6 +174,4 @@ const submitForm = async () => { } }) } - -