|
|
@@ -1021,7 +1021,7 @@ export default {
|
|
|
// 详情的返回列表
|
|
|
goBack() {
|
|
|
// 初始化数据
|
|
|
- this.pageIds = []
|
|
|
+ this.pageIds = [];
|
|
|
// this.detailData = this.$options.data().detailData;
|
|
|
if (JSON.stringify(this.$route.query) != "{}") {
|
|
|
this.$router.$avueRouter.closeTag();
|
|
|
@@ -1198,19 +1198,24 @@ export default {
|
|
|
},
|
|
|
// 获取列表数据
|
|
|
onLoad(page, params = {}) {
|
|
|
- let type = null;
|
|
|
- let status = null;
|
|
|
- let billStatus = null;
|
|
|
+ let obj = {};
|
|
|
if (this.tabsValue == "申请") {
|
|
|
- type = "申请";
|
|
|
- status = 3;
|
|
|
- billStatus = 0;
|
|
|
+ obj = {
|
|
|
+ type: "申请",
|
|
|
+ status: 3,
|
|
|
+ billStatus: 0,
|
|
|
+ cashierStatus: 2
|
|
|
+ };
|
|
|
} else if (this.tabsValue == "销项") {
|
|
|
- type = "销项";
|
|
|
- status = 0;
|
|
|
+ obj = {
|
|
|
+ type: "销项",
|
|
|
+ status: 0
|
|
|
+ };
|
|
|
} else if (this.tabsValue == "已完成") {
|
|
|
- type = "销项";
|
|
|
- status = 3;
|
|
|
+ obj = {
|
|
|
+ type: "销项",
|
|
|
+ status: 3
|
|
|
+ };
|
|
|
}
|
|
|
if (!this.query.dateList) {
|
|
|
this.query.invoiceDateStart = null;
|
|
|
@@ -1222,9 +1227,7 @@ export default {
|
|
|
this.loading = true;
|
|
|
fininvoicesList(page.currentPage, page.pageSize, {
|
|
|
...Object.assign(params, this.query),
|
|
|
- type: type,
|
|
|
- status: status,
|
|
|
- billStatus: billStatus
|
|
|
+ ...obj
|
|
|
}).then(res => {
|
|
|
const data = res.data.data;
|
|
|
if (this.tabsValue == "申请") {
|