|
@@ -13,7 +13,7 @@
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="日期">
|
|
<a-form-item label="日期">
|
|
- <rangeDate ref="rangeDate" />
|
|
|
|
|
|
+ <rangeDate ref="rangeDate" @change="dateChange"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
@@ -220,7 +220,20 @@ export default {
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
if (this.queryParam.beginDate) {
|
|
if (this.queryParam.beginDate) {
|
|
this.disabled = true
|
|
this.disabled = true
|
|
- return reportPageList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
|
|
|
+ const params = {
|
|
|
|
+ beginDate: this.queryParam.beginDate,
|
|
|
|
+ endDate: this.queryParam.endDate,
|
|
|
|
+ productEntity: {
|
|
|
|
+ code: this.queryParam.code, // 产品编码
|
|
|
|
+ name: this.queryParam.name, // 产品名称
|
|
|
|
+ origCode: this.queryParam.origCode, // 原厂编码
|
|
|
|
+ productBrandSn: this.queryParam.productBrandSn, // 产品品牌
|
|
|
|
+ productTypeSn1: this.queryParam.productTypeSn1, // 产品一级分类
|
|
|
|
+ productTypeSn2: this.queryParam.productTypeSn2, // 产品二级分类
|
|
|
|
+ productTypeSn3: this.queryParam.productTypeSn3 // 产品三级分类
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return reportPageList(Object.assign(parameter, params)).then(res => {
|
|
const data = res.data
|
|
const data = res.data
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
@@ -242,6 +255,11 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ // 时间 change
|
|
|
|
+ dateChange (date) {
|
|
|
|
+ this.queryParam.beginDate = date[0]
|
|
|
|
+ this.queryParam.endDate = date[1]
|
|
|
|
+ },
|
|
// 查询
|
|
// 查询
|
|
handleSearch () {
|
|
handleSearch () {
|
|
this.$refs.ruleForm.validate(valid => {
|
|
this.$refs.ruleForm.validate(valid => {
|
|
@@ -259,9 +277,22 @@ export default {
|
|
},
|
|
},
|
|
// 查询总计
|
|
// 查询总计
|
|
getTotal () {
|
|
getTotal () {
|
|
- linkageReportTotal(this.queryParam).then(res => {
|
|
|
|
- if (res.status == 200) {
|
|
|
|
- console.log(res, 'rrrrrrrrr')
|
|
|
|
|
|
+ const params = {
|
|
|
|
+ beginDate: this.queryParam.beginDate,
|
|
|
|
+ endDate: this.queryParam.endDate,
|
|
|
|
+ productEntity: {
|
|
|
|
+ code: this.queryParam.code, // 产品编码
|
|
|
|
+ name: this.queryParam.name, // 产品名称
|
|
|
|
+ origCode: this.queryParam.origCode, // 原厂编码
|
|
|
|
+ productBrandSn: this.queryParam.productBrandSn, // 产品品牌
|
|
|
|
+ productTypeSn1: this.queryParam.productTypeSn1, // 产品一级分类
|
|
|
|
+ productTypeSn2: this.queryParam.productTypeSn2, // 产品二级分类
|
|
|
|
+ productTypeSn3: this.queryParam.productTypeSn3 // 产品三级分类
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ linkageReportTotal(params).then(res => {
|
|
|
|
+ if (res.status == 200 && res.data) {
|
|
|
|
+ // console.log(res, 'rrrrrrrrr')
|
|
this.totalData = res.data
|
|
this.totalData = res.data
|
|
} else {
|
|
} else {
|
|
this.totalData = {}
|
|
this.totalData = {}
|
|
@@ -289,7 +320,7 @@ export default {
|
|
},
|
|
},
|
|
// 产品品牌 列表
|
|
// 产品品牌 列表
|
|
getProductBrand () {
|
|
getProductBrand () {
|
|
- dealerProductBrandQuery({ 'sysFlag': '0' }).then(res => {
|
|
|
|
|
|
+ dealerProductBrandQuery({}).then(res => {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
this.productBrandList = res.data
|
|
this.productBrandList = res.data
|
|
} else {
|
|
} else {
|
|
@@ -299,7 +330,7 @@ export default {
|
|
},
|
|
},
|
|
// 产品分类 列表
|
|
// 产品分类 列表
|
|
getProductType () {
|
|
getProductType () {
|
|
- dealerProductTypeList({ 'sysFlag': '0' }).then(res => {
|
|
|
|
|
|
+ dealerProductTypeList({}).then(res => {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
this.productTypeList = res.data
|
|
this.productTypeList = res.data
|
|
} else {
|
|
} else {
|