第二次 较大更新,已完成运单新增,地址簿,进港,出港(补提交)

src/api/base/BaseApi.d.ts

@@ -0,0 +1,3 @@
+export interface BaseApiConfig {
+  baseUrl: string;
+}

src/api/request/index.d.ts

@@ -0,0 +1,11 @@
+import { AxiosInstance } from 'axios';
+
+export interface MainAxiosInstance extends AxiosInstance {
+  exportFile?: any;
+}
+
+export interface ResponseData<T = any> {
+  code: number;
+  message: string;
+  data: T;
+}

src/assets/images/icons/u43.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="23px" height="23px" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <filter x="21px" y="125px" width="23px" height="23px" filterUnits="userSpaceOnUse" id="filter4">
+      <feOffset dx="1" dy="1" in="SourceAlpha" result="shadowOffsetInner" />
+      <feGaussianBlur stdDeviation="2.5" in="shadowOffsetInner" result="shadowGaussian" />
+      <feComposite in2="shadowGaussian" operator="atop" in="SourceAlpha" result="shadowComposite" />
+      <feColorMatrix type="matrix" values="0 0 0 0 0  0 0 0 0 0  0 0 0 0 0  0 0 0 0.698039215686274 0  " in="shadowComposite" />
+    </filter>
+    <g id="widget5">
+      <path d="M 31.5 129  C 35.14 129  38 131.86  38 135.5  C 38 139.14  35.14 142  31.5 142  C 27.86 142  25 139.14  25 135.5  C 25 131.86  27.86 129  31.5 129  Z " fill-rule="nonzero" fill="#952950" stroke="none" />
+      <path d="M 31.5 129.5  C 34.86 129.5  37.5 132.14  37.5 135.5  C 37.5 138.86  34.86 141.5  31.5 141.5  C 28.14 141.5  25.5 138.86  25.5 135.5  C 25.5 132.14  28.14 129.5  31.5 129.5  Z " stroke-width="1" stroke="#ffffff" fill="none" />
+    </g>
+  </defs>
+  <g transform="matrix(1 0 0 1 -21 -125 )">
+    <use xlink:href="#widget5" filter="url(#filter4)" />
+    <use xlink:href="#widget5" />
+  </g>
+</svg>

src/router/interceptor.ts

@@ -7,7 +7,6 @@ import { Router } from 'vue-router';
 const whiteList: string[] = [
   '/login',
   '/composite-search/inward-flight-inquiry',
-  '/composite-search/inORout-flight-Inquiry',
   '/composite-search/inward-flight-inquiry-his',
   '/departure/waybill-manage',
 ];

src/router/modules/compositeSearch.ts

@@ -60,16 +60,6 @@ export default {
         title: '进港航班查询',
       },
     },
-    {
-      path: '/composite-search/inward-flight-inquiry-his',
-      name: 'inwardFlightInquiryHis',
-      hidden: true,
-      component: () =>
-        import('@/views/compositeSearch/inwardFlightInquiryHis/index.vue'),
-      meta: {
-        title: '进港航班查询(历史)',
-      },
-    },
     {
       path: '/composite-search/inORout-flight-inquiry',
       name: 'inORoutFlightInquiry',
@@ -77,7 +67,7 @@ export default {
       component: () =>
         import('@/views/compositeSearch/inORoutFlightInquiry/index.vue'),
       meta: {
-        title: '进/出港航班查询',
+        title: '出港航班查询',
       },
     },
   ],

src/views/compositeSearch/components/api/currentApi.ts

@@ -0,0 +1,33 @@
+import BaseApi from '@/api/base/BaseApi';
+import request from '@/api/request';
+import type { ResponseData } from '@/api/request/index.d';
+
+class CurrentPageApi extends BaseApi {
+  constructor() {
+    super({
+      baseUrl: 'address',
+    });
+  }
+
+  addressPageList(data?: any): Promise<ResponseData<any>> {
+    return request.post(`${this.baseUrl}/pageList`, data);
+  }
+
+  createAddress(data?: any): Promise<ResponseData<any>> {
+    return request.post(`${this.baseUrl}/create`, data);
+  }
+
+  updateAddress(data?: any): Promise<ResponseData<any>> {
+    return request.post(`${this.baseUrl}/update`, data);
+  }
+
+  infoAddress(data?: any): Promise<ResponseData<any>> {
+    return request.get(`${this.baseUrl}/info?id=${data}`);
+  }
+
+  deleteAddress(data?: any): Promise<ResponseData<any>> {
+    return request.get(`${this.baseUrl}/deleteById?id=${data}`);
+  }
+}
+
+export default new CurrentPageApi();

src/views/compositeSearch/inORoutFlightInquiry/api/CurrentPageApi.js

@@ -0,0 +1,11 @@
+import BaseApi from '@/api/base/BaseApi';
+
+class CurrentPageApi extends BaseApi {
+  constructor() {
+    super({
+      baseUrl: 'user/sysDict',
+    });
+  }
+}
+export default new CurrentPageApi();
+// # sourceMappingURL=CurrentPageApi.js.map

src/views/compositeSearch/inORoutFlightInquiry/api/CurrentPageApi.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CurrentPageApi.js","sourceRoot":"","sources":["CurrentPageApi.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,oBAAoB,CAAC;AAEzC,MAAM,cAAe,SAAQ,OAAO;IAClC;QACE,KAAK,CAAC;YACJ,OAAO,EAAE,cAAc;SACxB,CAAC,CAAC;IACL,CAAC;CACF;AAED,eAAe,IAAI,cAAc,EAAE,CAAC"}

src/views/compositeSearch/inORoutFlightInquiry/api/CurrentPageApi.ts

@@ -1,11 +1,37 @@
 import BaseApi from '@/api/base/BaseApi';
+import request from '@/api/request';
+import type { ResponseData } from '@/api/request/index.d';
 
 class CurrentPageApi extends BaseApi {
   constructor() {
     super({
-      baseUrl: 'user/sysDict',
+      baseUrl: '',
     });
   }
+
+  /**
+   * 入港航班查询
+   * @param data
+   */
+  page(data: any): Promise<ResponseData<any>> {
+    return request.post(`${this.baseUrl}/mawb/oMawbList`, data);
+  }
+
+  summary(data: any): Promise<ResponseData<any>> {
+    return request.post(`${this.baseUrl}/mawb/oMawbCount`, data);
+  }
+
+  get(data: any): Promise<ResponseData<any>> {
+    return request.get(`${this.baseUrl}/mawb/fwbInfo?mawbId=${data}`);
+  }
+
+  selectOption(data: any | null): Promise<ResponseData<any>> {
+    return request.get(`${this.baseUrl}/dict/options?code=${data}`);
+  }
+
+  export(data: any) {
+    return request.exportFile(`${this.baseUrl}/mawb/OutMawbCsv`, data, 'post');
+  }
 }
 
 export default new CurrentPageApi();

src/views/compositeSearch/inORoutFlightInquiry/index.vue

@@ -1,287 +1,847 @@
 <template>
   <div class="page-content">
-    <div class="search-header">
-      <div class="search-header-left">
-        <div class="search-header-left-item">
-          <a-form-item label="航班号">
-            <a-input v-model="formState.flight.flightNo" />
-          </a-form-item>
-        </div>
-        <div class="search-header-left-item">
-          <a-form-item label="航班日期">
-            <a-range-picker v-model="formState.flight.flightDate" />
-          </a-form-item>
+    <a-spin :loading="loading" style="width: 100%">
+      <div class="search-header">
+        <div class="search-header-left">
+          <div v-if="searchType == '1'" class="search-header-left-item">
+            <a-form-item label="航班号">
+              <a-input
+                v-model="formState.flight.flightNo"
+                allow-clear
+                placeholder="请输入航班号"
+                @input="commonUpperCase('flightNo')"
+              />
+            </a-form-item>
+          </div>
+          <div v-if="searchType != '2'" class="search-header-left-item">
+            <a-form-item label="航班日期" style="width: 450px">
+              <a-range-picker
+                v-model="formState.flight.flightDate"
+                :allow-clear="false"
+              />
+              <span style="color: #0066ff; font-size: 12px"
+                >(最大查询时间,一个月)</span
+              >
+            </a-form-item>
+          </div>
+          <div v-if="searchType == '2'" class="search-header-left-item">
+            <a-form-item label="运单号">
+              <a-input
+                v-model="formState.flight.mawbNo"
+                :max-length="12"
+                allow-clear
+                placeholder="请输入运单号"
+                @keydown="mawbNoAddG"
+              />
+            </a-form-item>
+          </div>
         </div>
