Merge branch 'feature/GFRS-1469【0630】nbsapp' into dev

# Conflicts:
#	src/views/ebiz/nbs/CrewList.vue

src/views/ebiz/nbs/CrewList.vue

@@ -286,7 +286,6 @@ export default {
     },
     async getRankList() {
       const rs = await getRankList()
-      console.log('rs ::::: ', rs)
       rs.content.branchGroupBaseDtoList.map(item => {
         return (item.text = item.name)
       })
@@ -320,7 +319,6 @@ export default {
       this.params[`picker_${this.pickerType}`] = data
       if (this.pickerType === 1) {
         let data = await getGankLevel(this.params.picker_1.agentgroup)
-        console.log(data)
         this.pickerData.branchGroupBaseDtoList = data.content
       }
       this.getTableList()
@@ -345,6 +343,7 @@ export default {
       this.searchType = false
       this.showTime = false
       this.startTime = new Date()
+      this.endTime = new Date()
       this.startTimeStr = dateUtil.formatDate(this.startTime, 'yyyy-MM-dd')
       this.endTimeStr = dateUtil.formatDate(this.endTime, 'yyyy-MM-dd')
       this.getTableList()
@@ -373,7 +372,6 @@ export default {
           pageNum: 0
         }
       })
-      console.log(rs)
       this.excelUrl = config.imgDomain + '/returnDirectStream?imgPath=' + rs.content
     },
     async appCallBack(data) {
@@ -391,7 +389,6 @@ export default {
         } else {
           await this.exportExcel()
         }
-
         setTimeout(() => {
           // eslint-disable-next-line no-undef
           EWebBridge.webCallAppInJs('download', {
@@ -440,6 +437,7 @@ export default {
       this.endTimeStr = dateUtil.formatDate(value, 'yyyy-MM-dd')
     },
     queryTableList() {
+      if (this.startTime.getTime() > this.endTime.getTime()) return this.$toast('开始时间不能大于结束时间')
       this.searchType = true
       this.getTableList()
     }