From 285ea37245f42439fbf84a62c6b496e9207cbacc Mon Sep 17 00:00:00 2001
From: linxin <2981207131@qq.com>
Date: Tue, 13 Aug 2019 09:36:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .prettierrc                       |   2 +-
 package.json                      |   4 +-
 src/components/page/BaseForm.vue  | 161 +++++++-------
 src/components/page/BaseTable.vue | 347 ++++++++++++++++--------------
 4 files changed, 276 insertions(+), 238 deletions(-)

diff --git a/.prettierrc b/.prettierrc
index 5ca9a13..c5f454b 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,6 +1,6 @@
 {
 	"tabWidth": 4,
 	"singleQuote": true,
-	"trailingComma": "es5",
+	"trailingComma": "none",
 	"printWidth": 140
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 895b961..50fe0fc 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",
-    "element-ui": "^2.9.2",
+    "element-ui": "^2.11.0",
     "mavon-editor": "^2.6.17",
     "vue": "^2.6.10",
     "vue-cropperjs": "^3.0.0",
@@ -25,4 +25,4 @@
     "@vue/cli-service": "^3.2.0",
     "vue-template-compiler": "^2.5.21"
   }
-}
+}
\ No newline at end of file
diff --git a/src/components/page/BaseForm.vue b/src/components/page/BaseForm.vue
index 4a726d1..9beb0dd 100644
--- a/src/components/page/BaseForm.vue
+++ b/src/components/page/BaseForm.vue
@@ -2,7 +2,9 @@
     <div>
         <div class="crumbs">
             <el-breadcrumb separator="/">
-                <el-breadcrumb-item><i class="el-icon-lx-calendar"></i> 表单</el-breadcrumb-item>
+                <el-breadcrumb-item>
+                    <i class="el-icon-lx-calendar"></i> 表单
+                </el-breadcrumb-item>
                 <el-breadcrumb-item>基本表单</el-breadcrumb-item>
             </el-breadcrumb>
         </div>
@@ -21,11 +23,21 @@
                     </el-form-item>
                     <el-form-item label="日期时间">
                         <el-col :span="11">
-                            <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+                            <el-date-picker
+                                type="date"
+                                placeholder="选择日期"
+                                v-model="form.date1"
+                                value-format="yyyy-MM-dd"
+                                style="width: 100%;"
+                            ></el-date-picker>
                         </el-col>
                         <el-col class="line" :span="2">-</el-col>
                         <el-col :span="11">
-                            <el-time-picker placeholder="选择时间" v-model="form.date2" style="width: 100%;"></el-time-picker>
+                            <el-time-picker
+                                placeholder="选择时间"
+                                v-model="form.date2"
+                                style="width: 100%;"
+                            ></el-time-picker>
                         </el-col>
                     </el-form-item>
                     <el-form-item label="城市级联">
@@ -58,84 +70,83 @@
                 </el-form>
             </div>
         </div>
-
     </div>
 </template>
 
 <script>
