Commit 473b2266 authored by v-yuchenglong's avatar v-yuchenglong

update:新老订单增加下单时间筛选,部分测试问题修改

parent 947cffe9
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item style="margin-left: 50px"> <el-form-item style="margin-left: 50px">
<el-button @click="reset()">重置</el-button>
<el-button type="primary" @click="getActivityList">搜索</el-button> <el-button type="primary" @click="getActivityList">搜索</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -189,6 +190,13 @@ export default { ...@@ -189,6 +190,13 @@ export default {
}; };
}, },
methods: { methods: {
// 重置
reset() {
this.activity.activityName = "";
this.activity.online_status = "";
this.getActivityList();
},
/* API */ /* API */
// 获取商品列表 // 获取商品列表
async getActivityList() { async getActivityList() {
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<el-table :data="comTableData" border style="width: 100%"> <el-table :data="comTableData" border style="width: 100%">
<el-table-column label="显示顺序" align="center" width="140"> <el-table-column label="显示顺序" align="center" width="140">
<template #default="scope"> <template #default="scope">
<i class="el-icon-top" @click="upMove(scope.$index, scope.row)"></i> <i class="el-icon-top" @click="upMove(scope.$index, scope.row)" style="margin-right:15px;"></i>
<i <i
class="el-icon-bottom" class="el-icon-bottom"
@click="upDown(scope.$index, scope.row)" @click="upDown(scope.$index, scope.row)"
...@@ -87,6 +87,7 @@ ...@@ -87,6 +87,7 @@
<el-form-item <el-form-item
label="商品标题:" label="商品标题:"
prop="goods_name" prop="goods_name"
style="width:90%;"
:rules="[{ required: true, message: '请输入商品标题' }]" :rules="[{ required: true, message: '请输入商品标题' }]"
> >
<el-input <el-input
...@@ -134,7 +135,7 @@ ...@@ -134,7 +135,7 @@
</div> </div>
<br /> <br />
<el-form-item <el-form-item
label="商家" label="商家"
prop="business1" prop="business1"
:rules="[{ required: true, message: '请选择商家' }]" :rules="[{ required: true, message: '请选择商家' }]"
> >
......
...@@ -446,6 +446,7 @@ export default { ...@@ -446,6 +446,7 @@ export default {
if (valid) { if (valid) {
await this.addPlace(); await this.addPlace();
this.$refs.ruleForm.resetFields(); this.$refs.ruleForm.resetFields();
this.$refs.multipleTable.clearSelection();
this.dialogFormVisible = false; this.dialogFormVisible = false;
} else { } else {
return false; return false;
......
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