Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/assets/css/tripIndexNewHV.css

 .LeaveGroupDownload-form.LeaveGroupDownload-formHV .flight_list td{
   background: none !important;
 }
+.LeaveGroupDownload-form.LeaveGroupDownload-formHV{
+  background: url('http://imgfile.oytour.com/Static/bjHV2.png') repeat;
+}
 .hangban-info.hangban-infoHV{
   background: none !important;
 }
@@ -99,6 +102,12 @@
   line-height: 28px;
   white-space: nowrap;
 }
+.travelDaysHVTdetails-textBox > .travelDaysdetails-text{
+  line-height: 28px;
+}
+.travelDaysHVTdetails-textBox > div {
+  align-items: center;
+}
 .travelDaysHVTdetails-textBox{
   min-height: 53px;
   align-items: center;
@@ -135,11 +144,19 @@
   padding: 0 47px 40px 47px;
 }
 .travelDaysHVContent{
+  position: absolute;
   max-height: 695px;
+  bottom: 50px;
+  left: 57px;
+  right: 57px;
+  background: rgba(23,23,23,0.4);
+  padding: 40px 50px;
+  z-index: 1
+  /* max-height: 695px;
   padding: 42px 55px;
   background: rgba(23,23,23,0.4);
   margin: 0 57px;
-  margin-bottom: 50px;
+  margin-bottom: 50px; */
 }
 .travelDaysHVMasterMap img{
   width: 100%;

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -1156,32 +1156,32 @@ export default {
             });
           }
         }else if(rowData.ZhaiYao=="预收款(团费)"||rowData.ZhaiYao=="预收款(抵用)"){
-          if(column.title=="一月" || column.title=="二月" || column.title=="三月"||
-          column.title=="四月" || column.title=="五月" || column.title=="六月" ||
-          column.title=="第一季度" || column.title=="第二季度" || column.title=="上半年报"){
-            let QStartDate
-            let QEndDate
-            let month2
-            var MonthDayNum
-            if(column.title=="第一季度"){
-              QStartDate = `${rowData.Year}-01-01`
-              month2 = `03`
-            } else if(column.title=="第二季度"){
-              QStartDate = `${rowData.Year}-04-01`
-              month2 = `06`
-            } else if(column.title=="上半年报"){
-              QStartDate = `${rowData.Year}-01-01`
-              month2 = `06`
-            }else{
-              QStartDate = `${rowData.Year}-${month>10?month:'0'+month}-01`
-              month2 = `${month>10?month:'0'+month}`
-            }
-            MonthDayNum = new Date(rowData.Year, month2, 0).getDate(); //计算当月的天数
-            QEndDate = `${rowData.Year}-${month2}-${MonthDayNum}`
-            that.goUrl("prestoreList",QStartDate,QEndDate,"客户预存查询")
-          }else{
+          // if(column.title=="一月" || column.title=="二月" || column.title=="三月"||
+          // column.title=="四月" || column.title=="五月" || column.title=="六月" ||
+          // column.title=="第一季度" || column.title=="第二季度" || column.title=="上半年报"){
+          //   let QStartDate
+          //   let QEndDate
+          //   let month2
+          //   var MonthDayNum
+          //   if(column.title=="第一季度"){
+          //     QStartDate = `${rowData.Year}-01-01`
+          //     month2 = `03`
+          //   } else if(column.title=="第二季度"){
+          //     QStartDate = `${rowData.Year}-04-01`
+          //     month2 = `06`
+          //   } else if(column.title=="上半年报"){
+          //     QStartDate = `${rowData.Year}-01-01`
+          //     month2 = `06`
+          //   }else{
+          //     QStartDate = `${rowData.Year}-${month>10?month:'0'+month}-01`
+          //     month2 = `${month>10?month:'0'+month}`
+          //   }
+          //   MonthDayNum = new Date(rowData.Year, month2, 0).getDate(); //计算当月的天数
+          //   QEndDate = `${rowData.Year}-${month2}-${MonthDayNum}`
+          //   that.goUrl("prestoreList",QStartDate,QEndDate,"客户预存查询")
+          // }else{
             that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds,StandardCurrencyId)
-          }
+          //}
         }
         else{
           that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds,StandardCurrencyId)