-    export default {
-        name: 'baseform',
-        data: function(){
-            return {
-                options:[
-                    {
-                        value: 'guangdong',
-                        label: '广东省',
-                        children: [
-                            {
-                                value: 'guangzhou',
-                                label: '广州市',
-                                children: [
-                                    {
-                                        value: 'tianhe',
-                                        label: '天河区'
-                                    },
-                                    {
-                                        value: 'haizhu',
-                                        label: '海珠区'
-                                    }
-                                ]
-                            },
-                            {
-                                value: 'dongguan',
-                                label: '东莞市',
-                                children: [
-                                    {
-                                        value: 'changan',
-                                        label: '长安镇'
-                                    },
-                                    {
-                                        value: 'humen',
-                                        label: '虎门镇'
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        value: 'hunan',
-                        label: '湖南省',
-                        children: [
-                            {
-                                value: 'changsha',
-                                label: '长沙市',
-                                children: [
-                                    {
-                                        value: 'yuelu',
-                                        label: '岳麓区'
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                ],
-                form: {
-                    name: '',
-                    region: '',
-                    date1: '',
-                    date2: '',
-                    delivery: true,
-                    type: ['步步高'],
-                    resource: '小天才',
-                    desc: '',
-                    options: []
+export default {
+    name: 'baseform',
+    data() {
+        return {
+            options: [
+                {
+                    value: 'guangdong',
+                    label: '广东省',
+                    children: [
+                        {
+                            value: 'guangzhou',
+                            label: '广州市',
+                            children: [
+                                {
+                                    value: 'tianhe',
+                                    label: '天河区'
+                                },
+                                {
+                                    value: 'haizhu',
+                                    label: '海珠区'
+                                }
+                            ]
+                        },
+                        {
+                            value: 'dongguan',
+                            label: '东莞市',
+                            children: [
+                                {
+                                    value: 'changan',
+                                    label: '长安镇'
+                                },
+                                {
+                                    value: 'humen',
+                                    label: '虎门镇'
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    value: 'hunan',
+                    label: '湖南省',
+                    children: [
+                        {
+                            value: 'changsha',
+                            label: '长沙市',
+                            children: [
+                                {
+                                    value: 'yuelu',
+                                    label: '岳麓区'
+                                }
+                            ]
+                        }
+                    ]
                 }
+            ],
+            form: {
+                name: '',
+                region: '',
+                date1: '',
+                date2: '',
+                delivery: true,
+                type: ['步步高'],
+                resource: '小天才',
+                desc: '',
+                options: []
             }
-        },
-        methods: {
-            onSubmit() {
-                this.$message.success('提交成功！');
-            }
+        };
+    },
+    methods: {
+        onSubmit() {
+            this.$message.success('提交成功！');
         }
     }
+};
 </script>
\ No newline at end of file
diff --git a/src/components/page/BaseTable.vue b/src/components/page/BaseTable.vue
index 9aa442f..6046fc9 100644
--- a/src/components/page/BaseTable.vue
+++ b/src/components/page/BaseTable.vue
@@ -2,12 +2,19 @@
     <div class="table">
         <div class="crumbs">
             <el-breadcrumb separator="/">
-                <el-breadcrumb-item><i class="el-icon-lx-cascades"></i> 基础表格</el-breadcrumb-item>
+                <el-breadcrumb-item>
+                    <i class="el-icon-lx-cascades"></i> 基础表格
+                </el-breadcrumb-item>
             </el-breadcrumb>
         </div>
         <div class="container">
             <div class="handle-box">
-                <el-button type="primary" icon="el-icon-delete" class="handle-del mr10" @click="delAll">批量删除</el-button>
+                <el-button
+                    type="primary"
+                    icon="el-icon-delete"
+                    class="handle-del mr10"
+                    @click="delAll"
+                >批量删除</el-button>
                 <el-select v-model="select_cate" placeholder="筛选省份" class="handle-select mr10">
                     <el-option key="1" label="广东省" value="广东省"></el-option>
                     <el-option key="2" label="湖南省" value="湖南省"></el-option>
@@ -15,24 +22,40 @@
                 <el-input v-model="select_word" placeholder="筛选关键词" class="handle-input mr10"></el-input>
                 <el-button type="primary" icon="el-icon-search" @click="search">搜索</el-button>
             </div>
-            <el-table :data="data" border class="table" ref="multipleTable" @selection-change="handleSelectionChange">
+            <el-table
+                :data="data"
+                border
+                class="table"
+                ref="multipleTable"
+                @selection-change="handleSelectionChange"
+            >
                 <el-table-column type="selection" width="55" align="center"></el-table-column>
-                <el-table-column prop="date" label="日期" sortable width="150">
-                </el-table-column>
-                <el-table-column prop="name" label="姓名" width="120">
-                </el-table-column>
-                <el-table-column prop="address" label="地址" :formatter="formatter">
-                </el-table-column>
+                <el-table-column prop="date" label="日期" sortable width="150"></el-table-column>
+                <el-table-column prop="name" label="姓名" width="120"></el-table-column>
+                <el-table-column prop="address" label="地址" :formatter="formatter"></el-table-column>
                 <el-table-column label="操作" width="180" align="center">
                     <template slot-scope="scope">
-                        <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
-                        <el-button type="text" icon="el-icon-delete" class="red" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+                        <el-button
+                            type="text"
+                            icon="el-icon-edit"
+                            @click="handleEdit(scope.$index, scope.row)"
+                        >编辑</el-button>
+                        <el-button
+                            type="text"
+                            icon="el-icon-delete"
+                            class="red"
+                            @click="handleDelete(scope.$index, scope.row)"
+                        >删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
             <div class="pagination">
-                <el-pagination background @current-change="handleCurrentChange" layout="prev, pager, next" :total="1000">
-                </el-pagination>
+                <el-pagination
+                    background
+                    @current-change="handleCurrentChange"
+                    layout="prev, pager, next"
+                    :total="1000"
+                ></el-pagination>
             </div>
         </div>
 
@@ -40,7 +63,13 @@
         <el-dialog title="编辑" :visible.sync="editVisible" width="30%">
             <el-form ref="form" :model="form" label-width="50px">
                 <el-form-item label="日期">
-                    <el-date-picker type="date" placeholder="选择日期" v-model="form.date" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
+                    <el-date-picker
+                        type="date"
+                        placeholder="选择日期"
+                        v-model="form.date"
+                        value-format="yyyy-MM-dd"
+                        style="width: 100%;"
+                    ></el-date-picker>
                 </el-form-item>
                 <el-form-item label="姓名">
                     <el-input v-model="form.name"></el-input>
@@ -48,7 +77,6 @@
                 <el-form-item label="地址">
                     <el-input v-model="form.address"></el-input>
                 </el-form-item>
-
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="editVisible = false">取 消</el-button>
@@ -68,165 +96,164 @@
 </template>
 
 <script>
-    import { fetchData } from '../../api/index';
-    export default {
-        name: 'basetable',
+import { fetchData } from '../../api/index';
+export default {
+    name: 'basetable',
+    data() {
+        return {
+            tableData: [],
+            cur_page: 1,
+            multipleSelection: [],
+            select_cate: '',
+            select_word: '',
+            del_list: [],
+            is_search: false,
+            editVisible: false,
+            delVisible: false,
+            form: {
+                name: '',
+                date: '',
+                address: ''
+            },
+            idx: -1,
+            id: -1
+        };
+    },
+    created() {
+        this.getData();
+    },
+    computed: {
         data() {
-            return {
-                tableData: [],
-                cur_page: 1,
-                multipleSelection: [],
-                select_cate: '',
-                select_word: '',
-                del_list: [],
-                is_search: false,
-                editVisible: false,
-                delVisible: false,
-                form: {
-                    name: '',
-                    date: '',
-                    address: ''
-                },
-                idx: -1,
-                id: -1
-            }
-        },
-        created() {
+            return this.tableData.filter(d => {
+                let is_del = false;
+                for (let i = 0; i < this.del_list.length; i++) {
+                    if (d.name === this.del_list[i].name) {
+                        is_del = true;
+                        break;
+                    }
+                }
+                if (!is_del) {
+                    if (
+                        d.address.indexOf(this.select_cate) > -1 &&
+                        (d.name.indexOf(this.select_word) > -1 || d.address.indexOf(this.select_word) > -1)
+                    ) {
+                        return d;
+                    }
+                }
+            });
+        }
+    },
+    methods: {
+        // 分页导航
+        handleCurrentChange(val) {
+            this.cur_page = val;
             this.getData();
         },
-        computed: {
-            data() {
-                return this.tableData.filter((d) => {
-                    let is_del = false;
-                    for (let i = 0; i < this.del_list.length; i++) {
-                        if (d.name === this.del_list[i].name) {
-                            is_del = true;
-                            break;
-                        }
+        // 获取 easy-mock 的模拟数据
+        getData() {
+            fetchData({
+                page: this.cur_page
+            }).then(res => {
+                this.tableData = res.list;
+            });
+        },
+        search() {
+            this.is_search = true;
+        },
+        formatter(row, column) {
+            return row.address;
+        },
+        filterTag(value, row) {
+            return row.tag === value;
+        },
+        handleEdit(index, row) {
+            this.idx = index;
+            this.id = row.id;
+            this.form = {
+                id: row.id,
+                name: row.name,
+                date: row.date,
+                address: row.address
+            };
+            this.editVisible = true;
+        },
+        handleDelete(index, row) {
+            this.idx = index;
+            this.id = row.id;
+            this.delVisible = true;
+        },
+        delAll() {
+            const length = this.multipleSelection.length;
+            let str = '';
+            this.del_list = this.del_list.concat(this.multipleSelection);
+            for (let i = 0; i < length; i++) {
+                str += this.multipleSelection[i].name + ' ';
+            }
+            this.$message.error(`删除了${str}`);
+            this.multipleSelection = [];
+        },
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+        },
+        // 保存编辑
+        saveEdit() {
+            this.editVisible = false;
+            this.$message.success(`修改第 ${this.idx + 1} 行成功`);
+            if (this.tableData[this.idx].id === this.id) {
+                this.$set(this.tableData, this.idx, this.form);
+            } else {
+                for (let i = 0; i < this.tableData.length; i++) {
+                    if (this.tableData[i].id === this.id) {
+                        this.$set(this.tableData, i, this.form);
+                        return;
                     }
-                    if (!is_del) {
-                        if (d.address.indexOf(this.select_cate) > -1 &&
-                            (d.name.indexOf(this.select_word) > -1 ||
-                                d.address.indexOf(this.select_word) > -1)
-                        ) {
-                            return d;
-                        }
-                    }
-                })
+                }
             }
         },
-        methods: {
-            // 分页导航
-            handleCurrentChange(val) {
-                this.cur_page = val;
-                this.getData();
-            },
-            // 获取 easy-mock 的模拟数据
-            getData() {
-                fetchData({
-                    page: this.cur_page
-                }).then((res) => {
-                    this.tableData = res.list;
-                })
-            },
-            search() {
-                this.is_search = true;
-            },
-            formatter(row, column) {
-                return row.address;
-            },
-            filterTag(value, row) {
-                return row.tag === value;
-            },
-            handleEdit(index, row) {
-                this.idx = index;
-                this.id = row.id;
-                this.form = {
-                    id: row.id,
-                    name: row.name,
-                    date: row.date,
-                    address: row.address
-                }
-                this.editVisible = true;
-            },
-            handleDelete(index, row) {
-                this.idx = index;
-                this.id = row.id;
-                this.delVisible = true;
-            },
-            delAll() {
-                const length = this.multipleSelection.length;
-                let str = '';
-                this.del_list = this.del_list.concat(this.multipleSelection);
-                for (let i = 0; i < length; i++) {
-                    str += this.multipleSelection[i].name + ' ';
-                }
-                this.$message.error('删除了' + str);
-                this.multipleSelection = [];
-            },
-            handleSelectionChange(val) {
-                this.multipleSelection = val;
-            },
-            // 保存编辑
-            saveEdit() {
-                this.editVisible = false;
-                this.$message.success(`修改第 ${this.idx+1} 行成功`);
-                if(this.tableData[this.idx].id === this.id){
-                    this.$set(this.tableData, this.idx, this.form);
-                }else{
-                    for(let i = 0; i < this.tableData.length; i++){
-                        if(this.tableData[i].id === this.id){
-                            this.$set(this.tableData, i, this.form);
-                            return ;
-                        }
-                    }
-                }
-            },
-            // 确定删除
-            deleteRow(){
-                this.$message.success('删除成功');
-                this.delVisible = false;
-                if(this.tableData[this.idx].id === this.id){
-                    this.tableData.splice(this.idx, 1);
-                }else{
-                    for(let i = 0; i < this.tableData.length; i++){
-                        if(this.tableData[i].id === this.id){
-                            this.tableData.splice(i, 1);
-                            return ;
-                        }
+        // 确定删除
+        deleteRow() {
+            this.$message.success('删除成功');
+            this.delVisible = false;
+            if (this.tableData[this.idx].id === this.id) {
+                this.tableData.splice(this.idx, 1);
+            } else {
+                for (let i = 0; i < this.tableData.length; i++) {
+                    if (this.tableData[i].id === this.id) {
+                        this.tableData.splice(i, 1);
+                        return;
                     }
                 }
             }
         }
     }
-
+};
 </script>
 
 <style scoped>
-    .handle-box {
-        margin-bottom: 20px;
-    }
+.handle-box {
+    margin-bottom: 20px;
+}
 
-    .handle-select {
-        width: 120px;
-    }
+.handle-select {
+    width: 120px;
+}
 
-    .handle-input {
-        width: 300px;
-        display: inline-block;
-    }
-    .del-dialog-cnt{
-        font-size: 16px;
-        text-align: center
-    }
-    .table{
-        width: 100%;
-        font-size: 14px;
-    }
-    .red{
-        color: #ff0000;
-    }
-    .mr10{
-        margin-right: 10px;
-    }
+.handle-input {
+    width: 300px;
+    display: inline-block;
+}
+.del-dialog-cnt {
+    font-size: 16px;
+    text-align: center;
+}
+.table {
+    width: 100%;
+    font-size: 14px;
+}
+.red {
+    color: #ff0000;
+}
+.mr10 {
+    margin-right: 10px;
+}
 </style>