diff --git a/src/views/fingertipIntegral/list.vue b/src/views/fingertipIntegral/list.vue
index b58b24d..96d28eb 100644
--- a/src/views/fingertipIntegral/list.vue
+++ b/src/views/fingertipIntegral/list.vue
@@ -119,6 +119,7 @@
           <el-form-item v-if="form.ruleType === 'FINAL'" label="商户结算具体要求" prop="specialBusinessContent">
             <el-input
               v-model="form.specialBusinessContent"
+              type="textarea"
               placeholder="请输入"
             />
           </el-form-item>
diff --git a/src/views/fingertipIntegral/recordList.vue b/src/views/fingertipIntegral/recordList.vue
index bc55bb7..070161c 100644
--- a/src/views/fingertipIntegral/recordList.vue
+++ b/src/views/fingertipIntegral/recordList.vue
@@ -8,14 +8,42 @@
         placeholder="请输入关键字"
         clearable
       /> -->
-      <el-select v-model="listQuery.source" clearable class="filter-item" placeholder="请选择积分来源">
+      <el-select v-model="listQuery.source" clearable class="filter-item" style="margin-right: 10px" placeholder="请选择积分来源">
         <el-option v-for="item of sourceOptions" :key="item.value" v-bind="item" />
       </el-select>
+      <el-date-picker
+        v-model="listQuery.dateArr"
+        type="datetimerange"
+        class="filter-item"
+        style="margin-right: 10px"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        value-format="timestamp"
+        align="right"
+        clearable
+      />
+      <el-cascader
+        v-model="listQuery.regionIds"
+        class="filter-item"
+        style="width:240px"
+        :options="regions"
+        :props="{ checkStrictly: true }"
+        placeholder="行政区域"
+        clearable
+      />
       <el-button
         type="primary"
         style="margin-left:10px"
         @click="handleSearch"
       >搜索</el-button>
+      <el-button
+        :loading="exportLoading"
+        icon="el-icon-download"
+        type="primary"
+        style="margin-left:10px"
+        @click="handleExport"
+      >导出</el-button>
     </div>
     <el-table :data="list" border style="width: 100%">
       <el-table-column label="用户名" prop="residentInformation.name" />
@@ -51,6 +79,7 @@
 <script>
 import Pagination from '@/components/Pagination'
 import { recordList } from '@/api/fingertipIntegral'
+import { getRegions } from '@/api/region'
 import { sourceOptions } from './options'
 export default {
   components: { Pagination },
@@ -76,10 +105,16 @@ export default {
         keyword: undefined,
         source: undefined,
         status: undefined,
-        userId: undefined
+        userId: undefined,
+        dateArr: [],
+        regionIds: []
       },
       list: undefined,
 
+      regionSearchVal: undefined,
+      regions: [],
+      exportLoading: false,
+
       sourceOptions
     }
   },
@@ -93,15 +128,101 @@ export default {
   },
   created() {
     this.getList()
+    this.getRegions()
   },
   methods: {
     getList() {
-      recordList(this.listQuery).then(res => {
+      const listQuery = JSON.parse(JSON.stringify(this.listQuery))
+      const { dateArr, regionIds } = listQuery
+      if (dateArr) {
+        listQuery.startDate = dateArr[0] / 1000
+        listQuery.endDate = dateArr[1] / 1000
+      }
+      listQuery.regionIds = regionIds.join(',')
+      recordList(listQuery).then(res => {
         this.list = res.d.records
         this.total = res.d.total
         // this.pageSize = res.d.pageSize
       })
     },
+    getRegions() {
+      getRegions().then(res => {
+        const tempData = res.d
+        const countyArr = [] // 县,1
+        tempData.map(county => {
+          const countyObj = {
+            value: county.root.id,
+            label: county.root.name,
+            disabled: !county.root.check,
+            children: []
+          }
+          countyArr.push(countyObj)
+          county.node.map(town => {
+            const townObj = {
+              value: town.root.id,
+              label: town.root.name,
+              disabled: !town.root.check,
+              children: []
+            }
+            countyObj.children.push(townObj)
+            town.node.map(country => {
+              townObj.children.push({
+                value: country.root.id,
+                label: country.root.name,
+                disabled: !country.root.check
+              })
+            })
+          })
+        })
+        this.regions = countyArr
+      })
+    },
+    handleExport() {
+      const that = this
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['用户名', '积分来源', '获取积分数', '获取时间']
+        const filterVal = ['residentInformation.name', 'source', 'num', 'createDate']
+        this.exportLoading = true
+        const listQuery = JSON.parse(JSON.stringify(this.listQuery))
+        const { dateArr, regionIds } = listQuery
+        if (dateArr) {
+          listQuery.startDate = dateArr[0] / 1000
+          listQuery.endDate = dateArr[1] / 1000
+        }
+        listQuery.regionIds = regionIds.join(',')
+        listQuery.size = 999999
+        recordList(listQuery).then(res => {
+          setTimeout(() => {
+            this.exportLoading = false
+          }, 3000)
+
+          const data = that.formatJson(filterVal, res.d.records)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data: data,
+            filename: '积分流水'
+          })
+        })
+      })
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v =>
+        filterVal.map(j => {
+          let value
+          if (j === 'createDate') {
+            value = this.$options.filters['parseTime'](v[j])
+          } else if (j === 'residentInformation.name') {
+            value = v['residentInformation']['name']
+          } else if (j === 'source') {
+            value = this.$options.filters['optionsFilter'](v[j], sourceOptions)
+          } else {
+            value = v[j]
+          }
+          // if (!value && value !== 0) value = "N/A";
+          return value
+        })
+      )
+    },
     handleSearch() {
       const { listQuery } = this
       this.listQuery.lastPageIndex = 1
diff --git a/src/views/fingertipIntegral/settlementList.vue b/src/views/fingertipIntegral/settlementList.vue
index d589da7..10e088a 100644
--- a/src/views/fingertipIntegral/settlementList.vue
+++ b/src/views/fingertipIntegral/settlementList.vue
@@ -333,8 +333,8 @@ export default {
     handleRExport(item) {
       const that = this
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['商户姓名', '日期', '群众姓名', '积分数量', '积分交易备注', '积分来源']
-        const filterVal = ['businessName', 'createDate', 'massesName', 'num', 'remark', 'source']
+        const tHeader = ['商户姓名', '日期', '群众姓名', '积分数量', '积分兑换金额(元)', '积分交易备注']
+        const filterVal = ['businessName', 'createDate', 'massesName', 'num', 'money', 'remark']
         this.loading = true
         // const listQuery = JSON.parse(JSON.stringify(this.listQuery))
         // const { dateArr } = listQuery