进港航班查询修改

src/App.vue

@@ -6,7 +6,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
+import { computed, onBeforeMount } from 'vue';
 import { useRoute } from 'vue-router';
 import GlobalSetting from '@/components/global-setting/index.vue';
 import useLocale from '@/hooks/locale';

src/api/module/DictApi.ts

@@ -48,6 +48,10 @@ class DictApi extends BaseApi {
     return super.customizeGet('/vehbook-vtype', data);
   }
 
+  boolType(data?: any): Promise<ResponseData<any>> {
+    return super.customizeGet('/bool-type', data);
+  }
+
   iwvehType(data?: any): Promise<ResponseData<any>> {
     return super.customizeGet('/iwveh-type', data);
   }

src/components/crud-table/index.vue

@@ -118,7 +118,7 @@
 
 <script lang="ts" setup>
 import { isFunction } from 'lodash-es';
-import { unref, PropType } from 'vue';
+import { unref, PropType, reactive } from 'vue';
 import CrudLayout from '@/layout/crud-layout.vue';
 import Form from '@/components/form/index.vue';
 import Table from '@/components/table/index.vue';

src/components/form/form-item.vue

@@ -44,7 +44,7 @@ const ctx = inject('propsContext') as Record<string, any>;
 const props = defineProps({
   inline: {
     type: Boolean,
-    default: true,
+    default: false,
   },
   type: {
     type: String as PropType<Exclude<FormItemType, [FormItemType.TEXT]>>,

src/constant/waybill.ts

@@ -14,6 +14,6 @@ export enum WAYBILL_STATUS {
  */
 export enum WAYBILL_TYPE {
   MAIN = 1, // 主运单补录
-  SPLIT,
+  SPLIT, // 分运单
   MAIN_ADD, // 主运单新增
 }

src/router/modules/compositeSearch.ts

@@ -57,7 +57,7 @@ export default {
       component: () =>
         import('@/views/compositeSearch/inwardFlightInquiry/index.vue'),
       meta: {
-        title: '进港航班查询(实时)',
+        title: '进港航班查询',
       },
     },
     {

src/store/modules/user/index.ts

@@ -43,8 +43,6 @@ const useUserStore = defineStore('user', {
     // Set user's information
     setInfo(data: Record<string, any>) {
       this.userInfo = data?.user;
-      console.log('***********************************');
-      console.log(this.userInfo);
       this.roleTypes = data?.roleTypes;
       this.permissions = data?.permissions;
     },

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

@@ -1,11 +1,35 @@
 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/iMawbList`, data);
+  }
+
+  get(data: any): Promise<ResponseData<any>> {
+    return request.get(`${this.baseUrl}/mawb/fwbInfo?mawbId=${data}`);
+  }
+
+  getMawbCount(data: any): Promise<ResponseData<any>> {
+    return request.post(`${this.baseUrl}/mawb/iMawbCount`, data);
+  }
+  /* /mawb/fwbInfo?mawbId=1
+
+  get(data: any): Promise<ResponseData<any>> {
+    return request.get(`${this.baseUrl}/inbound/info?mawbId=`, data);
+  }
+*/
 }
 
 export default new CurrentPageApi();

src/views/compositeSearch/inwardFlightInquiry/data.json

@@ -0,0 +1,37 @@
+{
+  "code": 200,
+  "message": "操作成功",
+  "data": {
+    "current": 1,
+    "total": 1832,
+    "size": 10,
+    "records": [
+      {
+        "id": 283,
+        "mawbNo": "380-08840451",
+        "fltNo": "O3810",
+        "fltDate": "2023-03-25",
+        "pcsDec": 10,
+        "wtDec": 141.0,
+        "orgnNo": "BKI",
+        "destNo": "SZX",
+        "goodsType": "C",
+        "agtNo": "DYA",
+        "dmgCount": 0
+      },
+      {
+        "id": 400,
+        "mawbNo": "008-12345602",
+        "fltNo": "HZ8888",
+        "fltDate": "2023-04-14",
+        "pcsDec": 10,
+        "wtDec": 100.0,
+        "orgnNo": "SZX",
+        "destNo": "YLM",
+        "goodsType": "C",
+        "agtNo": "HZH",
+        "dmgCount": 0
+      }
+    ]
+  }
+}

src/views/compositeSearch/inwardFlightInquiry/index.vue

@@ -2,22 +2,44 @@
   <div class="page-content">
     <div class="search-header">
       <div class="search-header-left">
-        <div class="search-header-left-item" v-if="searchType=='1'">
+        <div v-if="searchType == '1'" class="search-header-left-item">
           <a-form-item label="航班号">
-            <a-input v-model="formState.flight.flightNo" />
+            <a-input
+              v-model="flyParam.fltNoPrefix"
+              allow-clear
+              class="mr-5 w-24"
+              @input="commonUpperCase('fltNoPrefix')"
+            />
+            <a-input
+              v-model="flyParam.fltNoSuffix"
+              allow-clear
+              class="mr-5 w-36"
+              @input="commonUpperCase('fltNoSuffix')"
+            />
           </a-form-item>
         </div>
-        <div class="search-header-left-item" v-if="searchType=='3'">
-          <a-select ref="select" :options="timeTypeOptions" v-model="timeType" style="width: 120px"
-            @change="timeTypeChange()">
+        <div v-if="searchType == '3'" class="search-header-left-item">
+          <a-select
+            ref="select"
+            v-model="timeType"
+            :allow-clear="false"
+            :options="timeTypeOptions"
+            style="width: 120px"
+            @change="timeTypeChange()"
+          >
           </a-select>
+          <a-range-picker v-model="timeDate" />
         </div>
-        <div class="search-header-left-item" v-if="searchType!='2'">
+        <div v-if="searchType == '1'" class="search-header-left-item">
           <a-form-item label="航班日期">
-            <a-range-picker v-model="formState.flight.flightDate" />
+            <a-range-picker
+              v-model="formState.flight.flightDate"
+              :allow-clear="false"
+              style="width: 250px"
+            />
           </a-form-item>
         </div>
-        <div class="search-header-left-item" v-if="searchType=='2'">
+        <div v-if="searchType == '2'" class="search-header-left-item">
           <a-form-item label="运单号">
             <a-input v-model="formState.flight.billNo" />
           </a-form-item>
@@ -25,8 +47,22 @@
       </div>
       <div class="search-header-right">
         <div class="search-header-right-item">
-          <a-radio-group v-model="searchType" name="radioGroup" :options="searchTypeOption"
-            @change="searchTypeChange()">
+          <a-radio-group
+            v-model="searchType"
+            :options="searchTypeOption"
+            name="radioGroup"
+            size="mini"
+            @change="searchTypeChange"
+          >
+          </a-radio-group>
+        </div>
+        <div class="search-header-right-item">
+          <a-radio-group
+            v-model="formState.flight.orderType"
+            :options="orderTypeOption"
+            name="radioGroup"
+            size="mini"
+          >
           </a-radio-group>
         </div>
         <div class="search-header-right-item">
@@ -38,270 +74,776 @@
       </div>
     </div>
     <div class="search-select">
-      <div class="search-select-title">
-        筛选条件
-      </div>
+      <div class="search-select-title"> 筛选条件</div>
       <div class="search-select-item">
-        <a-checkbox-group v-model="formState.flight.pickOrder" :options="pickOrderOptions" />
+        <a-checkbox-group
+          v-model="formState.flight.pickOrder"
+          :options="pickOrderOptions"
+        />
       </div>
       <div class="search-select-item">
-        <a-checkbox-group v-model="formState.flight.takeGoods" :options="takeGoodsOptions" />
+        <a-checkbox-group
+          v-model="formState.flight.takeGoods"
+          :options="takeGoodsOptions"
+        />
       </div>
       <div class="search-select-item">
-        <a-checkbox-group v-model="formState.flight.damaged" :options="damagedOptions" />
+        <a-checkbox-group
+          v-model="formState.flight.damaged"
+          :options="damagedOptions"
+        />
       </div>
       <div class="search-select-item">
-        <a-checkbox-group v-model="formState.flight.release" :options="releaseOptions" />
+        <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" />
+        <a-checkbox-group
+          v-model="formState.flight.partType"
+          :options="partTypeOptions"
+        />
       </div>
       <div class="search-select-item2">
         <div>
-          <a-radio-group v-model="formState.flight.orderType" name="radioGroup" :options="orderTypeOption" @change="">
-          </a-radio-group>
-        </div>
-        <div>
-          <a-radio-group v-model="formState.flight.goodsType" name="radioGroup" :options="goodsTypeOption" @change="">
+          <a-radio-group
+            v-model="formState.flight.goodsType"
+            :options="goodsTypeOption"
+            name="radioGroup"
+          >
           </a-radio-group>
         </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>合计：<span style="margin-right: 20px;">30159/894T</span><span>30159/894T</span></template>
-      </a-table>
+      <a-spin :loading="loading" style="width: 100%; margin-top: 20px">
+        <a-table
+          :data="dataSource"
+          :pagination="false"
+          :stripe="true"
+          :summary="summary"
+          :v-loading="loading"
+          bordered
+        >
+          <template #columns>
+            <a-table-column title="序号">
+              <template
+                #cell="{
+                  /* eslint-disable-next-line vue/no-unused-vars */
+                  record,
+                  /* eslint-disable-next-line vue/no-unused-vars */
+                  column,
+                  rowIndex,
+                }"
+                >{{ rowIndex + 1 }}</template
+              >
+            </a-table-column>
+            <a-table-column title="FWB信息">
+              <template #cell="{ record }">
+                <a-button type="text" @click="fwbClick(record)">
+                  {{ record.fwb === '1' ? '正常' : '缺失' }}
+                </a-button>
+              </template>
+            </a-table-column>
+            <a-table-column
+              data-index="mawbNo"
+              title="运单信息"
+            ></a-table-column>
+            <a-table-column data-index="fltNo" title="航班号">
+              <template #cell="{ record }">
+                <span>
+                  {{ contactStr(record.fltNo, record.fltDate) }}
+                </span>
+              </template>
+            </a-table-column>
+            <a-table-column data-index="pcsDec" title="运单件重">
+              <!-- 申报件数/申报重量-->
+              <template #cell="{ record }">
+                <span>
+                  {{ contactStr(record.pcsDec, record.wtDec) }}
+                </span>
+              </template>
+            </a-table-column>
+            <a-table-column data-index="wtDec" title="理货件重">
+              <!-- 理货件重 =  理货时间为空值为空字符串, 如果有时间,那么就是运单件重-->
+              <template #cell="{ record }">
+                <span>
+                  {{
+                    record.talCfmDate
+                      ? contactStr(record.pcsDec, record.wtDec)
+                      : ''
+                  }}
+                </span>
+              </template>
+            </a-table-column>
+            <a-table-column title="始发/目的地">
+              <template #cell="{ record }">
+                <span>
+                  {{ contactStr(record.orgnNo, record.destNo) }}
+                </span>
+              </template>
+            </a-table-column>
+            <a-table-column
+              data-index="iwsCfmDate"
+              title="抵港时间"
+            ></a-table-column>
+            <a-table-column
+              data-index="talCfmDate"
+              title="理货时间"
+            ></a-table-column>
+            <a-table-column
+              data-index="awdCfmDate"
+              title="取单时间"
+            ></a-table-column>
+            <a-table-column
+              data-index="dlvCfmDate"
+              title="提货时间"
+            ></a-table-column>
+            <a-table-column title="海关放行">
+              <template #cell="{ record }">
+                <span>{{ record.relStatus === 'Y' ? '是' : '否' }}</span>
+              </template>
+            </a-table-column>
+            <a-table-column title="破损">
+              <template #cell="{ record }">
+                <a-button type="text" @click="dmgClick"
+                  >{{ record.dmgCount > 0 ? '有' : '无' }}
+                </a-button>
+              </template>
+            </a-table-column>
+          </template>
+          <template #summary-cell="{ column, record }">
+            <div>{{ record[column.dataIndex] }}</div>
+          </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"
+        />
+      </a-spin>
     </div>
   </div>
+  <a-modal
+    v-model:visible="showDetail"
+    :hide-cancel="true"
+    :ok-text="'关闭'"
+    title="FWB报文信息"
+    @ok="showDetail = false"
+  >
+    <!--    <a-radio default-checked>发货人信息</a-radio>-->
+    <a-space direction="vertical" fill size="large">
+      <a-descriptions :size="'large'">
+        <a-descriptions-item :label="'运单号'">
+          {{ fwbData.mawbNo ? fwbData.mawbNo : '' }}
+        </a-descriptions-item>
+      </a-descriptions>
+      <a-descriptions
+        :column="{ xs: 1, md: 3, lg: 4 }"
+        :size="'large'"
+        title="发货人信息"
+      >
+        <a-descriptions-item :label="'发货人'" :span="6">
+          {{ fwbData.shpName }}
+        </a-descriptions-item>
+        <!--        <a-descriptions-item :label="'代码'" :span="6">-->
+        <!--          {{ fwbData.shipperInfo.code }}-->
+        <!--        </a-descriptions-item>-->
+        <a-descriptions-item :label="'国家地区'" :span="3">
+          {{ fwbData.shpCont }}
+        </a-descriptions-item>
+        <a-descriptions-item :label="'通讯号码'" :span="3">
+          {{ fwbData.shpTelNo }}
+        </a-descriptions-item>
+        <a-descriptions-item :label="'发货地址'" :span="6">
+          {{ fwbData.shpAddr }}
+        </a-descriptions-item>
+      </a-descriptions>
+      <a-descriptions
+        :column="{ xs: 1, md: 3, lg: 4 }"
+        :size="'large'"
+        title="收货人信息"
+      >
+        <a-descriptions-item :label="'收货人'" :span="6">
+          {{ fwbData.cneName }}
+        </a-descriptions-item>
+        <!--        <a-descriptions-item :label="'代码'" :span="6">-->
+        <!--          {{ fwbData.recipientInfo.code }}-->
+        <!--        </a-descriptions-item>-->
+        <a-descriptions-item :label="'国家地区'" :span="3">
+          {{ fwbData.cneCont }}
+        </a-descriptions-item>
+        <a-descriptions-item :label="'通讯号码'" :span="3">
+          {{ fwbData.cneTelNo }}
+        </a-descriptions-item>
+        <a-descriptions-item :label="'收货地址'" :span="6">
+          {{ fwbData.cneAddr }}
+        </a-descriptions-item>
+      </a-descriptions>
+    </a-space>
+  </a-modal>
+  <a-modal
+    v-model:visible="showPictureDetail"
+    :cancel-text="'关闭'"
+    :hide-cancel="false"
+    :ok-text="'导出'"
+    title="破损照片"
+    @cancel="showDetail = false"
+    @ok="exportPicture"
+  >
+    <a-descriptions :size="'large'">
+      <a-descriptions-item :label="'运单号'">
+        {{ fwbData.mawbNo ? fwbData.mawbNo : '' }}
+      </a-descriptions-item>
+    </a-descriptions>
+    <a-descriptions :size="'large'" :title="'预览'" layout="inline-horizontal">
+      <a-descriptions-item>
+        <a-image
+          v-for="(item, index) in imgList"
+          :key="index"
+          :src="item"
+          height="50px"
+          style="padding: 3px"
+          width="auto"
+        ></a-image>
+      </a-descriptions-item>
+    </a-descriptions>
+    <!--    <div
+      v-for="(item, index) in imgList"
+      :key="index"
+      style="display: inline-block"
+    >
+      <a-image
+        :src="item"
+        height="50px"
+        style="padding: 3px"
+        width="auto"
+      ></a-image>
+    </div>-->
+    <a-descriptions :size="'large'" :title="'大图'" layout="inline-horizontal">
+      <a-descriptions-item>
+        <a-image :src="imgList[0]" height="auto" width="100%"></a-image>
+      </a-descriptions-item>
+    </a-descriptions>
+    <!--    <a-row>
+      <a-col :span="24">
+        <a-image :src="imgList[0]" height="auto" width="100%"></a-image>
+      </a-col>
+    </a-row>-->
+  </a-modal>
 </template>
+
 <script lang="ts" setup>
-  const timeType = ref('1');
-  const searchType = ref<string>('1');
-  const timeTypeOptions = ref<SelectProps['options']>([
-    {
-      value: '1',
-      label: '理货时间',
-    },
-    {
-      value: '2',
-      label: '放行时间',
-    },
-    {
-      value: '3',
-      label: '抵港时间',
-    },
-  ]);
-  const searchTypeOption = ref<RadioGroupProps['options']>([
-    {
-      value: '1',
-      label: '按航班',
-    },
-    {
-      value: '2',
-      label: '按运单',
-    },
-    {
-      value: '3',
-      label: '按时间',
-    },
-  ]);
+import { SelectProps } from '@arco-design/web-vue';
+import { ref, watch, reactive } from 'vue';
+import { dayjs } from '@arco-design/web-vue/es/_utils/date';
+import { values } from 'lodash-es';
+import { useUserStore } from '@/store';
+import ApiObj from './api/CurrentPageApi';
+// import data from './data.json';
 
-  const pickOrderOptions = [
-    { label: '已取单', value: '1' },
-    { label: '未取单', value: '2' },
-  ];
+// 定义 flight 下的各个字段类型
+interface FlightState {
+  flightNo: string; // 航班号
+  flightDate: string[]; // 航班日期，字符串数组
+  billNo: string; // 运单号
+  pickOrder: string[]; // 取单状态，字符串数组
+  takeGoods: string[]; // 提货状态，字符串数组
+  damaged: string[]; // 破损状态，字符串数组
+  release: string[]; // 海关放行，字符串数组
+  partType: string[]; // 寄件类型，字符串数组
+  orderType: string; // 运单类型
+  goodsType: string; // 商品类型
+  tallyTime: string[]; // 理货时间，字符串数组
+  releaseTime: string[]; // 放行时间，字符串数组
+  arrivalTime: string[]; // 抵港时间，字符串数组
+}
+interface SummaryData {
+  salary: number;
+  data1: number;
+  data2: number;
+}
+interface Record {
+  key: string;
+  name: string;
+  salary: number;
+  data1: number;
+  data2: number;
+}
+// 定义记录项的接口
+interface RecordItem {
+  id: number;
+  mawbNo: string;
+  fltNo: string;
+  fltDate: string;
+  pcsDec: number;
+  wtDec: number;
+  orgnNo: string;
+  destNo: string;
+  goodsType: string;
+  agtNo: string;
+  dmgCount: number;
+}
 
-  const takeGoodsOptions = [
-    { label: '已提货', value: '1' },
-    { label: '未提货', value: '2' },
-  ];
+// 定义 API 返回的整体数据结构
+interface ApiResponse {
+  code: number;
+  message: string;
+  data: {
+    current: number;
+    total: number;
+    size: number;
+    records: RecordItem[];
+  };
+}
 
-  const damagedOptions = [
-    { label: '有破损', value: '1' },
-    { label: '未破损', value: '2' },
-  ];
+// 定义整个 formState 的类型
+interface FormStateItem {
+  flight: FlightState;
+  page: number;
+  size: number;
+}
+const imgList = ref<string[]>([
+  'https://p1-arco.byteimg.com/tos-cn-i-uwbnlip3yd/cd7a1aaea8e1c5e3d26fe2591e561798.png~tplv-uwbnlip3yd-webp.webp',
+  'https://p1-arco.byteimg.com/tos-cn-i-uwbnlip3yd/6480dbc69be1b5de95010289787d64f1.png~tplv-uwbnlip3yd-webp.webp',
+  'https://p1-arco.byteimg.com/tos-cn-i-uwbnlip3yd/0265a04fddbd77a19602a15d9d55d797.png~tplv-uwbnlip3yd-webp.webp',
+]);
+const showPictureDetail = ref<boolean>(false);
+const timeType = ref<string>('1');
+const showDetail = ref<boolean>(false);
+const total = ref<number>(0);
+const timeDate = ref<string[]>([]);
+const searchType = ref<string>('1');
+const timeTypeOptions = ref<SelectProps['options']>([
+  {
+    value: '1',
+    label: '理货时间',
+  },
+  {
+    value: '2',
+    label: '放行时间',
+  },
+  {
+    value: '3',
+    label: '抵港时间',
+  },
+]);
+const searchTypeOption = ref<any['options']>([
+  {
+    value: '1',
+    label: '按航班',
+  },
+  {
+    value: '2',
+    label: '按运单',
+  },
+  {
+    value: '3',
+    label: '按时间',
+  },
+]);
 
-  const releaseOptions = [
-    { label: '海关放行', value: '1' },
-    { label: '未放行', value: '2' },
-  ];
+const pickOrderOptions = [
+  { label: '已取单', value: 'Y' },
+  { label: '未取单', value: 'N' },
+];
 
-  const partTypeOptions = [
-    { label: '普件', value: '1' },
-    { label: '快件', value: '2' },
-  ];
+const takeGoodsOptions = [
+  { label: '已提货', value: 'Y' },
+  { label: '未提货', value: 'N' },
+];
 
-  const orderTypeOption = [
-    { label: '含分运单', value: '1' },
-    { label: '只含运单(不含主单)', value: '2' },
-  ];
+const damagedOptions = [
+  { label: '有破损', value: 'Y' },
+  { label: '未破损', value: 'N' },
+];
 
-  const goodsTypeOption = [
-    { label: '鲜活易腐', value: '1' },
-    { label: '生鲜', value: '2' },
-    { label: '危险品', value: '3' },
-    { label: '锂电池', value: '4' },
-    { label: '冷藏冷冻', value: '5' },
-    { label: '高价值', value: '6' },
-    { label: '药品', value: '7' },
-    { label: '提前报关', value: '8' },
-  ];
+const releaseOptions = [
+  { label: '海关放行', value: 'Y' },
+  { label: '未放行', value: 'N' },
+];
 
-  const formState = reactive({
-    flight: {
-      flightNo: '',
-      flightDate: '',
-      billNo: '',
-      pickOrder: [],
-      takeGoods: [],
-      damaged: [],
-      release: [],
-      partType: [],
-      orderType: '',
-      goodsType: ''
-    },
-  });
+const partTypeOptions = [
+  { label: '普件', value: '1' },
+  { label: '快件', value: '2' },
+  { label: '邮件', value: '3' },
+];
 
-  const columns = [
-    {
-      title: '序号',
-      dataIndex: 'order',
-    },
-    {
-      title: 'FWB信息',
-      dataIndex: 'fwb',
-    },
-    {
-      title: '运单信息',
-      dataIndex: 'orderinfo',
-    },
-    {
-      title: '航班号',
-      dataIndex: 'flightNo',
-    },
-    {
-      title: '运单件数',
-      dataIndex: 'orderCount',
-    },
-  ];
+const orderTypeOption = [
+  { label: '含分运单', value: '1' },
+  { label: '主分运单', value: '2' },
+  { label: '分运单', value: '3' },
+];
 
-  const dataSource = [
-    {
-      order: '1',
-      fwb: '正常',
-      orderinfo: '300,000.00',
-      flightNo: 'CA123',
-      orderCount: '1000',
-    },
-    {
-      order: '2',
-      fwb: '缺失',
-      orderinfo: '300,000.00',
-      flightNo: 'CA123',
-      orderCount: '1000',
-    },
-    {
-      order: '3',
-      fwb: '正常',
-      orderinfo: '300,000.00',
-      flightNo: 'CA123',
-      orderCount: '1000',
-    }
-  ];
-
-  const timeTypeChange = function () {
-    console.log(timeType.value)
+const goodsTypeOption = [
+  { label: '鲜活易腐', value: '1' },
+  { label: '生鲜', value: '2' },
+  { label: '危险品', value: '3' },
+  { label: '锂电池', value: '4' },
+  { label: '冷藏冷冻', value: '5' },
+  { label: '高价值', value: '6' },
+  { label: '药品', value: '7' },
+  { label: '提前报关', value: '8' },
+];
+type flyParamItem = {
+  fltNoPrefix: string;
+  fltNoSuffix: string;
+  [key: string]: string; // 索引签名：允许任何字符串作为键，值为 string
+};
+const flyParam = reactive<flyParamItem>({
+  fltNoPrefix: '',
+  fltNoSuffix: '',
+});
+const userStore = useUserStore();
+const formState: FormStateItem = reactive({
+  flight: {
+    flightNo: '', // 航班号
+    flightDate: [], // 航班日期
+    billNo: '', // 运单号
+    pickOrder: [], // 取单状态
+    takeGoods: [], // 提货状态
+    damaged: [], // 破损状态
+    release: [], // 海关放行
+    partType: [], // 寄件类型
+    orderType: '', // 运单类型
+    goodsType: '', // 商品类型
+    tallyTime: [], // 理货时间
+    releaseTime: [], // 放行时间
+    arrivalTime: [], // 抵港时间
+  },
+  page: 1,
+  size: 10,
+  agtNo: userStore.userInfo?.tenant?.threeCode,
+});
+const dataSource = ref<any[]>([]);
+const loading = ref<boolean>(false);
+interface shipperInfoItem {
+  consignor: string;
+  code: string;
+  countryRegion: string;
+  shippingAddress: string;
+  communicationNumber: string;
+}
+interface recipientInfoItem {
+  consignee: string;
+  code: string;
+  countryRegion: string;
+  communicationNumber: string;
+  receivingAddress: string;
+}
+interface fwbItem {
+  mawbNo?: string;
+  shpName: string;
+  shpCont: string;
+  shpTelNo: string;
+  shpAddr: string;
+  cneName: string;
+  cneCont: string;
+  cneTelNo: string;
+  cneAddr: string;
+}
+const fwbData = ref<fwbItem>({
+  mawbNo: '',
+  shpName: '',
+  shpCont: '',
+  shpTelNo: '',
+  shpAddr: '',
+  cneName: '',
+  cneCont: '',
+  cneTelNo: '',
+  cneAddr: '',
+});
+const contactStr = (str1: string, str2: string): string => {
+  if (str1 && str2) {
+    return `${str1}/${str2}`;
+  }
+  if (str1 && !str2) {
+    return str1;
+  }
+  if (str2 && !str1) {
+    return str2;
   }
+  return '';
+};
 
-  const searchTypeChange = function () {
-    console.log(searchType.value)
+/**
+ *  时间类型
+ */
+const timeTypeChange = () => {};
+/**
+ * 破损列按钮
+ */
+const dmgClick = () => {
+  showPictureDetail.value = true;
+};
+/**
+ * fwb信息列按钮
+ * @param record
+ */
+const fwbClick = async (record: any) => {
+  showDetail.value = true;
+  // 清空表单
+  fwbData.value.mawbNo = '';
+  fwbData.value.shpName = '';
+  fwbData.value.shpCont = '';
+  fwbData.value.shpTelNo = '';
+  fwbData.value.shpAddr = '';
+  fwbData.value.cneName = '';
+  fwbData.value.cneCont = '';
+  fwbData.value.cneTelNo = '';
+  fwbData.value.cneAddr = '';
+  // 根据运单号获取数据
+  const newVar = await ApiObj.get(record.id);
+  if (newVar && newVar.data) {
+    fwbData.value = newVar.data;
   }
+  fwbData.value.mawbNo = record.mawbNo;
+};
+/**
+ *  切换查询类型
+ * @param value
+ */
+const searchTypeChange = (value: string) => {
+  clearForm();
+  setDefaultTime();
+};
+/**
+ * 点击查询按钮
+ */
+const search = async () => {
+  loading.value = true;
+  try {
+    const res = await ApiObj.page(formState);
+    // const resCount = await ApiObj.getMawbCount(formState);
+    // console.log(resCount)
+    dataSource.value = res.data.records;
+    total.value = res.data.total;
+  } catch (e) {
+    console.log('异常');
+  } finally {
+    loading.value = false;
+  }
+};
+/**
+ * 清空查询条件
+ */
+const clearForm = () => {
+  // 清空飞行航班控件
+  flyParam.fltNoPrefix = '';
+  flyParam.fltNoSuffix = '';
+
+  // 清除会被类型隐藏的表单 内容
+  formState.flight.flightNo = '';
+  formState.flight.flightDate = [];
+  formState.flight.billNo = '';
+  formState.flight.tallyTime = [];
+  formState.flight.releaseTime = [];
+  formState.flight.arrivalTime = [];
+};
+const downLoad = () => {};
 
-  const search = function () {
+/**
+ * 转换大写
+ * @param str
+ */
+const commonUpperCase = (str: string): void => {
+  flyParam[str] = flyParam[str].toLocaleUpperCase();
+};
 
+const setDefaultTime = () => {
+  if (searchType.value === '1') {
+    // 按航班
+    // 设置航班日期默认值
+    formState.flight.flightDate = [
+      dayjs().format('YYYY-MM-DD'),
+      dayjs().format('YYYY-MM-DD'),
+    ];
+  }
+  if (searchType.value === '2') {
+    // 设置timeDate日期默认值
+    timeDate.value = [
+      dayjs().format('YYYY-MM-DD'),
+      dayjs().format('YYYY-MM-DD'),
+    ];
   }
+};
 
-  const downLoad = function () {
+/**
+ * 页面初始化
+ */
+onMounted(() => {
+  setDefaultTime();
+  search();
+});
 
+// 使用 watch 来监听 fltNoPrefix 和 fltNoSuffix 的变化，并更新 flightNo
+watch(
+  () =>
+    (flyParam.fltNoPrefix !== undefined ? flyParam.fltNoPrefix : '') +
+    (flyParam.fltNoSuffix !== undefined ? flyParam.fltNoSuffix : ''),
+  (newValue) => {
+    if (newValue === undefined || newValue === null) {
+      formState.flight.flightNo = '';
+    } else {
+      formState.flight.flightNo = newValue;
+    }
+  }
+);
+// 监听时间类型
+watch(
+  () => timeType.value,
+  (newVar) => {
+    changeTimeValue();
   }
+);
+// 监听时间
+watch(
+  () => timeDate.value,
+  (newVar) => {
+    changeTimeValue();
+  }
+);
+/**
+ * 给对应时间赋值
+ */
+const changeTimeValue = () => {
+  if (searchType.value === '3') {
+    // 先清空
+    formState.flight.tallyTime = [];
+    formState.flight.releaseTime = [];
+    formState.flight.arrivalTime = [];
+    // 再赋值
+    if (timeType.value === '1') {
+      formState.flight.tallyTime = timeDate.value;
+    }
+    if (timeType.value === '2') {
+      formState.flight.releaseTime = timeDate.value;
+    }
+    if (timeType.value === '3') {
+      formState.flight.arrivalTime = timeDate.value;
+    }
+  }
+};
+const exportPicture = () => {
+  console.log('图片导出');
+};
+const pageChange = (value: number) => {
+  console.log(`切换页码${value}`);
+  formState.page = value;
+  search();
+};
+const pageSizeChange = (value: number) => {
+  console.log(`改变当前表格记录条数${value}`);
+  formState.size = value;
+  search();
+};
+const summary = ({ data }: { data: any[] }) => {
+  const label = '合计';
+  const value1 = `${10000}/${20}`;
+  const value2 = `${10000}/${20}`;
+  return [
+    // 返回的就是表尾合计列
+    {
+      fltNo: label,
+      pcsDec: value1,
+      wtDec: value2,
+    },
+  ];
+};
 </script>
+
 <style lang="less" scoped>
-  .page-content {
+.page-content {
+  width: 100%;
+  height: 100%;
+  padding: 20px;
+
+  .search-header {
     width: 100%;
-    height: 100%;
-    padding: 20px;
+    height: 65px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
 
-    .search-header {
-      width: 100%;
+    .search-header-left {
       display: flex;
       flex-direction: row;
-      justify-content: space-between;
+      justify-content: flex-start;
+      align-items: center;
 
-      .search-header-left {
-        display: flex;
-        flex-direction: row;
-        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;
+      .search-header-left-item {
+        .arco-form-item {
+          margin-bottom: 0px;
         }
       }
     }
 
-    .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;
+      justify-content: flex-start;
+      align-items: center;
 
-      .search-select-title {
-        padding: 0 10px;
-        position: absolute;
-        left: 400px;
-        top: -12px;
-        background: #fff;
-        color: rgb(79, 89, 105);
+      .search-header-right-item {
+        margin-right: 10px;
       }
+    }
+  }
 
-      .search-select-item {
-        border: 1px solid #e5e7eb;
-        width: 125px;
-        padding: 10px;
-        box-sizing: border-box;
-      }
+  .search-select {
+    width: 100%;
+    border: 1px solid #e5e7eb;
+    padding: 20px 0;
+    position: relative;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
 
-      .search-select-item2 {
-        border: 1px solid #e5e7eb;
-        padding: 10px;
-        box-sizing: border-box;
-      }
+    .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: 125px;
+      padding: 10px;
+      box-sizing: border-box;
+    }
+
+    .search-select-item2 {
+      border: 1px solid #e5e7eb;
+      padding: 10px;
+      box-sizing: border-box;
+    }
   }
-  [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);
+
+  .search-body {
+    .pagination {
+      float: right;
+      padding: 20px 0px 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/departure/waybillManage/additionalDialog.vue

@@ -26,22 +26,29 @@
           >
             <a-col :span="6">
               <a-form-item
-                field="asIcs2"
+                field="mawbDetail.asIcs2"
                 label-col-flex="120px"
                 label="是否为ICS2运单"
-                :rules="[{ required: true, message: '必选项不可为空!' }]"
+                :rules="
+                  modelType !== MODEL_TYPE.ADD
+                    ? [{ required: true, message: '必选项不可为空!' }]
+                    : ''
+                "
               >
                 <a-radio-group
-                  v-model="currentFrom.asIcs2"
+                  v-if="modelType !== MODEL_TYPE.ADD"
+                  v-model="currentFrom.mawbDetail.asIcs2"
                   :options="plainOptions"
                 />
+                <p v-else>{{ getIcs2(currentFrom.awbContact['asIcs2']) }}</p>
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col v-if="modelType !== MODEL_TYPE.ADD" :span="6">
               <a-form-item
-                field="asEawOrEap"
+                field="mawbDetail.asEawOrEap"
                 label-col-flex="120px"
-                label="是否EAW/EAP"
+                label="是否电子运单"
+                :rules="[{ required: true, message: '必选项不可为空!' }]"
               >
                 <a-radio-group
                   v-model="currentFrom.mawbDetail.asEawOrEap"
@@ -81,6 +88,19 @@
             </a-col>
           </template>
           <template v-else>
+            <a-col :span="6">
+              <a-form-item
+                field="mawbDetail.asIcs2"
+                label-col-flex="120px"
+                label="是否为ICS2运单"
+              >
+                <!--                <a-radio-group
+                    v-model="currentFrom.mawbDetail.asIcs2"
+                    :options="plainOptions"
+                />-->
+                <p>{{ getIcs2(currentFrom.awbContact['asIcs2']) }}</p>
+              </a-form-item>
+            </a-col>
             <a-col
               v-for="item in hawbMainWaybillInfo"
               :key="item.field"
@@ -312,7 +332,15 @@
 </template>
 
 <script lang="ts" setup>
-import { Ref, toRefs } from 'vue';
+import {
+  computed,
+  nextTick,
+  onMounted,
+  reactive,
+  Ref,
+  toRefs,
+  watch,
+} from 'vue';
 import { WAYBILL_TYPE } from '@/constant/waybill';
 import { MODEL_TYPE } from '@/constant/base';
 import { Modal, Message } from '@arco-design/web-vue';
@@ -358,10 +386,10 @@ const dialogVisible = ref(false);
 const currentFrom = ref<any>({
   awbContact: {},
   mawbDetail: {
-    asEawOrEap: 1,
+    asEawOrEap: null,
+    asIcs2: null,
   },
   mawbPrice: {},
-  asIcs2: null,
 });
 const chgsList = ref([]);
 
@@ -386,6 +414,9 @@ const title = computed((): string => {
   if (modelType.value === MODEL_TYPE.MAIN_ADD) {
     return '新增运单(主运单)';
   }
+  if (modelType.value === MODEL_TYPE.ADD) {
+    return '新增运单(分运单)';
+  }
   if (orderType.value === WAYBILL_TYPE.MAIN && !isDetail.value) {
     return '运单补录（主运单）';
   }
@@ -397,26 +428,25 @@ const title = computed((): string => {
  */
 const costInfo = computed(() => {
   const tmp = getCostInfo(chgsList);
-  if (modelType?.value === MODEL_TYPE.MAIN_ADD || isMain.value) {
-    if (currentFrom.value.asIcs2 === 0) {
-      const hsCodeItem = tmp.find(
-        (item: { field: string }) => item.field === 'hsCode'
-      );
-      if (hsCodeItem) {
-        // 修改 hsCode 对象的 rules
-        hsCodeItem.rules = {
-          required: true,
-          message: '必填项不能为空',
-        };
-      }
-    } else {
-      const hsCodeItem = tmp.find((item) => item.field === 'hsCode');
-      if (hsCodeItem) {
-        // 修改 hsCode 对象的 rules
-        hsCodeItem.rules = { required: false, message: '' };
-      }
+  if (currentFrom.value.mawbDetail.asIcs2 === 'Y') {
+    const hsCodeItem = tmp.find(
+      (item: { field: string }) => item.field === 'hsCode'
+    );
+    if (hsCodeItem) {
+      // 修改 hsCode 对象的 rules
+      hsCodeItem.rules = {
+        required: true,
+        message: '必填项不能为空',
+      };
+    }
+  } else {
+    const hsCodeItem = tmp.find((item) => item.field === 'hsCode');
+    if (hsCodeItem) {
+      // 修改 hsCode 对象的 rules
+      hsCodeItem.rules = { required: false, message: '' };
     }
   }
+  // }
   return tmp;
 });
 
@@ -450,7 +480,6 @@ const handleSubmit = async (e: any) => {
   if (modelType?.value === MODEL_TYPE.MAIN_ADD) {
     params.mawbPrice = currentFrom.value.mawbPrice;
     params.mawbDetail = currentFrom.value.mawbDetail;
-    params.asIcs2 = currentFrom.value.asIcs2;
     const res = await ApiObj.addMainWaybill(params);
     if (res.code === 200) {
       Message.success('新增主运单成功');
@@ -461,7 +490,7 @@ const handleSubmit = async (e: any) => {
         mawbDetail: {},
         mawbPrice: {},
         asIcs2: null,
-        asEawOrEap: 1,
+        asEawOrEap: null,
       };
     }
     return;
@@ -469,8 +498,6 @@ const handleSubmit = async (e: any) => {
   if (isMain.value) {
     params.mawbPrice = currentFrom.value.mawbPrice;
     params.mawbDetail = currentFrom.value.mawbDetail;
-    params.asEawOrEap = currentFrom.value.asEawOrEap;
-    params.asIcs2 = currentFrom.value.asIcs2;
     params.mawbDetail.fltNo =
       params.mawbDetail.fltNoPrefix + params.mawbDetail.fltNoSuffix;
   } else {
@@ -504,7 +531,6 @@ const handleAdd = async () => {
 // 使用 watch 来监听 fltNoPrefix 和 fltNoSuffix 的变化，并更新 fltNo
 watch(
   () =>
-    // eslint-disable-next-line no-nested-ternary
     (currentFrom.value.mawbDetail.fltNoPrefix !== undefined
       ? currentFrom.value.mawbDetail.fltNoPrefix
       : '') +
@@ -528,6 +554,12 @@ const commonUpperCase = (prefix: any, suffix: any) => {
   currentFrom.value[prefix][suffix] =
     currentFrom.value[prefix][suffix].toLocaleUpperCase();
 };
+const getIcs2 = (isIcs2: string | null): string => {
+  if (isIcs2) {
+    return isIcs2 === 'Y' ? '是' : '否';
+  }
+  return '-';
+};
 /**
  * 打开新增主运单对话框
  */
@@ -536,10 +568,11 @@ const openNewMainDialog = (mawbNo: string): void => {
     // 清空表单
     currentFrom.value = {
       awbContact: {},
-      mawbDetail: {},
+      mawbDetail: {
+        asIcs2: null,
+        asEawOrEap: null,
+      },
       mawbPrice: {},
-      asIcs2: null,
-      asEawOrEap: 1,
     };
     // 设置默认值
     currentFrom.value.mawbPrice.ccWtChg = 0;
@@ -598,7 +631,6 @@ const openDialog = () => {
       currentFrom.value.hawbPrice = { ...fromData.value.hawbPrice };
     }
     dialogVisible.value = true;
-    console.log(currentFrom.value);
   });
 };
 
@@ -624,52 +656,67 @@ onMounted(() => {
  * 单选按钮组
  */
 const plainOptions = reactive([
-  { label: '是', value: 0 },
-  { label: '否', value: 1 },
+  { label: '是', value: 'Y' },
+  { label: '否', value: 'N' },
 ]);
 
-// 使用 watch 监听 currentForm.asIcs2 的变化
+// 使用 watch 监听 currentForm.mawbDetail.asIcs2 的变化
 watch(
-  () => currentFrom.value.asIcs2,
-  (newValue, oldValue) => {
-    if (modelType?.value === MODEL_TYPE.MAIN_ADD || isMain.value) {
-      if (newValue === 0) {
-        nextTick(() => {
-          // 使用代码动态添加 rules , find才能使页面进行渲染,遍历插入的无法生效
-          const cnePostNoItem = gooderInfo.find(
-            (item) => item.field === 'cnePostNo'
-          );
-          if (cnePostNoItem) {
-            cnePostNoItem.rules = {
-              required: true,
-              message: '必填项不可为空!',
-            };
+  () =>
+    currentFrom.value.mawbDetail.asIcs2 || currentFrom.value.awbContact.asIcs2,
+  (newValue) => {
+    // if (modelType?.value === MODEL_TYPE.MAIN_ADD || isMain.value) {
+    if (newValue && newValue === 'Y') {
+      nextTick(() => {
+        // 使用代码动态添加 rules , find才能使页面进行渲染,遍历插入的无法生效
+        const cnePostNoItem = gooderInfo.find(
+          (item) => item.field === 'cnePostNo'
+        );
+        if (cnePostNoItem) {
+          cnePostNoItem.rules = {
+            required: true,
+            message: '必填项不可为空!',
+          };
+        }
+        const shpPostNoItem = shipperInfo.find(
+          (item) => item.field === 'shpPostNo'
+        );
+        if (shpPostNoItem) {
+          shpPostNoItem.rules = {
+            required: true,
+            message: '必填项不可为空!',
+          };
+        }
+        const haWaybillInfoItem = haWaybillInfo.find(
+          (item) => item.field === 'hsCode'
+        );
+        if (haWaybillInfoItem) {
+          haWaybillInfoItem.rules = {
+            required: true,
+            message: '必填项不可为空!',
+          };
+        }
+      });
+    } else {
+      nextTick(() => {
+        gooderInfo.forEach((item: any) => {
+          if (item.field === 'cnePostNo') {
+            item.rules = [];
           }
-          const shpPostNoItem = shipperInfo.find(
-            (item) => item.field === 'shpPostNo'
-          );
-          if (shpPostNoItem) {
-            shpPostNoItem.rules = {
-              required: true,
-              message: '必填项不可为空!',
-            };
+        });
+        shipperInfo.forEach((item: any) => {
+          if (item.field === 'shpPostNo') {
+            item.rules = [];
           }
         });
-      } else {
-        nextTick(() => {
-          gooderInfo.forEach((item: any) => {
-            if (item.field === 'cnePostNo') {
-              item.rules = [];
-            }
-          });
-          shipperInfo.forEach((item: any) => {
-            if (item.field === 'shpPostNo') {
-              item.rules = [];
-            }
-          });
+        haWaybillInfo.forEach((item: any) => {
+          if (item.field === 'hsCode') {
+            item.rules = [];
+          }
         });
-      }
+      });
     }
+    // }
   }
 );
 

src/views/departure/waybillManage/api/CurrentPageApi.ts

@@ -13,6 +13,10 @@ class CurrentPageApi extends BaseApi {
     return request.post(`${this.baseUrl}/list`, data);
   }
 
+  checkExist(data: any): Promise<ResponseData<any>> {
+    return request.post(`${this.baseUrl}/checkExist`, data);
+  }
+
   /**
    * 新增主运单
    * @param data

src/views/departure/waybillManage/data.json

@@ -0,0 +1,37 @@
+{
+  "code": 200,
+  "message": "操作成功",
+  "data": {
+    "current": 1,
+    "total": 1832,
+    "size": 10,
+    "records": [
+      {
+        "id": 283,
+        "mawbNo": "380-08840451",
+        "fltNo": "O3810",
+        "fltDate": "2023-03-25",
+        "pcsDec": 10,
+        "wtDec": 141.0,
+        "orgnNo": "BKI",
+        "destNo": "SZX",
+        "goodsType": "C",
+        "agtNo": "DYA",
+        "dmgCount": 0
+      },
+      {
+        "id": 400,
+        "mawbNo": "008-12345602",
+        "fltNo": "HZ8888",
+        "fltDate": "2023-04-14",
+        "pcsDec": 10,
+        "wtDec": 100.0,
+        "orgnNo": "SZX",
+        "destNo": "YLM",
+        "goodsType": "C",
+        "agtNo": "HZH",
+        "dmgCount": 0
+      }
+    ]
+  }
+}

src/views/departure/waybillManage/index.vue

@@ -1,24 +1,25 @@
 <template>
   <div class="table-search">
-    <a-button class="common-button" @click="showSearchOrder"> 新增 </a-button>
+    <a-button class="common-button" @click="showSearchOrder"> 新增</a-button>
   </div>
   <CrudTable
     ref="crudTableRef"
     :api-obj="ApiObj"
-    :search-config="searchConfig"
     :columns="columns"
+    :on-search="queryTable"
+    :search-config="searchConfig"
     :search-form="searchForm"
-    :show-details="false"
     :show-add="false"
-    :show-edit="false"
     :show-del="false"
+    :show-details="false"
+    :show-edit="false"
   >
     <template #operate-cell="{ record }">
       <a-button
         v-if="record?.status === WAYBILL_ORDER_STATUS_MAP.FINISH"
         v-auth="'platform:awb:info'"
-        type="text"
         shape="round"
+        type="text"
         @click="showOrEditWaybill(MODEL_TYPE.DETAIL, record, 'new')"
       >
         详情
@@ -29,8 +30,8 @@
           record?.status === WAYBILL_ORDER_STATUS_MAP.UNFINISHED
         "
         v-auth="'platform:awb:update'"
-        type="text"
         shape="round"
+        type="text"
         @click="showOrEditWaybill(MODEL_TYPE.EDIT, record, 'new')"
         >补录
       </a-button>
@@ -40,8 +41,8 @@
           record?.status === WAYBILL_ORDER_STATUS_MAP.UNFINISHED
         "
         v-auth="'platform:awb:update'"
-        type="text"
         shape="round"
+        type="text"
         @click="showOrEditWaybill(MODEL_TYPE.ADD, record, 'new')"
         >新增分运单
       </a-button>
@@ -62,16 +63,16 @@
           !record?.hawbNo && record?.status === WAYBILL_ORDER_STATUS_MAP.FINISH
         "
         v-auth="'platform:awb:print'"
-        type="text"
         shape="round"
+        type="text"
         @click="printReport(record)"
       >
         打印安检申报单
       </a-button>
       <a-button
         v-auth="'platform:awb:print'"
-        type="text"
         shape="round"
+        type="text"
         @click="printConfirm(record)"
       >
         打印收货确认单
@@ -81,32 +82,32 @@
   <Additional
     v-model="visibleDialog"
     :from-data="fromData"
-    :order-type="orderType"
     :model-type="modelType"
+    :order-type="orderType"
   ></Additional>
   <additionalDialog
     ref="additionalDialogRef"
     :from-data="fromData"
-    :order-type="orderType"
     :model-type="modelType"
+    :order-type="orderType"
   ></additionalDialog>
   <!-- 点击新增按钮弹出的对话框 -->
   <a-modal
     v-model:visible="visible"
     :closable="false"
     :mask-closable="false"
-    title=" "
+    :ok-loading="buttonLoading"
     hide-cancel
-    width="auto"
     ok-text="关闭"
-    :ok-loading="buttonLoading"
+    title=" "
+    width="auto"
     @ok="handleOk"
   >
     <a-form :model="queryForm" layout="inline" @submit="submitQuery">
       <a-form-item
+        :rules="[{ required: true, message: '必填项不可为空!' }]"
         field="name"
         label="请输入运单号"
-        :rules="[{ required: true, message: '必填项不可为空!' }]"
       >
         <a-input v-model="queryForm.name" allow-clear width="200px" />
       </a-form-item>
@@ -118,11 +119,11 @@
   <!-- 查询运单后弹出的对话框 -->
   <a-modal
     v-model:visible="visibleTip"
-    width="46%"
-    ok-text="关闭"
-    :closable="false"
-    :mask-closable="false"
     :cancel-text="tipCancelText"
+    :hide-cancel="tipCancelText === '补录'"
+    :mask-closable="false"
+    ok-text="关闭"
+    width="46%"
     @cancel="updateOrSave"
     @ok="handleTipClose"
   >
@@ -133,7 +134,7 @@
       >
     </div>
     <a-typography-title :heading="4">
-      <div v-text="tipMsg"> </div>
+      <div>{{ tipMsg }}</div>
     </a-typography-title>
   </a-modal>
 </template>
@@ -142,11 +143,12 @@
 import dayjs from 'dayjs';
 import CrudTable from '@/components/crud-table/index';
 import { Message } from '@arco-design/web-vue';
-import { WAYBILL_TYPE, WAYBILL_ORDER_STATUS_MAP } from '@/constant/waybill';
+import { WAYBILL_ORDER_STATUS_MAP, WAYBILL_TYPE } from '@/constant/waybill';
 import { MODEL_TYPE } from '@/constant/base';
-import { useWaybillStore, useUserStore } from '@/store';
+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 ApiObj from './api/CurrentPageApi';
 import Additional from './additional.vue';
 import { columns } from './functions/table';
@@ -159,12 +161,13 @@ const userStore = useUserStore();
 const crudTableRef = ref();
 
 onMounted(async () => {
-  const res = await DictApi.wbcStatus(); // 原来代码
+  const res = await DictApi.wbcStatus();
   waybillStatusMap.value = res.data;
 });
 const timeRange = [
   // dayjs().add(-50, 'day').format('YYYY-MM-DD'),
   // dayjs().add(14, 'day').format('YYYY-MM-DD'),
+
   dayjs().format('YYYY-MM-DD'),
   dayjs().add(14, 'day').format('YYYY-MM-DD'),
 ];
@@ -201,7 +204,6 @@ const showOrEditWaybill = async (
   }
   const res = await ApiObj.get(data);
   fromData.value = res.data ?? {};
-  // fromData.value = dataList.data ?? {}; // fixme 这里给测试数据
   // Object.keys(fromData.value).forEach((key: string) => {
   //   waybillStore.setValueByKey(key, fromData.value[key]);
   // });
@@ -223,7 +225,6 @@ const showOrEditWaybill = async (
 const printReport = async (data: Record<string, any>) => {
   const { agtNo, mawbId } = data;
   try {
-    console.log('---导出');
     await ApiObj.printReport({
       agtNo,
       mawbId,
@@ -247,6 +248,7 @@ const printConfirm = async (data: Record<string, any>) => {
 interface queryFormInterface {
   name: string;
 }
+
 const visible = ref<boolean>(false);
 const tipMsg = ref<string>('');
 const tipCancelText = ref<string>('');
@@ -262,6 +264,7 @@ const queryForm = reactive<queryFormInterface>({
 function showSearchOrder(): void {
   visible.value = true;
 }
+
 /**
  * 点击新增按钮对话框的关闭按钮
  */
@@ -275,20 +278,26 @@ function handleOk(): void {
  * 点击新增按钮对话框的查询按钮
  */
 const submitQuery = async (e: any) => {
-  const { errors, values } = e;
+  const { errors } = e;
   if (errors) return; // 表单校验
-
   try {
     // 根据运单号查询运单是否存在
     // const res = await ApiObj.get({ mawbNo: queryForm.name });
-    // console.log(res);
 
-    // const flag = res.data !== null && res.data !== undefined;
-    const flag = queryForm.name === '1';
+    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,
+      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;
     visibleTip.value = true;
     if (flag) {
       // 假设运单存在
-      tipMsg.value = '当前运单已存在,点击补录按钮补录运单';
+      tipMsg.value = '当前运单已存在,请在列表进行查询补录';
       // 弹出的子对话框按钮变为 补录 关闭
       tipCancelText.value = '补录';
     } else {
@@ -298,11 +307,12 @@ const submitQuery = async (e: any) => {
       tipCancelText.value = '新增';
     }
   } catch (error) {
-    Message.error('数据导出异常');
+    Message.error('数据查询异常');
   }
 };
 const handleTipClose = () => {
   visibleTip.value = false;
+  visible.value = false;
 };
 type CueMessage = {
   value: number;
@@ -343,4 +353,8 @@ const updateOrSave = () => {
     showOrEditWaybill(MODEL_TYPE.EDIT, queryForm, 'new');
   }
 };
+
+const queryTable = () => {
+  console.log('发起查询');
+};
 </script>