编辑

src/main/resources/templates/FormTemplate.vm

@@ -2,6 +2,10 @@
     <div>
         <el-form :model="formData" :rules="rules" ref="form" label-width="120px" label-position="right" size="small"
                  style="max-width: 500px;">
+            <el-form-item>
+                <h2> ${model.remark}</h2>
+            </el-form-item>
+
             #foreach($field in $model.fields)
                 #if(${field.showInForm})
                     #if(${field.formType}=="singleLineText")

src/main/resources/templates/ListTemplate.vm

@@ -36,6 +36,7 @@
                 :height="tableHeight"
                 row-key="id"
                 ref="table">
+            <el-table-column label="${model.remark}" align="center" >
             <el-table-column
                     v-if="multipleMode"
                     align="center"
@@ -102,6 +103,7 @@
                     <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" v-if="0">

src/main/vue/src/pages/TestAaa.vue

@@ -1,78 +1,64 @@
 <template>
     <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="120px" label-position="right" size="small"
-                 style="max-width: 500px;">
-                                                                                                                                                                                                                                                                 <el-form-item prop="imageUrl" label="图片">
-                 <single-upload v-model="formData.imageUrl" :disabled="'imageUrl'==subColumn"></single-upload>
-             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                            <el-form-item prop="testName" label="枚举单选">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="120px" label-position="right" size="small" style="max-width: 500px;">
+            <!-- <el-form-item>
+                <h2> test_aaa</h2>
+            </el-form-item> -->
+
+            <el-form-item prop="imageUrl" label="图片">
+                <single-upload v-model="formData.imageUrl" :disabled="'imageUrl'==subColumn"></single-upload>
+            </el-form-item>
+            <el-form-item prop="testName" label="枚举单选">
                 <template>
-                    <el-select v-model="formData.testName" clearable  placeholder="请选择" :disabled="'testName'==subColumn">
-                        <el-option
-                                v-for="item in testNameOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                    <el-select v-model="formData.testName" clearable placeholder="请选择" :disabled="'testName'==subColumn">
+                        <el-option v-for="item in testNameOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="remark" label="接口单选">
+            <el-form-item prop="remark" label="接口单选">
                 <template>
-                    <el-select v-model="formData.remark" clearable  placeholder="请选择" :disabled="'remark'==subColumn">
-                        <el-option
-                                v-for="item in remarkOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                    <el-select v-model="formData.remark" clearable placeholder="请选择" :disabled="'remark'==subColumn">
+                        <el-option v-for="item in remarkOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <el-form-item prop="multiSelect" label="表多选">
+            <el-form-item prop="multiSelect" label="表多选">
                 <template>
                     <el-select v-model="formData.multiSelect" multiple clearable placeholder="请选择" :disabled="'multiSelect'==subColumn">
-                        <el-option
-                                v-for="item in multiSelectOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                        <el-option v-for="item in multiSelectOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                        <el-form-item prop="testTime" label="时间">
+            <el-form-item prop="testTime" label="时间">
                 <template>
                     <div class="block">
-                        <el-date-picker
-                                v-model="formData.testTime"
-                                type="date"
-                                value-format="timestamp"
-                                placeholder="选择日期"
-                                :disabled="'testTime'==subColumn">
+                        <el-date-picker v-model="formData.testTime" type="date" value-format="timestamp" placeholder="选择日期" :disabled="'testTime'==subColumn">
                         </el-date-picker>
                     </div>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <el-form-item prop="loginUser" label="登录名">
