Merge commit '3fa14c0a' into dev

@@ -386,7 +386,8 @@
                     </el-icon>
                     </el-icon>
                     {{ language == 0 ? '导出酒店预订单' : 'Export PDF' }}
                     {{ language == 0 ? '导出酒店预订单' : 'Export PDF' }}
                   </el-button>
                   </el-button>
-                  <el-button v-if="(form.viewStatus=='1'||form.viewStatus=='5')&&(type=='makeUp'||type=='hotel')"
+                  <el-button
+                    v-if="(form.viewStatus=='1'||form.viewStatus=='5')&&(type=='makeUp'||type=='hotel'||type=='ticket')"
                     class="mt20 btn-lineG" round
                     class="mt20 btn-lineG" round
                     size="large"
                     size="large"
                     type="primary"
                     type="primary"
@@ -699,6 +700,8 @@ async function getTicketOrderInfoFN() {
     form.value.extJson.ticketType = JSON.parse(form.value.extJson.ticketType)
     form.value.extJson.ticketType = JSON.parse(form.value.extJson.ticketType)
     form.value.extJson.message = JSON.parse(form.value.extJson.message)
     form.value.extJson.message = JSON.parse(form.value.extJson.message)
     await getDetail(form.value.extJson.ticketDate.activityId)
     await getDetail(form.value.extJson.ticketDate.activityId)
+    matchId.value = form.value.extJson.ticketDate.activityId
+
     totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
     totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
   } catch (e) {
   } catch (e) {
     console.log(e)
     console.log(e)
@@ -927,6 +930,11 @@ const showSJ = () => {
   if (form.value.receiptFlag == '0') {
   if (form.value.receiptFlag == '0') {
     obj.receiptInfo = lpName.value
     obj.receiptInfo = lpName.value
   }
   }
+  // // 报名
+  // proxy.download(`/ota/norder/getReceipt/${obj.orderId}`, {
+  //   ...obj
+  // }, `Receipt_${new Date().getTime()}.pdf`)
+
   // 报名
   // 报名
   proxy.download(`/ota/norder/getReceipt/${obj.orderId}`, {
   proxy.download(`/ota/norder/getReceipt/${obj.orderId}`, {
     ...obj
     ...obj