|
@@ -9,7 +9,7 @@
|
|
|
class="filter-item"
|
|
class="filter-item"
|
|
|
@keyup.enter.native="fetchData()"
|
|
@keyup.enter.native="fetchData()"
|
|
|
/>
|
|
/>
|
|
|
- <el-select v-model="selectType" v-if="isUsda" clearable style="width: 160px;margin-left: 10px;" class="filter-item">
|
|
|
|
|
|
|
+ <el-select v-model="selectType" v-if="isUsda" style="width: 160px;margin-left: 10px;" class="filter-item">
|
|
|
<el-option v-for="item in usdaTypes" :key="item.value" :label="item.label" :value="item.value" />
|
|
<el-option v-for="item in usdaTypes" :key="item.value" :label="item.label" :value="item.value" />
|
|
|
</el-select>
|
|
</el-select>
|
|
|
<el-select v-model="selectType" v-if="foodSourceIsAll" clearable style="width: 160px;margin-left: 10px;" class="filter-item">
|
|
<el-select v-model="selectType" v-if="foodSourceIsAll" clearable style="width: 160px;margin-left: 10px;" class="filter-item">
|
|
@@ -244,7 +244,7 @@ export default {
|
|
|
foodQRParams: {},
|
|
foodQRParams: {},
|
|
|
isUsda: false,
|
|
isUsda: false,
|
|
|
foodSourceIsAll: false,
|
|
foodSourceIsAll: false,
|
|
|
- usdaTypes: [{ 'label': '全部', 'value': 'ALL' }, { 'label': 'Foundation', 'value': 'USDA_FOUNDATION' },
|
|
|
|
|
|
|
+ usdaTypes: [{ 'label': 'Foundation', 'value': 'USDA_FOUNDATION' },
|
|
|
{ 'label': 'SR Legacy', 'value': 'USDA_SR_LEGACY' }, { 'label': 'Branded', 'value': 'USDA_BRANDED' },
|
|
{ 'label': 'SR Legacy', 'value': 'USDA_SR_LEGACY' }, { 'label': 'Branded', 'value': 'USDA_BRANDED' },
|
|
|
{ 'label': 'FNDDS', 'value': 'USDA_FNDDS' }],
|
|
{ 'label': 'FNDDS', 'value': 'USDA_FNDDS' }],
|
|
|
allTypes: [{ 'label': '全部', 'value': 'ALL' }, { 'label': '录入', 'value': 'ENTRY' },
|
|
allTypes: [{ 'label': '全部', 'value': 'ALL' }, { 'label': '录入', 'value': 'ENTRY' },
|
|
@@ -262,7 +262,12 @@ export default {
|
|
|
this.listQuery.orderBy = 1
|
|
this.listQuery.orderBy = 1
|
|
|
}
|
|
}
|
|
|
this.isUsda = isUsda(this.foodSource)
|
|
this.isUsda = isUsda(this.foodSource)
|
|
|
- this.foodSourceIsAll = this.foodSource === ''
|
|
|
|
|
|
|
+ if (this.isUsda) {
|
|
|
|
|
+ this.foodSource = this.foodSource === 'USDA' ? 'USDA_SR_LEGACY' : this.foodSource
|
|
|
|
|
+ this.selectType = this.foodSource
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.foodSourceIsAll = this.foodSource === ''
|
|
|
|
|
+ }
|
|
|
this.fetchData()
|
|
this.fetchData()
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|