基本信息

snowy-admin-web/.env.development

@@ -5,8 +5,8 @@ NODE_ENV = development
 VITE_TITLE = gsc
 
 # 接口地址
-#VITE_API_BASEURL = http://127.0.0.1:18070
-VITE_API_BASEURL = http://8.130.72.63:18070
+VITE_API_BASEURL = http://127.0.0.1:18070
+#VITE_API_BASEURL = http://8.130.72.63:18070
 #VITE_API_BASEURL = http://192.168.108.70:18070
 
 # 本地端口

snowy-admin-web/src/api/gsc/basic.js

@@ -0,0 +1,20 @@
+import { baseRequest } from '@/utils/request'
+
+const request = (url, ...arg) => baseRequest(url, ...arg)
+
+/**
+ * 回执单列表Api接口管理器
+ *
+ * @author hgx
+ * @date  2024/07/05 14:48
+ **/
+export default {
+	// 分页
+	passengerInfoPage(data) {
+		return request('/biz/passengerinfo/page', data, 'get')
+	},
+	// 详情
+	passengerinfoDetail(data) {
+		return request('/biz/passengerinfo/detail', data, 'get')
+	},
+}

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

@@ -13,29 +13,29 @@
             <a-row :gutter="16">
               <a-col :span="12">
                 <a-form-item label="姓名">
-                  <a-input v-model:value="formData.reWarehouseNumber" :disabled="true"/>
+                  <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.reWarehouseNumber" :disabled="true"
+                  <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.reWarehouseNumber" :disabled="true"
+                  <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.reWarehouseNumber" :disabled="true"/>
+                  <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.reWarehouseNumber" :disabled="true"/>
+                  <a-input v-model:value="formData.idNo" :disabled="true"/>
                 </a-form-item>
               </a-col>
             </a-row>
@@ -48,28 +48,26 @@
       <a-table
         style="margin-top: 10px"
         bordered
-        :dataSource="[
-          formData,
-        ]"
+        :dataSource="formData.goods"
         :columns="[
-          {title: '物品类别',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '物品细类',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '物品名称',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '物品产地',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '重量(千克)',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '品牌',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '规格型号',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '单价',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '币种',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '数量',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '数量单位',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '发票/许可证',dataIndex: 'action',key: 'action'},
+          {title: '物品类别',dataIndex: 'goodCategory',key: 'goodCategory'},
+          {title: '物品细类',dataIndex: 'goodSubclass',key: 'goodSubclass'},
+          {title: '物品名称',dataIndex: 'goodName',key: 'goodName'},
+          {title: '物品产地',dataIndex: 'goodPlace',key: 'goodPlace'},
+          {title: '重量(千克)',dataIndex: 'weight',key: 'weight'},
+          {title: '品牌',dataIndex: 'brand',key: 'brand'},
+          {title: '规格型号',dataIndex: 'specModel',key: 'specModel'},
+          {title: '单价',dataIndex: 'price',key: 'price'},
+          {title: '币种',dataIndex: 'currency',key: 'currency'},
+          {title: '数量',dataIndex: 'quantity',key: 'quantity'},
+          {title: '数量单位',dataIndex: 'unit',key: 'unit'},
+          {title: '发票/许可证',dataIndex: 'license',key: 'license'},
         ]"
         :pagination="false"
       >
         <template #bodyCell="{ column, record }">
-          <template v-if="column.dataIndex === 'action'">
-            <a-button type="link" primary size="small">查看</a-button>
+          <template v-if="column.dataIndex === 'license'">
+            <a-button type="link" primary size="small" @click="onViewImg(record.license)">查看</a-button>
           </template>
         </template>
       </a-table>
@@ -78,61 +76,77 @@
         <a-row :gutter="16">
           <a-col :span="8">
             <a-form-item label="乘坐交通工具类型">
-              <a-input v-model:value="formData.reWarehouseNumber" :disabled="true"/>
+              <a-input v-model:value="formData.vehicleType" :disabled="true"/>
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="出发时间">
-              <a-input v-model:value="formData.reWarehouseNumber" :disabled="true"/>
+              <a-input v-model:value="formData.departTime" :disabled="true"/>
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="出发港口">
-              <a-select v-model:value="formData.reWarehouseNumber" :disabled="true"
+              <a-select v-model:value="formData.fromPort" :disabled="true"
                         :options="departurePortOptions" 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.reWarehouseNumber" :disabled="true"
