Merge branch 'master' into online

src/views/businessManager/orderManager/income.vue

@@ -109,7 +109,7 @@
           <el-table-column align='center'
                            label="收款账户">
             <template slot-scope="scope">
-              {{ scope.row.paymentChannelType | paymentChannelType }}
+              {{ scope.row.merNos }}
             </template>
           </el-table-column>
           <el-table-column align='center'

src/views/businessManager/orderManager/incomeOne.vue

@@ -61,7 +61,7 @@
           </el-table-column>
           <el-table-column align='center' label="收款账户">
             <template slot-scope="scope">
-              {{ scope.row.paymentChannelType | paymentChannelType }}
+              {{ scope.row.merNos }}
             </template>
           </el-table-column>
           <el-table-column align='center' label="交易状态">
@@ -107,7 +107,7 @@
         searchForm: {
           orderStartDate: null,
           orderEndDate: null,
-          paymentStatus: null,
+          paymentStatus: 'SUCCESS',
           paymentType: null,
           organId: null
         },

src/views/businessManager/orderManager/incomeTwo.vue

@@ -110,7 +110,7 @@
           <el-table-column align='center'
                            label="收款账户">
             <template slot-scope="scope">
-              {{ scope.row.paymentChannelType | paymentChannelType }}
+              {{ scope.row.merNos }}
             </template>
           </el-table-column>
           <el-table-column align='center'