Przeglądaj źródła

判断是否淘器订单

wolyshaw 4 lat temu
rodzic
commit
3c8198df9c

+ 2 - 0
src/router/index.js

@@ -184,6 +184,8 @@ export const asyncRoutes = {
   income: () => import('@/views/businessManager/orderManager/income'),
   incomeOne: () => import('@/views/businessManager/orderManager/incomeOne'),
   incomeTwo: () => import('@/views/businessManager/orderManager/incomeTwo'),
+  // 财务管理(含陶气)
+  'financeManager-taoqi': () => import('@/views/businessManager/orderManager/financeManager'),
   // 财务管理
   financeManager: () => import('@/views/businessManager/orderManager/financeManager'),
   // 充值列表

+ 16 - 2
src/views/businessManager/orderManager/financeManager.vue

@@ -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;