-                            <el-input v-model="formData.loginUser" disabled></el-input>
-                        </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <el-form-item prop="testcTime" label="当前时间">
-                            <el-input v-model="formData.testcTime" disabled></el-input>
-                        </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="testcDate" label="当前日期">
-                            <el-input v-model="formData.testcDate" disabled></el-input>
-                        </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="workNumber" label="工号">
-                            <el-input v-model="formData.workNumber" disabled></el-input>
-                        </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="departId" label="部门">
-                            <el-input v-model="formData.departId" disabled></el-input>
-                        </el-form-item>
-                                                                                                    <el-form-item>
+            <el-form-item prop="loginUser" label="登录名">
+                <el-input v-model="formData.loginUser" disabled></el-input>
+            </el-form-item>
+            <el-form-item prop="testcTime" label="当前时间">
+                <el-input v-model="formData.testcTime" disabled></el-input>
+            </el-form-item>
+            <el-form-item prop="testcDate" label="当前日期">
+                <el-input v-model="formData.testcDate" disabled></el-input>
+            </el-form-item>
+            <el-form-item prop="workNumber" label="工号">
+                <el-input v-model="formData.workNumber" disabled></el-input>
+            </el-form-item>
+            <el-form-item prop="departId" label="部门">
+                <el-input v-model="formData.departId" disabled></el-input>
+            </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="changeEditDialogVisible(false)">取消</el-button>
             </el-form-item>
         </el-form>
     </div>
