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

src/components/commonPage/commonHotelInfo.vue

@@ -59,7 +59,7 @@
         <template v-for="(hotelItem,index) in  HotelObj">
           <tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList">
             <td width="120" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length" style="white-space:nowrap; ">
-              {{hotelItem.UseDay}}
+              {{hotelItem.UseDay}}&nbsp;({{getDayByDate(hotelItem.UseDay)}})
             </td>
             <td style="text-align:left;padding-left:3px;">
               <template v-if="hotelSubItem.HotelName!=hotelSubItem.NewHotelName && hotelSubItem.NewHotelName!=''">
@@ -221,6 +221,15 @@
         this.Confirm(str, function () {
           that.$emit('SetShouPeiShu');
         });
+      },
+      //根据日期返回星期几
+      getDayByDate(dateString){
+        if(dateString){
+          var date;
+          var dateArray = dateString.split("-");
+          date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]); 
+          return "日一二三四五六".charAt(date.getDay());
+        }
       }
     },
     mounted() {}

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -872,7 +872,7 @@
         <template v-for="(subItem,subIndex) in  priceData.PriceHotelList">
           <tr v-for="(childItem,childIndex) in subItem.SubList">
             <td style="background-color:#E6E6E6;color:#333;" v-if="childIndex==0" :rowspan="subItem.SubList.length">
-              {{subItem.UseDay}}</td>
+              {{subItem.UseDay}}&nbsp;({{getDayByDate(subItem.UseDay)}})</td>
             <td style="text-align:left;padding-left:3px;">
               {{childItem.HotelName}}
             </td>
@@ -1775,6 +1775,15 @@
           );
         });
       },
+      //根据日期返回星期几
+      getDayByDate(dateString){
+        if(dateString){
+          var date;
+          var dateArray = dateString.split("-");
+          date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]); 
+          return "日一二三四五六".charAt(date.getDay());
+        }
+      }
     },
     mounted() {
       var dateObj = this.$calendarUtils.getCurrentDate();

src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue

@@ -787,7 +787,7 @@
     <el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
       <table class="TphotelTable" border="0" cellspacing='1' v-if="priceData.TCID>0">
         <tr v-if="priceData.PriceHotelList" v-for="item in priceData.PriceHotelList">
-          <td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}</td>
+          <td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}&nbsp;({{getDayByDate(item.UseDay)}})</td>
           <td>
             <div class="tp_divList" v-for="(subItem,index) in item.SubList">
               <div>
@@ -1595,6 +1595,15 @@
             err => {}
           );
         }
+      },
+      //根据日期返回星期几
+      getDayByDate(dateString){
+        if(dateString){
+          var date;
+          var dateArray = dateString.split("-");
+          date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]); 
+          return "日一二三四五六".charAt(date.getDay());
+        }
       }
     },
     mounted() {

src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue

@@ -873,7 +873,7 @@
         <template v-for="(subItem,subIndex) in  priceData.PriceHotelList">
           <tr v-for="(childItem,childIndex) in subItem.SubList">
             <td style="background-color:#E6E6E6;color:#333;" v-if="childIndex==0" :rowspan="subItem.SubList.length">
-              {{subItem.UseDay}}</td>
+              {{subItem.UseDay}}&nbsp;({{getDayByDate(subItem.UseDay)}})</td>
             <td style="text-align:left;padding-left:3px;">
               {{childItem.HotelName}}
             </td>
@@ -1776,6 +1776,15 @@
           );
         });
       },
+      //根据日期返回星期几
+      getDayByDate(dateString){
+        if(dateString){
+          var date;
+          var dateArray = dateString.split("-");
+          date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]); 
+          return "日一二三四五六".charAt(date.getDay());
+        }
+      }
     },
     mounted() {
       var dateObj = this.$calendarUtils.getCurrentDate();