|
@@ -634,6 +634,15 @@ let that;
|
|
|
export default {
|
|
|
components: { pagination,Tooltip },
|
|
|
name: "incomeTwo",
|
|
|
+ computed: {
|
|
|
+ extraQuery() {
|
|
|
+ const data = {}
|
|
|
+ if (this.$route.path === '/orderList/financeManager') {
|
|
|
+ data.noneTqType = '1'
|
|
|
+ }
|
|
|
+ return data
|
|
|
+ }
|
|
|
+ },
|
|
|
data() {
|
|
|
return {
|
|
|
orderStatus: orderStatus,
|
|
@@ -837,6 +846,7 @@ export default {
|
|
|
organId: searchForm.organId,
|
|
|
lessBalancePaymentAmount: searchForm.lessBalancePaymentAmount,
|
|
|
lessActualAmount: searchForm.lessActualAmount,
|
|
|
+ ...this.extraQuery
|
|
|
};
|
|
|
|
|
|
if (this.searchForm.orderDate && this.searchForm.orderDate.length > 0) {
|
|
@@ -894,7 +904,9 @@ export default {
|
|
|
onAdaPayExport() {
|
|
|
// 报表导出
|
|
|
let url = "/api-web/adapay/exportBill";
|
|
|
- let data = {};
|
|
|
+ let data = {
|
|
|
+ ...this.extraQuery
|
|
|
+ };
|
|
|
if (this.searchForm.orderDate && this.searchForm.orderDate.length > 0) {
|
|
|
data.startTime = this.searchForm.orderDate[0];
|
|
|
data.endTime = this.searchForm.orderDate[1];
|
|
@@ -944,7 +956,9 @@ export default {
|
|
|
},
|
|
|
getList() {
|
|
|
// let params = JSON.parse(JSON.stringify(this.searchForm));
|
|
|
- let params = Object.assign({}, this.searchForm);
|
|
|
+ let params = Object.assign({
|
|
|
+ ...this.extraQuery
|
|
|
+ }, this.searchForm);
|
|
|
// let params = {...this.searchForm}
|
|
|
params.rows = this.pageInfo.limit;
|
|
|
params.page = this.pageInfo.page;
|