Skip to content

html / small-program-web

Go to a project
Commit 4f041eaa by duanguohui
Options

菜谱管理

parent aa3fdce1
Showing with 135 additions and 112 deletions
package-lock.json
...@@ -2873,8 +2873,7 @@ ...@@ -2873,8 +2873,7 @@
"version": "4.6.0", "version": "4.6.0",
"resolved": "https://registry.npm.taobao.org/co/download/co-4.6.0.tgz", "resolved": "https://registry.npm.taobao.org/co/download/co-4.6.0.tgz",
"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
"dev": true, "dev": true
"optional": true
}, },
"coa": { "coa": {
"version": "2.0.2", "version": "2.0.2",
...@@ -5312,8 +5311,7 @@ ...@@ -5312,8 +5311,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -5334,14 +5332,12 @@ ...@@ -5334,14 +5332,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -5356,20 +5352,17 @@ ...@@ -5356,20 +5352,17 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -5486,8 +5479,7 @@ ...@@ -5486,8 +5479,7 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -5499,7 +5491,6 @@ ...@@ -5499,7 +5491,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -5514,7 +5505,6 @@ ...@@ -5514,7 +5505,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -5522,14 +5512,12 @@ ...@@ -5522,14 +5512,12 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -5548,7 +5536,6 @@ ...@@ -5548,7 +5536,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -5629,8 +5616,7 @@ ...@@ -5629,8 +5616,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -5642,7 +5628,6 @@ ...@@ -5642,7 +5628,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -5728,8 +5713,7 @@ ...@@ -5728,8 +5713,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -5765,7 +5749,6 @@ ...@@ -5765,7 +5749,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -5785,7 +5768,6 @@ ...@@ -5785,7 +5768,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -5829,14 +5811,12 @@ ...@@ -5829,14 +5811,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
...@@ -9643,8 +9623,7 @@ ...@@ -9643,8 +9623,7 @@
"version": "4.0.8", "version": "4.0.8",
"resolved": "https://registry.npm.taobao.org/rx-lite/download/rx-lite-4.0.8.tgz", "resolved": "https://registry.npm.taobao.org/rx-lite/download/rx-lite-4.0.8.tgz",
"integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
"dev": true, "dev": true
"optional": true
}, },
"rx-lite-aggregates": { "rx-lite-aggregates": {
"version": "4.0.8", "version": "4.0.8",
......
src/components/Layout.vue
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
<template slot="title"><i class="icon"><img src="../assets/img/icon/ico3.png" alt=""></i>菜单管理</template> <template slot="title"><i class="icon"><img src="../assets/img/icon/ico3.png" alt=""></i>菜单管理</template>
<el-menu-item-group> <el-menu-item-group>
<el-menu-item index="/tab/bannerList">banner管理</el-menu-item> <el-menu-item index="/tab/bannerList">banner管理</el-menu-item>
<el-menu-item index="/tab/defaultPage/2">外卖管理</el-menu-item> <!-- <el-menu-item index="/tab/defaultPage/2">外卖管理</el-menu-item> -->
<el-menu-item index="/tab/cookbook">每日食谱管理</el-menu-item> <el-menu-item index="/tab/cookbook">菜谱管理</el-menu-item>
<el-menu-item index="/tab/cookList">厨师管理</el-menu-item> <el-menu-item index="/tab/cookList">厨师管理</el-menu-item>
<el-menu-item index="/tab/orderList">订单管理</el-menu-item> <el-menu-item index="/tab/orderList">订单管理</el-menu-item>
</el-menu-item-group> </el-menu-item-group>
......
src/views/banner/bannerAdd.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<el-breadcrumb-item>您当前的位置为：</el-breadcrumb-item> <el-breadcrumb-item>您当前的位置为：</el-breadcrumb-item>
<el-breadcrumb-item>菜单管理</el-breadcrumb-item> <el-breadcrumb-item>菜单管理</el-breadcrumb-item>
<el-breadcrumb-item>banner管理</el-breadcrumb-item> <el-breadcrumb-item>banner管理</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/tab/bannerAdd' }">{{renderType}}新增轮播图</el-breadcrumb-item> <el-breadcrumb-item>新增轮播图</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
</div> </div>
<el-card class="box-card no-margin-card"> <el-card class="box-card no-margin-card">
...@@ -24,13 +24,14 @@ ...@@ -24,13 +24,14 @@
<el-col :span="18" class="mt30"> <el-col :span="18" class="mt30">
<el-form-item label="轮播图：" :rules="{required: true}"> <el-form-item label="轮播图：" :rules="{required: true}">
<el-upload <el-upload
class="avatar-uploader" class="avatar-uploader"
action="http://47.94.209.240:8088/file/fileUpload" action="http://47.94.209.240:8088/file/fileUpload"
:show-file-list="false" :show-file-list="false"
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload"> >
<img v-if="imageUrl" :src="imageUrl" class="avatar"> <!-- :before-upload="beforeAvatarUpload" -->
<i v-else class="el-icon-plus avatar-uploader-icon"></i> <img v-if="imageUrl" :src="imageUrl" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -41,12 +42,12 @@ ...@@ -41,12 +42,12 @@
</el-col> </el-col>
<el-col :span="18" class="mt30"> <el-col :span="18" class="mt30">
<el-form-item label="链接：" :rules="{required: true}"> <el-form-item label="链接：" :rules="{required: true}">
<el-input v-model="addForm.name" placeholder="请输入链接"></el-input> <el-input v-model="addForm.herf" placeholder="请输入链接"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="18" class="mt30"> <el-col :span="18" class="mt30">
<el-form-item label="排序号：" :rules="{required: true}"> <el-form-item label="排序号：" :rules="{required: true}">
<el-input v-model="addForm.name" placeholder="请输入排序号（请填写数字，数字越大越靠前）"></el-input> <el-input v-model="addForm.sort" placeholder="请输入排序号（请填写数字，数字越大越靠前）"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
...@@ -71,36 +72,41 @@ export default { ...@@ -71,36 +72,41 @@ export default {
} }
}, },
created () { created () {
this.getDetail() if (this.$route.params.editParams) {
var editParams = this.$route.params.editParams
this.imageUrl = editParams.url
this.addForm = {
id: editParams.id,
name: editParams.name,
url: editParams.url,
status: editParams.status == '1' ? true : false,
herf: editParams.herf
}
}
}, },
methods: { methods: {
getDetail () { saveBtn () { // 保存
var _this = this
this.$axios.get('/pc/trade/get/id/' + this.$route.params.id, {
}).then(function (res) {
console.log(res.data)
_this.orderObg = res.data.data
})
},
// 保存
saveBtn () {
var that = this
var params = { var params = {
"herf": that.addForm.herf, "herf": this.addForm.herf ? this.addForm.herf : '',
"id": 0, "id": 0,
"name": that.addForm.herf, "name": this.addForm.name,
"status": that.addForm.status, "status": this.addForm.status,
"url": that.addForm.status, "url": this.addForm.url,
"userName": that.addForm.status "userName": JSON.parse(window.localStorage.getItem('userInfo')).data.userResponse.userName
}
var postUrl = '/pcbanner/add/banner'
if (this.addForm.id) {
postUrl = '/pcbanner/update/banner'
params.id = this.addForm.id
} }
this.$axios.post('/pcbanner/add/banner',params, { this.$axios.post(postUrl, params, {
}).then(function (res) { }).then((res)=> {
console.log(res.data) this.$router.go(-1)
_this.orderObg = res.data.data
}) })
}, },
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
this.imageUrl = URL.createObjectURL(file.raw); this.addForm.url = res.data
this.imageUrl = URL.createObjectURL(file.raw);
}, },
goBack () { goBack () {
this.$router.go(-1) this.$router.go(-1)
......
src/views/banner/bannerList.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<el-input v-model="formInline.orderNumber" placeholder="工号"></el-input> <el-input v-model="formInline.orderNumber" placeholder="工号"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :sm="10"> <el-col :sm="12">
<el-form-item label="上传时间"> <el-form-item label="上传时间">
<el-col :sm="11"> <el-col :sm="11">
<el-form-item prop="date1"> <el-form-item prop="date1">
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :sm="2"> <el-col :sm="2" :offset="1">
<el-form-item> <el-form-item>
<el-button type="primary" @click="searchList" size="small">搜索</el-button> <el-button class="searchButton" type="primary" @click="searchList" size="small">搜索</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
...@@ -55,32 +55,38 @@ ...@@ -55,32 +55,38 @@
:header-row-style="{height: '60px'}" :header-row-style="{height: '60px'}"
style="width: 100%"> style="width: 100%">
<el-table-column <el-table-column
prop="tradeNo" prop="name"
label="轮播图名称" label="轮播图名称"
align="center" align="center"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userNo" prop="url"
label="缩略图" label="缩略图"
align="center" align="center"
width="240"> width="240">
<template slot-scope="scope">
<img class="bannerImg" v-if="scope.row.url" :src="scope.row.url" alt="">
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userName" prop="status"
align="center" align="center"
label="启用"> label="启用">
<template slot-scope="scope">
<span>{{scope.row.status == "1" ? '启用' : '未启用'}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="type" prop="userName"
align="center" align="center"
label="上传人"> label="上传人">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{renderType(scope.row.type)}}</span> <span>{{scope.row.userName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="num" prop="createDate"
align="center" align="center"
label="上传时间"> label="上传时间">
</el-table-column> </el-table-column>
...@@ -128,7 +134,7 @@ export default { ...@@ -128,7 +134,7 @@ export default {
}, },
getOrderList () { getOrderList () {
let parms = { let parms = {
} }
this.$axios({ this.$axios({
method: 'post', method: 'post',
...@@ -138,11 +144,15 @@ export default { ...@@ -138,11 +144,15 @@ export default {
this.orderListData = res.data.data.resultList this.orderListData = res.data.data.resultList
this.countPage = res.data.data.countPage this.countPage = res.data.data.countPage
this.page = res.data.data.page this.page = res.data.data.page
console.log(res.data) console.log(this.orderListData)
}) })
}, },
handleRowChange (row, event, column) { handleRowChange (row, event, column) {
this.$router.push({ name: 'orderDetail', params: { id: row.id, type: row.type} }) this.$router.push({ name: 'bannerAdd',
params: {
editParams: row
}
})
}, },
searchList () { searchList () {
this.getOrderList() this.getOrderList()
...@@ -155,11 +165,18 @@ export default { ...@@ -155,11 +165,18 @@ export default {
this.getOrderList() this.getOrderList()
}, },
goAdd () { goAdd () {
this.$router.push('/tab/bannerAdd') this.$router.push('/tab/bannerAdd')
}, },
}, },
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.searchButton{
margin-top: 43px;
}
.bannerImg{
width: 100px;
margin-left: 60px;
}
</style> </style>
src/views/cookbook.vue
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<div class="breadcrumb-box" style="margin-bottom: 20px"> <div class="breadcrumb-box" style="margin-bottom: 20px">
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item>您当前的位置为：</el-breadcrumb-item> <el-breadcrumb-item>您当前的位置为：</el-breadcrumb-item>
<el-breadcrumb-item>每日食谱管理</el-breadcrumb-item> <el-breadcrumb-item>菜单管理</el-breadcrumb-item>
<el-breadcrumb-item>菜谱管理</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
</div> </div>
<div class="order-list"> <div class="order-list">
...@@ -16,7 +17,7 @@ ...@@ -16,7 +17,7 @@
</el-col> </el-col>
<el-col :sm="2"> <el-col :sm="2">
<el-form-item> <el-form-item>
<el-button type="primary" @click="searchList" size="small">搜索</el-button> <el-button class="searchButton" type="primary" @click="searchList" size="small">搜索</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
...@@ -33,62 +34,76 @@ ...@@ -33,62 +34,76 @@
:header-row-style="{height: '60px'}" :header-row-style="{height: '60px'}"
style="width: 100%"> style="width: 100%">
<el-table-column <el-table-column
prop="tradeNo" prop="mno"
label="菜品编号" label="菜品编号"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userNo" prop="mnm"
label="菜品名称" label="菜品名称"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userName" prop="imgUrl"
align="center" align="center"
label="菜品图片"> label="菜品图片">
<template slot-scope="scope">
<img class="cookImage" v-if="scope.row.imgUrl" :src="scope.row.imgUrl" alt="">
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="type" prop="typeNm"
align="center" align="center"
label="菜品种类"> label="菜品种类">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{renderType(scope.row.type)}}</span> <span>{{scope.row.typeNm}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userName" prop="stock"
align="center" align="center"
label="库存数量"> label="库存数量">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userName" prop="amount"
align="center" align="center"
label="单价"> label="单价">
<template slot-scope="scope">
<span>{{scope.row.amount ? scope.row.amount : ''}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userName" prop="unit"
align="center" align="center"
label="单位"> label="单位">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userName" prop="menuKbn"
align="center" align="center"
label="菜谱分类"> label="菜谱分类">
<template slot-scope="scope">
<span>
{{scope.row.menuKbn == 'C03001' ? '早餐' : ''}}
{{scope.row.menuKbn == 'C03002' ? '午餐' : ''}}
{{scope.row.menuKbn == 'C03003' ? '晚餐' : ''}}
{{scope.row.menuKbn == 'C03004' ? '午餐外卖' : ''}}
</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userName" prop="beginDtm"
align="center" align="center"
label="菜谱发布时间"> label="菜谱发布时间">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userName" prop="beginDtm"
align="center" align="center"
label="预定开始"> label="预定开始">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userName" prop="outDtm"
align="center" align="center"
label="预定截止"> label="预定截止">
</el-table-column> </el-table-column>
...@@ -136,21 +151,18 @@ export default { ...@@ -136,21 +151,18 @@ export default {
}, },
getOrderList () { getOrderList () {
let parms = { let parms = {
} }
this.$axios({ this.$axios({
method: 'post', method: 'post',
url: '/pclog/get/list?p=' + this.allPage + '&c=' + this.currentPage, url: '/pcfood/list?p=' + this.allPage + '&c=' + this.currentPage,
data: parms data: parms
}).then((res) => { }).then((res) => {
this.orderListData = res.data.data.resultList this.orderListData = res.data.data.resultList
this.countPage = res.data.data.countPage this.countPage = res.data.data.countPage
this.page = res.data.data.page this.page = res.data.data.page
console.log(res.data)
}) })
}, },
handleRowChange (row, event, column) { handleRowChange (row, event, column) {
this.$router.push({ name: 'orderDetail', params: { id: row.id, type: row.type} })
}, },
searchList () { searchList () {
this.getOrderList() this.getOrderList()
...@@ -162,12 +174,15 @@ export default { ...@@ -162,12 +174,15 @@ export default {
goToPage () { goToPage () {
this.getOrderList() this.getOrderList()
}, },
goAdd () {
this.$router.push('/tab/bannerAdd')
},
}, },
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.searchButton{
margin-top: 43px;
}
.cookImage{
width: 50px;
}
</style> </style>
src/views/log.vue
...@@ -9,21 +9,21 @@ ...@@ -9,21 +9,21 @@
<div class="order-list"> <div class="order-list">
<el-card class="box-card no-margin-card margin-bottom20"> <el-card class="box-card no-margin-card margin-bottom20">
<el-form :inline="true" :model="formInline" class="demo-form-inline"> <el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-col :sm="6" class="margin-bottom20"> <el-col :sm="5" class="margin-bottom20">
<el-form-item label="操作人"> <el-form-item label="操作人">
<el-input v-model="formInline.orderNumber" placeholder="操作人"></el-input> <el-input v-model="formInline.orderNumber" placeholder="操作人"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :sm="10"> <el-col :sm="13">
<el-form-item label="操作时间"> <el-form-item label="操作时间">
<el-col :sm="11"> <el-col :sm="10">
<el-form-item prop="date1"> <el-form-item prop="date1">
<el-date-picker v-model="formInline.startTime" type="datetime" placeholder="开始时间"> <el-date-picker v-model="formInline.startTime" type="datetime" placeholder="开始时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col class="line" :sm="2" style="text-align: center">-</el-col> <el-col class="line" :sm="2" style="text-align: center">-</el-col>
<el-col :sm="11"> <el-col :sm="10">
<el-form-item prop="date2"> <el-form-item prop="date2">
<el-date-picker v-model="formInline.endTime" type="datetime" placeholder="结束时间"> <el-date-picker v-model="formInline.endTime" type="datetime" placeholder="结束时间">
</el-date-picker> </el-date-picker>
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :sm="2"> <el-col :sm="2" :offset="1">
<el-form-item> <el-form-item>
<el-button type="primary" @click="searchList" size="small">搜索</el-button> <el-button class="searchButton" type="primary" @click="searchList" size="small">搜索</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
...@@ -152,4 +152,7 @@ export default { ...@@ -152,4 +152,7 @@ export default {
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.searchButton{
margin-top: 43px;
}
</style> </style>
src/views/user.vue
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
<el-input v-model="formInline.tel" placeholder="手机号"></el-input> <el-input v-model="formInline.tel" placeholder="手机号"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :sm="2"> <el-col :sm="2" >
<el-form-item> <el-form-item >
<el-button type="primary" @click="searchList" size="small">搜索</el-button> <el-button class="searchButton" type="primary" @click="searchList" size="small">搜索</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
...@@ -172,4 +172,7 @@ export default { ...@@ -172,4 +172,7 @@ export default {
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.searchButton{
margin-top: 40px;
}
</style> </style>
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 sign in to comment