批量删除

src/main/java/com/izouma/awesomeadmin/dao/TestBbbMapper.java

@@ -24,7 +24,7 @@ public interface TestBbbMapper{
 
     List<TestBbb> queryTestBbbByPage(Map<String, Object> parameter);
 
-    int delete(String id);
+    int delete(TestBbb record);
 
     TestBbb queryTestBbb(TestBbb record);
 

src/main/java/com/izouma/awesomeadmin/dao/TestBbbMapper.xml

@@ -10,21 +10,7 @@
                                 <result column="name_ddd" property="nameDdd" jdbcType="VARCHAR" />
             </resultMap>
     <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
-            id,
-
-            del_flag,
-
-            name_aaa,
-
-            name_bbb,
-
-            name_ccc,
-
-            name_ddd,
-
-            </trim>
-    </sql>
+        id, del_flag, name_aaa, name_bbb, name_ccc, name_ddd    </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
         select
         <include refid="Base_Column_List" />
@@ -100,12 +86,22 @@
                name_ddd= #{nameDdd,jdbcType=VARCHAR},
             </if>
                  </set>
-        where id = #{id,jdbcType=INTEGER}
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
     </update>
     <select id="queryTestBbbByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestBbb">
         select <include refid="Base_Column_List"/> from test_bbb
         <where>
             and del_flag = 'N'
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                and id in (${record.idStr})
+            </if>
                     <if test="record.id != null and !&quot;&quot;.equals(record.id)">
                 and  id = #{record.id}
             </if>
@@ -126,11 +122,7 @@
             </if>
                   <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
              <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                OR  name_aaa LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  name_bbb LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  name_ccc LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  name_ddd LIKE concat('%',#{record.searchKey},'%')
-                                                             </trim>
+                                                                                                                                                                                                                                                                                                                                                                                             </trim>
          </if>
 
             <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
@@ -169,12 +161,29 @@
             </if>
 
         </where>
-        order by id desc
+        order by
+
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id desc
     </select>
     <select id="queryAllTestBbb" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestBbb">
         select <include refid="Base_Column_List"/> from test_bbb
         <where>
             and del_flag = 'N'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                and id in (${idStr})
+            </if>
                     <if test="id != null and !&quot;&quot;.equals(id)">
                 and  id = #{id}
             </if>
@@ -195,11 +204,7 @@
             </if>
                     <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                OR  name_aaa LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  name_bbb LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  name_ccc LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  name_ddd LIKE concat('%',#{searchKey},'%')
-                                                                                        </trim>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                </trim>
             </if>
 <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
     <foreach item="item" index="index" collection="advancedQuery.split('_;')">
@@ -236,7 +241,22 @@
 
 </if>
         </where>
-        order by id desc
+        order by
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+
+        id desc
     </select>
     <select id="queryTestBbb" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestBbb">
         select <include refid="Base_Column_List"/> from test_bbb
@@ -266,9 +286,14 @@
     </select>
     <update id="delete">
         UPDATE test_bbb SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
     </update>
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.TestBbb">
         select <include refid="Base_Column_List"/> from test_bbb

src/main/java/com/izouma/awesomeadmin/model/TestBbb.java

@@ -15,6 +15,8 @@ public class TestBbb{
     private String nameCcc;
     private String nameDdd;
 
+private String idStr;
+
 private String searchKey;
 
 /**
@@ -22,6 +24,11 @@ private String searchKey;
 */
 private String advancedQuery;
 
+/**
+* column_name_,desc_;column_name_,asc
+*/
+private String orderByStr;
+
     public Integer getId(){
         return this.id;
     }
@@ -81,5 +88,21 @@ public void setAdvancedQuery(String advancedQuery) {
     this.advancedQuery = advancedQuery;
 }
 
+public String getOrderByStr() {
+    return orderByStr;
+}
+
+public void setOrderByStr(String orderByStr) {
+    this.orderByStr = orderByStr;
+}
+
+public String getIdStr() {
+    return idStr;
+}
+
+public void setIdStr(String idStr) {
+    this.idStr = idStr;
+}
+
 }
 

src/main/java/com/izouma/awesomeadmin/service/TestBbbService.java

@@ -20,7 +20,7 @@ public interface TestBbbService{
 
     boolean createTestBbb(TestBbb record);
 
-    boolean deleteTestBbb(String id);
+    boolean deleteTestBbb(TestBbb record);
 
     boolean updateTestBbb(TestBbb record);
 }

src/main/java/com/izouma/awesomeadmin/service/impl/TestBbbServiceImpl.java

@@ -99,12 +99,12 @@ public class TestBbbServiceImpl implements TestBbbService{
     }
 
     @Override
-    public boolean deleteTestBbb(String id) {
+    public boolean deleteTestBbb(TestBbb record) {
 
         logger.info("deleteTestBbb");
         try {
 
-             int updates = testBbbMapper.delete(id);
+             int updates = testBbbMapper.delete(record);
 
             if (updates > 0) {
                  return true;

src/main/java/com/izouma/awesomeadmin/web/TestBbbController.java

@@ -3,6 +3,7 @@ package com.izouma.awesomeadmin.web;
 import java.util.*;
 
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -105,9 +106,9 @@ public class TestBbbController {
     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
-    public Result deleteTestBbb(@RequestParam(required = true, value = "id") String id) {
+    public Result deleteTestBbb(TestBbb record) {
 
-        boolean num = testBbbService.deleteTestBbb(id);
+        boolean num = testBbbService.deleteTestBbb(record);
         if (num) {
         return new Result(true, "删除成功");
         }

src/main/resources/templates/ListTemplate.vm

@@ -95,22 +95,33 @@
                     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 v-if="isModulesShow('edit')"  @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button  v-if="isModulesShow('del')" @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                    #if($model.subtables.size()>0)
+                        <el-dropdown>
+                            <el-button type="primary" size="mini" plain>
+                                更多
+                                <i class="el-icon-arrow-down el-icon--right"></i>
+                            </el-button>
+                            <el-dropdown-menu slot="dropdown">
+                                #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-dropdown-menu>
+                        </el-dropdown>
+                    #end
+
                 </template>
             </el-table-column>
             </el-table-column>
         </el-table>
         <div class="pagination-wrapper">
-            <div class="multiple-mode-wrapper" v-if="0">
+            <div class="multiple-mode-wrapper">
                 <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>
-                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" v-if="isModulesShow('del')"  @click="operation1" type="danger" plain>批量删除</el-button>
+                    <el-button size="small" @click="operation2" v-if="0">批量操作2</el-button>
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
@@ -462,12 +473,32 @@
                 this.editDialogVisible = true
             },
             operation1() {
+                if (this.selection.length > 0) {
+                    this.${esc.d}alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                        return this.${esc.d}http.post({
+                            url: '/${display.uncapitalize($model.className)}/del',
+                            data: {idStr: this.selection.join()}
+                        })
+                    }).then(() => {
+                        this.${esc.d}message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                        if (action === 'cancel') {
+                        this.${esc.d}message.info('删除取消');
+                    } else {
+                        this.${esc.d}message.error('删除失败');
+                    }
+                })
+                }
+
+
+            },
+            operation2() {
                 this.${esc.d}notify({
                     title: '提示',
                     message: this.selection
                 });
-            },
-            operation2() {
+
                 this.${esc.d}message('操作2');
             },
             addField() {

src/main/vue/src/pages/GenCode.vue

@@ -399,15 +399,15 @@ export default {
 				this.loading = false;
 				if (res.success) {
 
-
+					res.data.genJson = JSON.parse(res.data.genJson)
+					// console.log(res.data.genJson)
+					res.data.genJson.modules = res.data.genJson.modules ? (res.data.genJson.modules.split(',').map(i => String(i))) : [];
 
 					this.formData = {
 						...this.formData,
-						...JSON.parse(res.data.genJson)
+						...res.data.genJson
 					};
 
-					this.formData.modules = this.formData.modules ? this.formData.modules.split(',').map(i => String(i)) : [];
-
 					this.fields = this.formData.fields;
 					this.formData.id = res.data.id;
 					this.formData.genRouter = false;

src/main/vue/src/pages/TestAaas.vue

@@ -135,10 +135,20 @@
                     min-width="150"
             >
                 <template slot-scope="scope">
-                    <el-button @click="$router.push({path:'/TestBbbs',query:{column:scope.row.testName+',nameAaa'}})" type="primary" size="small" plain>子表bbb
-            </el-button>
-                            <el-button v-if="isModulesShow('edit')"  @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+
+                    <el-button v-if="isModulesShow('edit')"  @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button  v-if="isModulesShow('del')" @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                                            <el-dropdown>
+                            <el-button type="primary" size="mini" plain>
+                                更多
+                                <i class="el-icon-arrow-down el-icon--right"></i>
+                            </el-button>
+                            <el-dropdown-menu slot="dropdown">
+                                                                    <el-button @click="$router.push({path:'/TestBbbs',query:{column:scope.row.testName+',nameAaa'}})" type="primary" size="small" plain>子表bbb
+                                    </el-button>
+                                                            </el-dropdown-menu>
+                        </el-dropdown>
+                    
                 </template>
             </el-table-column>
             </el-table-column>

src/main/vue/src/pages/TestBbb.vue

@@ -20,7 +20,7 @@
             </el-form-item>
                                                                                                                                                                                                                                                                                                                                                                                                                 <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="onDelete" v-if="formData.id&&isModulesShow('del')" type="danger">删除</el-button>
                 <el-button @click="changeEditDialogVisible(false)">取消</el-button>
             </el-form-item>
         </el-form>
@@ -61,6 +61,8 @@ export default {
                                             {required: true, message: '请输入 名称3', trigger: 'blur'},
                                                         ],
                                                                 },
+        modules:            'search,query,orders,excel,add,edit,del'.split(',').map(i => String(i))
+     ,
                                                                                                                                     }
     },
     computed: {
@@ -77,6 +79,10 @@ methods: {
     changeEditDialogVisible(value){
         this.$emit('changeEditDialogVisible',value)
     },
+    isModulesShow(column) {
+        var row = this.modules.find(i => i === column);
+        return row ? true : false;
+    },
     onSave() {
         this.$refs.form.validate((valid) => {
             if (valid) {

src/main/vue/src/pages/TestBbbs.vue

@@ -2,20 +2,20 @@
     <div>
         <div class="filters-container">
         
-            <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-input v-if="isModulesShow('search')" placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-button v-if="isModulesShow('search')" @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
+            <el-button v-if="isModulesShow('query')" @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"
+            <el-button v-if="isModulesShow('orders')" @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
                        icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="editRow({id:0,column:$route.query.column})" type="primary"
+            <el-button v-if="isModulesShow('add')" @click="editRow({id:0,column:$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 v-if="isModulesShow('excel')" @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>
@@ -79,18 +79,19 @@
                     min-width="150"
             >
                 <template slot-scope="scope">
-                            <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>
+
+                    <el-button v-if="isModulesShow('edit')"  @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    
                 </template>
             </el-table-column>
             </el-table-column>
         </el-table>
         <div class="pagination-wrapper">
-            <div class="multiple-mode-wrapper" v-if="0">
+            <div class="multiple-mode-wrapper">
                 <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>
-                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" v-if="isModulesShow('del')"  @click="operation1" type="danger" plain>批量删除</el-button>
+                    <el-button size="small" @click="operation2" v-if="0">批量操作2</el-button>
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
@@ -243,11 +244,14 @@
                                 show: true
                             },
                                                             ],
+                modules:                'search,query,orders,excel,add,edit,del'.split(',').map(i => String(i))
+             ,
                 multipleMode: false,
                 showAdvancedQueryDialog: false,
                 advancedQueryFields: [],
                 showTableSortDialog: false,
-                tableSortFields: [],
+                tableSortFields: [
+                            ],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
                                                                                                                                                                 {
@@ -298,6 +302,42 @@
             },
             getData() {
 
+                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('_;');
+                    }
+                }
+
+
+                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('_;');
+                    }
+                }
+
+
                 var data = {
                     currentPage: this.currentPage,
                     pageNumber: this.pageSize,
@@ -325,6 +365,10 @@
                 var row = this.tableColumns.find(i => i.value === column);
                 return row ? row.show : false;
             },
+            isModulesShow(column) {
+                var row = this.modules.find(i => i === column);
+                return row ? true : false;
+            },
             toggleMultipleMode(multipleMode) {
                 this.multipleMode = multipleMode;
                 if (!multipleMode) {
@@ -348,12 +392,32 @@
                 this.editDialogVisible = true
             },
             operation1() {
+                if (this.selection.length > 0) {
+                    this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                        return this.$http.post({
+                            url: '/testBbb/del',
+                            data: {idStr: this.selection.join()}
+                        })
+                    }).then(() => {
+                        this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                        if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+                }
+
+
+            },
+            operation2() {
                 this.$notify({
                     title: '提示',
                     message: this.selection
                 });
-            },
-            operation2() {
+
                 this.$message('操作2');
             },
             addField() {
@@ -373,23 +437,6 @@
 
                 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;
             },
@@ -408,23 +455,6 @@
 
                 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('_;');
-                    }
-                }
-
                 this.getData();
                 this.showTableSortDialog = false;
             },

src/main/vue/src/pages/Testaaaone.vue

@@ -1,103 +1,148 @@
 <template>
     <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
-            <el-form-item prop="delFlag" label="删除标识">
-                <el-input v-model="formData.delFlag"></el-input>
-            </el-form-item>
-            <el-form-item prop="testName" label="名字">
-                <el-input v-model="formData.testName"></el-input>
-            </el-form-item>
-            <el-form-item prop="remark" label="备注">
-                <el-input v-model="formData.remark"></el-input>
-            </el-form-item>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="120px" label-position="right" size="small"
+                 style="max-width: 500px;">
             <el-form-item>
+                <h2> Testaaaone</h2>
+            </el-form-item>
+
+                                                                                <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
-                <el-button @click="$router.go(-1)">取消</el-button>
+                <el-button @click="onDelete" v-if="formData.id&&isModulesShow('del')" type="danger">删除</el-button>
+                <el-button @click="changeEditDialogVisible(false)">取消</el-button>
             </el-form-item>
         </el-form>
     </div>
 </template>
 <script>
 import formValidator from '../formValidator'
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
 
 export default {
-    created() {
-        if (this.$route.query.id) {
-            this.$http.get({
-                url: '/testaaaone/getOne',
-                data: {
-                    id: this.$route.query.id
-                }
-            }).then(res => {
-                if (res.success) {
-
-
-                    this.formData = res.data;
-                }
-            })
+    props:{
+        formData:{
+            type:Object,
+            default:{
+                                                                                                                        }
         }
-
     },
+
+    created() {
+
+                                                                                                                            },
     data() {
         return {
             saving: false,
-            formData: {},
-            rules: {
-                testName:
-                    [
-                        { required: true, message: '请输入 名字', trigger: 'blur' },
-                        formValidator.number,
-                    ],
-                remark:
-                    [
-                        { required: true, message: '请输入 备注', trigger: 'blur' },
-                    ],
-            },
-        }
+        rules: {
+                                                                            },
+        modules:            'search,query,orders,excel,edit,add,del'.split(',').map(i => String(i))
+     ,
+                                                    }
     },
-    methods: {
-        onSave() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    this.submit();
-                } else {
-                    return false;
+    computed: {
+            ...mapState(['userInfo']),
+                subColumn(){
+                if(this.formData.subColumn){
+                   return  this.formData.subColumn;
+                }else{
+                    return '';
                 }
-            });
         },
-        submit() {
-            var data = JSON.parse(JSON.stringify(this.formData));
-            this.$http.post({
-                url: this.formData.id ? '/testaaaone/update' : '/testaaaone/save',
-                data: data
+},
+methods: {
+    changeEditDialogVisible(value){
+        this.$emit('changeEditDialogVisible',value)
+    },
+    isModulesShow(column) {
+        var row = this.modules.find(i => i === column);
+        return row ? true : false;
+    },
+    onSave() {
+        this.$refs.form.validate((valid) => {
+            if (valid) {
+                this.logicalValidate();
+            } else {
+                return false;
+    }
+    });
+    },
+    logicalValidate() {
+        var data = JSON.parse(JSON.stringify(this.formData));
+
+        var logicalData = {
+                                                    }
+
+        if (JSON.stringify(logicalData) == '{}') {
+            this.submit();
+        } else {
+            this.$http.get({
+                url: '/testaaaone/getOne',
+                data: logicalData
             }).then(res => {
                 if (res.success) {
-                    this.$message.success('成功');
-                    this.$router.go(-1);
-                } else {
-                    this.$message.warning('失败')
+
+                var logicalFlag = true;
+
+                if (res.data) {
+                    if (this.formData.id) {
+                        if (res.data.id != this.formData.id) {
+                            logicalFlag = false;
+                        }
+                    } else {
+                        logicalFlag = false;
+                    }
+
                 }
-            });
-        },
-        onDelete() {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/testaaaone/del',
-                    data: { id: this.formData.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
-                this.$router.go(-1);
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
+
+                if (logicalFlag) {
+                    this.submit();
                 } else {
-                    this.$message.error('删除失败');
+                    this.$message.warning('逻辑关键字:'+''+'验证失败')
                 }
+
+
+            } else {
+                this.$message.warning('逻辑关键字:'+''+'验证失败')
+            }
+        });
+        }
+    },
+    submit() {
+        var data = JSON.parse(JSON.stringify(this.formData));
+
+                                                
+    this.$http.post({
+        url: this.formData.id ? '/testaaaone/update' : '/testaaaone/save',
+        data: data
+    }).then(res => {
+        if (res.success) {
+            this.$message.success('成功');
+            this.$emit('changeEdit')
+        } else {
+            this.$message.warning('失败')
+        }
+    });
+    },
+    onDelete() {
+        this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+            return this.$http.post({
+                url: '/testaaaone/del',
+                data: { id: this.formData.id }
             })
-        },
-    }
+        }).then(() => {
+            this.$message.success('删除成功');
+        this.$emit('changeEdit')
+    }).catch(action => {
+            if (action === 'cancel') {
+            this.$message.info('删除取消');
+        } else {
+            this.$message.error('删除失败');
+        }
+    })
+    },
+}
 }
 </script>
 <style lang="less" scoped>

src/main/vue/src/pages/Testaaaones.vue

@@ -2,20 +2,20 @@
     <div>
         <div class="filters-container">
         
-            <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-input v-if="isModulesShow('search')" placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-button v-if="isModulesShow('search')" @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
+            <el-button v-if="isModulesShow('query')" @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"
+            <el-button v-if="isModulesShow('orders')" @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
                        icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="$router.push('/testaaaone')" type="primary"
+            <el-button v-if="isModulesShow('add')" @click="editRow({id:0,column:$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 v-if="isModulesShow('excel')" @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>
@@ -32,6 +32,7 @@
                 :height="tableHeight"
                 row-key="id"
                 ref="table">
+            <el-table-column label="Testaaaone" align="center" >
             <el-table-column
                     v-if="multipleMode"
                     align="center"
@@ -43,41 +44,31 @@
                     min-width="50"
                     align="center">
             </el-table-column>
-                                                        
-                                            <el-table-column
-                                v-if="isColumnShow('delFlag')"
-                                prop="delFlag"
-                                label="删除标识"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('testName')"
-                                prop="testName"
-                                label="名字"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('remark')"
-                                prop="remark"
-                                label="备注"
-                                min-width="100">
-                        </el-table-column>
-                                                            <el-table-column
+                                                                                <el-table-column
                     label="操作"
                     align="center"
                     fixed="right"
                     min-width="150"
             >
                 <template slot-scope="scope">
-                    <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>
+
+                    <el-button v-if="isModulesShow('edit')"  @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button  v-if="isModulesShow('del')" @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                                            <el-dropdown>
+                            <el-button type="primary" size="mini" plain>
+                                更多
+                                <i class="el-icon-arrow-down el-icon--right"></i>
+                            </el-button>
+                            <el-dropdown-menu slot="dropdown">
+                                                            </el-dropdown-menu>
+                        </el-dropdown>
+                    
                 </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>
@@ -185,19 +176,26 @@
             <img width="100%" :src="imgSrc" alt="">
         </el-dialog>
 
+        <el-dialog title="编辑Testaaaone" top='10px' :visible.sync="editDialogVisible">
+            <testaaaone :formData='editRowInfo' @changeEditDialogVisible='changeEditDialogVisible' @changeEdit='changeEdit'></testaaaone>
+        </el-dialog>
+
     </div>
 </template>
 <script>
     import {mapState} from 'vuex'
     import {format} from 'date-fns'
     import zh from 'date-fns/locale/zh_cn'
-
+    import testaaaone from '../pages/Testaaaone'
     export default {
         created() {
             this.getData();
         },
         data() {
             return {
+                editRowInfo: {
+                                                                                                                                                                                                                                                    },
+                editDialogVisible: false,
                 totalNumber: 0,
                 totalPage: 10,
                 currentPage: 1,
@@ -206,42 +204,18 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                    {
-                                label: '删除标识',
-                                value: 'delFlag',
-                                show: true
-                            },
-                                                                                                {
-                                label: '名字',
-                                value: 'testName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark',
-                                show: true
-                            },
-                                                            ],
+                                                                                                                            ],
+                modules:                'search,query,orders,excel,edit,add,del'.split(',').map(i => String(i))
+             ,
                 multipleMode: false,
                 showAdvancedQueryDialog: false,
                 advancedQueryFields: [],
                 showTableSortDialog: false,
-                tableSortFields: [],
+                tableSortFields: [
+                            ],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                    {
-                                label: '删除标识',
-                                value: 'del_flag'
-                            },
-                                                                                                {
-                                label: '名字',
-                                value: 'test_name'
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark'
-                            },
-                                                            ],
+                                                                                                                            ],
                 advancedQuerySearchKey: '',
                 orderByStr: '',
                 imgSrc: '',
@@ -249,12 +223,19 @@
             }
         },
         computed: {
-            ...mapState(['tableHeight']),
+            ...mapState(['tableHeight','userInfo']),
             selection() {
                 return this.$refs.table.selection.map(i => i.id);
             }
         },
         methods: {
+            changeEditDialogVisible(value) {
+                this.editDialogVisible = value
+            },
+            changeEdit() {
+                this.editDialogVisible = false
+                this.getData();
+            },
             pageSizeChange(size) {
                 this.currentPage = 1;
                 this.pageSize = size;
@@ -265,15 +246,59 @@
                 this.getData();
             },
             getData() {
+
+                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('_;');
+                    }
+                }
+
+
+                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('_;');
+                    }
+                }
+
+
+                var data = {
+                    currentPage: this.currentPage,
+                    pageNumber: this.pageSize,
+                    searchKey: this.filter1,
+                    advancedQuery: this.advancedQuerySearchKey,
+                    orderByStr: this.orderByStr,
+                }
+
+                if (this.$route.query.column) {
+                    var tempColumn = this.$route.query.column;
+                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                }
+
                 this.$http.get({
                     url: '/testaaaone/page',
-                    data: {
-                        currentPage: this.currentPage,
-                        pageNumber: this.pageSize,
-                        searchKey: this.filter1,
-                        advancedQuery: this.advancedQuerySearchKey,
-                        orderByStr: this.orderByStr,
-                    }
+                    data: data
                 }).then(res => {
                     if (res.success) {
                         this.totalNumber = res.data.page.totalNumber;
@@ -285,6 +310,10 @@
                 var row = this.tableColumns.find(i => i.value === column);
                 return row ? row.show : false;
             },
+            isModulesShow(column) {
+                var row = this.modules.find(i => i === column);
+                return row ? true : false;
+            },
             toggleMultipleMode(multipleMode) {
                 this.multipleMode = multipleMode;
                 if (!multipleMode) {
@@ -292,12 +321,20 @@
                 }
             },
             editRow(row) {
-                this.$router.push({
-                    path: '/testaaaone',
-                    query: {
-                        id: row.id
-                    }
-                })
+                var jsonp = { ...row }
+
+                                                                                                                                                                                                                                                                                                
+                if (this.$route.query.column) {
+                    jsonp.subColumn = this.$route.query.column.split(',')[1];
+                    jsonp.subValue = this.$route.query.column.split(',')[0];
+                }
+
+                if (this.$route.query.column) {
+                    jsonp[jsonp.subColumn] = jsonp.subValue;
+                }
+
+                this.editRowInfo = jsonp
+                this.editDialogVisible = true
             },
             operation1() {
                 this.$notify({
@@ -325,23 +362,6 @@
 
                 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;
             },
@@ -360,23 +380,6 @@
 
                 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('_;');
-                    }
-                }
-
                 this.getData();
                 this.showTableSortDialog = false;
             },
@@ -422,7 +425,10 @@
                 this.imageDialogVisible = true;
             },
 
-        }
+        },
+    components: {
+        testaaaone
+    }
     }
 </script>
 <style lang="less" scoped>