|
@@ -32,16 +32,7 @@
|
|
|
<template v-if="advanced">
|
|
|
<a-col :md="7" :sm="24">
|
|
|
<a-form-model-item label="产品品牌">
|
|
|
- <a-select
|
|
|
- placeholder="请选择"
|
|
|
- id="allocationDetailsList-productBrandSn"
|
|
|
- allowClear
|
|
|
- v-model="queryParam.productBrandSn"
|
|
|
- :showSearch="true"
|
|
|
- option-filter-prop="children"
|
|
|
- :filter-option="filterOption">
|
|
|
- <a-select-option v-for="item in productBrandList" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
|
|
|
- </a-select>
|
|
|
+ <ProductBrand id="allocationDetailsList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -176,10 +167,11 @@ import { productBrandQuery } from '@/api/productBrand'
|
|
|
import { productTypeQuery } from '@/api/productType'
|
|
|
import { getArea } from '@/api/data'
|
|
|
import { allocateTypeAllList } from '@/api/allocateType'
|
|
|
+import ProductBrand from '@/views/common/productBrand.js'
|
|
|
import { userQueryList } from '@/api/power-user'
|
|
|
import { allocateReportDetailList, allocateReportDetailCount, allocateReportDetailExport } from '@/api/allocateReport'
|
|
|
export default {
|
|
|
- components: { STable, VSelect, rangeDate, subarea },
|
|
|
+ components: { STable, VSelect, rangeDate, subarea,ProductBrand },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
@@ -378,11 +370,6 @@ export default {
|
|
|
document.body.appendChild(link)
|
|
|
link.click()
|
|
|
},
|
|
|
- filterOption (input, option) {
|
|
|
- return (
|
|
|
- option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
|
|
|
- )
|
|
|
- },
|
|
|
// 产品分类 change
|
|
|
changeProductType (val, opt) {
|
|
|
this.queryParam.productTypeSn1 = val[0] ? val[0] : ''
|