Merge branch 'devmatch' into 中分支

@@ -381,15 +381,15 @@
                 </div>
                 </div>
               </el-col>
               </el-col>
               <el-col :lg="24">
               <el-col :lg="24">
-                <el-link
-                  v-if="(form.viewStatus=='1'||form.viewStatus=='5')&&language!=0" type="primary"
-                  @click="exportPdf"
-                >
-                  <el-icon>
-                    <Upload />
-                  </el-icon>
-                  {{ language == 0 ? '导出酒店预订单' : 'Export PDF' }}
-                </el-link>
+                <!--                <el-link-->
+                <!--                  v-if="(form.viewStatus=='1'||form.viewStatus=='5')&&language!=0" type="primary"-->
+                <!--                  @click="exportPdf"-->
+                <!--                >-->
+                <!--                  <el-icon>-->
+                <!--                    <Download />-->
+                <!--                  </el-icon>-->
+                <!--                  {{ language == 0 ? '导出酒店预订单' : 'Download Confirmation' }}-->
+                <!--                </el-link>-->
               </el-col>
               </el-col>
             </el-row>
             </el-row>
           </div>
           </div>
@@ -497,6 +497,17 @@
             >
             >
               {{ language == 0 ? '确定' : 'Submit' }}
               {{ language == 0 ? '确定' : 'Submit' }}
             </el-button>
             </el-button>
+            <el-button
+              v-if="(form.viewStatus=='1'||form.viewStatus=='5')&&language!=0&&type=='hotel'" class="btn-lineG w200px"
+              round
+              type="primary"
+              @click="exportPdf"
+            >
+              <el-icon>
+                <Download />
+              </el-icon>
+              {{ language == 0 ? '导出酒店预订单' : 'Download Confirmation' }}
+            </el-button>
             <el-button v-if="form.viewStatus == '5'" round @click="unsubscribe">
             <el-button v-if="form.viewStatus == '5'" round @click="unsubscribe">
               {{ language == 0 ? '退订' : 'Unsubscribe' }}
               {{ language == 0 ? '退订' : 'Unsubscribe' }}
             </el-button>
             </el-button>
@@ -920,7 +931,7 @@ function exportPdf() {
   } else {
   } else {
     proxy.download('/ota/orderRoom/downRoomConfirmation', {
     proxy.download('/ota/orderRoom/downRoomConfirmation', {
       ...obj
       ...obj
-    }, `Hotel Reservation.pdf`)
+    }, `Hotel Reservation`)
   }
   }
 }
 }