Merge branch 'master' into online

src/views/businessManager/orderManager/incomeOne.vue

@@ -18,12 +18,12 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="searchForm.paymentType" clearable filterable placeholder="交易类型">
+          <el-select v-model="searchForm.paymentType" @clear="onClear('paymentType')" clearable filterable placeholder="交易类型">
             <el-option v-for="(item, index) in orderStatus" :key="index" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="searchForm.paymentStatus" clearable filterable placeholder="交易状态">
+          <el-select v-model="searchForm.paymentStatus" @clear="onClear('paymentStatus')" clearable filterable placeholder="交易状态">
             <el-option v-for="(item, index) in dealStatus" :key="index" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
@@ -131,10 +131,34 @@
       this.getList()
     },
     methods: {
+      onClear(type) {
+        if(type == 'paymentType') {
+          this.searchForm.paymentType = null
+        } else if(type  == 'paymentStatus') {
+          this.searchForm.paymentStatus = null
+        }
+      },
       onOrderExport() { // 报表导出
         let url = '/api-web/export/orderList'
         let data = {
-          orderType: 1,
+          orderType: 1
+        }
+        let searchForm = this.searchForm
+        if(searchForm.paymentStatus) {
+          data.paymentStatus = searchForm.paymentStatus
+        }
+
+        if(searchForm.paymentType) {
+          data.paymentType = searchForm.paymentType
+        }
+
+        if(searchForm.organId) {
+          data.organId = searchForm.organId
+        }
+
+        if(searchForm.orderStartDate && searchForm.orderEndDate) {
+          data.orderStartDate = searchForm.orderStartDate
+          data.orderEndDate = searchForm.orderEndDate
         }
         const options = {
           method: 'POST',

src/views/businessManager/orderManager/incomeTwo.vue

@@ -36,6 +36,7 @@
           <el-select v-model="searchForm.paymentType"
                      clearable
                      filterable
+                      @clear="onClear('paymentType')"
                      placeholder="交易类型">
             <el-option v-for="(item, index) in orderStatus"
                        :key="index"
@@ -47,6 +48,7 @@
           <el-select v-model="searchForm.paymentStatus"
                      clearable
                      filterable
+                     @clear="onClear('paymentStatus')"
                      placeholder="交易状态">
             <el-option v-for="(item, index) in dealStatus"
                        :key="index"
@@ -175,10 +177,34 @@ export default {
     this.getList()
   },
   methods: {
+    onClear(type) {
+      if(type == 'paymentType') {
+        this.searchForm.paymentType = null
+      } else if(type  == 'paymentStatus') {
+        this.searchForm.paymentStatus = null
+      }
+    },
     onOrderExport() { // 报表导出
       let url = '/api-web/export/orderList'
       let data = {
-        orderType: 2,
+        orderType: 2
+      }
+      let searchForm = this.searchForm
+      if(searchForm.paymentStatus) {
+        data.paymentStatus = searchForm.paymentStatus
+      }
+
+      if(searchForm.paymentType) {
+        data.paymentType = searchForm.paymentType
+      }
+
+      if(searchForm.organId) {
+        data.organId = searchForm.organId
+      }
+
+      if(searchForm.orderStartDate && searchForm.orderEndDate) {
+        data.orderStartDate = searchForm.orderStartDate
+        data.orderEndDate = searchForm.orderEndDate
       }
       const options = {
         method: 'POST',