diff --git a/src/components/TravelManager/TravelList/TravelControlList.vue b/src/components/TravelManager/TravelList/TravelControlList.vue
index 9fd69fa97353aa396c93af730ecaf951e36f75d2..4d14c57db32476e552d746cb56a8ebf1c62e8c98 100644
--- a/src/components/TravelManager/TravelList/TravelControlList.vue
+++ b/src/components/TravelManager/TravelList/TravelControlList.vue
@@ -1050,27 +1050,44 @@
                     <el-button v-if="item.IsPush==0" @click.native='PushMessage(item)' type="primary"
                       style="background:#00C6FF; border-color:#00C6FF;">订房推送
                     </el-button>
-                    <el-tooltip v-else-if="item.IsPush==1" class="item" effect="dark" content="点击取消推送" placement="top">
+                    <el-tooltip v-else-if="item.IsPush==1" class="item" effect="dark"   placement="top">
+                      <div slot="content">
+                    <div v-html="TipsContent(item,1)"></div>
+                  </div>
                       <el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">已推送
                       </el-button>
                     </el-tooltip>
-                    <el-button v-if="item.IsPush==2" @click.native='PushMessage(item)' type="primary"
+                    <el-tooltip v-else-if="item.IsPush==2" class="item" effect="dark" :content="item.HotelPushDate"  placement="top">
+                      <div slot="content">
+                    <div v-html="TipsContent(item,1)"></div>
+                  </div>
+                      <el-button  @click.native='PushMessage(item)' type="primary"
                       style="background:#00C6FF; border-color:#00C6FF;">重新推送
                     </el-button>
+                  </el-tooltip>
                   </template>
 
                   <template v-if="item.LineID==14||item.LineID==118">
-                    <el-button v-if="item.IsPush==0" @click.native='PushBusMessage(item)' type="primary"
+                    <el-button v-if="item.CarIsPush==0" @click.native='PushBusMessage(item)' type="primary"
                       style="background:#00C6FF; border-color:#00C6FF;">订车推送
                     </el-button>
-                    <el-tooltip v-else-if="item.IsPush==1" class="item" effect="dark" content="点击取消推送" placement="top">
+                    <!-- content="点击取消推送" -->
+                    <el-tooltip v-else-if="item.CarIsPush==1" class="item" effect="dark" :content="item.CarPushDate" placement="top">
+                      <div slot="content">
+                    <div v-html="TipsContent(item,2)"></div>
+                  </div>
                       <el-button @click.native='PushBusMessage(item)' type="primary" style="background:red !important;">
                         已推送
                       </el-button>
                     </el-tooltip>
-                    <el-button v-if="item.IsPush==2" @click.native='PushBusMessage(item)' type="primary"
+                    <el-tooltip v-else-if="item.CarIsPush==2" class="item" effect="dark"  placement="top">
+                      <div slot="content">
+                    <div v-html="TipsContent(item,1)"></div>
+                  </div>
+                      <el-button  @click.native='PushBusMessage(item)' type="primary"
                       style="background:#00C6FF; border-color:#00C6FF;">重新推送
                     </el-button>
+                  </el-tooltip>
                   </template>
                   <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
                     {{$t('Operation.Op_remark')}}
@@ -1671,10 +1688,40 @@
           }
         });
       },