-        <div class="search-header-left-item w120" v-if="searchType == '1'">
-          <a-form-item label="始发地">
-            <a-input v-model="formState.flight.startCity" />
-          </a-form-item>
+        <div class="search-header-right">
+          <div
+            class="search-header-right-item search-header-right-item-box searchType"
+          >
+            <a-radio-group
+              v-model="searchType"
+              :options="searchTypeOption"
+              name="radioGroup"
+              @change="searchTypeChange()"
+            >
+            </a-radio-group>
+          </div>
+          <!--          <div class="search-header-right-item search-header-right-item-box">
+            <a-radio-group
+              v-model="formState.flight.orderType"
+              :options="orderTypeOption"
+              name="radioGroup"
+              @change="searchTypeChange()"
+            >
+            </a-radio-group>
+          </div>-->
+          <div class="search-header-right-item search-header-right-item-box">
+            <a-radio-group
+              v-model="formState.flight.flightType"
+              :options="flightTypeOption"
+              name="radioGroup"
+            >
+            </a-radio-group>
+          </div>
+          <div class="search-header-right-item">
+            <a-button type="primary" @click="search()">查询</a-button>
+          </div>
+          <div class="search-header-right-item">
+            <a-button :loading="btnLoading" type="primary" @click="downLoad()"
+              >导出CSV</a-button
+            >
+          </div>
         </div>
-        <div class="search-header-left-item w120" v-if="searchType == '1'">
-          <a-form-item label="始发国">
-            <a-input v-model="formState.flight.startCountry" />
-          </a-form-item>
+      </div>
+      <div class="search-select">
+        <div class="search-select-title"> 筛选条件 </div>
+        <div class="mr-3 ml-3 mt-1">
+          <a-select
+            v-model="formState.flight.pickOrder"
+            :style="{ width: '240px', height: '30px' }"
+            allow-clear
+            allow-search
+            multiple
+            placeholder="请选择是否已交单"
+            tag-nowrap
+          >
+            <a-option
+              v-for="item in pickOrderOptions"
+              :key="item.value"
+              :value="item.value"
+              >{{ item.label }}</a-option
+            >
+          </a-select>
         </div>
-        <div class="search-header-left-item w120" v-if="searchType == '2'">
-          <a-form-item label="目的地">
-            <a-input v-model="formState.flight.endCity" />
-          </a-form-item>
+        <div class="mr-3 ml-3 mt-1">
+          <a-select
+            v-model="formState.flight.takeGoods"
+            :style="{ width: '240px', height: '30px' }"
+            allow-clear
+            allow-search
+            multiple
+            placeholder="请选择是否已安检"
+            tag-nowrap
+          >
+            <a-option
+              v-for="item in takeGoodsOptions"
+              :key="item.value"
+              :value="item.value"
+              >{{ item.label }}</a-option
+            >
+          </a-select>
         </div>
-        <div class="search-header-left-item w120" v-if="searchType == '2'">
-          <a-form-item label="目的国">
-            <a-input v-model="formState.flight.endCountry" />
-          </a-form-item>
+        <div class="mr-3 ml-3 mt-1">
+          <a-select
+            v-model="formState.flight.release"
+            :style="{ width: '240px', height: '30px' }"
+            allow-clear
+            allow-search
+            multiple
+            placeholder="请选择海关是已否放行"
+            tag-nowrap
+          >
+            <a-option
+              v-for="item in releaseOptions"
+              :key="item.value"
+              :value="item.value"
+              >{{ item.label }}</a-option
+            >
+          </a-select>
         </div>
-        <div class="search-header-left-item">
-          <a-form-item label="操作">
-            <a-select ref="select" placeholder="请选择" :options="timeTypeOptions" v-model="timeType" style="width: 120px"
-              @change="timeTypeChange()">
-            </a-select>
-          </a-form-item>
+        <div class="mr-3 ml-3 mt-1">
+          <a-select
+            v-model="formState.flight.partType"
+            :style="{ width: '240px', height: '30px' }"
+            allow-clear
+            allow-search
+            multiple
+            placeholder="请选择运单类型"
+            tag-nowrap
+          >
+            <a-option
+              v-for="item in partTypeOptions"
+              :key="item.value"
+              :value="item.value"
+              >{{ item.label }}</a-option
+            >
+          </a-select>
         </div>
-      </div>
-      <div class="search-header-right">
-        <div class="search-header-right-item">
-          <a-radio-group v-model="searchType" name="radioGroup" :options="searchTypeOption"
-            @change="searchTypeChange()">
+        <!--        <div class="search-header-right-item search-header-right-item-box">
+          <a-radio-group
+              v-model="formState.flight.orderType"
+              :options="orderTypeOption"
+              name="radioGroup"
+              @change="searchTypeChange()"
+          >
           </a-radio-group>
+        </div>-->
+        <div class="mr-3 ml-3 mt-1">
+          <a-select
+            v-model="formState.flight.orderType"
+            :style="{ width: '240px', height: '30px' }"
+            allow-clear
+            allow-search
+            multiple
+            placeholder="请选择整单/分批离港"
+            tag-nowrap
+          >
+            <a-option
+              v-for="item in orderTypeOption"
+              :key="item.value"
+              :value="item.value"
+              >{{ item.label }}</a-option
+            >
+          </a-select>
+        </div>
+        <!--        <div class="search-select-item">
+          <a-checkbox-group
+            v-model="formState.flight.pickOrder"
+            :options="pickOrderOptions"
+          />
         </div>
-        <div class="search-header-right-item">
-          <a-button type="primary" @click="search()">查询</a-button>
+        <div class="search-select-item">
+          <a-checkbox-group
+            v-model="formState.flight.takeGoods"
+            :options="takeGoodsOptions"
+          />
         </div>
-        <div class="search-header-right-item">
-          <a-button type="primary" @click="downLoad()">导出CSV</a-button>
+        <div class="search-select-item">
+          <a-checkbox-group
+            v-model="formState.flight.release"
+            :options="releaseOptions"
+          />
         </div>
+        <div class="search-select-item">
+          <a-checkbox-group
+            v-model="formState.flight.partType"
+            :options="partTypeOptions"
+          />
+        </div>
+        <div v-if="false" class="search-select-item2">
+          <div>
+            <a-radio-group
+              v-model="formState.flight.goodsType"
+              :options="goodsTypeOption"
+              name="radioGroup"
+            >
+            </a-radio-group>
+          </div>
+        </div>-->
       </div>
-    </div>
 
-    <div class="search-body">
-      <a-table :columns="columns" :data="dataSource" :stripe="true" bordered>
-        <!-- <template #fwb="{ rowIndex }">
-              <a-input v-model="dataSource[rowIndex].fwb" />
-            </template> -->
-        <template #footer>
-          <div class="foot" style="margin-left: 710px;display: flex;flex-direction: row;text-align: center;">
-            合计：<div style="width:127px">0</div>
-            <div style="width:127px">0</div>
-            <div style="width:135px">0/0T </div>
-            <div style="width:155px">0/0T </div>
-            <div style="width:155px">0/0T </div>
-            <div style="width:155px">0/0T </div>
-          </div>
-        </template>
-      </a-table>
-    </div>
+      <div class="search-body">
+        <a-table
+          :columns="columns"
+          :data="dataSource"
+          :pagination="false"
+          :scroll="scroll"
+          :scrollbar="true"
+          :stripe="true"
+          :summary="summary"
+          bordered
+        >
+          <template #summary-cell="{ column, record }">
+            {{ record[column.dataIndex] }}
+          </template>
+        </a-table>
+        <a-pagination
+          :page-number="formState.page"
+          :page-size="formState.size"
+          :page-size-options="[10, 20, 30, 40, 50, 100]"
+          :total="total"
+          class="pagination"
+          show-jumper
+          show-page-size
+          show-total
+          @change="pageChange"
+          @page-size-change="pageSizeChange"
+        />
+      </div>
+    </a-spin>
   </div>
 </template>
+
 <script lang="ts" setup>
-  const timeType = ref('');
-  const searchType = ref<string>('1');
-  const timeTypeOptions = ref<SelectProps['options']>([
-    {
-      value: '1',
-      label: '一部',
-    },
-    {
-      value: '2',
-      label: '二部',
-    },
-  ]);
-  const searchTypeOption = ref<RadioGroupProps['options']>([
-    {
-      value: '1',
-      label: '进港',
-    },
-    {
-      value: '2',
-      label: '出港',
-    }
-  ]);
+import { useUserStore } from '@/store';
+import { Message } from '@arco-design/web-vue';
+import { ref } from 'vue';
+import { dayjs } from '@arco-design/web-vue/es/_utils/date';
+import ApiObj from './api/CurrentPageApi';
 
-  const formState = {
-    flight: {
-      flightNo: '',
-      flightDate: '',
-      startCity: '',
-      startCountry: '',
-      endCity: '',
-      endCountry: '',
-      pickOrder: [],
-      takeGoods: [],
-      damaged: [],
-      release: [],
-      partType: [],
-      orderType: '',
-      goodsType: ''
-    },
-  };
+const scroll = {
+  x: '100%',
+  y: '550px',
+};
+const btnLoading = ref<boolean>(false);
+const total = ref<number>(0);
+const loading = ref<boolean>(false);
+const searchType = ref<string>('1');
+const userStore = useUserStore();
+const searchTypeOption = ref([
+  {
+    value: '1',
+    label: '按航班',
+  },
+  {
+    value: '2',
+    label: '按运单',
+  },
+]);
 
