|
@@ -19,18 +19,18 @@
|
|
|
<rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="产品名称">
|
|
|
<a-input id="allocationDetailsList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="品牌分类">
|
|
|
<v-select code="BRAND_TYPE" id="allocationDetailsList-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
|
- <a-col :md="7" :sm="24">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="产品品牌">
|
|
|
<ProductBrand id="allocationDetailsList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
|
|
|
</a-form-model-item>
|
|
@@ -59,16 +59,7 @@
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="产品分类">
|
|
|
- <a-cascader
|
|
|
- @change="changeProductType"
|
|
|
- expand-trigger="hover"
|
|
|
- change-on-select
|
|
|
- :options="productTypeList"
|
|
|
- :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
|
|
|
- id="allocationDetailsList-productType"
|
|
|
- placeholder="请选择产品分类"
|
|
|
- allowClear
|
|
|
- v-model="productType" />
|
|
|
+ <ProductType id="allocationDetailsList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -152,11 +143,10 @@ import { STable, VSelect } from '@/components'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
import reportModal from '@/views/common/reportModal.vue'
|
|
|
import subarea from '@/views/common/subarea.js'
|
|
|
-import { productBrandQuery } from '@/api/productBrand'
|
|
|
-import { productTypeQuery } from '@/api/productType'
|
|
|
import Area from '@/views/common/area.js'
|
|
|
import { allocateTypeAllList } from '@/api/allocateType'
|
|
|
import ProductBrand from '@/views/common/productBrand.js'
|
|
|
+import ProductType from '@/views/common/productType.js'
|
|
|
import { hdExportExcel } from '@/libs/exportExcel'
|
|
|
import { userQueryList } from '@/api/power-user'
|
|
|
import AllocateType from '@/views/common/allocateType.js'
|
|
@@ -164,7 +154,7 @@ import { allocateReportDetailList, allocateReportDetailCount, allocateReportDeta
|
|
|
export default {
|
|
|
name: 'AllocationDetailsList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, rangeDate, subarea, Area, ProductBrand, reportModal, AllocateType },
|
|
|
+ components: { STable, VSelect, rangeDate, subarea, Area, ProductBrand, reportModal, AllocateType, ProductType },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
@@ -243,7 +233,6 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
allocateTypeList: [], // 调拨类型
|
|
|
- productTypeList: [], // 分类下拉数据
|
|
|
operatorList: [], // 操作员下拉数据
|
|
|
totalData: null // 合计
|
|
|
}
|
|
@@ -397,16 +386,6 @@ export default {
|
|
|
this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
|
|
|
this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
|
|
|
},
|
|
|
- // 产品分类 列表
|
|
|
- getProductType () {
|
|
|
- productTypeQuery({}).then(res => {
|
|
|
- if (res.status == 200) {
|
|
|
- this.productTypeList = res.data
|
|
|
- } else {
|
|
|
- this.productTypeList = []
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
// 调拨类型
|
|
|
getAllocateTypeAllList () {
|
|
|
allocateTypeAllList().then(res => {
|
|
@@ -428,7 +407,6 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
pageInit () {
|
|
|
- this.getProductType()
|
|
|
this.getAllocateTypeAllList()
|
|
|
this.getUserList()
|
|
|
this.resetSearchForm()
|