Merge tag 'Hotfix-zh-310' into develop

Finish Hotfix-zh-310

src/views/deposit_home/refund_list.vue

@@ -274,15 +274,15 @@
         </div>
         <div class="fr">
           <el-button type="primary" size="mini" @click="exportFn">导出</el-button>
-          <!--          <el-upload-->
-          <!--            class="import-btn"-->
-          <!--            action=""-->
-          <!--            :http-request="handleImport"-->
-          <!--            :file-list="importFileList"-->
-          <!--            :show-file-list="false"-->
-          <!--          >-->
-          <!--            <el-button type="primary" size="mini">导入</el-button>-->
-          <!--          </el-upload>-->
+          <el-upload
+            class="import-btn"
+            action=""
+            :http-request="handleImport"
+            :file-list="importFileList"
+            :show-file-list="false"
+          >
+            <el-button type="primary" size="mini">导入</el-button>
+          </el-upload>
         </div>
       </div>
       <!-- 列表 -->

src/views/finance/rebate_list.vue

@@ -767,26 +767,26 @@ export default {
       }
       const res = await getRebateOrderList(params)
       this.listTotal = res.data.total
-      let arr = res.data.records
-      arr.forEach(value => {
+      this.dataList = res.data.records
+      this.dataList.forEach(value => {
         value.sums1 = []
         value.sums2 = ['amount', 'rebateAmount', 'withholdAmount', 'allowanceAmount', 'handledAllowanceAmount']
       })
-      if (this.isCustomer) {
-        let arr2 = arr.filter(v => {
-          if (
-            (v.examineStatus == 'OK_ONE' || v.examineStatus == 'OK' || v.examineStatus == 'FAIL') &&
-            v.withholdAmount == 0
-          ) {
-            return v
-          }
-        })
-        this.dataList = arr2
-        this.listTotal = arr2.length
-      } else {
-        this.dataList = arr
-        this.listTotal = res.data.total
-      }
+      // if (this.isCustomer) {
+      //   let arr2 = arr.filter(v => {
+      //     if (
+      //       (v.examineStatus == 'OK_ONE' || v.examineStatus == 'OK' || v.examineStatus == 'FAIL') &&
+      //       v.withholdAmount == 0
+      //     ) {
+      //       return v
+      //     }
+      //   })
+      //   this.dataList = arr2
+      //   this.listTotal = arr2.length
+      // } else {
+      //   this.dataList = arr
+      //   this.listTotal = res.data.total
+      // }
     },
     //确认
     confirmFn(id, isShow) {