|
@@ -49,7 +49,7 @@
|
|
|
</a-col>
|
|
|
<a-col :md="4" :sm="24">
|
|
|
<a-form-model-item label="所在省份">
|
|
|
- <a-select v-model="queryParam.dealerProvinceSn" allowClear placeholder="请选择省">
|
|
|
+ <a-select v-model="queryParam.provinceSn" allowClear placeholder="请选择省">
|
|
|
<a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-model-item>
|
|
@@ -185,7 +185,7 @@ export default {
|
|
|
productTypeSn2: '', // 产品二级分类
|
|
|
productTypeSn3: '', // 产品三级分类
|
|
|
subareaSn: undefined,
|
|
|
- dealerProvinceSn: undefined
|
|
|
+ provinceSn: undefined
|
|
|
},
|
|
|
productType: [],
|
|
|
rules: {
|
|
@@ -197,7 +197,21 @@ export default {
|
|
|
loadData: parameter => {
|
|
|
this.disabled = true
|
|
|
this.spinning = true
|
|
|
- const params = Object.assign(parameter, this.queryParam)
|
|
|
+ const params = Object.assign(parameter, this.queryParam, {
|
|
|
+ // 产品相关查询
|
|
|
+ productEntity: {
|
|
|
+ productBrandSn: this.queryParam.productBrandSn,
|
|
|
+ code: this.queryParam.productCode,
|
|
|
+ name: this.queryParam.productName,
|
|
|
+ productTypeSn1: this.queryParam.productTypeSn1,
|
|
|
+ productTypeSn2: this.queryParam.productTypeSn2,
|
|
|
+ productTypeSn3: this.queryParam.productTypeSn3
|
|
|
+ },
|
|
|
+ // 品牌分类
|
|
|
+ productBrandEntity: {
|
|
|
+ brandType: this.queryParam.productBrandTypeSn
|
|
|
+ }
|
|
|
+ })
|
|
|
delete params.time
|
|
|
return allocateReturnReportDetailQueryPage(params).then(res => {
|
|
|
let data
|
|
@@ -309,7 +323,7 @@ export default {
|
|
|
this.queryParam.productTypeSn2 = ''
|
|
|
this.queryParam.productTypeSn3 = ''
|
|
|
this.queryParam.subareaSn = undefined
|
|
|
- this.queryParam.dealerProvinceSn = undefined
|
|
|
+ this.queryParam.provinceSn = undefined
|
|
|
this.productType = []
|
|
|
this.totalData = null
|
|
|
this.$refs.ruleForm.resetFields()
|