+
+
+      TipsContent(item,type){
+        let resultStr='';
+        let dateStr='';
+        if(type==2){
+          if(item.CarIsPush==1){
+            resultStr+= '点击取消推送'+"<br/>"+''
+            dateStr ='推送时间：';
+          }
+          else if(item.CarIsPush==2){
+            resultStr+= '点击重新推送'+"<br/>"
+            dateStr ='取消时间：';
+          }
+          if(item.CarPushDate){
+            resultStr+= dateStr+ item.CarPushDate+"<br/>"
+          }
+        } else  if(type==1){
+          if(item.IsPush==1){
+            dateStr ='推送时间：';
+            resultStr+= '点击取消推送'+"<br/>"
+          }
+          else if(item.IsPush==2){
+            dateStr ='取消时间：';
+            resultStr+= '点击重新推送'+"<br/>"
+          }
+          if(item.HotelPushDate){
+            resultStr+= dateStr+ item.HotelPushDate+"<br/>"
+          }
+        }
+        return resultStr;
+      },
       //推送消息
       PushMessage(item) {
-        
-        this.queryCommonData.loading = true;
         var pMsg = {
           TCID: item.TCID
         };
@@ -1683,8 +1730,14 @@
         if (item.IsPush == 1) {
           cmdStr = "travel_post_CancelPushTravelPriceToQYWork"; //取消推送
           tipMessage = "【取消】推送";
-        }
-        this.apipost(cmdStr, pMsg, res => {
+        } let that = this;
+          that.$confirm('是否确认操作酒店推送', this.$t('tips.tips'), {
+            confirmButtonText: this.$t('pub.sureBtn'),
+            cancelButtonText: this.$t('pub.cancelBtn'),
+            type: 'warning'
+          }).then(() => {
+            this.queryCommonData.loading = true;
+            this.apipost(cmdStr, pMsg, res => {
           if (res.data.resultCode == 1) {
             this.Success(tipMessage + '成功!');
             this.getControlList();
@@ -1692,20 +1745,31 @@
             this.Error(tipMessage + '失败!');
           }
         });
+          }).catch(() => {
+
+          });
       },
       //订车推送
       PushBusMessage(item) {
-        this.queryCommonData.loading = true;
+       
         var pMsg = {
           TCID: item.TCID
-        };
+        };     
+       
         var tipMessage = "订车推送消息";
         var cmdStr = "travel_post_PushTravelBusToQYWork"; //推送消息
-        if (item.IsPush == 1) {
+        if (item.CarIsPush == 1) {
           cmdStr = "travel_post_CancelPushTravelBusToQYWork"; //取消推送
           tipMessage = "订车【取消】推送";
         }
-        this.apipost(cmdStr, pMsg, res => {
+        let that = this;
+          that.$confirm('是否确认操作订车推送', this.$t('tips.tips'), {
+            confirmButtonText: this.$t('pub.sureBtn'),
+            cancelButtonText: this.$t('pub.cancelBtn'),
+            type: 'warning'
+          }).then(() => {
+            this.queryCommonData.loading = true;
+            this.apipost(cmdStr, pMsg, res => {
           if (res.data.resultCode == 1) {
             this.Success(tipMessage + '成功!');
             this.getControlList();
@@ -1713,6 +1777,10 @@
             this.Error(tipMessage + '失败!');
           }
         });
+          }).catch(() => {
+
+          });
+      
       },
       showDialog(ConfigId, OfferId) {
         this.dialog = {
diff --git a/src/components/busManagement/busHandBook.vue b/src/components/busManagement/busHandBook.vue
index e2d97d3f7cf5c0c21bf68f4714c98ef2c262ee23..ba62e178d49ab8fab3658d836a612b60857bcb43 100644
--- a/src/components/busManagement/busHandBook.vue
+++ b/src/components/busManagement/busHandBook.vue
@@ -98,6 +98,7 @@
  
         <td class="commonBackColor" width="200">餐</td>
         <td class="commonBackColor" width="200">司机宿泊</td>
+        <td class="commonBackColor" width="100">确认状态</td>
       </tr>
       <tr v-for="(subItem, index) in DataObj.Details_Extends" :key="index">
         <td>
@@ -143,15 +144,18 @@
         <td>
           <el-input type="textarea" resize="none" style="padding:5px 0;" v-model="subItem.DriverStay" />
         </td>
+        <td>
+          {{subItem.IsSure==0?'暂定':subItem.IsSure==1?'OK':''}}
+        </td>
       </tr>
       <tr>
         <td>備考欄：</td>
-        <td colspan="7" class="comTextAlign">
+        <td colspan="8" class="comTextAlign">
           <el-input type="text" v-model="DataObj.Remarks" />
         </td>
       </tr>
       <tr>
-        <td colspan="8" class="comTextAlign">
+        <td colspan="9" class="comTextAlign">
           *迎えや送りは必要・不要となることは、必ず標記してください。
         </td>
       </tr>
diff --git a/src/components/dmc/manager/dmcTotalTable.vue b/src/components/dmc/manager/dmcTotalTable.vue
index 94b6359df1e680a1376762d70e36d43a5d454373..38979efbaae6331c598bde92f56fe0206aca886b 100644
--- a/src/components/dmc/manager/dmcTotalTable.vue
+++ b/src/components/dmc/manager/dmcTotalTable.vue
@@ -378,18 +378,24 @@
                   <span @click="GoShoupei(outItem)"
                     style="cursor:pointer;text-decoration:underline;display:block;color:#666;font-size:12px;">{{$t('ground.cheliangxinxi')}}</span>
 
-                  <template v-if="(item.LineId==14||item.LineId==118) &&(item.JapanBusOrder==0||item.JapanBusOrder==2)">
+                  <template v-if="(item.LineId==14||item.LineId==118) &&(item.CarIsPush==0||item.CarIsPush==2)">
                     <el-tooltip class="item" effect="dark" content="同步车信息到印象车行" placement="top-start">
+                      <div slot="content">
+                    <div v-html="TipsContent(item)"></div>
+                  </div>
                       <span
                         style="cursor:pointer;text-decoration:underline;display:block;color:blue;font-size:12px;padding-top:2px;"
-                        @click="SetBusOrder(outItem,item)">同步</span>
+                        @click="PushMessage(outItem,item)">同步</span>
                     </el-tooltip>
                   </template>
-                  <template v-else-if="(item.LineId==14||item.LineId==118) &&item.JapanBusOrder==1">
-                    <el-tooltip class="item" effect="dark" content="取消印象车行订单" placement="top-start">
+                  <template v-else-if="(item.LineId==14||item.LineId==118) &&item.CarIsPush==1">
+                    <el-tooltip class="item" effect="dark"  placement="top-start">
+                      <div slot="content">
+                    <div v-html="TipsContent(item)"></div>
+                  </div>
                       <span
                         style="cursor:pointer;text-decoration:underline;display:block;color:red;font-size:12px;padding-top:2px;"
-                        @click="CancelBusOrder(outItem,item)">取消同步</span>
+                        @click="PushMessage(outItem,item)">取消同步</span>
                     </el-tooltip>
                   </template>
                 </div>
@@ -771,6 +777,58 @@
       priceDialog
     },
     methods: {
+
+      //推送消息
+      PushMessage(obj,item) {
+        var pMsg = {
+          TCID: item.TCID
+        };     
+       
+        var tipMessage = "同步车信息到印象车行";
+        var cmdStr = "travel_post_PushTravelBusToQYWork"; //推送消息
+        if (item.CarIsPush == 1) {
+          cmdStr = "travel_post_CancelPushTravelBusToQYWork"; //取消推送
+          tipMessage = "取消印象车行订单";
+        }
+        let that = this;
+          that.$confirm('是否确认'+tipMessage, this.$t('tips.tips'), {
+            confirmButtonText: this.$t('pub.sureBtn'),
+            cancelButtonText: this.$t('pub.cancelBtn'),
+            type: 'warning'
+          }).then(() => {
+            this.queryCommonData.loading = true;
+            this.apipost(cmdStr, pMsg, res => {
+          if (res.data.resultCode == 1) {
+            this.Success(tipMessage + '成功!');
+            this.getControlList();
+          } else {
+            this.Error(tipMessage + '失败!');
+          }
+        });
+          }).catch(() => {
+
+          });
+      },
+
+      TipsContent(item){
+        let resultStr='';
+        let dateStr='';
+      
+          if(item.CarIsPush==1){
+            resultStr+= '点击取消印象车行订单'+"<br/>"+''
+            dateStr ='推送时间：';
+          }
+          else if(item.CarIsPush==2||item.CarIsPush==0){
+            resultStr+= '同步车信息到印象车行'+"<br/>"
+            if(item.CarIsPush==2){
+              dateStr ='取消时间：';
+            }
+          }
+          if(item.CarPushDateStr){
+            resultStr+= dateStr+ item.CarPushDateStr+"<br/>"
+          }
+        return resultStr;
+      },
       //同步用车到车行订单
       SetBusOrder(rootItem, item) {
         this.loading = true;