预约查询

@@ -3,7 +3,7 @@
     <div class="pd20">
       <div class="fr mb20">
         <el-input
-          v-model.trim="query.text1"
+          v-model.trim="query.text"
           :placeholder="language==0?'请输入邮箱或联系方式':'Please enter email or contact information' "
           :prefix-icon="Search"
           clearable
@@ -13,42 +13,46 @@
       <el-table :data="list" border>
         <el-table-column :label="language==0?'序号':'Serial'" :min-width="language==0?60:80" align="center"
                          type="index"/>
-        <el-table-column :label="language==0?'服务类型':'Type Of Service'" align="center" min-width="150"
-                         prop="name"></el-table-column>
-        <el-table-column :label="language==0?'联系人':'Contacts'" align="center" prop="danceType" width="110">
-        </el-table-column>
-        <el-table-column :label="language==0?'联系方式':'Contact Way'" align="center" prop="danceTypeDetailStr"
-                         width="120">
-        </el-table-column>
-        <el-table-column :label="language==0?'抵达时间':'Time Of Arrival'" align="center" width="140">
+        <el-table-column :label="language==0?'服务类型':'Type Of Service'" :min-width="language==0? 90:150"
+                         align="center"
+                         prop="serviceTypeStr">
           <template #default="{row}">
-            <span v-if="row.playTypeStr">{{ row.playTypeStr }}</span>
-            <span v-else>{{ row.playType }}</span>
+            {{ row.serviceType == 1 ? '接机' : '送机' }}
           </template>
         </el-table-column>
-        <el-table-column :label="language==0?'人数':'Number Of People'" :min-width="isNational?120:240" align="center">
-          <template #default="{row}">
-          </template>
+        <el-table-column :label="language==0?'联系人':'Contacts'" align="center" prop="name" width="110">
         </el-table-column>
-        <el-table-column :label="language==0?'航班 / 车次':'Flight / train number'" align="center" width="160">
-          <template #default="{row}">
-            <div class="text-primary">{{ language == 0 ? '¥' : '€' }}{{ row.serviceFee }}</div>
-          </template>
+        <el-table-column :label="language==0?'联系方式':'Contact Way'" :min-width="language==0?100:130" align="center"
+                         prop="phone">
         </el-table-column>
-        <el-table-column :label="language==0?'机场 / 火车站':'Airport / Train station'" align="center" width="160">
+        <el-table-column :label="language==0?'抵达时间':'Time Of Arrival'" align="center" width="180">
           <template #default="{row}">
-            <div class="text-primary">{{ language == 0 ? '¥' : '€' }}{{ row.serviceFee }}</div>
+            {{ row.arrivalDate + ' ' + row.arrivaTime }}
           </template>
         </el-table-column>
-        <el-table-column :label="language==0?'航站楼':'Terminal'" align="center" width="160">
+        <el-table-column :label="language==0?'人数':'Number Of People'" :min-width="language==0?120:170" align="center"
+                         prop="counts">
+        </el-table-column>
+        <el-table-column :label="language==0?'航班 / 车次':'Flight / train number'" :min-width="language==0?120:190"
+                         align="center"
+                         prop="flight">
+        </el-table-column>
+        <el-table-column :label="language==0?'机场 / 火车站':'Airport / Train station'" :min-width="language==0?120:200"
+                         align="center"
+                         prop="stationName">
+        </el-table-column>
+        <el-table-column :label="language==0?'航站楼':'Terminal'" align="center" prop="terminal" width="160">
+        </el-table-column>
+        <el-table-column :label="language==0?'出发地':' Place Of Departure'" :min-width="language==0?120:200"
+                         align="center" prop="hotle">
           <template #default="{row}">
-            <div class="text-primary">{{ language == 0 ? '¥' : '€' }}{{ row.serviceFee }}</div>
+            {{ row.serviceType != 1 ? row.hotle : row.stationName }}
           </template>
         </el-table-column>
-        <el-table-column :label="language==0?'目的地/出发地':'Destination / Place Of Departure'" align="center"
-                         width="260">
+        <el-table-column :label="language==0?'目的地':'Destination'" :min-width="language==0?120:200"
+                         align="center" prop="hotle">
           <template #default="{row}">
-            <div class="text-primary">{{ language == 0 ? '¥' : '€' }}{{ row.serviceFee }}</div>
+            {{ row.serviceType == 1 ? row.hotle : row.stationName }}
           </template>
         </el-table-column>
       </el-table>
@@ -82,7 +86,6 @@ const query = ref({
 })
 
 function getList() {
-  query.value.text = "%2E" + query.value.text1
   aircraft(query.value).then(res => {
     list.value = res
     total.value = res.total

@@ -15,13 +15,14 @@
                          type="index"/>
         <el-table-column :label="language==0?'酒店名称':'Hotel Name'" align="center" min-width="150"
                          prop="hotelName"></el-table-column>
-        <el-table-column :label="language==0?'联系人':'Contacts'" align="center" prop="contacts" width="110">
+        <el-table-column :label="language==0?'联系人':'Contacts'" align="center" min-width="110" prop="contacts">
         </el-table-column>
         <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" prop="reservationDate">
+        <el-table-column :label="language==0?'预留日期':'Reservation Date'" align="center" min-width="120"
+                         prop="reservationDate">
         </el-table-column>
         <el-table-column :label="language==0?'房型':'Room Type'" :min-width="isNational?120:240" align="center"
                          prop="roomType">
@@ -30,7 +31,7 @@
         </el-table-column>
         <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>
+            {{ row.status == 1 ? '已预留' : null }}
           </template>
         </el-table-column>
       </el-table>
@@ -62,26 +63,13 @@ const query = ref({
   pageNum: 1,
   activeId: route.query.matchId
 })
-const props = defineProps({
-  matchId: {
-    type: String,
-    required: false
-  },
-  isNational: {
-    type: Boolean,
-    required: false,
-    default: false
-  },
-})
-query.value.activeId = props.matchId
 
 function getList() {
+  // query.value.text = encodeURIComponent(query.value.text1)
   hotelList(query.value).then(res => {
     list.value = res
     total.value = res.total
   })
-  query.value.email = null
-  query.value.phone = null
 }
 </script>