-  const columns = [
-    {
-      title: '航班时间',
-      dataIndex: 'order',
-    },
-    {
-      title: '航班关闭时间',
-      dataIndex: 'fwb',
-    },
-    {
-      title: '航班号',
-      dataIndex: 'orderinfo',
-    },
-    {
-      title: '目的地/国',
-      dataIndex: 'flightNo',
-    },
-    {
-      title: '航段',
-      dataIndex: 'orderCount',
-    },
-    {
-      title: '总票数',
-      dataIndex: 'orderCount',
-    },
-    {
-      title: '板箱数',
-      dataIndex: 'orderCount',
-    },
-    {
-      title: '总件/重',
-      dataIndex: 'orderCount',
-    },
-    {
-      title: '普货件/重',
-      dataIndex: 'orderCount',
-    },
+const orderTypeOption = ref([
+  {
+    value: '1',
+    label: '整单离港',
+  },
+  {
+    value: '2',
+    label: '分批离港',
+  },
+]);
+
+const flightTypeOption = ref([
+  {
+    value: 'Y',
+    label: '已配航班',
+  },
+  {
+    value: 'N',
+    label: '未配航班',
+  },
+]);
+
+const pickOrderOptions = [
+  { label: '代理已交单', value: 'Y' },
+  { label: '代理未交单', value: 'N' },
+];
+
+const takeGoodsOptions = [
+  { label: '已安检', value: 'Y' },
+  { label: '未安检', value: 'N' },
+];
+
+const releaseOptions = [
+  { label: '海关放行', value: 'Y' },
+  { label: '未放行', value: 'N' },
+];
+
+const partTypeOptions = ref([
+  {
+    label: '普货',
+    value: 'C',
+  },
+  {
+    label: '快件',
+    value: 'E',
+  },
+  {
+    label: '邮件',
+    value: 'M',
+  },
+]);
+
+const goodsTypeOption = [
+  {
+    label: '鲜活易腐',
+    value: 'PV',
+  },
+  {
+    label: '锂电',
+    value: 'LI',
+  },
+  {
+    label: '冷藏冷冻',
+    value: 'CL',
+  },
+  {
+    label: '其他',
+    value: 'EL',
+  },
+  {
+    label: '药品',
+    value: 'MD',
+  },
+  {
+    label: '高价值',
+    value: 'VL',
+  },
+  {
+    label: '危险类',
+    value: 'ALL',
+  },
+];
+
+const rendTimeCol = (col: string) => {
+  if (col !== null && col !== '' && col !== undefined && col.length > 0) {
+    return dayjs(col).format('YYYY-MM-DD HH:mm');
+  }
+  return '';
+};
+
+/**
+ * 转换大写
+ * @param str
+ */
+const commonUpperCase = (str: string) => {
+  formState.flight[str] = formState.flight[str].toLocaleUpperCase();
+};
+
+const summary = () => {
+  return [
+    // 返回的就是表尾合计列
     {
-      title: '快件件/重',
-      dataIndex: 'orderCount',
+      /// /
+      mawbNo: '件数合计(件)',
+      pcsCba: concat(numberFormatter(summerData.value.pcsCba), ''),
+      pcs: concat(numberFormatter(summerData.value.pcs), ''),
+      pcsSpl: concat(numberFormatter(summerData.value.pcsSpl), ''),
+      pcsBup: concat(numberFormatter(summerData.value.pcsBup), ''),
     },
     {
-      title: '中转件/重',
-      dataIndex: 'orderCount',
+      mawbNo: '重量合计(吨)',
+      pcsCba: concat('', numberFormatter(chu(summerData.value.wtCba))),
+      pcs: concat('', numberFormatter(chu(summerData.value.wt))),
+      pcsSpl: concat('', numberFormatter(chu(summerData.value.wtSpl))),
+      pcsBup: concat('', numberFormatter(chu(summerData.value.wtBup))),
     },
   ];
-
-  const dataSource = [
-    {
-      order: '1',
-      fwb: '正常',
-      orderinfo: '300,000.00',
-      flightNo: 'CA123',
-      orderCount: '1000',
+};
+const chu = (value: any) => {
+  if (value !== null && value !== undefined) {
+    return Math.round((value / 1000) * 10) / 10;
+  }
+  return value;
+};
+const numberFormatter = (value: any) => {
+  if (value !== null && value !== undefined) {
+    return value.toLocaleString();
+  }
+  return value;
+};
+const formState = reactive({
+  flight: {
+    flightNo: '', // 航班号
+    flightDate: ['', ''], // 航班日期
+    mawbNo: '', // 运单号
+    pickOrder: [], // 是否交单
+    takeGoods: [], // 是否安检
+    flightType: 'Y', // Y 已配 N 未配
+    release: [], // 是否放行
+    partType: [], //  快件 邮件 普件
+    orderType: '', //  离岗类型 1:整单离港, 2: 分批离港
+    goodsType: [], // 鲜活易腐
+    agtNo: userStore.isSuperAdmin ? '' : userStore.userInfo?.tenant?.threeCode, // 代理
+    page: 1,
+    size: 10,
+  },
+});
+function formatDate(input: string): string {
+  try {
+    if (input === null || input === undefined || input === '') {
+      return '';
+    }
+    const date = new Date(input);
+    const options: Intl.DateTimeFormatOptions = {
+      month: '2-digit',
+      day: '2-digit',
+    };
+    const tmp = date.toLocaleDateString('en-US', options).replace('/', '-');
+    if (tmp === 'Invalid Date') {
+      return '';
+    }
+    return tmp;
+  } catch (err) {
+    return '';
+  }
+}
+const columns = [
+  // {
+  //   title: '序号',
+  //   dataIndex: 'order',
+  //   render: (row: any) => row.rowIndex + 1,
+  // },
+  {
+    title: '航班号',
+    dataIndex: 'fltNo',
+    width: 135,
+    render: (row: any) =>
+      concat(row.record.fltNo, formatDate(row.record.fltDate)),
+  },
+  {
+    title: '代理',
+    dataIndex: 'agtNo',
+    width: 70,
+  },
+  {
+    title: '运单信息',
+    dataIndex: 'mawbNo',
+    width: 130,
+  },
+  {
+    title: '订舱件重',
+    width: 100,
+    dataIndex: 'pcsCba',
+    render: (row: any) => concat(row.record.pcsCba, row.record.wtCba),
+  },
+  {
+    title: '收货件重',
+    width: 100,
+    dataIndex: 'pcs',
+    render: (row: any) => concat(row.record.pcs, row.record.wt),
+  },
+  {
+    title: '库存件重',
+    width: 100,
+    dataIndex: 'pcsSpl',
+    render: (row: any) => concat(row.record.pcsSpl, row.record.wtSpl),
+  },
+  {
+    title: '上舱件重',
+    width: 100,
+    dataIndex: 'pcsBup',
+    render: (row: any) => concat(row.record.pcsBup, row.record.wtBup),
+  },
+  {
+    title: '始发/目的地',
+    // dataIndex: 'orderCount',
+    width: 108,
+    render: (row: any) => concat(row.record.orgnNo, row.record.destNo),
+  },
+  {
+    title: '到场时间',
+    dataIndex: 'iwsDate',
+    width: 153,
+    render: (row: any) => rendTimeCol(row.record.iwsDate),
+  },
+  {
+    title: '收单时间',
+    dataIndex: 'wbcDate',
+    width: 153,
+    render: (row: any) => rendTimeCol(row.record.wbcDate),
+  },
+  {
+    title: '离港时间',
+    dataIndex: 'owsDate',
+    width: 153,
+    render: (row: any) => rendTimeCol(row.record.owsDate),
+  },
+  {
+    title: '安检放行',
+    dataIndex: 'sckStatus',
+    width: 88,
+    render: (row: any) => {
+      if (row.record.sckStatus !== undefined && row.record.sckStatus !== null) {
+        if (row.record.sckStatus === 'N') {
+          return '是';
+        }
+      }
+      return '否';
     },
-    {
-      order: '2',
-      fwb: '缺失',
-      orderinfo: '300,000.00',
-      flightNo: 'CA123',
-      orderCount: '1000',
+  },
+  {
+    title: '海关放行',
+    width: 88,
+    dataIndex: 'relStatus',
+    render: (row: any) => {
+      if (row.record.relStatus !== undefined && row.record.relStatus !== null) {
+        if (row.record.relStatus === 'Y') return '是';
+        if (row.record.relStatus === 'N') return '否';
+      }
+      return '';
     },
-    {
-      order: '3',
-      fwb: '正常',
-      orderinfo: '300,000.00',
-      flightNo: 'CA123',
-      orderCount: '1000',
-    }
-  ];
+  },
+  {
+    title: '特货代码',
+    dataIndex: 'shCodes',
+    ellipsis: true,
+    width: 90,
+    tooltip: true,
+  },
+  {
+    title: '舱单备注',
+    dataIndex: 'remark',
+    ellipsis: true,
+    tooltip: true,
+  },
+];
+
+const dataSource = ref([]);
 
-  const timeTypeChange = function () {
-    console.log(timeType.value)
+const concat = (a: any, b: any): string => {
+  if (
+    a !== null &&
+    a !== undefined &&
+    a !== '' &&
+    b !== null &&
+    b !== '' &&
+    b !== undefined
+  ) {
+    return `${a}/${b}`;
+  }
+  if (
+    a !== null &&
+    a !== undefined &&
+    a !== '' &&
+    (b === '' || b === null || b === undefined)
+  ) {
+    return a;
   }
 
-  const searchTypeChange = function () {
-    console.log(searchType.value)
+  if (
+    b !== null &&
+    b !== undefined &&
+    b !== '' &&
+    (a === '' || a === null || a === undefined)
+  ) {
+    return b;
   }
+  return '';
+};
 
-  const search = function () {
+const mawbNoAddG = (ev: KeyboardEvent) => {
+  if (
+    formState.flight.mawbNo !== null &&
+    formState.flight.mawbNo !== undefined &&
+    formState.flight.mawbNo !== ''
+  ) {
+    if (ev.code === 'NumpadSubtract' && formState.flight.mawbNo.length === 3)
+      return;
+    if (formState.flight.mawbNo.length >= 3) {
+      // 判断按下的键是否为删除键
+      const isDeleteKey = ev.key === 'Backspace' || ev.key === 'Delete';
+      if (formState.flight.mawbNo.charAt(3) !== '-' && !isDeleteKey) {
+        formState.flight.mawbNo = `${formState.flight.mawbNo.slice(
+          0,
+          3
+        )}-${formState.flight.mawbNo.slice(3)}`;
+      }
+    }
+  }
+};
 
+const searchTypeChange = () => {
+  // 切换查询类型时清空其它查询类型参数
+  if (searchType.value === '1') {
+    // 按航班查询
+    formState.flight.mawbNo = '';
+    // 设置航班日期默认值
+    formState.flight.flightDate = [
+      dayjs().add(-3, 'day').format('YYYY-MM-DD'),
+      dayjs().format('YYYY-MM-DD'),
+    ];
   }
 
-  const downLoad = function () {
+  if (searchType.value === '2') {
+    // 按运单号查询
+    formState.flight.flightDate = [];
+    formState.flight.flightNo = '';
+  }
+};
+interface summerDataItem {
+  pcsCba: number | null;
+  wtCba: number | null;
+  pcsBup: number | null;
+  wtBup: number | null;
+  pcs: number | null;
+  wt: number | null;
+  pcsSpl: number | null;
+  wtSpl: number | null;
+}
+const summerData = ref<summerDataItem>({
+  pcsCba: 0,
+  wtCba: 0,
+  pcsBup: 0,
+  wtBup: 0,
+  pcs: 0,
+  wt: 0,
+  pcsSpl: 0,
+  wtSpl: 0,
+});
+const search = async () => {
+  if (
+    searchType.value === '2' &&
+    (formState.flight.mawbNo === '' ||
+      formState.flight.mawbNo === undefined ||
+      formState.flight.mawbNo === null ||
+      formState.flight.mawbNo.length !== 12)
+  ) {
+    Message.error('按运单查询必须输入完整运单号12位');
+    return;
+  }
+  try {
+    loading.value = true;
+    await ApiObj.page(formState.flight).then((res) => {
+      dataSource.value = res.data.records;
+      total.value = res.data.total;
+    });
+    await ApiObj.summary(formState.flight).then((res) => {
+      if (res.code === 200) {
+        if (res.data) {
+          summerData.value = res.data;
+          summerData.value = {
+            pcsCba:
+              summerData.value.pcsCba !== null &&
+              summerData.value.pcsCba !== undefined
+                ? Math.round(summerData.value.pcsCba)
+                : null,
+            wtCba:
+              summerData.value.wtCba !== null &&
+              summerData.value.wtCba !== undefined
+                ? Math.round(summerData.value.wtCba)
+                : null,
+            pcsBup:
+              summerData.value.pcsBup !== null &&
+              summerData.value.pcsBup !== undefined
+                ? Math.round(summerData.value.pcsBup)
+                : null,
+            wtBup:
+              summerData.value.wtBup !== null &&
+              summerData.value.wtBup !== undefined
+                ? Math.round(summerData.value.wtBup)
+                : null,
+            pcs:
+              summerData.value.pcs !== null &&
+              summerData.value.pcs !== undefined
+                ? Math.round(summerData.value.pcs)
+                : null,
+            wt:
+              summerData.value.wt !== null && summerData.value.wt !== undefined
+                ? Math.round(summerData.value.wt)
+                : null,
+            pcsSpl:
+              summerData.value.pcsSpl !== null &&
+              summerData.value.pcsSpl !== undefined
+                ? Math.round(summerData.value.pcsSpl)
+                : null,
+            wtSpl:
+              summerData.value.wtSpl !== null &&
+              summerData.value.wtSpl !== undefined
+                ? Math.round(summerData.value.wtSpl)
+                : null,
+          };
+        } else {
+          // 解决后端data传null的前端显示未刷新的问题
+          summerData.value = {
+            pcsCba: null,
+            wtCba: null,
+            pcsBup: null,
+            wtBup: null,
+            pcs: null,
+            wt: null,
+            pcsSpl: null,
+            wtSpl: null,
+          };
+        }
+      }
+    });
+  } catch (error) {
+    console.log(error);
+  } finally {
+    loading.value = false;
+  }
+};
+
+const downLoad = async () => {
+  try {
+    btnLoading.value = true;
 
+    await ApiObj.export(formState.flight);
+  } catch (e) {
+    Message.error('数据导出异常');
+  } finally {
+    btnLoading.value = false;
   }
+};
+
+onMounted(async () => {
+  formState.flight.flightDate = [
+    dayjs().add(-3, 'day').format('YYYY-MM-DD'),
+    dayjs().format('YYYY-MM-DD'),
+  ];
+  // const typeOptions = await ApiObj.selectOption('goods.type');
+  // partTypeOptions.value = typeOptions.data;
+  search();
+});
+
+const pageChange = (value: number) => {
+  formState.flight.page = value;
+  search();
+};
+const pageSizeChange = (value: number) => {
+  formState.flight.size = value;
+  search();
+};
 </script>
+
 <style lang="less" scoped>
-  .page-content {
+.page-content {
+  width: 100%;
+  height: 100%;
+  padding: 15px 20px 0 20px;
+  .search-header {
     width: 100%;
-    height: 100%;
-    padding: 20px;
-
-    .search-header {
-      width: 100%;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    .search-header-left {
       display: flex;
       flex-direction: row;
-      justify-content: space-between;
-
-      .search-header-left {
-        display: flex;
-        flex-direction: row;
-        justify-content: flex-start;
-        align-items: center;
-
-        .search-header-left-item {
-          margin-right: 30px;
-        }
-
-        .w120 {
-          width: 130px;
-        }
+      justify-content: flex-start;
+      align-items: center;
+      .search-header-left-item {
+        margin-right: 30px;
       }
-
-      .search-header-right {
-        display: flex;
-        flex-direction: row;
-        justify-content: flex-start;
-        align-items: center;
-
-        .search-header-right-item {
-          margin-right: 30px;
-          padding-bottom: 20px;
-        }
+      .searchType {
+        padding-bottom: 10px;
       }
     }
 
-    .search-select {
-      width: 100%;
-      border: 1px solid #e5e7eb;
-      padding: 20px 0;
-      position: relative;
+    .search-header-right {
       display: flex;
       flex-direction: row;
-      justify-content: space-around;
-
-      .search-select-title {
-        padding: 0 10px;
-        position: absolute;
-        left: 400px;
-        top: -12px;
-        background: #fff;
-        color: rgb(79, 89, 105);
+      justify-content: flex-start;
+      align-items: center;
+      .search-header-right-item {
+        margin-right: 10px;
+        padding-bottom: 20px;
       }
-
-      .search-select-item {
+      .search-header-right-item-box {
+        padding: 10px 0 10px 0;
+        margin-top: -20px;
         border: 1px solid #e5e7eb;
-        width: 125px;
-        padding: 10px;
-        box-sizing: border-box;
       }
+    }
+  }
 
-      .search-select-item2 {
-        border: 1px solid #e5e7eb;
-        padding: 10px;
-        box-sizing: border-box;
-      }
+  .search-select {
+    width: 100%;
+    border: 1px solid #e5e7eb;
+    padding: 5px 0;
+    position: relative;
+    display: flex;
+    flex-direction: row;
+    //justify-content: space-around;
+    justify-content: flex-start; /* 左对齐 */
+    .search-select-title {
+      padding: 0 10px;
+      position: absolute;
+      left: 400px;
+      top: -12px;
+      background: #fff;
+      color: rgb(79, 89, 105);
     }
 
-  }
+    .search-select-item {
+      border: 1px solid #e5e7eb;
+      width: 155px;
+      padding: 10px;
+      box-sizing: border-box;
+      margin: 0 10px;
+    }
 
-  [data-doc-theme='light'] .ant-table-striped :deep(.table-striped) td {
-    background-color: #fafafa;
+    .search-select-item2 {
+      border: 1px solid #e5e7eb;
+      padding: 10px;
+      box-sizing: border-box;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+    }
   }
-
-  [data-doc-theme='dark'] .ant-table-striped :deep(.table-striped) td {
-    background-color: rgb(29, 29, 29);
+  .search-body {
+    .pagination {
+      float: right;
+      padding: 20px 0 0 0;
+    }
   }
+}
+[data-doc-theme='light'] .ant-table-striped :deep(.table-striped) td {
+  background-color: #fafafa;
+}
+[data-doc-theme='dark'] .ant-table-striped :deep(.table-striped) td {
+  background-color: rgb(29, 29, 29);
+}
 </style>

src/views/compositeSearch/inwardFlightInquiry/api/CurrentPageApi.ts

@@ -24,6 +24,14 @@ class CurrentPageApi extends BaseApi {
   getMawbCount(data: any): Promise<ResponseData<any>> {
     return request.post(`${this.baseUrl}/mawb/iMawbCount`, data);
   }
+
+  export(data: any) {
+    return request.exportFile(`${this.baseUrl}/mawb/inMawbCsv`, data, 'post');
+  }
+
+  selectOption(data: any | null): Promise<ResponseData<any>> {
+    return request.get(`${this.baseUrl}/dict/options?code=${data}`);
+  }
   /* /mawb/fwbInfo?mawbId=1
 
   get(data: any): Promise<ResponseData<any>> {

src/views/departure/waybillManage/functions/data.ts

@@ -1,8 +1,17 @@
 import { useUserStore } from '@/store';
 import { ComputedRef, Ref, reactive } from 'vue';
 import { validatorNum, validatorNotReqNum } from '@/regexp';
+import { endsWith } from 'lodash-es';
 
 const userStore = useUserStore();
+const englishAndNumber = /^[A-Za-z0-9]*$/; // 字母和数字
+const positiveInteger = /^[0-9]\d*$/; // 只匹配正整数
+const oneDecimal = /^\d+(\.\d{1})?$/; // 1位小数
+const twoDecimal = /^\d+(\.\d{1,2})?$/; // 2位小数
+const threeEngLish = /^[A-Za-z]{3}$/; // 3 位英文
+const twoEngLish = /^[a-zA-Z]{2}$/; // 两位英文
+const GOODSNAMEEN = /^[A-Z0-9.\-\s]+$/; // 只能包含大写字母、数字、点、连字符和空格
+const ENGLISH_LETTER_CHARACTER_NUMBER = /^[A-Za-z0-9\s.,!?()&@#%+-]*$/; // 部分英文字符和数字和英文
 // 查询条件
 export const setFiltrateData = (waybillStatusMap: Ref<string[]>) => {
   return [
@@ -35,7 +44,7 @@ export const setFiltrateData = (waybillStatusMap: Ref<string[]>) => {
   ];
 };
 
-// 主要信息——运单信息配置
+// 主要信息——运单信息配置 ,编辑页面
 export const mainOrderInfo = [
   { label: '主运单号', field: 'mawbNo', clo: 6 },
   { label: '分运单号', field: 'hawbNo', clo: 6 },
@@ -522,48 +531,288 @@ export const waybillPrice = [
 // TODO: 以下是新功能
 
 // 主运单信息
-export const mainWaybillInfo = [
-  { label: '主运单号', field: 'mawbNo', clo: 6 },
-  {
-    label: '主单件数',
-    field: 'pcsDec',
-    clo: 6,
-  },
-  {
-    label: '主单重量',
-    field: 'wtDec',
-    clo: 6,
-  },
-  {
-    label: '计费重量',
-    field: 'wtChg',
-    clo: 6,
-  },
-  { label: '货运代理', field: 'agtNo', clo: 6 },
-  {
-    'type': 'input',
-    'label': '英文品名',
-    'field': 'goodsNameEn',
-    'clo': 12,
-    'max-length': 20,
-    'rules': {
-      required: true,
-      message: '必填项不可为空',
+export const getMainWaybillInfo = (currentFrom) => {
+  return [
+    {
+      'type': 'input',
+      'label': '中文品名',
+      'field': 'goodsName',
+      'clo': 12,
+      'max-length': 200,
+      'rules': {
+        required: true,
+        message: '必填项不能为空',
+      },
     },
-  },
-  {
-    type: 'input',
-    label: '体积CBM',
-    field: 'volDec',
-    clo: 6,
-    rules: {
-      required: true,
-      message: '必填项不可为空',
+    {
+      'type': 'input',
+      'label': '英文品名',
+      'field': 'goodsNameEn',
+      'format': 'C',
+      'clo': 12,
+      'max-length': 50,
+      'rules': {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === null || value === undefined || value === '') {
+            callback('必填项不能为空');
+          }
+          // if (value.length > 20) {
+          //   callback('长度不能超过20位');
+          // }
+          if (GOODSNAMEEN.test(value)) {
+            callback();
+          } else {
+            callback('英文品名只能包含大写字母、数字、点、连字符和空格');
+          }
+        },
+      },
     },
-  },
-];
+    {
+      label: '主运单号',
+      field: 'mawbNo',
+      clo: 6,
+      rules: {
+        required: true,
+      },
+    },
+    {
+      label: '主单件数',
+      field: 'pcsDec',
+      format: 'E',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === null || value === undefined || value === '') {
+            callback('必填项不能为空');
+          }
+          if (
+            positiveInteger.test(value) &&
+            Number(value) >= 0 &&
+            Number(value) < 10000
+          ) {
+            callback();
+          } else {
+            callback('只能是正整数，并且小于10000');
+          }
+        },
+      },
+    },
+    {
+      label: '主单重量',
+      field: 'wtDec',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === null || value === undefined || value === '') {
+            callback('必填项不能为空');
+          }
+          if (oneDecimal.test(value) && Number(value) >= 0) {
+            callback();
+          } else {
+            callback('只能是数字，最多一位小数');
+          }
+        },
+      },
+    },
+    {
+      label: '计费重量',
+      field: 'wtChg',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === null || value === undefined || value === '') {
+            callback('必填项不能为空');
+          }
+          if (oneDecimal.test(value) && Number(value) >= 0) {
+            callback();
+          } else {
+            callback('只能是数字，最多一位小数');
+          }
+        },
+      },
+    },
+    {
+      label: '货运代理',
+      field: 'agtNo',
+      clo: 6,
+      rules: {
+        required: true,
+      },
+    },
+    {
+      type: 'input',
+      label: '体积CBM',
+      field: 'volDec',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === null || value === undefined || value === '') {
+            callback('必填项不能为空');
+          }
+          if (oneDecimal.test(value) && Number(value) >= 0) {
+            callback();
+          } else {
+            callback('只能是数字，最多一位小数');
+          }
+        },
+      },
+    },
+  ];
+};
 
-export const haWaybillInfo = reactive<ShipperInfoItem[]>([
+export const getHaWaybillInfo = () => {
+  return [
+    {
+      type: 'input',
+      label: '分单号',
+      field: 'hawbNo',
+      clo: 6,
+      rules: {
+        required: true,
+        message: '必填项不可为空',
+      },
+      editFlag: false,
+    },
+    {
+      type: 'input',
+      label: '分单件数',
+      field: 'pcsDec',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === null || value === undefined || value === '') {
+            callback('必填项不能为空');
+          }
+          if (
+            positiveInteger.test(value) &&
+            Number(value) >= 0 &&
+            Number(value) < 10000
+          ) {
+            callback();
+          } else {
+            callback('只能是正整数，并且小于10000');
+          }
+        },
+      },
+    },
+    {
+      type: 'input',
+      label: '分单重量',
+      field: 'wtDec',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === null || value === undefined || value === '') {
+            callback('必填项不能为空');
+          }
+          if (oneDecimal.test(value) && Number(value) >= 0) {
+            callback();
+          } else {
+            callback('只能是数字，最多一位小数');
+          }
+        },
+      },
+    },
+    {
+      type: 'input',
+      label: '分单计费重量',
+      field: 'wtChg',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === null || value === undefined || value === '') {
+            callback('必填项不能为空');
+          }
+          if (oneDecimal.test(value) && Number(value) >= 0) {
+            callback();
+          } else {
+            callback('只能是数字，最多一位小数');
+          }
+        },
+      },
+    },
+    {
+      type: 'input',
+      label: '卸机目的站',
+      field: 'destNo',
+      clo: 12,
+      rules: {
+        required: true,
+        message: '必填项不可为空',
+      },
+      editFlag: true,
+    },
+    {
+      'type': 'input',
+      'label': '分单品名',
+      'field': 'goodsNameEn',
+      'clo': 6,
+      'max-length': 20,
+      'rules': {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === null || value === undefined || value === '') {
+            callback('必填项不能为空');
+          }
+          if (GOODSNAMEEN.test(value)) {
+            callback();
+          } else {
+            callback('英文品名只能包含大写字母、数字、点、连字符或者空格');
+          }
+        },
+      },
+    },
+    {
+      type: 'input',
+      label: '分单体积',
+      field: 'hawbvolDec',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === null || value === undefined || value === '') {
+            callback('必填项不能为空');
+          }
+          if (oneDecimal.test(value) && Number(value) >= 0) {
+            callback();
+          } else {
+            callback('只能是数字，最多一位小数');
+          }
+        },
+      },
+    },
+    {
+      type: 'input',
+      label: '商品编码',
+      field: 'hsCode',
+      clo: 24,
+      editFlag: true,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (ENGLISH_LETTER_CHARACTER_NUMBER.test(value)) {
+            callback();
+          } else {
+            callback('只能是英文,英文字符或者数字');
+          }
+        },
+      },
+    },
+  ];
+};
+/*
+export const haWaybillInfo = reactive([
   {
     type: 'input',
     label: '分单号',
@@ -573,7 +822,7 @@ export const haWaybillInfo = reactive<ShipperInfoItem[]>([
       required: true,
       message: '必填项不可为空',
     },
-    editFlag: true,
+    editFlag: false,
   },
   {
     type: 'input',
@@ -645,8 +894,20 @@ export const haWaybillInfo = reactive<ShipperInfoItem[]>([
     editFlag: true,
   },
 ]);
+*/
 
 export const hawbMainWaybillInfo = [
+  {
+    label: '英文品名',
+    field: 'mawbgoodsNameEn',
+    clo: 12,
+  },
+  {
+    type: 'input',
+    label: '中文品名',
+    field: 'goodsName',
+    clo: 12,
+  },
   { label: '主运单号', field: 'mawbNo', clo: 6 },
   {
     label: '主单件数',
@@ -664,11 +925,6 @@ export const hawbMainWaybillInfo = [
     clo: 6,
   },
   { label: '货运代理', field: 'mawbagtNo', clo: 6 },
-  {
-    label: '英文品名',
-    field: 'mawbgoodsNameEn',
-    clo: 12,
-  },
   {
     label: '体积CBM',
     field: 'volDec',
@@ -676,36 +932,82 @@ export const hawbMainWaybillInfo = [
   },
 ];
 
-export const flightInfo = [
-  {
-    label: '预配航班',
-    field: 'fltNo',
-    clo: 12,
-    rules: {
-      required: true,
-      message: '必填项不可为空',
+export const getFlightInfo = () => {
+  return [
+    {
+      label: '预配航班',
+      field: 'fltNo',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          } else {
+            const prefix = value.substring(0, 2);
+            const suffix = value.substring(2, value.length);
+            if (prefix.length > 2) {
+              callback('前缀最大长度两位');
+            }
+            if (suffix.length > 4) {
+              callback('后缀最大长度四位');
+            }
+            if (englishAndNumber.test(value)) {
+              callback();
+            } else {
+              callback('前缀和后缀，只能是英文或者数字');
+            }
+          }
+        },
+      },
     },
-  },
-  {
-    label: '航班日期',
-    field: 'fltDate',
-    clo: 6,
-    rules: {
-      required: true,
-      message: '必填项不可为空',
+    {
+      label: '起始站',
+      field: 'orgnNo',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (threeEngLish.test(value)) {
+            callback();
+          } else {
+            callback('只能是三位英文字母');
+          }
+        },
+      },
     },
-  },
-  {
-    label: '卸机目的站',
-    field: 'destNo',
-    clo: 12,
-    rules: {
-      required: true,
-      message: '必填项不可为空',
+    {
+      label: '卸机目的站',
+      field: 'destNo',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (threeEngLish.test(value)) {
+            callback();
+          } else {
+            callback('只能是三位英文字母');
+          }
+        },
+      },
     },
-  },
-];
-
+    {
+      label: '航班日期',
+      field: 'fltDate',
+      clo: 6,
+      rules: {
+        required: true,
+        message: '必填项不可为空',
+      },
+    },
+  ];
+};
 export const getCostInfo = (chgsList: Ref<string[]>) => {
   return [
     {
@@ -713,6 +1015,19 @@ export const getCostInfo = (chgsList: Ref<string[]>) => {
       label: '商品编码',
       field: 'hsCode',
       clo: 24,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (ENGLISH_LETTER_CHARACTER_NUMBER.test(value)) {
+            callback();
+          } else {
+            callback('只能是英文,英文字符或者数字');
+          }
+        },
+      },
     },
     {
       type: 'select',
@@ -745,13 +1060,41 @@ export const getCostInfo = (chgsList: Ref<string[]>) => {
       clo: 6,
       rules: {
         required: true,
-        message: '必填项不可为空',
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (twoDecimal.test(value) && Number(value) >= 0) {
+            callback();
+          } else {
+            callback('只能是数字，最多两位小数');
+          }
+        },
+      },
+    },
+    {
+      type: 'input',
+      label: '币制代码',
+      field: 'curNo',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (threeEngLish.test(value)) {
+            callback();
+          } else {
+            callback('只能是三位字母');
+          }
+        },
       },
     },
   ];
 };
 
-export const otherInfo = reactive<ShipperInfoItem[]>([
+/* export const otherInfo = reactive<ShipperInfoItem[]>([
   {
     label: '运费',
     field: 'ccWtChg',
@@ -797,111 +1140,360 @@ export const otherInfo = reactive<ShipperInfoItem[]>([
       message: '必填项不可为空',
     },
   },
-]);
-
-export const gooderInfo = reactive<ShipperInfoItem[]>([
-  {
-    'label': '收货人名称',
-    'field': 'cneName',
-    'clo': 12,
-    'max-length': 65,
-    'placeholder': '请输入65个以内的字符',
-    'rules': { required: true, message: '必填项不可为空' },
-  },
-  {
-    'label': '收货人地址街道',
-    'field': 'cneAddr',
-    'clo': 12,
-    'max-length': 35,
-    'placeholder': '请输入35个以内的字符',
-    'rules': { required: true, message: '必填项不可为空' },
-  },
-  {
-    'label': '收货国家二字码',
-    'field': 'cneCont',
-    'clo': 6,
-    'max-length': 20,
-    'rules': { required: true, message: '必填项不可为空' },
-  },
-  {
-    'label': '收货人城市',
-    'field': 'cneCity',
-    'clo': 6,
-    'max-length': 20,
-    'rules': { required: true, message: '必填项不可为空' },
-  },
-  {
-    'label': '电话号码',
-    'field': 'cneTelNo',
-    'clo': 6,
-    'max-length': 11,
-    'rules': { required: true, message: '必填项不可为空' },
-  },
   {
-    'label': '发货邮编编码',
-    'field': 'cnePostNo',
-    'clo': 6,
-    'max-length': 50,
-  },
-]);
-
-export const shipperInfo = reactive<ShipperInfoItem[]>([
-  {
-    'label': '发货人名称',
-    'field': 'shpName',
-    'clo': 12,
-    'max-length': 65,
-    'placeholder': '请输入65个以内的字符',
-    'rules': { required: true, message: '必填项不可为空' },
-  },
-  {
-    'label': '发货人地址街道',
-    'field': 'shpAddr',
-    'clo': 12,
-    'max-length': 35,
-    'placeholder': '请输入35个以内的字符',
-    'rules': { required: true, message: '必填项不可为空' },
-  },
-  {
-    'label': '发货国家二字码',
-    'field': 'shpCont',
-    'clo': 6,
-    'max-length': 20,
-    'rules': { required: true, message: '必填项不可为空' },
-  },
-  {
-    'label': '发货人城市',
-    'field': 'shpCity',
-    'clo': 6,
-    'max-length': 20,
-    'rules': { required: true, message: '必填项不可为空' },
-  },
-  {
-    'label': '电话号码',
-    'field': 'shpTelNo',
-    'clo': 6,
-    'max-length': 11,
-    'rules': { required: true, message: '必填项不可为空' },
-  },
-  {
-    'label': '发货邮编编码',
-    'field': 'shpPostNo',
-    'clo': 6,
-    'max-length': 50,
+    type: 'select',
+    label: '付款方式代码',
+    field: 'wtValChgs',
+    clo: 8,
+    options: chgsList,
+    allowCreate: true,
+    rules: {
+      required: true,
+      message: '必填项不可为空',
+    },
   },
-]);
-
-// 1. 定义字段的类型接口
-interface ShipperInfoItem {
-  'type'?: string | undefined;
-  'label': string; // 字段标签
-  'field': string; // 字段名称
-  'editFlag'?: boolean | undefined | null;
-  'clo': number; // 列宽
-  'max-length'?: number; // 最大长度，可能是可选的
-  'placeholder'?: string; // 提示文字，可能是可选的
-  'rules'?: {
-    required: boolean; // 是否必填
-    message?: string; // 校验失败时的提示信息
-  };
-}
+]); */
+export const otherInfo = (chgsList: Ref<string[]>) => {
+  return [
+    {
+      label: '运费',
+      field: 'ccWtChg',
+      type: 'input',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (twoDecimal.test(value) && Number(value) >= 0) {
+            callback();
+          } else {
+            callback('只能是数字，最多两位小数');
+          }
+        },
+      },
+    },
+    {
+      label: '附加费',
+      type: 'input',
+      field: 'ccVlChg',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (twoDecimal.test(value) && Number(value) >= 0) {
+            callback();
+          } else {
+            callback('只能是数字，最多两位小数');
+          }
+        },
+      },
+    },
+    {
+      label: '税费',
+      type: 'input',
+      field: 'ccTxChg',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (twoDecimal.test(value) && Number(value) >= 0) {
+            callback();
+          } else {
+            callback('只能是数字，最多两位小数');
+          }
+        },
+      },
+    },
+    {
+      label: '代理人费',
+      field: 'ccAgChg',
+      type: 'input',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (twoDecimal.test(value) && Number(value) >= 0) {
+            callback();
+          } else {
+            callback('只能是数字，最多两位小数');
+          }
+        },
+      },
+    },
+    {
+      label: '承运人费',
+      type: 'input',
+      field: 'CrChg',
+      clo: 6,
+      rules: {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (twoDecimal.test(value) && Number(value) >= 0) {
+            callback();
+          } else {
+            callback('只能是数字，最多两位小数');
+          }
+        },
+      },
+    },
+    /*    {
+      type: 'select',
+      label: '其他费用付款方式',
+      field: 'othChgs',
+      clo: 6,
+      options: chgsList,
+      allowCreate: true,
+      rules: {
+        required: true,
+        message: '必填项不可为空',
+      },
+    }, */
+  ];
+};
+export const getShipperInfo = () => {
+  return [
+    {
+      'label': '发货人名称',
+      'field': 'shpName',
+      'clo': 12,
+      'max-length': 65,
+      'placeholder': '请输入65个以内的字符',
+      'rules': {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (ENGLISH_LETTER_CHARACTER_NUMBER.test(value)) {
+            callback();
+          } else {
+            callback('只能是英文,数字或者英文字符');
+          }
+        },
+      },
+    },
+    {
+      'label': '发货人地址街道',
+      'field': 'shpAddr',
+      'clo': 12,
+      'max-length': 35,
+      'placeholder': '请输入35个以内的字符',
+      'rules': {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (ENGLISH_LETTER_CHARACTER_NUMBER.test(value)) {
+            callback();
+          } else {
+            callback('只能是英文,数字或者英文字符');
+          }
+        },
+      },
+    },
+    {
+      'label': '发货国家二字码',
+      'field': 'shpCont',
+      'clo': 6,
+      'max-length': 20,
+      'rules': {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (value && value.length > 2) {
+            callback('长度不能大于两位');
+          }
+          if (twoEngLish.test(value)) {
+            callback();
+          } else {
+            callback('只能是两位英文');
+          }
+        },
+      },
+    },
+    {
+      'label': '发货人城市',
+      'field': 'shpCity',
+      'clo': 6,
+      'max-length': 20,
+      'rules': {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (ENGLISH_LETTER_CHARACTER_NUMBER.test(value)) {
+            callback();
+          } else {
+            callback('只能是英文,数字或者英文字符');
+          }
+        },
+      },
+    },
+    {
+      'label': '电话号码',
+      'field': 'shpTelNo',
+      'clo': 6,
+      'max-length': 20,
+      'rules': {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (ENGLISH_LETTER_CHARACTER_NUMBER.test(value)) {
+            callback();
+          } else {
+            callback('只能是英文,数字或者英文字符');
+          }
+        },
+      },
+    },
+    {
+      'label': '发货邮编编码',
+      'field': 'shpPostNo',
+      'clo': 6,
+      'max-length': 50,
+      'rules': {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (englishAndNumber.test(value)) {
+            callback();
+          } else {
+            callback('只能是数字或者英文');
+          }
+        },
+      },
+    },
+  ];
+};
+export const getGooderInfo = () => {
+  return [
+    {
+      'label': '收货人名称',
+      'field': 'cneName',
+      'clo': 12,
+      'max-length': 65,
+      'placeholder': '请输入65个以内的字符',
+      'rules': {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (ENGLISH_LETTER_CHARACTER_NUMBER.test(value)) {
+            callback();
+          } else {
+            callback('只能是英文,数字或者英文字符');
+          }
+        },
+      },
+    },
+    {
+      'label': '收货人地址街道',
+      'field': 'cneAddr',
+      'clo': 12,
+      'max-length': 35,
+      'placeholder': '请输入35个以内的字符',
+      'rules': {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (ENGLISH_LETTER_CHARACTER_NUMBER.test(value)) {
+            callback();
+          } else {
+            callback('只能是英文,数字或者英文字符');
+          }
+        },
+      },
+    },
+    {
+      'label': '收货国家二字码',
+      'field': 'cneCont',
+      'clo': 6,
+      'max-length': 20,
+      'rules': {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (value && value.length > 2) {
+            callback('长度不能大于两位');
+          }
+          if (twoEngLish.test(value)) {
+            callback();
+          } else {
+            callback('只能是两位英文');
+          }
+        },
+      },
+    },
+    {
+      'label': '收货人城市',
+      'field': 'cneCity',
+      'clo': 6,
+      'max-length': 20,
+      'rules': {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (ENGLISH_LETTER_CHARACTER_NUMBER.test(value)) {
+            callback();
+          } else {
+            callback('只能是英文,数字或者英文字符');
+          }
+        },
+      },
+    },
+    {
+      'label': '电话号码',
+      'field': 'cneTelNo',
+      'clo': 6,
+      'max-length': 20,
+      'rules': {
+        required: true,
+        validator(value: string, callback: (message?: string) => void) {
+          if (value === '' || value === null || value === undefined) {
+            callback('必填项不能为空');
+          }
+          if (ENGLISH_LETTER_CHARACTER_NUMBER.test(value)) {
+            callback();
+          } else {
+            callback('只能是数字或者英文');
+          }
+        },
+      },
+    },
+    {
+      'label': '发货邮编编码',
+      'field': 'cnePostNo',
+      'clo': 6,
+      'max-length': 50,
+    },
+  ];
+};

src/views/departure/waybillManage/functions/table.ts

@@ -33,6 +33,15 @@ export const columns = useTableOperate(
       title: '代理代码',
       dataIndex: 'agtNo',
     },
+    /*    {
+      title: '货物类型',
+      dataIndex: 'goodsType',
+      render(scope: any) {
+        return h(() => {
+          return '';
+        });
+      },
+    }, */
     {
       title: '收单状态',
       dataIndex: 'status',

src/views/departure/waybillManage/index.vue

@@ -6,7 +6,6 @@
     ref="crudTableRef"
     :api-obj="ApiObj"
     :columns="columns"
-    :on-search="queryTable"
     :search-config="searchConfig"
     :search-form="searchForm"
     :show-add="false"
@@ -87,6 +86,7 @@
   ></Additional>
   <additionalDialog
     ref="additionalDialogRef"
+    :clear-form="clearForm"
     :from-data="fromData"
     :model-type="modelType"
     :order-type="orderType"
@@ -99,43 +99,94 @@
     :ok-loading="buttonLoading"
     hide-cancel
     ok-text="关闭"
-    title=" "
+    title="查询运单号"
     width="auto"
-    @ok="handleOk"
   >
-    <a-form :model="queryForm" layout="inline" @submit="submitQuery">
+    <a-form
+      ref="ruleFormRef"
+      :model="queryForm"
+      layout="inline"
+      @submit="submitQuery"
+    >
       <a-form-item
-        :rules="[{ required: true, message: '必填项不可为空!' }]"
-        field="name"
+        :rules="[
+          {
+            required: true,
+            message: '必填项不可为空!并且前缀长度为3,后缀长度为8',
+            minLength: 12,
+          },
+        ]"
+        field="mawbNo"
         label="请输入运单号"