+              <a-select v-model:value="formData.toPort" :disabled="true"
                         :options="arrivingPortOptions" 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.reWarehouseNumber" :disabled="true"/>
+              <a-input v-model:value="formData.travelNo" :disabled="true"/>
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="座位号">
-              <a-input v-model:value="formData.reWarehouseNumber" :disabled="true"/>
+              <a-input v-model:value="formData.seatNo" :disabled="true"/>
             </a-form-item>
           </a-col>
         </a-row>
       </a-form>
 		</div>
 		<template #footer></template>
+<!--    <a-image-preview-group-->
+<!--      :style="{ display: 'none' }"-->
+<!--      :preview="{-->
+<!--        visible: imgOptions.visible,-->
+<!--        onVisibleChange: imgOptions.setVisible,-->
+<!--      }">-->
+<!--      <a-image :width="200" src="https://aliyuncdn.antdv.com/vue.png" />-->
+<!--      <a-image :width="200" src="https://aliyuncdn.antdv.com/logo.png" />-->
+<!--    </a-image-preview-group>-->
 	</a-modal>
 </template>
 
 <script setup name="enterpriseDetail">
 import tool from '@/utils/tool'
 import {cloneDeep} from 'lodash-es'
-import qyOutWarehouseApi from "@/api/yqyc/qyOutWarehouseApi";
+import basicApi from "@/api/gsc/basic";
 // 抽屉状态
 const open = ref(false)
 const emit = defineEmits({successful: null})
 // 表单数据
 const formData = ref({})
