wangqifan 2 жил өмнө
parent
commit
bb4f519cf8

+ 3 - 5
src/main/vue/src/components/roomStatus/RoomDrawer.vue

@@ -85,9 +85,7 @@
                 ></bed-info>
             </div>
             <div class="drawer-btn-list" v-if="selectedBedInfo" @click.stop @contextmenu.prevent="$refs.menu.open">
-                <el-button class="filter-btn" type="primary" round plain @click="showBedInfo = true"
-                    >详情</el-button
-                >
+                <el-button class="filter-btn" type="primary" round plain @click="showBedInfo = true">详情</el-button>
 
                 <el-button
                     class="filter-btn"
@@ -149,7 +147,7 @@
                         <div class="value">1468.7</div>
                     </div>
                     <div class="col">
-                        <div class="label">电价:  暂无</div>
+                        <div class="label">电价: 暂无</div>
                         <div class="value">1元/度</div>
                     </div>
                 </div>
@@ -246,7 +244,7 @@ export default {
             makeCardDialogVisible: false,
             makeCardForm: {},
             makeCardFormRule: {
-                room: { required: true, message: '请输入开卡参数' },
+                room: { required: true, message: '请输入开卡参数' }
             },
             makeCardLoading: false
         };

+ 31 - 27
src/main/vue/src/router.js

@@ -2035,73 +2035,77 @@ const router = new Router({
                     name: 'CompanyEdit',
                     component: () => import(/* webpackChunkName: "companyEdit" */ '@/views/CompanyEdit.vue'),
                     meta: {
-                       title: 'Company编辑',
-                    },
+                        title: 'Company编辑'
+                    }
                 },
                 {
                     path: '/companyList',
                     name: 'CompanyList',
                     component: () => import(/* webpackChunkName: "companyList" */ '@/views/CompanyList.vue'),
                     meta: {
-                       title: 'Company',
-                    },
-               },
+                        title: 'Company'
+                    }
+                },
                 {
                     path: '/balanceRecord',
                     name: 'BalanceRecord',
                     component: () => import(/* webpackChunkName: "balanceRecord" */ '@/views/Report/BalanceRecord.vue'),
                     meta: {
-                        title: 'Company',
-                    },
+                        title: 'Company'
+                    }
                 },
                 {
                     path: '/clientStoreInfoEdit',
                     name: 'ClientStoreInfoEdit',
-                    component: () => import(/* webpackChunkName: "clientStoreInfoEdit" */ '@/views/ClientStoreInfoEdit.vue'),
+                    component: () =>
+                        import(/* webpackChunkName: "clientStoreInfoEdit" */ '@/views/ClientStoreInfoEdit.vue'),
                     meta: {
-                       title: '小程序门店编辑',
-                    },
+                        title: '小程序门店编辑'
+                    }
                 },
                 {
                     path: '/clientStoreInfoList',
                     name: 'ClientStoreInfoList',
-                    component: () => import(/* webpackChunkName: "clientStoreInfoList" */ '@/views/ClientStoreInfoList.vue'),
+                    component: () =>
+                        import(/* webpackChunkName: "clientStoreInfoList" */ '@/views/ClientStoreInfoList.vue'),
                     meta: {
-                       title: '小程序门店',
-                    },
-               },
+                        title: '小程序门店'
+                    }
+                },
                 {
                     path: '/clientStoreInfoEdit',
                     name: 'ClientStoreInfoEdit',
-                    component: () => import(/* webpackChunkName: "clientStoreInfoEdit" */ '@/views/ClientStoreInfoEdit.vue'),
+                    component: () =>
+                        import(/* webpackChunkName: "clientStoreInfoEdit" */ '@/views/ClientStoreInfoEdit.vue'),
                     meta: {
-                       title: '门店列表编辑',
-                    },
+                        title: '门店列表编辑'
+                    }
                 },
                 {
                     path: '/clientStoreInfoList',
                     name: 'ClientStoreInfoList',
-                    component: () => import(/* webpackChunkName: "clientStoreInfoList" */ '@/views/ClientStoreInfoList.vue'),
+                    component: () =>
+                        import(/* webpackChunkName: "clientStoreInfoList" */ '@/views/ClientStoreInfoList.vue'),
                     meta: {
-                       title: '门店列表',
-                    },
-               },
+                        title: '门店列表'
+                    }
+                },
                 {
                     path: '/bannerEdit',
                     name: 'BannerEdit',
                     component: () => import(/* webpackChunkName: "bannerEdit" */ '@/views/BannerEdit.vue'),
                     meta: {
-                       title: 'banner条编辑',
-                    },
+                        title: 'banner条编辑'
+                    }
                 },
                 {
                     path: '/bannerList',
                     name: 'BannerList',
                     component: () => import(/* webpackChunkName: "bannerList" */ '@/views/BannerList.vue'),
                     meta: {
-                       title: 'banner条',
-                    },
-               }
+                        title: 'banner条'
+                    }
+                }
                 /**INSERT_LOCATION**/
             ]
         },
