From 64f6a69d9a71d54e768e0e677aede973034a4026 Mon Sep 17 00:00:00 2001
From: Ricky <hk_ricky@163.com>
Date: Thu, 25 Nov 2021 13:54:49 +0800
Subject: [PATCH] 修复代码生成复选框字典遗漏问题
---
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index 867225a..10a1b91 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -108,7 +108,6 @@
plain
icon="el-icon-download"
size="mini"
- :loading="exportLoading"
@click="handleExport"
v-hasPermi="['${moduleName}:${businessName}:export']"
>导出</el-button>
@@ -137,7 +136,11 @@
#elseif($column.list && "" != $column.dictType)
<el-table-column label="${comment}" align="center" prop="${javaField}">
<template slot-scope="scope">
+#if($column.htmlType == "checkbox")
+ <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+#else
<dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
+#end
</template>
</el-table-column>
#elseif($column.list && "" != $javaField)
@@ -313,7 +316,7 @@
</template>
<script>
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
export default {
name: "${BusinessName}",
@@ -324,8 +327,6 @@
return {
// 遮罩层
loading: true,
- // 导出遮罩层
- exportLoading: false,
// 选中数组
ids: [],
#if($table.sub)
@@ -562,14 +563,9 @@
#end
/** 导出按钮操作 */
handleExport() {
- const queryParams = this.queryParams;
- this.#[[$modal]]#.confirm('是否确认导出所有${functionName}数据项？').then(() => {
- this.exportLoading = true;
- return export${BusinessName}(queryParams);
- }).then(response => {
- this.#[[$download]]#.name(response.msg);
- this.exportLoading = false;
- }).catch(() => {});
+ this.download('${moduleName}/${businessName}/export', {
+ ...this.queryParams
+ }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
}
}
};
--
Gitblit v1.9.2