+const imgOptions = ref({
+  visible: false,
+  setVisible: (value) => {
+    imgOptions.value.visible = value;
+  },
+  url: []
+})
 
 // 打开抽屉
 const onOpen = (record, view = false) => {
 	open.value = true
-	// if (record) {
-	// 	qyOutWarehouseApi.qyOutWarehousePage({warehouseNumber: record.warehouseNumber}).then(res => {
-	// 		formData.value = Object.assign({}, res)
-	// 	})
-	// }
+	if (record) {
+    basicApi.passengerinfoDetail({id: record.id}).then(res => {
+			formData.value = Object.assign({}, res)
+		})
+	}
 }
 // 关闭抽屉
 const onClose = () => {
@@ -140,9 +154,11 @@ const onClose = () => {
 	formData.value = {}
 	open.value = false
 }
+const onViewImg = (urls) => {
+
+}
 const sexOptions = tool.dictList('lvke_sex')
-// const cityOptions = tool.dictList('lvke_city')
-const cityOptions = []
+const cityOptions = tool.dictList('lvke_city')
 const departurePortOptions = tool.dictList('lvke_departurePort')
 const arrivingPortOptions = tool.dictList('lvke_arrivingPort')
 // 抛出函数

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

@@ -1,6 +1,6 @@
 <template>
   <a-card :bordered="false">
-    <a-form ref="searchref_detail" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
+    <a-form ref="searchFormRef" :model="searchFormState" class="ant-advanced-search-form">
       <a-row :gutter="24">
         <a-col :span="6">
           <a-form-item label="姓名">
@@ -9,51 +9,51 @@
         </a-col>
         <a-col :span="6">
           <a-form-item label="性别">
-            <a-select v-model:value="searchFormState.accountType" placeholder="请选择性别"
+            <a-select v-model:value="searchFormState.gender" placeholder="请选择性别"
                       :options="sexOptions" show-search allow-clear optionFilterProp="label"/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
           <a-form-item label="身份证号">
-            <a-input v-model:value="searchFormState.name" placeholder="请输入身份证号" allow-clear/>
+            <a-input v-model:value="searchFormState.idNo" placeholder="请输入身份证号" allow-clear/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
           <a-form-item label="国籍">
-            <a-select v-model:value="searchFormState.accountType" placeholder="请选择国籍"
+            <a-select v-model:value="searchFormState.nationality" placeholder="请选择国籍"
                       :options="cityOptions" show-search allow-clear optionFilterProp="label"/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
           <a-form-item label="居住地">
-            <a-input v-model:value="searchFormState.name" placeholder="请输入居住地" allow-clear/>
+            <a-input v-model:value="searchFormState.address" placeholder="请输入居住地" allow-clear/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
           <a-form-item label="车次/航班号">
-            <a-input v-model:value="searchFormState.name" placeholder="请输入车次/航班号" allow-clear/>
+            <a-input v-model:value="searchFormState.travelNo" placeholder="请输入车次/航班号" allow-clear/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
           <a-form-item label="航/车次(班)日期">
-            <a-range-picker v-model:value="searchFormState.warehouseTime" show-time allow-clear/>
+            <a-range-picker v-model:value="searchFormState.travelTime" show-time allow-clear/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
           <a-form-item label="是否携带行李物品">
-            <a-select v-model:value="searchFormState.accountType" placeholder="请选择是否携带行李物品"
+            <a-select v-model:value="searchFormState.baggage" placeholder="请选择是否携带行李物品"
                       :options="isNoOptions" 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.accountType" placeholder="请选择出发港口"
+            <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.accountType" placeholder="请选择到达港口"
+            <a-select v-model:value="searchFormState.toPort" placeholder="请选择到达港口"
                       :options="arrivingPortOptions" show-search allow-clear optionFilterProp="label"/>
           </a-form-item>
         </a-col>
@@ -74,8 +74,20 @@
       :scroll="{ x: 2000 }"
     >
       <template #bodyCell="{ column, record }">
-        <template v-if="column.dataIndex === 'sex'">
-          {{ $TOOL.dictTypeData('lvke_sex', record.sex) }}
+        <template v-if="column.dataIndex === 'gender'">
+          {{ $TOOL.dictTypeData('lvke_sex', record.gender) }}
+        </template>
+        <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>
         <template v-if="column.dataIndex === 'action'">
           <a-space>
@@ -92,13 +104,12 @@
 import tool from '@/utils/tool'
 import {cloneDeep} from 'lodash-es'
 import Detail from './detail.vue'
-import demo2Api from '@/api/biz/demo2Api'
-import downloadUtil from "@/utils/downloadUtil";
+import basicApi from '@/api/gsc/basic'
 
 const {proxy} = getCurrentInstance()
 const searchFormState = ref({})
 const searchFormStateReal = ref({}) // 点击搜索后备份的查询参数
-const searchref_detail = ref()
+const searchFormRef = ref()
 const tableRef = ref()
 const filterParam = ref({})
 const ref_detail = ref()
@@ -110,43 +121,43 @@ const columns = [
   },
   {
     title: '性别',
-    dataIndex: 'age',
+    dataIndex: 'gender',
   },
   {
     title: '身份证号',
-    dataIndex: 'sex',
+    dataIndex: 'idNo',
   },
   {
     title: '国籍',
-    dataIndex: 'remark',
+    dataIndex: 'nationality',
   },
   {
     title: '居住地',
-    dataIndex: 'p1',
+    dataIndex: 'address',
   },
   {
     title: '车次/航班号',
-    dataIndex: 'p2',
+    dataIndex: 'travelNo',
   },
   {
     title: '航/车次(班)日期',
-    dataIndex: 'p3',
+    dataIndex: 'travelTime',
   },
   {
     title: '是否携带行李物品',
-    dataIndex: 'p4',
+    dataIndex: 'baggage',
   },
   {
     title: '出发港口',
-    dataIndex: 'p5',
+    dataIndex: 'fromPort',
   },
   {
     title: '到达港口',
-    dataIndex: 'p6',
+    dataIndex: 'toPort',
   },
   {
     title: '座位号',
-    dataIndex: 'p7',
+    dataIndex: 'seatNo',
   },
   {
     title: '操作',
@@ -173,7 +184,12 @@ const options = {
   }
 }
 const loadData = (parameter) => {
-  return demo2Api.demo2Page(Object.assign(parameter, searchFormStateReal.value)).then((data) => {
+  if (searchFormStateReal.value.travelTime?.length > 0) {
+    searchFormStateReal.value.travelTimeStart = proxy.$util.YMDHms(searchFormStateReal.value.travelTime[0])
+    searchFormStateReal.value.travelTimeEnd = proxy.$util.YMDHms(searchFormStateReal.value.travelTime[1])
+    delete searchFormStateReal.value.travelTime
+  }
+  return basicApi.passengerInfoPage(Object.assign(parameter, searchFormStateReal.value)).then((data) => {
     return data
   })
 }
@@ -184,49 +200,11 @@ const onSearch = (parameter) => {
 }
 // 重置
 const reset = () => {
-  searchref_detail.value.resetFields()
+  searchFormRef.value.resetFields()
   onSearch(true)
 }
-// 删除
-const deleteDemo2 = (record) => {
-  let params = [
-    {
-      id: record.id
-    }
-  ]
-  demo2Api.demo2Delete(params).then(() => {
-    tableRef.value.refresh(true)
-  })
-}
-// 批量删除
-const deleteBatchDemo2 = (params) => {
-  demo2Api.demo2Delete(params).then(() => {
-    tableRef.value.clearRefreshSelected()
-  })
-}
-// 批量导出
-const onExport = () => {
-  const params = {
-    ...filterParam.value
-  }
-  if (selectedRowKeys.value.length > 0) {
-    params.ids = selectedRowKeys.value
-  } else {
-    Object.entries(searchFormStateReal.value).forEach(([key, value]) => {
-      console.log(key)
-      if (proxy.$util.isValue(value)) {
-        params[key] = value
-      }
-    })
-  }
-  demo2Api.demo2Export(params).then((res) => {
-    downloadUtil.resultDownload(res)
-    tableRef.value.clearSelected()
-  })
-}
 const sexOptions = tool.dictList('lvke_sex')
-// const cityOptions = tool.dictList('lvke_city')
-const cityOptions = []
+const cityOptions = tool.dictList('lvke_city')
 const isNoOptions = tool.dictList('lvke_isNo')
 const departurePortOptions = tool.dictList('lvke_departurePort')
 const arrivingPortOptions = tool.dictList('lvke_arrivingPort')

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

@@ -13,29 +13,29 @@
             <a-row :gutter="16">
               <a-col :span="12">
                 <a-form-item label="姓名">
-                  <a-input v-model:value="formData.reWarehouseNumber" :disabled="true"/>
+                  <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.reWarehouseNumber" :disabled="true"
+                  <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.reWarehouseNumber" :disabled="true"
+                  <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.reWarehouseNumber" :disabled="true"/>
+                  <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.reWarehouseNumber" :disabled="true"/>
+                  <a-input v-model:value="formData.idNo" :disabled="true"/>
                 </a-form-item>
               </a-col>
             </a-row>
@@ -48,28 +48,26 @@
       <a-table
         style="margin-top: 10px"
         bordered
-        :dataSource="[
-          formData,
-        ]"
+        :dataSource="formData.goods"
         :columns="[
-          {title: '物品类别',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '物品细类',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '物品名称',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '物品产地',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '重量(千克)',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '品牌',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '规格型号',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '单价',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '币种',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '数量',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '数量单位',dataIndex: 'wlbh',key: 'wlbh'},
-          {title: '发票/许可证',dataIndex: 'action',key: 'action'},
+          {title: '物品类别',dataIndex: 'goodCategory',key: 'goodCategory'},
+          {title: '物品细类',dataIndex: 'goodSubclass',key: 'goodSubclass'},
+          {title: '物品名称',dataIndex: 'goodName',key: 'goodName'},
+          {title: '物品产地',dataIndex: 'goodPlace',key: 'goodPlace'},
+          {title: '重量(千克)',dataIndex: 'weight',key: 'weight'},
+          {title: '品牌',dataIndex: 'brand',key: 'brand'},
+          {title: '规格型号',dataIndex: 'specModel',key: 'specModel'},
+          {title: '单价',dataIndex: 'price',key: 'price'},
+          {title: '币种',dataIndex: 'currency',key: 'currency'},
+          {title: '数量',dataIndex: 'quantity',key: 'quantity'},
+          {title: '数量单位',dataIndex: 'unit',key: 'unit'},
+          {title: '发票/许可证',dataIndex: 'license',key: 'license'},
         ]"
         :pagination="false"
       >
         <template #bodyCell="{ column, record }">
-          <template v-if="column.dataIndex === 'action'">
-            <a-button type="link" primary size="small">查看</a-button>
+          <template v-if="column.dataIndex === 'license'">
+            <a-button type="link" primary size="small" @click="onViewImg(record.license)">查看</a-button>
           </template>
         </template>
       </a-table>
@@ -78,61 +76,77 @@
         <a-row :gutter="16">
           <a-col :span="8">
             <a-form-item label="乘坐交通工具类型">
-              <a-input v-model:value="formData.reWarehouseNumber" :disabled="true"/>
+              <a-input v-model:value="formData.vehicleType" :disabled="true"/>
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="出发时间">
-              <a-input v-model:value="formData.reWarehouseNumber" :disabled="true"/>
+              <a-input v-model:value="formData.departTime" :disabled="true"/>
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="出发港口">
-              <a-select v-model:value="formData.reWarehouseNumber" :disabled="true"
+              <a-select v-model:value="formData.fromPort" :disabled="true"
                         :options="departurePortOptions" 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.reWarehouseNumber" :disabled="true"
+              <a-select v-model:value="formData.toPort" :disabled="true"
                         :options="arrivingPortOptions" 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.reWarehouseNumber" :disabled="true"/>
+              <a-input v-model:value="formData.travelNo" :disabled="true"/>
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="座位号">
-              <a-input v-model:value="formData.reWarehouseNumber" :disabled="true"/>
+              <a-input v-model:value="formData.seatNo" :disabled="true"/>
             </a-form-item>
           </a-col>
         </a-row>
       </a-form>
 		</div>
 		<template #footer></template>
+<!--    <a-image-preview-group-->
+<!--      :style="{ display: 'none' }"-->
+<!--      :preview="{-->
+<!--        visible: imgOptions.visible,-->
+<!--        onVisibleChange: imgOptions.setVisible,-->
+<!--      }">-->
+<!--      <a-image :width="200" src="https://aliyuncdn.antdv.com/vue.png" />-->
+<!--      <a-image :width="200" src="https://aliyuncdn.antdv.com/logo.png" />-->
+<!--    </a-image-preview-group>-->
 	</a-modal>
 </template>
 
 <script setup name="enterpriseDetail">
 import tool from '@/utils/tool'
 import {cloneDeep} from 'lodash-es'