@@ -2161,4 +2165,4 @@ router.beforeEach((to, from, next) => {
     }
 });
 
-export default router;
+export default router;

+ 5 - 5
src/main/vue/src/views/Admin.vue

@@ -573,7 +573,7 @@ export default {
 .header {
     color: #fff;
     // background: #242744;
-    background: #00BEB4;
+    background: #00beb4;
     display: flex;
     align-items: center;
     padding-left: 0;
@@ -774,16 +774,16 @@ export default {
     flex-grow: 1;
     flex-basis: 0;
     overflow-y: scroll;
-    background: #00BEB4 !important;
+    background: #00beb4 !important;
     .el-submenu__title {
-        background: #00BEB4 !important;
+        background: #00beb4 !important;
     }
     .el-menu {
         border-bottom: none;
         .el-menu-item {
-            background: #00BEB4 !important;
+            background: #00beb4 !important;
             &.is-active {
-                background: #0096B4 !important;
+                background: #0096b4 !important;
                 color: #4dcc6f !important;
                 position: relative;
                 &::before {

+ 88 - 83
src/main/vue/src/views/BannerEdit.vue

@@ -1,30 +1,36 @@
 <template>
     <div class="edit-view">
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
-                 style="max-width: 500px;">
-                <el-form-item prop="name" label="名称">
-                            <el-input v-model="formData.name"></el-input>
-                </el-form-item>
-                <el-form-item prop="pic" label="图片">
-                            <single-upload v-model="formData.pic"></single-upload>
-                </el-form-item>
-                <el-form-item prop="remark" label="备注">
-                            <el-input v-model="formData.remark"></el-input>
-                </el-form-item>
-                <el-form-item prop="sort" label="排序">
-                            <el-input-number type="number" v-model="formData.sort"></el-input-number>
-                </el-form-item>
-                <el-form-item prop="link" label="跳转">
-                            <el-switch v-model="formData.link"></el-switch>
-                </el-form-item>
-                <el-form-item prop="linkContent" label="跳转内容">
-                            <el-input v-model="formData.linkContent"></el-input>
-                </el-form-item>
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="80px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="name" label="名称">
+                <el-input v-model="formData.name"></el-input>
+            </el-form-item>
+            <el-form-item prop="pic" label="图片">
+                <single-upload v-model="formData.pic"></single-upload>
+            </el-form-item>
+            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark"></el-input>
+            </el-form-item>
+            <el-form-item prop="sort" label="排序">
+                <el-input-number type="number" v-model="formData.sort"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="link" label="跳转">
+                <el-switch v-model="formData.link"></el-switch>
+            </el-form-item>
+            <el-form-item prop="linkContent" label="跳转内容">
+                <el-input v-model="formData.linkContent"></el-input>
+            </el-form-item>
             <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData"
-                           type="primary">保存</el-button>
-                <el-button @click="onDelete" :loading="$store.state.fetchingData"
-                           type="danger" v-if="formData.id">删除
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="$store.state.fetchingData" type="danger" v-if="formData.id"
+                    >删除
                 </el-button>
                 <el-button @click="$router.go(-1)">取消</el-button>
             </el-form-item>
@@ -32,73 +38,72 @@
     </div>
 </template>
 <script>
-    export default {
-        name: 'BannerEdit',
-        created() {
-            if (this.$route.query.id) {
-                this.$http
-                    .get('banner/get/'+this.$route.query.id)
-                    .then(res => {
-                        this.formData = res;
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.$message.error(e.error);
-                    });
-            }
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {
-                },
-                rules: {
-                },
-            }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
+export default {
+    name: 'BannerEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('banner/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
                 });
-            },
-            submit() {
-                let data = {...this.formData};
-
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {}
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
 
-                this.$store.commit('updateFetchingData', true);
-                this.$http
-                    .post('/banner/save', data, {body: 'json'})
-                    .then(res => {
-                        this.$store.commit('updateFetchingData', false);
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    })
-                    .catch(e => {
-                        this.$store.commit('updateFetchingData', false);
-                        console.log(e);
-                        this.$message.error(e.error);
-                    });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/banner/del/${this.formData.id}`)
-                }).then(() => {
+            this.$store.commit('updateFetchingData', true);
+            this.$http
+                .post('/banner/save', data, { body: 'json' })
+                .then(res => {
+                    this.$store.commit('updateFetchingData', false);
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    this.$store.commit('updateFetchingData', false);
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/banner/del/${this.formData.id}`);
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.$router.go(-1);
-                }).catch(e => {
+                })
+                .catch(e => {
                     if (e !== 'cancel') {
                         console.log(e);
                         this.$message.error(e.error);
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

+ 139 - 144
src/main/vue/src/views/BannerList.vue

@@ -1,61 +1,53 @@
 <template>
-    <div  class="list-view">
+    <div class="list-view">
         <div class="filters-container">
-            <el-input placeholder="输入关键字" v-model="search" clearable
-                      class="filter-item"></el-input>
-            <el-button @click="getData" type="primary" icon="el-icon-search"
-                       class="filter-item">搜索
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" v-if="canEdit" type="primary" icon="el-icon-plus" class="filter-item"
+                >添加
             </el-button>
-            <el-button @click="addRow" v-if="canEdit" type="primary" icon="el-icon-plus"
-                       class="filter-item">添加
-            </el-button>
-            <el-button @click="download" type="primary" icon="el-icon-download"
-                       :loading="downloading" class="filter-item">导出EXCEL
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
             </el-button>
         </div>
-        <el-table :data="tableData" row-key="id" ref="table"
-                  header-row-class-name="table-header-row"
-                  header-cell-class-name="table-header-cell"
-                  row-class-name="table-row" cell-class-name="table-cell"
-                  :height="tableHeight">
-            <el-table-column v-if="multipleMode" align="center" type="selection"
-                             width="50">
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="name" label="名称"> </el-table-column>
+            <el-table-column prop="pic" label="图片">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.pic"
+                        fit="cover"
+                        :preview-src-list="[row.pic]"
+                    ></el-image>
+                </template>
             </el-table-column>
-            <el-table-column prop="id" label="ID" width="100">
+            <el-table-column prop="remark" label="备注"> </el-table-column>
+            <el-table-column prop="sort" label="排序"> </el-table-column>
+            <el-table-column prop="link" label="跳转">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.link ? '' : 'info'">{{ row.link }}</el-tag>
+                </template>
             </el-table-column>
-                                <el-table-column prop="name" label="名称"
->
-                    </el-table-column>
-                    <el-table-column prop="pic" label="图片"
->
-                            <template slot-scope="{row}">
-                                <el-image style="width: 30px; height: 30px"
-                                          :src="row.pic" fit="cover"
-                                          :preview-src-list="[row.pic]"></el-image>
-                            </template>
-                    </el-table-column>
-                    <el-table-column prop="remark" label="备注"
->
-                    </el-table-column>
-                    <el-table-column prop="sort" label="排序"
->
-                    </el-table-column>
-                    <el-table-column prop="link" label="跳转"
->
-                            <template slot-scope="{row}">
-                                <el-tag :type="row.link?'':'info'">{{row.link}}</el-tag>
-                            </template>
-                    </el-table-column>
-                    <el-table-column prop="linkContent" label="跳转内容"
->
-                    </el-table-column>
-            <el-table-column
-                    label="操作"
-                    v-if="canEdit"
-                    align="center"
-                    fixed="right"
-                    min-width="150">
-                <template slot-scope="{row}">
+            <el-table-column prop="linkContent" label="跳转内容"> </el-table-column>
+            <el-table-column label="操作" v-if="canEdit" align="center" fixed="right" min-width="150">
+                <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
@@ -70,119 +62,122 @@
                     <el-button @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div> -->
-            <el-pagination background @size-change="onSizeChange"
-                           @current-change="onCurrentChange" :current-page="page"
-                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="totalElements">
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
             </el-pagination>
         </div>
-
     </div>
 </template>
 <script>
-    import { mapState } from "vuex";
-    import pageableTable from "@/mixins/pageableTable";
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
 
-    export default {
-        name: 'BannerList',
-        mixins: [pageableTable],
-        created() {
-            this.getData();
-        },
-        data() {
-            return {
-                multipleMode: false,
-                search: "",
-                url: "/banner/all",
-                downloading: false,
+export default {
+    name: 'BannerList',
+    mixins: [pageableTable],
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/banner/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            if (this.search) {
+                return { search: this.search };
             }
         },
-        computed: {
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
             }
         },
-        methods: {
-            beforeGetData() {
-                if (this.search) {
-                    return { search: this.search };
-                }
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
-                }
-            },
-            addRow() {
-                this.$router.push({
-                    path: "/bannerEdit",
-                    query: {
+        addRow() {
+            this.$router.push({
+                path: '/bannerEdit',
+                query: {
                     ...this.$route.query
-                    }
-                });
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: "/bannerEdit",
-                    query: {
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/bannerEdit',
+                query: {
                     id: row.id
-                    }
-                });
-            },
-            download() {
-                this.downloading = true;
-                this.$axios
-                    .get("/banner/excel", {
-                        responseType: "blob",
-                        params: { size: 10000 }
-                    })
-                    .then(res => {
-                        console.log(res);
-                        this.downloading = false;
-                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
-                        const link = document.createElement("a");
-                        link.href = downloadUrl;
-                        link.setAttribute(
-                            "download",
-                            res.headers["content-disposition"].split("filename=")[1]
-                        );
-                        document.body.appendChild(link);
-                        link.click();
-                        link.remove();
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.downloading = false;
-                        this.$message.error(e.error);
-                    });
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/banner/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
                 });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/banner/del/${row.id}`)
-                }).then(() => {
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/banner/del/${row.id}`);
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.getData();
-                }).catch(action => {
+                })
+                .catch(action => {
                     if (action === 'cancel') {
                         this.$message.info('删除取消');
                     } else {
                         this.$message.error('删除失败');
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

+ 88 - 83
src/main/vue/src/views/ClientStoreInfoEdit.vue

@@ -1,30 +1,36 @@
 <template>
     <div class="edit-view">
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
-                 style="max-width: 500px;">
-                <el-form-item prop="storeName" label="门店名称">
-                            <el-input v-model="formData.storeName"></el-input>
-                </el-form-item>
-                <el-form-item prop="shortName" label="门店简称">
-                            <el-input v-model="formData.shortName"></el-input>
-                </el-form-item>
-                <el-form-item prop="phone" label="手机号">
-                            <el-input v-model="formData.phone"></el-input>
-                </el-form-item>
-                <el-form-item prop="address" label="地址">
-                            <el-input v-model="formData.address"></el-input>
-                </el-form-item>
-                <el-form-item prop="money" label="价格">
-                            <el-input-number type="number" v-model="formData.money"></el-input-number>
-                </el-form-item>
-                <el-form-item prop="pic" label="图片">
-                            <single-upload v-model="formData.pic"></single-upload>
-                </el-form-item>
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="80px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="storeName" label="门店名称">
+                <el-input v-model="formData.storeName"></el-input>
+            </el-form-item>
+            <el-form-item prop="shortName" label="门店简称">
+                <el-input v-model="formData.shortName"></el-input>
+            </el-form-item>
+            <el-form-item prop="phone" label="手机号">
+                <el-input v-model="formData.phone"></el-input>
+            </el-form-item>
+            <el-form-item prop="address" label="地址">
+                <el-input v-model="formData.address"></el-input>
+            </el-form-item>
+            <el-form-item prop="money" label="价格">
+                <el-input-number type="number" v-model="formData.money"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="pic" label="图片">
+                <single-upload v-model="formData.pic"></single-upload>
+            </el-form-item>
             <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData"
-                           type="primary">保存</el-button>
-                <el-button @click="onDelete" :loading="$store.state.fetchingData"
-                           type="danger" v-if="formData.id">删除
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="$store.state.fetchingData" type="danger" v-if="formData.id"
+                    >删除
                 </el-button>
                 <el-button @click="$router.go(-1)">取消</el-button>
             </el-form-item>
@@ -32,73 +38,72 @@
     </div>
 </template>
 <script>
-    export default {
-        name: 'ClientStoreInfoEdit',
-        created() {
-            if (this.$route.query.id) {
-                this.$http
-                    .get('clientStoreInfo/get/'+this.$route.query.id)
-                    .then(res => {
-                        this.formData = res;
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.$message.error(e.error);
-                    });
-            }
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {
-                },
-                rules: {
-                },
-            }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
+export default {
+    name: 'ClientStoreInfoEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('clientStoreInfo/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
                 });
-            },
-            submit() {
-                let data = {...this.formData};
-
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {}
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
 
-                this.$store.commit('updateFetchingData', true);
-                this.$http
-                    .post('/clientStoreInfo/save', data, {body: 'json'})
-                    .then(res => {
-                        this.$store.commit('updateFetchingData', false);
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    })
-                    .catch(e => {
-                        this.$store.commit('updateFetchingData', false);
-                        console.log(e);
-                        this.$message.error(e.error);
-                    });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/clientStoreInfo/del/${this.formData.id}`)
-                }).then(() => {
+            this.$store.commit('updateFetchingData', true);
+            this.$http
+                .post('/clientStoreInfo/save', data, { body: 'json' })
+                .then(res => {
+                    this.$store.commit('updateFetchingData', false);
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    this.$store.commit('updateFetchingData', false);
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/clientStoreInfo/del/${this.formData.id}`);
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.$router.go(-1);
-                }).catch(e => {
+                })
+                .catch(e => {
                     if (e !== 'cancel') {
                         console.log(e);
                         this.$message.error(e.error);
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

+ 136 - 142
src/main/vue/src/views/ClientStoreInfoList.vue

@@ -1,58 +1,49 @@
 <template>
-    <div  class="list-view">
+    <div class="list-view">
         <div class="filters-container">
-            <el-input placeholder="输入关键字" v-model="search" clearable
-                      class="filter-item"></el-input>
-            <el-button @click="getData" type="primary" icon="el-icon-search"
-                       class="filter-item">搜索
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" v-if="canEdit" type="primary" icon="el-icon-plus" class="filter-item"
+                >添加
             </el-button>
-            <el-button @click="addRow" v-if="canEdit" type="primary" icon="el-icon-plus"
-                       class="filter-item">添加
-            </el-button>
-            <el-button @click="download" type="primary" icon="el-icon-download"
-                       :loading="downloading" class="filter-item">导出EXCEL
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
             </el-button>
         </div>
-        <el-table :data="tableData" row-key="id" ref="table"
-                  header-row-class-name="table-header-row"
-                  header-cell-class-name="table-header-cell"
-                  row-class-name="table-row" cell-class-name="table-cell"
-                  :height="tableHeight">
-            <el-table-column v-if="multipleMode" align="center" type="selection"
-                             width="50">
-            </el-table-column>
-            <el-table-column prop="id" label="ID" width="100">
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="storeName" label="门店名称"> </el-table-column>
+            <el-table-column prop="shortName" label="门店简称"> </el-table-column>
+            <el-table-column prop="phone" label="手机号"> </el-table-column>
+            <el-table-column prop="address" label="地址"> </el-table-column>
+            <el-table-column prop="money" label="价格"> </el-table-column>
+            <el-table-column prop="pic" label="图片">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.pic"
+                        fit="cover"
+                        :preview-src-list="[row.pic]"
+                    ></el-image>
+                </template>
             </el-table-column>
-                                <el-table-column prop="storeName" label="门店名称"
->
-                    </el-table-column>
-                    <el-table-column prop="shortName" label="门店简称"
->
-                    </el-table-column>
-                    <el-table-column prop="phone" label="手机号"
->
-                    </el-table-column>
-                    <el-table-column prop="address" label="地址"
->
-                    </el-table-column>
-                    <el-table-column prop="money" label="价格"
->
-                    </el-table-column>
-                    <el-table-column prop="pic" label="图片"
->
-                            <template slot-scope="{row}">
-                                <el-image style="width: 30px; height: 30px"
-                                          :src="row.pic" fit="cover"
-                                          :preview-src-list="[row.pic]"></el-image>
-                            </template>
-                    </el-table-column>
-            <el-table-column
-                    label="操作"
-                    v-if="canEdit"
-                    align="center"
-                    fixed="right"
-                    min-width="150">
-                <template slot-scope="{row}">
+            <el-table-column label="操作" v-if="canEdit" align="center" fixed="right" min-width="150">
+                <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
@@ -67,119 +58,122 @@
                     <el-button @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div> -->
-            <el-pagination background @size-change="onSizeChange"
-                           @current-change="onCurrentChange" :current-page="page"
-                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="totalElements">
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
             </el-pagination>
         </div>
-
     </div>
 </template>
 <script>
-    import { mapState } from "vuex";
-    import pageableTable from "@/mixins/pageableTable";
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
 
-    export default {
-        name: 'ClientStoreInfoList',
-        mixins: [pageableTable],
-        created() {
-            this.getData();
-        },
-        data() {
-            return {
-                multipleMode: false,
-                search: "",
-                url: "/clientStoreInfo/all",
-                downloading: false,
+export default {
+    name: 'ClientStoreInfoList',
+    mixins: [pageableTable],
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/clientStoreInfo/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            if (this.search) {
+                return { search: this.search };
             }
         },
-        computed: {
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
             }
         },
-        methods: {
-            beforeGetData() {
-                if (this.search) {
-                    return { search: this.search };
-                }
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
-                }
-            },
-            addRow() {
-                this.$router.push({
-                    path: "/clientStoreInfoEdit",
-                    query: {
+        addRow() {
+            this.$router.push({
+                path: '/clientStoreInfoEdit',
+                query: {
                     ...this.$route.query
-                    }
-                });
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: "/clientStoreInfoEdit",
-                    query: {
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/clientStoreInfoEdit',
+                query: {
                     id: row.id
-                    }
-                });
-            },
-            download() {
-                this.downloading = true;
-                this.$axios
-                    .get("/clientStoreInfo/excel", {
-                        responseType: "blob",
-                        params: { size: 10000 }
-                    })
-                    .then(res => {
-                        console.log(res);
-                        this.downloading = false;
-                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
-                        const link = document.createElement("a");
-                        link.href = downloadUrl;
-                        link.setAttribute(
-                            "download",
-                            res.headers["content-disposition"].split("filename=")[1]
-                        );
-                        document.body.appendChild(link);
-                        link.click();
-                        link.remove();
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.downloading = false;
-                        this.$message.error(e.error);
-                    });
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/clientStoreInfo/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
                 });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/clientStoreInfo/del/${row.id}`)
-                }).then(() => {
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/clientStoreInfo/del/${row.id}`);
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.getData();
-                }).catch(action => {
+                })
+                .catch(action => {
                     if (action === 'cancel') {
                         this.$message.info('删除取消');
                     } else {
                         this.$message.error('删除失败');
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

+ 85 - 80
src/main/vue/src/views/CompanyEdit.vue

@@ -1,27 +1,33 @@
 <template>
     <div class="edit-view">
-        <el-form :model="formData" :rules="rules" ref="form" label-width="139px" label-position="right" size="small"
-                 style="max-width: 500px;">
-                <el-form-item prop="companyName" label="companyName">
-                            <el-input v-model="formData.companyName"></el-input>
-                </el-form-item>
-                <el-form-item prop="companyPrincipal" label="companyPrincipal">
-                            <el-input v-model="formData.companyPrincipal"></el-input>
-                </el-form-item>
-                <el-form-item prop="appId" label="appId">
-                            <el-input v-model="formData.appId"></el-input>
-                </el-form-item>
-                <el-form-item prop="paySecret" label="paySecret">
-                            <el-input v-model="formData.paySecret"></el-input>
-                </el-form-item>
-                <el-form-item prop="userId" label="userId">
-                            <el-input-number type="number" v-model="formData.userId"></el-input-number>
-                </el-form-item>
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="139px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="companyName" label="companyName">
+                <el-input v-model="formData.companyName"></el-input>
+            </el-form-item>
+            <el-form-item prop="companyPrincipal" label="companyPrincipal">
+                <el-input v-model="formData.companyPrincipal"></el-input>
+            </el-form-item>
+            <el-form-item prop="appId" label="appId">
+                <el-input v-model="formData.appId"></el-input>
+            </el-form-item>
+            <el-form-item prop="paySecret" label="paySecret">
+                <el-input v-model="formData.paySecret"></el-input>
+            </el-form-item>
+            <el-form-item prop="userId" label="userId">
+                <el-input-number type="number" v-model="formData.userId"></el-input-number>
+            </el-form-item>
             <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData"
-                           type="primary">保存</el-button>
-                <el-button @click="onDelete" :loading="$store.state.fetchingData"
-                           type="danger" v-if="formData.id">删除
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="$store.state.fetchingData" type="danger" v-if="formData.id"
+                    >删除
                 </el-button>
                 <el-button @click="$router.go(-1)">取消</el-button>
             </el-form-item>
@@ -29,73 +35,72 @@
     </div>
 </template>
 <script>
-    export default {
-        name: 'CompanyEdit',
-        created() {
-            if (this.$route.query.id) {
-                this.$http
-                    .get('company/get/'+this.$route.query.id)
-                    .then(res => {
-                        this.formData = res;
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.$message.error(e.error);
-                    });
-            }
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {
-                },
-                rules: {
-                },
-            }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
+export default {
+    name: 'CompanyEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('company/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
                 });
-            },
-            submit() {
-                let data = {...this.formData};
-
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {}
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
 
-                this.$store.commit('updateFetchingData', true);
-                this.$http
-                    .post('/company/save', data, {body: 'json'})
-                    .then(res => {
-                        this.$store.commit('updateFetchingData', false);
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    })
-                    .catch(e => {
-                        this.$store.commit('updateFetchingData', false);
-                        console.log(e);
-                        this.$message.error(e.error);
-                    });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/company/del/${this.formData.id}`)
-                }).then(() => {
+            this.$store.commit('updateFetchingData', true);
+            this.$http
+                .post('/company/save', data, { body: 'json' })
+                .then(res => {
+                    this.$store.commit('updateFetchingData', false);
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    this.$store.commit('updateFetchingData', false);
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/company/del/${this.formData.id}`);
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.$router.go(-1);
-                }).catch(e => {
+                })
+                .catch(e => {
                     if (e !== 'cancel') {
                         console.log(e);
                         this.$message.error(e.error);
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

+ 127 - 135
src/main/vue/src/views/CompanyList.vue

@@ -1,50 +1,39 @@
 <template>
-    <div  class="list-view">
+    <div class="list-view">
         <div class="filters-container">
-            <el-input placeholder="输入关键字" v-model="search" clearable
-                      class="filter-item"></el-input>
-            <el-button @click="getData" type="primary" icon="el-icon-search"
-                       class="filter-item">搜索
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" v-if="canEdit" type="primary" icon="el-icon-plus" class="filter-item"
+                >添加
             </el-button>
-            <el-button @click="addRow" v-if="canEdit" type="primary" icon="el-icon-plus"
-                       class="filter-item">添加
-            </el-button>
-            <el-button @click="download" type="primary" icon="el-icon-download"
-                       :loading="downloading" class="filter-item">导出EXCEL
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
             </el-button>
         </div>
-        <el-table :data="tableData" row-key="id" ref="table"
-                  header-row-class-name="table-header-row"
-                  header-cell-class-name="table-header-cell"
-                  row-class-name="table-row" cell-class-name="table-cell"
-                  :height="tableHeight">
-            <el-table-column v-if="multipleMode" align="center" type="selection"
-                             width="50">
-            </el-table-column>
-            <el-table-column prop="id" label="ID" width="100">
-            </el-table-column>
-                                <el-table-column prop="companyName" label="companyName"
->
-                    </el-table-column>
-                    <el-table-column prop="companyPrincipal" label="companyPrincipal"
->
-                    </el-table-column>
-                    <el-table-column prop="appId" label="appId"
->
-                    </el-table-column>
-                    <el-table-column prop="paySecret" label="paySecret"
->
-                    </el-table-column>
-                    <el-table-column prop="userId" label="userId"
->
-                    </el-table-column>
-            <el-table-column
-                    label="操作"
-                    v-if="canEdit"
-                    align="center"
-                    fixed="right"
-                    min-width="150">
-                <template slot-scope="{row}">
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="companyName" label="companyName"> </el-table-column>
+            <el-table-column prop="companyPrincipal" label="companyPrincipal"> </el-table-column>
+            <el-table-column prop="appId" label="appId"> </el-table-column>
+            <el-table-column prop="paySecret" label="paySecret"> </el-table-column>
+            <el-table-column prop="userId" label="userId"> </el-table-column>
+            <el-table-column label="操作" v-if="canEdit" align="center" fixed="right" min-width="150">
+                <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
@@ -59,119 +48,122 @@
                     <el-button @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div> -->
-            <el-pagination background @size-change="onSizeChange"
-                           @current-change="onCurrentChange" :current-page="page"
-                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="totalElements">
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
             </el-pagination>
         </div>
-
     </div>
 </template>
 <script>
-    import { mapState } from "vuex";
-    import pageableTable from "@/mixins/pageableTable";
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
 
-    export default {
-        name: 'CompanyList',
-        mixins: [pageableTable],
-        created() {
-            this.getData();
-        },
-        data() {
-            return {
-                multipleMode: false,
-                search: "",
-                url: "/company/all",
-                downloading: false,
+export default {
+    name: 'CompanyList',
+    mixins: [pageableTable],
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/company/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            if (this.search) {
+                return { search: this.search };
             }
         },
-        computed: {
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
             }
         },
-        methods: {
-            beforeGetData() {
-                if (this.search) {
-                    return { search: this.search };
-                }
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
-                }
-            },
-            addRow() {
-                this.$router.push({
-                    path: "/companyEdit",
-                    query: {
+        addRow() {
+            this.$router.push({
+                path: '/companyEdit',
+                query: {
                     ...this.$route.query
-                    }
-                });
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: "/companyEdit",
-                    query: {
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/companyEdit',
+                query: {
                     id: row.id
-                    }
-                });
-            },
-            download() {
-                this.downloading = true;
-                this.$axios
-                    .get("/company/excel", {
-                        responseType: "blob",
-                        params: { size: 10000 }
-                    })
-                    .then(res => {
-                        console.log(res);
-                        this.downloading = false;
-                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
-                        const link = document.createElement("a");
-                        link.href = downloadUrl;
-                        link.setAttribute(
-                            "download",
-                            res.headers["content-disposition"].split("filename=")[1]
-                        );
-                        document.body.appendChild(link);
-                        link.click();
-                        link.remove();
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.downloading = false;
-                        this.$message.error(e.error);
-                    });
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/company/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
                 });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/company/del/${row.id}`)
-                }).then(() => {
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/company/del/${row.id}`);
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.getData();
-                }).catch(action => {
+                })
+                .catch(action => {
                     if (action === 'cancel') {
                         this.$message.info('删除取消');
                     } else {
                         this.$message.error('删除失败');
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

+ 1 - 2
src/main/vue/src/views/RechargeRecordList.vue

@@ -240,8 +240,7 @@ export default {
 
             this.downloading = true;
             this.$axios
-                .get('/rechargeRecord/excel', { responseType: 'blob',
-                    params: data})
+                .get('/rechargeRecord/excel', { responseType: 'blob', params: data })
                 .then(res => {
                     console.log(res);
                     this.downloading = false;

+ 7 - 11
src/main/vue/src/views/Report/BalanceRecord.vue

@@ -8,7 +8,7 @@
                 icon="el-icon-download"
                 :loading="downloading"
                 class="filter-item"
-            >导出EXCEL
+                >导出EXCEL
             </el-button>
         </div>
         <el-table
@@ -22,12 +22,9 @@
             cell-class-name="table-cell"
             v-loading="loading"
         >
-            <el-table-column prop="name" label="用户姓名">
-            </el-table-column>
-            <el-table-column prop="idNo" label="身份证号">
-            </el-table-column>
-            <el-table-column prop="sex" label="性别">
-            </el-table-column>
+            <el-table-column prop="name" label="用户姓名"> </el-table-column>
+            <el-table-column prop="idNo" label="身份证号"> </el-table-column>
+            <el-table-column prop="sex" label="性别"> </el-table-column>
             <el-table-column prop="phone" label="手机号">
                 <template slot="header" slot-scope="{ column }">
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"></sortable-header>
@@ -38,8 +35,7 @@
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"></sortable-header>
                 </template>
             </el-table-column>
-            <el-table-column prop="money" label="余额">
-            </el-table-column>
+            <el-table-column prop="money" label="余额"> </el-table-column>
             <el-table-column label="余额记录" width="80">
                 <template v-slot="{ row }">
                     <el-button @click="checkRecord(row.idNo)" type="success" size="mini" plain>查看记录 </el-button>
@@ -58,7 +54,7 @@
     </div>
 </template>
 <script>
-import {mapState} from 'vuex';
+import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
 import format from 'date-fns/format';
 import addDays from 'date-fns/addDays';
@@ -236,7 +232,7 @@ export default {
             this.$message('操作2');
         },
         deleteRow(row) {
-            this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'})
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
                 .then(() => {
                     return this.$http.post(`/rechargeRecord/del/${row.id}`);
                 })

+ 2 - 3
src/main/vue/src/views/ShiftSummary.vue

@@ -321,10 +321,9 @@ export default {
             } else if ('实际收费差值' === name) {
                 this.$router.push({
                     name: 'BalanceRecord',
-                    query: {
-                    }
+                    query: {}
                 });
-            }else {
+            } else {
                 this.$router.push({
                     name: 'payMethodDetail',
                     query: {