|
@@ -58,14 +58,18 @@ export default {
|
|
|
if (this.user.role == '4') {
|
|
|
let create_userid = this.user.uid;
|
|
|
let res = await this.transactionList({ create_userid, status: '4' });
|
|
|
+ let arr = await this.transactionList({ create_userid, status: '2' });
|
|
|
if (this.$checkRes(res)) {
|
|
|
- this.$set(this, `list`, res.data);
|
|
|
+ var newData = res.data.concat(arr.data);
|
|
|
+ this.$set(this, `list`, newData);
|
|
|
}
|
|
|
} else {
|
|
|
let userid = this.user.uid;
|
|
|
let res = await this.transactionList({ status: '4' });
|
|
|
+ let arr = await this.transactionList({ status: '2' });
|
|
|
if (this.$checkRes(res)) {
|
|
|
- this.$set(this, `list`, res.data);
|
|
|
+ var newData = res.data.concat(arr.data);
|
|
|
+ this.$set(this, `list`, newData);
|
|
|
}
|
|
|
}
|
|
|
},
|