diff --git a/src/components/order/cashOut.vue b/src/components/order/cashOut.vue
index f8af3b5..9b52a4d 100644
--- a/src/components/order/cashOut.vue
+++ b/src/components/order/cashOut.vue
@@ -1,13 +1,40 @@
 <template>
 <div style="height:95%">
-  <el-input
-    placeholder="请输入内容"
-    style="width:18%;"
-    size='small'
-    v-model="search_info">
-    <i slot="prefix" class="el-input__icon el-icon-search"></i>
-  </el-input>
-  <el-button size='small' @click="search()" type="primary" icon="el-icon-search">搜索</el-button>
+  <el-button  v-if="$local.isRoot()" size="small" @click="exportData()" plain>导出数据</el-button>
+  <div style="float:right">
+    <el-date-picker
+      v-model="search_month"
+      type="daterange"
+      align="right"
+      size="small"
+      style="margin-right:5px;width: 200px;"
+      start-placeholder="申请日期"
+      end-placeholder="申请日期">
+    </el-date-picker>
+    <el-select style="width:150px;" v-model="search_info.status" size='small' clearable placeholder="请选择处理状态">
+      <el-option
+        v-for="item in search_status"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value">
+      </el-option>
+    </el-select>
+    <el-input
+      placeholder="请输入操作人员登陆名称"
+      style="width:200px;"
+      size='small'
+      v-model="search_info.op_user">
+      <i slot="prefix" class="el-input__icon el-icon-search"></i>
+    </el-input>
+    <el-input
+      placeholder="请输入用户名"
+      style="width:18%;"
+      size='small'
+      v-model="search_info.username">
+      <i slot="prefix" class="el-input__icon el-icon-search"></i>
+    </el-input>
+    <el-button size='small' @click="search()" type="primary" icon="el-icon-search">搜索</el-button>
+  </div>
   <el-table :row-class-name="tableRowClassName" :show-overflow-tooltip="true" :data="tableData" height="calc(100% - 120px)" style="width: 100%">
     <el-table-column prop="username" label="用户" width="100"> </el-table-column>
     <el-table-column prop="money" label="提现金额" width="100"> </el-table-column>
@@ -88,9 +115,28 @@ export default {
       dialogFormVisible: false,
       form: {},
       formLabelWidth: '120px',
-      search_info: '',
       row_info: '',
-      clickOk: false
+      clickOk: false,
+      search_status: [{
+        value: '0',
+        label: '待处理'
+      }, {
+        value: '1',
+        label: '同意'
+      }, {
+        value: '2',
+        label: '拒绝'
+      }],
+      search_info: {
+        username: null,
+        op_user: null,
+        status: null,
+        create_time: {
+          st: null,
+          et: null
+        }
+      },
+      search_month: ''
     }
   },
 