+        validate-trigger="false"
       >
-        <a-input v-model="queryForm.name" allow-clear width="200px" />
+        <a-input
+          ref="prefixInput"
+          v-model="queryForm.mawbNoPrefix"
+          :max-length="3"
+          allow-clear
+          class="mr-1 w-20"
+          @focus="$refs.ruleFormRef.clearValidate('mawbNo')"
+          @input="onPrefixInput"
+        /><span>-</span>
+        <a-input
+          ref="suffixInput"
+          v-model="queryForm.mawbNoSuffix"
+          :max-length="8"
+          allow-clear
+          class="ml-1 w-32"
+          @focus="$refs.ruleFormRef.clearValidate('mawbNo')"
+          @input="
+            queryForm.mawbNoSuffix = queryForm.mawbNoSuffix.replace(/\D/g, '')
+          "
+          @keydown="onSuffixKeydown"
+        />
       </a-form-item>
       <a-form-item>
-        <a-button html-type="submit">查询</a-button>
+        <a-button class="common-button" html-type="submit">查询</a-button>
       </a-form-item>
     </a-form>
+    <div
+      style="
+        position: relative;
+        left: 100px;
+        display: block;
+        width: 200px;
+        height: 15px;
+      "
+    >
+      {{ queryForm.mawbNo }}
+    </div>
+    <template #footer>
+      <a-button @click="handleClonse">关闭</a-button>
+    </template>
   </a-modal>
   <!-- 查询运单后弹出的对话框 -->
   <a-modal
     v-model:visible="visibleTip"
