|
@@ -147,27 +147,31 @@ export default {
|
|
// 格式化数据
|
|
// 格式化数据
|
|
let ret = []
|
|
let ret = []
|
|
let no = 0
|
|
let no = 0
|
|
- listData.map((item, i) => {
|
|
|
|
|
|
+ for (let i = 0; i < listData.length; i++) {
|
|
|
|
+ const item = listData[i]
|
|
const rebateScopeList = item.rebateScopeList ? this.filterData(item.rebateScopeList, queryParam) : [{ productBrandName: null, productTypeName1: null, productTypeName2: null, productTypeName3: null }]
|
|
const rebateScopeList = item.rebateScopeList ? this.filterData(item.rebateScopeList, queryParam) : [{ productBrandName: null, productTypeName1: null, productTypeName2: null, productTypeName3: null }]
|
|
const supDealerList = item.rebateDealerList.find(b => b.rebateParentType == 'SUPERIORS')
|
|
const supDealerList = item.rebateDealerList.find(b => b.rebateParentType == 'SUPERIORS')
|
|
// this.checkedDealerSn.push(rebateScopeList)
|
|
// this.checkedDealerSn.push(rebateScopeList)
|
|
- // 组织展开数据
|
|
|
|
- // rebateScopeList.map((a, j) => {
|
|
|
|
- // if (j == 0) {
|
|
|
|
- // a.rowspan = rebateScopeList.length
|
|
|
|
- // }
|
|
|
|
- // a.dealerUpsSn = item.dealerUpsSn
|
|
|
|
- // a.dealerSn = item.dealerSn
|
|
|
|
- // a.no = no + j + 1
|
|
|
|
- // if (supDealerList) {
|
|
|
|
- // a.supDealerList = supDealerList
|
|
|
|
- // a.superDealerName = supDealerList.parentDealer.dealerName
|
|
|
|
- // }
|
|
|
|
- // a.rebateDealerList = item.rebateDealerList
|
|
|
|
- // })
|
|
|
|
|
|
+
|
|
|
|
+ for (let j = 0; j < rebateScopeList.length; j++) {
|
|
|
|
+ rebateScopeList[j].no = no + j + 1
|
|
|
|
+ if (j == 0) {
|
|
|
|
+ rebateScopeList[j].rowspan = rebateScopeList.length
|
|
|
|
+ }
|
|
|
|
+ rebateScopeList[j].dealerUpsSn = item.dealerUpsSn
|
|
|
|
+ rebateScopeList[j].dealerSn = item.dealerSn
|
|
|
|
+
|
|
|
|
+ if (supDealerList) {
|
|
|
|
+ rebateScopeList[j].supDealerList = supDealerList
|
|
|
|
+ rebateScopeList[j].superDealerName = supDealerList.parentDealer.dealerName
|
|
|
|
+ }
|
|
|
|
+ rebateScopeList[j].rebateDealerList = item.rebateDealerList
|
|
|
|
+ }
|
|
|
|
+
|
|
no = no + rebateScopeList.length
|
|
no = no + rebateScopeList.length
|
|
ret = ret.concat(rebateScopeList)
|
|
ret = ret.concat(rebateScopeList)
|
|
- })
|
|
|
|
|
|
+ }
|
|
|
|
+
|
|
return ret
|
|
return ret
|
|
},
|
|
},
|
|
searchTable (queryParam) {
|
|
searchTable (queryParam) {
|