修改细节

pull/198/head
linxin 2019-08-13 09:36:53 +08:00
parent 53d067f0d1
commit 285ea37245
4 changed files with 276 additions and 238 deletions

View File

@ -1,6 +1,6 @@
{ {
"tabWidth": 4, "tabWidth": 4,
"singleQuote": true, "singleQuote": true,
"trailingComma": "es5", "trailingComma": "none",
"printWidth": 140 "printWidth": 140
} }

View File

@ -10,7 +10,7 @@
"dependencies": { "dependencies": {
"axios": "^0.18.0", "axios": "^0.18.0",
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"element-ui": "^2.9.2", "element-ui": "^2.11.0",
"mavon-editor": "^2.6.17", "mavon-editor": "^2.6.17",
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-cropperjs": "^3.0.0", "vue-cropperjs": "^3.0.0",

View File

@ -2,7 +2,9 @@
<div> <div>
<div class="crumbs"> <div class="crumbs">
<el-breadcrumb separator="/"> <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-item>基本表单</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
</div> </div>
@ -21,11 +23,21 @@
</el-form-item> </el-form-item>
<el-form-item label="日期时间"> <el-form-item label="日期时间">
<el-col :span="11"> <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>
<el-col class="line" :span="2">-</el-col> <el-col class="line" :span="2">-</el-col>
<el-col :span="11"> <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-col>
</el-form-item> </el-form-item>
<el-form-item label="城市级联"> <el-form-item label="城市级联">
@ -58,16 +70,15 @@
</el-form> </el-form>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'baseform', name: 'baseform',
data: function(){ data() {
return { return {
options:[ options: [
{ {
value: 'guangdong', value: 'guangdong',
label: '广东省', label: '广东省',
@ -130,12 +141,12 @@
desc: '', desc: '',
options: [] options: []
} }
} };
}, },
methods: { methods: {
onSubmit() { onSubmit() {
this.$message.success('提交成功!'); this.$message.success('提交成功!');
} }
} }
} };
</script> </script>

View File

@ -2,12 +2,19 @@
<div class="table"> <div class="table">
<div class="crumbs"> <div class="crumbs">
<el-breadcrumb separator="/"> <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> </el-breadcrumb>
</div> </div>
<div class="container"> <div class="container">
<div class="handle-box"> <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-select v-model="select_cate" placeholder="筛选省份" class="handle-select mr10">
<el-option key="1" label="广东省" value="广东省"></el-option> <el-option key="1" label="广东省" value="广东省"></el-option>
<el-option key="2" 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-input v-model="select_word" placeholder="筛选关键词" class="handle-input mr10"></el-input>
<el-button type="primary" icon="el-icon-search" @click="search"></el-button> <el-button type="primary" icon="el-icon-search" @click="search"></el-button>
</div> </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 type="selection" width="55" align="center"></el-table-column>
<el-table-column prop="date" label="日期" sortable width="150"> <el-table-column prop="date" label="日期" sortable width="150"></el-table-column>
</el-table-column> <el-table-column prop="name" label="姓名" width="120"></el-table-column>
<el-table-column prop="name" label="姓名" width="120"> <el-table-column prop="address" label="地址" :formatter="formatter"></el-table-column>
</el-table-column>
<el-table-column prop="address" label="地址" :formatter="formatter">
</el-table-column>
<el-table-column label="操作" width="180" align="center"> <el-table-column label="操作" width="180" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button> <el-button
<el-button type="text" icon="el-icon-delete" class="red" @click="handleDelete(scope.$index, scope.row)">删除</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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination"> <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>
</div> </div>
@ -40,7 +63,13 @@
<el-dialog title="编辑" :visible.sync="editVisible" width="30%"> <el-dialog title="编辑" :visible.sync="editVisible" width="30%">
<el-form ref="form" :model="form" label-width="50px"> <el-form ref="form" :model="form" label-width="50px">
<el-form-item label="日期"> <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>
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input v-model="form.name"></el-input> <el-input v-model="form.name"></el-input>
@ -48,7 +77,6 @@
<el-form-item label="地址"> <el-form-item label="地址">
<el-input v-model="form.address"></el-input> <el-input v-model="form.address"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="editVisible = false"> </el-button> <el-button @click="editVisible = false"> </el-button>
@ -68,8 +96,8 @@
</template> </template>
<script> <script>
import { fetchData } from '../../api/index'; import { fetchData } from '../../api/index';
export default { export default {
name: 'basetable', name: 'basetable',
data() { data() {
return { return {
@ -89,14 +117,14 @@
}, },
idx: -1, idx: -1,
id: -1 id: -1
} };
}, },
created() { created() {
this.getData(); this.getData();
}, },
computed: { computed: {
data() { data() {
return this.tableData.filter((d) => { return this.tableData.filter(d => {
let is_del = false; let is_del = false;
for (let i = 0; i < this.del_list.length; i++) { for (let i = 0; i < this.del_list.length; i++) {
if (d.name === this.del_list[i].name) { if (d.name === this.del_list[i].name) {
@ -105,14 +133,14 @@
} }
} }
if (!is_del) { if (!is_del) {
if (d.address.indexOf(this.select_cate) > -1 && if (
(d.name.indexOf(this.select_word) > -1 || d.address.indexOf(this.select_cate) > -1 &&
d.address.indexOf(this.select_word) > -1) (d.name.indexOf(this.select_word) > -1 || d.address.indexOf(this.select_word) > -1)
) { ) {
return d; return d;
} }
} }
}) });
} }
}, },
methods: { methods: {
@ -125,9 +153,9 @@
getData() { getData() {
fetchData({ fetchData({
page: this.cur_page page: this.cur_page
}).then((res) => { }).then(res => {
this.tableData = res.list; this.tableData = res.list;
}) });
}, },
search() { search() {
this.is_search = true; this.is_search = true;
@ -146,7 +174,7 @@
name: row.name, name: row.name,
date: row.date, date: row.date,
address: row.address address: row.address
} };
this.editVisible = true; this.editVisible = true;
}, },
handleDelete(index, row) { handleDelete(index, row) {
@ -161,7 +189,7 @@
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
str += this.multipleSelection[i].name + ' '; str += this.multipleSelection[i].name + ' ';
} }
this.$message.error('删除了' + str); this.$message.error(`删除了${str}`);
this.multipleSelection = []; this.multipleSelection = [];
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
@ -170,63 +198,62 @@
// //
saveEdit() { saveEdit() {
this.editVisible = false; this.editVisible = false;
this.$message.success(`修改第 ${this.idx+1} 行成功`); this.$message.success(`修改第 ${this.idx + 1} 行成功`);
if(this.tableData[this.idx].id === this.id){ if (this.tableData[this.idx].id === this.id) {
this.$set(this.tableData, this.idx, this.form); this.$set(this.tableData, this.idx, this.form);
}else{ } else {
for(let i = 0; i < this.tableData.length; i++){ for (let i = 0; i < this.tableData.length; i++) {
if(this.tableData[i].id === this.id){ if (this.tableData[i].id === this.id) {
this.$set(this.tableData, i, this.form); this.$set(this.tableData, i, this.form);
return ; return;
} }
} }
} }
}, },
// //
deleteRow(){ deleteRow() {
this.$message.success('删除成功'); this.$message.success('删除成功');
this.delVisible = false; this.delVisible = false;
if(this.tableData[this.idx].id === this.id){ if (this.tableData[this.idx].id === this.id) {
this.tableData.splice(this.idx, 1); this.tableData.splice(this.idx, 1);
}else{ } else {
for(let i = 0; i < this.tableData.length; i++){ for (let i = 0; i < this.tableData.length; i++) {
if(this.tableData[i].id === this.id){ if (this.tableData[i].id === this.id) {
this.tableData.splice(i, 1); this.tableData.splice(i, 1);
return ; return;
} }
} }
} }
} }
} }
} };
</script> </script>
<style scoped> <style scoped>
.handle-box { .handle-box {
margin-bottom: 20px; margin-bottom: 20px;
} }
.handle-select { .handle-select {
width: 120px; width: 120px;
} }
.handle-input { .handle-input {
width: 300px; width: 300px;
display: inline-block; display: inline-block;
} }
.del-dialog-cnt{ .del-dialog-cnt {
font-size: 16px; font-size: 16px;
text-align: center text-align: center;
} }
.table{ .table {
width: 100%; width: 100%;
font-size: 14px; font-size: 14px;
} }
.red{ .red {
color: #ff0000; color: #ff0000;
} }
.mr10{ .mr10 {
margin-right: 10px; margin-right: 10px;
} }
</style> </style>