@@ -84,6 +70,18 @@ import { format } from 'date-fns'
 import zh from 'date-fns/locale/zh_cn'
 
 export default {
+    props:{
+        formData:{
+            type:Object,
+            default:{
+                loginUser: '',
+                testcTime: format(new Date(), 'YYYY/MM/DD HH:mm', { locale: zh }),
+                testcDate: format(new Date(), 'YYYY/MM/DD', { locale: zh }),
+                workNumber: '',
+                departId: '',
+            }
+        }
+    },
     created() {
 
         if (this.$route.query.column) {
@@ -91,211 +89,218 @@ export default {
             this.subValue = this.$route.query.column.split(',')[0];
         }
 
-        if (this.$route.query.id) {
-            this.$http.get({
-                url: '/testAaa/getOne',
-                data: {
-                    id: this.$route.query.id
-                }
-            }).then(res => {
-                if (res.success) {
+          if (this.$route.query.column) {
+                this.formData[this.subColumn] = this.subValue;
+            }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                        if(res.data.multiSelect){
-                            res.data.multiSelect = res.data.multiSelect.split(',');
-                        }else{
-                            res.data.multiSelect = [];
-                        }
+        // if (this.$route.query.id) {
+        //     this.$http.get({
+        //         url: '/testAaa/getOne',
+        //         data: {
+        //             id: this.$route.query.id
+        //         }
+        //     }).then(res => {
+        //         if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                            res.data.loginUser = this.userInfo.username;
 
-                                                                                                                                                res.data.testcTime = format(new Date(), 'YYYY/MM/DD HH:mm', { locale: zh });
+        //             if (res.data.multiSelect) {
+        //                 res.data.multiSelect = res.data.multiSelect.split(',');
+        //             } else {
+        //                 res.data.multiSelect = [];
+        //             }
 
-                                                                                                                                                                                                            res.data.testcDate = format(new Date(), 'YYYY/MM/DD', { locale: zh });
+        //             res.data.loginUser = this.userInfo.username;
 
-                                                                                                                                                                                                                                res.data.workNumber = this.userInfo.workNumber;
+        //             res.data.testcTime = format(new Date(), 'YYYY/MM/DD HH:mm', { locale: zh });
 
-                                                                                                                                                                                                            res.data.departId = this.userInfo.departId;
+        //             res.data.testcDate = format(new Date(), 'YYYY/MM/DD', { locale: zh });
 
-                                    
-                this.formData = res.data;
+        //             res.data.workNumber = this.userInfo.workNumber;
+
+        //             res.data.departId = this.userInfo.departId;
+
+
+        //             this.formData = res.data;
+
+        //             if (this.$route.query.column) {
+        //                 this.formData[this.subColumn] = this.subValue;
+        //             }
+        //         }
+        //     })
+        // } else {
+        //     if (this.$route.query.column) {
+        //         this.formData[this.subColumn] = this.subValue;
+        //     }
+        // }
 
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
-                }
-            }
-        })
-        }else {
-            if (this.$route.query.column) {
-                this.formData[this.subColumn] = this.subValue;
-            }
-        }
 
-                                                                                                                                                                                                                                                                                                
 
 
-                    this.$http.get({
-                        url:'/testBbb/all'
-                    }).then(res => {
-                        if (res.success) {
+        this.$http.get({
+            url: '/testBbb/all'
+        }).then(res => {
+            if (res.success) {
 
-                    if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                            this.remarkOptions.push({label: item.nameAaa, value:item.nameBbb});
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.remarkOptions.push({ label: item.nameAaa, value: item.nameBbb });
                     })
-                    }
                 }
-                });
-                                                                                                                        this.$http.get({
-                        url:'/commonQuery/all',
-                        data: {
-                            tableName: 'test_bbb',
-                            databasetype: 'Mysql',
-                            dataSourceCode: 'dataSource',
-                        }
-                    }).then(res => {
-                        if (res.success) {
+            }
+        });
+        this.$http.get({
+            url: '/commonQuery/all',
+            data: {
+                tableName: 'test_bbb',
+                databasetype: 'Mysql',
+                dataSourceCode: 'dataSource',
+            }
+        }).then(res => {
+            if (res.success) {
 
-                    if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                            this.multiSelectOptions.push({label: item.name_bbb, value:item.name_ccc});
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.multiSelectOptions.push({ label: item.name_bbb, value: item.name_ccc });
                     })
-                    }
                 }
-                });
-                                                                                                                                                                        this.formData.loginUser = this.userInfo.username;
-                                                                                                                                                                                                                this.formData.workNumber = this.userInfo.workNumber;
-                                                                                                this.formData.departId = this.userInfo.departId;
-                        },
+            }
+        });
+        this.formData.loginUser = this.userInfo.username;
+        this.formData.workNumber = this.userInfo.workNumber;
+        this.formData.departId = this.userInfo.departId;
+    },
     data() {
         return {
             saving: false,
-            formData: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                loginUser:'',
-                                                                                                                                    testcTime:format(new Date(), 'YYYY/MM/DD HH:mm', { locale: zh }),
-                                                                                                            testcDate:format(new Date(), 'YYYY/MM/DD', { locale: zh }),
-                                                            workNumber:'',
-                                                                                                            departId:'',
-                                                },
-        rules: {
-                                                                                                                                    testName:
-                [
-                                            {required: true, message: '请输入 枚举单选', trigger: 'blur'},
-                                                        ],
-                                                                remark:
-                [
-                                            {required: true, message: '请输入 接口单选', trigger: 'blur'},
-                                                        ],
-                                                                multiSelect:
-                [
-                                            {required: true, message: '请输入 表多选', trigger: 'blur'},
-                                                        ],
-                                                                                                                                                                                                            },
-                                                                                                                            testNameOptions:[{ label: 'A', value: 'A' }, { label: 'B', value: 'B' },{ label: 'C', value: 'C' }],
-                                                                                    remarkOptions:[],
-                                                                                    multiSelectOptions:[],
-                                                                                                                                                                    subColumn: '',
-                subValue: '',
-    }
+            // formData: {
+            //     loginUser: '',
+            //     testcTime: format(new Date(), 'YYYY/MM/DD HH:mm', { locale: zh }),
+            //     testcDate: format(new Date(), 'YYYY/MM/DD', { locale: zh }),
+            //     workNumber: '',
+            //     departId: '',
+            // },
+            rules: {
+                testName:
+                    [
+                        { required: true, message: '请输入 枚举单选', trigger: 'blur' },
+                    ],
+                remark:
+                    [
+                        { required: true, message: '请输入 接口单选', trigger: 'blur' },
+                    ],
+                multiSelect:
+                    [
+                        { required: true, message: '请输入 表多选', trigger: 'blur' },
+                    ],
+            },
+            testNameOptions: [{ label: 'A', value: 'A' }, { label: 'B', value: 'B' }, { label: 'C', value: 'C' }],
+            remarkOptions: [],
+            multiSelectOptions: [],
+            subColumn: '',
+            subValue: '',
+        }
     },
     computed: {
-            ...mapState(['userInfo']),
-},
-methods: {
-    onSave() {
-        this.$refs.form.validate((valid) => {
-            if (valid) {
-                this.logicalValidate();
-            } else {
-                return false;
-    }
-    });
+        ...mapState(['userInfo']),
     },
-    logicalValidate() {
-        var data = JSON.parse(JSON.stringify(this.formData));
-
-        var logicalData = {
-                                                                                                testName:data.testName,
-                                                remark:data.remark,
-                                                                                                                                                                    }
-
-        if (JSON.stringify(logicalData) == '{}') {
-            this.submit();
-        } else {
-            this.$http.get({
-                url: '/testAaa/getOne',
-                data: logicalData
-            }).then(res => {
-                if (res.success) {
+    methods: {
+        changeEditDialogVisible(value){
+            this.$emit('changeEditDialogVisible',value)
+        },
+        onSave() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.logicalValidate();
+                } else {
+                    return false;
+                }
+            });
+        },
+        logicalValidate() {
+            var data = JSON.parse(JSON.stringify(this.formData));
+
+            var logicalData = {
+                testName: data.testName,
+                remark: data.remark,
+            }
+
+            if (JSON.stringify(logicalData) == '{}') {
+                this.submit();
+            } else {
+                this.$http.get({
+                    url: '/testAaa/getOne',
+                    data: logicalData
+                }).then(res => {
+                    if (res.success) {
+
+                        var logicalFlag = true;
 
-                var logicalFlag = true;
+                        if (res.data) {
+                            if (this.formData.id) {
+                                if (res.data.id != this.formData.id) {
+                                    logicalFlag = false;
+                                }
+                            } else {
+                                logicalFlag = false;
+                            }
 
-                if (res.data) {
-                    if (this.formData.id) {
-                        if (res.data.id != this.formData.id) {
-                            logicalFlag = false;
                         }
-                    } else {
-                        logicalFlag = false;
-                    }
 
-                }
+                        if (logicalFlag) {
+                            this.submit();
+                        } else {
+                            this.$message.warning('逻辑关键字:' + '枚举单选,接口单选,' + '验证失败')
+                        }
 
-                if (logicalFlag) {
-                    this.submit();
-                } else {
-                    this.$message.warning('逻辑关键字:'+'枚举单选,接口单选,'+'验证失败')
-                }
 
+                    } else {
+                        this.$message.warning('逻辑关键字:' + '枚举单选,接口单选,' + '验证失败')
+                    }
+                });
+            }
+        },
+        submit() {
+            var data = JSON.parse(JSON.stringify(this.formData));
 
-            } else {
-                this.$message.warning('逻辑关键字:'+'枚举单选,接口单选,'+'验证失败')
+            if (data.testcTime) {
+                data.testcTime = Date.parse(new Date(data.testcTime));
             }
-        });
-        }
-    },
-    submit() {
-        var data = JSON.parse(JSON.stringify(this.formData));
 
-                                                                                                                                                                                                    if(data.testcTime){
-                    data.testcTime = Date.parse(new Date(data.testcTime));
-                }
+            if (data.testcDate) {
+                data.testcDate = Date.parse(new Date(data.testcDate));
+            }
 
-                                                if(data.testcDate){
-                    data.testcDate = Date.parse(new Date(data.testcDate));
-                }
 
-                                                            
-    this.$http.post({
-        url: this.formData.id ? '/testAaa/update' : '/testAaa/save',
-        data: data
-    }).then(res => {
-        if (res.success) {
-            this.$message.success('成功');
-            this.$router.go(-1);
-        } else {
-            this.$message.warning('失败')
-        }
-    });
-    },
-    onDelete() {
-        this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-            return this.$http.post({
-                url: '/testAaa/del',
-                data: { id: this.formData.id }
+            this.$http.post({
+                url: this.formData.id ? '/testAaa/update' : '/testAaa/save',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                } else {
+                    this.$message.warning('失败')
+                }
+            });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/testAaa/del',
+                    data: { id: this.formData.id }
+                })
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.$router.go(-1);
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
             })
