From 632aff30cebcd21575d789cc6813703f1a3d05ae Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 04 一月 2021 17:52:41 +0800
Subject: [PATCH] 操作按钮组调整为朴素按钮样式
---
src/main/resources/vm/vue/index-tree.vue.vm | 133 ++++++++++++++++++++++++++++++++------------
1 files changed, 97 insertions(+), 36 deletions(-)
diff --git a/src/main/resources/vm/vue/index-tree.vue.vm b/src/main/resources/vm/vue/index-tree.vue.vm
index 2b314c6..f12eb2f 100644
--- a/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/src/main/resources/vm/vue/index-tree.vue.vm
@@ -38,20 +38,33 @@
<el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
</el-select>
</el-form-item>
-#elseif($column.htmlType == "datetime")
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
<el-form-item label="${comment}" prop="${column.javaField}">
- <el-date-picker clearable size="small" style="width: 200px"
+ <el-date-picker clearable size="small"
v-model="queryParams.${column.javaField}"
type="date"
value-format="yyyy-MM-dd"
placeholder="閫夋嫨${comment}">
</el-date-picker>
</el-form-item>
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+ <el-form-item label="${comment}">
+ <el-date-picker
+ v-model="daterange${AttrName}"
+ size="small"
+ style="width: 240px"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </el-form-item>
#end
#end
#end
<el-form-item>
- <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <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>
</el-form>
@@ -60,20 +73,14 @@
<el-col :span="1.5">
<el-button
type="primary"
+ plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['${moduleName}:${businessName}:add']"
>鏂板</el-button>
</el-col>
- <div class="top-right-btn">
- <el-tooltip class="item" effect="dark" content="鍒锋柊" placement="top">
- <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
- </el-tooltip>
- <el-tooltip class="item" effect="dark" :content="showSearch ? '闅愯棌鎼滅储' : '鏄剧ず鎼滅储'" placement="top">
- <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
- </el-tooltip>
- </div>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
@@ -146,8 +153,16 @@
<el-form-item label="${comment}" prop="${field}">
<el-input v-model="form.${field}" placeholder="璇疯緭鍏�${comment}" />
</el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
+#elseif($column.htmlType == "uploadImage")
<el-form-item label="${comment}">
+ <uploadImage v-model="form.${field}"/>
+ </el-form-item>
+#elseif($column.htmlType == "editor")
+ <el-form-item label="${comment}">
+ <editor v-model="form.${field}" :min-height="192"/>
+ </el-form-item>
+#elseif($column.htmlType == "select" && "" != $dictType)
+ <el-form-item label="${comment}" prop="${field}">
<el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
<el-option
v-for="dict in ${field}Options"
@@ -159,7 +174,7 @@
</el-select>
</el-form-item>
#elseif($column.htmlType == "select" && $dictType)
- <el-form-item label="${comment}">
+ <el-form-item label="${comment}" prop="${field}">
<el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
<el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
</el-select>
@@ -200,7 +215,7 @@
</el-form-item>
#elseif($column.htmlType == "datetime")
<el-form-item label="${comment}" prop="${field}">
- <el-date-picker clearable size="small" style="width: 200px"
+ <el-date-picker clearable size="small"
v-model="form.${field}"
type="date"
value-format="yyyy-MM-dd"
@@ -228,15 +243,41 @@
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "uploadImage")
+import UploadImage from '@/components/UploadImage';
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor")
+import Editor from '@/components/Editor';
+#break
+#end
+#end
export default {
name: "${BusinessName}",
- components: { Treeselect },
+ components: {
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "uploadImage")
+ UploadImage,
+#break
+#end
+#end
+#foreach($column in $columns)
+#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor")
+ Editor,
+#break
+#end
+#end
+ Treeselect
+ },
data() {
return {
// 閬僵灞�
loading: true,
- // 鏄剧ず鎼滅储鏉′欢
+ // 鏄剧ず鎼滅储鏉′欢
showSearch: true,
// ${functionName}琛ㄦ牸鏁版嵁
${businessName}List: [],
@@ -256,13 +297,17 @@
#if(${column.dictType} != '')
// $comment瀛楀吀
${column.javaField}Options: [],
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+ // $comment鏃堕棿鑼冨洿
+ daterange${AttrName}: [],
#end
#end
// 鏌ヨ鍙傛暟
queryParams: {
#foreach ($column in $columns)
#if($column.query)
- $column.javaField: undefined#if($velocityCount != $columns.size()),#end
+ $column.javaField: null#if($velocityCount != $columns.size()),#end
#end
#end
@@ -279,9 +324,8 @@
#else
#set($comment=$column.columnComment)
#end
-#set($comment=$column.columnComment)
$column.javaField: [
- { required: true, message: "$comment涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, message: "$comment涓嶈兘涓虹┖", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
]#if($velocityCount != $columns.size()),#end
#end
@@ -303,6 +347,21 @@
/** 鏌ヨ${functionName}鍒楄〃 */
getList() {
this.loading = true;
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+ this.queryParams.params = {};
+#break
+#end
+#end
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+ if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
+ this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
+ this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
+ }
+#end
+#end
list${BusinessName}(this.queryParams).then(response => {
this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
this.loading = false;
@@ -352,13 +411,13 @@
this.form = {
#foreach ($column in $columns)
#if($column.htmlType == "radio")
- $column.javaField: "0"#if($velocityCount != $columns.size()),#end
+ $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($velocityCount != $columns.size()),#end
#elseif($column.htmlType == "checkbox")
$column.javaField: []#if($velocityCount != $columns.size()),#end
#else
- $column.javaField: undefined#if($velocityCount != $columns.size()),#end
+ $column.javaField: null#if($velocityCount != $columns.size()),#end
#end
#end
@@ -371,6 +430,12 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+#foreach ($column in $columns)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+ this.daterange${AttrName} = [];
+#end
+#end
this.resetForm("queryForm");
this.handleQuery();
},
@@ -385,7 +450,7 @@
handleUpdate(row) {
this.reset();
this.getTreeselect();
- if (row != undefined) {
+ if (row != null) {
this.form.${treeParentCode} = row.${treeCode};
}
get${BusinessName}(row.${pkColumn.javaField}).then(response => {
@@ -400,7 +465,7 @@
});
},
/** 鎻愪氦鎸夐挳 */
- submitForm: function() {
+ submitForm() {
this.#[[$]]#refs["form"].validate(valid => {
if (valid) {
#foreach ($column in $columns)
@@ -408,21 +473,17 @@
this.form.$column.javaField = this.form.${column.javaField}.join(",");
#end
#end
- if (this.form.${pkColumn.javaField} != undefined) {
+ if (this.form.${pkColumn.javaField} != null) {
update${BusinessName}(this.form).then(response => {
- if (response.code === 200) {
- this.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- }
+ this.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
});
} else {
add${BusinessName}(this.form).then(response => {
- if (response.code === 200) {
- this.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- }
+ this.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
});
}
}
@@ -439,8 +500,8 @@
}).then(() => {
this.getList();
this.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(function() {});
+ })
}
}
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3