Browse Source

编辑/添加

suochencheng 7 years ago
parent
commit
8fd389d59c
2 changed files with 621 additions and 351 deletions
  1. 384 114
      src/main/resources/templates/listTemplate1.vm
  2. 237 237
      src/main/vue/package-lock.json

+ 384 - 114
src/main/resources/templates/listTemplate1.vm

@@ -1,22 +1,26 @@
 <template>
     <div>
         <div class="filters-container">
-            <el-input placeholder="用户名" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-            <el-select placeholder="性别" size="small" v-model="filter2" clearable class="filter-item">
-                <el-option
-                        label="女"
-                        value="item1">
-                </el-option>
-                <el-option
-                        label="男"
-                        value="item2">
-                </el-option>
-            </el-select>
-            <el-button @click="getData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+        #* #foreach($field in $model.fields)
+           #if(${field.searchable})
+           <el-input placeholder="${field.remark}" size="small" v-model="${field.name}" clearable class="filter-item"></el-input>
+           #end
+           #end*#
+            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="${esc.d}router.push('/user')" type="primary" size="small" icon="el-icon-edit"
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
+                       icon="el-icon-search" class="filter-item">高级查询
+            </el-button>
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
+                       icon="el-icon-sort" class="filter-item">排序
+            </el-button>
+            <el-button @click="${esc.d}router.push({path:'/${display.uncapitalize($model.className)}',query:{column:${esc.d}route.query.column}})" type="primary"
+                       size="small" icon="el-icon-edit"
                        class="filter-item">添加
             </el-button>
+            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
+            </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
                   筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
@@ -32,38 +36,77 @@
                 :height="tableHeight"
                 row-key="id"
                 ref="table">
-            <el-table-column
-                    v-if="multipleMode"
-                    align="center"
-                    type="selection"
-                    width="50">
-            </el-table-column>
-            <el-table-column
-                    type="index"
-                    min-width="50"
-                    align="center">
-            </el-table-column>
-            #foreach($field in $model.fields)
-                #if($field.showInList)
-                    <el-table-column
-                            v-if="isColumnShow('$field.modelName')"
-                            prop="$field.modelName"
-                            label="$display.alt($field.remark,$field.modelName)"
-                            min-width="300">
-                    </el-table-column>
+            <el-table-column label="${model.remark}" align="center" >
+                <el-table-column
+                        v-if="multipleMode"
+                        align="center"
+                        type="selection"
+                        width="50">
+                </el-table-column>
+                <el-table-column
+                        type="index"
+                        min-width="50"
+                        align="center">
+                </el-table-column>
+                #foreach($field in $model.fields)
+                    #if(${field.showInList})
+
+                        #if(${field.formType}=="date"||${field.formType}=="currentDate")
+                            <el-table-column
+                                    v-if="isColumnShow('${field.modelName}')"
+                                    prop="${field.modelName}"
+                                    label="$display.alt(${field.remark},${field.modelName})"
+                                    :formatter="DateFormatter"
+                                    min-width="100">
+                            </el-table-column>
+                        #elseif(${field.formType}=="datetime"||${field.formType}=="currentTime")
+                            <el-table-column
+                                    v-if="isColumnShow('${field.modelName}')"
+                                    prop="${field.modelName}"
+                                    label="$display.alt(${field.remark},${field.modelName})"
+                                    :formatter="DateTimeFormatter"
+                                    min-width="100">
+                            </el-table-column>
+                        #elseif(${field.formType}=="singleImage")
+                            <el-table-column
+                                    v-if="isColumnShow('${field.modelName}')"
+                                    prop="${field.modelName}"
+                                    label="$display.alt(${field.remark},${field.modelName})"
+                                    min-width="100">
+                                <template slot-scope="{row}">
+                                    <img :src="row.${field.modelName}" @click="showImg(row.${field.modelName})" style="width: 100px;height: 100px;vertical-align: middle;" />
+                                </template>
+
+                            </el-table-column>
+                        #else
+                            <el-table-column
+                                    v-if="isColumnShow('${field.modelName}')"
+                                    prop="${field.modelName}"
+                                    label="$display.alt(${field.remark},${field.modelName})"
+                                    min-width="100">
+                            </el-table-column>
+                        #end
+                    #end
                 #end
-            #end
-            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right">
-                <template slot-scope="scope">
-                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
-                </template>
+                <el-table-column
+                        label="操作"
+                        align="center"
+                        fixed="right"
+                        min-width="150"
+                >
+                    <template slot-scope="scope">
+                        #foreach($subtable in $model.subtables)
+                            <el-button @click="${esc.d}router.push({path:'/${subtable.subCode}s',query:{column:scope.row.${subtable.column}+',${subtable.subColumn}'}})" type="primary" size="small" plain>${subtable.name}
+                            </el-button>
+                        #end
+                        <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                        <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                    </template>
+                </el-table-column>
             </el-table-column>
         </el-table>
         <div class="pagination-wrapper">
-            <div class="multiple-mode-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
                 <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
                 <el-button-group v-else>
                     <el-button size="small" @click="operation1">批量操作1</el-button>
