|
@@ -561,14 +561,14 @@ export default {
|
|
]
|
|
]
|
|
// 根据权限及勾选按固定顺序动态显示列
|
|
// 根据权限及勾选按固定顺序动态显示列
|
|
arr.map(item => {
|
|
arr.map(item => {
|
|
- if (this.$hasPermissions('M_salesQueryList_salesPrice')) {
|
|
|
|
- item.isShow = ['totalAmount', 'totalPushedAmount', 'totalUnpushedAmount', 'totalConvertPromoGiftsAmount'].includes(item.dataIndex)
|
|
|
|
- }
|
|
|
|
- if (this.colsArr.find(k => k.value == item.dataIndex)) {
|
|
|
|
- item.isShow = this.showCols.includes(item.dataIndex)
|
|
|
|
|
|
+ item.isShow = true
|
|
|
|
+ const arr = ['totalAmount', 'totalPushedAmount', 'totalUnpushedAmount', 'totalConvertPromoGiftsAmount']
|
|
|
|
+ item.isShow = _this.$hasPermissions('M_salesQueryList_salesPrice') ? arr.includes(item.dataIndex) : !arr.includes(item.dataIndex)
|
|
|
|
+ if (_this.colsArr.find(k => k.value == item.dataIndex)) {
|
|
|
|
+ item.isShow = _this.showCols.includes(item.dataIndex)
|
|
}
|
|
}
|
|
})
|
|
})
|
|
- return arr.filter(item => !this.colsArr.find(k => k.value == item.dataIndex) || item.isShow)
|
|
|
|
|
|
+ return arr.filter(item => item.isShow)
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|