diff --git a/src/views/operation/seaexport/api/BookingLedger.js b/src/views/operation/seaexport/api/BookingLedger.js
index 70b327bb..96db7211 100644
--- a/src/views/operation/seaexport/api/BookingLedger.js
+++ b/src/views/operation/seaexport/api/BookingLedger.js
@@ -34,6 +34,14 @@ export function GetUserQuerySet(parameter) {
     params: parameter,
   })
 }
+// 获取船公司
+export function GetCarrierlist(parameter) {
+  return request({
+    url: '/mainApi/ClientCommon/GetCarrierClientList',
+    method: 'get',
+    params: parameter,
+  })
+}
 /**
  * 获取订舱明细
  * @params Id
@@ -68,17 +76,6 @@ export function DjyCustomerSuggest(parameter) {
     params: parameter,
   })
 }
-/**
- * 获取船公司
- * @params CnName
- */
-export function GetCarrierlist(parameter) {
-  return request({
-    url: '/commondb/carrierlist',
-    method: 'get',
-    params: parameter,
-  })
-}
 
 /**
  * 获取船名
diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue
index f70a55ed..73106d48 100644
--- a/src/views/operation/seaexport/detail/index.vue
+++ b/src/views/operation/seaexport/detail/index.vue
@@ -40,8 +40,8 @@
                   <input id="tab2" type="radio" name="tabs" checked="false" />
                   <label class="tabs-label" for="tab2">EDI补充信息</label>
                 </li>
-                <li v-if="appStore.getfeeShow" @click="changeParentTabs('3-3')">
-                  <input id="tab3" type="radio" name="tabs" checked="false" />
+                <li v-show="appStore.getfeeShow" @click="changeParentTabs('3-3')">
+                  <input type="radio" name="tabs" id="tab3" checked="false" />
                   <label class="tabs-label" for="tab3">费用信息</label>
                 </li>
               </div>
@@ -176,11 +176,11 @@
   })
 </script> -->
 <script lang="ts" setup>
-  import { ref, reactive, getCurrentInstance, h, watch, onMounted } from 'vue'
+  import { ref, reactive, getCurrentInstance, h, watch, onMounted, nextTick } from 'vue'
   import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
   import { useAppStore } from '/@/store/modules/app'
   import { useMessage } from '/@/hooks/web/useMessage'
-  import rules from './rulesTest'
+  import rules from './rules'
   import { useRoute, useRouter } from 'vue-router'
   import { Modal } from 'ant-design-vue'
   import { useGo } from '/@/hooks/web/usePage'
@@ -455,24 +455,27 @@
   const hasHbList = ref(false)
   const moreStr = ref('')
   // =========
-
   watch(
     () => mainOrderActiveKey,
-    (nVal, oVal) => {
-      if (nVal == '1-1') {
-        document.querySelector('#tab1').checked = true
-        document.querySelector('#tab2').checked = false
-        document.querySelector('#tab3').checked = false
+    async (nVal) => {
+      await nextTick()
+      let tab1: any = document.getElementById('tab1')
+      let tab2: any = document.getElementById('tab2')
+      let tab3: any = document.getElementById('tab3')
+      if (nVal.value == '1-1') {
+        tab1.checked = true
+        tab2.checked = false
+        tab3.checked = false
       }
-      if (nVal == '2-2') {
-        document.querySelector('#tab2').checked = true
-        document.querySelector('#tab1').checked = false
-        document.querySelector('#tab3').checked = false
+      if (nVal.value == '2-2') {
+        tab2.checked = true
+        tab1.checked = false
+        tab3.checked = false
       }
-      if (nVal == '3-3') {
-        document.querySelector('#tab3').checked = true
-        document.querySelector('#tab1').checked = false
-        document.querySelector('#tab2').checked = false
+      if (nVal.value == '3-3') {
+        tab3.checked = true
+        tab1.checked = false
+        tab2.checked = false
       }
     },
     { immediate: true, deep: true },
@@ -628,1178 +631,1200 @@
       inChildLoading.value = false
     }, 2000)
   })
-  // =========
-  function getRouterHis() {
-    inChildLoading.value = true
-    const newId = route.query.id ? route.query.id.toString() : ''
-    if (
-      (Object.keys(historyData.value).includes(`copy-${newId}`) ||
-        Object.keys(historyData.value).includes(`copy-${newId}-${route.query.copyId}`)) &&
-      route.query.isCopy === 'true'
-    ) {
-      if (!route.query.copyId) {
-        const $data = JSON.parse(JSON.stringify(historyData.value[`copy-${newId}`]))
-        bookingDetails.value = $data.bookingDetails
-        oldBookingDetails.value = JSON.parse(JSON.stringify(bookingDetails.value))
-        excuteRules.value = $data.excuteRules
-        excuteRulesType.value = $data.excuteRulesType
-        isAdd.value = $data.isAdd
-        tabActiveKey.value = $data.tabActiveKey
-        mainOrderActiveKey.value = $data.mainOrderActiveKey
-      } else {
-        const $data = JSON.parse(
-          JSON.stringify(historyData.value[`copy-${newId}-${route.query.copyId}`]),
-        )
-        bookingDetails.value = $data.bookingDetails
-        oldBookingDetails.value = JSON.parse(JSON.stringify(bookingDetails.value))
-        excuteRules.value = $data.excuteRules
-        excuteRulesType.value = $data.excuteRulesType
-        isAdd.value = $data.isAdd
-        tabActiveKey.value = $data.tabActiveKey
-        mainOrderActiveKey.value = $data.mainOrderActiveKey
+  // ============================================
+  //点击保存
+  function saveFun() {
+    bookingOrderUpdate()
+  }
+  //保存方法
+  async function bookingOrderUpdate() {
+    let basicFrom = true
+    let basicObject = true
+    await RefbasicInfo.value.RefbasicFrom.validateFields()
+      .then((e) => {
+        console.log(e)
+        basicFrom = true
+        basicObject = e
+      })
+      .catch((err) => {
+        console.log('error', err)
+        basicFrom = false
+      })
+    let mailingFrom = true
+    await RefmailingInfo.value.$refs.RefmailingFrom.validate()
+      .then((e) => {
+        mailingFrom = true
+      })
+      .catch((err) => {
+        console.log('error', err)
+        mailingFrom = false
+      })
+    let cargoFrom = true
+    await RefcargoInfo.value.$refs.RefcargoFrom.validate()
+      .then((e) => {
+        cargoFrom = true
+      })
+      .catch((err) => {
+        console.log('error', err)
+        cargoFrom = false
+      })
+    if (!basicFrom && mailingFrom && cargoFrom) {
+      if (Object.keys(basicObject).length === 1 && Object.keys(basicObject)[0] === 'zhanCangFlag') {
+        notification.error({ message: '保存失败，是否占舱未填写', duration: 3 })
+        return false
       }
-      id.value = route.query.id
-      isCopy.value = route.query.isCopy
-      inPageLoading.value = false
-      setTimeout(() => {
-        if (bookingDetails.value.hbList && bookingDetails.value.hbList.length > 0) {
-          Showtabs.value = true
-          if (Object.keys(that.$refs).includes('RefsedOrder')) {
-            RefsedOrder.value.init(bookingDetails.value.hbList)
-          }
-        } else {
-          Showtabs.value = false
-          if (Object.keys(that.$refs).includes('RefsedOrder')) {
-            RefsedOrder.value.init([])
-          }
-        }
-        if (Object.keys(that.$refs).includes('goodsTable')) {
-          RefgoodsTable.value.init()
+    }
+    if (!basicFrom || !mailingFrom || !cargoFrom) {
+      notification.error({ message: '保存失败，请检查必填项', duration: 3 })
+      return false
+    }
+
+    if (RefediMore.value) {
+      let ediFrom = true
+      RefediMore.value.$refs.ediFrom.validate((valid) => {
+        ediFrom = valid
+      })
+      if (!ediFrom) {
+        mainOrderActiveKey.value = '2-2'
+        notification.error({ message: '保存失败，请检查EDI必填项', duration: 3 })
+        return false
+      }
+    } else {
+      Object.keys(ediRules.value).map((item) => {
+        if (
+          checkFrom.value.includes(item) &&
+          !bookingDetails.value[item.split('.')[0]][item.split('.')[1]]
+        ) {
+          hasEdiRules.value = true
         }
-      }, 200)
-      setTimeout(() => {
-        const key = route.fullPath
-        const detailsChange = Object.keys(appStore.getneedSavePages).includes(key)
-          ? !!appStore.getneedSavePages[key].details
-          : false
-        checkSaveFun({ type: 'details', hasChange: detailsChange })
+      })
+      if (hasEdiRules.value) {
+        mainOrderActiveKey.value = '2-2'
+        notification.error({ message: '保存失败，请检查EDI必填项', duration: 3 })
+        return false
+      }
+    }
 
-        const hbListChange = !!appStore.getneedSavePages[key].hbList
-        checkSaveFun({ type: 'hbList', hasChange: hbListChange })
-        inChildLoading.value = false
-      }, 500)
-      isLockBooking.value = false
-      getFilter()
-      that.$forceUpdate()
-    } else if (
-      Object.keys(historyData.value).includes(`add-${route.query.addNum}`) &&
-      route.query.addNum
+    if (
+      hasTableRules.value &&
+      bookingDetails.value.shippingMethod !== '拼箱' &&
+      bookingDetails.value.carrierid !== 'GGPX'
     ) {
-      const $data = JSON.parse(JSON.stringify(historyData.value[`add-${route.query.addNum}`]))
-      bookingDetails.value = $data.bookingDetails
-      oldBookingDetails.value = JSON.parse(JSON.stringify(bookingDetails.value))
-      excuteRules.value = $data.excuteRules
-      excuteRulesType.value = $data.excuteRulesType
-      isAdd.value = $data.isAdd
-      tabActiveKey.value = $data.tabActiveKey
-      mainOrderActiveKey.value = $data.mainOrderActiveKey
-      isCopy.value = route.query.isCopy || false
-      inPageLoading.value = false
-      if (isCopy.value && !$data.isCopy) {
-        bookingDetails.value.mblno = ''
+      if (bookingDetails.value.ctnInputs.length === 0) {
+        notification.error({ message: '保存失败，箱信息未填写', duration: 3 })
+        return false
       }
-      setTimeout(() => {
-        if (bookingDetails.value.hbList && bookingDetails.value.hbList.length > 0) {
-          Showtabs.value = true
-          if (Object.keys(that.$refs).includes('RefsedOrder')) {
-            RefsedOrder.value.init(bookingDetails.value.hbList)
-          }
-        } else {
-          Showtabs.value = false
-          if (Object.keys(that.$refs).includes('RefsedOrder')) {
-            RefsedOrder.value.init([])
+      let tableErrTip = ''
+      bookingDetails.value.ctnInputs.map((item, index) => {
+        Object.keys(item).map((label) => {
+          if (tableRules.value[label] && tableRules.value[label].required && item[label] === '') {
+            tableErrTip = `${tableErrTip}  序号${index + 1}中${
+              tableRules.value[label].title
+            }未填写,`
           }
-        }
-        if (Object.keys(that.$refs).includes('goodsTable')) {
-          RefgoodsTable.value.init()
-        }
-      }, 200)
-      setTimeout(() => {
-        const key = route.fullPath
-
-        const detailsChange = Object.keys(appStore.getneedSavePages).includes(key)
-          ? !!appStore.getneedSavePages[key].details
-          : false
-        checkSaveFun({ type: 'details', hasChange: detailsChange })
-
-        const hbListChange = !!appStore.getneedSavePages[key].hbList
-        checkSaveFun({ type: 'hbList', hasChange: hbListChange })
-        inChildLoading.value = false
-      }, 500)
-      isLockBooking.value = false
-      getFilter()
-      that.$forceUpdate()
-    } else if (Object.keys(historyData.value).includes(newId)) {
-      id.value = route.query.id
-      const $data = JSON.parse(JSON.stringify(historyData.value[newId]))
-      isCopy.value = route.query.isCopy
-      excuteRules.value = $data.excuteRules
-      excuteRulesType.value = $data.excuteRulesType
-      isAdd.value = $data.isAdd
-      tabActiveKey.value = $data.tabActiveKey
-      mainOrderActiveKey.value = $data.mainOrderActiveKey
-      inPageLoading.value = false
-      if ($data.bookingDetails.goodsStatus && isCopy.value) {
-        $data.bookingDetails.goodsStatus.forEach((item) => {
-          delete item.isPublic
-          delete item.finishUserId
-          delete item.finishTime
-          delete item.finishUser
-          delete item.remark
-          delete item.extData
         })
+      })
+      if (tableErrTip !== '') {
+        notification.error({
+          message: `保存失败， 箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`,
+          duration: 3,
+        })
+        return false
       }
-      if (isCopy.value && !$data.isCopy) {
-        const copyData = {
-          customername: $data.bookingDetails.customername,
-          portloadid: $data.bookingDetails.portloadid,
-          carrierid: $data.bookingDetails.carrierid,
-          carrier: $data.bookingDetails.carrier,
-          portload: $data.bookingDetails.portload,
-          issueplace: $data.bookingDetails.issueplace,
-          prepardat: $data.bookingDetails.prepardat,
-          route: $data.bookingDetails.route,
-          shippingMethod: $data.bookingDetails.shippingMethod,
-          shipper: $data.bookingDetails.shipper,
-          consignee: $data.bookingDetails.consignee,
-          notifyparty: $data.bookingDetails.notifyparty,
-          goodsStatus: $data.bookingDetails.goodsStatus,
-          sale: $data.bookingDetails.sale,
-        }
-        bookingDetails.value = { ...JSON.parse(JSON.stringify(initDetail)), ...copyData }
-        oldBookingDetails.value = JSON.parse(JSON.stringify(bookingDetails.value))
-      } else {
-        bookingDetails.value = $data.bookingDetails
-        oldBookingDetails.value = JSON.parse(JSON.stringify(bookingDetails.value))
-        if (appStore.gettopDown) {
-          getDetail()
-        }
-        getRightAll()
+    }
+    const FnOk = () => {
+      const _data = JSON.parse(JSON.stringify(that.bookingDetails))
+      delete _data.hbList
+      appStore.setinBookingDetailsSave(true)
+      if (route.query.isCopy) {
+        delete _data.bookingno
+        _data.id = 0
+        _data.ctnInputs.map((item) => {
+          delete item.id
+        })
       }
-      setTimeout(() => {
-        if (bookingDetails.value.hbList && bookingDetails.value.hbList.length > 0) {
-          Showtabs.value = true
-          if (Object.keys(that.$refs).includes('RefsedOrder')) {
-            RefsedOrder.value.init(bookingDetails.value.hbList)
-          }
-        } else {
-          Showtabs.value = false
-          if (Object.keys(that.$refs).includes('RefsedOrder')) {
-            RefsedOrder.value.init([])
+      notification.open({ message: '保存中, 请勿切换页面...' })
+      appStore.setsaveFlag(true)
+      _data.ctnInputs.map((item) => {
+        if (!item.ctncode) {
+          if (appStore.getctnallList) {
+            appStore.getctnallList.forEach((ite) => {
+              if (item.ctnall === ite.name) {
+                item.ctncode = ite.code
+              }
+            })
           }
         }
-        if (Object.keys(that.$refs).includes('goodsTable')) {
-          RefgoodsTable.value.init()
-        }
-      }, 200)
-      setTimeout(() => {
-        const key = route.fullPath
-        sendMessageFY()
-        setTimeout(() => {
-          const detailsChange = Object.keys(appStore.getneedSavePages).includes(key)
-            ? !!appStore.getneedSavePages[key].details
-            : false
-          checkSaveFun({ type: 'details', hasChange: false })
-          const hbListChange = !!appStore.getneedSavePages[key].hbList
-          checkSaveFun({ type: 'hbList', hasChange: hbListChange })
-          inChildLoading.value = false
-        }, 1300)
-      }, 500)
-      getFilter()
-      if (!bookingDetails.value.extendState) {
-        isLockBooking.value = false
-      } else {
-        isLockBooking.value = bookingDetails.value.extendState.isLockBooking
-      }
-      that.$forceUpdate()
-    } else {
-      id.value = route.query.id
-      type.value = route.query.type || 'CMA'
-      isCopy.value = route.query.isCopy || false
-      tabActiveKey.value = '1'
-      mainOrderActiveKey.value = '1-1'
-      that.$forceUpdate()
-      init()
-      setTimeout(() => {
-        const key = route.fullPath
-
-        const detailsChange = Object.keys(appStore.getneedSavePages).includes(key)
-          ? !!appStore.getneedSavePages[key].details
-          : false
-        checkSaveFun({ type: 'details', hasChange: detailsChange })
-
-        const hbListChange = !!appStore.getneedSavePages[key].hbList
-        checkSaveFun({ type: 'hbList', hasChange: hbListChange })
-        inChildLoading.value = false
-      }, 500)
-    }
-    RefbasicInfo.value.$refs.basicFrom.clearValidate()
-    RefmailingInfo.value.$refs.mailingFrom.clearValidate()
-    RefcargoInfo.value.$refs.cargoFrom.clearValidate()
-  }
-  function fileNewUpadte(file) {
-    bookingDetails.value.tempFiles.push({
-      tempPathName: file.tempPathName,
-      typeCode: file.TypeCode,
-      typeName: file.TypeName,
-    })
-  }
-  function changeAtd(time, type) {
-    if (type === 1) {
-      bookingDetails.value.startETA = time + ':00'
-    }
-    if (type === 2) {
-      bookingDetails.value.startATA = time + ':00'
-    }
-    if (type === 3) {
-      bookingDetails.value.ygtETD = time + ':00'
-    }
-    if (type === 4) {
-      bookingDetails.value.atd = time + ':00'
-    }
-  }
-  function handleComplete() {
-    checkSaveFun({ type: 'details', hasChange: false })
-  }
-  function upDateRightFun() {
-    getRightAll()
-  }
-  function inGoodsSaveFun(data) {
-    inGoodsSave.value = data
-  }
-  function handleRefshRight(data) {
-    bookingDetails.value.startETA = data.startETA
-    bookingDetails.value.startATA = data.startATA
-    bookingDetails.value.ygtETD = data.ygtETD
-    bookingDetails.value.atd = data.atd
-  }
-  function handleIframeLoad() {
-    if (bookingDetails.value.id !== 0) {
-      const mapFrame = iframe.value
-      const data = {
-        custno: bookingDetails.value.custno,
-        mblno: bookingDetails.value.mblno,
-        cntrtotal: bookingDetails.value.cntrtotal,
-        cbm: bookingDetails.value.cbm,
-        kgs: bookingDetails.value.kgs,
-        pkgs: bookingDetails.value.pkgs,
-        customername: bookingDetails.value.customername,
-        customerid: bookingDetails.value.customerid,
-        portdischarge: bookingDetails.value.portdischarge,
-        vessel: bookingDetails.value.vessel,
-        voyno: bookingDetails.value.voyno,
-        sale: bookingDetails.value.sale,
-        etd: bookingDetails.value.etd,
-        blfrt: bookingDetails.value.blfrt,
-        destination: bookingDetails.value.destination,
-        portload: bookingDetails.value.portload,
-        truckerid: bookingDetails.value.truckerid,
-        trucker: bookingDetails.value.trucker,
-        customser: bookingDetails.value.customser,
-        customserid: bookingDetails.value.customserid,
-        forwarder: bookingDetails.value.forwarder,
-        forwarderid: bookingDetails.value.forwarderid,
-        agentname: bookingDetails.value.agentname,
-        agentnameid: bookingDetails.value.agentnameid,
-        yard: bookingDetails.value.yard,
-        yardid: bookingDetails.value.yardid,
-        shipagency: bookingDetails.value.shipagency,
-        shipagencyid: bookingDetails.value.shipagencyid,
-        id: bookingDetails.value.id,
+      })
+      saveBtnFlag.value = true
+      if (oldBookingDetails.value.log) {
+        oldBookingDetails.value.log = ''
       }
-      if (appStore.getfeeShow) {
-        const iframeWin = mapFrame.contentWindow
-        iframeWin.postMessage(
-          {
-            token: localStorage.getItem('pro__Access-Token'),
-            data: data,
-            customerTypeList: this.$options.filters['dictData']('djy_cust_prop'),
-          },
-          '*',
-        )
+      if (oldBookingDetails.value.goodsStatus) {
+        oldBookingDetails.value.goodsStatus = ''
       }
-    }
-  }
-  function handleSaveService(data) {
-    if (route.query.id) {
-      RefrightContent.value.saveServiceBasic(data)
-    }
-  }
-  function changeDetailFun(data) {
-    const { detail } = data
-    if (ifCompare(bookingDetails.value, detail) && !inChildLoading.value) {
-      checkSaveFun({ type: 'details', hasChange: true })
-    }
-    bookingDetails.value = detail
-  }
-  function changectnall(arr) {
-    let str = ''
-    arr.forEach((item, index) => {
-      str += item.ctnall + '*' + item.ctnnum
-      if (index != arr.length - 1) {
-        str += '/'
+      if (_data.log) {
+        delete _data.log
       }
-    })
-    bookingDetails.value.cntrtotal = str
-  }
-  function handleRefshTable() {
-    RefgoodsTable.value.loadingTable = true
-    GetCtnListRefsh({ orderId: bookingDetails.value.id }).then((res) => {
-      if (res.success) {
-        bookingDetails.value.ctnInputs = res.data
-        RefgoodsTable.value.init()
-      } else {
-        notification.error({ message: res.message, duration: 3 })
+      if (_data.goodsStatus) {
+        delete _data.goodsStatus
       }
-      RefgoodsTable.value.loadingTable = false
-    })
-  }
-  function changeTotalFun(data) {
-    const { type, val } = data
-    if (type === 'totalKgs') {
-      bookingDetails.value.kgs = val || bookingDetails.value.kgs
-    } else if (type === 'totalPkgs') {
-      bookingDetails.value.pkgs = val || bookingDetails.value.pkgs
-      const enCapitalRes = RefcargoInfo.value.SetTOTALNO(bookingDetails.value.pkgs)
-      bookingDetails.value.totalno = enCapitalRes
-    } else if (type === 'totalCbm') {
-      bookingDetails.value.cbm = val || bookingDetails.value.cbm
-    }
-  }
-  function changeCtnInfoFun({ type, val }) {
-    if (type === 'kindpkgs') {
-      bookingDetails.value.kindpkgs = val
-      const enCapitalRes = RefcargoInfo.value.SetTOTALNO(bookingDetails.value.pkgs)
-      bookingDetails.value.totalno = enCapitalRes
-    }
-  }
-  function spliceMorefun(str) {
-    moreStr.value = str
-  }
-  function editLineNameFun(type) {
-    if (type) {
-      RefmailingInfo.value.$data.userHasLine = !!bookingDetails.value.lineName
-    }
-  }
-  function pkgsEnCapitalFun(data) {
-    bookingDetails.value.totalno = data
-  }
-  function ifCompare(object1, object2) {
-    var o1keys = Object.keys(object1)
-    var o2keys = Object.keys(object2)
-    if (o2keys.length !== o1keys.length) return false
-    for (let i = 0; i <= o1keys.length - 1; i++) {
-      const key = o1keys[i]
-      if (!o2keys.includes(key)) return false
-      if (object2[key] !== object1[key]) return false
-    }
-    return true
-  }
-  function changeParentTabs(type) {
-    mainOrderActiveKey.value = type
-  }
-  function changeTab(e) {
-    tabActiveKey.value = e
-    setTimeout(() => {
-      RefsedOrder.value.init(bookingDetails.value.hbList)
-    }, 100)
-  }
-  function refreshPage() {
-    if (appStore.getfeeShow) {
-      const mapFrame = iframe.value
-      const iframeWin = mapFrame.contentWindow
-      iframeWin.postMessage(
-        {
-          id: bookingDetails.value.valueid,
-          type: 'empty',
-        },
-        '*',
-      )
-    }
-    setTimeout(() => {
-      init()
-      RefrightContent.value.init()
-    }, 100)
-  }
-  function init() {
-    bookingDetails.value = JSON.parse(JSON.stringify(initDetail))
-    excuteRules.value = []
-    excuteRulesType.value = ''
-    Showtabs.value = false
-    if (id.value) {
-      isAdd.value = false
-      getDetail()
-      getRightAll()
-    } else {
-      isAdd.value = true
-      detailsLoadOver.value = false
-      bookingDetails.value.carrierid = type.value
-      bookingDetails.value.carrier = type.value
-      isLockBooking.value = false
-      getFilter()
-      getDefaultVal()
-      setTimeout(() => {
-        if (Object.keys(that.$refs).includes('RefsedOrder')) {
-          RefsedOrder.value.init([])
+      const changedFields = diffObj(oldBookingDetails.value, _data)
+      if (changedFields) {
+        if (changedFields.new_val.bookingEDIExt) {
+          delete changedFields.new_val.bookingEDIExt
         }
-        if (Object.keys(that.$refs).includes('goodsTable')) {
-          RefgoodsTable.value.init()
+        if (changedFields.new_val.ctnInputs) {
+          delete changedFields.new_val.ctnInputs
         }
-        detailsLoadOver.value = true
-      }, 200)
-    }
-    FngetDjyTenantConfig()
-  }
-  function FngetDjyTenantConfig() {
-    getDjyTenantConfig({
-      type: 'booking_form_col',
-    })
-      .then((res) => {
-        if (res.data && JSON.parse(res.data.configJson).length) {
-          checkFrom.value = JSON.parse(res.data.configJson) || []
-        } else {
-          checkFrom.value = []
+        if (changedFields.new_val.extendState) {
+          delete changedFields.new_val.extendState
         }
-        Object.keys(basicRules.value).map((item) => {
-          if (checkFrom.value.includes(item)) {
-            basicRules.value[item][0].required = true
-          }
-        })
-        Object.keys(mailingRules.value).map((item) => {
-          if (checkFrom.value.includes(item)) {
-            mailingRules.value[item][0].required = true
-          }
-        })
-        Object.keys(cargoRules.value).map((item) => {
-          if (checkFrom.value.includes(item)) {
-            cargoRules.value[item][0].required = true
-          }
-        })
-        Object.keys(remarksRules.value).map((item) => {
-          if (checkFrom.value.includes(item)) {
-            remarksRules.value[item][0].required = true
-          }
-        })
-        Object.keys(ediRules.value).map((item) => {
-          if (checkFrom.value.includes(item)) {
-            ediRules.value[item][0].required = true
-          }
-          if (checkFrom.value.includes('bookingEDIExt.scaccode')) {
-            ediRules.value['scaccode'][0].required = true
-          }
-          if (checkFrom.value.includes('bookingEDIExt.itncode')) {
-            ediRules.value['itncode'][0].required = true
-          }
-          if (checkFrom.value.includes('bookingEDIExt.freightpayer')) {
-            ediRules.value['freightpayer'][0].required = true
-          }
-        })
-        Object.keys(tableRules.value).map((item) => {
-          if (checkFrom.value.includes(item)) {
-            tableRules.value[item].required = true
-            hasTableRules.value = true
-          }
-        })
-        that.$forceUpdate()
-      })
-      .catch((err) => {
-        console.log(err)
-      })
-  }
-  function getDefaultVal() {
-    getDjyTenantConfig({
-      type: 'booking_default_value',
-    })
-      .then((res) => {
-        const cdefaultData = JSON.parse(res.data.configJson)
-        defaultData.value = cdefaultData
-        const Fn = (item) => {
-          const field = item.field.split('.')
-          let label = field[1].toLowerCase()
-          if (field[0] === 'order') {
-            if (['EPCODE', 'DZREMARK', 'CZREMARK', 'Warehouse'].includes(field[1])) {
-              label = emnuDefaultLabel(field[1])
-            }
-            if (Object.keys(initDetail).includes(label)) {
-              initDetail[label] = item.code
-              bookingDetails.value[label] =
-                bookingDetails.value[label] && bookingDetails.value[label] !== ''
-                  ? bookingDetails.value[label]
-                  : item.code
-            }
-          } else if (field[0] === 'ctn') {
-            if (
-              [
-                'CTNALL',
-                'CTNNUM',
-                'CNTRNO',
-                'SEALNO',
-                'PKGS',
-                'KINDPKGS',
-                'KGS',
-                'CBM',
-                'TAREWEIGHT',
-                'WEIGHTYPE',
-                'WEIGHKGS',
-              ].includes(field[1])
-            ) {
-              ctnDefaultData.value[label] = item.code
-              bookingDetails.value.ctnInputs.map((citem, cindex) => {
-                bookingDetails.value.ctnInputs[cindex][label] =
-                  citem[label] && citem[label] !== '' ? citem[label] : item.code
+        if (changedFields.new_val.item) {
+          delete changedFields.new_val.item
+        }
+        if (changedFields.new_val.hbList) {
+          delete changedFields.new_val.hbList
+        }
+      }
+      if (changedFields) {
+        _data.changedFields = Object.keys(changedFields.new_val)
+      }
+      console.log(changedFields, oldBookingDetails.value, 'changedFields')
+      BookingOrderSave(_data)
+        .then((res) => {
+          if (res.success) {
+            setTimeout(() => {
+              appStore.setsaveFlag(false)
+            }, 5000)
+            notification.destroy()
+            notification.success({ message: '保存成功', duration: 3 })
+            if (isAdd.value || isCopy.value) {
+              isCopy.value = false
+              isAdd.value = false
+              inAddSave.value = true
+              id.value = res.data.id
+              const newBookingList = JSON.parse(JSON.stringify(appStore.getbookingList))
+              const newBookingGridOptions = JSON.parse(
+                JSON.stringify(appStore.getbookingGridOptions),
+              )
+              newBookingGridOptions.data = [...[res.data], ...newBookingGridOptions.data]
+              newBookingList[res.data.id] = res.data
+              appStore.setbookingList(newBookingList)
+              appStore.getbookingGridOptions(newBookingGridOptions)
+              appStore.setsaveNeedNumber(null)
+              that.$router.replace({
+                name: 'BookingDetail',
+                query: {
+                  id: res.data.id,
+                  type: res.data.carrierid,
+                  noOpenTab: true,
+                  mblno: res.data.mblno,
+                },
               })
+              setDeatilsFun(res, true)
+              setTimeout(() => {
+                inAddSave.value = false
+                getRightAll()
+                RefrightContent.value.init()
+              }, 2000)
+            } else if (that.$route.query.mblno === that.bookingDetails.mblno) {
+              that.isCopy = false
+              isAdd.value = false
+              setDeatilsFun(res, true)
+              checkSaveFun({ type: 'hbList', hasChange: false })
+              checkSaveFun({ type: 'details', hasChange: false })
+              const newBookingList = JSON.parse(JSON.stringify(appStore.getbookingList))
+              const newBookingGridOptions = JSON.parse(
+                JSON.stringify(appStore.getbookingGridOptions),
+              )
+              newBookingList[res.data.id] = res.data
+              const arr = newBookingGridOptions.data.map((item) => {
+                return item.id
+              })
+              const index = arr.indexOf(res.data.id)
+              newBookingGridOptions.data.splice(index, 1, res.data)
+              appStore.setbookingList(newBookingList)
+              appStore.getbookingGridOptions(newBookingGridOptions)
+              appStore.setsaveNeedNumber(res.data.id)
+            } else {
+              that.isCopy = false
+              isAdd.value = false
+              inAddSave.value = true
+              id.value = res.data.id
+              setDeatilsFun(res, true)
+              const newBookingList = JSON.parse(JSON.stringify(appStore.getbookingList))
+              const newBookingGridOptions = JSON.parse(
+                JSON.stringify(appStore.getbookingGridOptions),
+              )
+              newBookingList[res.data.id] = res.data
+              const arr = newBookingGridOptions.data.map((item) => {
+                return item.id
+              })
+              const index = arr.indexOf(res.data.id)
+              newBookingGridOptions.data.splice(index, 1, res.data)
+              appStore.setbookingList(newBookingList)
+              appStore.getbookingGridOptions(newBookingGridOptions)
+              appStore.setsaveNeedNumber(res.data.id)
+              that.$router.replace({
+                name: 'BookingDetail',
+                query: {
+                  id: res.data.id,
+                  type: res.data.carrierid,
+                  noOpenTab: true,
+                  mblno: res.data.mblno,
+                },
+              })
+              setTimeout(() => {
+                inAddSave.value = false
+              }, 2000)
             }
-          } else if (field[0] === 'edi') {
-            const typeArr1 = [
-              'WeiTuoFang',
-              'SendCode',
-              'ReceiveCode',
-              'NotifyCdoe',
-              'SalerCode',
-              'MasterBolIndicator',
-              'EmanifestHbl',
-              'ConsigneeEdiCode',
-              'ShipperEdiCode',
-              'OpEName',
-              'OpTel',
-              'OpEmail',
-              'GoodsName',
-              'MasterBolIndicatorName',
-              'SalerCodeName',
-              'OrderRemark',
-              'ExRemark1',
-              'ExRemark2',
-              'ExRemark3',
-              'ExRemark4',
-              'KingTareweight',
-            ]
-            const typeArr2 = [
-              'EDIAttn',
-              'EDIAttnTel',
-              'EDIAttnMail',
-              'AMSConsignee',
-              'AMSNotifyParty',
-              'CNPTNo',
-            ]
-            const typeArr3 = ['ACIHBL', 'CKHI', 'CNCM', 'WNCM']
-            const typeArr4 = ['S0CC0C']
-            if (typeArr1.includes(field[1])) {
-              label = field[1].substr(0, 1).toLowerCase() + field[1].substr(1, field[1].length - 1)
-            } else if (typeArr3.includes(field[1])) {
-              label = field[1].toLowerCase()
-            } else if (typeArr2.includes(field[1]) || typeArr4.includes(field[1])) {
-              label = emnuDefaultLabel(field[1])
-            }
-            if (label == 'orderRemark') {
+            that.setInBookingDetailsSave(false)
+            saveBtnFlag.value = false
+            that.$forceUpdate()
+          } else {
+            that.setInBookingDetailsSave(false)
+            appStore.setsaveFlag(false)
+            saveBtnFlag.value = false
+            if (typeof res.message === 'string') {
+              that.$message.error(res.message)
+            } else {
+              that.$message.error('保存失败')
             }
-            initDetail.bookingEDIExt[label] = item.code
-            bookingEDIExtData[label] = item.code
-            bookingDetails.value.bookingEDIExt[label] = item.code
           }
+        })
+        .catch((err) => {
+          saveBtnFlag.value = false
+          console.log(err)
+        })
+    }
+    let pkgs = 0
+    let kgs = 0
+    let cbm = 0
+    let kindpkgs = ''
+    bookingDetails.value.ctnInputs.forEach((item) => {
+      if (parseFloat(item.pkgs)) {
+        pkgs = pkgs + parseFloat(item.pkgs)
+      }
+      if (parseFloat(item.kgs)) {
+        kgs = kgs + parseFloat(item.kgs)
+      }
+      if (parseFloat(item.cbm)) {
+        cbm = cbm + parseFloat(item.cbm)
+      }
+      kindpkgs = item.kindpkgs
+    })
+    const refsh = () => {
+      RefgoodsTable.value.handleRefsh()
+    }
+    const check = () => {
+      if (bookingDetails.value.id !== 0) {
+        const checkData = {
+          bookingOrderId: bookingDetails.value.id,
+          ctnInputs: bookingDetails.value.ctnInputs,
         }
-        cdefaultData.map((item) => {
-          if (item.Carrier) {
-            if (bookingDetails.value.carrierid == item.Carrier) {
-              Fn(item)
+        notification.open({ message: '数据校验中, 请勿切换页面...' })
+        CheckCtnCover(checkData).then((res) => {
+          if (res.success) {
+            if (!res.data) {
+              FnOk()
+            } else {
+              Modal.confirm({
+                content: h('p', {}, [
+                  h('span', '箱信息发生改变,是否要覆盖保存?'),
+                  h('br'),
+                  h('span', '否：取消保存并刷新箱信息 是：覆盖保存'),
+                ]),
+                okText: '是',
+                okType: 'danger',
+                cancelText: '否',
+                onOk() {
+                  FnOk()
+                },
+                onCancel() {
+                  refsh()
+                },
+                class: 'test',
+              })
             }
-          } else {
-            Fn(item)
           }
         })
-        // this.$forceUpdate()
-      })
-      .catch((err) => {
-        console.log(err)
+      } else {
+        FnOk()
+      }
+    }
+    const confirm = (text) => {
+      Modal.confirm({
+        title: `${text}不一致，是否继续?`,
+        okText: '是',
+        okType: 'danger',
+        cancelText: '否',
+        onOk() {
+          check()
+        },
+        onCancel() {
+          return false
+        },
+        class: 'test',
       })
-  }
-  function emnuDefaultLabel(field) {
-    switch (field) {
-      case 'EPCODE':
-        return 'epCode'
-      case 'DZREMARK':
-        return 'dzRemark'
-      case 'CZREMARK':
-        return 'czRemark'
-      case 'Warehouse':
-        return 'warehouse'
-      case 'S0CC0C':
-        return 's0CC0C'
-      case 'EDIAttn':
-        return 'ediAttn'
-      case 'EDIAttnTel':
-        return 'ediAttnTel'
-      case 'EDIAttnMail':
-        return 'ediAttnMail'
-      case 'AMSConsignee':
-        return 'amsConsignee'
-      case 'AMSNotifyParty':
-        return 'amsNotifyParty'
-      case 'CNPTNo':
-        return 'cnptNo'
     }
-  }
-  function getFilter() {
-    listYardBwCarrier({ carrierCode: bookingDetails.value.carrierid }).then((res) => {
-      appStore.setyardFilter(res.data)
-    })
-  }
-  function getDetail() {
-    if (inPageLoading.value) {
-      return false
+    let WText = ''
+    if (parseFloat(pkgs) != parseFloat(bookingDetails.value.pkgs)) {
+      if (WText) {
+        WText = `${WText},件数`
+      } else {
+        WText = `件数`
+      }
+    }
+    if (parseFloat(kgs).toFixed(2) != parseFloat(bookingDetails.value.kgs).toFixed(2)) {
+      if (WText) {
+        WText = `${WText},重量`
+      } else {
+        WText = `重量`
+      }
+    }
+    if (parseFloat(cbm).toFixed(2) != parseFloat(bookingDetails.value.cbm).toFixed(2)) {
+      if (WText) {
+        WText = `${WText},尺码`
+      } else {
+        WText = `尺码`
+      }
+    }
+    if (kindpkgs !== bookingDetails.value.kindpkgs) {
+      if (WText) {
+        WText = `${WText},包装`
+      } else {
+        WText = `包装`
+      }
+    }
+    if (WText) {
+      confirm(WText)
+    } else {
+      check()
     }
-    inPageLoading.value = true
-    inChildLoading.value = true
-    detailsLoadOver.value = false
-    notification.open({ message: '加载中...' })
-    BookingOrderGet({
-      id: id.value,
-    })
-      .then((res) => {
-        notification.destroy()
-        setDeatilsFun(res, false)
-        appStore.settopDown(false)
-      })
-      .catch(() => {
-        appStore.settopDown(false)
-      })
-  }
-  function saveFun() {
-    bookingOrderUpdate()
-  }
-  function ocrUpflie(file) {
-    bookingDetails.value.tempFiles.push({
-      tempPathName: file,
-    })
-  }
-  function getRules(data) {
-    const { rows, type } = data
-    excuteRules.value = rows
-    excuteRulesType.value = type
   }
-  function changePageFun(type) {
-    const key = route.fullPath
+  // ============================================
+  function getRouterHis() {
+    inChildLoading.value = true
+    const newId = route.query.id ? route.query.id.toString() : ''
     if (
-      Object.keys(appStore.getneedSavePages).includes(key) &&
-      (appStore.getneedSavePages[key].details || appStore.getneedSavePages[key].hbList)
+      (Object.keys(historyData.value).includes(`copy-${newId}`) ||
+        Object.keys(historyData.value).includes(`copy-${newId}-${route.query.copyId}`)) &&
+      route.query.isCopy === 'true'
     ) {
-      Modal.confirm({
-        title: '请确认无未保存数据！',
-        content: '当点击确定按钮时，此页面 将会关闭。',
-        onOk() {
-          changePage(type)
-          const $data = appStore.getneedSavePages
-          delete $data[key]
-          appStore.setneedSavePages($data)
-        },
-        onCancel() {},
-      })
+      if (!route.query.copyId) {
+        const $data = JSON.parse(JSON.stringify(historyData.value[`copy-${newId}`]))
+        bookingDetails.value = $data.bookingDetails
+        oldBookingDetails.value = JSON.parse(JSON.stringify(bookingDetails.value))
+        excuteRules.value = $data.excuteRules
+        excuteRulesType.value = $data.excuteRulesType
+        isAdd.value = $data.isAdd
+        tabActiveKey.value = $data.tabActiveKey
+        mainOrderActiveKey.value = $data.mainOrderActiveKey
+      } else {
+        const $data = JSON.parse(
+          JSON.stringify(historyData.value[`copy-${newId}-${route.query.copyId}`]),
+        )
+        bookingDetails.value = $data.bookingDetails
+        oldBookingDetails.value = JSON.parse(JSON.stringify(bookingDetails.value))
+        excuteRules.value = $data.excuteRules
+        excuteRulesType.value = $data.excuteRulesType
+        isAdd.value = $data.isAdd
+        tabActiveKey.value = $data.tabActiveKey
+        mainOrderActiveKey.value = $data.mainOrderActiveKey
+      }
+      id.value = route.query.id
+      isCopy.value = route.query.isCopy
+      inPageLoading.value = false
+      setTimeout(() => {
+        if (bookingDetails.value.hbList && bookingDetails.value.hbList.length > 0) {
+          Showtabs.value = true
+          if (Object.keys(that.$refs).includes('RefsedOrder')) {
+            RefsedOrder.value.init(bookingDetails.value.hbList)
+          }
+        } else {
+          Showtabs.value = false
+          if (Object.keys(that.$refs).includes('RefsedOrder')) {
+            RefsedOrder.value.init([])
+          }
+        }
+        if (Object.keys(that.$refs).includes('goodsTable')) {
+          RefgoodsTable.value.init()
+        }
+      }, 200)
+      setTimeout(() => {
+        const key = route.fullPath
+        const detailsChange = Object.keys(appStore.getneedSavePages).includes(key)
+          ? !!appStore.getneedSavePages[key].details
+          : false
+        checkSaveFun({ type: 'details', hasChange: detailsChange })
+
+        const hbListChange = !!appStore.getneedSavePages[key].hbList
+        checkSaveFun({ type: 'hbList', hasChange: hbListChange })
+        inChildLoading.value = false
+      }, 500)
+      isLockBooking.value = false
+      getFilter()
+      that.$forceUpdate()
+    } else if (
+      Object.keys(historyData.value).includes(`add-${route.query.addNum}`) &&
+      route.query.addNum
+    ) {
+      const $data = JSON.parse(JSON.stringify(historyData.value[`add-${route.query.addNum}`]))
+      bookingDetails.value = $data.bookingDetails
+      oldBookingDetails.value = JSON.parse(JSON.stringify(bookingDetails.value))
+      excuteRules.value = $data.excuteRules
+      excuteRulesType.value = $data.excuteRulesType
+      isAdd.value = $data.isAdd
+      tabActiveKey.value = $data.tabActiveKey
+      mainOrderActiveKey.value = $data.mainOrderActiveKey
+      isCopy.value = route.query.isCopy || false
+      inPageLoading.value = false
+      if (isCopy.value && !$data.isCopy) {
+        bookingDetails.value.mblno = ''
+      }
+      setTimeout(() => {
+        if (bookingDetails.value.hbList && bookingDetails.value.hbList.length > 0) {
+          Showtabs.value = true
+          if (Object.keys(that.$refs).includes('RefsedOrder')) {
+            RefsedOrder.value.init(bookingDetails.value.hbList)
+          }
+        } else {
+          Showtabs.value = false
+          if (Object.keys(that.$refs).includes('RefsedOrder')) {
+            RefsedOrder.value.init([])
+          }
+        }
+        if (Object.keys(that.$refs).includes('goodsTable')) {
+          RefgoodsTable.value.init()
+        }
+      }, 200)
+      setTimeout(() => {
+        const key = route.fullPath
+
+        const detailsChange = Object.keys(appStore.getneedSavePages).includes(key)
+          ? !!appStore.getneedSavePages[key].details
+          : false
+        checkSaveFun({ type: 'details', hasChange: detailsChange })
+
+        const hbListChange = !!appStore.getneedSavePages[key].hbList
+        checkSaveFun({ type: 'hbList', hasChange: hbListChange })
+        inChildLoading.value = false
+      }, 500)
+      isLockBooking.value = false
+      getFilter()
+      that.$forceUpdate()
+    } else if (Object.keys(historyData.value).includes(newId)) {
+      id.value = route.query.id
+      const $data = JSON.parse(JSON.stringify(historyData.value[newId]))
+      isCopy.value = route.query.isCopy
+      excuteRules.value = $data.excuteRules
+      excuteRulesType.value = $data.excuteRulesType
+      isAdd.value = $data.isAdd
+      tabActiveKey.value = $data.tabActiveKey
+      mainOrderActiveKey.value = $data.mainOrderActiveKey
+      inPageLoading.value = false
+      if ($data.bookingDetails.goodsStatus && isCopy.value) {
+        $data.bookingDetails.goodsStatus.forEach((item) => {
+          delete item.isPublic
+          delete item.finishUserId
+          delete item.finishTime
+          delete item.finishUser
+          delete item.remark
+          delete item.extData
+        })
+      }
+      if (isCopy.value && !$data.isCopy) {
+        const copyData = {
+          customername: $data.bookingDetails.customername,
+          portloadid: $data.bookingDetails.portloadid,
+          carrierid: $data.bookingDetails.carrierid,
+          carrier: $data.bookingDetails.carrier,
+          portload: $data.bookingDetails.portload,
+          issueplace: $data.bookingDetails.issueplace,
+          prepardat: $data.bookingDetails.prepardat,
+          route: $data.bookingDetails.route,
+          shippingMethod: $data.bookingDetails.shippingMethod,
+          shipper: $data.bookingDetails.shipper,
+          consignee: $data.bookingDetails.consignee,
+          notifyparty: $data.bookingDetails.notifyparty,
+          goodsStatus: $data.bookingDetails.goodsStatus,
+          sale: $data.bookingDetails.sale,
+        }
+        bookingDetails.value = { ...JSON.parse(JSON.stringify(initDetail)), ...copyData }
+        oldBookingDetails.value = JSON.parse(JSON.stringify(bookingDetails.value))
+      } else {
+        bookingDetails.value = $data.bookingDetails
+        oldBookingDetails.value = JSON.parse(JSON.stringify(bookingDetails.value))
+        if (appStore.gettopDown) {
+          getDetail()
+        }
+        getRightAll()
+      }
+      setTimeout(() => {
+        if (bookingDetails.value.hbList && bookingDetails.value.hbList.length > 0) {
+          Showtabs.value = true
+          if (Object.keys(that.$refs).includes('RefsedOrder')) {
+            RefsedOrder.value.init(bookingDetails.value.hbList)
+          }
+        } else {
+          Showtabs.value = false
+          if (Object.keys(that.$refs).includes('RefsedOrder')) {
+            RefsedOrder.value.init([])
+          }
+        }
+        if (Object.keys(that.$refs).includes('goodsTable')) {
+          RefgoodsTable.value.init()
+        }
+      }, 200)
+      setTimeout(() => {
+        const key = route.fullPath
+        sendMessageFY()
+        setTimeout(() => {
+          const detailsChange = Object.keys(appStore.getneedSavePages).includes(key)
+            ? !!appStore.getneedSavePages[key].details
+            : false
+          checkSaveFun({ type: 'details', hasChange: false })
+          const hbListChange = !!appStore.getneedSavePages[key].hbList
+          checkSaveFun({ type: 'hbList', hasChange: hbListChange })
+          inChildLoading.value = false
+        }, 1300)
+      }, 500)
+      getFilter()
+      if (!bookingDetails.value.extendState) {
+        isLockBooking.value = false
+      } else {
+        isLockBooking.value = bookingDetails.value.extendState.isLockBooking
+      }
+      that.$forceUpdate()
     } else {
-      changePage(type)
+      id.value = route.query.id
+      type.value = route.query.type || 'CMA'
+      isCopy.value = route.query.isCopy || false
+      tabActiveKey.value = '1'
+      mainOrderActiveKey.value = '1-1'
+      that.$forceUpdate()
+      init()
+      setTimeout(() => {
+        const key = route.fullPath
+
+        const detailsChange = Object.keys(appStore.getneedSavePages).includes(key)
+          ? !!appStore.getneedSavePages[key].details
+          : false
+        checkSaveFun({ type: 'details', hasChange: detailsChange })
+
+        const hbListChange = !!appStore.getneedSavePages[key].hbList
+        checkSaveFun({ type: 'hbList', hasChange: hbListChange })
+        inChildLoading.value = false
+      }, 500)
     }
+    RefbasicInfo.value.$refs.basicFrom.clearValidate()
+    RefmailingInfo.value.$refs.mailingFrom.clearValidate()
+    RefcargoInfo.value.$refs.cargoFrom.clearValidate()
   }
-  function copyBookingFun() {
-    if (!saveBtnFlag.value) {
-      router.push({
-        name: 'BookingDetail',
-        query: { id: id.value, isCopy: 'true', type: bookingDetails.value.carrierid },
-      })
-    }
+  function fileNewUpadte(file) {
+    bookingDetails.value.tempFiles.push({
+      tempPathName: file.tempPathName,
+      typeCode: file.TypeCode,
+      typeName: file.TypeName,
+    })
   }
-  function addSedList() {
-    if (isAdd.value) {
-      notification.error({ message: '请先保存主单', duration: 3 })
-      return false
+  function changeAtd(time, type) {
+    if (type === 1) {
+      bookingDetails.value.startETA = time + ':00'
     }
-    const data = JSON.parse(JSON.stringify(bookingDetails.value))
-    data.isNoSave = true
-    // data.hblno = ''
-    data.shipper = ''
-    data.consignee = ''
-    data.notifyparty = ''
-    data.issuetype = ''
-    data.blfrt = ''
-    data.prepardat = ''
-    data.prepardatid = ''
-    if (data.ctnInputs.length > 0) {
-      data.ctnInputs.map((item) => {
-        delete item.id
-      })
+    if (type === 2) {
+      bookingDetails.value.startATA = time + ':00'
+    }
+    if (type === 3) {
+      bookingDetails.value.ygtETD = time + ':00'
+    }
+    if (type === 4) {
+      bookingDetails.value.atd = time + ':00'
     }
-
-    bookingDetails.value.hbList = [data]
-    tabActiveKey.value = '2'
-    Showtabs.value = true
-    setTimeout(() => {
-      RefsedOrder.value.init(bookingDetails.value.hbList)
-    }, 200)
-  }
-  function removeOrderFun() {
-    DeleteBookingOrder(bookingDetails.value.id)
-      .then((res) => {
-        if (res.success) {
-          notification.error({ message: '删除成功', duration: 3 })
-          const $data = appStore.getneedSavePages
-          delete $data[route.fullPath]
-          appStore.setneedSavePages($data)
-          const removeIcon = document
-            .getElementsByClassName('ant-tabs-tab-active')[0]
-            .getElementsByTagName('i')[0]
-          removeIcon.click()
-          that.$forceUpdate()
-          appStore.setdeleteId(bookingDetails.value.id)
-        } else {
-          notification.error({ message: res.message, duration: 3 })
-        }
-      })
-      .catch((err) => {
-        console.log(err)
-      })
   }
-  function handleSaveCtnListCover(data, slots) {
-    const arr = []
-    data.forEach((item) => {
-      if (item.ctnnum > 0) {
-        arr.push(item)
-      }
-    })
-    bookingDetails.value.ctnInputs = arr
-    bookingDetails.value.slots = slots
-    bookingDetails.value.mblno = slots[0].sloT_BOOKING_NO
-    bookingDetails.value.carrier = slots[0].carrier
-    bookingDetails.value.carrierid = slots[0].carrierid
-    bookingDetails.value.voynoinner = slots[0].voyno
-    bookingDetails.value.voyno = slots[0].voyno
-    bookingDetails.value.vessel = slots[0].vessel
-    bookingDetails.value.etd = slots[0].etd
-    bookingDetails.value.cntrtotal = slots[0].ctN_STAT
-    bookingDetails.value.startETA = slots[0].eta
-    that.$forceUpdate()
-    RefgoodsTable.value.init()
+  function handleComplete() {
+    checkSaveFun({ type: 'details', hasChange: false })
   }
-  function handleSaveCtnList(data, slots) {
-    const arr = []
-    data.forEach((item) => {
-      if (item.ctnnum > 0) {
-        arr.push(item)
-      }
-    })
-    bookingDetails.value.ctnInputs = arr
-    bookingDetails.value.slots = slots
-    RefgoodsTable.value.init()
+  function upDateRightFun() {
+    getRightAll()
   }
-  function handleSetCtnList() {
-    bookingDetails.value.slots = []
-    that.$forceUpdate()
+  function inGoodsSaveFun(data) {
+    inGoodsSave.value = data
   }
-  function frompre(data) {
-    RefbasicInfo.value._data.frompre = data.data1
+  function handleRefshRight(data) {
+    bookingDetails.value.startETA = data.startETA
+    bookingDetails.value.startATA = data.startATA
+    bookingDetails.value.ygtETD = data.ygtETD
+    bookingDetails.value.atd = data.atd
   }
-  function changePage(type) {
-    const nowId = route.query.id
-    const arr = Object.keys(appStore.getbookingList)
-    const index = arr.indexOf(nowId.toString())
-    if (type === 'prev') {
-      if (index < 1) {
-        notification.error({ message: '当前已经是第一票', duration: 3 })
-        return false
+  function handleIframeLoad() {
+    if (bookingDetails.value.id !== 0) {
+      const mapFrame = iframe.value
+      const data = {
+        custno: bookingDetails.value.custno,
+        mblno: bookingDetails.value.mblno,
+        cntrtotal: bookingDetails.value.cntrtotal,
+        cbm: bookingDetails.value.cbm,
+        kgs: bookingDetails.value.kgs,
+        pkgs: bookingDetails.value.pkgs,
+        customername: bookingDetails.value.customername,
+        customerid: bookingDetails.value.customerid,
+        portdischarge: bookingDetails.value.portdischarge,
+        vessel: bookingDetails.value.vessel,
+        voyno: bookingDetails.value.voyno,
+        sale: bookingDetails.value.sale,
+        etd: bookingDetails.value.etd,
+        blfrt: bookingDetails.value.blfrt,
+        destination: bookingDetails.value.destination,
+        portload: bookingDetails.value.portload,
+        truckerid: bookingDetails.value.truckerid,
+        trucker: bookingDetails.value.trucker,
+        customser: bookingDetails.value.customser,
+        customserid: bookingDetails.value.customserid,
+        forwarder: bookingDetails.value.forwarder,
+        forwarderid: bookingDetails.value.forwarderid,
+        agentname: bookingDetails.value.agentname,
+        agentnameid: bookingDetails.value.agentnameid,
+        yard: bookingDetails.value.yard,
+        yardid: bookingDetails.value.yardid,
+        shipagency: bookingDetails.value.shipagency,
+        shipagencyid: bookingDetails.value.shipagencyid,
+        id: bookingDetails.value.id,
       }
-      const prevId = arr[index - 1]
-      const prevType = appStore.getbookingList[prevId].carrierid
-
-      const $data = appStore.getneedSavePages
-      delete $data[route.fullPath]
-      appStore.setneedSavePages($data)
-      appStore.settopDown(true)
-      router.replace({
-        name: 'BookingDetail',
-        query: {
-          id: prevId,
-          type: prevType,
-          mblno: appStore.getbookingList[prevId].mblno,
-          noOpenTab: true,
-        },
-      })
-    } else {
-      if (index === arr.length - 1) {
-        notification.error({ message: '当前已经是最后一票', duration: 3 })
-        return false
+      if (appStore.getfeeShow) {
+        const iframeWin = mapFrame.contentWindow
+        iframeWin.postMessage(
+          {
+            token: localStorage.getItem('pro__Access-Token'),
+            data: data,
+            customerTypeList: this.$options.filters['dictData']('djy_cust_prop'),
+          },
+          '*',
+        )
       }
-      const nextId = arr[index + 1]
-      const nextType = appStore.getbookingList[nextId].carrierid
-      const $data = appStore.getneedSavePages
-      delete $data[route.fullPath]
-      appStore.setneedSavePages($data)
-      appStore.settopDown(true)
-      router.replace({
-        name: 'BookingDetail',
-        query: {
-          id: nextId,
-          type: nextType,
-          mblno: appStore.getbookingList[nextId].mblno,
-          noOpenTab: true,
-        },
-      })
     }
   }
-  function bookingOrderUpdate() {
-    let basicFrom = true
-    let basicObject = true
-    RefbasicInfo.value.$refs.basicFrom.validate((valid, object) => {
-      basicFrom = valid
-      basicObject = object
-    })
-    let mailingFrom = true
-    RefmailingInfo.value.$refs.mailingFrom.validate((valid) => {
-      mailingFrom = valid
-    })
-    let cargoFrom = true
-    RefcargoInfo.value.$refs.cargoFrom.validate((valid) => {
-      cargoFrom = valid
+  function handleSaveService(data) {
+    if (route.query.id) {
+      RefrightContent.value.saveServiceBasic(data)
+    }
+  }
+  function changeDetailFun(data) {
+    const { detail } = data
+    if (ifCompare(bookingDetails.value, detail) && !inChildLoading.value) {
+      checkSaveFun({ type: 'details', hasChange: true })
+    }
+    bookingDetails.value = detail
+  }
+  function changectnall(arr) {
+    let str = ''
+    arr.forEach((item, index) => {
+      str += item.ctnall + '*' + item.ctnnum
+      if (index != arr.length - 1) {
+        str += '/'
+      }
     })
-    if (!basicFrom && mailingFrom && cargoFrom) {
-      if (Object.keys(basicObject).length === 1 && Object.keys(basicObject)[0] === 'zhanCangFlag') {
-        notification.error({ message: '保存失败，是否占舱未填写', duration: 3 })
-        return false
+    bookingDetails.value.cntrtotal = str
+  }
+  function handleRefshTable() {
+    RefgoodsTable.value.loadingTable = true
+    GetCtnListRefsh({ orderId: bookingDetails.value.id }).then((res) => {
+      if (res.success) {
+        bookingDetails.value.ctnInputs = res.data
+        RefgoodsTable.value.init()
+      } else {
+        notification.error({ message: res.message, duration: 3 })
       }
+      RefgoodsTable.value.loadingTable = false
+    })
+  }
+  function changeTotalFun(data) {
+    const { type, val } = data
+    if (type === 'totalKgs') {
+      bookingDetails.value.kgs = val || bookingDetails.value.kgs
+    } else if (type === 'totalPkgs') {
+      bookingDetails.value.pkgs = val || bookingDetails.value.pkgs
+      const enCapitalRes = RefcargoInfo.value.SetTOTALNO(bookingDetails.value.pkgs)
+      bookingDetails.value.totalno = enCapitalRes
+    } else if (type === 'totalCbm') {
+      bookingDetails.value.cbm = val || bookingDetails.value.cbm
     }
-    if (!basicFrom || !mailingFrom || !cargoFrom) {
-      notification.error({ message: '保存失败，请检查必填项', duration: 3 })
-      return false
+  }
+  function changeCtnInfoFun({ type, val }) {
+    if (type === 'kindpkgs') {
+      bookingDetails.value.kindpkgs = val
+      const enCapitalRes = RefcargoInfo.value.SetTOTALNO(bookingDetails.value.pkgs)
+      bookingDetails.value.totalno = enCapitalRes
     }
-    if (RefediMore.value) {
-      let ediFrom = true
-      RefediMore.value.$refs.ediFrom.validate((valid) => {
-        ediFrom = valid
-      })
-      if (!ediFrom) {
-        mainOrderActiveKey.value = '2-2'
-        notification.error({ message: '保存失败，请检查EDI必填项', duration: 3 })
-        return false
-      }
-    } else {
-      Object.keys(ediRules.value).map((item) => {
-        if (
-          checkFrom.value.includes(item) &&
-          !bookingDetails.value[item.split('.')[0]][item.split('.')[1]]
-        ) {
-          hasEdiRules.value = true
-        }
-      })
-      if (hasEdiRules.value) {
-        mainOrderActiveKey.value = '2-2'
-        notification.error({ message: '保存失败，请检查EDI必填项', duration: 3 })
-        return false
-      }
+  }
+  function spliceMorefun(str) {
+    moreStr.value = str
+  }
+  function editLineNameFun(type) {
+    if (type) {
+      RefmailingInfo.value.$data.userHasLine = !!bookingDetails.value.lineName
     }
-
-    if (
-      hasTableRules.value &&
-      bookingDetails.value.shippingMethod !== '拼箱' &&
-      bookingDetails.value.carrierid !== 'GGPX'
-    ) {
-      if (bookingDetails.value.ctnInputs.length === 0) {
-        notification.error({ message: '保存失败，箱信息未填写', duration: 3 })
-        return false
-      }
-      let tableErrTip = ''
-      bookingDetails.value.ctnInputs.map((item, index) => {
-        Object.keys(item).map((label) => {
-          if (tableRules.value[label] && tableRules.value[label].required && item[label] === '') {
-            tableErrTip = `${tableErrTip}  序号${index + 1}中${
-              tableRules.value[label].title
-            }未填写,`
-          }
-        })
-      })
-      if (tableErrTip !== '') {
-        notification.error({
-          message: `保存失败， 箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`,
-          duration: 3,
-        })
-        return false
-      }
+  }
+  function pkgsEnCapitalFun(data) {
+    bookingDetails.value.totalno = data
+  }
+  function ifCompare(object1, object2) {
+    var o1keys = Object.keys(object1)
+    var o2keys = Object.keys(object2)
+    if (o2keys.length !== o1keys.length) return false
+    for (let i = 0; i <= o1keys.length - 1; i++) {
+      const key = o1keys[i]
+      if (!o2keys.includes(key)) return false
+      if (object2[key] !== object1[key]) return false
     }
-    const FnOk = () => {
-      const _data = JSON.parse(JSON.stringify(that.bookingDetails))
-      delete _data.hbList
-      appStore.setinBookingDetailsSave(true)
-      if (route.query.isCopy) {
-        delete _data.bookingno
-        _data.id = 0
-        _data.ctnInputs.map((item) => {
-          delete item.id
-        })
-      }
-      notification.open({ message: '保存中, 请勿切换页面...' })
-      appStore.setsaveFlag(true)
-      _data.ctnInputs.map((item) => {
-        if (!item.ctncode) {
-          if (appStore.getctnallList) {
-            appStore.getctnallList.forEach((ite) => {
-              if (item.ctnall === ite.name) {
-                item.ctncode = ite.code
-              }
-            })
-          }
-        }
-      })
-      saveBtnFlag.value = true
-      if (oldBookingDetails.value.log) {
-        oldBookingDetails.value.log = ''
-      }
-      if (oldBookingDetails.value.goodsStatus) {
-        oldBookingDetails.value.goodsStatus = ''
-      }
-      if (_data.log) {
-        delete _data.log
-      }
-      if (_data.goodsStatus) {
-        delete _data.goodsStatus
-      }
-      const changedFields = diffObj(oldBookingDetails.value, _data)
-      if (changedFields) {
-        if (changedFields.new_val.bookingEDIExt) {
-          delete changedFields.new_val.bookingEDIExt
-        }
-        if (changedFields.new_val.ctnInputs) {
-          delete changedFields.new_val.ctnInputs
-        }
-        if (changedFields.new_val.extendState) {
-          delete changedFields.new_val.extendState
-        }
-        if (changedFields.new_val.item) {
-          delete changedFields.new_val.item
-        }
-        if (changedFields.new_val.hbList) {
-          delete changedFields.new_val.hbList
-        }
-      }
-      if (changedFields) {
-        _data.changedFields = Object.keys(changedFields.new_val)
-      }
-      console.log(changedFields, oldBookingDetails.value, 'changedFields')
-      BookingOrderSave(_data)
-        .then((res) => {
-          if (res.success) {
-            setTimeout(() => {
-              appStore.setsaveFlag(false)
-            }, 5000)
-            notification.destroy()
-            notification.success({ message: '保存成功', duration: 3 })
-            if (isAdd.value || isCopy.value) {
-              isCopy.value = false
-              isAdd.value = false
-              inAddSave.value = true
-              id.value = res.data.id
-              const newBookingList = JSON.parse(JSON.stringify(appStore.getbookingList))
-              const newBookingGridOptions = JSON.parse(
-                JSON.stringify(appStore.getbookingGridOptions),
-              )
-              newBookingGridOptions.data = [...[res.data], ...newBookingGridOptions.data]
-              newBookingList[res.data.id] = res.data
-              appStore.setbookingList(newBookingList)
-              appStore.getbookingGridOptions(newBookingGridOptions)
-              appStore.setsaveNeedNumber(null)
-              that.$router.replace({
-                name: 'BookingDetail',
-                query: {
-                  id: res.data.id,
-                  type: res.data.carrierid,
-                  noOpenTab: true,
-                  mblno: res.data.mblno,
-                },
-              })
-              setDeatilsFun(res, true)
-              setTimeout(() => {
-                inAddSave.value = false
-                getRightAll()
-                RefrightContent.value.init()
-              }, 2000)
-            } else if (that.$route.query.mblno === that.bookingDetails.mblno) {
-              that.isCopy = false
-              isAdd.value = false
-              setDeatilsFun(res, true)
-              checkSaveFun({ type: 'hbList', hasChange: false })
-              checkSaveFun({ type: 'details', hasChange: false })
-              const newBookingList = JSON.parse(JSON.stringify(appStore.getbookingList))
-              const newBookingGridOptions = JSON.parse(
-                JSON.stringify(appStore.getbookingGridOptions),
-              )
-              newBookingList[res.data.id] = res.data
-              const arr = newBookingGridOptions.data.map((item) => {
-                return item.id
-              })
-              const index = arr.indexOf(res.data.id)
-              newBookingGridOptions.data.splice(index, 1, res.data)
-              appStore.setbookingList(newBookingList)
-              appStore.getbookingGridOptions(newBookingGridOptions)
-              appStore.setsaveNeedNumber(res.data.id)
-            } else {
-              that.isCopy = false
-              isAdd.value = false
-              inAddSave.value = true
-              id.value = res.data.id
-              setDeatilsFun(res, true)
-              const newBookingList = JSON.parse(JSON.stringify(appStore.getbookingList))
-              const newBookingGridOptions = JSON.parse(
-                JSON.stringify(appStore.getbookingGridOptions),
-              )
-              newBookingList[res.data.id] = res.data
-              const arr = newBookingGridOptions.data.map((item) => {
-                return item.id
-              })
-              const index = arr.indexOf(res.data.id)
-              newBookingGridOptions.data.splice(index, 1, res.data)
-              appStore.setbookingList(newBookingList)
-              appStore.getbookingGridOptions(newBookingGridOptions)
-              appStore.setsaveNeedNumber(res.data.id)
-              that.$router.replace({
-                name: 'BookingDetail',
-                query: {
-                  id: res.data.id,
-                  type: res.data.carrierid,
-                  noOpenTab: true,
-                  mblno: res.data.mblno,
-                },
-              })
-              setTimeout(() => {
-                inAddSave.value = false
-              }, 2000)
-            }
-            that.setInBookingDetailsSave(false)
-            saveBtnFlag.value = false
-            that.$forceUpdate()
-          } else {
-            that.setInBookingDetailsSave(false)
-            appStore.setsaveFlag(false)
-            saveBtnFlag.value = false
-            if (typeof res.message === 'string') {
-              that.$message.error(res.message)
-            } else {
-              that.$message.error('保存失败')
-            }
+    return true
+  }
+  function changeParentTabs(type) {
+    mainOrderActiveKey.value = type
+  }
+  function changeTab(e) {
+    tabActiveKey.value = e
+    setTimeout(() => {
+      RefsedOrder.value.init(bookingDetails.value.hbList)
+    }, 100)
+  }
+  function refreshPage() {
+    if (appStore.getfeeShow) {
+      const mapFrame = iframe.value
+      const iframeWin = mapFrame.contentWindow
+      iframeWin.postMessage(
+        {
+          id: bookingDetails.value.valueid,
+          type: 'empty',
+        },
+        '*',
+      )
+    }
+    setTimeout(() => {
+      init()
+      RefrightContent.value.init()
+    }, 100)
+  }
+  function init() {
+    bookingDetails.value = JSON.parse(JSON.stringify(initDetail))
+    excuteRules.value = []
+    excuteRulesType.value = ''
+    Showtabs.value = false
+    if (id.value) {
+      isAdd.value = false
+      getDetail()
+      getRightAll()
+    } else {
+      isAdd.value = true
+      detailsLoadOver.value = false
+      bookingDetails.value.carrierid = type.value
+      bookingDetails.value.carrier = type.value
+      isLockBooking.value = false
+      getFilter()
+      getDefaultVal()
+      setTimeout(() => {
+        if (Object.keys(that.$refs).includes('RefsedOrder')) {
+          RefsedOrder.value.init([])
+        }
+        if (Object.keys(that.$refs).includes('goodsTable')) {
+          RefgoodsTable.value.init()
+        }
+        detailsLoadOver.value = true
+      }, 200)
+    }
+    FngetDjyTenantConfig()
+  }
+  function FngetDjyTenantConfig() {
+    getDjyTenantConfig({
+      type: 'booking_form_col',
+    })
+      .then((res) => {
+        if (res.data && JSON.parse(res.data.configJson).length) {
+          checkFrom.value = JSON.parse(res.data.configJson) || []
+        } else {
+          checkFrom.value = []
+        }
+        Object.keys(basicRules.value).map((item) => {
+          if (checkFrom.value.includes(item)) {
+            basicRules.value[item][0].required = true
           }
         })
-        .catch((err) => {
-          saveBtnFlag.value = false
-          console.log(err)
+        Object.keys(mailingRules.value).map((item) => {
+          if (checkFrom.value.includes(item)) {
+            mailingRules.value[item][0].required = true
+          }
         })
-    }
-    let pkgs = 0
-    let kgs = 0
-    let cbm = 0
-    let kindpkgs = ''
-    bookingDetails.value.ctnInputs.forEach((item) => {
-      if (parseFloat(item.pkgs)) {
-        pkgs = pkgs + parseFloat(item.pkgs)
-      }
-      if (parseFloat(item.kgs)) {
-        kgs = kgs + parseFloat(item.kgs)
-      }
-      if (parseFloat(item.cbm)) {
-        cbm = cbm + parseFloat(item.cbm)
-      }
-      kindpkgs = item.kindpkgs
+        Object.keys(cargoRules.value).map((item) => {
+          if (checkFrom.value.includes(item)) {
+            cargoRules.value[item][0].required = true
+          }
+        })
+        Object.keys(remarksRules.value).map((item) => {
+          if (checkFrom.value.includes(item)) {
+            remarksRules.value[item][0].required = true
+          }
+        })
+        Object.keys(ediRules.value).map((item) => {
+          if (checkFrom.value.includes(item)) {
+            ediRules.value[item][0].required = true
+          }
+          if (checkFrom.value.includes('bookingEDIExt.scaccode')) {
+            ediRules.value['scaccode'][0].required = true
+          }
+          if (checkFrom.value.includes('bookingEDIExt.itncode')) {
+            ediRules.value['itncode'][0].required = true
+          }
+          if (checkFrom.value.includes('bookingEDIExt.freightpayer')) {
+            ediRules.value['freightpayer'][0].required = true
+          }
+        })
+        Object.keys(tableRules.value).map((item) => {
+          if (checkFrom.value.includes(item)) {
+            tableRules.value[item].required = true
+            hasTableRules.value = true
+          }
+        })
+        that.$forceUpdate()
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+  }
+  function getDefaultVal() {
+    getDjyTenantConfig({
+      type: 'booking_default_value',
     })
-    const refsh = () => {
-      RefgoodsTable.value.handleRefsh()
-    }
-    const check = () => {
-      if (bookingDetails.value.id !== 0) {
-        const checkData = {
-          bookingOrderId: bookingDetails.value.id,
-          ctnInputs: bookingDetails.value.ctnInputs,
-        }
-        notification.open({ message: '数据校验中, 请勿切换页面...' })
-        CheckCtnCover(checkData).then((res) => {
-          if (res.success) {
-            if (!res.data) {
-              FnOk()
-            } else {
-              Modal.confirm({
-                content: h('p', {}, [
-                  h('span', '箱信息发生改变,是否要覆盖保存?'),
-                  h('br'),
-                  h('span', '否：取消保存并刷新箱信息 是：覆盖保存'),
-                ]),
-                okText: '是',
-                okType: 'danger',
-                cancelText: '否',
-                onOk() {
-                  FnOk()
-                },
-                onCancel() {
-                  refsh()
-                },
-                class: 'test',
+      .then((res) => {
+        const cdefaultData = JSON.parse(res.data.configJson)
+        defaultData.value = cdefaultData
+        const Fn = (item) => {
+          const field = item.field.split('.')
+          let label = field[1].toLowerCase()
+          if (field[0] === 'order') {
+            if (['EPCODE', 'DZREMARK', 'CZREMARK', 'Warehouse'].includes(field[1])) {
+              label = emnuDefaultLabel(field[1])
+            }
+            if (Object.keys(initDetail).includes(label)) {
+              initDetail[label] = item.code
+              bookingDetails.value[label] =
+                bookingDetails.value[label] && bookingDetails.value[label] !== ''
+                  ? bookingDetails.value[label]
+                  : item.code
+            }
+          } else if (field[0] === 'ctn') {
+            if (
+              [
+                'CTNALL',
+                'CTNNUM',
+                'CNTRNO',
+                'SEALNO',
+                'PKGS',
+                'KINDPKGS',
+                'KGS',
+                'CBM',
+                'TAREWEIGHT',
+                'WEIGHTYPE',
+                'WEIGHKGS',
+              ].includes(field[1])
+            ) {
+              ctnDefaultData.value[label] = item.code
+              bookingDetails.value.ctnInputs.map((citem, cindex) => {
+                bookingDetails.value.ctnInputs[cindex][label] =
+                  citem[label] && citem[label] !== '' ? citem[label] : item.code
               })
             }
+          } else if (field[0] === 'edi') {
+            const typeArr1 = [
+              'WeiTuoFang',
+              'SendCode',
+              'ReceiveCode',
+              'NotifyCdoe',
+              'SalerCode',
+              'MasterBolIndicator',
+              'EmanifestHbl',
+              'ConsigneeEdiCode',
+              'ShipperEdiCode',
+              'OpEName',
+              'OpTel',
+              'OpEmail',
+              'GoodsName',
+              'MasterBolIndicatorName',
+              'SalerCodeName',
+              'OrderRemark',
+              'ExRemark1',
+              'ExRemark2',
+              'ExRemark3',
+              'ExRemark4',
+              'KingTareweight',
+            ]
+            const typeArr2 = [
+              'EDIAttn',
+              'EDIAttnTel',
+              'EDIAttnMail',
+              'AMSConsignee',
+              'AMSNotifyParty',
+              'CNPTNo',
+            ]
+            const typeArr3 = ['ACIHBL', 'CKHI', 'CNCM', 'WNCM']
+            const typeArr4 = ['S0CC0C']
+            if (typeArr1.includes(field[1])) {
+              label = field[1].substr(0, 1).toLowerCase() + field[1].substr(1, field[1].length - 1)
+            } else if (typeArr3.includes(field[1])) {
+              label = field[1].toLowerCase()
+            } else if (typeArr2.includes(field[1]) || typeArr4.includes(field[1])) {
+              label = emnuDefaultLabel(field[1])
+            }
+            if (label == 'orderRemark') {
+            }
+            initDetail.bookingEDIExt[label] = item.code
+            bookingEDIExtData[label] = item.code
+            bookingDetails.value.bookingEDIExt[label] = item.code
+          }
+        }
+        cdefaultData.map((item) => {
+          if (item.Carrier) {
+            if (bookingDetails.value.carrierid == item.Carrier) {
+              Fn(item)
+            }
+          } else {
+            Fn(item)
           }
         })
-      } else {
-        FnOk()
-      }
+        // this.$forceUpdate()
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+  }
+  function emnuDefaultLabel(field) {
+    switch (field) {
+      case 'EPCODE':
+        return 'epCode'
+      case 'DZREMARK':
+        return 'dzRemark'
+      case 'CZREMARK':
+        return 'czRemark'
+      case 'Warehouse':
+        return 'warehouse'
+      case 'S0CC0C':
+        return 's0CC0C'
+      case 'EDIAttn':
+        return 'ediAttn'
+      case 'EDIAttnTel':
+        return 'ediAttnTel'
+      case 'EDIAttnMail':
+        return 'ediAttnMail'
+      case 'AMSConsignee':
+        return 'amsConsignee'
+      case 'AMSNotifyParty':
+        return 'amsNotifyParty'
+      case 'CNPTNo':
+        return 'cnptNo'
     }
-    const confirm = (text) => {
+  }
+  function getFilter() {
+    listYardBwCarrier({ carrierCode: bookingDetails.value.carrierid }).then((res) => {
+      appStore.setyardFilter(res.data)
+    })
+  }
+  function getDetail() {
+    if (inPageLoading.value) {
+      return false
+    }
+    inPageLoading.value = true
+    inChildLoading.value = true
+    detailsLoadOver.value = false
+    notification.open({ message: '加载中...' })
+    BookingOrderGet({
+      id: id.value,
+    })
+      .then((res) => {
+        notification.destroy()
+        setDeatilsFun(res, false)
+        appStore.settopDown(false)
+      })
+      .catch(() => {
+        appStore.settopDown(false)
+      })
+  }
+
+  function ocrUpflie(file) {
+    bookingDetails.value.tempFiles.push({
+      tempPathName: file,
+    })
+  }
+  function getRules(data) {
+    const { rows, type } = data
+    excuteRules.value = rows
+    excuteRulesType.value = type
+  }
+  function changePageFun(type) {
+    const key = route.fullPath
+    if (
+      Object.keys(appStore.getneedSavePages).includes(key) &&
+      (appStore.getneedSavePages[key].details || appStore.getneedSavePages[key].hbList)
+    ) {
       Modal.confirm({
-        title: `${text}不一致，是否继续?`,
-        okText: '是',
-        okType: 'danger',
-        cancelText: '否',
+        title: '请确认无未保存数据！',
+        content: '当点击确定按钮时，此页面 将会关闭。',
         onOk() {
-          check()
-        },
-        onCancel() {
-          return false
+          changePage(type)
+          const $data = appStore.getneedSavePages
+          delete $data[key]
+          appStore.setneedSavePages($data)
         },
-        class: 'test',
+        onCancel() {},
       })
+    } else {
+      changePage(type)
     }
-    let WText = ''
-    if (parseFloat(pkgs) != parseFloat(bookingDetails.value.pkgs)) {
-      if (WText) {
-        WText = `${WText},件数`
-      } else {
-        WText = `件数`
-      }
+  }
+  function copyBookingFun() {
+    if (!saveBtnFlag.value) {
+      router.push({
+        name: 'BookingDetail',
+        query: { id: id.value, isCopy: 'true', type: bookingDetails.value.carrierid },
+      })
     }
-    if (parseFloat(kgs).toFixed(2) != parseFloat(bookingDetails.value.kgs).toFixed(2)) {
-      if (WText) {
-        WText = `${WText},重量`
-      } else {
-        WText = `重量`
-      }
+  }
+  function addSedList() {
+    if (isAdd.value) {
+      notification.error({ message: '请先保存主单', duration: 3 })
+      return false
     }
-    if (parseFloat(cbm).toFixed(2) != parseFloat(bookingDetails.value.cbm).toFixed(2)) {
-      if (WText) {
-        WText = `${WText},尺码`
-      } else {
-        WText = `尺码`
-      }
+    const data = JSON.parse(JSON.stringify(bookingDetails.value))
+    data.isNoSave = true
+    // data.hblno = ''
+    data.shipper = ''
+    data.consignee = ''
+    data.notifyparty = ''
+    data.issuetype = ''
+    data.blfrt = ''
+    data.prepardat = ''
+    data.prepardatid = ''
+    if (data.ctnInputs.length > 0) {
+      data.ctnInputs.map((item) => {
+        delete item.id
+      })
     }
-    if (kindpkgs !== bookingDetails.value.kindpkgs) {
-      if (WText) {
-        WText = `${WText},包装`
-      } else {
-        WText = `包装`
+
+    bookingDetails.value.hbList = [data]
+    tabActiveKey.value = '2'
+    Showtabs.value = true
+    setTimeout(() => {
+      RefsedOrder.value.init(bookingDetails.value.hbList)
+    }, 200)
+  }
+  function removeOrderFun() {
+    DeleteBookingOrder(bookingDetails.value.id)
+      .then((res) => {
+        if (res.success) {
+          notification.error({ message: '删除成功', duration: 3 })
+          const $data = appStore.getneedSavePages
+          delete $data[route.fullPath]
+          appStore.setneedSavePages($data)
+          const removeIcon = document
+            .getElementsByClassName('ant-tabs-tab-active')[0]
+            .getElementsByTagName('i')[0]
+          removeIcon.click()
+          that.$forceUpdate()
+          appStore.setdeleteId(bookingDetails.value.id)
+        } else {
+          notification.error({ message: res.message, duration: 3 })
+        }
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+  }
+  function handleSaveCtnListCover(data, slots) {
+    const arr = []
+    data.forEach((item) => {
+      if (item.ctnnum > 0) {
+        arr.push(item)
       }
-    }
-    if (WText) {
-      confirm(WText)
+    })
+    bookingDetails.value.ctnInputs = arr
+    bookingDetails.value.slots = slots
+    bookingDetails.value.mblno = slots[0].sloT_BOOKING_NO
+    bookingDetails.value.carrier = slots[0].carrier
+    bookingDetails.value.carrierid = slots[0].carrierid
+    bookingDetails.value.voynoinner = slots[0].voyno
+    bookingDetails.value.voyno = slots[0].voyno
+    bookingDetails.value.vessel = slots[0].vessel
+    bookingDetails.value.etd = slots[0].etd
+    bookingDetails.value.cntrtotal = slots[0].ctN_STAT
+    bookingDetails.value.startETA = slots[0].eta
+    that.$forceUpdate()
+    RefgoodsTable.value.init()
+  }
+  function handleSaveCtnList(data, slots) {
+    const arr = []
+    data.forEach((item) => {
+      if (item.ctnnum > 0) {
+        arr.push(item)
+      }
+    })
+    bookingDetails.value.ctnInputs = arr
+    bookingDetails.value.slots = slots
+    RefgoodsTable.value.init()
+  }
+  function handleSetCtnList() {
+    bookingDetails.value.slots = []
+    that.$forceUpdate()
+  }
+  function frompre(data) {
+    RefbasicInfo.value._data.frompre = data.data1
+  }
+  function changePage(type) {
+    const nowId = route.query.id
+    const arr = Object.keys(appStore.getbookingList)
+    const index = arr.indexOf(nowId.toString())
+    if (type === 'prev') {
+      if (index < 1) {
+        notification.error({ message: '当前已经是第一票', duration: 3 })
+        return false
+      }
+      const prevId = arr[index - 1]
+      const prevType = appStore.getbookingList[prevId].carrierid
+
+      const $data = appStore.getneedSavePages
+      delete $data[route.fullPath]
+      appStore.setneedSavePages($data)
+      appStore.settopDown(true)
+      router.replace({
+        name: 'BookingDetail',
+        query: {
+          id: prevId,
+          type: prevType,
+          mblno: appStore.getbookingList[prevId].mblno,
+          noOpenTab: true,
+        },
+      })
     } else {
-      check()
+      if (index === arr.length - 1) {
+        notification.error({ message: '当前已经是最后一票', duration: 3 })
+        return false
+      }
+      const nextId = arr[index + 1]
+      const nextType = appStore.getbookingList[nextId].carrierid
+      const $data = appStore.getneedSavePages
+      delete $data[route.fullPath]
+      appStore.setneedSavePages($data)
+      appStore.settopDown(true)
+      router.replace({
+        name: 'BookingDetail',
+        query: {
+          id: nextId,
+          type: nextType,
+          mblno: appStore.getbookingList[nextId].mblno,
+          noOpenTab: true,
+        },
+      })
     }
   }
+
   function setDeatilsFun(res, overSet = false) {
     if (!res.data.bookingEDIExt) {
       res.data.bookingEDIExt = bookingEDIExtData
diff --git a/src/views/operation/seaexport/detail/modules/basicInfo.vue b/src/views/operation/seaexport/detail/modules/basicInfo.vue
index f8ebc2a9..c46c2512 100644
--- a/src/views/operation/seaexport/detail/modules/basicInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/basicInfo.vue
@@ -6,7 +6,8 @@
           ref="basicFrom"
           style="margin-bottom: 10px"
           size="small"
-          :self-update="true"
+          ref="RefbasicFrom"
+          :selfUpdate="true"
           :model="details"
           :rules="rules"
         >
@@ -966,6 +967,7 @@
     },
   })
   const id = ref()
+  const RefbasicFrom = ref()
   watch(
     () => props.details,
     (nval) => {
@@ -1301,6 +1303,9 @@
     }
     return tree
   }
+  defineExpose({
+    RefbasicFrom,
+  })
 </script>
 <style lang="less" scoped>
   /deep/ .ant-form-explain {
diff --git a/src/views/operation/seaexport/detail/modules/cargoInfo.vue b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
index 8505eddc..9330a454 100644
--- a/src/views/operation/seaexport/detail/modules/cargoInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
@@ -1,6 +1,6 @@
 <template>
-  <a-collapse v-model="showKey" class="collapse-box" :bordered="false">
-    <a-collapse-panel key="1" :show-arrow="false">
+  <a-collapse class="collapse-box" :bordered="false" v-model:activeKey="showKey">
+    <a-collapse-panel key="1" :showArrow="false">
       <template #header>
         <div class="base-tit"
           ><i class="iconfont icon-goods"></i>货物信息
@@ -13,7 +13,7 @@
         ></div>
       </template>
       <div class="container cargo-info">
-        <a-form ref="cargoFrom" :self-update="true" :model="details" :rules="rules">
+        <a-form :selfUpdate="true" ref="RefcargoFrom" :model="details" :rules="rules">
           <a-row :gutter="10">
             <a-col :span="5">
               <div
@@ -639,6 +639,7 @@
   const kgstotalRes = ref(0)
   const cbmtotalRes = ref(0)
   const id = ref()
+  const RefcargoFrom = ref()
   watch(
     () => props.details,
     (nval) => {
@@ -958,6 +959,9 @@
     textEntryModalTitle.value = ''
     textEntryType.value = false
   }
+  defineExpose({
+    RefcargoFrom,
+  })
 </script>
 <style lang="less" scoped>
   .copy-btn {
diff --git a/src/views/operation/seaexport/detail/modules/mailingInfo.vue b/src/views/operation/seaexport/detail/modules/mailingInfo.vue
index 33250636..660ed27a 100644
--- a/src/views/operation/seaexport/detail/modules/mailingInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/mailingInfo.vue
@@ -1,6 +1,6 @@
 <template>
-  <a-collapse v-model="showKey" class="collapse-box" :bordered="false">
-    <a-collapse-panel key="1" :show-arrow="false">
+  <a-collapse class="collapse-box" :bordered="false" v-model:activeKey="showKey">
+    <a-collapse-panel key="1" :showArrow="false">
       <template #header>
         <div class="base-tit">
           <i class="iconfont icon-a-fahuodaifahuo"></i>收发通信息
@@ -13,7 +13,7 @@
         </div>
       </template>
       <div class="mail-info" style="padding-bottom: 18px">
-        <a-form ref="mailingFrom" :self-update="true" :model="details" :rules="rules">
+        <a-form :selfUpdate="true" ref="RefmailingFrom" :model="details" :rules="rules">
           <a-row :gutter="10">
             <a-col class="left-sender-box" :xs="24" :sm="24" :md="24" :lg="10" :xl="8">
               <a-form-item
@@ -1114,6 +1114,7 @@
   const shippernameInput = ref()
   const consigneenameInput = ref()
   const notifypartynameInput = ref()
+  const RefmailingFrom = ref()
   watch(
     () => props.details,
     (nval) => {
@@ -1598,6 +1599,9 @@
   function handleOpenFd() {
     visibleJW.value = true
   }
+  defineExpose({
+    RefmailingFrom,
+  })
 </script>
 <style lang="less" scoped>
   @import url('../index.less');
diff --git a/src/views/operation/seaexport/detail/modules/operationArea.vue b/src/views/operation/seaexport/detail/modules/operationArea.vue
index 6a3aa5fa..f13fe6a7 100644
--- a/src/views/operation/seaexport/detail/modules/operationArea.vue
+++ b/src/views/operation/seaexport/detail/modules/operationArea.vue
@@ -846,7 +846,14 @@
     lineHeight: '30px',
   })
   const mskBookingOrder = ref()
-  // ===========
+  // ============================================
+  //保存
+  function saveFun() {
+    if (!appStore.getsaveFlag) {
+      emit('save')
+    }
+  }
+  // ============================================
   function refreshPage() {
     emit('refresh')
   }
@@ -856,11 +863,7 @@
   function copyBooking() {
     emit('copy')
   }
-  function saveFun() {
-    if (!appStore.getsaveFlag) {
-      emit('save')
-    }
-  }
+
   function FSnhowPrintModal() {
     cateCode.value = 'zhudan_print'
     let DprintType = ''
diff --git a/src/views/operation/seaexport/detail/rules.js b/src/views/operation/seaexport/detail/rules.js
index 44357de7..065bd302 100644
--- a/src/views/operation/seaexport/detail/rules.js
+++ b/src/views/operation/seaexport/detail/rules.js
@@ -1,184 +1,187 @@
 export default {
   basicRules: {
-    customername: [{ required: false, message: '请选择委托单位', trigger: 'change' }],
+    // customername: [{ required: false, message: '请选择委托单位', trigger: 'change' }],
+    bsno: [{ required: false, message: '请输入业务编号', trigger: 'change' }],
+    masterNo: [{ required: false, message: '请输入主票业务编号', trigger: 'change' }],
     mblno: [{ required: false, message: '请输入提单号', trigger: 'change' }],
-    carrierid: [{ required: false, message: '请选择船公司', trigger: 'change' }],
-    forwarder: [{ required: false, message: '请输入订舱代理', trigger: 'change' }],
-    pono: [{ required: false, message: '请输入PO NO', trigger: 'change' }],
+    mblno: [{ required: false, message: '选择模板', trigger: 'change' }],
+    // carrierid: [{ required: false, message: '请选择船公司', trigger: 'change' }],
+    // forwarder: [{ required: false, message: '请输入订舱代理', trigger: 'change' }],
+    // pono: [{ required: false, message: '请输入PO NO', trigger: 'change' }],
     hblno: [{ required: false, message: '请输入分提单号', trigger: 'change' }],
-    custno: [{ required: false, message: '请输入订舱编号', trigger: 'change' }],
-    contractno: [{ required: false, message: '请输入运费协议号', trigger: 'change' }],
-    tmblno: [{ required: false, message: '请输入真提单号', trigger: 'change' }], // VOLTA WHL CSL
-    epCode: [{ required: false, message: '请输入EP号', trigger: 'change' }], // esl
-    vessel: [{ required: false, message: '请输入船名', trigger: 'change' }],
-    lanecode: [{ required: false, message: '请输入航线代码', trigger: 'change' }], // esl
-    voynoinner: [{ required: false, message: '请输入内部航次', trigger: 'change' }],
-    voyno: [{ required: false, message: '请输入航次/海关航次', trigger: 'change' }],
-    etd: [{ required: false, message: '请选择开船日期', trigger: 'change' }],
-    zhanCangFlag: [{ required: false, message: '请选择是否占舱', trigger: 'change' }],
-    // atd: [{ required: false, message: '请选择实际开船日期', trigger: 'change' }],
-    lanename: [{ required: false, message: '请输入船司航线', trigger: 'change' }],
-    shipagency: [{ required: false, message: '请输入船代', trigger: 'change' }],
-    lineName: [{ required: false, message: '请输入航线', trigger: 'change' }],
-    sale: [{ required: false, message: '请选择揽货人员', trigger: 'change' }],
-    op: [{ required: false, message: '请选择操作人员', trigger: 'change' }],
-    doc: [{ required: false, message: '请选择单证人员', trigger: 'change' }],
-    custservice: [{ required: false, message: '请选择客服人员', trigger: 'change' }],
-    route: [{ required: false, message: '请选择航线操作', trigger: 'change' }],
-    lineManage: [{ required: false, message: '请选择航线管理', trigger: 'change' }],
-    dzRemark: [{ required: false, message: '请选择单证备注', trigger: 'change' }],
-    czRemark: [{ required: false, message: '请选择操作备注', trigger: 'change' }],
+    // custno: [{ required: false, message: '请输入订舱编号', trigger: 'change' }],
+    // contractno: [{ required: false, message: '请输入运费协议号', trigger: 'change' }],
+    // tmblno: [{ required: false, message: '请输入真提单号', trigger: 'change' }], // VOLTA WHL CSL
+    // epCode: [{ required: false, message: '请输入EP号', trigger: 'change' }], // esl
+    // vessel: [{ required: false, message: '请输入船名', trigger: 'change' }],
+    // lanecode: [{ required: false, message: '请输入航线代码', trigger: 'change' }], // esl
+    // voynoinner: [{ required: false, message: '请输入内部航次', trigger: 'change' }],
+    // voyno: [{ required: false, message: '请输入航次/海关航次', trigger: 'change' }],
+    // etd: [{ required: false, message: '请选择开船日期', trigger: 'change' }],
+    // zhanCangFlag: [{ required: false, message: '请选择是否占舱', trigger: 'change' }],
+    // // atd: [{ required: false, message: '请选择实际开船日期', trigger: 'change' }],
+    // lanename: [{ required: false, message: '请输入船司航线', trigger: 'change' }],
+    // shipagency: [{ required: false, message: '请输入船代', trigger: 'change' }],
+    // lineName: [{ required: false, message: '请输入航线', trigger: 'change' }],
+    // sale: [{ required: false, message: '请选择揽货人员', trigger: 'change' }],
+    // op: [{ required: false, message: '请选择操作人员', trigger: 'change' }],
+    // doc: [{ required: false, message: '请选择单证人员', trigger: 'change' }],
+    // custservice: [{ required: false, message: '请选择客服人员', trigger: 'change' }],
+    // route: [{ required: false, message: '请选择航线操作', trigger: 'change' }],
+    // lineManage: [{ required: false, message: '请选择航线管理', trigger: 'change' }],
+    // dzRemark: [{ required: false, message: '请选择单证备注', trigger: 'change' }],
+    // czRemark: [{ required: false, message: '请选择操作备注', trigger: 'change' }],
   },
   mailingRules: {
-    shipper: [{ required: false, message: '请输入发货人', trigger: 'submit' }],
-    consignee: [{ required: false, message: '请输入收货人', trigger: 'submit' }],
-    notifyparty: [{ required: false, message: '请输入通知人', trigger: 'submit' }],
-    yard: [{ required: false, message: '请输入场站', trigger: 'change' }],
-    feeself: [{ required: false, message: '请选择场站费自结', trigger: 'change' }],
-    customser: [{ required: false, message: '请输入报关行', trigger: 'change' }],
-    trucker: [{ required: false, message: '请输入车队', trigger: 'change' }],
-    agentname: [{ required: false, message: '请输入国外代理', trigger: 'change' }],
-    warehouse: [{ required: false, message: '请选择仓库', trigger: 'change' }],
-    shippingMethod: [{ required: false, message: '请选择装运方式', trigger: 'change' }],
-    closingdate: [{ required: false, message: '请选择截港时间', trigger: 'change' }],
-    closedocdate: [{ required: false, message: '请选择截单时间', trigger: 'change' }],
-    closevgmdate: [{ required: false, message: '请选择VGM时间', trigger: 'change' }],
-    placereceiptid: [{ required: false, message: '请选择收货地代码', trigger: 'change' }],
-    placereceipt: [{ required: false, message: '请选择收货地', trigger: 'change' }],
-    portloadid: [{ required: false, message: '请选择装货港代码', trigger: 'change' }],
-    portload: [{ required: false, message: '请选择装货港', trigger: 'change' }],
-    transportid: [{ required: false, message: '请选择中转港代码', trigger: 'change' }],
-    transport: [{ required: false, message: '请选择中转港', trigger: 'change' }],
-    portdischargeid: [{ required: false, message: '请选择卸货港代码', trigger: 'change' }],
-    portdischarge: [{ required: false, message: '请选择卸货港', trigger: 'change' }],
-    destinationid: [{ required: false, message: '请选择目的代码', trigger: 'change' }],
-    destination: [{ required: false, message: '请选择目的地', trigger: 'change' }],
-    placedeliveryid: [{ required: true, message: '请选择交货代码', trigger: 'change' }],
-    placedelivery: [{ required: true, message: '请选择交货地', trigger: 'change' }],
-    pkgs: [{ required: false, message: '请输入件数', trigger: 'change' }],
-    kindpkgs: [{ required: false, message: '请输入包装', trigger: 'change' }],
-    kgs: [{ required: false, message: '请输入毛重', trigger: 'change' }],
-    cbm: [{ required: false, message: '请输入尺寸', trigger: 'change' }],
-    blfrt: [{ required: false, message: '请选择付费方式', trigger: 'change' }],
+    // shipper: [{ required: false, message: '请输入发货人', trigger: 'submit' }],
+    // consignee: [{ required: false, message: '请输入收货人', trigger: 'submit' }],
+    // notifyparty: [{ required: false, message: '请输入通知人', trigger: 'submit' }],
+    // yard: [{ required: false, message: '请输入场站', trigger: 'change' }],
+    // feeself: [{ required: false, message: '请选择场站费自结', trigger: 'change' }],
+    // customser: [{ required: false, message: '请输入报关行', trigger: 'change' }],
+    // trucker: [{ required: false, message: '请输入车队', trigger: 'change' }],
+    // agentname: [{ required: false, message: '请输入国外代理', trigger: 'change' }],
+    // warehouse: [{ required: false, message: '请选择仓库', trigger: 'change' }],
+    // shippingMethod: [{ required: false, message: '请选择装运方式', trigger: 'change' }],
+    // closingdate: [{ required: false, message: '请选择截港时间', trigger: 'change' }],
+    // closedocdate: [{ required: false, message: '请选择截单时间', trigger: 'change' }],
+    // closevgmdate: [{ required: false, message: '请选择VGM时间', trigger: 'change' }],
+    // placereceiptid: [{ required: false, message: '请选择收货地代码', trigger: 'change' }],
+    // placereceipt: [{ required: false, message: '请选择收货地', trigger: 'change' }],
+    // portloadid: [{ required: false, message: '请选择装货港代码', trigger: 'change' }],
+    // portload: [{ required: false, message: '请选择装货港', trigger: 'change' }],
+    // transportid: [{ required: false, message: '请选择中转港代码', trigger: 'change' }],
+    // transport: [{ required: false, message: '请选择中转港', trigger: 'change' }],
+    // portdischargeid: [{ required: false, message: '请选择卸货港代码', trigger: 'change' }],
+    // portdischarge: [{ required: false, message: '请选择卸货港', trigger: 'change' }],
+    // destinationid: [{ required: false, message: '请选择目的代码', trigger: 'change' }],
+    // destination: [{ required: false, message: '请选择目的地', trigger: 'change' }],
+    // placedeliveryid: [{ required: true, message: '请选择交货代码', trigger: 'change' }],
+    // placedelivery: [{ required: true, message: '请选择交货地', trigger: 'change' }],
+    // pkgs: [{ required: false, message: '请输入件数', trigger: 'change' }],
+    // kindpkgs: [{ required: false, message: '请输入包装', trigger: 'change' }],
+    // kgs: [{ required: false, message: '请输入毛重', trigger: 'change' }],
+    // cbm: [{ required: false, message: '请输入尺寸', trigger: 'change' }],
+    // blfrt: [{ required: false, message: '请选择付费方式', trigger: 'change' }],
   },
   cargoRules: {
-    marks: [{ required: false, message: '请输入Seal No.  Marks & Nos', trigger: 'change' }],
-    cargoid: [{ required: false, message: '请选择货物标志', trigger: 'change' }],
-    hscode: [{ required: false, message: '请输入HS编码', trigger: 'change' }],
-    description: [{ required: false, message: '请输入包装种类与货名', trigger: 'change' }],
-    goodsname: [{ required: false, message: '请选择品名', trigger: 'change' }],
+    // marks: [{ required: false, message: '请输入Seal No.  Marks & Nos', trigger: 'change' }],
+    // cargoid: [{ required: false, message: '请选择货物标志', trigger: 'change' }],
+    // hscode: [{ required: false, message: '请输入HS编码', trigger: 'change' }],
+    // description: [{ required: false, message: '请输入包装种类与货名', trigger: 'change' }],
+    // goodsname: [{ required: false, message: '请选择品名', trigger: 'change' }],
   },
   billRules: {
-    issuetype: [{ required: false, message: '请选择签单方式', trigger: 'change' }],
-    issuedate: [{ required: false, message: '请选择签单日期', trigger: 'change' }],
-    issueplace: [{ required: false, message: '请选择签单地点', trigger: 'change' }],
-    issueplaceid: [{ required: false, message: '请输入签单地代码', trigger: 'change' }],
-    nobill: [{ required: false, message: '请选择提单份数', trigger: 'change' }],
-    copynobill: [{ required: false, message: '请选择副本份数', trigger: 'change' }],
-    prepardat: [{ required: false, message: '请选择预付地点', trigger: 'change' }],
-    payableat: [{ required: false, message: '请选择到付地点', trigger: 'change' }],
-    blfrt: [{ required: false, message: '请选择付费方式', trigger: 'change' }],
-    thirdpayaddr: [{ required: false, message: '请输入第三付款地', trigger: 'change' }],
-    service: [{ required: false, message: '请选择运输条款', trigger: 'change' }],
-    reeferf: [{ required: false, message: '请输入冷藏通风量', trigger: 'change' }],
-    tempset: [{ required: false, message: '请输入温度', trigger: 'change' }],
-    tempid: [{ required: false, message: '请选择温度单位', trigger: 'change' }],
-    tempmin: [{ required: false, message: '请输入最低温度', trigger: 'change' }],
-    tempmax: [{ required: false, message: '请输入最高温度', trigger: 'change' }],
-    humidity: [{ required: false, message: '请输入湿度', trigger: 'change' }],
-    dclass: [{ required: false, message: '请输入危险品等级', trigger: 'change' }],
-    dunno: [{ required: false, message: '请输入危险品编号', trigger: 'change' }],
-    dpage: [{ required: false, message: '请输入危险品页号', trigger: 'change' }],
-    dlabel: [{ required: false, message: '请输入危险品标签', trigger: 'change' }],
-    linkman: [{ required: false, message: '请输入危险品联系人', trigger: 'change' }],
+    // issuetype: [{ required: false, message: '请选择签单方式', trigger: 'change' }],
+    // issuedate: [{ required: false, message: '请选择签单日期', trigger: 'change' }],
+    // issueplace: [{ required: false, message: '请选择签单地点', trigger: 'change' }],
+    // issueplaceid: [{ required: false, message: '请输入签单地代码', trigger: 'change' }],
+    // nobill: [{ required: false, message: '请选择提单份数', trigger: 'change' }],
+    // copynobill: [{ required: false, message: '请选择副本份数', trigger: 'change' }],
+    // prepardat: [{ required: false, message: '请选择预付地点', trigger: 'change' }],
+    // payableat: [{ required: false, message: '请选择到付地点', trigger: 'change' }],
+    // blfrt: [{ required: false, message: '请选择付费方式', trigger: 'change' }],
+    // thirdpayaddr: [{ required: false, message: '请输入第三付款地', trigger: 'change' }],
+    // service: [{ required: false, message: '请选择运输条款', trigger: 'change' }],
+    // reeferf: [{ required: false, message: '请输入冷藏通风量', trigger: 'change' }],
+    // tempset: [{ required: false, message: '请输入温度', trigger: 'change' }],
+    // tempid: [{ required: false, message: '请选择温度单位', trigger: 'change' }],
+    // tempmin: [{ required: false, message: '请输入最低温度', trigger: 'change' }],
+    // tempmax: [{ required: false, message: '请输入最高温度', trigger: 'change' }],
+    // humidity: [{ required: false, message: '请输入湿度', trigger: 'change' }],
+    // dclass: [{ required: false, message: '请输入危险品等级', trigger: 'change' }],
+    // dunno: [{ required: false, message: '请输入危险品编号', trigger: 'change' }],
+    // dpage: [{ required: false, message: '请输入危险品页号', trigger: 'change' }],
+    // dlabel: [{ required: false, message: '请输入危险品标签', trigger: 'change' }],
+    // linkman: [{ required: false, message: '请输入危险品联系人', trigger: 'change' }],
   },
   remarksRules: {
-    soremark: [{ required: false, message: '请输入订舱备注', trigger: 'change' }],
-    siremark: [{ required: false, message: '请输入截单备注', trigger: 'change' }],
+    // soremark: [{ required: false, message: '请输入订舱备注', trigger: 'change' }],
+    // siremark: [{ required: false, message: '请输入截单备注', trigger: 'change' }],
   },
   ediRules: {
-    'bookingEDIExt.sendCode': [
-      { required: false, message: '请输入发送方EDI代码', trigger: 'change' },
-    ],
-    'bookingEDIExt.receiveCode': [
-      { required: false, message: '请输入接收方EDI代码', trigger: 'change' },
-    ],
-    'bookingEDIExt.ediAttn': [
-      { required: false, message: '请输入EDI联系人名称', trigger: 'change' },
-    ],
-    'bookingEDIExt.ediAttnTel': [
-      { required: false, message: '请输入EDI联系人电话', trigger: 'change' },
-    ],
-    'bookingEDIExt.ediAttnMail': [
-      { required: false, message: '请输入EDI联系人邮箱', trigger: 'change' },
-    ],
-    'bookingEDIExt.amsConsignee': [
-      { required: false, message: '请输入AMS收货人', trigger: 'change' },
-    ],
-    'bookingEDIExt.amsNotifyParty': [
-      { required: false, message: '请输入AMS通知人', trigger: 'change' },
-    ],
-    'bookingEDIExt.opEName': [
-      { required: false, message: '请输入操作英文名称', trigger: 'change' },
-    ],
-    'bookingEDIExt.opTel': [{ required: false, message: '请输入操作电话', trigger: 'change' }],
-    'bookingEDIExt.opEmail': [{ required: false, message: '请输入操作邮箱', trigger: 'change' }],
-    'bookingEDIExt.goodsName': [{ required: false, message: '请输入商品名称', trigger: 'change' }],
-    iscontainersoc: [{ required: false, message: '请输入SOC箱', trigger: 'change' }],
-    scaccode: [{ required: false, message: '请输入SCAC代码', trigger: 'change' }],
-    itncode: [{ required: false, message: '请输入ITN编号', trigger: 'change' }],
-    'bookingEDIExt.orderRemark': [
-      { required: false, message: '请输入订舱人说明', trigger: 'change' },
-    ],
-    freightpayer: [{ required: false, message: '请输入付款方', trigger: 'change' }],
-    'bookingEDIExt.kingTareweight': [
-      { required: false, message: '请输入第一层包装皮重', trigger: 'change' },
-    ],
-    'bookingEDIExt.weiTuoFang': [{ required: false, message: '请输入委托方', trigger: 'change' }],
-    'bookingEDIExt.exRemark1': [{ required: false, message: '请输入辅助字段1', trigger: 'change' }],
-    'bookingEDIExt.exRemark2': [{ required: false, message: '请输入辅助字段2', trigger: 'change' }],
-    'bookingEDIExt.exRemark3': [{ required: false, message: '请输入辅助字段3', trigger: 'change' }],
-    'bookingEDIExt.exRemark4': [{ required: false, message: '请输入辅助字段4', trigger: 'change' }],
-    'bookingEDIExt.consigneeEdiCode': [
-      { required: false, message: '请输入收货人EDI代码', trigger: 'change' },
-    ],
-    'bookingEDIExt.shipperEdiCode': [
-      { required: false, message: '请输入发货人EDI代码', trigger: 'change' },
-    ],
-    'bookingEDIExt.notifyCdoe': [
-      { required: false, message: '请输入通知方EDI代码', trigger: 'change' },
-    ],
-    'bookingEDIExt.salerCode': [
-      { required: false, message: '请输入太平销售EDI代码', trigger: 'change' },
-    ],
-    'bookingEDIExt.emanifestHbl': [
-      { required: false, message: '请输入EMANIFEST HBL', trigger: 'change' },
-    ],
-    'bookingEDIExt.masterBolIndicator': [
-      { required: false, message: '请输入Master Bol Indicator', trigger: 'change' },
-    ],
-    'bookingEDIExt.s0CC0C': [{ required: false, message: '请输入S0C C0C', trigger: 'change' }],
-    'bookingEDIExt.ckhi': [
-      { required: false, message: '请输入欧盟港口、伊朗港口、KHI', trigger: 'change' },
-    ],
-    'bookingEDIExt.cncm': [{ required: false, message: '请输入南美东', trigger: 'change' }],
-    'bookingEDIExt.wncm': [
-      { required: false, message: '请输入巴西线木质包装情况', trigger: 'change' },
-    ],
-    'bookingEDIExt.acihbl': [{ required: false, message: '请输入ACI HBL', trigger: 'change' }],
+    // 'bookingEDIExt.sendCode': [
+    //   { required: false, message: '请输入发送方EDI代码', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.receiveCode': [
+    //   { required: false, message: '请输入接收方EDI代码', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.ediAttn': [
+    //   { required: false, message: '请输入EDI联系人名称', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.ediAttnTel': [
+    //   { required: false, message: '请输入EDI联系人电话', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.ediAttnMail': [
+    //   { required: false, message: '请输入EDI联系人邮箱', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.amsConsignee': [
+    //   { required: false, message: '请输入AMS收货人', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.amsNotifyParty': [
+    //   { required: false, message: '请输入AMS通知人', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.opEName': [
+    //   { required: false, message: '请输入操作英文名称', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.opTel': [{ required: false, message: '请输入操作电话', trigger: 'change' }],
+    // 'bookingEDIExt.opEmail': [{ required: false, message: '请输入操作邮箱', trigger: 'change' }],
+    // 'bookingEDIExt.goodsName': [{ required: false, message: '请输入商品名称', trigger: 'change' }],
+    // iscontainersoc: [{ required: false, message: '请输入SOC箱', trigger: 'change' }],
+    // scaccode: [{ required: false, message: '请输入SCAC代码', trigger: 'change' }],
+    // itncode: [{ required: false, message: '请输入ITN编号', trigger: 'change' }],
+    // 'bookingEDIExt.orderRemark': [
+    //   { required: false, message: '请输入订舱人说明', trigger: 'change' },
+    // ],
+    // freightpayer: [{ required: false, message: '请输入付款方', trigger: 'change' }],
+    // 'bookingEDIExt.kingTareweight': [
+    //   { required: false, message: '请输入第一层包装皮重', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.weiTuoFang': [{ required: false, message: '请输入委托方', trigger: 'change' }],
+    // 'bookingEDIExt.exRemark1': [{ required: false, message: '请输入辅助字段1', trigger: 'change' }],
+    // 'bookingEDIExt.exRemark2': [{ required: false, message: '请输入辅助字段2', trigger: 'change' }],
+    // 'bookingEDIExt.exRemark3': [{ required: false, message: '请输入辅助字段3', trigger: 'change' }],
+    // 'bookingEDIExt.exRemark4': [{ required: false, message: '请输入辅助字段4', trigger: 'change' }],
+    // 'bookingEDIExt.consigneeEdiCode': [
+    //   { required: false, message: '请输入收货人EDI代码', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.shipperEdiCode': [
+    //   { required: false, message: '请输入发货人EDI代码', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.notifyCdoe': [
+    //   { required: false, message: '请输入通知方EDI代码', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.salerCode': [
+    //   { required: false, message: '请输入太平销售EDI代码', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.emanifestHbl': [
+    //   { required: false, message: '请输入EMANIFEST HBL', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.masterBolIndicator': [
+    //   { required: false, message: '请输入Master Bol Indicator', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.s0CC0C': [{ required: false, message: '请输入S0C C0C', trigger: 'change' }],
+    // 'bookingEDIExt.ckhi': [
+    //   { required: false, message: '请输入欧盟港口、伊朗港口、KHI', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.cncm': [{ required: false, message: '请输入南美东', trigger: 'change' }],
+    // 'bookingEDIExt.wncm': [
+    //   { required: false, message: '请输入巴西线木质包装情况', trigger: 'change' },
+    // ],
+    // 'bookingEDIExt.acihbl': [{ required: false, message: '请输入ACI HBL', trigger: 'change' }],
   },
   tableRules: {
-    ctnall: { required: false, title: '箱型', message: '请选择箱型', trigger: 'change' },
-    ctnnum: { required: false, title: '箱量', message: '请选择箱量', trigger: 'change' },
-    cntrno: { required: false, title: '箱号', message: '请选择箱号', trigger: 'change' },
-    sealno: { required: false, title: '封号', message: '请选择封号', trigger: 'change' },
-    pkgs: { required: false, title: '件数', message: '请选择件数', trigger: 'change' },
-    kindpkgs: { required: false, title: '包装', message: '请选择包装', trigger: 'change' },
-    kgs: { required: false, title: '重量', message: '请选择重量', trigger: 'change' },
-    cbm: { required: false, title: '尺码', message: '请选择尺码', trigger: 'change' },
-    tareweight: { required: false, title: '箱皮重', message: '请选择箱皮重', trigger: 'change' },
-    weightype: { required: false, title: '称重方式', message: '请选择称重方式', trigger: 'change' },
-    weighkgs: { required: false, title: '称重重量', message: '请选择称重重量', trigger: 'change' },
+    // ctnall: { required: false, title: '箱型', message: '请选择箱型', trigger: 'change' },
+    // ctnnum: { required: false, title: '箱量', message: '请选择箱量', trigger: 'change' },
+    // cntrno: { required: false, title: '箱号', message: '请选择箱号', trigger: 'change' },
+    // sealno: { required: false, title: '封号', message: '请选择封号', trigger: 'change' },
+    // pkgs: { required: false, title: '件数', message: '请选择件数', trigger: 'change' },
+    // kindpkgs: { required: false, title: '包装', message: '请选择包装', trigger: 'change' },
+    // kgs: { required: false, title: '重量', message: '请选择重量', trigger: 'change' },
+    // cbm: { required: false, title: '尺码', message: '请选择尺码', trigger: 'change' },
+    // tareweight: { required: false, title: '箱皮重', message: '请选择箱皮重', trigger: 'change' },
+    // weightype: { required: false, title: '称重方式', message: '请选择称重方式', trigger: 'change' },
+    // weighkgs: { required: false, title: '称重重量', message: '请选择称重重量', trigger: 'change' },
   },
   preRules: {
     ctn: { required: false, title: '箱型', message: '请选择箱型', trigger: 'change' },
diff --git a/src/views/operation/seaexport/index.vue b/src/views/operation/seaexport/index.vue
index d3436036..f29fe2b2 100644
--- a/src/views/operation/seaexport/index.vue
+++ b/src/views/operation/seaexport/index.vue
@@ -83,12 +83,9 @@
             <vxe-toolbar>
               <template #buttons>
                 <div class="nav-box">
-                  <div class="nav" @click="addBooking"
-                    ><i class="iconfont icon-jiahao2fill"></i>新建</div
-                  >
-                  <div class="nav" @click="addBooking2"
-                    ><i class="iconfont icon-jiahao2fill"></i>Test跳转</div
-                  >
+                  <div class="nav" @click="addBooking">
+                    <i class="iconfont icon-jiahao2fill"></i>新建
+                  </div>
                   <div class="nav" @click="copyBooking"
                     ><i class="iconfont icon-fuzhi"></i>复制</div
                   >
@@ -1082,45 +1079,6 @@
           </a-spin>
         </div>
       </a-modal>
-      <a-modal
-        :mask-closable="false"
-        :width="1700"
-        :visible="addVisible"
-        @ok="addSubmit"
-        @cancel="addCancel"
-      >
-        <a-radio-group v-model="carrierRadio" class="group-label-box">
-          <p v-if="RecentlyCarrierData.length" class="Awrapper"
-            >最近使用 <span class="line"></span
-          ></p>
-          <div v-if="RecentlyCarrierData.length" class="group-label">
-            <a-radio
-              v-for="item in RecentlyCarrierData"
-              :key="item.code"
-              :style="radioStyle"
-              :value="item.code"
-            >
-              <img class="radio-logo" :src="item.ImgSrc" />
-              {{ item.cnName }}
-            </a-radio>
-          </div>
-
-          <div v-for="e in Object.keys(RcarrierData)" :key="e">
-            <p class="Awrapper">{{ e }}<span class="line"></span></p>
-            <div class="group-label">
-              <a-radio
-                v-for="item in RcarrierData[e]"
-                :key="item.code"
-                :style="radioStyle"
-                :value="item.code"
-              >
-                <img class="radio-logo" :src="item.ImgSrc" />
-                {{ item.cnName }}
-              </a-radio>
-            </div>
-          </div>
-        </a-radio-group>
-      </a-modal>
       <a-modal
         title="多提单号查询"
         :mask-closable="false"
@@ -1663,7 +1621,6 @@
   })
   const tableOrderLabel = ref('')
   const tableOrderType = ref('')
-  const addVisible = ref(false)
   const carrierRadio = ref('CMA')
   const RecentlyCarrierData = ref([])
   const addNum = ref(0)
@@ -2036,6 +1993,10 @@
         console.log(err)
       })
   }
+  function addBooking() {
+    addNum.value = Math.round(Math.random() * 1000)
+    go(`/BookingDetail?type=OOCL&addNum=${addNum.value}`)
+  }
   // ====================================================
   function getListByone(listId, listIndex) {
     PageDataByBooking({ id: listId }).then((res) => {
@@ -2139,7 +2100,6 @@
     }
     FnGetUserQuerySet()
     getConfigUser(true)
-    getCarrier()
   }
   async function FnGetUserQuerySet() {
     const res: API.DataResult = await GetUserQuerySet({
@@ -2653,104 +2613,6 @@
         return GetTenantLineList
     }
   }
-  function addBooking() {
-    addVisible.value = !addVisible.value
-  }
-  function addBooking2() {
-    go(`/BookingDetail?type=Add`)
-  }
-  function addSubmit() {
-    const data = []
-    data.push(carrierRadio.value)
-    if (RecentlyCarrierData.value.length) {
-      RecentlyCarrierData.value.forEach((item) => {
-        if (item.code != carrierRadio.value && data.length < 10) {
-          data.push(item.code)
-        }
-      })
-    }
-
-    DjyUserConfigAdd({
-      type: 'booking_memory',
-      configJson: JSON.stringify(data),
-    }).then((res) => {
-      getCarrier()
-      addVisible.value = false
-      addNum.value = Math.round(Math.random() * 1000)
-      go(`/BookingDetail?type=${carrierRadio.value}&addNum=${addNum.value}`)
-    })
-  }
-  function getCarrier() {
-    const Rdata = (data) => {
-      const RData = {}
-      for (var i = 0; i < 26; i++) {
-        RData[String.fromCharCode(65 + i)] = []
-        data.forEach((item) => {
-          if (String.fromCharCode(65 + i) == item.enName[0].toUpperCase()) {
-            RData[String.fromCharCode(65 + i)].push(item)
-          }
-        })
-      }
-      const Obj = {
-        'A-D': ['A', 'B', 'C', 'D'],
-        'E-L': ['E', 'F', 'G', 'H', 'I', 'J', 'K', 'L'],
-        'M-R': ['M', 'N', 'O', 'P', 'Q', 'R'],
-        'S-U': ['S', 'T', 'U'],
-        'V-Z': ['V', 'W', 'X', 'Y', 'Z'],
-      }
-      const Data = {
-        'A-D': [],
-        'E-L': [],
-        'M-R': [],
-        'S-U': [],
-        'V-Z': [],
-      }
-      Object.keys(Obj).forEach((e) => {
-        Obj[e].forEach((item) => {
-          RData[item].forEach((Ai, AiIndex) => {
-            let imgSrc = ''
-            try {
-              imgSrc = require(`@/assets/logo/${Ai.code}.png`)
-            } catch (error) {
-              // imgSrc = require('@/assets/logo/default.png')
-            }
-            RData[item][AiIndex].ImgSrc = imgSrc
-          })
-          Data[e].push(...RData[item])
-        })
-      })
-      RcarrierData.value = Data
-    }
-    GetCarrierlist()
-      .then((res) => {
-        if (res.code === 200) {
-          Rdata(res.data)
-          DjyUserConfigGet({ type: 'booking_memory' })
-            .then((e) => {
-              if (e.data) {
-                const data = []
-                JSON.parse(e.data.configJson).forEach((item) => {
-                  res.data.forEach((item2) => {
-                    if (item == item2.code) {
-                      data.push(item2)
-                    }
-                  })
-                })
-                RecentlyCarrierData.value = data
-              }
-            })
-            .catch(() => {
-              Rdata(res.data)
-            })
-        }
-      })
-      .catch((err) => {
-        console.log(err)
-      })
-  }
-  function addCancel() {
-    addVisible.value = false
-  }
   function copyBooking() {
     const select = xGrid.value.getCheckboxRecords()
     const pkIdArr = select.map((item, index) => {