|
@@ -106,8 +106,6 @@ import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
|
|
import { dealerProductTypeList } from '@/api/dealerProductType'
|
|
import { dealerProductTypeList } from '@/api/dealerProductType'
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
import { linkageReportPageList, linkageReportPageTotal } from '@/api/reportData.js'
|
|
import { linkageReportPageList, linkageReportPageTotal } from '@/api/reportData.js'
|
|
-// import { allocateBillList, allocateBillDel, allocateBillAudit, allocateBillExport } from '@/api/allocateBill'
|
|
|
|
-// import { allocateTypeAllList } from '@/api/allocateType'
|
|
|
|
export default {
|
|
export default {
|
|
components: { STable, VSelect, rangeDate },
|
|
components: { STable, VSelect, rangeDate },
|
|
data () {
|
|
data () {
|
|
@@ -155,7 +153,7 @@ export default {
|
|
},
|
|
},
|
|
{ title: '产品名称',
|
|
{ title: '产品名称',
|
|
dataIndex: 'name',
|
|
dataIndex: 'name',
|
|
- width: 220,
|
|
|
|
|
|
+ width: 220,
|
|
align: 'center',
|
|
align: 'center',
|
|
customRender: function (value, row, index) {
|
|
customRender: function (value, row, index) {
|
|
value = value || '--'
|
|
value = value || '--'
|
|
@@ -231,32 +229,38 @@ export default {
|
|
loadData: async parameter => {
|
|
loadData: async parameter => {
|
|
if (this.queryParam.beginDate) {
|
|
if (this.queryParam.beginDate) {
|
|
this.disabled = true
|
|
this.disabled = true
|
|
- const params = {
|
|
|
|
- beginDate: this.queryParam.beginDate,
|
|
|
|
- endDate: this.queryParam.endDate,
|
|
|
|
- targetName: this.queryParam.targetName,
|
|
|
|
- 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 // 产品三级分类
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ const params = {
|
|
|
|
+ beginDate: this.queryParam.beginDate,
|
|
|
|
+ endDate: this.queryParam.endDate,
|
|
|
|
+ targetName: this.queryParam.targetName,
|
|
|
|
+ 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 linkageReportPageList(Object.assign(parameter, params)).then(res => {
|
|
return linkageReportPageList(Object.assign(parameter, params)).then(res => {
|
|
- const data = res.data
|
|
|
|
- const no = (data.pageNo - 1) * data.pageSize
|
|
|
|
- for (var i = 0; i < data.list.length; i++) {
|
|
|
|
- data.list[i].no = no + i + 1
|
|
|
|
- }
|
|
|
|
- this.disabled = false
|
|
|
|
- return data
|
|
|
|
|
|
+ const data = res.data
|
|
|
|
+ const no = (data.pageNo - 1) * data.pageSize
|
|
|
|
+ for (var i = 0; i < data.list.length; i++) {
|
|
|
|
+ data.list[i].no = no + i + 1
|
|
|
|
+ }
|
|
|
|
+ this.disabled = false
|
|
|
|
+ return data
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
return new Promise(function (resolve, reject) {
|
|
return new Promise(function (resolve, reject) {
|
|
- resolve([])
|
|
|
|
|
|
+ const data = {
|
|
|
|
+ pageNo: 1,
|
|
|
|
+ pageSize: 10,
|
|
|
|
+ list: [],
|
|
|
|
+ count: 10
|
|
|
|
+ }
|
|
|
|
+ resolve(data)
|
|
})
|
|
})
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -264,7 +268,7 @@ export default {
|
|
productBrandList: [], // 品牌下拉数据
|
|
productBrandList: [], // 品牌下拉数据
|
|
productTypeList: [], // 分类下拉数据
|
|
productTypeList: [], // 分类下拉数据
|
|
allocateTypeList: [], // 调拨类型
|
|
allocateTypeList: [], // 调拨类型
|
|
- totalData: {} // 合计
|
|
|
|
|
|
+ totalData: {} // 合计
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
@@ -276,7 +280,7 @@ export default {
|
|
// 查询
|
|
// 查询
|
|
handleSearch () {
|
|
handleSearch () {
|
|
if (!this.queryParam.beginDate) {
|
|
if (!this.queryParam.beginDate) {
|
|
- return this.$message.error('请先选择日期')
|
|
|
|
|
|
+ return this.$message.error('请先选择日期')
|
|
}
|
|
}
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
this.getTotal()
|
|
this.getTotal()
|
|
@@ -286,7 +290,7 @@ export default {
|
|
// return this.$message.error('请先选择日期')
|
|
// return this.$message.error('请先选择日期')
|
|
// }
|
|
// }
|
|
// this.$refs.table.refresh(true)
|
|
// this.$refs.table.refresh(true)
|
|
- // this.getTotal()
|
|
|
|
|
|
+ // this.getTotal()
|
|
// } else {
|
|
// } else {
|
|
// console.log('error submit!!')
|
|
// console.log('error submit!!')
|
|
// return false
|
|
// return false
|
|
@@ -296,22 +300,21 @@ export default {
|
|
// 查询总计
|
|
// 查询总计
|
|
getTotal () {
|
|
getTotal () {
|
|
const params = {
|
|
const params = {
|
|
- beginDate: this.queryParam.beginDate,
|
|
|
|
- endDate: this.queryParam.endDate,
|
|
|
|
- targetName: this.queryParam.targetName,
|
|
|
|
- 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 // 产品三级分类
|
|
|
|
- }
|
|
|
|
|
|
+ beginDate: this.queryParam.beginDate,
|
|
|
|
+ endDate: this.queryParam.endDate,
|
|
|
|
+ targetName: this.queryParam.targetName,
|
|
|
|
+ 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 // 产品三级分类
|
|
|
|
+ }
|
|
}
|
|
}
|
|
linkageReportPageTotal(params).then(res => {
|
|
linkageReportPageTotal(params).then(res => {
|
|
if (res.status == 200 && res.data) {
|
|
if (res.status == 200 && res.data) {
|
|
- console.log(res, 'rrrrrrrrr')
|
|
|
|
this.totalData = res.data
|
|
this.totalData = res.data
|
|
} else {
|
|
} else {
|
|
this.totalData = {}
|
|
this.totalData = {}
|
|
@@ -340,10 +343,8 @@ export default {
|
|
// 产品品牌 列表
|
|
// 产品品牌 列表
|
|
getProductBrand () {
|
|
getProductBrand () {
|
|
dealerProductBrandQuery({}).then(res => {
|
|
dealerProductBrandQuery({}).then(res => {
|
|
- console.log(res, 'rrrrrr')
|
|
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
this.productBrandList = res.data
|
|
this.productBrandList = res.data
|
|
- console.log(this.productBrandList, res, '--------pinpai--------')
|
|
|
|
} else {
|
|
} else {
|
|
this.productBrandList = []
|
|
this.productBrandList = []
|
|
}
|
|
}
|