@@ -153,11 +199,22 @@ export default {
       })
     },
     search () {
-      this.$api.post(this.$api.phpURL + 'order/CashOutAdmin/search', {username: this.search_info}).then(res => {
+      if (this.search_month && this.search_month.length === 2) {
+        this.search_info.create_time.st = this.search_month[0]
+        this.search_info.create_time.et = this.search_month[1]
+      }
+      this.$api.post(this.$api.phpURL + 'order/CashOutAdmin/search', {data: this.search_info}).then(res => {
         this.tableData = res.data
         this.count = parseInt(res.count)
       })
     },
+    exportData () {
+      if (this.search_month && this.search_month.length === 2) {
+        this.search_info.create_time.st = this.search_month[0]
+        this.search_info.create_time.et = this.search_month[1]
+      }
+      this.$api.getDownloadFile(this.$api.phpURL + 'order/CashOutAdmin/export', {data: this.search_info}, '提现处理.csv')
+    },
     dealStatus (info) {
       switch (info) {
         case '0':
diff --git a/src/components/order/tb_refund.vue b/src/components/order/tb_refund.vue
index f1cdc1d..c1d7b2c 100644
--- a/src/components/order/tb_refund.vue
+++ b/src/components/order/tb_refund.vue
@@ -1,19 +1,48 @@
-<!--
- * @Author: kangkang
- * @Date: 2020-10-13 19:45:55
- * @LastEditors: kangkang
- * @LastEditTime: 2020-11-02 10:20:33
--->
 <template>
 <div style="height:95%">
-  <el-input
-    placeholder="请输入会员号"
-    style="width:18%;"
-    size='small'
-    v-model="search_info">
-    <i slot="prefix" class="el-input__icon el-icon-search"></i>
-  </el-input>
-  <el-button size='small' @click="search()" type="primary" icon="el-icon-search">搜索</el-button>
+  <el-button v-if="$local.isRoot()" size="small" @click="exportData()" plain>导出数据</el-button>
+  <div style="float:right;">
+    <el-date-picker
+      v-model="search_month"
+      type="daterange"
+      align="right"
+      size="small"
+      style="margin-right:5px;width: 200px;"
+      start-placeholder="申请日期"
+      end-placeholder="申请日期">
+    </el-date-picker>
+    <el-select style="width:150px;" v-model="search_info.SellerNick" size='small' clearable placeholder="请选择淘宝店铺">
+      <el-option
+        v-for="item in SellerNicks"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value">
+      </el-option>
+    </el-select>
+    <el-select style="width:150px;" v-model="search_info.status" size='small' clearable placeholder="请选择处理状态">
+      <el-option
+        v-for="item in search_status"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value">
+      </el-option>
+    </el-select>
+    <el-input
+      placeholder="请输入操作人员登陆名称"
+      style="width:200px;"
+      size='small'
+      v-model="search_info.handle_user">
+      <i slot="prefix" class="el-input__icon el-icon-search"></i>
+    </el-input>
+    <el-input
+      placeholder="请输入会员号"
+      style="width:200px;"
+      size='small'
+      v-model="search_info.Phone">
+      <i slot="prefix" class="el-input__icon el-icon-search"></i>
+    </el-input>
+    <el-button size='small' @click="search()" type="primary" icon="el-icon-search">搜索</el-button>
+  </div>
   <el-table :row-class-name="tableRowClassName" :show-overflow-tooltip="true" :data="tableData" height="calc(100% - 120px)" style="width: 100%">
     <el-table-column prop="BuyerNick" label="淘宝会员名" > </el-table-column>
     <el-table-column prop="Phone" label="会员号" > </el-table-column>
@@ -59,8 +88,41 @@ export default {
       tableData: [],
       count: 0,
       pageNum: 1,
-      search_info: '',
-      form: {}
+      search_info: {
+        Phone: null,
+        SellerNick: null,
+        handle_user: null,
+        status: null,
+        Modified: {
+          st: null,
+          et: null
+        }
+      },
+      SellerNicks: [{
+        value: '强子pptp动态',
+        label: '强子pptp动态'
+      }, {
+        value: '可乐开发商',
+        label: '可乐开发商'
+      }, {
+        value: '老鹰动态pptp',
+        label: '老鹰动态pptp'
+      }],
+      search_status: [{
+        value: '0',
+        label: '申请中'
+      }, {
+        value: '1',
+        label: '已同意'
+      }, {
+        value: '2',
+        label: '已拒绝'
+      }, {
+        value: '3',
+        label: '已关闭'
+      }],
+      form: {},
+      search_month: ''
     }
   },
 
@@ -114,7 +176,11 @@ export default {
       })
     },
     search () {
-      this.$api.post(this.$api.phpURL + 'order/TbRefund/search', {Phone: this.search_info}).then(res => {
+      if (this.search_month && this.search_month.length === 2) {
+        this.search_info.Modified.st = this.search_month[0]
+        this.search_info.Modified.et = this.search_month[1]
+      }
+      this.$api.post(this.$api.phpURL + 'order/TbRefund/search', {data: this.search_info}).then(res => {
         this.tableData = res.data
         this.count = parseInt(res.count)
       })
@@ -122,6 +188,13 @@ export default {
     submit (info) {
       this.$api.post(this.$api.phpURL + 'order/TbRefund/handle', {info}).then(res => {})
       this.dialogFormVisible = false
+    },
+    exportData () {
+      if (this.search_month && this.search_month.length === 2) {
+        this.search_info.Modified.st = this.search_month[0]
+        this.search_info.Modified.et = this.search_month[1]
+      }
+      this.$api.getDownloadFile(this.$api.phpURL + 'order/TbRefund/export', {data: this.search_info}, '淘宝退款.csv')
     }
   }
 }