放行

snowy-admin-web/src/views/gsc/pass/detail.vue

@@ -8,39 +8,43 @@
 		<div class="goods-detail">
       <div class="__cus-title_1">基本信息</div>
       <a-form :model="formData">
-        <a-row>
-          <a-col :span="16">
-            <a-row :gutter="16">
-              <a-col :span="12">
-                <a-form-item label="姓名">
-                  <a-input v-model:value="formData.name" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                <a-form-item label="性别">
-                  <a-select v-model:value="formData.gender" :disabled="true"
-                            :options="sexOptions" show-search allow-clear optionFilterProp="label"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                <a-form-item label="国籍">
-                  <a-select v-model:value="formData.nationality" :disabled="true"
-                            :options="cityOptions" show-search allow-clear optionFilterProp="label"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                <a-form-item label="年龄">
-                  <a-input v-model:value="formData.age" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                <a-form-item label="身份证号">
-                  <a-input v-model:value="formData.idNo" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-            </a-row>
+        <a-row :gutter="16">
+          <a-col :span="8">
+            <a-form-item label="姓名">
+              <a-input v-model:value="formData.name" :disabled="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="性别">
+              <a-select v-model:value="formData.gender" :disabled="true"
+                        :options="sexOptions" show-search allow-clear optionFilterProp="label"/>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
+            <a-form-item label="国籍">
+              <a-select v-model:value="formData.nationality" :disabled="true"
+                        :options="cityOptions" show-search allow-clear optionFilterProp="label"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="年龄">
+              <a-input v-model:value="formData.age" :disabled="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="身份证号">
+              <a-input v-model:value="formData.idNo" :disabled="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="入场时间">
+              <a-input v-model:value="formData.admissionTime" :disabled="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="放行时间">
+              <a-input v-model:value="formData.passTime" :disabled="true"/>
+            </a-form-item>
           </a-col>
         </a-row>
       </a-form>
@@ -143,7 +147,7 @@ const imgOptions = ref({
 const onOpen = (record, view = false) => {
 	open.value = true
 	if (record) {
-    basicApi.passengerinfoDetail({id: record.id}).then(res => {
+    basicApi.passengerinfoDetail({id: record.id, queryType: 3}).then(res => {
 			formData.value = Object.assign({}, res)
 		})
 	}

snowy-admin-web/src/views/gsc/pass/index.vue

@@ -40,21 +40,13 @@
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="是否携带行李物品">
-            <a-select v-model:value="searchFormState.baggage" placeholder="请选择是否携带行李物品"
-                      :options="isNoOptions" show-search allow-clear optionFilterProp="label"/>
+          <a-form-item label="入场时间">
+            <a-range-picker v-model:value="searchFormState.admissionTime" show-time allow-clear/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="出发港口">
-            <a-select v-model:value="searchFormState.fromPort" placeholder="请选择出发港口"
-                      :options="departurePortOptions" show-search allow-clear optionFilterProp="label"/>
-          </a-form-item>
-        </a-col>
-        <a-col :span="6">
-          <a-form-item label="到达港口">
-            <a-select v-model:value="searchFormState.toPort" placeholder="请选择到达港口"
-                      :options="arrivingPortOptions" show-search allow-clear optionFilterProp="label"/>
+          <a-form-item label="放行时间">
+            <a-range-picker v-model:value="searchFormState.passTime" show-time allow-clear/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
@@ -80,14 +72,8 @@
         <template v-if="column.dataIndex === 'nationality'">
           {{ $TOOL.dictTypeData('lvke_city', record.nationality) }}
         </template>
-        <template v-if="column.dataIndex === 'baggage'">
-          {{ $TOOL.dictTypeData('lvke_isNo', record.baggage) }}
-        </template>
-        <template v-if="column.dataIndex === 'fromPort'">
-          {{ $TOOL.dictTypeData('lvke_departurePort', record.fromPort) }}
-        </template>
-        <template v-if="column.dataIndex === 'toPort'">
-          {{ $TOOL.dictTypeData('lvke_arrivingPort', record.toPort) }}
+        <template v-if="column.dataIndex === 'checkType'">
+          {{ $TOOL.dictTypeData('lvke_checkType', record.checkType) }}
         </template>
         <template v-if="column.dataIndex === 'action'">
           <a-space>
@@ -144,20 +130,16 @@ const columns = [
     dataIndex: 'travelTime',
   },
   {
-    title: '是否携带行李物品',
-    dataIndex: 'baggage',
+    title: '类型',
+    dataIndex: 'checkType',
   },
   {
-    title: '出发港口',
-    dataIndex: 'fromPort',
+    title: '入场时间',
+    dataIndex: 'admissionTime',
   },
   {
-    title: '到达港口',
-    dataIndex: 'toPort',
-  },
-  {
-    title: '座位号',
-    dataIndex: 'seatNo',
+    title: '放行时间',
+    dataIndex: 'passTime',
   },
   {
     title: '操作',
@@ -189,7 +171,17 @@ const loadData = (parameter) => {
     searchFormStateReal.value.travelTimeEnd = proxy.$util.YMDHms(searchFormStateReal.value.travelTime[1])
     delete searchFormStateReal.value.travelTime
   }
-  return basicApi.passengerInfoPage(Object.assign(parameter, searchFormStateReal.value)).then((data) => {
+  if (searchFormStateReal.value.admissionTime?.length > 0) {
+    searchFormStateReal.value.admissionTimeStart = proxy.$util.YMDHms(searchFormStateReal.value.admissionTime[0])
+    searchFormStateReal.value.admissionTimeEnd = proxy.$util.YMDHms(searchFormStateReal.value.admissionTime[1])
+    delete searchFormStateReal.value.admissionTime
+  }
+  if (searchFormStateReal.value.passTime?.length > 0) {
+    searchFormStateReal.value.passTimeStart = proxy.$util.YMDHms(searchFormStateReal.value.passTime[0])
+    searchFormStateReal.value.passTimeEnd = proxy.$util.YMDHms(searchFormStateReal.value.passTime[1])
+    delete searchFormStateReal.value.passTime
+  }
+  return basicApi.passengerInfoPage(Object.assign(parameter, searchFormStateReal.value, {queryType: 3})).then((data) => {
     return data
   })
 }