-import qyOutWarehouseApi from "@/api/yqyc/qyOutWarehouseApi";
+import basicApi from "@/api/gsc/basic";
 // 抽屉状态
 const open = ref(false)
 const emit = defineEmits({successful: null})
 // 表单数据
 const formData = ref({})
+const imgOptions = ref({
+  visible: false,
+  setVisible: (value) => {
+    imgOptions.value.visible = value;
+  },
+  url: []
+})
 
 // 打开抽屉
 const onOpen = (record, view = false) => {
 	open.value = true
-	// if (record) {
-	// 	qyOutWarehouseApi.qyOutWarehousePage({warehouseNumber: record.warehouseNumber}).then(res => {
-	// 		formData.value = Object.assign({}, res)
-	// 	})
-	// }
+	if (record) {
+    basicApi.passengerinfoDetail({id: record.id}).then(res => {
+			formData.value = Object.assign({}, res)
+		})
+	}
 }
 // 关闭抽屉
 const onClose = () => {
@@ -140,9 +154,11 @@ const onClose = () => {
 	formData.value = {}
 	open.value = false
 }
+const onViewImg = (urls) => {
+
+}
 const sexOptions = tool.dictList('lvke_sex')
-// const cityOptions = tool.dictList('lvke_city')
-const cityOptions = []
+const cityOptions = tool.dictList('lvke_city')
 const departurePortOptions = tool.dictList('lvke_departurePort')
 const arrivingPortOptions = tool.dictList('lvke_arrivingPort')
 // 抛出函数

snowy-admin-web/src/views/gsc/check/index_all.vue

@@ -1,6 +1,6 @@
 <template>
   <a-card :bordered="false">
-    <a-form ref="searchref_detail" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
+    <a-form ref="searchFormRef" :model="searchFormState" class="ant-advanced-search-form">
       <a-row :gutter="24">
         <a-col :span="6">
           <a-form-item label="姓名">
@@ -8,56 +8,56 @@
           </a-form-item>
         </a-col>
         <a-col :span="6">
+          <a-form-item label="性别">
+            <a-select v-model:value="searchFormState.gender" placeholder="请选择性别"
+                      :options="sexOptions" show-search allow-clear optionFilterProp="label"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="6">
           <a-form-item label="身份证号">
-            <a-input v-model:value="searchFormState.name" placeholder="请输入身份证号" allow-clear/>
+            <a-input v-model:value="searchFormState.idNo" placeholder="请输入身份证号" allow-clear/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
           <a-form-item label="国籍">
-            <a-select v-model:value="searchFormState.accountType" placeholder="请选择国籍"
+            <a-select v-model:value="searchFormState.nationality" placeholder="请选择国籍"
                       :options="cityOptions" show-search allow-clear optionFilterProp="label"/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
           <a-form-item label="居住地">
-            <a-input v-model:value="searchFormState.name" placeholder="请输入居住地" allow-clear/>
+            <a-input v-model:value="searchFormState.address" placeholder="请输入居住地" allow-clear/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="性别">
-            <a-select v-model:value="searchFormState.accountType" placeholder="请选择性别"
-                      :options="sexOptions" show-search allow-clear optionFilterProp="label"/>
+          <a-form-item label="车次/航班号">
+            <a-input v-model:value="searchFormState.travelNo" placeholder="请输入车次/航班号" allow-clear/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="车次/航班号">
-            <a-input v-model:value="searchFormState.name" placeholder="请输入车次/航班号" allow-clear/>
+          <a-form-item label="航/车次(班)日期">
+            <a-range-picker v-model:value="searchFormState.travelTime" show-time allow-clear/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="航/车次(班)日期">
-            <a-range-picker v-model:value="searchFormState.warehouseTime" show-time allow-clear/>
+          <a-form-item label="是否携带行李物品">
+            <a-select v-model:value="searchFormState.baggage" placeholder="请选择是否携带行李物品"
+                      :options="isNoOptions" 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.accountType" placeholder="请选择出发港口"
+            <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.accountType" placeholder="请选择到达港口"
+            <a-select v-model:value="searchFormState.toPort" placeholder="请选择到达港口"
                       :options="arrivingPortOptions" 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.accountType" placeholder="请选择查验状态"
-                      :options="checkStatusOptions" show-search allow-clear optionFilterProp="label"/>
-          </a-form-item>
-        </a-col>
-        <a-col :span="6">
           <a-button type="primary" @click="onSearch()">查询</a-button>
           <a-button style="margin: 0 8px" @click="reset">重置</a-button>
         </a-col>
@@ -74,11 +74,20 @@
       :scroll="{ x: 2000 }"
     >
       <template #bodyCell="{ column, record }">
-        <template v-if="column.dataIndex === 'sex'">
-          {{ $TOOL.dictTypeData('lvke_sex', record.sex) }}
+        <template v-if="column.dataIndex === 'gender'">
+          {{ $TOOL.dictTypeData('lvke_sex', record.gender) }}
+        </template>
+        <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 === 'cyzl'">
-          <a @click="ref_method.onOpen(record)">查看查验指令</a>
+        <template v-if="column.dataIndex === 'toPort'">
+          {{ $TOOL.dictTypeData('lvke_arrivingPort', record.toPort) }}
         </template>
         <template v-if="column.dataIndex === 'action'">
           <a-space>
@@ -89,25 +98,21 @@
     </s-table>
   </a-card>
   <Detail ref="ref_detail"/>
-  <Method ref="ref_method"/>
 </template>
 
 <script setup name="demo2">
 import tool from '@/utils/tool'
 import {cloneDeep} from 'lodash-es'
 import Detail from './detail.vue'
-import Method from './method.vue'
-import demo2Api from '@/api/biz/demo2Api'
-import downloadUtil from "@/utils/downloadUtil";
+import basicApi from '@/api/gsc/basic'
 
 const {proxy} = getCurrentInstance()
 const searchFormState = ref({})
 const searchFormStateReal = ref({}) // 点击搜索后备份的查询参数
-const searchref_detail = ref()
+const searchFormRef = ref()
 const tableRef = ref()
 const filterParam = ref({})
 const ref_detail = ref()
-const ref_method = ref()
 const toolConfig = {refresh: true, height: true, columnSetting: true, striped: false}
 const columns = [
   {
@@ -116,47 +121,43 @@ const columns = [
   },
   {
     title: '性别',
-    dataIndex: 'age',
+    dataIndex: 'gender',
   },
   {
     title: '身份证号',
-    dataIndex: 'sex',
+    dataIndex: 'idNo',
   },
   {
     title: '国籍',
-    dataIndex: 'remark',
+    dataIndex: 'nationality',
   },
   {
     title: '居住地',
-    dataIndex: 'p1',
-  },
-  {
-    title: '年龄',
-    dataIndex: 'p1',
+    dataIndex: 'address',
   },
   {
     title: '车次/航班号',
-    dataIndex: 'p2',
+    dataIndex: 'travelNo',
   },
   {
     title: '航/车次(班)日期',
-    dataIndex: 'p3',
+    dataIndex: 'travelTime',
   },
   {
-    title: '出发港口',
-    dataIndex: 'p5',
+    title: '是否携带行李物品',
+    dataIndex: 'baggage',
   },
   {
-    title: '到达港口',
-    dataIndex: 'p6',
+    title: '出发港口',
+    dataIndex: 'fromPort',
   },
   {
-    title: '查验指令',
-    dataIndex: 'cyzl',
+    title: '到达港口',
+    dataIndex: 'toPort',
   },
   {
-    title: '查验状态',
-    dataIndex: 'p7',
+    title: '座位号',
+    dataIndex: 'seatNo',
   },
   {
     title: '操作',
@@ -183,7 +184,12 @@ const options = {
   }
 }
 const loadData = (parameter) => {
-  return demo2Api.demo2Page(Object.assign(parameter, searchFormStateReal.value)).then((data) => {
+  if (searchFormStateReal.value.travelTime?.length > 0) {
+    searchFormStateReal.value.travelTimeStart = proxy.$util.YMDHms(searchFormStateReal.value.travelTime[0])
+    searchFormStateReal.value.travelTimeEnd = proxy.$util.YMDHms(searchFormStateReal.value.travelTime[1])
+    delete searchFormStateReal.value.travelTime
+  }
+  return basicApi.passengerInfoPage(Object.assign(parameter, searchFormStateReal.value)).then((data) => {
     return data
   })
 }
@@ -194,50 +200,12 @@ const onSearch = (parameter) => {
 }
 // 重置
 const reset = () => {
-  searchref_detail.value.resetFields()
+  searchFormRef.value.resetFields()
   onSearch(true)
 }
-// 删除
-const deleteDemo2 = (record) => {
-  let params = [
-    {
-      id: record.id
-    }
-  ]
-  demo2Api.demo2Delete(params).then(() => {
-    tableRef.value.refresh(true)
-  })
-}
-// 批量删除
-const deleteBatchDemo2 = (params) => {
-  demo2Api.demo2Delete(params).then(() => {
-    tableRef.value.clearRefreshSelected()
-  })
-}
-// 批量导出
-const onExport = () => {
-  const params = {
-    ...filterParam.value
-  }
-  if (selectedRowKeys.value.length > 0) {
-    params.ids = selectedRowKeys.value
-  } else {
-    Object.entries(searchFormStateReal.value).forEach(([key, value]) => {
-      console.log(key)
-      if (proxy.$util.isValue(value)) {
-        params[key] = value
-      }
-    })
-  }
-  demo2Api.demo2Export(params).then((res) => {
-    downloadUtil.resultDownload(res)
-    tableRef.value.clearSelected()
-  })
-}
 const sexOptions = tool.dictList('lvke_sex')
-// const cityOptions = tool.dictList('lvke_city')
-const cityOptions = []
+const cityOptions = tool.dictList('lvke_city')
+const isNoOptions = tool.dictList('lvke_isNo')
 const departurePortOptions = tool.dictList('lvke_departurePort')
 const arrivingPortOptions = tool.dictList('lvke_arrivingPort')
-const checkStatusOptions = tool.dictList('lvke_checkStatus')
 </script>