预约查询

@@ -15,6 +15,7 @@ export function getMatchById(params) {
     params: params
   })
 }
+
 export function refundApply(orderId) {
   return request({
     url: `/league/signOrder/refundApply?orderId=${orderId}`,
@@ -39,7 +40,7 @@ export function getMySignDetailById(params) {
 }
 
 // 获取赛事下的已报团队
-export function getGroupListByCptId(cptId,query) {
+export function getGroupListByCptId(cptId, query) {
   return request({
     // url: `/league/group/getGroupListByCptId/${cptId}`,
     url: `/league/sign/getSignInfoDataByCptId/${cptId}`,
@@ -85,6 +86,7 @@ export function getCaptchaSms(data) {
     data: data
   })
 }
+
 // 发送手机验证码
 export function getCaptchaSms2(data) {
   return request({
@@ -93,6 +95,7 @@ export function getCaptchaSms2(data) {
     data: data
   })
 }
+
 export function checkRegisterCode(data) {
   return request({
     url: `/checkRegisterCode`,
@@ -107,32 +110,36 @@ export function getMyGroupList() {
     method: 'get'
   })
 }
+
 export function checkWdsf(query) {
   return request({
     url: `/league/wdsf/check`,
     method: 'get',
-    params:query
+    params: query
   })
 }
+
 export function checkWdsfAthletes(query) {
   return request({
     url: `/league/wdsf/checkForGroup`,
     method: 'get',
-    params:query
+    params: query
   })
 }
+
 export function registerSingle(data) {
   return request({
     url: `/pcRegisterSingleAboard`,
     method: 'post',
-    data:data
+    data: data
   })
 }
+
 export function loginSingle(data) {
   return request({
     url: `/userLoginAboard`,
     method: 'post',
-    data:data
+    data: data
   })
 }
 
@@ -159,6 +166,7 @@ export function saveMyGroup(data) {
     data: data
   })
 }
+
 export function saveMyGroupForCpt(data) {
   return request({
     url: `/league/group/saveMyGroupForCpt`,
@@ -166,6 +174,7 @@ export function saveMyGroupForCpt(data) {
     data: data
   })
 }
+
 export function commitAudit(data) {
   return request({
     url: `/league/group/commitAudit`,
@@ -236,12 +245,14 @@ export function saveMyTeam(data) {
     data: data
   })
 }
+
 export function withDrawByOrderId(orderId) {
   return request({
     url: `/league/signOrder/withDraw/${orderId}`,
     method: 'post'
   })
 }
+
 export function recoverMySignFromCancel(cptId) {
   return request({
     url: `/league/sign/recoverMySignFromCancel`,
@@ -317,14 +328,15 @@ export function getMyGroupForCptFilter(groupId, cptId, query) {
   })
 }
 
-export function getGroupPersonList(query,groupId) {
+export function getGroupPersonList(query, groupId) {
   return request({
     url: `/systemj/personInfo/getPersonInfoListByGroupIdNoLabel/${groupId}`,
     method: 'get',
     params: query
   })
 }
-export function getPerPersonList(query,userId) {
+
+export function getPerPersonList(query, userId) {
   return request({
     url: `/systemj/personInfo/getPersonInfoListByPersonIdNoLabel/${userId}`,
     method: 'get',
@@ -364,6 +376,7 @@ export function savePersonForMyPerson(data) {
     data: data
   })
 }
+
 export function savePersonForMyPerson2(data) {
   return request({
     url: `/systemj/personInfo/savePersonForMyPerson2`,
@@ -388,6 +401,7 @@ export function delPerson(id) {
     method: 'delete'
   })
 }
+
 //个人账号
 export function delPersonForPersonal(id) {
   return request({
@@ -432,12 +446,14 @@ export function getCanSignlevelListFromSelectPerson(groupId, personId) {
     method: 'get'
   })
 }
+
 export function delRank(id) {
   return request({
     url: `/league/team/${id}`,
     method: 'delete'
   })
 }
+
 export function getCanSignLevelPerson(data) {
   return request({
     url: `/league/competitionLevel/getCanSignLevelPerson`,
@@ -445,6 +461,7 @@ export function getCanSignLevelPerson(data) {
     data: data
   })
 }
+
 export function sportsmanDone(data) {
   return request({
     url: `/league/sign/signUp`,
@@ -452,6 +469,7 @@ export function sportsmanDone(data) {
     data: data
   })
 }
+
 // 删除报名接口
 export function deleteSign(id) {
   return request({
@@ -459,6 +477,7 @@ export function deleteSign(id) {
     method: 'post'
   })
 }
+
 // 选择运动员的补充信息表头
 export function getCptExtraInfo(cptId) {
   return request({
@@ -466,6 +485,7 @@ export function getCptExtraInfo(cptId) {
     method: 'get'
   })
 }
+
 export function recoverMySign(data) {
   return request({
     url: `/league/sign/recoverMySign`,
@@ -473,6 +493,7 @@ export function recoverMySign(data) {
     data: data
   })
 }
+
 // 生成订单
 export function commitSign(data) {
   return request({
@@ -481,24 +502,28 @@ export function commitSign(data) {
     data: data
   })
 }
+
 export function getTotalFee(data) {
   return request({
     url: `/league/expenseConfig/getTotalFee/${data.cptId}/${data.entryId}`,
     method: 'get'
   })
 }
+
 export function getMemberInfoByCptId(cptId) {
   return request({
     url: `/systemj/member/editMemberCode/${cptId}`,
     method: 'get'
   })
 }
+
 export function getTemplate() {
   return request({
     url: `/systemj/personInfo/getTemplate`,
     method: 'get'
   })
 }
+
 // 支付 orderId,payType
 export function payMatch(data) {
   return request({
@@ -507,12 +532,14 @@ export function payMatch(data) {
     data: data
   })
 }
+
 export function cancelMyUnPayedOrder(orderId) {
   return request({
     url: `/league/signOrder/cancelMyUnPayedOrder/${orderId}`,
     method: 'post'
   })
 }
+
 export function getMySignListFromBaoXiang(data) {
   return request({
     url: `/league/sign/getMySignListFromBaoXiang`,
@@ -520,12 +547,14 @@ export function getMySignListFromBaoXiang(data) {
     data: data
   })
 }
+
 export function deleteMyGroup(groupId) {
   return request({
     url: `/league/group/deleteMyGroup/${groupId}`,
     method: 'post'
   })
 }
+
 export function checkPerson(data) {
   return request({
     url: `/systemj/personInfo/checkPersonInfoExist`,
@@ -533,12 +562,14 @@ export function checkPerson(data) {
     data: data
   })
 }
+
 export function getMySignListTree(cptId, personId, teamId) {
   return request({
     url: `/league/competitionProject/getAllInfoFromSelectPerson/${cptId}/${personId}/${teamId || 0}`,
     method: 'get'
   })
 }
+
 export function getMySignInfoList(data) {
   return request({
     url: `/league/sign/getMySignInfoList`,
@@ -546,6 +577,7 @@ export function getMySignInfoList(data) {
     params: data
   })
 }
+
 export function exportCn(data) {
   return request({
     url: `/league/sign/exportCn`,
@@ -553,37 +585,44 @@ export function exportCn(data) {
     params: data
   })
 }
+
 export function saveMyGroupExtraInfo(data) {
   return request({
     url: `/league/competitionGroupInfo/saveMyGroupExtraInfo`,
     method: 'post',
     data: data
   })
-}export function pcRegisterTeam(data) {
+}
+
+export function pcRegisterTeam(data) {
   return request({
     url: `/pcRegisterTeam`,
     method: 'post',
     data: data
   })
 }
+
 export function getMySignIds(cptId, personId, teamId) {
   return request({
     url: `/league/sign/getSignEntityByPersonId/${cptId}/${personId}/${teamId || 0}`,
     method: 'get'
   })
 }
+
 export function querySonLevel(parentId) {
   return request({
     url: `/league/competitionSonLevel/querySonLevelByParentId/${parentId}`,
     method: 'get'
   })
 }
+
 export function getPayedOrderPdf(cptId, groupId) {
   return request({
     url: `/pdf/getPayedOrderPdf/${cptId}/${groupId}`,
     method: 'get'
   })
 }
+
 export function checkNoRepeat(query) {
   return request({
     url: `/league/wdsf/checkNoRepeat`,
@@ -592,20 +631,22 @@ export function checkNoRepeat(query) {
   })
 }
 
-export function saveWdsfMin(obj,groupId) {
+export function saveWdsfMin(obj, groupId) {
   return request({
     url: `systemj/personInfo/bindWdsfForGroup/${groupId}`,
     method: 'post',
-    data:obj
+    data: obj
   })
 }
+
 //todo
-export function bindWdsf(perId,card) {
+export function bindWdsf(perId, card) {
   return request({
     url: `/systemj/personInfo/bindWdsf/${perId}?card=${card}`,
     method: 'post'
   })
 }
+
 export function getProjectPageByPerIds(query) {
   return request({
     url: `/league/competitionProject/getProjectPageByPerIds/${query.cptId}/${query.perIds}`,
@@ -613,6 +654,7 @@ export function getProjectPageByPerIds(query) {
     params: query
   })
 }
+
 export function getMatchNewslistByCode(query) {
   return request({
     url: `/ztx/notesort/listByCode`,
@@ -625,67 +667,76 @@ export function createWePay(data) {
   return request({
     url: `/league/signOrder/wxPay`,
     method: 'post',
-    data:data
+    data: data
   })
 }
+
 export function createWePayPhone(data) {
   return request({
     url: `/league/signOrder/wxH5Pay`,
     method: 'post',
-    data:data
+    data: data
   })
 }
+
 export function createPalPay(data) {
   return request({
     url: `/league/signOrder/palPay`,
     method: 'post',
-    data:data
+    data: data
   })
 }
+
 export function callbackPalPay(tradeNo) {
   return request({
     url: `/league/signOrder/palPay/callback`,
     method: 'post',
-    data:{
-      tradeNo:tradeNo
+    data: {
+      tradeNo: tradeNo
     }
   })
 }
+
 export function upReceipt(data) {
   return request({
     url: `/league/signOrder/offlinePay`,
     method: 'post',
-    data:data
+    data: data
   })
 }
+
 export function signgetSignInfoConflict(query) {
   return request({
     url: `/league/sign/getSignInfoConflict`,
     method: 'get',
-    params:query
+    params: query
   })
 }
+
 export function checkMate(query) {
   return request({
     url: `/systemj/personInfo/checkMate`,
     method: 'get',
-    params:query
+    params: query
   })
 }
+
 export function checkIdcCode(query) {
   return request({
     url: `/systemj/personInfo/extractInfo`,
     method: 'get',
-    params:query
+    params: query
   })
 }
-export function getProjectByCptId(cptId,query) {
+
+export function getProjectByCptId(cptId, query) {
   return request({
     url: `/league/competitionProject/getTableByLanguageSourceAndCptId/${cptId}`,
     method: 'get',
     params: query
   })
 }
+
 export function addInvitation(data) {
   return request({
     url: `/league/person`,
@@ -693,3 +744,21 @@ export function addInvitation(data) {
     data: data
   })
 }
+
+// 酒店预约查询
+export function hotelList(params) {
+  return request({
+    url: `/ota/reservedRoom/query`,
+    method: 'get',
+    params
+  })
+}
+
+// 飞机预约查询
+export function aircraft(params) {
+  return request({
+    url: `/league/pickup/query`,
+    method: 'get',
+    params
+  })
+}

@@ -318,7 +318,7 @@ export const constantRoutes = [
             path: 'list/reservationSearch',
             component: () => import('@/viewsPc/match/reservationSearch.vue'),
             name: 'reservationSearch',
-            meta: {title: '预约查询'}
+            meta: {title: '预订查询'}
           }
         ]
       },

@@ -3,7 +3,7 @@
     <div class="pd20">
       <div class="fr mb20">
         <el-input
-          v-model.trim="query.projectName"
+          v-model.trim="query.text1"
           :placeholder="language==0?'请输入邮箱或联系方式':'Please enter email or contact information' "
           :prefix-icon="Search"
           clearable
@@ -66,32 +66,25 @@
 <script setup>
 import {Search} from "@element-plus/icons-vue";
 import {useStorage} from "@vueuse/core/index"
-import {getProjectByCptId} from "@/apiPc/match";
+import {aircraft} from "@/apiPc/match";
 import PaginationPc from "@/components/PaginationPc";
+import {useRoute} from 'vue-router'
 
 const language = useStorage('language', 0)
 const list = ref([])
 const total = ref(0)
+const route = useRoute()
 const query = ref({
-  projectName: '',
+  text: '',
   pageSize: 10,
-  pageNum: 1
-})
-const props = defineProps({
-  matchId: {
-    type: String,
-    required: false
-  },
-  isNational: {
-    type: Boolean,
-    required: false,
-    default: false
-  },
+  pageNum: 1,
+  cptId: route.query.matchId
 })
 
 function getList() {
-  getProjectByCptId(props.matchId, query.value).then(res => {
-    list.value = res.rows
+  query.value.text = "%2E" + query.value.text1
+  aircraft(query.value).then(res => {
+    list.value = res
     total.value = res.total
   })
 }

@@ -3,7 +3,7 @@
     <div class="pd20">
       <div class="fr mb20">
         <el-input
-          v-model.trim="query.projectName"
+          v-model.trim="query.text"
           :placeholder="language==0?'请输入邮箱或联系方式':'Please enter email or contact information'"
           :prefix-icon="Search"
           clearable
@@ -14,69 +14,21 @@
         <el-table-column :label="language==0?'序号':'Serial'" :min-width="language==0?60:80" align="center"
                          type="index"/>
         <el-table-column :label="language==0?'酒店名称':'Hotel Name'" align="center" min-width="150"
-                         prop="name"></el-table-column>
-        <el-table-column :label="language==0?'联系人':'Contacts'" align="center" prop="danceType" width="110">
+                         prop="hotelName"></el-table-column>
+        <el-table-column :label="language==0?'联系人':'Contacts'" align="center" prop="contacts" width="110">
         </el-table-column>
-        <el-table-column :label="language==0?'联系方式':'Contact Way'" align="center" prop="danceTypeDetailStr"
+        <el-table-column :label="language==0?'联系方式':'Contact Way'" align="center" prop="phone"
                          width="120">
         </el-table-column>
 
-        <el-table-column :label="language==0?'预留日期':'Reservation Date'" align="center">
-          <template #default="{row}">
-            <span v-if="row.playTypeStr">{{ row.playTypeStr }}</span>
-            <span v-else>{{ row.playType }}</span>
-          </template>
+        <el-table-column :label="language==0?'预留日期':'Reservation Date'" align="center" prop="reservationDate">
         </el-table-column>
-        <el-table-column :label="language==0?'房型':'Room Type'" :min-width="isNational?120:240" align="center">
-          <template #default="{row}">
-            <div v-if="isNational">
-              <span v-if="row.ageGroup == '0'">{{ language == 0 ? '不限制' : 'Unlimited' }}</span>
-              <span v-if="row.ageGroup == '1'">Juvenile I</span>
-              <span v-if="row.ageGroup == '2'">Juvenile II</span>
-              <span v-if="row.ageGroup == '3'">Juv1& II (comb.)</span>
-              <span v-if="row.ageGroup == '4'">Junior I</span>
-              <span v-if="row.ageGroup == '5'">Junior II</span>
-              <span v-if="row.ageGroup == '6'">Juv I & II (comb.)</span>
-              <span v-if="row.ageGroup == '7'">
-                <span v-if="row.danceType=='Breaking'">2006-01-01 {{
-                    language == 0 ? '至' : '~'
-                  }} 2010-12-31</span>
-                <span v-else>Youth</span>
-              </span>
-              <span v-if="row.ageGroup == '8'">Under 21</span>
-              <span v-if="row.ageGroup == '9'">Adult</span>
-              <span v-if="row.ageGroup == '10'">Senior I</span>
-              <span v-if="row.ageGroup == '11'">Senior II</span>
-              <span v-if="row.ageGroup == '12'">Senior III</span>
-              <span v-if="row.ageGroup == '13'">Senior IV</span>
-              <span v-if="row.ageGroup == '14'">Senior V</span>
-            </div>
-            <div v-else>
-              <div>{{ row.birthPeriod.replace(',', language == 0 ? ' 至 ' : ' to ') }}</div>
-              <div v-if="row.birthPeriodSecond">
-                {{ row.birthPeriodSecond?.replace(',', language == 0 ? ' 至 ' : ' to ') }}
-              </div>
-              <div v-if="row.birthPeriodThird">
-                {{ row.birthPeriodThird?.replace(',', language == 0 ? ' 至 ' : ' to ') }}
-              </div>
-              <div v-if="row.birthPeriodFourth">
-                {{ row.birthPeriodFourth?.replace(',', language == 0 ? ' 至 ' : ' to ') }}
-              </div>
-              <div v-if="row.birthPeriodFifth">
-                {{ row.birthPeriodFifth?.replace(',', language == 0 ? ' 至 ' : ' to ') }}
-              </div>
-              <div v-if="row.birthPeriodSixth">
-                {{ row.birthPeriodSixth?.replace(',', language == 0 ? ' 至 ' : ' to ') }}
-              </div>
-            </div>
-          </template>
+        <el-table-column :label="language==0?'房型':'Room Type'" :min-width="isNational?120:240" align="center"
+                         prop="roomType">
         </el-table-column>
-        <el-table-column :label="language==0?'数量':'Quantity'" align="center" width="160">
-          <template #default="{row}">
-            <div class="text-primary">{{ language == 0 ? '¥' : '€' }}{{ row.serviceFee }}</div>
-          </template>
+        <el-table-column :label="language==0?'数量':'Quantity'" align="center" prop="num" width="160">
         </el-table-column>
-        <el-table-column :label="language==0?'状态':'State'" align="center" width="160">
+        <el-table-column :label="language==0?'状态':'State'" align="center" prop="status" width="160">
           <template #default="{row}">
             <div class="text-primary">{{ language == 0 ? '¥' : '€' }}{{ row.serviceFee }}</div>
           </template>
@@ -96,16 +48,19 @@
 <script setup>
 import {Search} from "@element-plus/icons-vue";
 import {useStorage} from "@vueuse/core/index"
-import {getProjectByCptId} from "@/apiPc/match";
+import {hotelList} from "@/apiPc/match";
 import PaginationPc from "@/components/PaginationPc";
+import {useRoute} from 'vue-router'
 
 const language = useStorage('language', 0)
 const list = ref([])
 const total = ref(0)
+const route = useRoute()
 const query = ref({
   projectName: '',
   pageSize: 10,
-  pageNum: 1
+  pageNum: 1,
+  activeId: route.query.matchId
 })
 const props = defineProps({
   matchId: {
@@ -118,12 +73,15 @@ const props = defineProps({
     default: false
   },
 })
+query.value.activeId = props.matchId
 
 function getList() {
-  getProjectByCptId(props.matchId, query.value).then(res => {
-    list.value = res.rows
+  hotelList(query.value).then(res => {
+    list.value = res
     total.value = res.total
   })
+  query.value.email = null
+  query.value.phone = null
 }
 </script>
 

 <template>
   <div style="filter: opacity(1)">
-    <el-row v-if="language==0" :gutter="14" class="btnbox">
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+    <el-row v-if="language==0" class="btnbox" justify='space-between'>
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(0)">
           <img src="@/assets/dance/btn04.png"/>
           <h4>票务预订</h4>
         </div>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(1)">
           <img src="@/assets/dance/btn01.png"/>
           <h4>酒店预订</h4>
         </div>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(2)">
           <img src="@/assets/dance/btn02.png"/>
           <h4>车辆预订</h4>
         </div>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(6)">
-          <img src="@/assets/dance/btn04.png"/>
+          <img src="@/assets/dance/btn07.png"/>
           <h4>预订查询</h4>
         </div>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(3)">
           <img src="@/assets/dance/btn03.png"/>
           <h4>餐饮预订</h4>
         </div>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(4)">
           <img src="@/assets/dance/btn05.png"/>
           <h4>化妆预约</h4>
         </div>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(5)">
           <img src="@/assets/dance/btn06.png"/>
           <h4>拍照预约</h4>
         </div>
       </el-col>
     </el-row>
-    <el-row v-else :gutter="14" class="btnbox">
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+    <el-row v-else class="btnbox" justify='space-between'>
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(0)">
           <img src="@/assets/dance/btn04.png"/>
           <h4>TICKET BOOKING</h4>
         </div>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(1)">
           <img src="@/assets/dance/btn01.png"/>
           <h4>HOTEL RESERVATION</h4>
         </div>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(2)">
           <img src="@/assets/dance/btn02.png"/>
           <h4>TRANSPORTATION RESERVATION</h4>
         </div>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(6)">
-          <img src="@/assets/dance/btn04.png"/>
+          <img src="@/assets/dance/btn07.png"/>
           <h4>RESERVATION SEARCH</h4>
         </div>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(3)">
           <img src="@/assets/dance/btn03.png"/>
           <h4>DINING RESERVATION</h4>
         </div>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(4)">
           <img src="@/assets/dance/btn05.png"/>
           <h4>MAKEUP APPOINTMENT</h4>
         </div>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(5)">
           <img src="@/assets/dance/btn06.png"/>
           <h4>PHOTOGRAPHY APPOINTMENT</h4>
@@ -218,12 +218,12 @@ h4 {
   padding: 0 10px;
 }
 
-.btnbox {
-  .el-col-lg-4 {
-    max-width: 14.28%;
-    flex: 0 0 14.28%;
-  }
-}
+//.btnbox {
+//  .el-col-lg-4 {
+//    max-width: 14.28%;
+//    flex: 0 0 14.28%;
+//  }
+//}
 
 .fixedKP {
   position: fixed;