-    :cancel-text="tipCancelText"
-    :hide-cancel="tipCancelText === '补录'"
+    :closable="false"
     :mask-closable="false"
-    ok-text="关闭"
+    ok-text="确认按钮"
     width="46%"
-    @cancel="updateOrSave"
-    @ok="handleTipClose"
   >
-    <h4 style="color: red">ICS2欧盟申报温馨提示:</h4>
+    <h4 style="color: #0066ff; font-size: 14px">ICS2欧盟申报温馨提示:</h4>
     <div v-for="item in cueMsg" :key="item.value">
-      <p style="color: red; font-size: 11px"
+      <p style="color: #0066ff; font-size: 14px"
         >{{ item.value }}.{{ item.label }}</p
       >
     </div>
     <a-typography-title :heading="4">
       <div>{{ tipMsg }}</div>
     </a-typography-title>
+    <template #footer>
+      <a-button
+        v-if="tipCancelText !== '补录'"
+        class="common-button"
+        @click="updateOrSave"
+        >{{ tipCancelText }}</a-button
+      >
+      <a-button @click="handleTipClose">关闭</a-button>
+    </template>
   </a-modal>
 </template>
 
@@ -148,17 +199,19 @@ import { MODEL_TYPE } from '@/constant/base';
 import { useUserStore, useWaybillStore } from '@/store';
 import DictApi from '@/api/module/DictApi';
 import AdditionalDialog from '@/views/departure/waybillManage/additionalDialog.vue';