-        }).then(() => {
-            this.$message.success('删除成功');
-        this.$router.go(-1);
-    }).catch(action => {
-            if (action === 'cancel') {
-            this.$message.info('删除取消');
-        } else {
-            this.$message.error('删除失败');
-        }
-    })
-    },
-}
+        },
+    }
 }
 </script>
 <style lang="less" scoped>

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

@@ -1,25 +1,22 @@
 <template>
     <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-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
+            <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 @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="$router.push({path:'/testAaa',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
+            <el-button @click="$router.push({path:'/testAaa',query:{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>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
                     <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
@@ -27,118 +24,57 @@
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
-        <el-table
-                :data="tableData"
-                :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>
-                            
-                                            <el-table-column
-                                v-if="isColumnShow('id')"
-                                prop="id"
-                                label="id"
-                                min-width="100">
-                        </el-table-column>
-                                                                                            
-                                            <el-table-column
-                                v-if="isColumnShow('imageUrl')"
-                                prop="imageUrl"
-                                label="图片"
-                                min-width="100">
-                            <template slot-scope="{row}">
-                                <img :src="row.imageUrl" @click="showImg(row.imageUrl)" style="width: 100px;height: 100px;vertical-align: middle;" />
-                            </template>
-
-                        </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
-                                v-if="isColumnShow('multiSelect')"
-                                prop="multiSelect"
-                                label="表多选"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('testTime')"
-                                prop="testTime"
-                                label="时间"
-                                :formatter="DateFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('loginUser')"
-                                prop="loginUser"
-                                label="登录名"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('testcTime')"
-                                prop="testcTime"
-                                label="当前时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('testcDate')"
-                                prop="testcDate"
-                                label="当前日期"
-                                :formatter="DateFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('workNumber')"
-                                prop="workNumber"
-                                label="工号"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('departId')"
-                                prop="departId"
-                                label="部门"
-                                min-width="100">
-                        </el-table-column>
-                                                            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    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 @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 :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column label="test_aaa" 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>
+
+                <el-table-column v-if="isColumnShow('id')" prop="id" label="id" min-width="100">
+                </el-table-column>
+
+                <el-table-column v-if="isColumnShow('imageUrl')" prop="imageUrl" label="图片" min-width="100">
+                    <template slot-scope="{row}">
+                        <img :src="row.imageUrl" @click="showImg(row.imageUrl)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                    </template>
+
+                </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 v-if="isColumnShow('multiSelect')" prop="multiSelect" label="表多选" min-width="100">
+                </el-table-column>
+
+                <el-table-column v-if="isColumnShow('testTime')" prop="testTime" label="时间" :formatter="DateFormatter" min-width="100">
+                </el-table-column>
+
+                <el-table-column v-if="isColumnShow('loginUser')" prop="loginUser" label="登录名" min-width="100">
+                </el-table-column>
+
+                <el-table-column v-if="isColumnShow('testcTime')" prop="testcTime" label="当前时间" :formatter="DateTimeFormatter" min-width="100">
+                </el-table-column>
+
+                <el-table-column v-if="isColumnShow('testcDate')" prop="testcDate" label="当前日期" :formatter="DateFormatter" min-width="100">
+                </el-table-column>
+
+                <el-table-column v-if="isColumnShow('workNumber')" prop="workNumber" label="工号" min-width="100">
+                </el-table-column>
+
+                <el-table-column v-if="isColumnShow('departId')" prop="departId" label="部门" min-width="100">
+                </el-table-column>
+                <el-table-column label="操作" align="center" fixed="right" 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 @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">
@@ -150,15 +86,7 @@
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
-            <el-pagination
-                    background
-                    @size-change="pageSizeChange"
-                    @current-change="currentPageChange"
-                    :current-page="currentPage"
-                    :page-sizes="[10, 20, 30, 40, 50]"
-                    :page-size="pageSize"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    :total="totalNumber">
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
             </el-pagination>
         </div>
         <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
