From 096a6a1245d2c5bbff9fdb91c6695adaa849825d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 10 Apr 2026 14:41:03 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=80=82=E9=85=8D=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/ts/api.ts.vm        |  6 +-
 .../main/resources/vm/vue/index-tree.vue.vm   | 97 ++++++++++---------
 .../src/main/resources/vm/vue/index.vue.vm    | 75 ++++++++------
 3 files changed, 102 insertions(+), 76 deletions(-)

diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/api.ts.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/api.ts.vm
index a8f2230c8..da6f9eeda 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/api.ts.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/api.ts.vm
@@ -1,7 +1,7 @@
+import type { ${BusinessName}Form, ${BusinessName}Query, ${BusinessName}VO } from '@/api/${moduleName}/${businessName}/types';
+import type { PageResult } from '@/api/types';
+import type { AxiosPromise } from '@/utils/api-types';
 import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { ${BusinessName}VO, ${BusinessName}Form, ${BusinessName}Query } from '@/api/${moduleName}/${businessName}/types';
-import { PageResult } from '@/api/types';
 
 /**
  * 查询${functionName}列表
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
index 6e6ac8789..1daf156d0 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
@@ -268,22 +268,31 @@
   </div>
 </template>
 
+#set($needAddDateRange = false)
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($needAddDateRange = true)
+#end
+#end
 <script setup name="${BusinessName}" lang="ts">
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
-import { ${BusinessName}VO, ${BusinessName}Query, ${BusinessName}Form } from '@/api/${moduleName}/${businessName}/types';
+import { add${BusinessName}, del${BusinessName}, get${BusinessName}, list${BusinessName}, update${BusinessName} } from '@/api/${moduleName}/${businessName}';
+import { ${BusinessName}Form, ${BusinessName}Query, ${BusinessName}VO } from '@/api/${moduleName}/${businessName}/types';
+#if(${dicts} != '')
+import { useDict } from '@/utils/dict';
+#end
+import modal from '@/plugins/modal';
+import { handleTree#if($needAddDateRange), addDateRange#end } from '@/utils/ruoyi';
+
+#if(${dicts} != '')
+#set($dictsNoSymbol=$dicts.replace("'", ""))
+const { ${dictsNoSymbol} } = toRefs<any>(useDict(${dicts}));
+#end
 
 type ${BusinessName}Option = {
   ${treeCode}: number;
   ${treeName}: string;
   children?: ${BusinessName}Option[];
-}
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;;
-
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = toRefs<any>(proxy?.useDict(${dicts}));
-#end
+};
 
 const ${businessName}List = ref<${BusinessName}VO[]>([]);
 const ${businessName}Options = ref<${BusinessName}Option[]>([]);
@@ -294,11 +303,11 @@ const loading = ref(false);
 
 const queryFormRef = ref<ElFormInstance>();
 const ${businessName}FormRef = ref<ElFormInstance>();
-const ${businessName}TableRef = ref<ElTableInstance>()
+const ${businessName}TableRef = ref<ElTableInstance>();
 
 const dialog = reactive<DialogOption>({
-    visible: false,
-    title: ''
+  visible: false,
+  title: ''
 });
 
 #foreach ($column in $columns)
@@ -373,42 +382,42 @@ const getList = async () => {
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  proxy?.addDateRange(queryParams.value, dateRange${AttrName}.value, '${AttrName}');
+  addDateRange(queryParams.value, dateRange${AttrName}.value, '${AttrName}');
 #end
 #end
   const res = await list${BusinessName}(queryParams.value);
-  const data = proxy?.handleTree<${BusinessName}VO>(res.data, "${treeCode}", "${treeParentCode}");
+  const data = handleTree<${BusinessName}VO>(res.data, '${treeCode}', '${treeParentCode}');
   if (data) {
     ${businessName}List.value = data;
     loading.value = false;
   }
-}
+};
 
 /** 查询${functionName}下拉树结构 */
 const getTreeselect = async () => {
   const res = await list${BusinessName}();
   ${businessName}Options.value = [];
   const data: ${BusinessName}Option = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
-  data.children = proxy?.handleTree<${BusinessName}Option>(res.data, "${treeCode}", "${treeParentCode}");
+  data.children = handleTree<${BusinessName}Option>(res.data, '${treeCode}', '${treeParentCode}');
   ${businessName}Options.value.push(data);
-}
+};
 
