fe / yoho-shop-manage · Commits

Go to a project

Authored by htoooth
Commit 23fed2b5a5680c20c4165548c284ee4e10343819 2 parents cdf2df52 84e3edbf

Merge remote-tracking branch 'origin/release/2.0' into release/2.0

Inline Side-by-side
Showing 4 changed files with 5 additions and 13 deletions
... ... @@ -47,13 +47,9 @@ export default () => {
},
prodStatus: {
label: '商品状态',
model: -1,
model: '',
options: [
{
value: -1,
label: '全部'
},
{
value: 2,
label: '已处理'
},
... ...
... ... @@ -42,13 +42,9 @@ export default function() {
},
prodStatus: {
label: '商品状态',
model: -1,
model: '',
options: [
{
value: -1,
label: '全部'
},
{
value: 1,
label: '待处理'
},
... ...
... ... @@ -28,7 +28,7 @@
v-model="filters.orderTime.model"></Date-picker>
</filter-item>
<filter-item :label="filters.prodStatus.label">
<Select v-model.trim="filters.prodStatus.model">
<Select v-model.trim="filters.prodStatus.model" clearable>
<Option v-for="option in filters.prodStatus.options"
:value="option.value"
:key="option.value">{{option.label}}</Option>
... ... @@ -150,7 +150,7 @@
values.endTime = '';
}
if (status === -1) {
if (status === '' || status === null) {
values.statusList = [2, 3, 4];
} else if (status === -2) {
values.statusList = [2];
... ...
... ... @@ -25,7 +25,7 @@
</Date-picker>
</filter-item>
<filter-item :label="filters.prodStatus.label">
<Select v-model.trim="filters.prodStatus.model">
<Select v-model.trim="filters.prodStatus.model" clearable>
<Option v-for="option in filters.prodStatus.options"
:value="option.value"
:key="option.value">{{option.label}}</Option>
... ...