From 69187ef7dad13dd9b4b5b663148e66807b252972 Mon Sep 17 00:00:00 2001
From: wanyongkang <937888580@qq.com>
Date: Mon, 19 Oct 2020 12:24:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=80=E6=AC=BE=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/order/refunds.vue    |  1 +
 src/components/order/statistics.vue | 80 ++++++++++++++---------------
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/src/components/order/refunds.vue b/src/components/order/refunds.vue
index e35087c..1d2a58a 100644
--- a/src/components/order/refunds.vue
+++ b/src/components/order/refunds.vue
@@ -48,6 +48,7 @@
        <el-table-column prop="RefundRestTime" label="剩余时间"></el-table-column>    
        <el-table-column prop="IsAutoRefund" label="自动退款" :formatter="autoFormat"></el-table-column>    
        <el-table-column prop="BackAmount" label="返点"></el-table-column>     
+       <el-table-column prop="RefundReason" label="退款原因"></el-table-column>
        <el-table-column prop="OrderState" label="退款状态">
          <template slot-scope="scope">          
            <span :class="{red:scope.row.OrderState==30}"> {{refundTypeFormat(scope.row.OrderState)}}</span>
diff --git a/src/components/order/statistics.vue b/src/components/order/statistics.vue
index c0cadee..eb97749 100644
--- a/src/components/order/statistics.vue
+++ b/src/components/order/statistics.vue
@@ -21,7 +21,7 @@
       size="medium"
       :height="$getHeight(150)"
       :span-method="mergeSpan"
-      show-summary      
+      show-summary
     >
       <el-table-column prop="ProductName" label="产品"></el-table-column>
       <el-table-column prop="PackageName" label="套餐"></el-table-column>
@@ -38,62 +38,62 @@
 </template>
 <script>
 export default {
-  name: "treeTable",
+  name: 'treeTable',
   components: {},
-  data() {
+  data () {
     return {
       loading: false,
-      retData:[],
-      dateRange:[],
+      retData: [],
+      dateRange: [],
       searchModel: {
         PageIndex: 1,
-        keyWord: "",
+        keyWord: '',
         Status: 0,
         PayType: 0,
-        Btime: "",
-        Etime: ""
+        Btime: '',
+        Etime: ''
       },
-      flagMap:{}
-    };
+      flagMap: {}
+    }
   },
-  mounted(){
-     this.$store.commit("setCurrentNav","销售管理>>统计分析")
-    this.get();
+  mounted () {
+    this.$store.commit('setCurrentNav', '销售管理>>统计分析')
+    this.get()
   },
   methods: {
-    get() {
-      this.flagMap={};
-      if (this.dateRange && this.dateRange.length == 2) {
-        this.searchModel.Btime = this.dateRange[0];
-        this.searchModel.Etime = this.dateRange[1];
+    get () {
+      this.flagMap = {}
+      if (this.dateRange && this.dateRange.length === 2) {
+        this.searchModel.Btime = this.dateRange[0]
+        this.searchModel.Etime = this.dateRange[1]
       }
-      this.$api.get("course/v1/order/Statistics", this.searchModel).then(res => {    
-         this.retData = res.Data;   
-        this.retData.forEach(item=>{
-          var flag=this.flagMap[item.ProductName];
-          if(!flag){
-            this.flagMap[item.ProductName]=true;
-             var count=this.retData.filter(m=>m.ProductName== item.ProductName).length;
-             item.rSpan=count;
-             item.cSpan=1;
-          }else{
-             item.rSpan=0;
-             item.cSpan=0;
-          }         
-        })               
+      this.$api.get('course/v1/order/Statistics', this.searchModel).then(res => {
+        this.retData = res.Data
+        this.retData.forEach(item => {
+          var flag = this.flagMap[item.ProductName]
+          if (!flag) {
+            this.flagMap[item.ProductName] = true
+            var count = this.retData.filter(m => m.ProductName === item.ProductName).length
+            item.rSpan = count
+            item.cSpan = 1
+          } else {
+            item.rSpan = 0
+            item.cSpan = 0
+          }
+        })
       })
     },
-    mergeSpan({row, column, rowIndex, columnIndex}){    
+    mergeSpan ({row, column, rowIndex, columnIndex}) {
       if (columnIndex === 0) {
-          console.log(`${row.rSpan}-${row.cSpan}`)
+        console.log(`${row.rSpan}-${row.cSpan}`)
         return {
-              rowspan: row.rSpan,
-              colspan: row.cSpan
-        }       
-     }
-    }  
+          rowspan: row.rSpan,
+          colspan: row.cSpan
+        }
+      }
+    }
   }
-};
+}
 </script>
 <style scoped>
 .el-table{