@@ -179,16 +107,14 @@
                     <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-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-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -218,8 +144,7 @@
                     <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-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -249,328 +174,352 @@
         <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
             <img width="100%" :src="imgSrc" alt="">
         </el-dialog>
+        <el-dialog title="编辑test_aaa" top='10px' :visible.sync="editDialogVisible">
+            <testAaa :formData='editRowInfo' @changeEditDialogVisible='changeEditDialogVisible'></testAaa>
+        </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() {
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+import testAaa from '../pages/TestAaa'
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            editRowInfo: {
+                loginUser: '',
+                testcTime: format(new Date(), 'YYYY/MM/DD HH:mm', { locale: zh }),
+                testcDate: format(new Date(), 'YYYY/MM/DD', { locale: zh }),
+                workNumber: '',
+                departId: '',
+            },
+            editDialogVisible: false,
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: 'id',
+                    value: 'id',
+                    show: true
+                },
+                {
+                    label: '图片',
+                    value: 'imageUrl',
+                    show: true
+                },
+                {
+                    label: '枚举单选',
+                    value: 'testName',
+                    show: true
+                },
+                {
+                    label: '接口单选',
+                    value: 'remark',
+                    show: true
+                },
+                {
+                    label: '表多选',
+                    value: 'multiSelect',
+                    show: true
+                },
+                {
+                    label: '时间',
+                    value: 'testTime',
+                    show: true
+                },
+                {
+                    label: '登录名',
+                    value: 'loginUser',
+                    show: true
+                },
+                {
+                    label: '当前时间',
+                    value: 'testcTime',
+                    show: true
+                },
+                {
+                    label: '当前日期',
+                    value: 'testcDate',
+                    show: true
+                },
+                {
+                    label: '工号',
+                    value: 'workNumber',
+                    show: true
+                },
+                {
+                    label: '部门',
+                    value: 'departId',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'id',
+                    value: 'id'
+                },
+                {
+                    label: '图片',
+                    value: 'image_url'
+                },
+                {
+                    label: '枚举单选',
+                    value: 'test_name'
+                },
+                {
+                    label: '接口单选',
+                    value: 'remark'
+                },
+                {
+                    label: '表多选',
+                    value: 'multi_select'
+                },
+                {
+                    label: '时间',
+                    value: 'test_time'
+                },
+                {
+                    label: '登录名',
+                    value: 'login_user'
+                },
+                {
+                    label: '当前时间',
+                    value: 'testc_time'
+                },
+                {
+                    label: '当前日期',
+                    value: 'testc_date'
+                },
+                {
+                    label: '工号',
+                    value: 'work_number'
+                },
+                {
+                    label: '部门',
+                    value: 'depart_id'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        changeEditDialogVisible(value){
+            this.editDialogVisible=value
+        },
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
             this.getData();
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                        {
-                                label: 'id',
-                                value: 'id',
-                                show: true
-                            },
-                                                                                                                                            {
-                                label: '图片',
-                                value: 'imageUrl',
-                                show: true
-                            },
-                                                                                                {
-                                label: '枚举单选',
-                                value: 'testName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '接口单选',
-                                value: 'remark',
-                                show: true
-                            },
-                                                                                                {
-                                label: '表多选',
-                                value: 'multiSelect',
-                                show: true
-                            },
-                                                                                                {
-                                label: '时间',
-                                value: 'testTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '登录名',
-                                value: 'loginUser',
-                                show: true
-                            },
-                                                                                                {
-                                label: '当前时间',
-                                value: 'testcTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '当前日期',
-                                value: 'testcDate',
-                                show: true
-                            },
-                                                                                                {
-                                label: '工号',
-                                value: 'workNumber',
-                                show: true
-                            },
-                                                                                                {
-                                label: '部门',
-                                value: 'departId',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                        {
-                                label: 'id',
-                                value: 'id'
-                            },
-                                                                                                                                            {
-                                label: '图片',
-                                value: 'image_url'
-                            },
-                                                                                                {
-                                label: '枚举单选',
-                                value: 'test_name'
-                            },
-                                                                                                {
-                                label: '接口单选',
-                                value: 'remark'
-                            },
-                                                                                                {
-                                label: '表多选',
-                                value: 'multi_select'
-                            },
-                                                                                                {
-                                label: '时间',
-                                value: 'test_time'
-                            },
-                                                                                                {
-                                label: '登录名',
-                                value: 'login_user'
-                            },
-                                                                                                {
-                                label: '当前时间',
-                                value: 'testc_time'
-                            },
-                                                                                                {
-                                label: '当前日期',
-                                value: 'testc_date'
-                            },
-                                                                                                {
-                                label: '工号',
-                                value: 'work_number'
-                            },
-                                                                                                {
-                                label: '部门',
-                                value: 'depart_id'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
-            }
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
             }
-        },
-        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.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
-                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                }
+            if (this.$route.query.column) {
+                var tempColumn = this.$route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
 
-                this.$http.get({
-                    url: '/testAaa/page',
-                    data: data
-                }).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.$refs.table.clearSelection();
-                }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/testAaa',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
-                    }
-                })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            addField() {
-                this.advancedQueryFields.push({
-                    link: 'AND',
-                    name: '',
-                    searchMethod: '=',
-                    value: '',
-                });
-            },
-            removeField(i) {
-                if (this.advancedQueryFields.length > 0) {
-                    this.advancedQueryFields.splice(i, 1);
+            this.$http.get({
+                url: '/testAaa/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
                 }
-            },
-            advancedQuery() {
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            // this.$router.push({
+            //     path: '/testAaa',
+            //     query: {
+            //         id: row.id,
+            //         column: this.$route.query.column,
+            //     }
+            // })
+            var jsonp = { ...row }
+            if (jsonp.multiSelect) {
+                jsonp.multiSelect = jsonp.multiSelect.split(',');
+            } else {
+                jsonp.multiSelect = [];
+            }
+            this.editRowInfo = jsonp
+            this.editDialogVisible = true
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$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 = '';
+            this.advancedQuerySearchKey = '';
 
-                if (this.advancedQueryFields.length > 0) {
+            if (this.advancedQueryFields.length > 0) {
 
-                    var templist = [];
+                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);
-                        }
-                    })
+                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) {
+                if (templist.length > 0) {
 
-                        this.advancedQuerySearchKey = templist.join('_;');
-                    }
+                    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.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 = '';
+            this.orderByStr = '';
 
-                if (this.tableSortFields.length > 0) {
+            if (this.tableSortFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.tableSortFields.forEach(item => {
-                        if (item.name && item.order) {
-                            var tempItem = item.name + '_,' + item.order;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.orderByStr = templist.join('_;');
-                    }
+                    this.orderByStr = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/testAaa/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post({
-                        url: '/testAaa/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/testAaa/exportExcel?searchKey="
+                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/testAaa/del',
+                    data: { id: row.id }
                 })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$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})
-                }
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
 
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
 
-        }
+    },
+    components: {
+        testAaa
     }
+}
 </script>
 <style lang="less" scoped>
-
 </style>