diff --git a/src/views/company/claim/index.vue b/src/views/company/claim/index.vue index fc086ee..7304842 100644 --- a/src/views/company/claim/index.vue +++ b/src/views/company/claim/index.vue @@ -154,7 +154,6 @@ -
申请单关联
@@ -280,7 +279,7 @@ export default { } ] }, - times:null + times: null }; }, // 计算属性 @@ -676,6 +675,8 @@ export default { this.$nextTick(() => { this.$refs.BottomBtn.handleFilterBtnList() }) + // this.handleInitForm(this.form.expenseApplyIds || []) + this.handleGetInvoiceList(this.form.expenseApplyIds || []) }).finally(() => { this.$loading(false, 'loadingSb') }) @@ -753,27 +754,8 @@ export default { ] }) }, - handleInitList() { - console.log('......'); - this.$loading(true) - return new Promise((resolve) => { - listData({ - pageNo: 1, - pageSize: this.$store.getters.requestPageSize, - dictType: 'bs_trip_type', - }).then((res) => { - // 出差类型 - this.tripTypeList = res.data.list || [] - console.log('tripTypeList..', this.tripTypeList); - }) - listData({ - pageNo: 1, - pageSize: this.$store.getters.requestPageSize, - dictType: 'bs_fee_type', - }).then((res) => { - // 出差类型 - this.feeTypeList = res.data.list || [] - }) + handleGetInvoiceList(ids = []) { + return new Promise(resolve => { getInvoicePage({ pageNo: 1, pageSize: this.$store.getters.requestPageSize, @@ -784,7 +766,7 @@ export default { pageSize: 1000, billType: this.$route.query.billType === 'RCBX' ? 'RCSQ' : 'CLSQ', expenseFlag: 0, - ids: [], + ids: ids.length ? ids.join(',') : null, sortingFieldStr: encodeURIComponent(JSON.stringify([{ field: 'id', order: "desc" }])) }).then((res) => { @@ -824,13 +806,36 @@ export default { disabled: item.status != 2 ? true : false } }) - console.log(this.expenseApplyList) - console.log('dkldsjlkdsjl') + console.log('this.expenseApplyList', this.expenseApplyList.filter(item => item.id == 179)) resolve() this.$loading(false) }) }) - + }) + }, + handleInitList() { + this.$loading(true) + return new Promise((resolve) => { + listData({ + pageNo: 1, + pageSize: this.$store.getters.requestPageSize, + dictType: 'bs_trip_type', + }).then((res) => { + // 出差类型 + this.tripTypeList = res.data.list || [] + console.log('tripTypeList..', this.tripTypeList); + }) + listData({ + pageNo: 1, + pageSize: this.$store.getters.requestPageSize, + dictType: 'bs_fee_type', + }).then((res) => { + // 出差类型 + this.feeTypeList = res.data.list || [] + }) + this.handleGetInvoiceList([]).then(() => { + resolve() + }) }) },