@@ -82,10 +125,101 @@
                     :total="totalNumber">
             </el-pagination>
         </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item"
+                                       :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, ${esc.d}index }">
+                        <el-button @click="removeField(${esc.d}index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="${esc.d}store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, ${esc.d}index }">
+                        <el-button @click="removeSortField(${esc.d}index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="${esc.d}store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
     </div>
 </template>
 <script>
     import {mapState} from 'vuex'
+    import {format} from 'date-fns'
+    import zh from 'date-fns/locale/zh_cn'
 
     export default {
         created() {
@@ -100,87 +234,223 @@
                 tableData: [],
                 filter1: '',
                 filter2: '',
-                tableColumns: [{
-                    label: '用户名',
-                    value: 'username',
-                    show: true
-                }, {
-                    label: '昵称',
-                    value: 'nickname',
-                    show: true
-                }, {
-                    label: '头像',
-                    value: 'icon',
-                    show: true
-                }, {
-                    label: '性别',
-                    value: 'sex',
-                    show: true
-                }, {
-                    label: 'openId',
-                    value: 'openId',
-                    show: true
-                }],
-                multipleMode: false
+                tableColumns: [
+                    #foreach($field in $model.fields)
+                        #if(${field.showInList})
+                            {
+                                label: '$display.alt(${field.remark},${field.modelName})',
+                                value: '${field.modelName}',
+                                show: true
+                            },
+                        #end
+                    #end
+                ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                showTableSortDialog: false,
+                tableSortFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                    #foreach($field in $model.fields)
+                        #if(${field.showInList})
+                            {
+                                label: '$display.alt(${field.remark},${field.modelName})',
+                                value: '${field.name}'
+                            },
+                        #end
+                    #end
+                ],
+                advancedQuerySearchKey: '',
+                orderByStr: '',
+                imgSrc: '',
+                imageDialogVisible: false,
             }
         },
         computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.${esc.d}refs.table.selection.map(i => i.id);
+                ...mapState(['tableHeight']),
+        selection() {
+            return this.${esc.d}refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
+            this.getData();
+        },
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
+        },
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
+            }
+
+            if (this.${esc.d}route.query.column) {
+                var tempColumn = this.${esc.d}route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
+
+            this.${esc.d}http.get({
+                url: '/${display.uncapitalize($model.className)}/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                this.totalNumber = res.data.page.totalNumber;
+                this.tableData = res.data.pp;
             }
+        })
         },
-        methods: {
-            pageSizeChange(size) {
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-                this.${esc.d}http.get({
-                    url: '/userInfo/page',
-                    data: {
-                        currentPage: this.currentPage,
-                        pageNumber: this.pageSize
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.totalNumber = res.data.page.totalNumber;
-                        this.tableData = res.data.pp;
-                    }
-                })
-            },
-            isColumnShow(column) {
-                var row = this.tableColumns.find(i => i.value === column);
-                return row ? row.show : false;
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.${esc.d}refs.table.clearSelection();
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.${esc.d}refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.${esc.d}router.push({
+                path: '/${display.uncapitalize($model.className)}',
+                query: {
+                    id: row.id,
+                    column: this.${esc.d}route.query.column,
+                }
+            })
+        },
+        operation1() {
+            this.${esc.d}notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.${esc.d}message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
+
+            this.advancedQuerySearchKey = '';
+
+            if (this.advancedQueryFields.length > 0) {
+
+                var templist = [];
+
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                    var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                    templist.push(tempItem);
+                }
+            })
+
+                if (templist.length > 0) {
+
+                    this.advancedQuerySearchKey = templist.join('_;');
+                }
+            }
+
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
+
+            this.orderByStr = '';
+
+            if (this.tableSortFields.length > 0) {
+
+                var templist = [];
+
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                    var tempItem = item.name + '_,' + item.order;
+                    templist.push(tempItem);
+                }
+            })
+
+                if (templist.length > 0) {
+
+                    this.orderByStr = templist.join('_;');
                 }
-            },
-            editRow(row) {
-                this.${esc.d}router.push({
-                    path: '/user',
-                    query: {
-                        id: row.id
-                    }
+            }
+
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.${esc.d}baseUrl + "/${display.uncapitalize($model.className)}/exportExcel?searchKey="
+                    + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.${esc.d}alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
+                return this.${esc.d}http.post({
+                    url: '/${display.uncapitalize($model.className)}/del',
+                    data: {id: row.id}
                 })
-            },
-            operation1() {
-                this.${esc.d}notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.${esc.d}message('操作2');
+            }).then(() => {
+                this.${esc.d}message.success('删除成功');
+            this.getData();
+        }).catch(action => {
+                if (action === 'cancel') {
+                this.${esc.d}message.info('删除取消');
+            } else {
+                this.${esc.d}message.error('删除失败');
             }
-        }
+        })
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+            }
+
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', {locale: zh})
+            }
+
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
+
+    }
     }
 </script>
 <style lang="less" scoped>

File diff suppressed because it is too large
+ 237 - 237
src/main/vue/package-lock.json


Some files were not shown because too many files changed in this diff