Merge branch 'hotfix/0803业绩快报BUG修改' into release/0809

# Conflicts:
#	src/views/ebiz/report/reportList.vue

src/views/ebiz/report/reportList.vue

@@ -106,32 +106,16 @@ export default {
           console.log(res)
           this.reportList = res.content
           this.list = res.content[this.active]
-          if (this.list.insertTime == null) {
+          if (this.list.insertDate == null && this.list.insertTime == null) {
             this.time = '--'
           } else {
-            this.time = this.list.insertTime
+            this.time = this.list.insertDate + '  ' + this.list.insertTime
           }
         } else {
           this.$toast(res.resultMessage)
         }
       })
     },
-    tabChange(name, title) {
-      this.active = name
-      if (title == '健康险') {
-        this.title = '团险'
-      } else if (title == '银保') {
-        this.title = '银代'
-      } else {
-        this.title = title
-      }
-      this.list = this.reportList[this.active]
-      if (this.list.insertTime == null) {
-        this.time = '--'
-      } else {
-        this.time = this.list.insertTime
-      }
-    },
     goDetail(val) {
       let name = ''
       let data = {
@@ -175,6 +159,41 @@ export default {
           this.$toast(res.resultMessage)
         }
       })
+    },
+
+    tabChange(name, title) {
+      this.active = name
+      if (title == '健康险') {
+        this.title = '团险'
+      } else if (title == '银保') {
+        this.title = '银代'
+      } else {
+        this.title = title
+      }
+      this.list = {
+        salechnlName: this.active,
+        sellTypeName: null,
+        preItems: '0',
+        prePrem: '0.00',
+        items: '0',
+        prem: '0.00',
+        standPrem: '0.00',
+        manageComName: null,
+        insertDate: null,
+        insertTime: null,
+        riskName: null
+      }
+      for (let item of this.reportList) {
+        console.log(item)
+        if (item.salechnlName === this.title) {
+          this.list = item
+        }
+      }
+      if (this.list.insertDate == null && this.list.insertTime == null) {
+        this.time = '--'
+      } else {
+        this.time = this.list.insertDate + '  ' + this.list.insertTime
+      }
     }
   },
   filters: {}