Commit 2853db73 authored by 杨柠瑞's avatar 杨柠瑞

issues5

parent a2e34c7f
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">搜索</el-button> <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" type="primary" :loading="downloadLoading" v-waves icon="el-icon-download" @click="handleDownload">导出</el-button> <el-button class="filter-item" type="primary" :loading="downloadLoading" v-waves icon="el-icon-download" @click="handleDownload">导出</el-button>
<el-button class="filter-item" type="primary" v-waves icon="el-icon-plus" @click="openDialog('newData')">新建</el-button>
</div> </div>
<!-- end 过滤 --> <!-- end 过滤 -->
...@@ -40,6 +41,19 @@ ...@@ -40,6 +41,19 @@
<!-- 弹窗 --> <!-- 弹窗 -->
<!-- @TODO 补充弹窗 --> <!-- @TODO 补充弹窗 -->
<el-dialog title="收货地址" :visible.sync="dialogFormVisible" :close-on-click-modal="closeOnClickModal" width="dialogWidth">
<el-form>
<el-form-item :label="dialog.name" :label-width="formLabelWidth" v-for="dialog in dialogForm">
<el-input v-model="dialog.value" auto-complete="off"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="submitDialog">确 定</el-button>
</div>
</el-dialog>
<!-- end 弹窗 --> <!-- end 弹窗 -->
</div> </div>
...@@ -49,7 +63,7 @@ ...@@ -49,7 +63,7 @@
import _ from 'lodash' import _ from 'lodash'
import request from '@/utils/request' import request from '@/utils/request'
import waves from '@/directive/waves' // 水波纹指令 import waves from '@/directive/waves' // 水波纹指令
import { parseTime } from '@/utils' import { parseTime, param } from '@/utils'
import * as excel from '@/vendor/Export2Excel' import * as excel from '@/vendor/Export2Excel'
import { Button, Table, TableColumn, Pagination, Loading } from 'element-ui' import { Button, Table, TableColumn, Pagination, Loading } from 'element-ui'
...@@ -171,8 +185,12 @@ ...@@ -171,8 +185,12 @@
filters: {} filters: {}
}, },
downloadLoading: false, downloadLoading: false,
dialogFormVisible: false, // 是否显示弹窗
showColumns: [] // 要显示的列数据 dialogForm: [], // 弹窗的数据
dialogType: '', // 弹窗的类型
showColumns: [], // 要显示的列数据
formLabelWidth: '120px',
closeOnClickModal: false
} }
}, },
computed: { computed: {
...@@ -287,6 +305,13 @@ ...@@ -287,6 +305,13 @@
self.listLoading = false self.listLoading = false
}) })
}, },
// 添加一条数据
openDialog(type) {
const self = this
self.dialogType = type
self.dialogFormVisible = true
self.dialogForm = _.cloneDeep(self.schema.columns)
},
// 删除过滤条件为空的filter // 删除过滤条件为空的filter
deleteFilter(filters) { deleteFilter(filters) {
const newFilters = filters const newFilters = filters
...@@ -299,6 +324,34 @@ ...@@ -299,6 +324,34 @@
}) })
return JSON.stringify(newFilters[Object.keys(newFilters)]) === '{}' ? {} : newFilters return JSON.stringify(newFilters[Object.keys(newFilters)]) === '{}' ? {} : newFilters
}, },
// 弹框提交数据
submitDialog() {
const self = this
const params = {}
self.dialogFormVisible = false
_.each(self.dialogForm, function(data, index) {
if (data.value) {
params[data.code] = data.value
}
})
// 新建
if (self.dialogType === 'newData') {
self.addData(params)
}
},
addData(params) {
const self = this
request(self.schema.modelUnderscorePlural + '/new', {
method: 'POST',
headers: { 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' },
data: params,
transformRequest: param
}).then(data => {
if (data.data.id) {
self.getList()
}
})
},
handleFilter() { handleFilter() {
this.getList() this.getList()
}, },
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
<hm-complex-table :schema="schema['HmUser']" <hm-complex-table :schema="schema['HmUser']"
:columns="showUserColumns" :columns="showUserColumns"
:filters="userFilters"></hm-complex-table> :filters="userFilters"></hm-complex-table>
<!--<hm-complex-table :schema="schema['Department']"></hm-complex-table>-->
<!--<hm-complex-table :schema="schema['Role']"></hm-complex-table>-->
</div> </div>
</template> </template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment