增加日期显示

src/components/SalesconfirmationOrder.vue

@@ -7,7 +7,15 @@
   .travelControlTrip .hangban-info tr th {
     padding-left: 0 !important;
   }
-
+  .travelControlTrip .playTime i{
+    position: relative;
+    top:-3px;
+  }
+  .travelControlTrip .commonTimeStr{
+    margin-bottom:5px;
+    color:#999;
+    font-size:12px;
+  }
 </style>
 
 <template>
@@ -286,6 +294,9 @@
                           <i v-if="dns.arrivalType==3" class="iconfont icon-icon31"></i>
                           <i v-if="dns.arrivalType==4" class="iconfont icon-gaotiedongche"></i>
                           <span v-if="o+1==son.childItem.subTraffic.length">{{dns.arrivalCityName}}</span>
+                          <div class="commonTimeStr" style="margin-top:5px;">
+                            <span v-if="dns.startTime!=''" style="margin-right:20px;">出发时间:{{dns.startTime}} </span><span v-if="dns.endTime!=''">到达时间{{dns.endTime}}</span>
+                          </div>
                         </span>
                       </span>
                       <span class="content" v-html="son.childItem.description"></span>
@@ -299,6 +310,9 @@
                       <i class="iconfont icon-zuji"></i>
                     </div>
                     <div class="new_right">
+                      <div class="commonTimeStr" v-if="son.childItem.timeStr!=''">
+                        预计到达时间：{{son.childItem.timeStr}}
+                      </div>
                       <span class="time" v-if="son.childItem.timeType==1">上午</span>
                       <span class="time" v-if="son.childItem.timeType==2">下午</span>
                       <span class="time" v-if="son.childItem.timeType==0">全天</span>
@@ -346,6 +360,9 @@
                       <i class="iconfont icon-yongcan"></i>
                     </div>
                     <div class="new_right">
+                      <div class="commonTimeStr" v-if="son.childItem.timeStr!=''">
+                        预计到达时间：{{son.childItem.timeStr}}
+                      </div>
                       <span class="time" v-if="son.childItem.timeType==1">上午</span>
                       <span class="time" v-if="son.childItem.timeType==2">下午</span>
                       <span class="time" v-if="son.childItem.timeType==0">全天</span>
@@ -1200,7 +1217,9 @@
                 ticketName: '',
                 playTimeHour: null,
                 playTimeMinutes: null,
-                url: ''
+                url: '',
+                startTime:y.childItem.startTime,
+                endTime:y.childItem.endTime
               }
               jiao.push(obj)
             } else if (y.type == 2 && y.childItem.couponsName != '' && y.childItem.imaArray.length > 0) {
@@ -1212,7 +1231,8 @@
                 playTimeHour: y.childItem.playTimeHour,
                 playTimeMinutes: y.childItem.playTimeMinutes,
                 scenicJson: y.childItem.scenicJson,
-                url: y.childItem.url
+                url: y.childItem.url,
+                timeStr: y.childItem.timeStr
               }
               jin.push(obj)
             } else if (y.type == 3 && y.childItem.hotelName != '' && y.childItem.imaArray.length > 0) {
@@ -1234,6 +1254,7 @@
               } else if (y.childItem.useDinnerType == "3") {
                 can.dinner = y.childItem.dinnerName
               }
+              can.timeStr = y.childItem.timeStr;
             } else if (y.type == 5) {
               let obj = {
                 title: '自由活动',

src/components/newTravelmanager/oldTravelGroupControl/dinnerTrip_Direct.vue

@@ -23,7 +23,11 @@
           </el-tooltip>
         </div>
         <div class="TDplanList clearfix">
-          <div class="TDLeftPlan">
+          <div>
+            <span class="comTravelLeft">时间</span>
+            <span>
+              <el-input v-model="subItemObj.childItem.TimeStr" placeholder="时间信息" style="width:90px"></el-input>
+            </span>
             <span style="margin-left:26px;">{{$t('commonPickUp.Pick_resName')}}</span>
             <span>
               <el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.DinnerId'"
@@ -37,22 +41,18 @@
                 </el-select>
               </el-form-item>
             </span>
-            <span class="comTravelLeft">时间</span>
-            <span>
-              <el-input v-model="subItemObj.childItem.TimeStr" placeholder="时间信息" style="width:80px"></el-input>
-            </span>
-          </div>
-          <div class="TDmealTime">
             <label class="TDhotelDiner">{{$t('sm.yongcanshiduan')}}</label>
             <el-checkbox-group v-model="Diner.UseDinerCked">
               <el-checkbox v-for="item in Diner.UseDinnerType" style="margin-left:5px;"
                 :disabled="isOpenGroup||!varCanChecked(item)" :label="item.Id" :key='item.Id'>{{item.Name}}
               </el-checkbox>
             </el-checkbox-group>
+          </div>
+          <div class="TDmealTime" style="margin:10px 0;">
             <span class="comTravelLeft">{{$t('restaurant.res_etTime')}}</span>
-            <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeHour"
+            <el-input :disabled="isOpenGroup" type="text" class="w80" v-model="subItemObj.childItem.UseTimeHour"
               @keyup.native="checkInteger(subItemObj.childItem,'UseTimeHour')"></el-input>&nbsp;&nbsp;{{$t('sm.hour')}}
-            <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeMinutes"
+            <el-input :disabled="isOpenGroup" type="text" class="w80" v-model="subItemObj.childItem.UseTimeMinutes"
               @keyup.native="checkInteger(subItemObj.childItem,'UseTimeMinutes')"></el-input>
             &nbsp;&nbsp;{{$t('sm.Minute')}}
           </div>

src/components/newTravelmanager/oldTravelGroupControl/scienTrip_Direct.vue

@@ -32,8 +32,12 @@
           </el-tooltip>
         </div>
         <div class="TDplanList clearfix">
-          <div class="TDLeftPlan">
-            <span>{{$t('sm.scenChoosse')}}</span>
+          <div>
+            <span class="comTravelLeft">时间</span>
+            <span>
+              <el-input v-model="subItemObj.childItem.TimeStr" placeholder="时间信息" style="width:90px"></el-input>
+            </span>
+            <span style="margin-left:20px;">{{$t('sm.scenChoosse')}}</span>
             <span>
               <el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.CouponsId'"
                 :rules="scienTripRules.CouponsId">
@@ -46,12 +50,6 @@
                 </el-select>
               </el-form-item>
             </span>
-            <span class="comTravelLeft">时间</span>
-            <span>
-              <el-input v-model="subItemObj.childItem.TimeStr" placeholder="时间信息" style="width:80px"></el-input>
-            </span>
-          </div>
-          <div class="TDRightPlan">
             <label class="comTravelLeft">{{$t('scen.sc_etTime')}}</label>
             <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeHour"
               @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeHour')" maxlength="2"></el-input>&nbsp;&nbsp;小时
@@ -59,6 +57,14 @@
               @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>
             &nbsp;&nbsp;分钟
           </div>
+          <!-- <div class="TDRightPlan">
+            <label class="comTravelLeft">{{$t('scen.sc_etTime')}}</label>
+            <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeHour"
+              @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeHour')" maxlength="2"></el-input>&nbsp;&nbsp;小时
+            <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeMinutes"
+              @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>
+            &nbsp;&nbsp;分钟
+          </div> -->
         </div>
       </div>
       <div class="TP_edit">