|
@@ -710,7 +710,9 @@ export default {
|
|
this.NoRebateWalletList2.push(
|
|
this.NoRebateWalletList2.push(
|
|
{
|
|
{
|
|
id: k.walletId,
|
|
id: k.walletId,
|
|
- name: k.walletName
|
|
|
|
|
|
+ name: k.walletName,
|
|
|
|
+ createTime: k.createTime
|
|
|
|
+
|
|
}
|
|
}
|
|
)
|
|
)
|
|
NoRebateWalletListId.push(k.walletId)
|
|
NoRebateWalletListId.push(k.walletId)
|
|
@@ -718,12 +720,15 @@ export default {
|
|
if (k.walletId2) {
|
|
if (k.walletId2) {
|
|
this.rebateList2.push({
|
|
this.rebateList2.push({
|
|
walletRebateId: k.walletId2,
|
|
walletRebateId: k.walletId2,
|
|
- name: k.walletName2
|
|
|
|
|
|
+ name: k.walletName2,
|
|
|
|
+ createTime: k.createTime
|
|
})
|
|
})
|
|
rebateListId.push(k.walletId2)
|
|
rebateListId.push(k.walletId2)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
})
|
|
})
|
|
|
|
+ this.handleUpdateTime()
|
|
|
|
+
|
|
if (NoRebateWalletListId.length && this.importWallet.id && !~NoRebateWalletListId.indexOf(this.importWallet.id)) {
|
|
if (NoRebateWalletListId.length && this.importWallet.id && !~NoRebateWalletListId.indexOf(this.importWallet.id)) {
|
|
this.NoRebateWalletList2.push(this.importWallet)
|
|
this.NoRebateWalletList2.push(this.importWallet)
|
|
NoRebateWalletListId.push(this.importWallet.id)
|
|
NoRebateWalletListId.push(this.importWallet.id)
|
|
@@ -1290,12 +1295,14 @@ export default {
|
|
const rebateListId = []
|
|
const rebateListId = []
|
|
const NoRebateWalletListId = []
|
|
const NoRebateWalletListId = []
|
|
this.priceList.forEach(k => {
|
|
this.priceList.forEach(k => {
|
|
|
|
+ console.log(k, 999)
|
|
if (k.priceTypeName === row.priceType) {
|
|
if (k.priceTypeName === row.priceType) {
|
|
if (k.walletId) {
|
|
if (k.walletId) {
|
|
this.NoRebateWalletList2.push(
|
|
this.NoRebateWalletList2.push(
|
|
{
|
|
{
|
|
id: k.walletId,
|
|
id: k.walletId,
|
|
- name: k.walletName
|
|
|
|
|
|
+ name: k.walletName,
|
|
|
|
+ createTime: k.createTime
|
|
}
|
|
}
|
|
)
|
|
)
|
|
NoRebateWalletListId.push(k.walletId)
|
|
NoRebateWalletListId.push(k.walletId)
|
|
@@ -1304,11 +1311,15 @@ export default {
|
|
rebateListId.push(k.walletId2)
|
|
rebateListId.push(k.walletId2)
|
|
this.rebateList2.push({
|
|
this.rebateList2.push({
|
|
walletRebateId: k.walletId2,
|
|
walletRebateId: k.walletId2,
|
|
- name: k.walletName2
|
|
|
|
|
|
+ name: k.walletName2,
|
|
|
|
+ createTime: k.createTime
|
|
|
|
+
|
|
})
|
|
})
|
|
}
|
|
}
|
|
}
|
|
}
|
|
})
|
|
})
|
|
|
|
+ this.handleUpdateTime()
|
|
|
|
+
|
|
if (row.ovalWalletIds && row.ovalWalletIds.length) {
|
|
if (row.ovalWalletIds && row.ovalWalletIds.length) {
|
|
row.ovalWalletIds.forEach(k => {
|
|
row.ovalWalletIds.forEach(k => {
|
|
if (!~NoRebateWalletListId.indexOf(k)) {
|
|
if (!~NoRebateWalletListId.indexOf(k)) {
|
|
@@ -1323,7 +1334,6 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
}
|
|
}
|
|
- console.log(row.ovalRebateWalletIds, this.rebateList)
|
|
|
|
if (row.ovalRebateWalletIds && row.ovalRebateWalletIds.length) {
|
|
if (row.ovalRebateWalletIds && row.ovalRebateWalletIds.length) {
|
|
row.ovalRebateWalletIds.forEach(k => {
|
|
row.ovalRebateWalletIds.forEach(k => {
|
|
if (!~rebateListId.indexOf(k)) {
|
|
if (!~rebateListId.indexOf(k)) {
|
|
@@ -1338,14 +1348,23 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
}
|
|
}
|
|
-
|
|
|
|
this.$set(row, 'walletIds', [...new Set([...row.walletIds, ...NoRebateWalletListId])])
|
|
this.$set(row, 'walletIds', [...new Set([...row.walletIds, ...NoRebateWalletListId])])
|
|
this.$set(row, 'rebateWalletIds', [...new Set([...row.rebateWalletIds, ...rebateListId])])
|
|
this.$set(row, 'rebateWalletIds', [...new Set([...row.rebateWalletIds, ...rebateListId])])
|
|
this.dataList[index].walletIds = [...new Set([...row.walletIds, ...NoRebateWalletListId])]
|
|
this.dataList[index].walletIds = [...new Set([...row.walletIds, ...NoRebateWalletListId])]
|
|
this.dataList[index].rebateWalletIds = [...new Set([...row.rebateWalletIds, ...rebateListId])]
|
|
this.dataList[index].rebateWalletIds = [...new Set([...row.rebateWalletIds, ...rebateListId])]
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
+ },
|
|
|
|
+ handleUpdateTime() {
|
|
|
|
+ this.NoRebateWalletList2 = this.NoRebateWalletList2.sort((a, b) => {
|
|
|
|
+ return new Date(a.createTime).getTime() - new Date(b.createTime).getTime()
|
|
|
|
+ })
|
|
|
|
+ this.rebateList2 = this.rebateList2.sort((a, b) => {
|
|
|
|
+ return new Date(a.createTime).getTime() - new Date(b.createTime).getTime()
|
|
|
|
+ })
|
|
|
|
+ console.log(this.NoRebateWalletList2, this.rebateList2)
|
|
}
|
|
}
|
|
|
|
+
|
|
},
|
|
},
|
|
components: {
|
|
components: {
|
|
// Transfer,
|
|
// Transfer,
|