From 17638d2eba38eb0d9d98e899374b5db5d474b819 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 22 十一月 2024 14:08:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
billion-generator/src/main/resources/vm/vue/index.vue.vm | 49 +++++++++++++++++++++++--------------------------
1 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/billion-generator/src/main/resources/vm/vue/index.vue.vm b/billion-generator/src/main/resources/vm/vue/index.vue.vm
index 6296014..5522dd5 100644
--- a/billion-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/billion-generator/src/main/resources/vm/vue/index.vue.vm
@@ -61,7 +61,7 @@
#end
#end
#end
- <el-form-item>
+ <el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
@@ -110,11 +110,11 @@
v-hasPermi="['${moduleName}:${businessName}:export']"
>瀵煎嚭</el-button>
</el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+## <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
+ <el-table border v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
+ <el-table-column show-overflow-tooltip="true" type="selection" width="55" align="center" />
#foreach($column in $columns)
#set($javaField=$column.javaField)
#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
@@ -127,9 +127,6 @@
<el-table-column label="${comment}" align="center" prop="${javaField}" />
#elseif($column.list && $column.htmlType == "datetime")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
- </template>
</el-table-column>
#elseif($column.list && $column.htmlType == "imageUpload")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
@@ -151,24 +148,24 @@
<el-table-column label="${comment}" align="center" prop="${javaField}" />
#end
#end
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['${moduleName}:${businessName}:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['${moduleName}:${businessName}:remove']"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
+## <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+## <template slot-scope="scope">
+## <el-button
+## size="mini"
+## type="text"
+## icon="el-icon-edit"
+## @click="handleUpdate(scope.row)"
+## v-hasPermi="['${moduleName}:${businessName}:edit']"
+## >淇敼</el-button>
+## <el-button
+## size="mini"
+## type="text"
+## icon="el-icon-delete"
+## @click="handleDelete(scope.row)"
+## v-hasPermi="['${moduleName}:${businessName}:remove']"
+## >鍒犻櫎</el-button>
+## </template>
+## </el-table-column>
</el-table>
<pagination
@@ -353,7 +350,7 @@
</template>
<script>
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/main/${moduleName}/${businessName}";
export default {
name: "${BusinessName}",
--
Gitblit v1.9.3