-import { onMounted, reactive, ref } from 'vue';
+import { onMounted, reactive, ref, watch } from 'vue';
 import ApiObj from './api/CurrentPageApi';
 import Additional from './additional.vue';
 import { columns } from './functions/table';
 import { setFiltrateData } from './functions/data';
 
+useWaybillStore();
 const additionalDialogRef = ref<any>(null);
 const waybillStatusMap = ref<string[]>([]);
-useWaybillStore();
 const userStore = useUserStore();
 const crudTableRef = ref();
+const prefixInput = ref();
+const suffixInput = ref();
 
 onMounted(async () => {
   const res = await DictApi.wbcStatus();
@@ -177,14 +230,13 @@ const searchForm = reactive<Record<string, any>>({
 });
 // 查询条件
 const searchConfig = setFiltrateData(waybillStatusMap);
-
 const visibleDialog = ref<boolean>(false);
 const orderType = ref<WAYBILL_TYPE>(WAYBILL_TYPE.MAIN);
 const modelType = ref<MODEL_TYPE>(MODEL_TYPE.EDIT);
 const fromData = ref<Record<string, any>>({});
 
 /**
- * 这里确认打开的是 补录主运单 还是 补录分运单 还是 打开新增主运单
+ *  通过参数控制打开不同业务的对话窗口
  * @param type
  * @param data
  * @param isNew
@@ -198,7 +250,8 @@ const showOrEditWaybill = async (
   if (isNew === 'mainNew') {
     // 主运单新增
     if (additionalDialogRef.value) {
-      additionalDialogRef.value.openNewMainDialog(queryForm.name);
+      orderType.value = WAYBILL_TYPE.MAIN;
+      additionalDialogRef.value.openNewMainDialog(queryForm.mawbNo);
     }
     return;
   }
@@ -246,18 +299,64 @@ const printConfirm = async (data: Record<string, any>) => {
 };
 
 interface queryFormInterface {
-  name: string;
+  mawbNoPrefix: string;
+  mawbNoSuffix: string;
+  mawbNo: string;
 }
 
 const visible = ref<boolean>(false);
 const tipMsg = ref<string>('');
 const tipCancelText = ref<string>('');
 const visibleTip = ref<boolean>(false);
+const ruleFormRef = ref<Record<string, any>>({});
 const buttonLoading = ref<boolean>(false);
 const queryForm = reactive<queryFormInterface>({
-  name: '',
+  mawbNoPrefix: '',
+  mawbNoSuffix: '',
+  mawbNo: '',
 });
 
+/**
+ * 新增对话框的运单号拼接
+ */
+watch(
+  () =>
+    `${queryForm.mawbNoPrefix !== undefined ? queryForm.mawbNoPrefix : ''}-${
+      queryForm.mawbNoSuffix !== undefined ? queryForm.mawbNoSuffix : ''
+    }` === '-'
+      ? ''
+      : `${
+          queryForm.mawbNoPrefix !== undefined ? queryForm.mawbNoPrefix : ''
+        }-${
+          queryForm.mawbNoSuffix !== undefined ? queryForm.mawbNoSuffix : ''
+        }`,
+  (newValue) => {
+    if (newValue === undefined || newValue === null) {
+      queryForm.mawbNo = '';
+    } else {
+      queryForm.mawbNo = newValue;
+    }
+  }
+);
+
+/**
+ * 输入完之后自动跳转到下一个文本框,并且去掉非数字的输入
+ */
+const onPrefixInput = () => {
+  queryForm.mawbNoPrefix = queryForm.mawbNoPrefix.replace(/\D/g, '');
+  if (queryForm.mawbNoPrefix.length === 3) {
+    suffixInput.value.focus();
+  }
+};
+/**
+ * 删除完继续删除会跳转到上一个文本框
+ * @param event
+ */
+const onSuffixKeydown = (event: KeyboardEvent) => {
+  if (queryForm.mawbNoSuffix.length === 0 && event.key === 'Backspace') {
+    prefixInput.value.focus();
+  }
+};
 /**
  * 点击新增按钮
  */
@@ -268,8 +367,10 @@ function showSearchOrder(): void {
 /**
  * 点击新增按钮对话框的关闭按钮
  */
-function handleOk(): void {
-  queryForm.name = '';
+function handleClonse(): void {
+  queryForm.mawbNo = '';
+  queryForm.mawbNoSuffix = '';
+  queryForm.mawbNoPrefix = '';
   buttonLoading.value = false;
   visible.value = false;
 }
@@ -278,22 +379,20 @@ function handleOk(): void {
  * 点击新增按钮对话框的查询按钮
  */
 const submitQuery = async (e: any) => {
+  console.log('submitQuery', e);
   const { errors } = e;
   if (errors) return; // 表单校验
   try {
-    // 根据运单号查询运单是否存在
-    // const res = await ApiObj.get({ mawbNo: queryForm.name });
-
     const start = dayjs().add(-5, 'day').format('YYYY-MM-DD');
     const end = dayjs().add(14, 'day').format('YYYY-MM-DD');
     const tmp = {
-      mawbNo: queryForm.name,
+      mawbNo: queryForm.mawbNo,
       agtNo: userStore.userInfo?.tenant?.threeCode,
       startTime: start,
       endTime: end,
     };
     const res = await ApiObj.checkExist(tmp);
-    const flag = res.data && res.data.total && res.data.total > 0;
+    const flag = res && res.data && res.data > 0;
     visibleTip.value = true;
     if (flag) {
       // 假设运单存在
@@ -311,6 +410,9 @@ const submitQuery = async (e: any) => {
   }
 };
 const handleTipClose = () => {
+  queryForm.mawbNo = '';
+  queryForm.mawbNoSuffix = '';
+  queryForm.mawbNoPrefix = '';
   visibleTip.value = false;
   visible.value = false;
 };
@@ -323,7 +425,7 @@ const cueMsg = ref<CueMessage[]>([
   {
     value: 1,
     label:
-      '凡是属于3S/D0/I9/ES且航班目的地为飞往欧盟以及挪威和瑞士的所有航班，请选择IC2选项',
+      '凡是属于3S/D0/I9/ES且航班目的地为飞往欧盟以及挪威和瑞士的所有航班，请选择ICS2选项',
   },
   {
     value: 2,
@@ -354,7 +456,16 @@ const updateOrSave = () => {
   }
 };
 
-const queryTable = () => {
-  console.log('发起查询');
+/**
+ * 运单新增或者时关闭之前打开的窗口
+ * 并清空输入
+ */
+const clearForm = (): void => {
+  queryForm.mawbNo = '';
+  queryForm.mawbNoPrefix = '';
+  queryForm.mawbNoSuffix = '';
+  visibleTip.value = false;
+  visible.value = false;
+  crudTableRef.value.onSearch();
 };
 </script>