修改机票

src/components/Ticketing/TicketManager.vue

@@ -1730,6 +1730,12 @@
                   <span>{{$t('system.query_arrivalAir')}}：{{item.aName }}</span>
                 </p>
               </el-tooltip>
+              <div style="margin:10px 0 0 12px;">
+                <el-input type="text" class="w80" v-model="item.TicketDepartureTime" maxlength="5"
+                :placeholder="$t('system.ph_time')"></el-input> -
+                <el-input type="text" class="w80" v-model="item.TicketArrivalTime" maxlength="5"
+                :placeholder="$t('system.ph_time')"></el-input>
+              </div>
             </div>
           </div>
           <div class="_add_go _new_go">
@@ -1792,6 +1798,12 @@
                   <span>{{$t('system.query_arrivalAir')}}：{{item.aName}}</span>
                 </p>
               </el-tooltip>
+              <div style="margin:10px 0 0 12px;">
+                <el-input type="text" class="w80" v-model="item.TicketDepartureTime" maxlength="5"
+                :placeholder="$t('system.ph_time')"></el-input> -
+                <el-input type="text" class="w80" v-model="item.TicketArrivalTime" maxlength="5"
+                :placeholder="$t('system.ph_time')"></el-input>
+              </div>
             </div>
           </div>
           <div class="_add_go _new_go">
@@ -2735,6 +2747,8 @@
               res.data.data.flightList.forEach((x, index) => {
                 this.chengeDelIdList.push(x.ID);
               });
+
+              console.log(this.addMsg,'addmsg');
             } else {
               this.Warning(res.data.message);
             }

src/components/busManagement/BusInfo.vue

@@ -86,8 +86,8 @@
               <th width="150">日期</th>
               <th width="300">酒店名称</th>
               <th width="120">停车场</th>
-              <th width="300">用车计划</th>
-              <th width="150">订团号</th>
+              <th width="280">用车计划</th>
+              <th width="200">订团号</th>
               <th width="120">司机姓名</th>
               <th width="120">联系电话</th>
               <th width="250">司机住宿</th>
@@ -141,8 +141,8 @@
                 </div>
               </td>
                <td>
-              	<div class="w100">
-              	 <el-input class='w100' type="text" v-model="item.BookGroup"></el-input>
+              	<div class="w120">
+              	 <el-input class='w120' type="text" v-model="item.BookGroup"></el-input>
               	</div>
               </td>
               <td>
@@ -469,7 +469,9 @@ export default {
         response => {
           if (response.data.resultCode == 1) {
             this.PlanTableData = response.data.data;
-            console.log(this.PlanTableData)
+            this.PlanTableData.forEach(x=>{
+              x.BookGroup = this.$route.query.NewCombinationNum;
+            })
           }
         },
         null

src/components/dmc/manager/dmcTotalTable.vue

@@ -215,7 +215,7 @@
                 </div>
               </td>
               <td>
-                <div class="fz16 fbold linkspan" @click="goUrlBus('BusInfo',item,'车配信息')">
+                <div class="fz16 fbold linkspan" @click="goUrlBus('BusInfo',item,outItem,'车配信息')">
                   <span style="color: #4BCA81;" v-if="item.ResultReport.BusResult==1">√</span>
                   <span class="colorE95252" v-else>{{item.ResultReport.BusResult=='-1'?"x":"O"}}</span>
                 </div>
@@ -414,7 +414,7 @@
           }
         })
       },
-      goUrlBus(path, obj, title) {
+      goUrlBus(path, obj,outItem, title) {
         this.$router.push({
           name: path,
           query: {
@@ -422,13 +422,13 @@
             StartDate: obj.StartDateStr,
             DayNum: obj.DayNum,
             TotalNumber: obj.TotalSeat,
+            NewCombinationNum: outItem.NewCombinationNum,
             blank: 'y',
             tab: title
           }
         })
       },
       goUrlLeaderIsApply(path, obj,outItem, title) {
-        console.log(outItem,'outItem');
         this.$router.push({
           name: path,
           query: {