-// 取消按钮
+/** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
-// 表单重置
+/** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData}
+  form.value = { ...initFormData };
   ${businessName}FormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
@@ -420,7 +429,7 @@ const resetQuery = () => {
 #end
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 新增按钮操作 */
 const handleAdd = (row?: ${BusinessName}VO) => {
@@ -432,22 +441,22 @@ const handleAdd = (row?: ${BusinessName}VO) => {
     form.value.${treeParentCode} = 0;
   }
   dialog.visible = true;
-  dialog.title = "添加${functionName}";
-}
+  dialog.title = '添加${functionName}';
+};
 
 /** 展开/折叠操作 */
 const handleToggleExpandAll = () => {
   isExpandAll.value = !isExpandAll.value;
-  toggleExpandAll(${businessName}List.value, isExpandAll.value)
-}
+  toggleExpandAll(${businessName}List.value, isExpandAll.value);
+};
 
 /** 展开/折叠操作 */
 const toggleExpandAll = (data: ${BusinessName}VO[], status: boolean) => {
-  data.forEach((item) => {
-    ${businessName}TableRef.value?.toggleRowExpansion(item, status)
-    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
-  })
-}
+  data.forEach(item => {
+    ${businessName}TableRef.value?.toggleRowExpansion(item, status);
+    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status);
+  });
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row: ${BusinessName}VO) => {
@@ -464,8 +473,8 @@ const handleUpdate = async (row: ${BusinessName}VO) => {
   #end
 #end
   dialog.visible = true;
-  dialog.title = "修改${functionName}";
-}
+  dialog.title = '修改${functionName}';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -478,25 +487,25 @@ const submitForm = () => {
 #end
 #end
       if (form.value.${pkColumn.javaField}) {
-        await update${BusinessName}(form.value).finally(() => buttonLoading.value = false);
+        await update${BusinessName}(form.value).finally(() => (buttonLoading.value = false));
       } else {
-        await add${BusinessName}(form.value).finally(() => buttonLoading.value = false);
+        await add${BusinessName}(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.#[[$modal]]#.msgSuccess("操作成功");
+      modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row: ${BusinessName}VO) => {
-  await proxy?.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？');
+  await modal.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？');
   loading.value = true;
-  await del${BusinessName}(row.${pkColumn.javaField}).finally(() => loading.value = false);
+  await del${BusinessName}(row.${pkColumn.javaField}).finally(() => (loading.value = false));
   await getList();
-  proxy?.#[[$modal]]#.msgSuccess("删除成功");
-}
+  modal.msgSuccess('删除成功');
+};
 
 onMounted(() => {
   getList();
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
index 30a8dc1a7..b2147a207 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
@@ -248,14 +248,27 @@
   </div>
 </template>
 
+#set($needAddDateRange = false)
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($needAddDateRange = true)
+#end
+#end
 <script setup name="${BusinessName}" lang="ts">
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from '@/api/${moduleName}/${businessName}';
-import { ${BusinessName}VO, ${BusinessName}Query, ${BusinessName}Form } from '@/api/${moduleName}/${businessName}/types';
+import { add${BusinessName}, del${BusinessName}, get${BusinessName}, list${BusinessName}, update${BusinessName} } from '@/api/${moduleName}/${businessName}';
+import { ${BusinessName}Form, ${BusinessName}Query, ${BusinessName}VO } from '@/api/${moduleName}/${businessName}/types';
+#if(${dicts} != '')
+import { useDict } from '@/utils/dict';
+#end
+#if($needAddDateRange)
+import { addDateRange } from '@/utils/ruoyi';
+#end
+import modal from '@/plugins/modal';
+import { download as requestDownload } from '@/utils/request';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = toRefs<any>(proxy?.useDict(${dicts}));
+const { ${dictsNoSymbol} } = toRefs<any>(useDict(${dicts}));
 #end
 
 const ${businessName}List = ref<${BusinessName}VO[]>([]);
@@ -293,7 +306,7 @@ const initFormData: ${BusinessName}Form = {
 #end
 }
 const data = reactive<PageData<${BusinessName}Form, ${BusinessName}Query>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -347,32 +360,32 @@ const getList = async () => {
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  proxy?.addDateRange(queryParams.value, dateRange${AttrName}.value, '${AttrName}');
+  addDateRange(queryParams.value, dateRange${AttrName}.value, '${AttrName}');
 #end
 #end
   const res = await list${BusinessName}(queryParams.value);
   ${businessName}List.value = res.data?.rows;
   total.value = res.data?.total;
   loading.value = false;
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   ${businessName}FormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
@@ -384,26 +397,26 @@ const resetQuery = () => {
 #end
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: ${BusinessName}VO[]) => {
   ids.value = selection.map(item => item.${pkColumn.javaField});
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-}
+};
 
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加${functionName}";
-}
+  dialog.title = '添加${functionName}';
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: ${BusinessName}VO) => {
   reset();
-  const _${pkColumn.javaField} = row?.${pkColumn.javaField} || ids.value[0]
+  const _${pkColumn.javaField} = row?.${pkColumn.javaField} || ids.value[0];
   const res = await get${BusinessName}(_${pkColumn.javaField});
   Object.assign(form.value, res.data);
 #foreach ($column in $columns)
@@ -412,8 +425,8 @@ const handleUpdate = async (row?: ${BusinessName}VO) => {
   #end
 #end
   dialog.visible = true;
-  dialog.title = "修改${functionName}";
-}
+  dialog.title = '修改${functionName}';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -426,32 +439,36 @@ const submitForm = () => {
         #end
       #end
       if (form.value.${pkColumn.javaField}) {
-        await update${BusinessName}(form.value).finally(() =>  buttonLoading.value = false);
+        await update${BusinessName}(form.value).finally(() => (buttonLoading.value = false));
       } else {
-        await add${BusinessName}(form.value).finally(() =>  buttonLoading.value = false);
+        await add${BusinessName}(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.#[[$modal]]#.msgSuccess("操作成功");
+      modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: ${BusinessName}VO) => {
   const _${pkColumn.javaField}s = row?.${pkColumn.javaField} || ids.value;
-  await proxy?.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + _${pkColumn.javaField}s + '"的数据项？').finally(() => loading.value = false);
+  await modal.confirm('是否确认删除${functionName}编号为"' + _${pkColumn.javaField}s + '"的数据项？').finally(() => (loading.value = false));
   await del${BusinessName}(_${pkColumn.javaField}s);
-  proxy?.#[[$modal]]#.msgSuccess("删除成功");
+  modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download('${moduleName}/${businessName}/export', {
-    ...queryParams.value
-  }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
-}
+  requestDownload(
+    '${moduleName}/${businessName}/export',
+    {
+      ...queryParams.value
+    },
+    `${businessName}_#[[${new Date().getTime()}]]#.xlsx`
+  );
+};
 
 onMounted(() => {
   getList();