diff --git a/ds-wms-client-web/package.json b/ds-wms-client-web/package.json
index cea623f0..13e14e7a 100644
--- a/ds-wms-client-web/package.json
+++ b/ds-wms-client-web/package.json
@@ -157,6 +157,7 @@
     "vite-plugin-vue-setup-extend": "^0.4.0",
     "vite-plugin-windicss": "^1.8.4",
     "vite-ssg": "^0.23.1",
+    "vue-easytable": "^2.27.1",
     "vue-eslint-parser": "^8.3.0",
     "vue-tsc": "^1.8.11"
   },
diff --git a/ds-wms-client-web/src/main.ts b/ds-wms-client-web/src/main.ts
index 09937a86..2ccb36f8 100644
--- a/ds-wms-client-web/src/main.ts
+++ b/ds-wms-client-web/src/main.ts
@@ -19,7 +19,9 @@ import '/@/styles/element/index.scss'
 
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
+
 import 'vxe-table/lib/style.css'
+
 if (isDevMode()) {
   import('ant-design-vue/es/style')
 }
diff --git a/ds-wms-client-web/src/views/operation/seaexport/asd.json b/ds-wms-client-web/src/views/operation/seaexport/asd.json
index a64746db..9e7affe7 100644
--- a/ds-wms-client-web/src/views/operation/seaexport/asd.json
+++ b/ds-wms-client-web/src/views/operation/seaexport/asd.json
@@ -1,20 +1,25 @@
 [
+  { "FieldName": "MBLNO", "FieldValue": "1", "ConditionalType": 1 },
   {
     "ConditionalList": [
+      { "Key": 0, "Value": { "FieldName": "Cntr10", "FieldValue": "equal", "ConditionalType": 2 } },
       {
-        "Key": -1,
-        "Value": {
-          "FieldName": "id",
-          "FieldValue": "2",
-          "ConditionalType": 0
-        }
+        "Key": 0,
+        "Value": { "FieldName": "MasterNo", "FieldValue": "contains", "ConditionalType": 12412 }
       },
       {
         "Key": 0,
         "Value": {
-          "FieldName": "name",
-          "FieldValue": "2",
-          "ConditionalType": 0
+          "ConditionalList": [
+            {
+              "Key": 0,
+              "Value": { "FieldName": "BSNO", "FieldValue": "GreaterThan", "ConditionalType": 1 }
+            },
+            {
+              "Key": 0,
+              "Value": { "FieldName": "BusinessDate", "FieldValue": "equal", "ConditionalType": 2 }
+            }
+          ]
         }
       },
       {
@@ -22,20 +27,16 @@
         "Value": {
           "ConditionalList": [
             {
-              "Key": -1,
+              "Key": 1,
               "Value": {
-                "FieldName": "price",
-                "FieldValue": "1",
-                "ConditionalType": 0
+                "FieldName": "BusinessStatus",
+                "FieldValue": "GreaterThanOrEqual",
+                "ConditionalType": 3
               }
             },
             {
-              "Key": 0,
-              "Value": {
-                "FieldName": "CustomId",
-                "FieldValue": "1",
-                "ConditionalType": 0
-              }
+              "Key": 1,
+              "Value": { "FieldName": "Yard", "FieldValue": "equal", "ConditionalType": 4 }
             }
           ]
         }
diff --git a/ds-wms-client-web/src/views/operation/seaexport/detail/index.vue b/ds-wms-client-web/src/views/operation/seaexport/detail/index.vue
index 0163c9bb..dfdad703 100644
--- a/ds-wms-client-web/src/views/operation/seaexport/detail/index.vue
+++ b/ds-wms-client-web/src/views/operation/seaexport/detail/index.vue
@@ -5,7 +5,7 @@
       :class="!Showtabs ? 'Showtabs' : ''"
       :tabBarStyle="tabBarStyle"
       :activeKey="tabActiveKey"
-      :animated="Object.keys($refs).includes('sedOrder') ? false : true"
+      :animated="Object.keys($refs).includes('RefsedOrder') ? false : true"
       @change="changeTab"
     >
       <a-tab-pane key="1" tab="主单信息" :forceRender="true">
@@ -82,7 +82,7 @@
                       @changeDetail="changeDetailFun"
                     ></cargoInfo>
                     <goodsTable
-                      ref="goodsTable"
+                      ref="RefgoodsTable"
                       :details="bookingDetails"
                       :rules="tableRules"
                       isParent="parent"
@@ -98,7 +98,7 @@
                 </div>
                 <div id="tab-content2" class="tab-content" v-show="mainOrderActiveKey === '2-2'">
                   <ediMore
-                    ref="ediMore"
+                    ref="RefediMore"
                     class="pane-box"
                     :details="bookingDetails"
                     :rules="ediRules"
@@ -125,7 +125,7 @@
           </a-col>
           <a-col :span="6" style="padding-left: 8px">
             <rightContent
-              ref="rightContent"
+              ref="RefrightContent"
               :id="id"
               :details="bookingDetails"
               :excuteRules="excuteRules"
@@ -143,6 +143,24 @@
           </a-col>
         </a-row>
       </a-tab-pane>
+      <a-tab-pane
+        key="2"
+        tab="分单信息"
+        :forceRender="true"
+        v-show="bookingDetails.hbList && bookingDetails.hbList.length > 0"
+      >
+        <sedOrder
+          ref="RefsedOrder"
+          :details="bookingDetails"
+          :parSedOrderList="bookingDetails.hbList"
+          :isAdd="isAdd"
+          :checkFrom="checkFrom"
+          :scrollTop="scrollTop"
+          @changeHB="changeHBFun"
+          @sedOrderRemove="sedOrderRemoveFun"
+        >
+        </sedOrder>
+      </a-tab-pane>
     </a-tabs>
   </div>
 </template>
@@ -186,6 +204,10 @@
   import basicInfo from './modules/basicInfo.vue'
   import mailingInfo from './modules/mailingInfo.vue'
   import cargoInfo from './modules/cargoInfo.vue'
+  import goodsTable from './modules/goodsTable.vue'
+  import ediMore from './modules/ediMore.vue'
+  import rightContent from './modules/rightContent.vue'
+  import sedOrder from './modules/sedOrder.vue'
   const initDetail = {
     id: 0,
     parentId: 0,
@@ -397,15 +419,15 @@
   const inChildLoading = ref(false)
   const scrollTop = ref(0)
   const iframe = ref()
-  const rightContent = ref()
+  const RefrightContent = ref()
   const excuteRules = ref([])
   const excuteRulesType = ref('')
-  const sedOrder = ref()
-  const goodsTable = ref()
+  const RefsedOrder = ref()
+  const RefgoodsTable = ref()
   const RefbasicInfo = ref()
   const RefmailingInfo = ref()
   const RefcargoInfo = ref()
-  const ediMore = ref()
+  const RefediMore = ref()
   const mainOrderActiveKey = ref('1-1')
   const ediRules = ref(rules.ediRules)
   const checkFrom = ref([])
@@ -483,9 +505,9 @@
         isCopy: isCopy.value,
         id: id.value,
       }
-      if (Object.keys(that.$refs).includes('sedOrder')) {
-        const secActive = sedOrder.value.$data.editIndex
-        hisData.secActive = secActive
+      if (Object.keys(that.$refs).includes('RefsedOrder')) {
+        const secActive = RefsedOrder.value.$data.editIndex
+        hisData.RefsedOrder = secActive
       }
       historyData.value[`copy-${id.value}`] = hisData
     } else if (route.query.addNum) {
@@ -500,9 +522,9 @@
         isCopy: isCopy.value,
         // id: id.value
       }
-      if (Object.keys(that.$refs).includes('sedOrder')) {
-        const secActive = sedOrder.value.$data.editIndex
-        hisData.secActive = secActive
+      if (Object.keys(that.$refs).includes('RefsedOrder')) {
+        const secActive = RefsedOrder.value.$data.editIndex
+        hisData.RefsedOrder = secActive
       }
       historyData.value[`add-${route.query.addNum}`] = hisData
     } else {
@@ -517,8 +539,8 @@
         isCopy: isCopy.value,
         id: id.value,
       }
-      if (Object.keys(that.$refs).includes('sedOrder')) {
-        const secActive = sedOrder.value.$data.editIndex
+      if (Object.keys(that.$refs).includes('RefsedOrder')) {
+        const secActive = RefsedOrder.value.$data.editIndex
         hisData.secActive = secActive
       }
       historyData.value[id.value] = hisData
@@ -554,8 +576,8 @@
         isCopy: isCopy.value,
         id: id.value,
       }
-      if (Object.keys(this.$refs).includes('sedOrder')) {
-        const secActive = sedOrder.value.$data.editIndex
+      if (Object.keys(this.$refs).includes('RefsedOrder')) {
+        const secActive = RefsedOrder.value.$data.editIndex
         hisData.secActive = secActive
       }
       if (!route.query.copyId) {
@@ -575,8 +597,8 @@
         isCopy: isCopy.value,
         // id: id.value
       }
-      if (Object.keys(that.$refs).includes('sedOrder')) {
-        const secActive = sedOrder.value.$data.editIndex
+      if (Object.keys(that.$refs).includes('RefsedOrder')) {
+        const secActive = RefsedOrder.value.$data.editIndex
         hisData.secActive = secActive
       }
       historyData.value[`add-${route.query.addNum}`] = hisData
@@ -592,8 +614,8 @@
         isCopy: isCopy.value,
         id: id.value,
       }
-      if (Object.keys(that.$refs).includes('sedOrder')) {
-        const secActive = sedOrder.value.$data.editIndex
+      if (Object.keys(that.$refs).includes('RefsedOrder')) {
+        const secActive = RefsedOrder.value.$data.editIndex
         hisData.secActive = secActive
       }
       historyData.value[id.value] = hisData
@@ -642,17 +664,17 @@
       setTimeout(() => {
         if (bookingDetails.value.hbList && bookingDetails.value.hbList.length > 0) {
           Showtabs.value = true
-          if (Object.keys(that.$refs).includes('sedOrder')) {
-            sedOrder.value.init(bookingDetails.value.hbList)
+          if (Object.keys(that.$refs).includes('RefsedOrder')) {
+            RefsedOrder.value.init(bookingDetails.value.hbList)
           }
         } else {
           Showtabs.value = false
-          if (Object.keys(that.$refs).includes('sedOrder')) {
-            sedOrder.value.init([])
+          if (Object.keys(that.$refs).includes('RefsedOrder')) {
+            RefsedOrder.value.init([])
           }
         }
         if (Object.keys(that.$refs).includes('goodsTable')) {
-          goodsTable.value.init()
+          RefgoodsTable.value.init()
         }
       }, 200)
       setTimeout(() => {
@@ -689,17 +711,17 @@
       setTimeout(() => {
         if (bookingDetails.value.hbList && bookingDetails.value.hbList.length > 0) {
           Showtabs.value = true
-          if (Object.keys(that.$refs).includes('sedOrder')) {
-            sedOrder.value.init(bookingDetails.value.hbList)
+          if (Object.keys(that.$refs).includes('RefsedOrder')) {
+            RefsedOrder.value.init(bookingDetails.value.hbList)
           }
         } else {
           Showtabs.value = false
-          if (Object.keys(that.$refs).includes('sedOrder')) {
-            sedOrder.value.init([])
+          if (Object.keys(that.$refs).includes('RefsedOrder')) {
+            RefsedOrder.value.init([])
           }
         }
         if (Object.keys(that.$refs).includes('goodsTable')) {
-          goodsTable.value.init()
+          RefgoodsTable.value.init()
         }
       }, 200)
       setTimeout(() => {
@@ -767,17 +789,17 @@
       setTimeout(() => {
         if (bookingDetails.value.hbList && bookingDetails.value.hbList.length > 0) {
           Showtabs.value = true
-          if (Object.keys(that.$refs).includes('sedOrder')) {
-            sedOrder.value.init(bookingDetails.value.hbList)
+          if (Object.keys(that.$refs).includes('RefsedOrder')) {
+            RefsedOrder.value.init(bookingDetails.value.hbList)
           }
         } else {
           Showtabs.value = false
-          if (Object.keys(that.$refs).includes('sedOrder')) {
-            sedOrder.value.init([])
+          if (Object.keys(that.$refs).includes('RefsedOrder')) {
+            RefsedOrder.value.init([])
           }
         }
         if (Object.keys(that.$refs).includes('goodsTable')) {
-          goodsTable.value.init()
+          RefgoodsTable.value.init()
         }
       }, 200)
       setTimeout(() => {
@@ -910,7 +932,7 @@
   }
   function handleSaveService(data) {
     if (route.query.id) {
-      rightContent.value.saveServiceBasic(data)
+      RefrightContent.value.saveServiceBasic(data)
     }
   }
   function changeDetailFun(data) {
@@ -931,15 +953,15 @@
     bookingDetails.value.cntrtotal = str
   }
   function handleRefshTable() {
-    goodsTable.value.loadingTable = true
+    RefgoodsTable.value.loadingTable = true
     GetCtnListRefsh({ orderId: bookingDetails.value.id }).then((res) => {
       if (res.success) {
         bookingDetails.value.ctnInputs = res.data
-        goodsTable.value.init()
+        RefgoodsTable.value.init()
       } else {
         notification.error({ message: res.message, duration: 3 })
       }
-      goodsTable.value.loadingTable = false
+      RefgoodsTable.value.loadingTable = false
     })
   }
   function changeTotalFun(data) {
@@ -989,7 +1011,7 @@
   function changeTab(e) {
     tabActiveKey.value = e
     setTimeout(() => {
-      sedOrder.value.init(bookingDetails.value.hbList)
+      RefsedOrder.value.init(bookingDetails.value.hbList)
     }, 100)
   }
   function refreshPage() {
@@ -1006,7 +1028,7 @@
     }
     setTimeout(() => {
       init()
-      rightContent.value.init()
+      RefrightContent.value.init()
     }, 100)
   }
   function init() {
@@ -1027,11 +1049,11 @@
       getFilter()
       getDefaultVal()
       setTimeout(() => {
-        if (Object.keys(that.$refs).includes('sedOrder')) {
-          sedOrder.value.init([])
+        if (Object.keys(that.$refs).includes('RefsedOrder')) {
+          RefsedOrder.value.init([])
         }
         if (Object.keys(that.$refs).includes('goodsTable')) {
-          goodsTable.value.init()
+          RefgoodsTable.value.init()
         }
         detailsLoadOver.value = true
       }, 200)
@@ -1318,7 +1340,7 @@
     tabActiveKey.value = '2'
     Showtabs.value = true
     setTimeout(() => {
-      sedOrder.value.init(bookingDetails.value.hbList)
+      RefsedOrder.value.init(bookingDetails.value.hbList)
     }, 200)
   }
   function removeOrderFun() {
@@ -1362,7 +1384,7 @@
     bookingDetails.value.cntrtotal = slots[0].ctN_STAT
     bookingDetails.value.startETA = slots[0].eta
     that.$forceUpdate()
-    goodsTable.value.init()
+    RefgoodsTable.value.init()
   }
   function handleSaveCtnList(data, slots) {
     const arr = []
@@ -1373,7 +1395,7 @@
     })
     bookingDetails.value.ctnInputs = arr
     bookingDetails.value.slots = slots
-    goodsTable.value.init()
+    RefgoodsTable.value.init()
   }
   function handleSetCtnList() {
     bookingDetails.value.slots = []
@@ -1454,9 +1476,9 @@
       notification.error({ message: '保存失败，请检查必填项', duration: 3 })
       return false
     }
-    if (ediMore.value) {
+    if (RefediMore.value) {
       let ediFrom = true
-      ediMore.value.$refs.ediFrom.validate((valid) => {
+      RefediMore.value.$refs.ediFrom.validate((valid) => {
         ediFrom = valid
       })
       if (!ediFrom) {
@@ -1601,7 +1623,7 @@
               setTimeout(() => {
                 inAddSave.value = false
                 getRightAll()
-                rightContent.value.init()
+                RefrightContent.value.init()
               }, 2000)
             } else if (that.$route.query.mblno === that.bookingDetails.mblno) {
               that.isCopy = false
@@ -1690,7 +1712,7 @@
       kindpkgs = item.kindpkgs
     })
     const refsh = () => {
-      goodsTable.value.handleRefsh()
+      RefgoodsTable.value.handleRefsh()
     }
     const check = () => {
       if (bookingDetails.value.id !== 0) {
@@ -1882,8 +1904,8 @@
         isCopy: isCopy.value,
         id: id.value,
       }
-      if (Object.keys(that.$refs).includes('sedOrder')) {
-        const secActive = sedOrder.value.$data.editIndex
+      if (Object.keys(that.$refs).includes('RefsedOrder')) {
+        const secActive = RefsedOrder.value.$data.editIndex
         hisData.secActive = secActive
       }
       historyData.value[`copyMore-${id.value}`] = hisData
@@ -1901,13 +1923,13 @@
         Showtabs.value = true
       }
       if (!hasHbList.value && bookingDetails.value.hbList.length > 0) {
-        sedOrder.value.init(bookingDetails.value.hbList)
+        RefsedOrder.value.init(bookingDetails.value.hbList)
         hasHbList.value = true
       } else {
-        sedOrder.value.init([])
+        RefsedOrder.value.init([])
       }
       if (bookingDetails.value.ctnInputs.length > 0) {
-        goodsTable.value.init()
+        RefgoodsTable.value.init()
       }
     }, 1200)
     that.$forceUpdate()
@@ -2130,6 +2152,25 @@
     lastPages[key] = $data
     appStore.setneedSavePages(lastPages)
   }
+  function changeHBFun(data) {
+    const arr = []
+    data.map((item: any) => {
+      arr.push(item.isNoSave)
+    })
+    if (arr.includes(true)) {
+      bookingDetails.value.hbList = data
+      checkSaveFun({ type: 'hbList', hasChange: true })
+    } else {
+      checkSaveFun({ type: 'hbList', hasChange: false })
+    }
+  }
+  function sedOrderRemoveFun(sedData) {
+    bookingDetails.value.hbList = sedData
+    if (sedData.length === 0) {
+      Showtabs.value = false
+      tabActiveKey.value = '1'
+    }
+  }
 </script>
 <style lang="less" scoped>
   @import url('./style/index.less');
diff --git a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/cargoInfo copy.vue b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/cargoInfo copy.vue
deleted file mode 100644
index afb38b9d..00000000
--- a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/cargoInfo copy.vue	
+++ /dev/null
@@ -1,1079 +0,0 @@
-<template>
-  <a-collapse class="collapse-box" :bordered="false" v-model="showKey">
-    <a-collapse-panel key="1" :showArrow="false">
-      <template slot="header">
-        <div class="base-tit"
-          ><i class="iconfont icon-goods"></i>货物信息
-          <span class="click-btn" @click.stop="tabStopFun"></span
-        ></div>
-      </template>
-      <template slot="extra">
-        <div class="tab-change"
-          ><i class="iconfont icon-xia" :class="{ active: !showKey.includes('1') }"></i
-        ></div>
-      </template>
-      <div class="container cargo-info">
-        <a-form :selfUpdate="true" ref="cargoFrom" :model="details" :rules="rules">
-          <a-row :gutter="10">
-            <a-col :span="5">
-              <div
-                class="cargo-info-tit"
-                :class="{ required: rules['marks'] && rules['marks'][0].required }"
-              >
-                <div
-                  >Seal No.(封志号)<span
-                    @click="handleOpen(1)"
-                    style="cursor: pointer"
-                    class="copy-btn iconfont icon-bianji"
-                  ></span
-                ></div>
-                <div>Marks & Nos.(标记与号码)</div>
-              </div>
-              <a-form-item has-feedback prop="marks" class="textarea-label" label="">
-                <div class="bottom">
-                  <textareaView
-                    class="input-box"
-                    id="marks-scroll"
-                    :parentVal="details.marks"
-                    type="marks"
-                    :disabled="BookingLockOrder['marks'] && isLockBooking"
-                    :height="100"
-                    :openToCDB="true"
-                    @getTextareaChange="getTextareaChange"
-                  />
-                  <div
-                    class="line-count"
-                    id="marks-scroll-right"
-                    v-if="Object.keys(details).length > 1 && details.marks.length > 1"
-                  >
-                    <div v-for="(num, index) in details.marks.split('\n')" :key="index">{{
-                      num.length
-                    }}</div>
-                  </div>
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="10">
-              <div class="line">
-                <!-- <div
-                  class="left"
-                  :class="{ 'required': rules['description'] && rules['description'][0].required }"
-                  v-if="details.carrierid !== 'PIL'">
-                  <div>Description of Goods</div>
-                  <div>(包装种类与货名)<span
-                    @click="handleOpen(2)"
-                    style="cursor: pointer;"
-                    class="copy-btn iconfont icon-bianji"></span></div>
-                </div> -->
-                <div class="left">
-                  <div
-                    class="title"
-                    :class="{ required: rules['description'] && rules['description'][0].required }"
-                  >
-                    <span
-                      @click="handleOpen(2)"
-                      style="cursor: pointer; color: black; margin: 0px"
-                      class="copy-btn iconfont icon-bianji"
-                    ></span>
-                    Description of Goods (包装种类与货名)</div
-                  >
-                  <a-form-item
-                    has-feedback
-                    prop="goodsname"
-                    label=""
-                    :class="{
-                      'goods-name-box': rules['goodsname'] && rules['goodsname'][0].required,
-                    }"
-                  >
-                    <i
-                      style="top: 4px"
-                      class="icon required goods-required"
-                      v-if="rules['goodsname'] && rules['goodsname'][0].required"
-                    ></i>
-                    <!-- :showLabel="['goodsNameEN', 'goodsCode']" -->
-                    <selectView
-                      type="goodsname"
-                      :defaultVal="details.goodsname"
-                      searchApi="getGoodsname"
-                      :disabled="BookingLockOrder['goodsname'] && isLockBooking"
-                      :searchQuery="{ queryItem: '', top: 50 }"
-                      :showLabel="['goodsNameEN', 'goodsCode']"
-                      :openSearch="true"
-                      @change="getSelectViewRes"
-                      style="width: 75%; max-width: 210px"
-                    ></selectView>
-                  </a-form-item>
-                </div>
-                <div class="cargo-mark">
-                  <div
-                    :class="{ required: rules['cargoid'] && rules['cargoid'][0].required }"
-                    class="tit"
-                    >货物标志</div
-                  >
-                  <a-form-item
-                    class="cargoid"
-                    has-feedback
-                    prop="cargoid"
-                    label=""
-                    style="margin-top: -6px"
-                  >
-                    <selectView
-                      type="cargoid"
-                      :defaultVal="details.cargoid"
-                      searchApi="cargoData"
-                      :searchQuery="{ name: '' }"
-                      :disabled="BookingLockOrder['cargoid'] && isLockBooking"
-                      :showLabel="['name']"
-                      :openSearch="false"
-                      @change="getSelectViewRes"
-                      style="width: 120px; margin-top: 7px"
-                    ></selectView>
-                  </a-form-item>
-                </div>
-                <div class="input">
-                  <div
-                    :class="{ required: rules['hscode'] && rules['hscode'][0].required }"
-                    calss="tit"
-                    >HS编码</div
-                  >
-                  <a-form-item
-                    class="cargoid"
-                    has-feedback
-                    prop="hscode"
-                    label=""
-                    style="margin-top: -2px"
-                  >
-                    <!-- <a-input size="small" :allowClear="true" v-model="details.hscode" /> -->
-                    <inputView
-                      :ishd="BookingLockOrder['hscode'] && isLockBooking"
-                      type="hscode"
-                      size="small"
-                      :parentVal="details.hscode"
-                      @getInputChange="inputChange"
-                    />
-                  </a-form-item>
-                </div>
-              </div>
-              <a-form-item has-feedback prop="description" class="textarea-label" label="">
-                <div class="bottom">
-                  <textareaView
-                    id="description-scroll"
-                    class="input-box"
-                    :parentVal="details.description"
-                    :disabled="BookingLockOrder['description'] && isLockBooking"
-                    type="description"
-                    :height="100"
-                    :openToCDB="true"
-                    @getTextareaChange="getTextareaChange"
-                  />
-                  <div
-                    class="line-count"
-                    id="description-scroll-right"
-                    v-if="Object.keys(details).length > 1 && details.description.length > 1"
-                  >
-                    <div v-for="(num, index) in details.description.split('\n')" :key="index">{{
-                      num.length
-                    }}</div>
-                  </div>
-                </div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="9">
-              <a-col :span="12">
-                <a-form-item
-                  class="from-label pkgs-line-box"
-                  label="件数"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  has-feedback
-                  prop="pkgs"
-                >
-                  <div class="line-box">
-                    <a-input
-                      :allowClear="true"
-                      size="small"
-                      :disabled="BookingLockOrder['pkgs'] && isLockBooking"
-                      v-model="details.pkgs"
-                      type="number"
-                      @change="changePkgs"
-                    />
-                    <i
-                      class="iconfont icon-bianji1 edit-icon"
-                      @click="editTextEntryModel('pkgs')"
-                    ></i>
-                  </div>
-                </a-form-item>
-              </a-col>
-              <a-col :span="12" style="overflow: hidden">
-                <a-form-item
-                  class="from-label"
-                  label="包装"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  has-feedback
-                  prop="kindpkgs"
-                >
-                  <selectView
-                    type="kindpkgs"
-                    :defaultVal="details.kindpkgs"
-                    searchApi="GetPackage"
-                    :disabled="BookingLockOrder['kindpkgs'] && isLockBooking"
-                    :searchQuery="{ KeyWord: '' }"
-                    :showLabel="['name']"
-                    :openSearch="false"
-                    @change="getSelectViewRes"
-                  >
-                  </selectView>
-                </a-form-item>
-              </a-col>
-              <a-col :span="12" style="overflow: hidden">
-                <a-form-item
-                  class="from-label kgs-line-box"
-                  label="毛重"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  has-feedback
-                  prop="kgs"
-                >
-                  <div class="line-box">
-                    <a-input
-                      :disabled="BookingLockOrder['kgs'] && isLockBooking"
-                      size="small"
-                      :allowClear="true"
-                      v-model="details.kgs"
-                    />
-                    <i
-                      class="iconfont icon-bianji1 edit-icon"
-                      @click="editTextEntryModel('kgs')"
-                    ></i>
-                    <span class="unit">KGS</span>
-                  </div>
-                </a-form-item>
-              </a-col>
-              <a-col :span="12" style="overflow: hidden">
-                <a-form-item
-                  class="from-label cbm-line-box"
-                  label="尺寸"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  has-feedback
-                  prop="cbm"
-                >
-                  <div class="line-box">
-                    <a-input
-                      :disabled="BookingLockOrder['cbm'] && isLockBooking"
-                      size="small"
-                      :allowClear="true"
-                      v-model="details.cbm"
-                    />
-                    <i
-                      class="iconfont icon-bianji1 edit-icon"
-                      @click="editTextEntryModel('cbm')"
-                    ></i>
-                    <span class="unit">CBM</span>
-                  </div>
-                </a-form-item>
-              </a-col>
-              <template v-if="details.cargoid == 'R'">
-                <a-col :span="12">
-                  <a-form-item
-                    class="from-label"
-                    label="设置温度"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="tempset"
-                  >
-                    <inputView
-                      :ishd="BookingLockOrder['tempset'] && isLockBooking"
-                      type="tempset"
-                      size="small"
-                      :parentVal="details.tempset"
-                      @getInputChange="inputChange"
-                    />
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item
-                    class="from-label"
-                    label="冷藏通风量"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
-                    prop="reeferf"
-                  >
-                    <inputView
-                      :ishd="BookingLockOrder['reeferf'] && isLockBooking"
-                      type="reeferf"
-                      size="small"
-                      :parentVal="details.reeferf"
-                      @getInputChange="inputChange"
-                    />
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item
-                    class="from-label"
-                    label="温度单位"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="tempid"
-                  >
-                    <a-select
-                      :disabled="BookingLockOrder['tempid'] && isLockBooking"
-                      size="small"
-                      :default-value="details.tempid || 'C摄氏'"
-                      v-model="details.tempid"
-                    >
-                      <a-select-option value="C"> C摄氏 </a-select-option>
-                      <a-select-option value="F"> F华氏 </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item
-                    class="from-label"
-                    label="最低温度"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="tempmin"
-                  >
-                    <inputView
-                      :ishd="BookingLockOrder['tempmin'] && isLockBooking"
-                      type="tempmin"
-                      size="small"
-                      :parentVal="details.tempmin"
-                      @getInputChange="inputChange"
-                    />
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item
-                    class="from-label"
-                    label="最高温度"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="tempmax"
-                  >
-                    <inputView
-                      :ishd="BookingLockOrder['tempmax'] && isLockBooking"
-                      type="tempmax"
-                      size="small"
-                      :parentVal="details.tempmax"
-                      @getInputChange="inputChange"
-                    />
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item
-                    class="from-label"
-                    label="湿度"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="humidity"
-                  >
-                    <inputView
-                      :ishd="BookingLockOrder['humidity'] && isLockBooking"
-                      type="humidity"
-                      size="small"
-                      :parentVal="details.humidity"
-                      @getInputChange="inputChange"
-                    />
-                  </a-form-item>
-                </a-col>
-              </template>
-              <template v-if="details.cargoid == 'D'">
-                <a-col :span="12">
-                  <a-form-item
-                    class="from-label"
-                    label="危险品等级"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
-                    prop="dclass"
-                  >
-                    <inputView
-                      :ishd="BookingLockOrder['dclass'] && isLockBooking"
-                      type="dclass"
-                      size="small"
-                      :parentVal="details.dclass"
-                      @getInputChange="inputChange"
-                    />
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item
-                    class="from-label"
-                    label="危险品编号"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
-                    prop="dunno"
-                  >
-                    <inputView
-                      :ishd="BookingLockOrder['dunno'] && isLockBooking"
-                      type="dunno"
-                      size="small"
-                      :parentVal="details.dunno"
-                      @getInputChange="inputChange"
-                    />
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item
-                    class="from-label"
-                    label="危险品页号"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
-                    prop="dpage"
-                  >
-                    <inputView
-                      :ishd="BookingLockOrder['dpage'] && isLockBooking"
-                      type="dpage"
-                      size="small"
-                      :parentVal="details.dpage"
-                      @getInputChange="inputChange"
-                    />
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item
-                    class="from-label"
-                    label="危险品标签"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
-                    prop="dlabel"
-                  >
-                    <inputView
-                      :ishd="BookingLockOrder['dlabel'] && isLockBooking"
-                      type="dlabel"
-                      size="small"
-                      :parentVal="details.dlabel"
-                      @getInputChange="inputChange"
-                    />
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item
-                    class="from-label"
-                    label="危险品联系人"
-                    :labelCol="{
-                      xs: { span: 24 },
-                      sm: { span: 10 },
-                      md: { span: 12 },
-                    }"
-                    :wrapperCol="{
-                      xs: { span: 24 },
-                      sm: { span: 14 },
-                      md: { span: 12 },
-                    }"
-                    has-feedback
-                    prop="linkman"
-                  >
-                    <inputView
-                      :ishd="BookingLockOrder['linkman'] && isLockBooking"
-                      type="linkman"
-                      size="small"
-                      :parentVal="details.linkman"
-                      @getInputChange="inputChange"
-                    />
-                  </a-form-item>
-                </a-col>
-              </template>
-            </a-col>
-            <a-col class="num-box" :span="24">
-              <span class="label">件数大写: </span>
-              <a-input
-                :allowClear="true"
-                class="input-val num-box-right"
-                v-model="details.totalno"
-                disabled
-                placeholder="自动生成"
-              />
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-      <a-modal
-        :title="modelTitle"
-        :width="900"
-        :visible="visible"
-        @ok="visible = false"
-        @cancel="visible = false"
-      >
-        <div>
-          <div v-if="modelType === 1" style="display: flex">
-            <textareaView
-              class="input-box"
-              id="marks-scroll"
-              :parentVal="details.marks"
-              type="marks"
-              :height="500"
-              style="font-size: 20px; margin-right: 10px"
-              :openToCDB="true"
-              @getTextareaChange="getTextareaChange"
-            />
-            <div
-              class="line-count"
-              id="marks-scroll-right"
-              v-if="Object.keys(details).length > 1 && details.marks.length > 1"
-            >
-              <div v-for="(num, index) in details.marks.split('\n')" :key="index">{{
-                num.length
-              }}</div>
-            </div>
-          </div>
-          <div v-if="modelType === 2" style="display: flex">
-            <textareaView
-              id="description-scroll"
-              class="input-box"
-              :parentVal="details.description"
-              type="description"
-              :height="500"
-              style="font-size: 20px; margin-right: 10px"
-              :openToCDB="true"
-              @getTextareaChange="getTextareaChange"
-            />
-            <div
-              class="line-count"
-              id="description-scroll-right"
-              v-if="Object.keys(details).length > 1 && details.description.length > 1"
-            >
-              <div v-for="(num, index) in details.description.split('\n')" :key="index">{{
-                num.length
-              }}</div>
-            </div>
-          </div>
-        </div>
-      </a-modal>
-      <a-modal
-        width="500px"
-        :maskClosable="false"
-        v-model="textEntryModalVisible"
-        :title="textEntryModalTitle"
-      >
-        <div class="text-entry-box">
-          <!-- 件数包装 -->
-          <a-form v-if="textEntryType === 'pkgs'">
-            <div class="text-input">
-              <a-textarea
-                v-model="details.pkgstotal"
-                placeholder="请输入内容"
-                :auto-size="{ minRows: 6, maxRows: 9 }"
-                @change="pkgsTextChange"
-              />
-            </div>
-            <div class="total" v-if="pkgstotalRes">总计：{{ pkgstotalRes }}</div>
-          </a-form>
-          <!-- 毛重 -->
-          <a-form v-if="textEntryType === 'kgs'">
-            <div class="text-input">
-              <a-textarea
-                v-model="details.kgstotal"
-                placeholder="请输入内容"
-                :auto-size="{ minRows: 6, maxRows: 9 }"
-                @change="kgsTextChange"
-              />
-            </div>
-            <div class="total" v-if="kgstotalRes">总计：{{ kgstotalRes }} / KGS</div>
-          </a-form>
-          <!-- 尺码 -->
-          <a-form v-if="textEntryType === 'cbm'">
-            <div class="text-input">
-              <a-textarea
-                v-model="details.cbmtotal"
-                placeholder="请输入内容"
-                :auto-size="{ minRows: 6, maxRows: 9 }"
-                @change="cbmTextChange"
-              />
-            </div>
-            <div class="total" v-if="cbmtotalRes">总计：{{ cbmtotalRes }} / CBM</div>
-          </a-form>
-        </div>
-        <template slot="footer">
-          <a-button type="primary" @click="textEntryClose">确定</a-button>
-        </template>
-      </a-modal>
-    </a-collapse-panel>
-  </a-collapse>
-</template>
-<script>
-  import textareaView from '../components/textareaView.vue'
-  import selectView from '../components/selectView.vue'
-  import inputView from '../components/inputView.vue'
-
-  let timer
-  export default {
-    name: '',
-    components: {
-      textareaView,
-      selectView,
-      inputView,
-    },
-    props: {
-      details: {
-        type: Object,
-        default: () => {
-          return {}
-        },
-      },
-      moreStr: {
-        type: String,
-        default: '',
-      },
-      rules: {
-        type: Object,
-        default: () => {
-          return {}
-        },
-      },
-      inSave: {
-        type: Boolean,
-        default: false,
-      },
-      isParent: {
-        type: String,
-        default: '',
-      },
-      isLockBooking: {
-        type: Boolean,
-        default: false,
-      },
-    },
-    data() {
-      return {
-        showKey: ['1'],
-        modelTitle: '',
-        modelType: 0,
-        visible: false,
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 8 },
-          md: { span: 8 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-          md: { span: 16 },
-        },
-        labelColCode: {
-          xs: { span: 24 },
-          sm: { span: 8 },
-          md: { span: 10 },
-        },
-        wrapperColCode: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-          md: { span: 14 },
-        },
-        shippername: '',
-        consigneename: '',
-        notifypartyname: '',
-        foreignAgentname: '',
-        notifypartY2name: '',
-        modelVisible: false,
-        modelconfirm: false,
-        BookingLockOrder: {},
-        modelName: '',
-        yardType: '',
-        yardVisible: false,
-        customerModelconfirm: false,
-        textEntryModalVisible: false,
-        textEntryType: '',
-        textEntryModalTitle: '',
-        pkgstotalRes: 0,
-        kgstotalRes: 0,
-        cbmtotalRes: 0,
-        portdischargeHasline: false,
-        destinationidHasline: false,
-        userHasLine: false,
-
-        // goodsnameData: []
-      }
-    },
-    watch: {
-      details: {
-        handler(nval, oval) {
-          if (!this.inSave) {
-            this.$emit('changeDetail', {
-              detail: nval,
-              type: 'cargoInfo',
-            })
-          }
-        },
-        deep: true,
-      },
-      moreStr(nval, oval) {
-        if (nval !== oval) {
-          let str = this.details.description
-          if (str.length > 0) {
-            str += '\n'
-          }
-          this.details.description = str + nval
-        }
-      },
-      '$route.query': {
-        immediate: true,
-        handler(nD, oD) {
-          this.id = this.$route.query.id
-        },
-      },
-    },
-    created() {},
-    mounted() {
-      const marksScroll = document.getElementById('marks-scroll')
-      if (marksScroll) {
-        marksScroll.addEventListener('scroll', () => {
-          document.getElementById('marks-scroll-right').scrollTop = marksScroll.scrollTop
-        })
-      }
-      const descriptionScroll = document.getElementById('description-scroll')
-      if (descriptionScroll) {
-        descriptionScroll.addEventListener('scroll', () => {
-          document.getElementById('description-scroll-right').scrollTop =
-            descriptionScroll.scrollTop
-        })
-      }
-      const obj = {}
-      this.$options.filters['dictData']('BookingLockOrder').forEach((item) => {
-        obj[item.code] = true
-      })
-      this.BookingLockOrder = obj
-      setTimeout(() => {
-        this.changePkgs()
-      }, 2000)
-    },
-    methods: {
-      SetTOTALNO(SS) {
-        SS = SS.toString()
-        const i = SS.indexOf('\n')
-        let num = 0
-        let strKind = ''
-        let enCapital = ''
-        if (i > 0) {
-          const slist = SS.split('\n')
-          for (let i = 0; i < slist.length; i += 1) {
-            const member = slist[i]
-            const strNum = this.GetStringNum(member)
-            if (i == 0) {
-              strKind = member.substring(strNum.length)
-            }
-            num = parseFloat(num).add(parseFloat(strNum))
-          }
-          if (strKind !== '') {
-            enCapital = strKind
-          } else {
-            strKind = this.details.kindpkgs
-            enCapital = this.ToEn(num).toUpperCase() + ' ' + strKind + ' ONLY.'
-          }
-        } else {
-          const strNum = this.GetStringNum(SS)
-          strKind = SS.substring(strNum.length)
-          if (strKind !== '') {
-            console.log(strKind)
-            enCapital = strKind
-          } else {
-            strKind = this.details.kindpkgs
-            enCapital = 'SAY:' + this.ToEn(strNum).toUpperCase() + ' ' + strKind + ' ONLY.'
-          }
-        }
-        return enCapital
-      },
-      ToEn(a) {
-        // eslint-disable-next-line no-array-constructor
-        const arr1 = new Array('', ' thousand', ' million', ' billion')
-        const b = a.length
-        let f = null
-        let h = 0
-        let g = ''
-        const e = Math.ceil(b / 3)
-        const k = b - e * 3
-        g = ''
-        for (f = k; f < b; f += 3) {
-          ++h
-          // eslint-disable-next-line no-undef
-          const num3 = f >= 0 ? a.substring(f, f + 3) : a.substring(0, k + 3)
-          // eslint-disable-next-line no-undef
-          const strEng = this.English(num3)
-          // eslint-disable-next-line eqeqeq
-          if (strEng != '') {
-            // eslint-disable-next-line eqeqeq
-            if (g != '') g += ' '
-            g += this.English(num3) + arr1[e - h]
-          }
-        }
-        return g
-      },
-      English(a) {
-        // eslint-disable-next-line no-array-constructor
-        var arr1 = new Array('', ' thousand', ' million', ' billion')
-        // eslint-disable-next-line no-array-constructor
-        var arr2 = new Array(
-          'zero',
-          'ten',
-          'twenty',
-          'thirty',
-          'forty',
-          'fifty',
-          'sixty',
-          'seventy',
-          'eighty',
-          'ninety',
-        )
-        // eslint-disable-next-line no-array-constructor
-        var arr3 = new Array(
-          'zero',
-          'one',
-          'two',
-          'three',
-          'four',
-          'five',
-          'six',
-          'seven',
-          'eight',
-          'nine',
-        )
-        // eslint-disable-next-line no-array-constructor
-        var arr4 = new Array(
-          'ten',
-          'eleven',
-          'twelve',
-          'thirteen',
-          'fourteen',
-          'fifteen',
-          'sixteen',
-          'seventeen',
-          'eighteen',
-          'nineteen',
-        )
-
-        let strRet = ''
-        // eslint-disable-next-line eqeqeq
-        if (a.length == 3 && a.substr(0, 3) != '000') {
-          if (a.substr(0, 1) != '0') {
-            strRet += arr3[a.substr(0, 1)] + ' hundred'
-            if (a.substr(1, 2) != '00') strRet += ' and '
-          } else {
-            strRet += ' and '
-          }
-          a = a.substring(1)
-        }
-        if (a.length == 2) {
-          if (a.substr(0, 1) == '0') a = a.substring(1)
-          else if (a.substr(0, 1) == '1') strRet += arr4[a.substr(1, 2)]
-          else {
-            strRet += arr2[a.substr(0, 1)]
-            if (a.substr(1, 1) != '0') strRet += '-'
-            a = a.substring(1)
-          }
-        }
-        if (a.length == 1 && a.substr(0, 1) != '0') strRet += arr3[a.substr(0, 1)]
-        return strRet
-      },
-      editTextEntryModel(type) {
-        this.textEntryModalVisible = true
-        this.textEntryType = type
-        if (type === 'pkgs') {
-          this.textEntryModalTitle = '件数/包装'
-          if (this.details.pkgstotal) {
-            this.pkgsTextChange()
-          } else {
-            this.pkgstotalRes = 0
-          }
-        } else if (type === 'kgs') {
-          this.textEntryModalTitle = '毛重'
-          if (this.details.kgstotal) {
-            this.kgsTextChange()
-          } else {
-            this.kgstotalRes = 0
-          }
-        } else if (type === 'cbm') {
-          this.textEntryModalTitle = '尺码'
-          if (this.details.cbmtotal) {
-            this.cbmTextChange()
-          } else {
-            this.cbmtotalRes = 0
-          }
-        }
-      },
-      textEntryClose() {
-        this.textEntryModalVisible = false
-        this.textEntryModalTitle = ''
-        this.textEntryType = false
-      },
-      GetStringNum(str) {
-        var num = 0
-        if (str == null || str == '') return num
-        if (str.length == 0) return num
-        var if_find = false
-        var str_num = ''
-        for (var i = 0; i < str.length; i += 1) {
-          var member = str.substr(i, 1)
-          if (
-            member == '0' ||
-            member == '1' ||
-            member == '2' ||
-            member == '3' ||
-            member == '4' ||
-            member == '5' ||
-            member == '6' ||
-            member == '7' ||
-            member == '8' ||
-            member == '9' ||
-            member == '.' ||
-            member == '-'
-          ) {
-            if (!if_find) {
-              str_num = str_num + member
-            }
-          } else {
-            if_find = true
-          }
-        }
-        return str_num
-      },
-      pkgsTextChange() {
-        const pkgsTexyVal = this.details.pkgstotal
-        const arr = pkgsTexyVal.split(/\n|\r/g)
-        let pkgs = 0
-        let kindpkgs = ''
-        arr.map((item, index) => {
-          const regexStr = item.match(/[a-zA-Z]+|[0-9]+(?:\.[0-9]+|)/g)
-          if (regexStr && Number(regexStr[0])) {
-            const num1 = Number(regexStr[0])
-            pkgs = (pkgs * 100 + num1 * 100) / 100
-          }
-          if (!kindpkgs && regexStr && /^[a-zA-Z]+$/.test(regexStr[1])) {
-            kindpkgs = regexStr[1]
-          }
-        })
-        this.details.pkgs = parseInt(pkgs)
-        this.details.kindpkgs = kindpkgs
-        this.pkgstotalRes = parseInt(pkgs)
-      },
-      kgsTextChange() {
-        const kgsTexyVal = this.details.kgstotal
-        const arr = kgsTexyVal.split(/\n|\r/g)
-        let kgs = 0
-        arr.map((item, index) => {
-          const regexStr = item.match(/[a-zA-Z]+|[0-9]+(?:\.[0-9]+|)/g)
-          if (regexStr && Number(regexStr[0])) {
-            const num1 = Number(regexStr[0])
-            kgs = (kgs * 100 + num1 * 100) / 100
-          }
-        })
-        this.details.kgs = kgs
-        this.kgstotalRes = kgs
-      },
-      cbmTextChange() {
-        const cbmTexyVal = this.details.cbmtotal
-        const arr = cbmTexyVal.split(/\n|\r/g)
-        let cbm = 0
-        arr.map((item, index) => {
-          const regexStr = item.match(/[a-zA-Z]+|[0-9]+(?:\.[0-9]+|)/g)
-          if (regexStr && Number(regexStr[0])) {
-            const num1 = Number(regexStr[0])
-            cbm = (cbm * 100 + num1 * 100) / 100
-          }
-        })
-        this.details.cbm = cbm
-        this.cbmtotalRes = cbm
-      },
-      handleOpen(type) {
-        this.modelType = type
-        if (type === 1) {
-          this.modelTitle = '唛头'
-        } else {
-          this.modelTitle = '货物描述'
-        }
-        this.visible = true
-      },
-      debounce(func, wait, ...args) {
-        if (timer) clearTimeout(timer)
-        timer = setTimeout(() => {
-          func.apply(this, args)
-        }, wait)
-      },
-      checkbasic() {
-        this.$refs.cargoFrom.validate((valid) => {
-          if (valid) {
-            console.log('验证成功!')
-            return true
-          } else {
-            console.log('验证失败!')
-            return false
-          }
-        })
-      },
-      handleChange(value) {
-        this.details.cargoid = value
-      },
-      getTextareaChange({ type, value }) {
-        this.details[type] = value
-        this.$forceUpdate()
-      },
-      getSelectViewRes({ type, res }) {
-        if (type === 'goodsname') {
-          this.details.goodscode = res.goodsCode || ''
-          this.details.goodsname = res.goodsNameEN || ''
-        } else if (type === 'cargoid') {
-          this.details.cargoid = res.code || ''
-          if (res.code == 'R') {
-            this.rules['goodsname'][0].required = true
-          } else {
-            this.rules['goodsname'][0].required = false
-          }
-        } else if (['kindpkgs'].includes(type)) {
-          this.details.kindpkgs = res['name'] || ''
-          const enCapitalRes = this.SetTOTALNO(this.details.pkgs)
-          this.$emit('pkgsEnCapital', enCapitalRes)
-        }
-      },
-      changePkgs() {
-        const enCapitalRes = this.SetTOTALNO(this.details.pkgs)
-        this.$emit('pkgsEnCapital', enCapitalRes)
-      },
-      inputChange({ type, value }) {
-        this.details[type] = value
-        if (type === 'pkgs') {
-          this.changePkgs()
-        }
-        this.$forceUpdate()
-      },
-      tabStopFun() {
-        return false
-      },
-      tabChangeFun() {},
-    },
-  }
-</script>
-<style lang="less" scoped>
-  .copy-btn {
-    margin-left: 10px;
-
-    &:hover {
-      color: @primary-color !important;
-    }
-  }
-
-  /deep/ .ant-form-explain {
-    display: none !important;
-  }
-
-  /deep/ .ant-form-item-children-icon .anticon-check-circle {
-    display: none;
-  }
-</style>
-<style lang="less" scoped>
-  @import url('../style/cargoInfo.less');
-  @import url('../style/mailingInfo.less');
-  .cargo-info {
-    padding-bottom: 20px;
-  }
-</style>
diff --git a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/cargoInfo.vue b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/cargoInfo.vue
index 28173b0c..d3b0eb2a 100644
--- a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/cargoInfo.vue
+++ b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/cargoInfo.vue
@@ -29,7 +29,7 @@
                 ></div>
                 <div>Marks & Nos.(标记与号码)</div>
               </div>
-              <a-form-item has-feedback prop="marks" class="textarea-label" label="">
+              <a-form-item has-feedback name="marks" class="textarea-label" label="">
                 <div class="bottom">
                   <textareaView
                     class="input-box"
@@ -53,18 +53,922 @@
                 </div>
               </a-form-item>
             </a-col>
+            <a-col :span="10">
+              <div class="line">
+                <div class="left">
+                  <div
+                    class="title"
+                    :class="{ required: rules['description'] && rules['description'][0].required }"
+                  >
+                    <span
+                      @click="handleOpen(2)"
+                      style="cursor: pointer; color: black; margin: 0px"
+                      class="copy-btn iconfont icon-bianji"
+                    ></span>
+                    Description of Goods (包装种类与货名)</div
+                  >
+                  <a-form-item
+                    has-feedback
+                    name="goodsname"
+                    label=""
+                    :class="{
+                      'goods-name-box': rules['goodsname'] && rules['goodsname'][0].required,
+                    }"
+                  >
+                    <i
+                      style="top: 4px"
+                      class="icon required goods-required"
+                      v-if="rules['goodsname'] && rules['goodsname'][0].required"
+                    ></i>
+                    <selectView
+                      type="goodsname"
+                      :defaultVal="details.goodsname"
+                      searchApi="getGoodsname"
+                      :disabled="BookingLockOrder['goodsname'] && isLockBooking"
+                      :searchQuery="{ queryItem: '', top: 50 }"
+                      :showLabel="['goodsNameEN', 'goodsCode']"
+                      :openSearch="true"
+                      @change="getSelectViewRes"
+                      style="width: 75%; max-width: 210px"
+                    ></selectView>
+                  </a-form-item>
+                </div>
+                <div class="cargo-mark">
+                  <div
+                    :class="{ required: rules['cargoid'] && rules['cargoid'][0].required }"
+                    class="tit"
+                    >货物标志</div
+                  >
+                  <a-form-item
+                    class="cargoid"
+                    has-feedback
+                    name="cargoid"
+                    label=""
+                    style="margin-top: -6px"
+                  >
+                    <selectView
+                      type="cargoid"
+                      :defaultVal="details.cargoid"
+                      searchApi="cargoData"
+                      :searchQuery="{ name: '' }"
+                      :disabled="BookingLockOrder['cargoid'] && isLockBooking"
+                      :showLabel="['name']"
+                      :openSearch="false"
+                      @change="getSelectViewRes"
+                      style="width: 120px; margin-top: 7px"
+                    ></selectView>
+                  </a-form-item>
+                </div>
+                <div class="input">
+                  <div
+                    :class="{ required: rules['hscode'] && rules['hscode'][0].required }"
+                    calss="tit"
+                    >HS编码</div
+                  >
+                  <a-form-item
+                    class="cargoid"
+                    has-feedback
+                    name="hscode"
+                    label=""
+                    style="margin-top: -2px"
+                  >
+                    <inputView
+                      :ishd="BookingLockOrder['hscode'] && isLockBooking"
+                      type="hscode"
+                      size="small"
+                      :parentVal="details.hscode"
+                      @getInputChange="inputChange"
+                    />
+                  </a-form-item>
+                </div>
+              </div>
+              <a-form-item has-feedback name="description" class="textarea-label" label="">
+                <div class="bottom">
+                  <textareaView
+                    id="description-scroll"
+                    class="input-box"
+                    :parentVal="details.description"
+                    :disabled="BookingLockOrder['description'] && isLockBooking"
+                    type="description"
+                    :height="100"
+                    :openToCDB="true"
+                    @getTextareaChange="getTextareaChange"
+                  />
+                  <div
+                    class="line-count"
+                    id="description-scroll-right"
+                    v-if="Object.keys(details).length > 1 && details.description.length > 1"
+                  >
+                    <div v-for="(num, index) in details.description.split('\n')" :key="index">{{
+                      num.length
+                    }}</div>
+                  </div>
+                </div>
+              </a-form-item>
+            </a-col>
+            <a-col :span="9">
+              <a-col :span="12">
+                <a-form-item
+                  class="from-label pkgs-line-box"
+                  label="件数"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  name="pkgs"
+                >
+                  <div class="line-box">
+                    <a-input
+                      :allowClear="true"
+                      size="small"
+                      :disabled="BookingLockOrder['pkgs'] && isLockBooking"
+                      v-model="details.pkgs"
+                      type="number"
+                      @change="changePkgs"
+                    />
+                    <i
+                      class="iconfont icon-bianji1 edit-icon"
+                      @click="editTextEntryModel('pkgs')"
+                    ></i>
+                  </div>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12" style="overflow: hidden">
+                <a-form-item
+                  class="from-label"
+                  label="包装"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  name="kindpkgs"
+                >
+                  <selectView
+                    type="kindpkgs"
+                    :defaultVal="details.kindpkgs"
+                    searchApi="GetPackage"
+                    :disabled="BookingLockOrder['kindpkgs'] && isLockBooking"
+                    :searchQuery="{ KeyWord: '' }"
+                    :showLabel="['name']"
+                    :openSearch="false"
+                    @change="getSelectViewRes"
+                  >
+                  </selectView>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12" style="overflow: hidden">
+                <a-form-item
+                  class="from-label kgs-line-box"
+                  label="毛重"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  name="kgs"
+                >
+                  <div class="line-box">
+                    <a-input
+                      :disabled="BookingLockOrder['kgs'] && isLockBooking"
+                      size="small"
+                      :allowClear="true"
+                      v-model="details.kgs"
+                    />
+                    <i
+                      class="iconfont icon-bianji1 edit-icon"
+                      @click="editTextEntryModel('kgs')"
+                    ></i>
+                    <span class="unit">KGS</span>
+                  </div>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12" style="overflow: hidden">
+                <a-form-item
+                  class="from-label cbm-line-box"
+                  label="尺寸"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  name="cbm"
+                >
+                  <div class="line-box">
+                    <a-input
+                      :disabled="BookingLockOrder['cbm'] && isLockBooking"
+                      size="small"
+                      :allowClear="true"
+                      v-model="details.cbm"
+                    />
+                    <i
+                      class="iconfont icon-bianji1 edit-icon"
+                      @click="editTextEntryModel('cbm')"
+                    ></i>
+                    <span class="unit">CBM</span>
+                  </div>
+                </a-form-item>
+              </a-col>
+              <template v-if="details.cargoid == 'R'">
+                <a-col :span="12">
+                  <a-form-item
+                    class="from-label"
+                    label="设置温度"
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    has-feedback
+                    name="tempset"
+                  >
+                    <inputView
+                      :ishd="BookingLockOrder['tempset'] && isLockBooking"
+                      type="tempset"
+                      size="small"
+                      :parentVal="details.tempset"
+                      @getInputChange="inputChange"
+                    />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                  <a-form-item
+                    class="from-label"
+                    label="冷藏通风量"
+                    :labelCol="labelColCode"
+                    :wrapperCol="wrapperColCode"
+                    has-feedback
+                    name="reeferf"
+                  >
+                    <inputView
+                      :ishd="BookingLockOrder['reeferf'] && isLockBooking"
+                      type="reeferf"
+                      size="small"
+                      :parentVal="details.reeferf"
+                      @getInputChange="inputChange"
+                    />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                  <a-form-item
+                    class="from-label"
+                    label="温度单位"
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    has-feedback
+                    name="tempid"
+                  >
+                    <a-select
+                      :disabled="BookingLockOrder['tempid'] && isLockBooking"
+                      size="small"
+                      :default-value="details.tempid || 'C摄氏'"
+                      v-model="details.tempid"
+                    >
+                      <a-select-option value="C"> C摄氏 </a-select-option>
+                      <a-select-option value="F"> F华氏 </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                  <a-form-item
+                    class="from-label"
+                    label="最低温度"
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    has-feedback
+                    name="tempmin"
+                  >
+                    <inputView
+                      :ishd="BookingLockOrder['tempmin'] && isLockBooking"
+                      type="tempmin"
+                      size="small"
+                      :parentVal="details.tempmin"
+                      @getInputChange="inputChange"
+                    />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                  <a-form-item
+                    class="from-label"
+                    label="最高温度"
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    has-feedback
+                    name="tempmax"
+                  >
+                    <inputView
+                      :ishd="BookingLockOrder['tempmax'] && isLockBooking"
+                      type="tempmax"
+                      size="small"
+                      :parentVal="details.tempmax"
+                      @getInputChange="inputChange"
+                    />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                  <a-form-item
+                    class="from-label"
+                    label="湿度"
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    has-feedback
+                    name="humidity"
+                  >
+                    <inputView
+                      :ishd="BookingLockOrder['humidity'] && isLockBooking"
+                      type="humidity"
+                      size="small"
+                      :parentVal="details.humidity"
+                      @getInputChange="inputChange"
+                    />
+                  </a-form-item>
+                </a-col>
+              </template>
+              <template v-if="details.cargoid == 'D'">
+                <a-col :span="12">
+                  <a-form-item
+                    class="from-label"
+                    label="危险品等级"
+                    :labelCol="labelColCode"
+                    :wrapperCol="wrapperColCode"
+                    has-feedback
+                    name="dclass"
+                  >
+                    <inputView
+                      :ishd="BookingLockOrder['dclass'] && isLockBooking"
+                      type="dclass"
+                      size="small"
+                      :parentVal="details.dclass"
+                      @getInputChange="inputChange"
+                    />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                  <a-form-item
+                    class="from-label"
+                    label="危险品编号"
+                    :labelCol="labelColCode"
+                    :wrapperCol="wrapperColCode"
+                    has-feedback
+                    name="dunno"
+                  >
+                    <inputView
+                      :ishd="BookingLockOrder['dunno'] && isLockBooking"
+                      type="dunno"
+                      size="small"
+                      :parentVal="details.dunno"
+                      @getInputChange="inputChange"
+                    />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                  <a-form-item
+                    class="from-label"
+                    label="危险品页号"
+                    :labelCol="labelColCode"
+                    :wrapperCol="wrapperColCode"
+                    has-feedback
+                    name="dpage"
+                  >
+                    <inputView
+                      :ishd="BookingLockOrder['dpage'] && isLockBooking"
+                      type="dpage"
+                      size="small"
+                      :parentVal="details.dpage"
+                      @getInputChange="inputChange"
+                    />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                  <a-form-item
+                    class="from-label"
+                    label="危险品标签"
+                    :labelCol="labelColCode"
+                    :wrapperCol="wrapperColCode"
+                    has-feedback
+                    name="dlabel"
+                  >
+                    <inputView
+                      :ishd="BookingLockOrder['dlabel'] && isLockBooking"
+                      type="dlabel"
+                      size="small"
+                      :parentVal="details.dlabel"
+                      @getInputChange="inputChange"
+                    />
+                  </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                  <a-form-item
+                    class="from-label"
+                    label="危险品联系人"
+                    :labelCol="{
+                      xs: { span: 24 },
+                      sm: { span: 10 },
+                      md: { span: 12 },
+                    }"
+                    :wrapperCol="{
+                      xs: { span: 24 },
+                      sm: { span: 14 },
+                      md: { span: 12 },
+                    }"
+                    has-feedback
+                    name="linkman"
+                  >
+                    <inputView
+                      :ishd="BookingLockOrder['linkman'] && isLockBooking"
+                      type="linkman"
+                      size="small"
+                      :parentVal="details.linkman"
+                      @getInputChange="inputChange"
+                    />
+                  </a-form-item>
+                </a-col>
+              </template>
+            </a-col>
+            <a-col class="num-box" :span="24">
+              <span class="label">件数大写: </span>
+              <a-input
+                :allowClear="true"
+                class="input-val num-box-right"
+                v-model="details.totalno"
+                disabled
+                placeholder="自动生成"
+              />
+            </a-col>
           </a-row>
         </a-form>
       </div>
+      <a-modal
+        :title="modelTitle"
+        :width="900"
+        :visible="visible"
+        @ok="visible = false"
+        @cancel="visible = false"
+      >
+        <div>
+          <div v-if="modelType === 1" style="display: flex">
+            <textareaView
+              class="input-box"
+              id="marks-scroll"
+              :parentVal="details.marks"
+              type="marks"
+              :height="500"
+              style="font-size: 20px; margin-right: 10px"
+              :openToCDB="true"
+              @getTextareaChange="getTextareaChange"
+            />
+            <div
+              class="line-count"
+              id="marks-scroll-right"
+              v-if="Object.keys(details).length > 1 && details.marks.length > 1"
+            >
+              <div v-for="(num, index) in details.marks.split('\n')" :key="index">{{
+                num.length
+              }}</div>
+            </div>
+          </div>
+          <div v-if="modelType === 2" style="display: flex">
+            <textareaView
+              id="description-scroll"
+              class="input-box"
+              :parentVal="details.description"
+              type="description"
+              :height="500"
+              style="font-size: 20px; margin-right: 10px"
+              :openToCDB="true"
+              @getTextareaChange="getTextareaChange"
+            />
+            <div
+              class="line-count"
+              id="description-scroll-right"
+              v-if="Object.keys(details).length > 1 && details.description.length > 1"
+            >
+              <div v-for="(num, index) in details.description.split('\n')" :key="index">{{
+                num.length
+              }}</div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+      <a-modal
+        width="500px"
+        :maskClosable="false"
+        v-model="textEntryModalVisible"
+        :title="textEntryModalTitle"
+      >
+        <div class="text-entry-box">
+          <!-- 件数包装 -->
+          <a-form v-if="textEntryType === 'pkgs'">
+            <div class="text-input">
+              <a-textarea
+                v-model="details.pkgstotal"
+                placeholder="请输入内容"
+                :auto-size="{ minRows: 6, maxRows: 9 }"
+                @change="pkgsTextChange"
+              />
+            </div>
+            <div class="total" v-if="pkgstotalRes">总计：{{ pkgstotalRes }}</div>
+          </a-form>
+          <!-- 毛重 -->
+          <a-form v-if="textEntryType === 'kgs'">
+            <div class="text-input">
+              <a-textarea
+                v-model="details.kgstotal"
+                placeholder="请输入内容"
+                :auto-size="{ minRows: 6, maxRows: 9 }"
+                @change="kgsTextChange"
+              />
+            </div>
+            <div class="total" v-if="kgstotalRes">总计：{{ kgstotalRes }} / KGS</div>
+          </a-form>
+          <!-- 尺码 -->
+          <a-form v-if="textEntryType === 'cbm'">
+            <div class="text-input">
+              <a-textarea
+                v-model="details.cbmtotal"
+                placeholder="请输入内容"
+                :auto-size="{ minRows: 6, maxRows: 9 }"
+                @change="cbmTextChange"
+              />
+            </div>
+            <div class="total" v-if="cbmtotalRes">总计：{{ cbmtotalRes }} / CBM</div>
+          </a-form>
+        </div>
+        <template #footer>
+          <a-button type="primary" @click="textEntryClose">确定</a-button>
+        </template>
+      </a-modal>
     </a-collapse-panel>
   </a-collapse>
 </template>
 <script lang="ts" setup>
-  import { ref, reactive, getCurrentInstance, h, watch, onMounted } from 'vue'
+  import { ref, getCurrentInstance, watch, onMounted } from 'vue'
+  import inputView from '../components/inputView.vue'
+  import textareaView from '../components/textareaView.vue'
+  import selectView from '../components/selectView.vue'
+  import { useRoute } from 'vue-router'
+  const route = useRoute()
+  const props = defineProps({
+    details: { type: Object, default: {} },
+    rules: { type: Object, default: {} },
+    isLockBooking: { type: Boolean, default: false },
+    inSave: { type: Boolean, default: false },
+    moreStr: { type: String, default: '' },
+  })
+  const emit = defineEmits(['pkgsEnCapital', 'changeDetail'])
+  let { ctx: that, proxy }: any = getCurrentInstance()
   const showKey = ref(['1'])
+  const BookingLockOrder = ref({})
+  const modelType = ref()
+  const modelTitle = ref('')
+  const visible = ref(false)
+  const labelCol = ref({
+    xs: { span: 24 },
+    sm: { span: 8 },
+    md: { span: 8 },
+  })
+  const wrapperCol = ref({
+    xs: { span: 24 },
+    sm: { span: 16 },
+    md: { span: 16 },
+  })
+  const labelColCode = ref({
+    xs: { span: 24 },
+    sm: { span: 8 },
+    md: { span: 10 },
+  })
+  const wrapperColCode = ref({
+    xs: { span: 24 },
+    sm: { span: 16 },
+    md: { span: 14 },
+  })
+  const textEntryModalVisible = ref(false)
+  const textEntryType: any = ref('')
+  const textEntryModalTitle = ref('')
+  const pkgstotalRes = ref(0)
+  const kgstotalRes = ref(0)
+  const cbmtotalRes = ref(0)
+  const id = ref()
+  watch(
+    () => props.details,
+    (nval) => {
+      if (!props.inSave) {
+        emit('changeDetail', {
+          detail: nval,
+          type: 'cargoInfo',
+        })
+      }
+    },
+    { deep: true },
+  )
+  watch(
+    () => props.moreStr,
+    (nval, oval) => {
+      if (nval !== oval) {
+        let str = props.details.description
+        if (str.length > 0) {
+          str += '\n'
+        }
+        props.details.description = str + nval
+      }
+    },
+  )
+  watch(
+    () => route.query,
+    () => {
+      id.value = route.query.id
+    },
+    { immediate: true },
+  )
+  onMounted(() => {
+    // const marksScroll = document.getElementById('marks-scroll')
+    // if (marksScroll) {
+    //   marksScroll.addEventListener('scroll', () => {
+    //     document.getElementById('marks-scroll-right').scrollTop = marksScroll.scrollTop
+    //   })
+    // }
+    // const descriptionScroll = document.getElementById('description-scroll')
+    // if (descriptionScroll) {
+    //   descriptionScroll.addEventListener('scroll', () => {
+    //     document.getElementById('description-scroll-right').scrollTop = descriptionScroll.scrollTop
+    //   })
+    // }
+    // const obj = {}
+    // that.$options.filters['dictData']('BookingLockOrder').forEach((item) => {
+    //   obj[item.code] = true
+    // })
+    // BookingLockOrder.value = obj
+    setTimeout(() => {
+      changePkgs()
+    }, 2000)
+  })
   function tabStopFun() {
     return false
   }
+  function handleOpen(type) {
+    modelType.value = type
+    if (type === 1) {
+      modelTitle.value = '唛头'
+    } else {
+      modelTitle.value = '货物描述'
+    }
+    visible.value = true
+  }
+  function getTextareaChange({ type, value }) {
+    props.details[type] = value
+    that.$forceUpdate()
+  }
+  function getSelectViewRes({ type, res }) {
+    if (type === 'goodsname') {
+      props.details.goodscode = res.goodsCode || ''
+      props.details.goodsname = res.goodsNameEN || ''
+    } else if (type === 'cargoid') {
+      props.details.cargoid = res.code || ''
+      if (res.code == 'R') {
+        props.rules['goodsname'][0].required = true
+      } else {
+        props.rules['goodsname'][0].required = false
+      }
+    } else if (['kindpkgs'].includes(type)) {
+      props.details.kindpkgs = res['name'] || ''
+      const enCapitalRes = SetTOTALNO(props.details.pkgs)
+      emit('pkgsEnCapital', enCapitalRes)
+    }
+  }
+  function SetTOTALNO(SS) {
+    SS = SS.toString()
+    const i = SS.indexOf('\n')
+    let num = 0
+    let strKind = ''
+    let enCapital = ''
+    if (i > 0) {
+      const slist = SS.split('\n')
+      for (let i = 0; i < slist.length; i += 1) {
+        const member = slist[i]
+        const strNum: any = GetStringNum(member)
+        if (i == 0) {
+          strKind = member.substring(strNum.length)
+        }
+        num = parseFloat(num).add(parseFloat(strNum))
+      }
+      if (strKind !== '') {
+        enCapital = strKind
+      } else {
+        strKind = props.details.kindpkgs
+        enCapital = ToEn(num).toUpperCase() + ' ' + strKind + ' ONLY.'
+      }
+    } else {
+      const strNum: any = GetStringNum(SS)
+      strKind = SS.substring(strNum.length)
+      if (strKind !== '') {
+        console.log(strKind)
+        enCapital = strKind
+      } else {
+        strKind = props.details.kindpkgs
+        enCapital = 'SAY:' + ToEn(strNum).toUpperCase() + ' ' + strKind + ' ONLY.'
+      }
+    }
+    return enCapital
+  }
+  function ToEn(a) {
+    // eslint-disable-next-line no-array-constructor
+    const arr1 = new Array('', ' thousand', ' million', ' billion')
+    const b = a.length
+    let f: any = null
+    let h = 0
+    let g = ''
+    const e = Math.ceil(b / 3)
+    const k = b - e * 3
+    g = ''
+    for (f = k; f < b; f += 3) {
+      ++h
+      // eslint-disable-next-line no-undef
+      const num3 = f >= 0 ? a.substring(f, f + 3) : a.substring(0, k + 3)
+      // eslint-disable-next-line no-undef
+      const strEng = English(num3)
+      // eslint-disable-next-line eqeqeq
+      if (strEng != '') {
+        // eslint-disable-next-line eqeqeq
+        if (g != '') g += ' '
+        g += English(num3) + arr1[e - h]
+      }
+    }
+    return g
+  }
+  function English(a) {
+    // eslint-disable-next-line no-array-constructor
+    var arr2 = new Array(
+      'zero',
+      'ten',
+      'twenty',
+      'thirty',
+      'forty',
+      'fifty',
+      'sixty',
+      'seventy',
+      'eighty',
+      'ninety',
+    )
+    // eslint-disable-next-line no-array-constructor
+    var arr3 = new Array(
+      'zero',
+      'one',
+      'two',
+      'three',
+      'four',
+      'five',
+      'six',
+      'seven',
+      'eight',
+      'nine',
+    )
+    // eslint-disable-next-line no-array-constructor
+    var arr4 = new Array(
+      'ten',
+      'eleven',
+      'twelve',
+      'thirteen',
+      'fourteen',
+      'fifteen',
+      'sixteen',
+      'seventeen',
+      'eighteen',
+      'nineteen',
+    )
+
+    let strRet = ''
+    // eslint-disable-next-line eqeqeq
+    if (a.length == 3 && a.substr(0, 3) != '000') {
+      if (a.substr(0, 1) != '0') {
+        strRet += arr3[a.substr(0, 1)] + ' hundred'
+        if (a.substr(1, 2) != '00') strRet += ' and '
+      } else {
+        strRet += ' and '
+      }
+      a = a.substring(1)
+    }
+    if (a.length == 2) {
+      if (a.substr(0, 1) == '0') a = a.substring(1)
+      else if (a.substr(0, 1) == '1') strRet += arr4[a.substr(1, 2)]
+      else {
+        strRet += arr2[a.substr(0, 1)]
+        if (a.substr(1, 1) != '0') strRet += '-'
+        a = a.substring(1)
+      }
+    }
+    if (a.length == 1 && a.substr(0, 1) != '0') strRet += arr3[a.substr(0, 1)]
+    return strRet
+  }
+  function GetStringNum(str) {
+    var num = 0
+    if (str == null || str == '') return num
+    if (str.length == 0) return num
+    var if_find = false
+    var str_num = ''
+    for (var i = 0; i < str.length; i += 1) {
+      var member = str.substr(i, 1)
+      if (
+        member == '0' ||
+        member == '1' ||
+        member == '2' ||
+        member == '3' ||
+        member == '4' ||
+        member == '5' ||
+        member == '6' ||
+        member == '7' ||
+        member == '8' ||
+        member == '9' ||
+        member == '.' ||
+        member == '-'
+      ) {
+        if (!if_find) {
+          str_num = str_num + member
+        }
+      } else {
+        if_find = true
+      }
+    }
+    return str_num
+  }
+  function inputChange({ type, value }) {
+    props.details[type] = value
+    if (type === 'pkgs') {
+      changePkgs()
+    }
+    that.$forceUpdate()
+  }
+  function changePkgs() {
+    const enCapitalRes = SetTOTALNO(props.details.pkgs)
+    emit('pkgsEnCapital', enCapitalRes)
+  }
+  function editTextEntryModel(type) {
+    textEntryModalVisible.value = true
+    textEntryType.value = type
+    if (type === 'pkgs') {
+      textEntryModalTitle.value = '件数/包装'
+      if (props.details.pkgstotal) {
+        pkgsTextChange()
+      } else {
+        pkgstotalRes.value = 0
+      }
+    } else if (type === 'kgs') {
+      textEntryModalTitle.value = '毛重'
+      if (props.details.kgstotal) {
+        kgsTextChange()
+      } else {
+        kgstotalRes.value = 0
+      }
+    } else if (type === 'cbm') {
+      textEntryModalTitle.value = '尺码'
+      if (props.details.cbmtotal) {
+        cbmTextChange()
+      } else {
+        cbmtotalRes.value = 0
+      }
+    }
+  }
+  function pkgsTextChange() {
+    const pkgsTexyVal = props.details.pkgstotal
+    const arr = pkgsTexyVal.split(/\n|\r/g)
+    let pkgs = 0
+    let kindpkgs = ''
+    arr.map((item, index) => {
+      const regexStr = item.match(/[a-zA-Z]+|[0-9]+(?:\.[0-9]+|)/g)
+      if (regexStr && Number(regexStr[0])) {
+        const num1 = Number(regexStr[0])
+        pkgs = (pkgs * 100 + num1 * 100) / 100
+      }
+      if (!kindpkgs && regexStr && /^[a-zA-Z]+$/.test(regexStr[1])) {
+        kindpkgs = regexStr[1]
+      }
+    })
+    props.details.pkgs = parseInt(pkgs)
+    props.details.kindpkgs = kindpkgs
+    pkgstotalRes.value = parseInt(pkgs)
+  }
+  function kgsTextChange() {
+    const kgsTexyVal = props.details.kgstotal
+    const arr = kgsTexyVal.split(/\n|\r/g)
+    let kgs = 0
+    arr.map((item, index) => {
+      const regexStr = item.match(/[a-zA-Z]+|[0-9]+(?:\.[0-9]+|)/g)
+      if (regexStr && Number(regexStr[0])) {
+        const num1 = Number(regexStr[0])
+        kgs = (kgs * 100 + num1 * 100) / 100
+      }
+    })
+    props.details.kgs = kgs
+    kgstotalRes.value = kgs
+  }
+  function cbmTextChange() {
+    const cbmTexyVal = props.details.cbmtotal
+    const arr = cbmTexyVal.split(/\n|\r/g)
+    let cbm = 0
+    arr.map((item, index) => {
+      const regexStr = item.match(/[a-zA-Z]+|[0-9]+(?:\.[0-9]+|)/g)
+      if (regexStr && Number(regexStr[0])) {
+        const num1 = Number(regexStr[0])
+        cbm = (cbm * 100 + num1 * 100) / 100
+      }
+    })
+    props.details.cbm = cbm
+    cbmtotalRes.value = cbm
+  }
+  function textEntryClose() {
+    textEntryModalVisible.value = false
+    textEntryModalTitle.value = ''
+    textEntryType.value = false
+  }
 </script>
 <style lang="less" scoped>
   .copy-btn {
@@ -84,8 +988,8 @@
   }
 </style>
 <style lang="less" scoped>
-  @import url('../style/cargoInfo.less');
   @import url('../style/mailingInfo.less');
+  @import url('../style/cargoInfo.less');
   .cargo-info {
     padding-bottom: 20px;
   }
diff --git a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/ediMore.vue b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/ediMore.vue
index 09801258..de873c24 100644
--- a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/ediMore.vue
+++ b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/ediMore.vue
@@ -1,15 +1,15 @@
 <template>
   <div class="more-edi" :style="{ paddingTop: '20px', paddingBottom: '10px' }">
-    <a-form-model ref="ediFrom" :model="details" :rules="rules" v-if="details">
+    <a-form ref="ediFrom" :model="details" :rules="rules" v-if="details">
       <div class="normal">
         <a-row :gutter="16">
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="发送方EDI代码"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="bookingEDIExt.sendCode"
+              name="bookingEDIExt.sendCode"
             >
               <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.sendCode" /> -->
               <inputView
@@ -17,15 +17,15 @@
                 :parentVal="details.bookingEDIExt.sendCode"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="接收方EDI代码"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="bookingEDIExt.receiveCode"
+              name="bookingEDIExt.receiveCode"
             >
               <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.receiveCode" /> -->
               <inputView
@@ -33,15 +33,15 @@
                 :parentVal="details.bookingEDIExt.receiveCode"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="EDI联系人名称"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="bookingEDIExt.ediAttn"
+              name="bookingEDIExt.ediAttn"
             >
               <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.ediAttn" /> -->
               <inputView
@@ -49,15 +49,15 @@
                 :parentVal="details.bookingEDIExt.ediAttn"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="EDI联系人电话"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="bookingEDIExt.ediAttnTel"
+              name="bookingEDIExt.ediAttnTel"
             >
               <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.ediAttnTel" /> -->
               <inputView
@@ -65,15 +65,15 @@
                 :parentVal="details.bookingEDIExt.ediAttnTel"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="EDI联系人邮箱"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="bookingEDIExt.ediAttnMail"
+              name="bookingEDIExt.ediAttnMail"
             >
               <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.ediAttnMail" /> -->
               <inputView
@@ -81,15 +81,15 @@
                 :parentVal="details.bookingEDIExt.ediAttnMail"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="AMS收货人"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="bookingEDIExt.amsConsignee"
+              name="bookingEDIExt.amsConsignee"
             >
               <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.amsConsignee" /> -->
               <inputView
@@ -97,15 +97,15 @@
                 :parentVal="details.bookingEDIExt.amsConsignee"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="AMS通知人"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="bookingEDIExt.amsNotifyParty"
+              name="bookingEDIExt.amsNotifyParty"
             >
               <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.amsNotifyParty" /> -->
               <inputView
@@ -113,15 +113,15 @@
                 :parentVal="details.bookingEDIExt.amsNotifyParty"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="操作英文名称"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="bookingEDIExt.opEName"
+              name="bookingEDIExt.opEName"
             >
               <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.opEName" /> -->
               <inputView
@@ -129,15 +129,15 @@
                 :parentVal="details.bookingEDIExt.opEName"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="操作电话"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="bookingEDIExt.opTel"
+              name="bookingEDIExt.opTel"
             >
               <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.opTel" /> -->
               <inputView
@@ -145,15 +145,15 @@
                 :parentVal="details.bookingEDIExt.opTel"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="操作邮箱"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="bookingEDIExt.opEmail"
+              name="bookingEDIExt.opEmail"
             >
               <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.opEmail" /> -->
               <inputView
@@ -161,15 +161,15 @@
                 :parentVal="details.bookingEDIExt.opEmail"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="商品名称"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="bookingEDIExt.goodsName"
+              name="bookingEDIExt.goodsName"
             >
               <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.goodsName" /> -->
               <inputView
@@ -177,15 +177,15 @@
                 :parentVal="details.bookingEDIExt.goodsName"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="SOC箱"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="iscontainersoc"
+              name="iscontainersoc"
             >
               <a-select
                 size="small"
@@ -196,15 +196,15 @@
                 <a-select-option value="1"> 是 </a-select-option>
                 <a-select-option value="0"> 否 </a-select-option>
               </a-select>
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="SCAC代码"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="scaccode"
+              name="scaccode"
             >
               <!-- <a-input :allowClear="true" v-model="details.scaccode" /> -->
               <inputView
@@ -212,15 +212,15 @@
                 :parentVal="details.scaccode"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="ITN编号"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="itncode"
+              name="itncode"
             >
               <!-- <a-input :allowClear="true" v-model="details.itncode" /> -->
               <inputView
@@ -228,15 +228,15 @@
                 :parentVal="details.itncode"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="订舱人说明"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="bookingEDIExt.orderRemark"
+              name="bookingEDIExt.orderRemark"
             >
               <!-- <a-input v-model="details.bookingEDIExt.orderRemark" /> -->
               <inputView
@@ -245,15 +245,15 @@
                 :parentVal="details.bookingEDIExt.orderRemark"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="付款方"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="freightpayer"
+              name="freightpayer"
             >
               <!-- <a-input :allowClear="true" v-model="details.freightpayer" /> -->
               <inputView
@@ -261,60 +261,60 @@
                 :parentVal="details.freightpayer"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="第一层包装皮重"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="bookingEDIExt.kingTareweight"
+              name="bookingEDIExt.kingTareweight"
             >
               <inputView
                 type="kingTareweight"
                 :parentVal="details.bookingEDIExt.kingTareweight"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item
+            <a-form-item
               label="指定业务员"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="bookingEDIExt.xmcywy"
+              name="bookingEDIExt.xmcywy"
             >
               <inputView
                 type="xmcywy"
                 :parentVal="details.bookingEDIExt.xmcywy"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col v-if="details.carrierid == 'EMC'" :span="8">
-            <a-form-model-item
+            <a-form-item
               label="Name accout"
               :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
               has-feedback
-              prop="bookingEDIExt.emcNameAccount"
+              name="bookingEDIExt.emcNameAccount"
             >
               <inputView
                 type="emcNameAccount"
                 :parentVal="details.bookingEDIExt.emcNameAccount"
                 @getInputChange="inputChange"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
           <a-col :span="23">
-            <a-form-model-item
+            <a-form-item
               label="委托方"
               :labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
               :wrapperCol="{ xs: { span: 24 }, sm: { span: 21 } }"
               has-feedback
-              prop="bookingEDIExt.weiTuoFang"
+              name="bookingEDIExt.weiTuoFang"
               style="margin-top: 4px"
             >
               <a-textarea
@@ -322,7 +322,7 @@
                 v-model="details.bookingEDIExt.weiTuoFang"
                 :auto-size="{ minRows: 2, maxRows: 5 }"
               />
-            </a-form-model-item>
+            </a-form-item>
           </a-col>
         </a-row>
       </div>
@@ -335,12 +335,12 @@
         <div class="ex-remark-content">
           <a-row :gutter="16">
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="辅助字段1"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 17 } }"
                 has-feedback
-                prop="bookingEDIExt.exRemark1"
+                name="bookingEDIExt.exRemark1"
               >
                 <a-textarea
                   size="small"
@@ -348,15 +348,15 @@
                   v-model="details.bookingEDIExt.exRemark1"
                   :auto-size="{ minRows: 2, maxRows: 5 }"
                 />
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="辅助字段2"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 17 } }"
                 has-feedback
-                prop="bookingEDIExt.exRemark2"
+                name="bookingEDIExt.exRemark2"
               >
                 <a-textarea
                   size="small"
@@ -364,17 +364,17 @@
                   v-model="details.bookingEDIExt.exRemark2"
                   :auto-size="{ minRows: 2, maxRows: 5 }"
                 />
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
           </a-row>
           <a-row :gutter="16">
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="辅助字段3"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 17 } }"
                 has-feedback
-                prop="bookingEDIExt.exRemark3"
+                name="bookingEDIExt.exRemark3"
               >
                 <a-textarea
                   size="small"
@@ -382,15 +382,15 @@
                   v-model="details.bookingEDIExt.exRemark3"
                   :auto-size="{ minRows: 2, maxRows: 5 }"
                 />
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="辅助字段4"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 17 } }"
                 has-feedback
-                prop="bookingEDIExt.exRemark4"
+                name="bookingEDIExt.exRemark4"
               >
                 <a-textarea
                   size="small"
@@ -398,7 +398,7 @@
                   v-model="details.bookingEDIExt.exRemark4"
                   :auto-size="{ minRows: 2, maxRows: 5 }"
                 />
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
           </a-row>
         </div>
@@ -408,12 +408,12 @@
         <div class="taiping">
           <a-row :gutter="16">
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="收货人EDI代码"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                 has-feedback
-                prop="bookingEDIExt.consigneeEdiCode"
+                name="bookingEDIExt.consigneeEdiCode"
               >
                 <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.consigneeEdiCode" /> -->
                 <inputView
@@ -421,15 +421,15 @@
                   :parentVal="details.bookingEDIExt.consigneeEdiCode"
                   @getInputChange="inputChange"
                 />
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="发货人EDI代码"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                 has-feedback
-                prop="bookingEDIExt.shipperEdiCode"
+                name="bookingEDIExt.shipperEdiCode"
               >
                 <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.shipperEdiCode" /> -->
                 <inputView
@@ -437,15 +437,15 @@
                   :parentVal="details.bookingEDIExt.shipperEdiCode"
                   @getInputChange="inputChange"
                 />
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="通知方EDI代码"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                 has-feedback
-                prop="bookingEDIExt.notifyCdoe"
+                name="bookingEDIExt.notifyCdoe"
               >
                 <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.notifyCdoe" /> -->
                 <inputView
@@ -453,15 +453,15 @@
                   :parentVal="details.bookingEDIExt.notifyCdoe"
                   @getInputChange="inputChange"
                 />
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="太平销售EDI代码"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                 has-feedback
-                prop="bookingEDIExt.salerCode"
+                name="bookingEDIExt.salerCode"
               >
                 <selectView
                   type="salerCode"
@@ -477,15 +477,15 @@
                     {{ sales.NAME }}
                   </a-select-option>
                 </a-select> -->
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="EMANIFEST HBL"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                 has-feedback
-                prop="bookingEDIExt.emanifestHbl"
+                name="bookingEDIExt.emanifestHbl"
               >
                 <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.emanifestHbl" /> -->
                 <inputView
@@ -493,15 +493,15 @@
                   :parentVal="details.bookingEDIExt.emanifestHbl"
                   @getInputChange="inputChange"
                 />
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="Master Bol Indicator"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                 has-feedback
-                prop="bookingEDIExt.masterBolIndicator"
+                name="bookingEDIExt.masterBolIndicator"
               >
                 <selectView
                   type="masterBolIndicator"
@@ -517,15 +517,15 @@
                     {{ master.NAME }}
                   </a-select-option>
                 </a-select> -->
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="S0C C0C:"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                 has-feedback
-                prop="bookingEDIExt.s0CC0C"
+                name="bookingEDIExt.s0CC0C"
                 style="margin-top: 4px"
               >
                 <a-textarea
@@ -534,15 +534,15 @@
                   v-model="details.bookingEDIExt.s0CC0C"
                   :auto-size="{ minRows: 2, maxRows: 5 }"
                 />
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="欧盟港口、伊朗港口、KHI"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                 has-feedback
-                prop="bookingEDIExt.ckhi"
+                name="bookingEDIExt.ckhi"
                 style="margin-top: 4px"
               >
                 <a-textarea
@@ -550,49 +550,49 @@
                   v-model="details.bookingEDIExt.ckhi"
                   :auto-size="{ minRows: 2, maxRows: 5 }"
                 />
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
           </a-row>
         </div>
         <div class="taiping-2">
           <a-row :gutter="16">
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="南美东"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                 has-feedback
-                prop="bookingEDIExt.cncm"
+                name="bookingEDIExt.cncm"
               >
                 <a-textarea
                   size="small"
                   v-model="details.bookingEDIExt.cncm"
                   :auto-size="{ minRows: 2, maxRows: 5 }"
                 />
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="巴西线木质包装情况"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                 has-feedback
-                prop="bookingEDIExt.wncm"
+                name="bookingEDIExt.wncm"
               >
                 <a-textarea
                   size="small"
                   v-model="details.bookingEDIExt.wncm"
                   :auto-size="{ minRows: 2, maxRows: 5 }"
                 />
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="ACI HBL:"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                 has-feedback
-                prop="bookingEDIExt.acihbl"
+                name="bookingEDIExt.acihbl"
               >
                 <!-- <a-input :allowClear="true" v-model="details.bookingEDIExt.acihbl" /> -->
                 <inputView
@@ -600,28 +600,28 @@
                   :parentVal="details.bookingEDIExt.acihbl"
                   @getInputChange="inputChange"
                 />
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-model-item
+              <a-form-item
                 label="CNPT No:"
                 :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
                 :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
                 has-feedback
-                prop="bookingEDIExt.cnptNo"
+                name="bookingEDIExt.cnptNo"
               >
                 <inputView
                   type="CNPTNo"
                   :parentVal="details.bookingEDIExt.cnptNo"
                   @getInputChange="inputChange"
                 />
-              </a-form-model-item>
+              </a-form-item>
             </a-col>
           </a-row>
         </div>
       </template>
       <!-- === 太平添加 END === -->
-    </a-form-model>
+    </a-form>
   </div>
 </template>
 <script>
diff --git a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/goodsTable copy.vue b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/goodsTable copy.vue
new file mode 100644
index 00000000..069324be
--- /dev/null
+++ b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/goodsTable copy.vue	
@@ -0,0 +1,2393 @@
+<template>
+  <div class="goods-table">
+    <a-spin :spinning="loadingTable">
+      <a-card :bordered="false" :bodyStyle="{ padding: '10px 20px' }">
+        <div class="from-line">
+          <div class="left" v-if="!isLockBooking">
+            <a-button class="btn btn-add" type="primary" @click="addboxLine">添加</a-button>
+            <a-button class="btn btn-delete" @click="removeLine" :style="{ marginRight: '20px' }"
+              >删除</a-button
+            >
+            <a-button
+              class="btn btn-more-name"
+              type="primary"
+              @click="openDialog"
+              :disabled="tableData.length === 0"
+            >
+              <a-icon type="appstore" />多品名
+            </a-button>
+            <a-button
+              class="btn btn-import-station"
+              type="primary"
+              @click="importYarn"
+              :loading="YarnLoading"
+            >
+              <a-icon type="import" />引入场站数据
+            </a-button>
+            <a-button
+              class="btn btn-import-station"
+              type="primary"
+              @click="importsealno"
+              :loading="sealnoLoading"
+            >
+              <a-icon type="import" />引入场站箱封号
+            </a-button>
+            <a-button
+              class="btn btn-weight"
+              type="primary"
+              @click="importWeight"
+              :loading="WeightLoading"
+            >
+              <a-icon type="import" />引入箱皮重
+            </a-button>
+            <a-button class="btn btn-weight" type="primary" @click="arrowsWeight">
+              <a-icon type="arrows-alt" />展开箱量
+            </a-button>
+            <a-button class="btn btn-add" type="primary" @click="handleRefsh">刷新</a-button>
+          </div>
+          <div
+            v-if="details.autoYardImport && !details.autoYardImport.isRead"
+            style="display: inline-block; margin-left: 10px; padding-top: 5px"
+          >
+            <a-icon
+              v-if="details.autoYardImport && details.autoYardImport.status == '已导入'"
+              @click="handleOpen"
+              type="check-circle"
+              theme="filled"
+              style="color: green; font-size: 19px; cursor: pointer"
+            />
+            <a-icon
+              v-if="details.autoYardImport && details.autoYardImport.status == '未导入'"
+              @click="handleOpen"
+              type="exclamation-circle"
+              theme="filled"
+              style="color: rgb(197, 194, 16); font-size: 19px; cursor: pointer"
+            />
+          </div>
+          <div class="table-right">
+            <!-- <span>合计: {{ totalCtnall }}</span> -->
+            <span
+              >件数: {{ totalPkgs }} {{ tableData.length > 0 ? tableData[0].kindpkgs : '' }}</span
+            >
+            <span>重量: {{ totalKgs }} KGS</span>
+            <span>尺码: {{ totalCbm }} CBM</span>
+            <span>箱量: {{ details.cntrtotal }}</span>
+          </div>
+        </div>
+        <div v-if="tableLoaded">
+          <!-- rowKeyFieldName="rowKey" -->
+          <ve-table
+            :columns="columns"
+            :table-data="tableData"
+            borderY
+            ref="tableRef"
+            style="min-width: 970"
+            :cell-autofill-option="cellAutofillOption"
+            :editOption="editOption"
+            :rowKeyFieldName="rowKeyName"
+            :rowStyleOption="rowStyleOption"
+            :checkbox-option="checkboxOption"
+            :clipboard-option="clipboardOption"
+            :cellSelectionOption="cellSelectionOption"
+          />
+          <div class="table-no-data" v-if="tableData.length === 0">暂无数据</div>
+        </div>
+        <div class="loading" v-else>加载中 ...</div>
+      </a-card>
+    </a-spin>
+
+    <a-modal
+      title="多品名维护"
+      width="80%"
+      :visible="moreVisible"
+      :confirmLoading="moreModelconfirm"
+      :maskClosable="false"
+      @cancel="handleModelCancel"
+    >
+      <div class="model-content">
+        <ve-table
+          style="width: 100%"
+          :columns="modelColumns"
+          :table-data="tableData"
+          :radio-option="radioOption"
+          row-key-field-name="rowKey"
+        />
+        <div class="model-botton-box">
+          <a-button class="btn" type="primary" @click="addChildData">新增</a-button>
+          <a-button class="btn btn-delete" @click="removeChildData">删除</a-button>
+          <a-button class="btn" type="primary" @click="saveChildData">保存</a-button>
+        </div>
+        <div class="model-child-table">
+          <ve-table
+            :columns="childColumns"
+            :table-data="childTableData"
+            borderY
+            :cell-autofill-option="cellAutofillOption"
+            :editOption="editChildOption"
+            rowKeyFieldName="rowKey"
+            :rowStyleOption="rowStyleOption"
+            :checkbox-option="checkChildboxOption"
+            :clipboard-option="clipboardChildOption"
+          />
+          <div class="table-no-data" v-if="childTableData.length === 0">暂无数据</div>
+        </div>
+      </div>
+      <template slot="footer">
+        <a-button @click="handleModelCancel">关闭</a-button>
+      </template>
+    </a-modal>
+
+    <a-modal
+      title="场站数据比对"
+      width="80%"
+      :visible="comparisonFlag"
+      @cancel="comparisonFlag = false"
+    >
+      <div>
+        <div style="font-size: 16px">
+          <span>状态:{{ yardAutoForm.status }}</span>
+          <span style="margin-right: 80px; margin-left: 80px">提示:{{ yardAutoForm.content }}</span>
+          <span>创建时间:{{ yardAutoForm.createdTime }}</span>
+        </div>
+        <div style="font-size: 16px; margin-bottom: 10px; margin-top: 15px">场站数据</div>
+        <a-table
+          :pagination="false"
+          :columns="columnsAuto"
+          :data-source="yardAutoForm.yardTable"
+        ></a-table>
+        <div style="font-size: 16px; margin-bottom: 10px; margin-top: 15px">原有数据</div>
+        <a-table
+          :pagination="false"
+          :columns="columnsAuto"
+          :data-source="yardAutoForm.ctnTable"
+        ></a-table>
+      </div>
+      <template slot="footer">
+        <a-button @click="comparisonFlag = false">关闭</a-button>
+      </template>
+    </a-modal>
+  </div>
+</template>
+<script>
+  import {
+    GetYardData,
+    ReadAutoYardImport,
+    GetCtnListRefsh,
+  } from '/@/views/operation/seaexport/api/BookingLedger'
+  import { mapGetters } from 'vuex'
+  export default {
+    name: '',
+    props: {
+      details: {
+        type: Object,
+        default: () => {
+          return {}
+        },
+      },
+      rules: {
+        type: Object,
+        default: () => {
+          return {}
+        },
+      },
+      inSave: {
+        type: Boolean,
+        default: false,
+      },
+      pType: {
+        type: String,
+        default: 'normal',
+      },
+      isLockBooking: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    data() {
+      return {
+        id: this.$route.query.id,
+        rowKeyName: 'rowKey',
+        loadingTable: false,
+        BookingLockCtn: {},
+        cellAutofillOption: {
+          directionX: false,
+          directionY: true,
+          afterAutofill: ({
+            direction,
+            sourceSelectionRangeIndexes,
+            targetSelectionRangeIndexes,
+            sourceSelectionData,
+            targetSelectionData,
+          }) => {
+            console.log('direction::', direction)
+            console.log('sourceSelectionRangeIndexes::', sourceSelectionRangeIndexes)
+            console.log('targetSelectionRangeIndexes::', targetSelectionRangeIndexes)
+            console.log('sourceSelectionData::', sourceSelectionData)
+            console.log('targetSelectionData::', targetSelectionData)
+            console.log('---')
+          },
+        },
+        cellSelectionOption: {
+          // disble cell selection
+          enable: true,
+        },
+        columnsAuto: [
+          {
+            dataIndex: 'CTNALL',
+            key: 'CTNALL',
+            title: '箱型',
+          },
+          {
+            dataIndex: 'CTNNUM',
+            key: 'CTNNUM',
+            title: '箱量',
+          },
+          {
+            dataIndex: 'CNTRNO',
+            key: 'CNTRNO',
+            title: '箱号',
+          },
+          {
+            dataIndex: 'SEALNO',
+            key: 'SEALNO',
+            title: '封号',
+          },
+          {
+            dataIndex: 'PKGS',
+            key: 'PKGS',
+            title: '件数',
+          },
+          {
+            dataIndex: 'KINDPKGS',
+            key: 'KINDPKGS',
+            title: '包装',
+          },
+          {
+            dataIndex: 'KGS',
+            key: 'KGS',
+            title: '重量',
+          },
+          {
+            dataIndex: 'CBM',
+            key: 'CBM',
+            title: '尺码',
+          },
+          {
+            dataIndex: 'TAREWEIGHT',
+            key: 'TAREWEIGHT',
+            title: '箱皮重',
+          },
+          {
+            dataIndex: 'WEIGHTYPE',
+            key: 'WEIGHTYPE',
+            title: '称重方式',
+          },
+          {
+            dataIndex: 'WEIGHKGS',
+            key: 'WEIGHKGS',
+            title: '称重重量',
+          },
+          {
+            dataIndex: 'WEIGHDATE',
+            key: 'WEIGHDATE',
+            title: '称重日期',
+          },
+        ],
+        yardAutoForm: {},
+        columns: [
+          {
+            field: '',
+            key: 'checkbox',
+            type: 'checkbox',
+            title: '',
+            width: 40,
+            operationColumn: true,
+            align: 'center',
+          },
+          {
+            field: '',
+            key: 'a',
+            title: '序号',
+            width: 50,
+            align: 'center',
+            operationColumn: true,
+            renderBodyCell: ({ row, column, rowIndex }, h) => {
+              return ++rowIndex
+            },
+          },
+          {
+            field: 'ctnall',
+            key: 'ctnall',
+            title: '箱型',
+            align: 'left',
+            width: 120,
+            edit: false,
+            // renderBodyCell: ({ row, column, rowIndex }, h) => {
+            //   this.openEdit = true
+            //   return (
+            //     <a-select
+            //       size="small"
+            //       value={row['ctnall']}
+            //       showSearch
+            //       ref="ctnallView"
+            //       class="ctnallView"
+            //       disabled={BookingLockCtn.value['CTNALL'] && this.isLockBooking}
+            //       allow-clear={true}
+            //       style="width: 120px"
+            //       filter-option={this.filterOption1}
+            //       on-change={(val) => {
+            //         // console.log('== 箱型内部监听change ==')
+            //         if (val !== undefined) {
+            //           const data = this.ctnallList[val]
+            //           tableData.value[rowIndex].ctnall = data.name
+            //           tableData.value[rowIndex].ctncode = data.code
+            //           row['ctnall'] = data.name
+            //           var map = {};
+            //           var dest = [];
+            //           for (var i = 0; i < tableData.value.length; i++) {
+            //             var ai = tableData.value[i];
+            //             if (!map[ai.ctnall]) {
+            //               dest.push({
+            //                 ctnall: ai.ctnall,
+            //                 ctnnum: ai.ctnnum
+            //               });
+            //               map[ai.ctnall] = ai;
+            //             } else {
+            //               for (var j = 0; j < dest.length; j++) {
+            //                 var dj = dest[j];
+            //                 if (dj.ctnall == ai.ctnall) {
+            //                   dj.ctnnum = (parseFloat(dj.ctnnum) + parseFloat(ai.ctnnum)).toString();
+            //                   break;
+            //                 }
+            //               }
+            //             }
+            //           };
+            //           this.changeEmit1(dest)
+            //           this.$forceUpdate()
+            //         } else {
+            //           row['ctnall'] = ''
+            //           tableData.value[rowIndex].ctnall = ''
+            //           tableData.value[rowIndex].ctncode = ''
+            //         }
+            //       }}
+            //       on-focus={(val) => {
+            //         // console.log('== 箱型内部监听focus ==')
+            //         this.ctnallViewIndex = rowIndex
+            //         this.cellSelectionOption.enable = false
+            //       }}
+            //       on-blur={(val) => {
+            //         // 箱信息 下拉框自动弹出部分 - 测试中
+            //         // console.log('== 箱型内部监听blur ==', this.ctnallViewIndex, rowIndex)
+            //         this.cellSelectionOption.enable = true
+            //         this.ctnallViewIndex = null
+            //       }}
+            //       on-select={(val) => {
+            //         this.cellSelectionOption.enable = true
+            //         this.setCellSelection(rowIndex, 'ctnall')
+            //       }}
+            //     >
+            //       {this.ctnallList.map((item, index) => {
+            //         return <a-select-option value={index}>{item.name}</a-select-option>
+            //       })}
+            //     </a-select>
+            //   )
+            // },
+            // renderHeaderCell: ({ column }, h) => {
+            //   return (
+            //     <span class="text-bold" style="text-align: center;">
+            //       {this.rules.ctnall.required ? <i style="color: #f00">*</i> : ''} {column.title}
+            //     </span>
+            //   )
+            // }
+          },
+          {
+            field: 'ctnnum',
+            key: 'ctnnum',
+            title: '箱量',
+            align: 'left',
+            width: 60,
+            edit: true,
+            // renderHeaderCell: ({ column }, h) => {
+            //   return (
+            //     <span class="text-bold" style="text-align: center;">
+            //       {this.rules.ctnnum.required ? <i style="color: #f00">*</i> : ''} {column.title}
+            //     </span>
+            //   )
+            // },
+          },
+          {
+            field: 'cntrno',
+            key: 'cntrno',
+            title: '箱号',
+            align: 'left',
+            width: 130,
+            edit: true,
+            // renderHeaderCell: ({ column }, h) => {
+            //   return (
+            //     <span class="text-bold" style="text-align: center;">
+            //       {this.rules.cntrno.required ? <i style="color: #f00">*</i> : ''} {column.title}
+            //     </span>
+            //   )
+            // },
+          },
+          {
+            field: 'sealno',
+            key: 'sealno',
+            title: '封号',
+            align: 'left',
+            width: 60,
+            edit: true,
+            // renderHeaderCell: ({ column }, h) => {
+            //   return (
+            //     <span class="text-bold" style="text-align: center;">
+            //       {this.rules.sealno.required ? <i style="color: #f00">*</i> : ''} {column.title}
+            //     </span>
+            //   )
+            // },
+          },
+          {
+            field: 'pkgs',
+            key: 'pkgs',
+            title: '件数',
+            align: 'left',
+            width: 60,
+            edit: true,
+            // renderHeaderCell: ({ column }, h) => {
+            //   return (
+            //     <span class="text-bold" style="text-align: center;">
+            //       {this.rules.pkgs.required ? <i style="color: #f00">*</i> : ''} {column.title}
+            //     </span>
+            //   )
+            // },
+          },
+          {
+            field: 'kindpkgs',
+            key: 'kindpkgs',
+            title: '包装',
+            align: 'left',
+            edit: false,
+            width: 130,
+            // renderBodyCell: ({ row, column, rowIndex }, h) => {
+            //   this.openEdit = true
+            //   return (
+            //     <a-select
+            //       size="small"
+            //       allow-clear={true}
+            //       showSearch
+            //       value={row['kindpkgs']}
+            //       option-filter-prop="children"
+            //       filter-option={this.filterOption}
+            //       disabled={BookingLockCtn.value['kindpkgs'] && this.isLockBooking}
+            //       style="width: 120px"
+            //       class="kindpkgsView"
+            //       on-change={(val) => {
+            //         if (val !== undefined) {
+            //           const data = this.packageList[val]
+            //           tableData.value[rowIndex].kindpkgs = data.name
+            //           row['kindpkgs'] = data.name
+            //           this.$forceUpdate()
+            //         } else {
+            //           row['kindpkgs'] = ''
+            //           tableData.value[rowIndex].kindpkgs = ''
+            //           tableData.value.map((item, index) => {
+            //             if (index !== rowIndex) {
+            //               item.kindpkgs = ''
+            //               document
+            //                 .getElementsByClassName('kindpkgsView')
+            //               [index].getElementsByClassName('ant-select-selection-selected-value')[0].innerHTML = ''
+            //             }
+            //           })
+            //         }
+            //         this.changeEmit(row)
+            //       }}
+            //       on-focus={(val) => {
+            //         this.kindpkgsViewIndex = rowIndex
+            //         this.cellSelectionOption.enable = false
+            //         // console.log('=获取焦点=', rowIndex, this.kindpkgsViewIndex)
+            //       }}
+            //       on-blur={(val) => {
+            //         // 箱信息 下拉框自动弹出部分 - 测试中
+            //         this.cellSelectionOption.enable = true
+            //         this.kindpkgsViewIndex = null
+            //       }}
+            //       on-input={(val) => {
+            //         // console.log('== input - 修改内容==', val)
+            //       }}
+            //       on-select={(val) => {
+            //         this.cellSelectionOption.enable = true
+            //         this.setCellSelection(rowIndex, 'kindpkgs')
+            //       }}
+            //     >
+            //       {this.packageList.map((item, index) => {
+            //         return <a-select-option value={index}>{item.code}</a-select-option>
+            //       })}
+            //     </a-select>
+            //   )
+            // },
+            // renderHeaderCell: ({ column }, h) => {
+            //   return (
+            //     <span class="text-bold" style="text-align: center;">
+            //       {this.rules.kindpkgs.required ? <i style="color: #f00">*</i> : ''} {column.title}
+            //     </span>
+            //   )
+            // }
+          },
+          {
+            field: 'kgs',
+            key: 'kgs',
+            title: '重量',
+            align: 'left',
+            width: 60,
+            edit: true,
+            // renderHeaderCell: ({ column }, h) => {
+            //   return (
+            //     <span class="text-bold" style="text-align: center;">
+            //       {this.rules.kgs.required ? <i style="color: #f00">*</i> : ''} {column.title}
+            //     </span>
+            //   )
+            // },
+          },
+          {
+            field: 'cbm',
+            key: 'cbm',
+            title: '尺码',
+            align: 'left',
+            width: 60,
+            edit: true,
+            // renderHeaderCell: ({ column }, h) => {
+            //   return (
+            //     <span class="text-bold" style="text-align: center;">
+            //       {this.rules.cbm.required ? <i style="color: #f00">*</i> : ''} {column.title}
+            //     </span>
+            //   )
+            // },
+          },
+          {
+            field: 'tareweight',
+            key: 'tareweight',
+            title: '箱皮重',
+            align: 'left',
+            width: 60,
+            edit: true,
+            // renderHeaderCell: ({ column }, h) => {
+            //   return (
+            //     <span class="text-bold" style="text-align: center;">
+            //       {this.rules.tareweight.required ? <i style="color: #f00">*</i> : ''}{' '}
+            //       {column.title}
+            //     </span>
+            //   )
+            // },
+          },
+          {
+            field: 'weightype',
+            key: 'weightype',
+            title: '称重方式',
+            align: 'left',
+            width: 90,
+            edit: false,
+            // renderBodyCell: ({ row, column, rowIndex }, h) => {
+            //   return (
+            //     <a-select
+            //       size="small"
+            //       show-search
+            //       value={row['weightype']}
+            //       option-filter-prop="children"
+            //       disabled={BookingLockCtn.value['weightype'] && this.isLockBooking}
+            //       style="width: 80px"
+            //       on-change={(val) => {
+            //         tableData.value[rowIndex].weightype = val
+            //         row['weightype'] = val
+            //         if (row['weightype'] === '累加') {
+            //           row['weighkgs'] = calc(
+            //             Number(row['kgs']),
+            //             Number(row['tareweight']),
+            //             '+',
+            //           )
+            //         } else {
+            //           row['weighkgs'] = ''
+            //         }
+            //         this.$forceUpdate()
+            //       }}
+            //       on-blur={(val) => {
+            //         // 箱信息 下拉框自动弹出部分 - 测试中
+            //         this.cellSelectionOption.enable = true
+            //       }}
+            //       on-focus={(val) => {
+            //         this.cellSelectionOption.enable = false
+            //       }}
+            //     >
+            //       <a-select-option value="累加">累加</a-select-option>
+            //       <a-select-option value="总重">总重</a-select-option>
+            //     </a-select>
+            //   )
+            // },
+            // renderHeaderCell: ({ column }, h) => {
+            //   return (
+            //     <span class="text-bold" style="text-align: center;">
+            //       {this.rules.weightype.required ? <i style="color: #f00">*</i> : ''} {column.title}
+            //     </span>
+            //   )
+            // },
+          },
+          {
+            field: 'weighkgs',
+            key: 'weighkgs',
+            title: '称重重量',
+            align: 'left',
+            width: 60,
+            edit: true,
+            // renderHeaderCell: ({ column }, h) => {
+            //   return (
+            //     <span class="text-bold" style="text-align: center;">
+            //       {this.rules.weighkgs.required ? <i style="color: #f00">*</i> : ''} {column.title}
+            //     </span>
+            //   )
+            // },
+          },
+          {
+            field: 'weighdate',
+            key: 'weighdate',
+            title: '称重日期',
+            align: 'left',
+            width: 120,
+            edit: false,
+            // renderBodyCell: ({ row, column, rowIndex }, h) => {
+            //   return (
+            //     <a-date-picker
+            //       value={row['weighdate']}
+            //       disabled={BookingLockCtn.value['weighdate'] && this.isLockBooking}
+            //       on-change={(date, dateString) => {
+            //         // console.log('== 选择日期 ==', dateString)
+            //         tableData.value[rowIndex].weighdate = dateString
+            //         row['weighdate'] = dateString
+            //       }}
+            //     />
+            //   )
+            // },
+            // renderHeaderCell: ({ column }, h) => {
+            //   return (
+            //     <span class="text-bold" style="text-align: center;">
+            //       {this.rules.weightype.required ? <i style="color: #f00">*</i> : ''} {column.title}
+            //     </span>
+            //   )
+            // },
+          },
+        ],
+        modelColumns: [
+          {
+            field: '',
+            key: 'radio',
+            type: 'radio',
+            title: '',
+            width: 40,
+            operationColumn: true,
+            align: 'center',
+          },
+          {
+            field: 'ctnall',
+            key: 'ctnall',
+            title: '箱型',
+            align: 'left',
+            width: 80,
+          },
+          {
+            field: 'ctnnum',
+            key: 'ctnnum ',
+            title: '箱量',
+            align: 'left',
+          },
+          {
+            field: 'cntrno',
+            key: 'cntrno',
+            title: '箱号',
+            align: 'left',
+            width: 240,
+          },
+          {
+            field: 'sealno',
+            key: 'sealno',
+            title: '封号',
+            align: 'left',
+          },
+          {
+            field: 'pkgs',
+            key: 'pkgs',
+            title: '件数',
+            align: 'left',
+          },
+          {
+            field: 'kindpkgs',
+            key: 'kindpkgs',
+            title: '包装',
+            align: 'left',
+            width: 130,
+          },
+          {
+            field: 'kgs',
+            key: 'kgs',
+            title: '毛重',
+            align: 'left',
+          },
+          {
+            field: 'cbm',
+            key: 'cbm',
+            title: '尺码',
+            align: 'left',
+          },
+        ],
+        childColumns: [
+          {
+            field: '',
+            key: 'checkbox',
+            type: 'checkbox',
+            title: '',
+            width: 40,
+            operationColumn: true,
+            align: 'center',
+          },
+          {
+            field: 'pkgs',
+            key: 'pkgs',
+            title: '件数',
+            align: 'left',
+            edit: true,
+          },
+          {
+            field: 'kindpkgs',
+            key: 'kindpkgs',
+            title: '包装',
+            align: 'left',
+            edit: false,
+            width: 130,
+            // renderBodyCell: ({ row, column, rowIndex }, h) => {
+            //   return (
+            //     <a-select
+            //       show-search
+            //       value={row['kindpkgs']}
+            //       option-filter-prop="children"
+            //       style="width: 120px"
+            //       on-change={(val) => {
+            //         const data = this.packageList[val]
+            //         row['kindpkgs'] = data.name
+            //         childTableData.value[rowIndex].kindpkgs = data.name
+            //         this.$forceUpdate()
+            //       }}
+            //     >
+            //       {this.packageList.map((item, index) => {
+            //         return <a-select-option value={index}>{item.name}</a-select-option>
+            //       })}
+            //     </a-select>
+            //   )
+            // },
+          },
+          {
+            field: 'kgs',
+            key: 'kgs',
+            title: '毛重',
+            align: 'left',
+            edit: true,
+          },
+          {
+            field: 'cbm',
+            key: 'cbm',
+            title: '尺码',
+            align: 'left',
+            edit: true,
+          },
+          {
+            field: 'hscode',
+            key: 'hscode',
+            title: 'HS代码',
+            align: 'left',
+            edit: true,
+          },
+          {
+            field: 'marks',
+            key: 'marks',
+            title: '唛头',
+            align: 'left',
+            edit: true,
+          },
+          {
+            field: 'description',
+            key: 'description',
+            title: '货描',
+            align: 'left',
+            width: '25%',
+            edit: true,
+          },
+        ],
+        tableData: [],
+        editOption: {
+          beforeCellValueChange: ({ row, column, changeValue }) => {
+            if (inTableLoad.value) {
+              return false
+            }
+            if (
+              ['pkgs', 'kgs', 'cbm', 'tareweight'].includes(column.field) &&
+              !new RegExp(/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(changeValue)
+            ) {
+              const height = document.body.clientHeight - 100
+              this.$message.config({
+                top: `${height}px`,
+                duration: 2,
+                maxCount: 3,
+              })
+              this.$message.error(`输入的${this.enmuErrorLabel(column.field)}不符合规则`)
+              setTimeout(() => {
+                this.$message.destroy()
+                this.$message.config({
+                  top: `100px`,
+                  duration: 2,
+                  maxCount: 3,
+                })
+              }, 2000)
+              return false
+            }
+            if (column.field === 'cntrno') {
+              const res = this.checkCntrno(changeValue)
+              if (res !== '') {
+                const height = document.body.clientHeight - 100
+                this.$message.config({
+                  top: `${height}px`,
+                  duration: 2,
+                  maxCount: 3,
+                })
+                this.$message.error(res)
+                // row['cntrno'] = ''
+                setTimeout(() => {
+                  this.$message.destroy()
+                  this.$message.config({
+                    top: `100px`,
+                    duration: 2,
+                    maxCount: 3,
+                  })
+                }, 2000)
+              }
+            }
+          },
+          beforeStartCellEditing: ({ row, column, cellValue }) => {
+            console.log(column)
+            const arr = this.$options.filters['dictData']('BookingLockCtn')
+            let type = true
+            arr.forEach((item) => {
+              if (item.code == column.field && this.isLockBooking) {
+                type = false
+              }
+            })
+            return type
+          },
+          afterCellValueChange: ({ row, column, changeValue }) => {
+            if (inTableLoad.value) {
+              return false
+            }
+            if (['kgs', 'cbm', 'tareweight', 'weighkgs'].includes(column.field)) {
+              changeValue = changeValue + ''
+              const valIndex = changeValue.includes('.') ? changeValue.indexOf('.') + 1 : false
+              const valCount = changeValue.length - valIndex
+              if (valIndex && valCount > 5) {
+                const height = document.body.clientHeight - 100
+                this.$message.config({
+                  top: `${height}px`,
+                  duration: 2,
+                  maxCount: 3,
+                })
+                this.$message.error('仅支持小数点后五位')
+                row[column.field] = changeValue.substr(0, valIndex + 5)
+                setTimeout(() => {
+                  this.$message.destroy()
+                  this.$message.config({
+                    top: `100px`,
+                    duration: 2,
+                    maxCount: 3,
+                  })
+                }, 2000)
+              } else {
+                const arrayNum = changeValue.split('.')
+                if (!/\./.test(changeValue)) {
+                  row[column.field] = changeValue + '.00'
+                } else if (arrayNum[1].length < 2) {
+                  row[column.field] = changeValue + '0'
+                }
+              }
+            }
+            if (column.field === 'pkgs') {
+              if (!/(^[1-9]\d*$)/.test(changeValue)) {
+                const height = document.body.clientHeight - 100
+                this.$message.config({
+                  top: `${height}px`,
+                  duration: 2,
+                  maxCount: 3,
+                })
+                this.$message.error('件数请输入整数')
+                const cNum = changeValue.indexOf('.')
+                row[column.field] = changeValue.substr(0, cNum)
+                setTimeout(() => {
+                  this.$message.destroy()
+                  this.$message.config({
+                    top: `100px`,
+                    duration: 2,
+                    maxCount: 3,
+                  })
+                }, 2000)
+              } else {
+              }
+              let num = 0
+              tableData.value.map((item, index) => {
+                if (item.pkgs) {
+                  num += Number(item.pkgs)
+                }
+              })
+              totalPkgs.value = num
+            }
+            if (column.field === 'kgs') {
+              let num = 0
+              tableData.value.map((item, index) => {
+                num = (num * 10000 + Number(item.kgs) * 10000) / 10000
+                // num += Number(item.kgs)
+              })
+              num += ''
+              const pNum = num.split('.')
+              if (!/\./.test(num)) {
+                totalKgs.value = num + '.00'
+              } else if (pNum[1].length < 2) {
+                totalKgs.value = num + '0'
+              } else {
+                totalKgs.value = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
+                // totalKgs.value = num
+              }
+            }
+            if (column.field === 'cbm') {
+              let num = 0
+              tableData.value.map((item, index) => {
+                // num += Number(item.cbm)
+                num = (num * 10000 + Number(item.cbm) * 10000) / 10000
+              })
+              num += ''
+              const pNum = num.split('.')
+              if (!/\./.test(num)) {
+                totalCbm.value = num + '.00'
+              } else if (pNum[1].length < 2) {
+                totalCbm.value = num + '0'
+              } else {
+                // totalCbm.value = num
+                totalCbm.value = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
+              }
+            }
+            if (column.field === 'kgs' || column.field === 'tareweight') {
+              row['weighkgs'] = calc(Number(row['kgs']), Number(row['tareweight']), '+')
+              const kgsVal = row['weighkgs'] + ''
+              const kgsIndex = kgsVal.includes('.') ? kgsVal.indexOf('.') + 1 : false
+              const kgsCount = kgsVal.includes('.') ? kgsVal.length - kgsIndex : false
+              if (kgsCount > 4) {
+                row['weighkgs'] = kgsVal.substr(0, kgsIndex + 5)
+              } else if (!kgsIndex) {
+                row['weighkgs'] = kgsVal + '.00'
+              } else {
+                const arrayNum = kgsVal.split('.')
+                if (!/\./.test(kgsVal)) {
+                  row['weighkgs'] = kgsVal + '.00'
+                } else if (arrayNum[1].length < 2) {
+                  row['weighkgs'] = kgsVal + '0'
+                }
+              }
+            }
+            if (column.field === 'ctnnum') {
+              const map = {}
+              const dest = []
+              for (var i = 0; i < tableData.value.length; i++) {
+                var ai = tableData.value[i]
+                if (!map[ai.ctnall]) {
+                  dest.push({
+                    ctnall: ai.ctnall,
+                    ctnnum: ai.ctnnum,
+                  })
+                  map[ai.ctnall] = ai
+                } else {
+                  for (var j = 0; j < dest.length; j++) {
+                    var dj = dest[j]
+                    if (dj.ctnall == ai.ctnall) {
+                      dj.ctnnum = (parseFloat(dj.ctnnum) + parseFloat(ai.ctnnum)).toString()
+                      break
+                    }
+                  }
+                }
+              }
+              this.changeEmit1(dest)
+            }
+          },
+          cellValueChange: ({ row, column }) => {},
+        },
+        editChildOption: {
+          beforeCellValueChange: ({ row, column, changeValue }) => {
+            if (
+              ['pkgs', 'kgs', 'cbm'].includes(column.field) &&
+              !new RegExp(/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(changeValue)
+            ) {
+              // const height = document.body.clientHeight - 100
+              // this.$message.config({
+              //   top: `${height}px`,
+              //   duration: 2,
+              //   maxCount: 3,
+              // })
+              this.$message.error(`输入的${this.enmuErrorLabel(column.field)}不符合规则`)
+              row['cntrno'] = ''
+              setTimeout(() => {
+                this.$message.destroy()
+                this.$message.config({
+                  top: `100px`,
+                  duration: 2,
+                  maxCount: 3,
+                })
+              }, 2000)
+              return false
+            }
+          },
+          afterCellValueChange: ({ row, column, changeValue }) => {
+            let num = null
+            childTableData.value.map((item, index) => {
+              if (row.rowKey === item.rowKey) {
+                // eslint-disable-next-line no-const-assign
+                num = index
+              }
+            })
+            childTableData.value[num][column.field] = changeValue
+            // 暂时屏蔽 - 根据需求放开
+            // props.details.ctnInputs[childModelSelect.valueIndex].ctnDetailInputs[num][column.field] = changeValue
+            this.$forceUpdate()
+          },
+          cellValueChange: ({ row, column }) => {},
+        },
+        // 可控单元格编辑
+        rowStyleOption: {
+          clickHighlight: false,
+          hoverHighlight: false,
+        },
+        checkboxOption: {
+          hideSelectAll: false,
+          // 可控属性
+          selectedRowKeys: [],
+          // 行选择改变事件
+          selectedRowChange: ({ row, isSelected, selectedRowKeys }) => {
+            this.changeSelectedRowKeys(selectedRowKeys)
+            // selectArr.value = selectedRowKeys
+          },
+          // 全选改变事件
+          selectedAllChange: ({ isSelected, selectedRowKeys }) => {
+            if (isSelected) {
+              this.changeSelectedRowKeys(selectedRowKeys)
+              // selectArr.value = selectedRowKeys
+            } else {
+              selectArr.value = []
+            }
+          },
+        },
+        checkChildboxOption: {
+          hideSelectAll: false,
+          // 行选择改变事件
+          selectedRowChange: ({ row, isSelected, selectedRowKeys }) => {
+            console.log(row, isSelected, selectedRowKeys)
+            selectChildArr.value = selectedRowKeys
+          },
+          // 全选改变事件
+          selectedAllChange: ({ isSelected, selectedRowKeys }) => {
+            if (isSelected) {
+              selectChildArr.value = selectedRowKeys
+            } else {
+              selectChildArr.value = []
+            }
+          },
+        },
+        // 单元格复制
+        clipboardOption: {
+          copy: true,
+          paste: true,
+          cut: true,
+          delete: true,
+          beforeCopy: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
+          },
+          afterCopy: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
+          },
+          beforePaste: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            const changeValue = data[0][selectionRangeKeys.endColKey]
+            if (inTableLoad.value) {
+              return false
+            }
+            if (
+              ['pkgs', 'kgs', 'cbm', 'tareweight'].includes(selectionRangeKeys.endColKey) &&
+              !new RegExp(/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(changeValue)
+            ) {
+              const height = document.body.clientHeight - 100
+              this.$message.config({
+                top: `${height}px`,
+                duration: 2,
+                maxCount: 3,
+              })
+              this.$message.error(
+                `输入的${this.enmuErrorLabel(selectionRangeKeys.endColKey)}不符合规则`,
+              )
+              setTimeout(() => {
+                this.$message.destroy()
+                this.$message.config({
+                  top: `100px`,
+                  duration: 2,
+                  maxCount: 3,
+                })
+              }, 2000)
+              return false
+            }
+            if (selectionRangeKeys.endColKey === 'cntrno') {
+              const res = this.checkCntrno(changeValue)
+              if (res !== '') {
+                const height = document.body.clientHeight - 100
+                this.$message.config({
+                  top: `${height}px`,
+                  duration: 2,
+                  maxCount: 3,
+                })
+                this.$message.error(res)
+                // row['cntrno'] = ''
+                setTimeout(() => {
+                  this.$message.destroy()
+                  this.$message.config({
+                    top: `100px`,
+                    duration: 2,
+                    maxCount: 3,
+                  })
+                }, 2000)
+              }
+            }
+          },
+          afterPaste: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            let changeValue = data[0][selectionRangeKeys.endColKey]
+            const index = selectionRangeIndexes.startRowIndex
+            if (inTableLoad.value) {
+              return false
+            }
+            if (['kgs', 'cbm', 'tareweight', 'weighkgs'].includes(selectionRangeKeys.endColKey)) {
+              changeValue = changeValue + ''
+              const valIndex = changeValue.includes('.') ? changeValue.indexOf('.') + 1 : false
+              const valCount = changeValue.length - valIndex
+              if (valIndex && valCount > 5) {
+                const height = document.body.clientHeight - 100
+                this.$message.config({
+                  top: `${height}px`,
+                  duration: 2,
+                  maxCount: 3,
+                })
+                this.$message.error('仅支持小数点后五位')
+                tableData.value[index][selectionRangeKeys.endColKey] = changeValue.substr(
+                  0,
+                  valIndex + 5,
+                )
+                setTimeout(() => {
+                  this.$message.destroy()
+                  this.$message.config({
+                    top: `100px`,
+                    duration: 2,
+                    maxCount: 3,
+                  })
+                }, 2000)
+              } else {
+                const arrayNum = changeValue.split('.')
+                if (!/\./.test(changeValue)) {
+                  tableData.value[index][selectionRangeKeys.endColKey] = changeValue + '.00'
+                } else if (arrayNum[1].length < 2) {
+                  tableData.value[index][selectionRangeKeys.endColKey] = changeValue + '0'
+                }
+              }
+            }
+            if (selectionRangeKeys.endColKey === 'pkgs') {
+              if (!/(^[1-9]\d*$)/.test(changeValue)) {
+                const height = document.body.clientHeight - 100
+                this.$message.config({
+                  top: `${height}px`,
+                  duration: 2,
+                  maxCount: 3,
+                })
+                this.$message.error('件数请输入整数')
+                const cNum = changeValue.indexOf('.')
+                tableData.value[index][selectionRangeKeys.endColKey] = changeValue.substr(0, cNum)
+                setTimeout(() => {
+                  this.$message.destroy()
+                  this.$message.config({
+                    top: `100px`,
+                    duration: 2,
+                    maxCount: 3,
+                  })
+                }, 2000)
+              } else {
+              }
+              let num = 0
+              tableData.value.map((item, index) => {
+                if (item.pkgs) {
+                  num += Number(item.pkgs)
+                }
+              })
+              totalPkgs.value = num
+            }
+            if (selectionRangeKeys.endColKey === 'kgs') {
+              let num = 0
+              tableData.value.map((item, index) => {
+                num = (num * 10000 + Number(item.kgs) * 10000) / 10000
+                // num += Number(item.kgs)
+              })
+              num += ''
+              const pNum = num.split('.')
+              if (!/\./.test(num)) {
+                totalKgs.value = num + '.00'
+              } else if (pNum[1].length < 2) {
+                totalKgs.value = num + '0'
+              } else {
+                totalKgs.value = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
+                // totalKgs.value = num
+              }
+            }
+            if (selectionRangeKeys.endColKey === 'cbm') {
+              let num = 0
+              tableData.value.map((item, index) => {
+                // num += Number(item.cbm)
+                num = (num * 10000 + Number(item.cbm) * 10000) / 10000
+              })
+              num += ''
+              const pNum = num.split('.')
+              if (!/\./.test(num)) {
+                totalCbm.value = num + '.00'
+              } else if (pNum[1].length < 2) {
+                totalCbm.value = num + '0'
+              } else {
+                // totalCbm.value = num
+                totalCbm.value = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
+              }
+            }
+            if (
+              selectionRangeKeys.endColKey === 'kgs' ||
+              selectionRangeKeys.endColKey === 'tareweight'
+            ) {
+              tableData.value[index]['weighkgs'] = calc(
+                Number(tableData.value[index]['kgs']),
+                Number(tableData.value[index]['tareweight']),
+                '+',
+              )
+              const kgsVal = tableData.value[index]['weighkgs'] + ''
+              const kgsIndex = kgsVal.includes('.') ? kgsVal.indexOf('.') + 1 : false
+              const kgsCount = kgsVal.includes('.') ? kgsVal.length - kgsIndex : false
+              if (kgsCount > 4) {
+                tableData.value[index]['weighkgs'] = kgsVal.substr(0, kgsIndex + 5)
+              } else if (!kgsIndex) {
+                tableData.value[index]['weighkgs'] = kgsVal + '.00'
+              } else {
+                const arrayNum = kgsVal.split('.')
+                if (!/\./.test(kgsVal)) {
+                  tableData.value[index]['weighkgs'] = kgsVal + '.00'
+                } else if (arrayNum[1].length < 2) {
+                  tableData.value[index]['weighkgs'] = kgsVal + '0'
+                }
+              }
+            }
+          },
+          beforeCut: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
+          },
+          afterCut: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
+          },
+          beforeDelete: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
+          },
+          afterDelete: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
+          },
+        },
+        clipboardChildOption: {
+          copy: true,
+          paste: true,
+          cut: true,
+          delete: true,
+          beforeCopy: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
+          },
+          afterCopy: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
+          },
+          beforePaste: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
+          },
+          afterPaste: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
+          },
+          beforeCut: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
+          },
+          afterCut: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
+          },
+          beforeDelete: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
+          },
+          afterDelete: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
+          },
+        },
+        tableLoaded: false,
+        // ctnList: [],
+        // packageList: [],
+        selectArr: [],
+        totalCtnall: '',
+        totalPkgs: 0,
+        totalKgs: 0,
+        totalCbm: 0,
+        moreVisible: false,
+        moreModelconfirm: false,
+        radioOption: {
+          // 行选择改变事件
+          selectedRowChange: ({ row }) => {
+            childModelSelect.value = row
+            tableData.value.map((item, index) => {
+              if (item.rowKey === row.rowKey) {
+                childModelSelect.valueIndex = index
+              }
+            })
+            if (tableData.value[childModelSelect.valueIndex].ctnDetailInputs) {
+              tableData.value[childModelSelect.valueIndex].ctnDetailInputs.map((item, index) => {
+                item.rowKey = index
+              })
+              childTableData.value = tableData.value[childModelSelect.valueIndex].ctnDetailInputs
+            } else {
+              childTableData.value = []
+            }
+          },
+        },
+        childTableData: [],
+        childModelSelect: null,
+        childModelSelectIndex: null,
+        selectChildArr: [],
+        YarnLoading: false,
+        sealnoLoading: false,
+        WeightLoading: false,
+        ctnallViewIndex: null,
+        kindpkgsViewIndex: null,
+        inTableLoad: false,
+        openEdit: false,
+        comparisonFlag: false,
+      }
+    },
+    computed: {
+      ...mapGetters(['packageList', 'ctnallList']),
+    },
+    watch: {
+      details: {
+        handler(nval, oval) {
+          // console.log('=== 修改table内容 ===', nval.ctnInputs, this.pType, inTableLoad.value)
+          if (!this.inSave && !inTableLoad.value) {
+            emit('changeDetail', {
+              detail: nval,
+              type: 'goodsTable',
+            })
+            // if (this.pType === 'secOrder' && !inTableLoad.value && this.$route.name === 'BookingDetail') {
+            //   this.init()
+            // }
+          }
+        },
+        deep: true,
+      },
+      tableData: {
+        handler(nval, oval) {
+          props.details.ctnInputs = nval
+        },
+        deep: true,
+      },
+      '$route.query': {
+        immediate: true,
+        handler(nD, oD) {
+          if (this.$route.query.isCopy) {
+            id.value = ''
+          } else {
+            id.value = this.$route.query.id
+          }
+
+          if (this.$route.name === 'BookingDetail') {
+            this.init()
+          }
+        },
+      },
+      totalKgs() {
+        emit('changeTotal', {
+          type: 'totalKgs',
+          val: totalKgs.value,
+        })
+      },
+      totalPkgs() {
+        emit('changeTotal', {
+          type: 'totalPkgs',
+          val: totalPkgs.value,
+        })
+      },
+      totalCbm() {
+        emit('changeTotal', {
+          type: 'totalCbm',
+          val: totalCbm.value,
+        })
+      },
+      openEdit(nval, oval) {},
+    },
+    created() {
+      this.init()
+    },
+    mounted() {
+      const editDom = document.getElementsByClassName('ve-table-body-tr')
+      document.onkeydown = (event) => {
+        editDom.forEach((item, index) => {
+          item.children.forEach((ite) => {
+            if (ite.classList.contains('ve-table-cell-selection')) {
+              this.kindpkgsViewIndex = index
+            }
+          })
+        })
+        if (event.key === 'Backspace' && this.kindpkgsViewIndex !== null) {
+          const val = document
+            .getElementsByClassName('kindpkgsView')
+            [this.kindpkgsViewIndex].getElementsByTagName('input')[0].value
+          document
+            .getElementsByClassName('kindpkgsView')
+            [this.kindpkgsViewIndex].getElementsByTagName('input')[0].value = val.substr(
+            0,
+            val.length - 1,
+          )
+          var evt = document.createEvent('HTMLEvents')
+          evt.initEvent('input', true, false)
+          document
+            .getElementsByClassName('kindpkgsView')
+            [this.kindpkgsViewIndex].getElementsByTagName('input')[0]
+            .dispatchEvent(evt)
+        }
+        if (event.key === 'Backspace' && this.kindpkgsViewIndex !== null) {
+          const val = document
+            .getElementsByClassName('ctnallView')
+            [this.kindpkgsViewIndex].getElementsByTagName('input')[0].value
+          document
+            .getElementsByClassName('ctnallView')
+            [this.kindpkgsViewIndex].getElementsByTagName('input')[0].value = val.substr(
+            0,
+            val.length - 1,
+          )
+          var evt = document.createEvent('HTMLEvents')
+          evt.initEvent('input', true, false)
+          document
+            .getElementsByClassName('ctnallView')
+            [this.kindpkgsViewIndex].getElementsByTagName('input')[0]
+            .dispatchEvent(evt)
+        }
+        const arr = []
+        if (document.getElementsByClassName('ant-select-dropdown').length > 0) {
+          document.getElementsByClassName('ant-select-dropdown').forEach((item) => {
+            const style = item.style
+            if (style.display !== 'none') {
+              arr.push(1)
+            }
+          })
+        }
+        if (arr.length === 0) {
+          this.cellSelectionOption.enable = true
+          if ([37, 38, 39, 40, 9].includes(event.keyCode)) {
+            if (arr.length === 0) {
+              setTimeout(() => {
+                if (document.getElementsByClassName('ve-table-cell-selection')) {
+                  const activeDom =
+                    document.getElementsByClassName('ve-table-cell-selection')[0].firstChild
+                  if (this.isDOM(activeDom)) {
+                    activeDom.click()
+                  }
+                }
+              }, 200)
+            }
+          }
+        } else {
+          this.cellSelectionOption.enable = false
+        }
+      }
+    },
+    methods: {
+      keydown(e) {
+        console.log(e)
+      },
+      handleRefsh() {
+        emit('handleRefshTable')
+      },
+      changeEmit(row) {
+        emit('changeCtnInfo', { type: 'kindpkgs', val: row['kindpkgs'] })
+      },
+      isDOM(item) {
+        // 首先判断是否支持HTMLELement，如果支持，使用HTMLElement，如果不支持，通过判断DOM的特征，如果拥有这些特征说明就是ODM节点，特征使用的越多越准确
+        return typeof HTMLElement === 'function'
+          ? item instanceof HTMLElement
+          : item &&
+              typeof item === 'object' &&
+              item.nodeType === 1 &&
+              typeof item.nodeName === 'string'
+      },
+      // 给可控属性重新赋值
+      changeSelectedRowKeys(keys) {
+        selectArr.value = keys
+        checkboxOption.value.selectedRowKeys = keys
+      },
+      startEditingCell(rowKey, colKey, defaultValue) {
+        this.$refs['tableRef'].startEditingCell({ rowKey, colKey, defaultValue })
+      },
+      setCellSelection(rowKey, colKey) {
+        this.$refs['tableRef'].setCellSelection({ rowKey, colKey })
+      },
+      init() {
+        if (Object.keys(props.details).length > 0) {
+          const arr = []
+          const totalCtnall = {}
+          totalPkgs.value = 0
+          totalKgs.value = 0
+          totalCbm.value = 0
+          props.details.ctnInputs.map((item, index) => {
+            arr.push({
+              ...{ rowKey: index },
+              ...item,
+            })
+            if (!Object.keys(totalCtnall).includes(item.ctnall)) {
+              const cData = {
+                type: 'ctnall',
+                num: item.ctnnum,
+              }
+              this.$set(totalCtnall, item.ctnall, cData)
+            }
+            if (item.pkgs) {
+              totalPkgs.value = (totalPkgs.value * 100 + Number(item.pkgs) * 100) / 100
+            }
+            if (item.kgs) {
+              let onum = (totalKgs.value * 10000 + Number(item.kgs) * 10000) / 10000
+              onum += ''
+              const pNum = onum.split('.')
+              if (!/\./.test(onum)) {
+                totalKgs.value = onum + '.00'
+              } else if (pNum[1].length < 2) {
+                totalKgs.value = onum + '0'
+              } else {
+                totalKgs.value = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
+              }
+            }
+            if (item.cbm) {
+              let onum = (totalCbm.value * 10000 + Number(item.cbm) * 10000) / 10000
+              onum += ''
+              const pNum = onum.split('.')
+              if (!/\./.test(onum)) {
+                totalCbm.value = onum + '.00'
+              } else if (pNum[1].length < 2) {
+                totalCbm.value = onum + '0'
+              } else {
+                totalCbm.value = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
+              }
+            }
+          })
+          tableData.value = arr
+          tableLoaded.value = true
+          this.totalCtnall = ''
+          emit('changeTotal', { type: 'totalKgs', val: totalKgs.value })
+          emit('changeTotal', { type: 'totalPkgs', val: totalPkgs.value })
+          emit('changeTotal', { type: 'totalCbm', val: totalCbm.value })
+        } else {
+          tableData.value = []
+          tableLoaded.value = true
+          this.totalCtnall = ''
+          totalPkgs.value = 0
+          totalKgs.value = 0
+          totalCbm.value = 0
+        }
+        const obj = {}
+        this.$options.filters['dictData']('BookingLockCtn').forEach((item) => {
+          obj[item.code] = true
+        })
+        BookingLockCtn.value = obj
+      },
+      filterOption1(input, option) {
+        return (
+          option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        )
+      },
+      filterOption(input, option) {
+        const search = option.componentOptions.children[0].text.toLowerCase()
+        const inputStr = input.toLowerCase()
+        const arr = []
+        for (let i = 0; i < inputStr.length; i++) {
+          if (inputStr[i] === search[i]) {
+            arr.push(1)
+          }
+        }
+        if (arr.length === inputStr.length) {
+          return true
+        }
+      },
+      enmuErrorLabel(val) {
+        switch (val) {
+          case 'cntrno':
+            return '箱型'
+          case 'pkgs':
+            return '件数'
+          case 'kgs':
+            return '重量'
+          case 'cbm':
+            return '尺码'
+          case 'tareweight':
+            return '箱皮重'
+          default:
+            return '内容'
+        }
+      },
+      handleOpen() {
+        this.comparisonFlag = true
+        this.yardAutoForm = props.details.autoYardImport
+        if (this.yardAutoForm.yardJson) {
+          this.yardAutoForm.yardTable = JSON.parse(this.yardAutoForm.yardJson)
+        }
+        if (this.yardAutoForm.ctnJson) {
+          this.yardAutoForm.ctnTable = JSON.parse(this.yardAutoForm.ctnJson)
+        }
+        ReadAutoYardImport({ bookId: this.$route.query.id }).then((res) => {})
+      },
+      addboxLine() {
+        const data = {
+          ctnall: '',
+          ctnnum: '1',
+          cntrno: '',
+          sealno: '',
+          pkgs: '',
+          kindpkgs: tableData.value.length > 0 ? tableData.value[0].kindpkgs : '',
+          kgs: '',
+          cbm: '',
+          tareweight: '',
+          weightype: '累加',
+          weighkgs: '',
+          weighdate: '',
+          rowKey:
+            tableData.value.length > 0
+              ? Number(tableData.value[tableData.value.length - 1].rowKey) + 1
+              : 0,
+        }
+        tableData.value.push(data)
+      },
+      removeLine() {
+        selectArr.value.map((item, index) => {
+          tableData.value.map((oitem, oindex) => {
+            if (item === oitem.rowKey) {
+              tableData.value.splice(oindex, 1)
+            }
+          })
+        })
+        let kgs = 0
+        tableData.value.map((item, index) => {
+          kgs += Number(item.kgs)
+        })
+        totalKgs.value = kgs
+
+        let cbm = 0
+        tableData.value.map((item, index) => {
+          cbm += Number(item.cbm)
+        })
+        totalCbm.value = cbm
+
+        let pkgs = 0
+        tableData.value.map((item, index) => {
+          pkgs += Number(item.pkgs)
+        })
+        totalPkgs.value = pkgs
+        checkboxOption.value.selectedRowKeys = []
+        selectArr.value = []
+        tableData.value.forEach((item, index) => {
+          item.rowKey = index
+        })
+      },
+      developboxLine() {
+        const arr = []
+        let key = 0
+        tableData.value.map((item, index) => {
+          const num = Number(item.ctnnum)
+          if (num > 1) {
+            let surplusPkgs = item.pkgs
+            let surpluskgs = item.kgs * 100000
+            let surpluscbm = item.cbm * 100000
+            for (let i = 0; i < num; i++) {
+              // eslint-disable-next-line prefer-const
+              let sunData = JSON.parse(JSON.stringify(item))
+              sunData.ctnnum = 1
+              sunData.rowKey = key
+              key++
+              if (!/(^[1-9]\d*$)/.test(sunData.pkgs / num)) {
+                if (i !== num - 1) {
+                  const averagePkgs = sunData.pkgs / num + ''
+                  const cNum = averagePkgs.indexOf('.')
+                  sunData.pkgs = Number(averagePkgs.substr(0, cNum))
+                  surplusPkgs = surplusPkgs - sunData.pkgs
+                } else {
+                  sunData.pkgs = surplusPkgs
+                }
+              } else {
+                sunData.pkgs = sunData.pkgs / num
+              }
+
+              if (!/(^[1-9]\d*$)/.test((sunData.kgs * 100000) / num)) {
+                if (i !== num - 1) {
+                  const averagekgs = (sunData.kgs * 100000) / num + ''
+                  const cNum = averagekgs.indexOf('.')
+                  sunData.kgs = Number(averagekgs.substr(0, cNum)) / 100000
+                  surpluskgs = surpluskgs - Number(averagekgs.substr(0, cNum))
+                } else {
+                  sunData.kgs = surpluskgs / 100000
+                }
+              } else {
+                sunData.kgs = (sunData.kgs * 100000) / num / 100000
+              }
+
+              if (!/(^[1-9]\d*$)/.test((sunData.cbm * 100000) / num)) {
+                if (i !== num - 1) {
+                  const averagecbm = (sunData.cbm * 100000) / num + ''
+                  const cNum = averagecbm.indexOf('.')
+                  sunData.cbm = Number(averagecbm.substr(0, cNum)) / 100000
+                  surpluscbm = surpluscbm - Number(averagecbm.substr(0, cNum))
+                } else {
+                  sunData.cbm = surpluscbm / 100000
+                }
+              } else {
+                sunData.cbm = (sunData.cbm * 100000) / num / 100000
+              }
+              if (sunData.weightype === '累加') {
+                sunData['weighkgs'] = calc(
+                  Number(sunData['kgs']),
+                  Number(sunData['tareweight']),
+                  '+',
+                )
+              }
+              arr.push(sunData)
+            }
+          } else {
+            item.rowKey = key
+            key++
+            arr.push(item)
+          }
+        })
+        tableData.value = arr
+      },
+      openDialog() {
+        if (tableData.value.length === 0) {
+          return false
+        }
+        moreVisible.value = true
+      },
+      handleModelSubmit() {},
+      handleModelCancel() {
+        moreVisible.value = false
+      },
+      addChildData() {
+        if (!childModelSelect.value) {
+          this.$message.error('请选择数据')
+          return false
+        }
+        let $pkgs = 0
+        let $kgs = 0
+        let $cbm = 0
+        childTableData.value.map((item, index) => {
+          $pkgs += Number(item.pkgs)
+          $kgs += Number(item.kgs)
+          $cbm += Number(item.cbm)
+        })
+        const data = {
+          rowKey:
+            childTableData.value.length > 0
+              ? Number(childTableData.value[childTableData.value.length - 1].rowKey) + 1
+              : 0,
+          pkgs:
+            Number(childModelSelect.value.pkgs) - $pkgs > 0
+              ? Number(childModelSelect.value.pkgs) - $pkgs
+              : 0,
+          kindpkgs: '',
+          kgs:
+            Number(childModelSelect.value.kgs) - $kgs > 0
+              ? Number(childModelSelect.value.kgs) - $kgs
+              : 0,
+          cbm:
+            Number(childModelSelect.value.cbm) - $cbm > 0
+              ? Number(childModelSelect.value.cbm) - $cbm
+              : 0,
+          hscode: props.details.hscode,
+          marks: props.details.marks,
+          description: props.details.description,
+        }
+        childTableData.value.push(data)
+      },
+      changeEmit1(arr) {
+        emit('changectnall', arr)
+      },
+      removeChildData() {
+        selectChildArr.value.map((item, index) => {
+          childTableData.value.map((oitem, oindex) => {
+            if (item === oitem.rowKey) {
+              childTableData.value.splice(oindex, 1)
+            }
+          })
+        })
+      },
+      saveChildData() {
+        if (!childModelSelect.value) {
+          this.$message.error('请选择数据')
+          return false
+        }
+        let $pkgs = 0
+        let $kgs = 0
+        let $cbm = 0
+        childTableData.value.map((item, index) => {
+          $pkgs += Number(item.pkgs)
+          $kgs += Number(item.kgs)
+          $cbm += Number(item.cbm)
+        })
+        if (Number(childModelSelect.value.pkgs) < $pkgs) {
+          this.$message.error('件数输入错误')
+          return false
+        }
+        if (Number(childModelSelect.value.kgs) < $kgs) {
+          this.$message.error('毛重输入错误')
+          return false
+        }
+        if (Number(childModelSelect.value.cbm) < $cbm) {
+          this.$message.error('尺码输入错误')
+          return false
+        }
+        props.details.ctnInputs[childModelSelect.valueIndex].ctnDetailInputs = childTableData.value
+        this.$message.success('已保存')
+      },
+      importsealno() {
+        sealnoLoading.value = true
+        GetYardData({
+          bookingId: id.value,
+          isWeb: false,
+        })
+          .then((res) => {
+            if (res.success) {
+              let type = true
+              tableData.value.forEach((item) => {
+                if (item.sealno || item.cntrno) {
+                  this.$message.error('请清空所有箱封号后再引入')
+                  type = false
+                }
+              })
+              if (type) {
+                const data = JSON.parse(res.data)
+                if (data.length == tableData.value.length) {
+                  data.forEach((item, index) => {
+                    tableData.value[index].sealno = item.SEALNO
+                    tableData.value[index].cntrno = item.CNTRNO
+                    tableData.value[index].ctnnum = 1
+                  })
+                  const map = {}
+                  const dest = []
+                  for (var i = 0; i < tableData.value.length; i++) {
+                    var ai = tableData.value[i]
+                    if (!map[ai.ctnall]) {
+                      dest.push({
+                        ctnall: ai.ctnall,
+                        ctnnum: ai.ctnnum,
+                      })
+                      map[ai.ctnall] = ai
+                    } else {
+                      for (var j = 0; j < dest.length; j++) {
+                        var dj = dest[j]
+                        if (dj.ctnall == ai.ctnall) {
+                          dj.ctnnum = (parseFloat(dj.ctnnum) + parseFloat(ai.ctnnum)).toString()
+                          break
+                        }
+                      }
+                    }
+                  }
+                  this.changeEmit1(dest)
+                } else {
+                  this.$message.error('箱量与场站不一致')
+                }
+              }
+            } else {
+              this.$message.error(res.message)
+            }
+            sealnoLoading.value = false
+          })
+          .catch((err) => {
+            console.log(err)
+            sealnoLoading.value = false
+          })
+      },
+      importYarn() {
+        if (!id.value) {
+          this.$message.error('请先保存订舱信息')
+          return false
+        }
+        YarnLoading.value = true
+        GetYardData({
+          bookingId: id.value,
+          isWeb: false,
+        })
+          .then((res) => {
+            if (res.success) {
+              const data = JSON.parse(res.data)
+              const addTable = []
+              const cntrnoArr = []
+              const kindpkgsOld = tableData.value[0] ? tableData.value[0].kindpkgs : ''
+              tableData.value = []
+              const lastNum =
+                tableData.value.length > 0
+                  ? Number(tableData.value[tableData.value.length - 1].rowKey) + 1
+                  : 0
+              data.map((item, index) => {
+                const _data = {
+                  rowKey: lastNum + index,
+                  ctnall: item.CTNALL,
+                  ctnnum: '1',
+                  cntrno: item.CNTRNO,
+                  sealno: item.SEALNO,
+                  ctncode: item.CtnCode,
+                  pkgs: item.PKGS,
+                  kindpkgs: kindpkgsOld || item.KINDPKGS,
+                  kgs: item.KGS,
+                  cbm: item.CBM,
+                  tareweight: item.TAREWEIGHT,
+                  weightype: '',
+                  weighkgs: '',
+                  weighdate: item.WEIGHDATE,
+                }
+                addTable.push(_data)
+              })
+
+              tableData.value = [...tableData.value, ...addTable]
+              console.log(tableData.value)
+              this.$forceUpdate()
+            } else {
+              this.$message.error(res.message)
+            }
+            YarnLoading.value = false
+          })
+          .catch((err) => {
+            console.log(err)
+            YarnLoading.value = false
+          })
+      },
+      arrowsWeight() {
+        console.log(`选中${selectArr.value}`)
+        if (selectArr.value.length != 1) {
+          this.$message.error('请选择一条数据')
+        } else {
+          console.log(tableData.value, selectArr.value[0])
+          console.log(tableData.value[selectArr.value[0]])
+          if (tableData.value[selectArr.value[0]].ctnnum > 1) {
+            console.log(
+              parseFloat(tableData.value[selectArr.value[0]].ctnnum),
+              parseFloat(tableData.value[selectArr.value[0]].pkgs),
+            )
+            if (
+              parseFloat(tableData.value[selectArr.value[0]].ctnnum) <=
+                parseFloat(tableData.value[selectArr.value[0]].pkgs) ||
+              !tableData.value[selectArr.value[0]].pkgs
+            ) {
+              const tableData = tableData.value
+              const data = []
+              let num = 0
+              let totalPkgs = 0
+              let totalKgs = 0
+              let totalCbm = 0
+              tableData.forEach((item, index) => {
+                parseFloat(item.pkgs) ? (totalPkgs = totalPkgs + parseFloat(item.pkgs)) : ''
+                parseFloat(item.kgs) ? (totalKgs = totalKgs + parseFloat(item.kgs)) : ''
+                parseFloat(item.cbm) ? (totalCbm = totalCbm + parseFloat(item.cbm)) : ''
+                if (index == selectArr.value[0]) {
+                  for (let index = 0; index < item.ctnnum; index++) {
+                    let pkgs = 0
+                    let kgs = 0
+                    let cbm = 0
+                    if (index == item.ctnnum - 1) {
+                      pkgs =
+                        parseInt(item.pkgs / item.ctnnum) +
+                        parseInt(item.pkgs) -
+                        parseInt(parseInt(item.pkgs / item.ctnnum) * item.ctnnum)
+                      kgs = (
+                        parseFloat((item.kgs / item.ctnnum).toFixed(2)) +
+                        parseFloat(item.kgs) -
+                        parseFloat(parseFloat((item.kgs / item.ctnnum).toFixed(2)) * item.ctnnum)
+                      ).toFixed(2)
+                      cbm = (
+                        parseFloat((item.cbm / item.ctnnum).toFixed(2)) +
+                        parseFloat(item.cbm) -
+                        parseFloat(parseFloat((item.cbm / item.ctnnum).toFixed(2)) * item.ctnnum)
+                      ).toFixed(2)
+                    } else {
+                      pkgs = parseInt(item.pkgs / item.ctnnum)
+                      kgs = parseFloat((item.kgs / item.ctnnum).toFixed(2))
+                      cbm = parseFloat((item.cbm / item.ctnnum).toFixed(2))
+                    }
+                    num = num + 1
+                    data.push({
+                      ...item,
+                      ctnnum: 1,
+                      rowKey: num,
+                      id: '',
+                      pkgs: pkgs,
+                      kgs: kgs,
+                      cbm: cbm,
+                    })
+                  }
+                } else {
+                  num = num + 1
+                  data.push({ ...item, rowKey: num })
+                }
+              })
+              totalPkgs.value = totalPkgs
+              totalKgs.value = totalKgs.toFixed(2)
+              totalCbm.value = totalCbm.toFixed(2)
+              data.forEach((item) => {
+                if (!tableData.value[selectArr.value[0]].pkgs) {
+                  item.pkgs = ''
+                }
+                if (!tableData.value[selectArr.value[0]].kgs) {
+                  item.kgs = ''
+                }
+                if (!tableData.value[selectArr.value[0]].cbm) {
+                  item.cbm = ''
+                }
+              })
+              tableData.value = data
+              this.$forceUpdate()
+            } else {
+              this.$message.error('所选数据的件数应大于等于箱量')
+            }
+          } else {
+            this.$message.error('所选数据的箱量应大于1')
+          }
+        }
+      },
+      importWeight() {
+        if (!id.value) {
+          this.$message.error('请先保存订舱信息')
+          return false
+        }
+        WeightLoading.value = true
+        GetYardData({
+          bookingId: id.value,
+          isWeb: false,
+        })
+          .then((res) => {
+            if (res.success) {
+              const data = JSON.parse(res.data)
+              const addTable = []
+              const cntrnoArr = []
+              console.log(data)
+              tableData.value.map((item, index) => {
+                if (!item.cntrno) {
+                  // delete tableData.value[index]
+                  tableData.value.splice(index, 1)
+                } else {
+                  cntrnoArr.push(item.cntrno)
+                }
+              })
+              for (let i = tableData.value.length - 1; i >= 0; i--) {
+                if (!tableData.value[i].cntrno) {
+                  tableData.value.splice(i, 1)
+                } else {
+                  cntrnoArr.push(tableData.value[i].cntrno)
+                }
+              }
+              const lastNum =
+                tableData.value.length > 0
+                  ? Number(tableData.value[tableData.value.length - 1].rowKey) + 1
+                  : 0
+              data.map((item, index) => {
+                if (cntrnoArr.includes(item.CNTRNO)) {
+                  const setWeighkgs = calc(
+                    Number(tableData.value[cntrnoArr.indexOf(item.CNTRNO)].kgs),
+                    Number(item.TAREWEIGHT),
+                    '+',
+                  )
+                  tableData.value[cntrnoArr.indexOf(item.CNTRNO)] = {
+                    rowKey: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].rowKey,
+                    ctnall: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].ctnall,
+                    ctnnum: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].ctnnum,
+                    cntrno: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].cntrno,
+                    sealno: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].sealno,
+                    pkgs: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].pkgs,
+                    kindpkgs: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].kindpkgs,
+                    kgs: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].kgs,
+                    cbm: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].cbm,
+                    tareweight: item.TAREWEIGHT,
+                    weightype: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].weightype,
+                    weighkgs: setWeighkgs,
+                    weighdate: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].weighdate,
+                  }
+                } else {
+                  const _data = {
+                    rowKey: lastNum + index,
+                    ctnall: '',
+                    ctnnum: '1',
+                    cntrno: '',
+                    sealno: '',
+                    pkgs: '',
+                    kindpkgs: '',
+                    kgs: '',
+                    cbm: '',
+                    tareweight: item.TAREWEIGHT,
+                    weightype: '',
+                    weighkgs: '',
+                    weighdate: '',
+                  }
+                  addTable.push(_data)
+                }
+              })
+              console.log(tableData.value, addTable)
+              tableData.value = [...tableData.value, ...addTable]
+              this.$forceUpdate()
+            } else {
+              this.$message.error(res.message)
+            }
+            WeightLoading.value = false
+          })
+          .catch((err) => {
+            console.log(err)
+            WeightLoading.value = false
+          })
+      },
+      log({ data, selectionRangeIndexes, selectionRangeKeys }) {
+        // console.log('data::', data)
+        // console.log('selectionRangeIndexes::', selectionRangeIndexes)
+        // console.log('selectionRangeKeys::', selectionRangeKeys)
+      },
+      calc(num1, num2, calcStr) {
+        var str1 // 转换为字符串的数字
+        var str2
+        var ws1 = 0 // ws1，ws2 用来存储传入的num的小数点后的数字的位数
+        var ws2 = 0 // 赋默认值，解决当整数和小数运算时倍数计算错误导致的结果误差
+        var bigger // bigger和smaller用于加，减，除法找出小的那个数字，给后面补0，解决位数不对从而造成的计算错误的问题；乘法需要将结果除两个数字的倍数之和
+        var smaller // 例如：加减除法中1.001 + 2.03 ，如果不给2.03进行补0，最后会变成1001+203，数字错位导致结果错误；乘法中1.12*1.1会放大为112*11，所以结果需要除以1000才会是正确的结果，112*11/1000=1.232
+        var zeroCount // 需要补充0的个数
+        var isExistDot1 // 传入的数字是否存在小数点
+        var isExistDot2
+        var sum
+        var beishu = 1
+        // 将数字转换为字符串
+        str1 = num1.toString()
+        str2 = num2.toString()
+        // 是否存在小数点（判断需要计算的数字是不是包含小数）
+        isExistDot1 = str1.indexOf('.') != -1
+        isExistDot2 = str2.indexOf('.') != -1
+        // 取小数点后面的位数
+        if (isExistDot1) {
+          ws1 = str1.split('.')[1].length
+        }
+
+        if (isExistDot2) {
+          ws2 = str2.split('.')[1].length
+        }
+        // 如ws1 和 ws2 无默认值，如果num1 或 num2 不是小数的话则 ws1 或 ws2 的值将为 undefined
+        // bigger 和 smaller 的值会和预期不符
+        bigger = ws1 > ws2 ? ws1 : ws2
+        smaller = ws1 < ws2 ? ws1 : ws2
+
+        switch (calcStr) {
+          // 加减法找出小的那个数字，给后面补0，解决位数不对从而造成的计算错误的问题
+          // 例如：1.001 + 2.03 ，如果不给2.03进行补0，最后会变成1001+203，数字错位导致结果错误
+          case '+':
+          case '-':
+          case '/':
+            zeroCount = bigger - smaller
+            for (var i = 0; i < zeroCount; i++) {
+              if (ws1 == smaller) {
+                str1 += '0'
+              } else {
+                str2 += '0'
+              }
+            }
+            break
+          case '*':
+            // 乘法需要将结果除两个数字的倍数之和
+            bigger = bigger + smaller
+            break
+          default:
+            return '暂不支持的计算类型，现已支持的有加法、减法、乘法、除法'
+            break
+        }
+
+        // 去除数字中的小数点
+        str1 = str1.replace('.', '')
+        str2 = str2.replace('.', '')
+
+        // 计算倍数，例如：1.001小数点后有三位，则需要乘 1000 变成 1001，变成整数后精度丢失问题则不会存在
+        for (var i = 0; i < bigger; i++) {
+          beishu *= 10 // 等价于beishu = beishu * 10;
+        }
+        num1 = parseInt(str1)
+        num2 = parseInt(str2)
+        // 进行最终计算并除相应倍数
+        switch (calcStr) {
+          case '+':
+            sum = (num1 + num2) / beishu
+            break
+          case '-':
+            sum = (num1 - num2) / beishu
+            break
+          case '*':
+            sum = (num1 * num2) / beishu
+            break
+          case '/':
+            sum = num1 / num2
+            /* 除数与被除数同时放大一定倍数，不影响结果，
+      所以对数字进行放大对应倍数并进行补0操作后不用另对倍数做处理 */
+            break
+          default:
+            return '暂不支持的计算类型，现已支持的有加法、减法、乘法、除法'
+        }
+
+        return sum
+      },
+      checkCntrno(val) {
+        let str = ''
+        if (val.length !== 11) {
+          str = '箱号长度不符合规则'
+        } else if (val.split('')[3] !== 'U' && val.split('')[3] !== 'u') {
+          str = '输入的箱号不符合规则'
+        }
+        val.split('').map((item, index) => {
+          if (index < 3 && !new RegExp(/^[a-zA-Z]+$/).test(item)) {
+            str = '输入的箱号不符合规则'
+          } else if (index > 4 && !new RegExp(/^[0-9]+$/).test(item)) {
+            str = '输入的箱号不符合规则'
+          }
+        })
+        return str
+      },
+    },
+  }
+</script>
+<style lang="less" scoped>
+  .from-line {
+    margin: 0 0 10px 0;
+    overflow: hidden;
+
+    .left {
+      text-align: left;
+      width: 715px;
+      float: left;
+
+      .btn {
+        margin-right: 10px;
+        font-size: 14px;
+        padding: 0 4px;
+        line-height: 25px;
+        height: 28px;
+      }
+
+      .btn-delete {
+        border: 1px solid #ff6646;
+        background: #fdf2f0;
+        color: #ff6646;
+
+        &:hover {
+          border: 1px solid #ff6646 !important;
+          background: #fdf2f0 !important;
+          color: #ff6646 !important;
+          opacity: 0.7;
+        }
+      }
+
+      .btn-more-name,
+      .btn-import-station,
+      .btn-weight {
+        position: relative;
+        border: 1px solid @primary-color;
+        color: @primary-color;
+        background: none;
+
+        &::after {
+          content: '';
+          position: absolute;
+          top: 0;
+          left: 0;
+          width: 100%;
+          height: 100%;
+          z-index: 0;
+          background-color: @primary-color !important;
+          opacity: 0.04;
+        }
+
+        &:hover {
+          opacity: 0.7;
+        }
+      }
+    }
+
+    .table-right {
+      line-height: 28px;
+      font-size: 14px;
+      min-width: 260px;
+      float: right;
+
+      span {
+        margin-left: 10px;
+        color: #666;
+        font-weight: 600;
+      }
+    }
+  }
+
+  .model-content {
+    .model-botton-box {
+      margin: 40px 0 20px;
+
+      .btn {
+        margin-right: 10px;
+      }
+
+      .btn-delete {
+        border: 1px solid #ff6646;
+        background: #fdf2f0;
+        color: #ff6646;
+
+        &:hover {
+          border: 1px solid #ff6646 !important;
+          background: #fdf2f0 !important;
+          color: #ff6646 !important;
+          opacity: 0.7;
+        }
+      }
+    }
+  }
+
+  .table-no-data {
+    width: 100%;
+    text-align: center;
+    line-height: 60px;
+  }
+
+  .text-bold {
+    text-align: center;
+    width: 100%;
+    display: block;
+  }
+
+  .ve-table
+    .ve-table-container
+    .ve-table-content-wrapper
+    table.ve-table-content
+    tbody.ve-table-body
+    tr.ve-table-body-tr
+    td.ve-table-body-td,
+  .ve-table
+    .ve-table-container
+    .ve-table-content-wrapper
+    table.ve-table-content
+    tbody.ve-table-body
+    tr.ve-table-expand-tr
+    td.ve-table-body-td {
+    padding: 0 5px;
+  }
+
+  // /deep/ .ve-table-container{
+  //   height: auto !important;
+  // }
+</style>
diff --git a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/goodsTable.vue b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/goodsTable.vue
index 9a8dee17..8dfe2f29 100644
--- a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/goodsTable.vue
+++ b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/goodsTable.vue
@@ -76,7 +76,7 @@
         </div>
         <div v-if="tableLoaded">
           <!-- rowKeyFieldName="rowKey" -->
-          <ve-table
+          <vxe-table
             :columns="columns"
             :table-data="tableData"
             borderY
@@ -95,7 +95,6 @@
         <div class="loading" v-else>加载中 ...</div>
       </a-card>
     </a-spin>
-
     <a-modal
       title="多品名维护"
       width="80%"
@@ -132,11 +131,10 @@
           <div class="table-no-data" v-if="childTableData.length === 0">暂无数据</div>
         </div>
       </div>
-      <template slot="footer">
+      <template #footer>
         <a-button @click="handleModelCancel">关闭</a-button>
       </template>
     </a-modal>
-
     <a-modal
       title="场站数据比对"
       width="80%"
@@ -162,2106 +160,1843 @@
           :data-source="yardAutoForm.ctnTable"
         ></a-table>
       </div>
-      <template slot="footer">
+      <template #footer>
         <a-button @click="comparisonFlag = false">关闭</a-button>
       </template>
     </a-modal>
   </div>
 </template>
-<script>
+<script lang="ts" setup>
+  interface yardAutoFormObj {
+    yardJson: any
+    yardTable: any
+    ctnJson: any
+    ctnTable: any
+  }
   import {
     GetYardData,
     ReadAutoYardImport,
     GetCtnListRefsh,
   } from '/@/views/operation/seaexport/api/BookingLedger'
-  import { mapGetters } from 'vuex'
-  export default {
-    name: '',
-    props: {
-      details: {
-        type: Object,
-        default: () => {
-          return {}
-        },
-      },
-      rules: {
-        type: Object,
-        default: () => {
-          return {}
-        },
-      },
-      inSave: {
-        type: Boolean,
-        default: false,
-      },
-      pType: {
-        type: String,
-        default: 'normal',
-      },
-      isLockBooking: {
-        type: Boolean,
-        default: false,
+  import { ref, Ref, reactive, getCurrentInstance, h, watch, onMounted } from 'vue'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  const { notification } = useMessage()
+  import { useRoute } from 'vue-router'
+  const route = useRoute()
+  const props = defineProps({
+    details: { type: Object, default: {} },
+    rules: { type: Object, default: {} },
+    inSave: { type: Boolean, default: false },
+    pType: { type: String, default: 'normal' },
+    isLockBooking: { type: Boolean, default: false },
+  })
+  const emit = defineEmits([
+    'changectnall',
+    'changeDetail',
+    'changeTotal',
+    'handleRefshTable',
+    'changeCtnInfo',
+  ])
+  let { ctx: that, proxy }: any = getCurrentInstance()
+  const loadingTable = ref(false)
+  const tableData: any = ref([{}])
+  const selectArr = ref([])
+  const totalPkgs: any = ref(0)
+  const totalKgs: any = ref(0)
+  const totalCbm: any = ref(0)
+  const checkboxOption = ref({
+    hideSelectAll: false,
+    // 可控属性
+    selectedRowKeys: [],
+    // 行选择改变事件
+    selectedRowChange: ({ row, isSelected, selectedRowKeys }) => {
+      changeSelectedRowKeys(selectedRowKeys)
+      // selectArr.value = selectedRowKeys
+    },
+    // 全选改变事件
+    selectedAllChange: ({ isSelected, selectedRowKeys }) => {
+      if (isSelected) {
+        changeSelectedRowKeys(selectedRowKeys)
+        // selectArr.value = selectedRowKeys
+      } else {
+        selectArr.value = []
+      }
+    },
+  })
+  const moreVisible = ref(false)
+  const id = ref()
+  const YarnLoading = ref(false)
+  const sealnoLoading = ref(false)
+  const WeightLoading = ref(false)
+  const comparisonFlag = ref(false)
+  const yardAutoForm: Ref<yardAutoFormObj | any> = ref({})
+  const tableLoaded = ref(false)
+  const inTableLoad = ref(false)
+  const columns = ref([
+    {
+      field: '',
+      key: 'checkbox',
+      type: 'checkbox',
+      title: '',
+      width: 40,
+      operationColumn: true,
+      align: 'center',
+    },
+    {
+      field: '',
+      key: 'a',
+      title: '序号',
+      width: 50,
+      align: 'center',
+      operationColumn: true,
+      renderBodyCell: ({ row, column, rowIndex }, h) => {
+        return ++rowIndex
       },
     },
-    data() {
-      return {
-        id: this.$route.query.id,
-        rowKeyName: 'rowKey',
-        loadingTable: false,
-        BookingLockCtn: {},
-        cellAutofillOption: {
-          directionX: false,
-          directionY: true,
-          afterAutofill: ({
-            direction,
-            sourceSelectionRangeIndexes,
-            targetSelectionRangeIndexes,
-            sourceSelectionData,
-            targetSelectionData,
-          }) => {
-            console.log('direction::', direction)
-            console.log('sourceSelectionRangeIndexes::', sourceSelectionRangeIndexes)
-            console.log('targetSelectionRangeIndexes::', targetSelectionRangeIndexes)
-            console.log('sourceSelectionData::', sourceSelectionData)
-            console.log('targetSelectionData::', targetSelectionData)
-            console.log('---')
-          },
-        },
-        cellSelectionOption: {
-          // disble cell selection
-          enable: true,
-        },
-        columnsAuto: [
-          {
-            dataIndex: 'CTNALL',
-            key: 'CTNALL',
-            title: '箱型',
-          },
-          {
-            dataIndex: 'CTNNUM',
-            key: 'CTNNUM',
-            title: '箱量',
-          },
-          {
-            dataIndex: 'CNTRNO',
-            key: 'CNTRNO',
-            title: '箱号',
-          },
-          {
-            dataIndex: 'SEALNO',
-            key: 'SEALNO',
-            title: '封号',
-          },
-          {
-            dataIndex: 'PKGS',
-            key: 'PKGS',
-            title: '件数',
-          },
-          {
-            dataIndex: 'KINDPKGS',
-            key: 'KINDPKGS',
-            title: '包装',
-          },
-          {
-            dataIndex: 'KGS',
-            key: 'KGS',
-            title: '重量',
-          },
-          {
-            dataIndex: 'CBM',
-            key: 'CBM',
-            title: '尺码',
-          },
-          {
-            dataIndex: 'TAREWEIGHT',
-            key: 'TAREWEIGHT',
-            title: '箱皮重',
-          },
-          {
-            dataIndex: 'WEIGHTYPE',
-            key: 'WEIGHTYPE',
-            title: '称重方式',
-          },
-          {
-            dataIndex: 'WEIGHKGS',
-            key: 'WEIGHKGS',
-            title: '称重重量',
-          },
-          {
-            dataIndex: 'WEIGHDATE',
-            key: 'WEIGHDATE',
-            title: '称重日期',
-          },
-        ],
-        yardAutoForm: {},
-        columns: [
-          {
-            field: '',
-            key: 'checkbox',
-            type: 'checkbox',
-            title: '',
-            width: 40,
-            operationColumn: true,
-            align: 'center',
-          },
-          {
-            field: '',
-            key: 'a',
-            title: '序号',
-            width: 50,
-            align: 'center',
-            operationColumn: true,
-            renderBodyCell: ({ row, column, rowIndex }, h) => {
-              return ++rowIndex
-            },
-          },
-          {
-            field: 'ctnall',
-            key: 'ctnall',
-            title: '箱型',
-            align: 'left',
-            width: 120,
-            edit: false,
-            // renderBodyCell: ({ row, column, rowIndex }, h) => {
-            //   this.openEdit = true
-            //   return (
-            //     <a-select
-            //       size="small"
-            //       value={row['ctnall']}
-            //       showSearch
-            //       ref="ctnallView"
-            //       class="ctnallView"
-            //       disabled={this.BookingLockCtn['CTNALL'] && this.isLockBooking}
-            //       allow-clear={true}
-            //       style="width: 120px"
-            //       filter-option={this.filterOption1}
-            //       on-change={(val) => {
-            //         // console.log('== 箱型内部监听change ==')
-            //         if (val !== undefined) {
-            //           const data = this.ctnallList[val]
-            //           this.tableData[rowIndex].ctnall = data.name
-            //           this.tableData[rowIndex].ctncode = data.code
-            //           row['ctnall'] = data.name
-            //           var map = {};
-            //           var dest = [];
-            //           for (var i = 0; i < this.tableData.length; i++) {
-            //             var ai = this.tableData[i];
-            //             if (!map[ai.ctnall]) {
-            //               dest.push({
-            //                 ctnall: ai.ctnall,
-            //                 ctnnum: ai.ctnnum
-            //               });
-            //               map[ai.ctnall] = ai;
-            //             } else {
-            //               for (var j = 0; j < dest.length; j++) {
-            //                 var dj = dest[j];
-            //                 if (dj.ctnall == ai.ctnall) {
-            //                   dj.ctnnum = (parseFloat(dj.ctnnum) + parseFloat(ai.ctnnum)).toString();
-            //                   break;
-            //                 }
-            //               }
-            //             }
-            //           };
-            //           this.changeEmit1(dest)
-            //           this.$forceUpdate()
-            //         } else {
-            //           row['ctnall'] = ''
-            //           this.tableData[rowIndex].ctnall = ''
-            //           this.tableData[rowIndex].ctncode = ''
-            //         }
-            //       }}
-            //       on-focus={(val) => {
-            //         // console.log('== 箱型内部监听focus ==')
-            //         this.ctnallViewIndex = rowIndex
-            //         this.cellSelectionOption.enable = false
-            //       }}
-            //       on-blur={(val) => {
-            //         // 箱信息 下拉框自动弹出部分 - 测试中
-            //         // console.log('== 箱型内部监听blur ==', this.ctnallViewIndex, rowIndex)
-            //         this.cellSelectionOption.enable = true
-            //         this.ctnallViewIndex = null
-            //       }}
-            //       on-select={(val) => {
-            //         this.cellSelectionOption.enable = true
-            //         this.setCellSelection(rowIndex, 'ctnall')
-            //       }}
-            //     >
-            //       {this.ctnallList.map((item, index) => {
-            //         return <a-select-option value={index}>{item.name}</a-select-option>
-            //       })}
-            //     </a-select>
-            //   )
-            // },
-            // renderHeaderCell: ({ column }, h) => {
-            //   return (
-            //     <span class="text-bold" style="text-align: center;">
-            //       {this.rules.ctnall.required ? <i style="color: #f00">*</i> : ''} {column.title}
-            //     </span>
-            //   )
-            // }
-          },
-          {
-            field: 'ctnnum',
-            key: 'ctnnum',
-            title: '箱量',
-            align: 'left',
-            width: 60,
-            edit: true,
-            // renderHeaderCell: ({ column }, h) => {
-            //   return (
-            //     <span class="text-bold" style="text-align: center;">
-            //       {this.rules.ctnnum.required ? <i style="color: #f00">*</i> : ''} {column.title}
-            //     </span>
-            //   )
-            // },
-          },
-          {
-            field: 'cntrno',
-            key: 'cntrno',
-            title: '箱号',
-            align: 'left',
-            width: 130,
-            edit: true,
-            // renderHeaderCell: ({ column }, h) => {
-            //   return (
-            //     <span class="text-bold" style="text-align: center;">
-            //       {this.rules.cntrno.required ? <i style="color: #f00">*</i> : ''} {column.title}
-            //     </span>
-            //   )
-            // },
-          },
-          {
-            field: 'sealno',
-            key: 'sealno',
-            title: '封号',
-            align: 'left',
-            width: 60,
-            edit: true,
-            // renderHeaderCell: ({ column }, h) => {
-            //   return (
-            //     <span class="text-bold" style="text-align: center;">
-            //       {this.rules.sealno.required ? <i style="color: #f00">*</i> : ''} {column.title}
-            //     </span>
-            //   )
-            // },
-          },
-          {
-            field: 'pkgs',
-            key: 'pkgs',
-            title: '件数',
-            align: 'left',
-            width: 60,
-            edit: true,
-            // renderHeaderCell: ({ column }, h) => {
-            //   return (
-            //     <span class="text-bold" style="text-align: center;">
-            //       {this.rules.pkgs.required ? <i style="color: #f00">*</i> : ''} {column.title}
-            //     </span>
-            //   )
-            // },
-          },
-          {
-            field: 'kindpkgs',
-            key: 'kindpkgs',
-            title: '包装',
-            align: 'left',
-            edit: false,
-            width: 130,
-            // renderBodyCell: ({ row, column, rowIndex }, h) => {
-            //   this.openEdit = true
-            //   return (
-            //     <a-select
-            //       size="small"
-            //       allow-clear={true}
-            //       showSearch
-            //       value={row['kindpkgs']}
-            //       option-filter-prop="children"
-            //       filter-option={this.filterOption}
-            //       disabled={this.BookingLockCtn['kindpkgs'] && this.isLockBooking}
-            //       style="width: 120px"
-            //       class="kindpkgsView"
-            //       on-change={(val) => {
-            //         if (val !== undefined) {
-            //           const data = this.packageList[val]
-            //           this.tableData[rowIndex].kindpkgs = data.name
-            //           row['kindpkgs'] = data.name
-            //           this.$forceUpdate()
-            //         } else {
-            //           row['kindpkgs'] = ''
-            //           this.tableData[rowIndex].kindpkgs = ''
-            //           this.tableData.map((item, index) => {
-            //             if (index !== rowIndex) {
-            //               item.kindpkgs = ''
-            //               document
-            //                 .getElementsByClassName('kindpkgsView')
-            //               [index].getElementsByClassName('ant-select-selection-selected-value')[0].innerHTML = ''
-            //             }
-            //           })
-            //         }
-            //         this.changeEmit(row)
-            //       }}
-            //       on-focus={(val) => {
-            //         this.kindpkgsViewIndex = rowIndex
-            //         this.cellSelectionOption.enable = false
-            //         // console.log('=获取焦点=', rowIndex, this.kindpkgsViewIndex)
-            //       }}
-            //       on-blur={(val) => {
-            //         // 箱信息 下拉框自动弹出部分 - 测试中
-            //         this.cellSelectionOption.enable = true
-            //         this.kindpkgsViewIndex = null
-            //       }}
-            //       on-input={(val) => {
-            //         // console.log('== input - 修改内容==', val)
-            //       }}
-            //       on-select={(val) => {
-            //         this.cellSelectionOption.enable = true
-            //         this.setCellSelection(rowIndex, 'kindpkgs')
-            //       }}
-            //     >
-            //       {this.packageList.map((item, index) => {
-            //         return <a-select-option value={index}>{item.code}</a-select-option>
-            //       })}
-            //     </a-select>
-            //   )
-            // },
-            // renderHeaderCell: ({ column }, h) => {
-            //   return (
-            //     <span class="text-bold" style="text-align: center;">
-            //       {this.rules.kindpkgs.required ? <i style="color: #f00">*</i> : ''} {column.title}
-            //     </span>
-            //   )
-            // }
-          },
-          {
-            field: 'kgs',
-            key: 'kgs',
-            title: '重量',
-            align: 'left',
-            width: 60,
-            edit: true,
-            // renderHeaderCell: ({ column }, h) => {
-            //   return (
-            //     <span class="text-bold" style="text-align: center;">
-            //       {this.rules.kgs.required ? <i style="color: #f00">*</i> : ''} {column.title}
-            //     </span>
-            //   )
-            // },
-          },
-          {
-            field: 'cbm',
-            key: 'cbm',
-            title: '尺码',
-            align: 'left',
-            width: 60,
-            edit: true,
-            // renderHeaderCell: ({ column }, h) => {
-            //   return (
-            //     <span class="text-bold" style="text-align: center;">
-            //       {this.rules.cbm.required ? <i style="color: #f00">*</i> : ''} {column.title}
-            //     </span>
-            //   )
-            // },
-          },
-          {
-            field: 'tareweight',
-            key: 'tareweight',
-            title: '箱皮重',
-            align: 'left',
-            width: 60,
-            edit: true,
-            // renderHeaderCell: ({ column }, h) => {
-            //   return (
-            //     <span class="text-bold" style="text-align: center;">
-            //       {this.rules.tareweight.required ? <i style="color: #f00">*</i> : ''}{' '}
-            //       {column.title}
-            //     </span>
-            //   )
-            // },
-          },
-          {
-            field: 'weightype',
-            key: 'weightype',
-            title: '称重方式',
-            align: 'left',
-            width: 90,
-            edit: false,
-            // renderBodyCell: ({ row, column, rowIndex }, h) => {
-            //   return (
-            //     <a-select
-            //       size="small"
-            //       show-search
-            //       value={row['weightype']}
-            //       option-filter-prop="children"
-            //       disabled={this.BookingLockCtn['weightype'] && this.isLockBooking}
-            //       style="width: 80px"
-            //       on-change={(val) => {
-            //         this.tableData[rowIndex].weightype = val
-            //         row['weightype'] = val
-            //         if (row['weightype'] === '累加') {
-            //           row['weighkgs'] = this.calc(
-            //             Number(row['kgs']),
-            //             Number(row['tareweight']),
-            //             '+',
-            //           )
-            //         } else {
-            //           row['weighkgs'] = ''
-            //         }
-            //         this.$forceUpdate()
-            //       }}
-            //       on-blur={(val) => {
-            //         // 箱信息 下拉框自动弹出部分 - 测试中
-            //         this.cellSelectionOption.enable = true
-            //       }}
-            //       on-focus={(val) => {
-            //         this.cellSelectionOption.enable = false
-            //       }}
-            //     >
-            //       <a-select-option value="累加">累加</a-select-option>
-            //       <a-select-option value="总重">总重</a-select-option>
-            //     </a-select>
-            //   )
-            // },
-            // renderHeaderCell: ({ column }, h) => {
-            //   return (
-            //     <span class="text-bold" style="text-align: center;">
-            //       {this.rules.weightype.required ? <i style="color: #f00">*</i> : ''} {column.title}
-            //     </span>
-            //   )
-            // },
-          },
-          {
-            field: 'weighkgs',
-            key: 'weighkgs',
-            title: '称重重量',
-            align: 'left',
-            width: 60,
-            edit: true,
-            // renderHeaderCell: ({ column }, h) => {
-            //   return (
-            //     <span class="text-bold" style="text-align: center;">
-            //       {this.rules.weighkgs.required ? <i style="color: #f00">*</i> : ''} {column.title}
-            //     </span>
-            //   )
-            // },
-          },
-          {
-            field: 'weighdate',
-            key: 'weighdate',
-            title: '称重日期',
-            align: 'left',
-            width: 120,
-            edit: false,
-            // renderBodyCell: ({ row, column, rowIndex }, h) => {
-            //   return (
-            //     <a-date-picker
-            //       value={row['weighdate']}
-            //       disabled={this.BookingLockCtn['weighdate'] && this.isLockBooking}
-            //       on-change={(date, dateString) => {
-            //         // console.log('== 选择日期 ==', dateString)
-            //         this.tableData[rowIndex].weighdate = dateString
-            //         row['weighdate'] = dateString
-            //       }}
-            //     />
-            //   )
-            // },
-            // renderHeaderCell: ({ column }, h) => {
-            //   return (
-            //     <span class="text-bold" style="text-align: center;">
-            //       {this.rules.weightype.required ? <i style="color: #f00">*</i> : ''} {column.title}
-            //     </span>
-            //   )
-            // },
-          },
-        ],
-        modelColumns: [
-          {
-            field: '',
-            key: 'radio',
-            type: 'radio',
-            title: '',
-            width: 40,
-            operationColumn: true,
-            align: 'center',
-          },
-          {
-            field: 'ctnall',
-            key: 'ctnall',
-            title: '箱型',
-            align: 'left',
-            width: 80,
-          },
-          {
-            field: 'ctnnum',
-            key: 'ctnnum ',
-            title: '箱量',
-            align: 'left',
-          },
-          {
-            field: 'cntrno',
-            key: 'cntrno',
-            title: '箱号',
-            align: 'left',
-            width: 240,
-          },
-          {
-            field: 'sealno',
-            key: 'sealno',
-            title: '封号',
-            align: 'left',
-          },
-          {
-            field: 'pkgs',
-            key: 'pkgs',
-            title: '件数',
-            align: 'left',
-          },
-          {
-            field: 'kindpkgs',
-            key: 'kindpkgs',
-            title: '包装',
-            align: 'left',
-            width: 130,
-          },
-          {
-            field: 'kgs',
-            key: 'kgs',
-            title: '毛重',
-            align: 'left',
-          },
-          {
-            field: 'cbm',
-            key: 'cbm',
-            title: '尺码',
-            align: 'left',
-          },
-        ],
-        childColumns: [
-          {
-            field: '',
-            key: 'checkbox',
-            type: 'checkbox',
-            title: '',
-            width: 40,
-            operationColumn: true,
-            align: 'center',
-          },
-          {
-            field: 'pkgs',
-            key: 'pkgs',
-            title: '件数',
-            align: 'left',
-            edit: true,
-          },
-          {
-            field: 'kindpkgs',
-            key: 'kindpkgs',
-            title: '包装',
-            align: 'left',
-            edit: false,
-            width: 130,
-            // renderBodyCell: ({ row, column, rowIndex }, h) => {
-            //   return (
-            //     <a-select
-            //       show-search
-            //       value={row['kindpkgs']}
-            //       option-filter-prop="children"
-            //       style="width: 120px"
-            //       on-change={(val) => {
-            //         const data = this.packageList[val]
-            //         row['kindpkgs'] = data.name
-            //         this.childTableData[rowIndex].kindpkgs = data.name
-            //         this.$forceUpdate()
-            //       }}
-            //     >
-            //       {this.packageList.map((item, index) => {
-            //         return <a-select-option value={index}>{item.name}</a-select-option>
-            //       })}
-            //     </a-select>
-            //   )
-            // },
-          },
-          {
-            field: 'kgs',
-            key: 'kgs',
-            title: '毛重',
-            align: 'left',
-            edit: true,
-          },
-          {
-            field: 'cbm',
-            key: 'cbm',
-            title: '尺码',
-            align: 'left',
-            edit: true,
-          },
-          {
-            field: 'hscode',
-            key: 'hscode',
-            title: 'HS代码',
-            align: 'left',
-            edit: true,
-          },
-          {
-            field: 'marks',
-            key: 'marks',
-            title: '唛头',
-            align: 'left',
-            edit: true,
-          },
-          {
-            field: 'description',
-            key: 'description',
-            title: '货描',
-            align: 'left',
-            width: '25%',
-            edit: true,
-          },
-        ],
-        tableData: [],
-        editOption: {
-          beforeCellValueChange: ({ row, column, changeValue }) => {
-            if (this.inTableLoad) {
-              return false
-            }
-            if (
-              ['pkgs', 'kgs', 'cbm', 'tareweight'].includes(column.field) &&
-              !new RegExp(/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(changeValue)
-            ) {
-              const height = document.body.clientHeight - 100
-              this.$message.config({
-                top: `${height}px`,
-                duration: 2,
-                maxCount: 3,
-              })
-              this.$message.error(`输入的${this.enmuErrorLabel(column.field)}不符合规则`)
-              setTimeout(() => {
-                this.$message.destroy()
-                this.$message.config({
-                  top: `100px`,
-                  duration: 2,
-                  maxCount: 3,
-                })
-              }, 2000)
-              return false
-            }
-            if (column.field === 'cntrno') {
-              const res = this.checkCntrno(changeValue)
-              if (res !== '') {
-                const height = document.body.clientHeight - 100
-                this.$message.config({
-                  top: `${height}px`,
-                  duration: 2,
-                  maxCount: 3,
-                })
-                this.$message.error(res)
-                // row['cntrno'] = ''
-                setTimeout(() => {
-                  this.$message.destroy()
-                  this.$message.config({
-                    top: `100px`,
-                    duration: 2,
-                    maxCount: 3,
-                  })
-                }, 2000)
-              }
-            }
-          },
-          beforeStartCellEditing: ({ row, column, cellValue }) => {
-            console.log(column)
-            const arr = this.$options.filters['dictData']('BookingLockCtn')
-            let type = true
-            arr.forEach((item) => {
-              if (item.code == column.field && this.isLockBooking) {
-                type = false
-              }
-            })
-            return type
-          },
-          afterCellValueChange: ({ row, column, changeValue }) => {
-            if (this.inTableLoad) {
-              return false
-            }
-            if (['kgs', 'cbm', 'tareweight', 'weighkgs'].includes(column.field)) {
-              changeValue = changeValue + ''
-              const valIndex = changeValue.includes('.') ? changeValue.indexOf('.') + 1 : false
-              const valCount = changeValue.length - valIndex
-              if (valIndex && valCount > 5) {
-                const height = document.body.clientHeight - 100
-                this.$message.config({
-                  top: `${height}px`,
-                  duration: 2,
-                  maxCount: 3,
-                })
-                this.$message.error('仅支持小数点后五位')
-                row[column.field] = changeValue.substr(0, valIndex + 5)
-                setTimeout(() => {
-                  this.$message.destroy()
-                  this.$message.config({
-                    top: `100px`,
-                    duration: 2,
-                    maxCount: 3,
-                  })
-                }, 2000)
-              } else {
-                const arrayNum = changeValue.split('.')
-                if (!/\./.test(changeValue)) {
-                  row[column.field] = changeValue + '.00'
-                } else if (arrayNum[1].length < 2) {
-                  row[column.field] = changeValue + '0'
-                }
-              }
-            }
-            if (column.field === 'pkgs') {
-              if (!/(^[1-9]\d*$)/.test(changeValue)) {
-                const height = document.body.clientHeight - 100
-                this.$message.config({
-                  top: `${height}px`,
-                  duration: 2,
-                  maxCount: 3,
-                })
-                this.$message.error('件数请输入整数')
-                const cNum = changeValue.indexOf('.')
-                row[column.field] = changeValue.substr(0, cNum)
-                setTimeout(() => {
-                  this.$message.destroy()
-                  this.$message.config({
-                    top: `100px`,
-                    duration: 2,
-                    maxCount: 3,
-                  })
-                }, 2000)
-              } else {
-              }
-              let num = 0
-              this.tableData.map((item, index) => {
-                if (item.pkgs) {
-                  num += Number(item.pkgs)
-                }
-              })
-              this.totalPkgs = num
-            }
-            if (column.field === 'kgs') {
-              let num = 0
-              this.tableData.map((item, index) => {
-                num = (num * 10000 + Number(item.kgs) * 10000) / 10000
-                // num += Number(item.kgs)
-              })
-              num += ''
-              const pNum = num.split('.')
-              if (!/\./.test(num)) {
-                this.totalKgs = num + '.00'
-              } else if (pNum[1].length < 2) {
-                this.totalKgs = num + '0'
-              } else {
-                this.totalKgs = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
-                // this.totalKgs = num
-              }
-            }
-            if (column.field === 'cbm') {
-              let num = 0
-              this.tableData.map((item, index) => {
-                // num += Number(item.cbm)
-                num = (num * 10000 + Number(item.cbm) * 10000) / 10000
-              })
-              num += ''
-              const pNum = num.split('.')
-              if (!/\./.test(num)) {
-                this.totalCbm = num + '.00'
-              } else if (pNum[1].length < 2) {
-                this.totalCbm = num + '0'
-              } else {
-                // this.totalCbm = num
-                this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
-              }
-            }
-            if (column.field === 'kgs' || column.field === 'tareweight') {
-              row['weighkgs'] = this.calc(Number(row['kgs']), Number(row['tareweight']), '+')
-              const kgsVal = row['weighkgs'] + ''
-              const kgsIndex = kgsVal.includes('.') ? kgsVal.indexOf('.') + 1 : false
-              const kgsCount = kgsVal.includes('.') ? kgsVal.length - kgsIndex : false
-              if (kgsCount > 4) {
-                row['weighkgs'] = kgsVal.substr(0, kgsIndex + 5)
-              } else if (!kgsIndex) {
-                row['weighkgs'] = kgsVal + '.00'
-              } else {
-                const arrayNum = kgsVal.split('.')
-                if (!/\./.test(kgsVal)) {
-                  row['weighkgs'] = kgsVal + '.00'
-                } else if (arrayNum[1].length < 2) {
-                  row['weighkgs'] = kgsVal + '0'
-                }
-              }
-            }
-            if (column.field === 'ctnnum') {
-              const map = {}
-              const dest = []
-              for (var i = 0; i < this.tableData.length; i++) {
-                var ai = this.tableData[i]
-                if (!map[ai.ctnall]) {
-                  dest.push({
-                    ctnall: ai.ctnall,
-                    ctnnum: ai.ctnnum,
-                  })
-                  map[ai.ctnall] = ai
-                } else {
-                  for (var j = 0; j < dest.length; j++) {
-                    var dj = dest[j]
-                    if (dj.ctnall == ai.ctnall) {
-                      dj.ctnnum = (parseFloat(dj.ctnnum) + parseFloat(ai.ctnnum)).toString()
-                      break
-                    }
-                  }
-                }
-              }
-              this.changeEmit1(dest)
-            }
-          },
-          cellValueChange: ({ row, column }) => {},
-        },
-        editChildOption: {
-          beforeCellValueChange: ({ row, column, changeValue }) => {
-            if (
-              ['pkgs', 'kgs', 'cbm'].includes(column.field) &&
-              !new RegExp(/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(changeValue)
-            ) {
-              // const height = document.body.clientHeight - 100
-              // this.$message.config({
-              //   top: `${height}px`,
-              //   duration: 2,
-              //   maxCount: 3,
-              // })
-              this.$message.error(`输入的${this.enmuErrorLabel(column.field)}不符合规则`)
-              row['cntrno'] = ''
-              setTimeout(() => {
-                this.$message.destroy()
-                this.$message.config({
-                  top: `100px`,
-                  duration: 2,
-                  maxCount: 3,
-                })
-              }, 2000)
-              return false
-            }
-          },
-          afterCellValueChange: ({ row, column, changeValue }) => {
-            let num = null
-            this.childTableData.map((item, index) => {
-              if (row.rowKey === item.rowKey) {
-                // eslint-disable-next-line no-const-assign
-                num = index
-              }
-            })
-            this.childTableData[num][column.field] = changeValue
-            // 暂时屏蔽 - 根据需求放开
-            // this.details.ctnInputs[this.childModelSelectIndex].ctnDetailInputs[num][column.field] = changeValue
-            this.$forceUpdate()
-          },
-          cellValueChange: ({ row, column }) => {},
-        },
-        // 可控单元格编辑
-        rowStyleOption: {
-          clickHighlight: false,
-          hoverHighlight: false,
-        },
-        checkboxOption: {
-          hideSelectAll: false,
-          // 可控属性
-          selectedRowKeys: [],
-          // 行选择改变事件
-          selectedRowChange: ({ row, isSelected, selectedRowKeys }) => {
-            this.changeSelectedRowKeys(selectedRowKeys)
-            // this.selectArr = selectedRowKeys
-          },
-          // 全选改变事件
-          selectedAllChange: ({ isSelected, selectedRowKeys }) => {
-            if (isSelected) {
-              this.changeSelectedRowKeys(selectedRowKeys)
-              // this.selectArr = selectedRowKeys
-            } else {
-              this.selectArr = []
-            }
-          },
-        },
-        checkChildboxOption: {
-          hideSelectAll: false,
-          // 行选择改变事件
-          selectedRowChange: ({ row, isSelected, selectedRowKeys }) => {
-            console.log(row, isSelected, selectedRowKeys)
-            this.selectChildArr = selectedRowKeys
-          },
-          // 全选改变事件
-          selectedAllChange: ({ isSelected, selectedRowKeys }) => {
-            if (isSelected) {
-              this.selectChildArr = selectedRowKeys
-            } else {
-              this.selectChildArr = []
-            }
-          },
-        },
-        // 单元格复制
-        clipboardOption: {
-          copy: true,
-          paste: true,
-          cut: true,
-          delete: true,
-          beforeCopy: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
-          },
-          afterCopy: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
-          },
-          beforePaste: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            const changeValue = data[0][selectionRangeKeys.endColKey]
-            if (this.inTableLoad) {
-              return false
-            }
-            if (
-              ['pkgs', 'kgs', 'cbm', 'tareweight'].includes(selectionRangeKeys.endColKey) &&
-              !new RegExp(/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(changeValue)
-            ) {
-              const height = document.body.clientHeight - 100
-              this.$message.config({
-                top: `${height}px`,
-                duration: 2,
-                maxCount: 3,
-              })
-              this.$message.error(
-                `输入的${this.enmuErrorLabel(selectionRangeKeys.endColKey)}不符合规则`,
-              )
-              setTimeout(() => {
-                this.$message.destroy()
-                this.$message.config({
-                  top: `100px`,
-                  duration: 2,
-                  maxCount: 3,
-                })
-              }, 2000)
-              return false
-            }
-            if (selectionRangeKeys.endColKey === 'cntrno') {
-              const res = this.checkCntrno(changeValue)
-              if (res !== '') {
-                const height = document.body.clientHeight - 100
-                this.$message.config({
-                  top: `${height}px`,
-                  duration: 2,
-                  maxCount: 3,
-                })
-                this.$message.error(res)
-                // row['cntrno'] = ''
-                setTimeout(() => {
-                  this.$message.destroy()
-                  this.$message.config({
-                    top: `100px`,
-                    duration: 2,
-                    maxCount: 3,
-                  })
-                }, 2000)
-              }
-            }
-          },
-          afterPaste: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            let changeValue = data[0][selectionRangeKeys.endColKey]
-            const index = selectionRangeIndexes.startRowIndex
-            if (this.inTableLoad) {
-              return false
-            }
-            if (['kgs', 'cbm', 'tareweight', 'weighkgs'].includes(selectionRangeKeys.endColKey)) {
-              changeValue = changeValue + ''
-              const valIndex = changeValue.includes('.') ? changeValue.indexOf('.') + 1 : false
-              const valCount = changeValue.length - valIndex
-              if (valIndex && valCount > 5) {
-                const height = document.body.clientHeight - 100
-                this.$message.config({
-                  top: `${height}px`,
-                  duration: 2,
-                  maxCount: 3,
-                })
-                this.$message.error('仅支持小数点后五位')
-                this.tableData[index][selectionRangeKeys.endColKey] = changeValue.substr(
-                  0,
-                  valIndex + 5,
-                )
-                setTimeout(() => {
-                  this.$message.destroy()
-                  this.$message.config({
-                    top: `100px`,
-                    duration: 2,
-                    maxCount: 3,
-                  })
-                }, 2000)
-              } else {
-                const arrayNum = changeValue.split('.')
-                if (!/\./.test(changeValue)) {
-                  this.tableData[index][selectionRangeKeys.endColKey] = changeValue + '.00'
-                } else if (arrayNum[1].length < 2) {
-                  this.tableData[index][selectionRangeKeys.endColKey] = changeValue + '0'
-                }
-              }
-            }
-            if (selectionRangeKeys.endColKey === 'pkgs') {
-              if (!/(^[1-9]\d*$)/.test(changeValue)) {
-                const height = document.body.clientHeight - 100
-                this.$message.config({
-                  top: `${height}px`,
-                  duration: 2,
-                  maxCount: 3,
-                })
-                this.$message.error('件数请输入整数')
-                const cNum = changeValue.indexOf('.')
-                this.tableData[index][selectionRangeKeys.endColKey] = changeValue.substr(0, cNum)
-                setTimeout(() => {
-                  this.$message.destroy()
-                  this.$message.config({
-                    top: `100px`,
-                    duration: 2,
-                    maxCount: 3,
-                  })
-                }, 2000)
-              } else {
-              }
-              let num = 0
-              this.tableData.map((item, index) => {
-                if (item.pkgs) {
-                  num += Number(item.pkgs)
-                }
-              })
-              this.totalPkgs = num
-            }
-            if (selectionRangeKeys.endColKey === 'kgs') {
-              let num = 0
-              this.tableData.map((item, index) => {
-                num = (num * 10000 + Number(item.kgs) * 10000) / 10000
-                // num += Number(item.kgs)
-              })
-              num += ''
-              const pNum = num.split('.')
-              if (!/\./.test(num)) {
-                this.totalKgs = num + '.00'
-              } else if (pNum[1].length < 2) {
-                this.totalKgs = num + '0'
-              } else {
-                this.totalKgs = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
-                // this.totalKgs = num
-              }
-            }
-            if (selectionRangeKeys.endColKey === 'cbm') {
-              let num = 0
-              this.tableData.map((item, index) => {
-                // num += Number(item.cbm)
-                num = (num * 10000 + Number(item.cbm) * 10000) / 10000
-              })
-              num += ''
-              const pNum = num.split('.')
-              if (!/\./.test(num)) {
-                this.totalCbm = num + '.00'
-              } else if (pNum[1].length < 2) {
-                this.totalCbm = num + '0'
-              } else {
-                // this.totalCbm = num
-                this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
-              }
-            }
-            if (
-              selectionRangeKeys.endColKey === 'kgs' ||
-              selectionRangeKeys.endColKey === 'tareweight'
-            ) {
-              this.tableData[index]['weighkgs'] = this.calc(
-                Number(this.tableData[index]['kgs']),
-                Number(this.tableData[index]['tareweight']),
-                '+',
-              )
-              const kgsVal = this.tableData[index]['weighkgs'] + ''
-              const kgsIndex = kgsVal.includes('.') ? kgsVal.indexOf('.') + 1 : false
-              const kgsCount = kgsVal.includes('.') ? kgsVal.length - kgsIndex : false
-              if (kgsCount > 4) {
-                this.tableData[index]['weighkgs'] = kgsVal.substr(0, kgsIndex + 5)
-              } else if (!kgsIndex) {
-                this.tableData[index]['weighkgs'] = kgsVal + '.00'
-              } else {
-                const arrayNum = kgsVal.split('.')
-                if (!/\./.test(kgsVal)) {
-                  this.tableData[index]['weighkgs'] = kgsVal + '.00'
-                } else if (arrayNum[1].length < 2) {
-                  this.tableData[index]['weighkgs'] = kgsVal + '0'
-                }
-              }
-            }
-          },
-          beforeCut: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
-          },
-          afterCut: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
-          },
-          beforeDelete: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
-          },
-          afterDelete: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
-          },
-        },
-        clipboardChildOption: {
-          copy: true,
-          paste: true,
-          cut: true,
-          delete: true,
-          beforeCopy: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
-          },
-          afterCopy: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
-          },
-          beforePaste: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
-          },
-          afterPaste: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
-          },
-          beforeCut: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
-          },
-          afterCut: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
-          },
-          beforeDelete: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
-          },
-          afterDelete: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
-            this.log({ data, selectionRangeIndexes, selectionRangeKeys })
-          },
-        },
-        tableLoaded: false,
-        // ctnList: [],
-        // packageList: [],
-        selectArr: [],
-        totalCtnall: '',
-        totalPkgs: 0,
-        totalKgs: 0,
-        totalCbm: 0,
-        moreVisible: false,
-        moreModelconfirm: false,
-        radioOption: {
-          // 行选择改变事件
-          selectedRowChange: ({ row }) => {
-            this.childModelSelect = row
-            this.tableData.map((item, index) => {
-              if (item.rowKey === row.rowKey) {
-                this.childModelSelectIndex = index
-              }
+    {
+      field: 'ctnall',
+      key: 'ctnall',
+      title: '箱型',
+      align: 'left',
+      width: 120,
+      edit: false,
+      // renderBodyCell: ({ row, column, rowIndex }, h) => {
+      //   this.openEdit = true
+      //   return (
+      //     <a-select
+      //       size="small"
+      //       value={row['ctnall']}
+      //       showSearch
+      //       ref="ctnallView"
+      //       class="ctnallView"
+      //       disabled={BookingLockCtn.value['CTNALL'] && this.isLockBooking}
+      //       allow-clear={true}
+      //       style="width: 120px"
+      //       filter-option={this.filterOption1}
+      //       on-change={(val) => {
+      //         // console.log('== 箱型内部监听change ==')
+      //         if (val !== undefined) {
+      //           const data = this.ctnallList[val]
+      //           tableData.value[rowIndex].ctnall = data.name
+      //           tableData.value[rowIndex].ctncode = data.code
+      //           row['ctnall'] = data.name
+      //           var map = {};
+      //           var dest = [];
+      //           for (var i = 0; i < tableData.value.length; i++) {
+      //             var ai = tableData.value[i];
+      //             if (!map[ai.ctnall]) {
+      //               dest.push({
+      //                 ctnall: ai.ctnall,
+      //                 ctnnum: ai.ctnnum
+      //               });
+      //               map[ai.ctnall] = ai;
+      //             } else {
+      //               for (var j = 0; j < dest.length; j++) {
+      //                 var dj = dest[j];
+      //                 if (dj.ctnall == ai.ctnall) {
+      //                   dj.ctnnum = (parseFloat(dj.ctnnum) + parseFloat(ai.ctnnum)).toString();
+      //                   break;
+      //                 }
+      //               }
+      //             }
+      //           };
+      //           this.changeEmit1(dest)
+      //           this.$forceUpdate()
+      //         } else {
+      //           row['ctnall'] = ''
+      //           tableData.value[rowIndex].ctnall = ''
+      //           tableData.value[rowIndex].ctncode = ''
+      //         }
+      //       }}
+      //       on-focus={(val) => {
+      //         // console.log('== 箱型内部监听focus ==')
+      //         this.ctnallViewIndex = rowIndex
+      //         this.cellSelectionOption.enable = false
+      //       }}
+      //       on-blur={(val) => {
+      //         // 箱信息 下拉框自动弹出部分 - 测试中
+      //         // console.log('== 箱型内部监听blur ==', this.ctnallViewIndex, rowIndex)
+      //         this.cellSelectionOption.enable = true
+      //         this.ctnallViewIndex = null
+      //       }}
+      //       on-select={(val) => {
+      //         this.cellSelectionOption.enable = true
+      //         this.setCellSelection(rowIndex, 'ctnall')
+      //       }}
+      //     >
+      //       {this.ctnallList.map((item, index) => {
+      //         return <a-select-option value={index}>{item.name}</a-select-option>
+      //       })}
+      //     </a-select>
+      //   )
+      // },
+      // renderHeaderCell: ({ column }, h) => {
+      //   return (
+      //     <span class="text-bold" style="text-align: center;">
+      //       {this.rules.ctnall.required ? <i style="color: #f00">*</i> : ''} {column.title}
+      //     </span>
+      //   )
+      // }
+    },
+    {
+      field: 'ctnnum',
+      key: 'ctnnum',
+      title: '箱量',
+      align: 'left',
+      width: 60,
+      edit: true,
+      // renderHeaderCell: ({ column }, h) => {
+      //   return (
+      //     <span class="text-bold" style="text-align: center;">
+      //       {this.rules.ctnnum.required ? <i style="color: #f00">*</i> : ''} {column.title}
+      //     </span>
+      //   )
+      // },
+    },
+    {
+      field: 'cntrno',
+      key: 'cntrno',
+      title: '箱号',
+      align: 'left',
+      width: 130,
+      edit: true,
+      // renderHeaderCell: ({ column }, h) => {
+      //   return (
+      //     <span class="text-bold" style="text-align: center;">
+      //       {this.rules.cntrno.required ? <i style="color: #f00">*</i> : ''} {column.title}
+      //     </span>
+      //   )
+      // },
+    },
+    {
+      field: 'sealno',
+      key: 'sealno',
+      title: '封号',
+      align: 'left',
+      width: 60,
+      edit: true,
+      // renderHeaderCell: ({ column }, h) => {
+      //   return (
+      //     <span class="text-bold" style="text-align: center;">
+      //       {this.rules.sealno.required ? <i style="color: #f00">*</i> : ''} {column.title}
+      //     </span>
+      //   )
+      // },
+    },
+    {
+      field: 'pkgs',
+      key: 'pkgs',
+      title: '件数',
+      align: 'left',
+      width: 60,
+      edit: true,
+      // renderHeaderCell: ({ column }, h) => {
+      //   return (
+      //     <span class="text-bold" style="text-align: center;">
+      //       {this.rules.pkgs.required ? <i style="color: #f00">*</i> : ''} {column.title}
+      //     </span>
+      //   )
+      // },
+    },
+    {
+      field: 'kindpkgs',
+      key: 'kindpkgs',
+      title: '包装',
+      align: 'left',
+      edit: false,
+      width: 130,
+      // renderBodyCell: ({ row, column, rowIndex }, h) => {
+      //   this.openEdit = true
+      //   return (
+      //     <a-select
+      //       size="small"
+      //       allow-clear={true}
+      //       showSearch
+      //       value={row['kindpkgs']}
+      //       option-filter-prop="children"
+      //       filter-option={this.filterOption}
+      //       disabled={BookingLockCtn.value['kindpkgs'] && this.isLockBooking}
+      //       style="width: 120px"
+      //       class="kindpkgsView"
+      //       on-change={(val) => {
+      //         if (val !== undefined) {
+      //           const data = this.packageList[val]
+      //           tableData.value[rowIndex].kindpkgs = data.name
+      //           row['kindpkgs'] = data.name
+      //           this.$forceUpdate()
+      //         } else {
+      //           row['kindpkgs'] = ''
+      //           tableData.value[rowIndex].kindpkgs = ''
+      //           tableData.value.map((item, index) => {
+      //             if (index !== rowIndex) {
+      //               item.kindpkgs = ''
+      //               document
+      //                 .getElementsByClassName('kindpkgsView')
+      //               [index].getElementsByClassName('ant-select-selection-selected-value')[0].innerHTML = ''
+      //             }
+      //           })
+      //         }
+      //         this.changeEmit(row)
+      //       }}
+      //       on-focus={(val) => {
+      //         this.kindpkgsViewIndex = rowIndex
+      //         this.cellSelectionOption.enable = false
+      //         // console.log('=获取焦点=', rowIndex, this.kindpkgsViewIndex)
+      //       }}
+      //       on-blur={(val) => {
+      //         // 箱信息 下拉框自动弹出部分 - 测试中
+      //         this.cellSelectionOption.enable = true
+      //         this.kindpkgsViewIndex = null
+      //       }}
+      //       on-input={(val) => {
+      //         // console.log('== input - 修改内容==', val)
+      //       }}
+      //       on-select={(val) => {
+      //         this.cellSelectionOption.enable = true
+      //         this.setCellSelection(rowIndex, 'kindpkgs')
+      //       }}
+      //     >
+      //       {this.packageList.map((item, index) => {
+      //         return <a-select-option value={index}>{item.code}</a-select-option>
+      //       })}
+      //     </a-select-option>
+      //   )
+      // },
+      // renderHeaderCell: ({ column }, h) => {
+      //   return (
+      //     <span class="text-bold" style="text-align: center;">
+      //       {this.rules.kindpkgs.required ? <i style="color: #f00">*</i> : ''} {column.title}
+      //     </span>
+      //   )
+      // }
+    },
+    {
+      field: 'kgs',
+      key: 'kgs',
+      title: '重量',
+      align: 'left',
+      width: 60,
+      edit: true,
+      // renderHeaderCell: ({ column }, h) => {
+      //   return (
+      //     <span class="text-bold" style="text-align: center;">
+      //       {this.rules.kgs.required ? <i style="color: #f00">*</i> : ''} {column.title}
+      //     </span>
+      //   )
+      // },
+    },
+    {
+      field: 'cbm',
+      key: 'cbm',
+      title: '尺码',
+      align: 'left',
+      width: 60,
+      edit: true,
+      // renderHeaderCell: ({ column }, h) => {
+      //   return (
+      //     <span class="text-bold" style="text-align: center;">
+      //       {this.rules.cbm.required ? <i style="color: #f00">*</i> : ''} {column.title}
+      //     </span>
+      //   )
+      // },
+    },
+    {
+      field: 'tareweight',
+      key: 'tareweight',
+      title: '箱皮重',
+      align: 'left',
+      width: 60,
+      edit: true,
+      // renderHeaderCell: ({ column }, h) => {
+      //   return (
+      //     <span class="text-bold" style="text-align: center;">
+      //       {this.rules.tareweight.required ? <i style="color: #f00">*</i> : ''}{' '}
+      //       {column.title}
+      //     </span>
+      //   )
+      // },
+    },
+    {
+      field: 'weightype',
+      key: 'weightype',
+      title: '称重方式',
+      align: 'left',
+      width: 90,
+      edit: false,
+      // renderBodyCell: ({ row, column, rowIndex }, h) => {
+      //   return (
+      //     <a-select
+      //       size="small"
+      //       show-search
+      //       value={row['weightype']}
+      //       option-filter-prop="children"
+      //       disabled={BookingLockCtn.value['weightype'] && this.isLockBooking}
+      //       style="width: 80px"
+      //       on-change={(val) => {
+      //         tableData.value[rowIndex].weightype = val
+      //         row['weightype'] = val
+      //         if (row['weightype'] === '累加') {
+      //           row['weighkgs'] = calc(
+      //             Number(row['kgs']),
+      //             Number(row['tareweight']),
+      //             '+',
+      //           )
+      //         } else {
+      //           row['weighkgs'] = ''
+      //         }
+      //         this.$forceUpdate()
+      //       }}
+      //       on-blur={(val) => {
+      //         // 箱信息 下拉框自动弹出部分 - 测试中
+      //         this.cellSelectionOption.enable = true
+      //       }}
+      //       on-focus={(val) => {
+      //         this.cellSelectionOption.enable = false
+      //       }}
+      //     >
+      //       <a-select-option value="累加">累加</a-select-option>
+      //       <a-select-option value="总重">总重</a-select-option>
+      //     </a-select>
+      //   )
+      // },
+      // renderHeaderCell: ({ column }, h) => {
+      //   return (
+      //     <span class="text-bold" style="text-align: center;">
+      //       {this.rules.weightype.required ? <i style="color: #f00">*</i> : ''} {column.title}
+      //     </span>
+      //   )
+      // },
+    },
+    {
+      field: 'weighkgs',
+      key: 'weighkgs',
+      title: '称重重量',
+      align: 'left',
+      width: 60,
+      edit: true,
+      // renderHeaderCell: ({ column }, h) => {
+      //   return (
+      //     <span class="text-bold" style="text-align: center;">
+      //       {this.rules.weighkgs.required ? <i style="color: #f00">*</i> : ''} {column.title}
+      //     </span>
+      //   )
+      // },
+    },
+    {
+      field: 'weighdate',
+      key: 'weighdate',
+      title: '称重日期',
+      align: 'left',
+      width: 120,
+      edit: false,
+      // renderBodyCell: ({ row, column, rowIndex }, h) => {
+      //   return (
+      //     <a-date-picker
+      //       value={row['weighdate']}
+      //       disabled={BookingLockCtn.value['weighdate'] && this.isLockBooking}
+      //       on-change={(date, dateString) => {
+      //         // console.log('== 选择日期 ==', dateString)
+      //         tableData.value[rowIndex].weighdate = dateString
+      //         row['weighdate'] = dateString
+      //       }}
+      //     />
+      //   )
+      // },
+      // renderHeaderCell: ({ column }, h) => {
+      //   return (
+      //     <span class="text-bold" style="text-align: center;">
+      //       {this.rules.weightype.required ? <i style="color: #f00">*</i> : ''} {column.title}
+      //     </span>
+      //   )
+      // },
+    },
+  ])
+  const cellAutofillOption = ref({
+    directionX: false,
+    directionY: true,
+    afterAutofill: ({
+      direction,
+      sourceSelectionRangeIndexes,
+      targetSelectionRangeIndexes,
+      sourceSelectionData,
+      targetSelectionData,
+    }) => {
+      console.log('direction::', direction)
+      console.log('sourceSelectionRangeIndexes::', sourceSelectionRangeIndexes)
+      console.log('targetSelectionRangeIndexes::', targetSelectionRangeIndexes)
+      console.log('sourceSelectionData::', sourceSelectionData)
+      console.log('targetSelectionData::', targetSelectionData)
+      console.log('---')
+    },
+  })
+  const editOption = ref({
+    beforeCellValueChange: ({ row, column, changeValue }) => {
+      if (inTableLoad.value) {
+        return false
+      }
+      if (
+        ['pkgs', 'kgs', 'cbm', 'tareweight'].includes(column.field) &&
+        !new RegExp(/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(changeValue)
+      ) {
+        const height = document.body.clientHeight - 100
+        notification.config({
+          top: `${height}px`,
+          duration: 2,
+          maxCount: 3,
+        })
+        notification.error({
+          message: `输入的${enmuErrorLabel(column.field)}不符合规则`,
+          duration: 3,
+        })
+        setTimeout(() => {
+          notification.destroy()
+          notification.config({
+            top: `100px`,
+            duration: 2,
+            maxCount: 3,
+          })
+        }, 2000)
+        return false
+      }
+      if (column.field === 'cntrno') {
+        const res = checkCntrno(changeValue)
+        if (res !== '') {
+          const height = document.body.clientHeight - 100
+          notification.config({
+            top: `${height}px`,
+            duration: 2,
+            maxCount: 3,
+          })
+
+          notification.error({ message: res, duration: 3 })
+          // row['cntrno'] = ''
+          setTimeout(() => {
+            notification.destroy()
+            notification.config({
+              top: `100px`,
+              duration: 2,
+              maxCount: 3,
             })
-            if (this.tableData[this.childModelSelectIndex].ctnDetailInputs) {
-              this.tableData[this.childModelSelectIndex].ctnDetailInputs.map((item, index) => {
-                item.rowKey = index
-              })
-              this.childTableData = this.tableData[this.childModelSelectIndex].ctnDetailInputs
-            } else {
-              this.childTableData = []
-            }
-          },
-        },
-        childTableData: [],
-        childModelSelect: null,
-        childModelSelectIndex: null,
-        selectChildArr: [],
-        YarnLoading: false,
-        sealnoLoading: false,
-        WeightLoading: false,
-        ctnallViewIndex: null,
-        kindpkgsViewIndex: null,
-        inTableLoad: false,
-        openEdit: false,
-        comparisonFlag: false,
+          }, 2000)
+        }
       }
     },
-    computed: {
-      ...mapGetters(['packageList', 'ctnallList']),
-    },
-    watch: {
-      details: {
-        handler(nval, oval) {
-          // console.log('=== 修改table内容 ===', nval.ctnInputs, this.pType, this.inTableLoad)
-          if (!this.inSave && !this.inTableLoad) {
-            this.$emit('changeDetail', {
-              detail: nval,
-              type: 'goodsTable',
+    beforeStartCellEditing: ({ row, column, cellValue }) => {
+      console.log(column)
+      // const arr = this.$options.filters['dictData']('BookingLockCtn')
+      let type = true
+      // arr.forEach((item) => {
+      //   if (item.code == column.field && this.isLockBooking) {
+      //     type = false
+      //   }
+      // })
+      return type
+    },
+    afterCellValueChange: ({ row, column, changeValue }) => {
+      if (inTableLoad.value) {
+        return false
+      }
+      if (['kgs', 'cbm', 'tareweight', 'weighkgs'].includes(column.field)) {
+        changeValue = changeValue + ''
+        const valIndex = changeValue.includes('.') ? changeValue.indexOf('.') + 1 : false
+        const valCount = changeValue.length - valIndex
+        if (valIndex && valCount > 5) {
+          const height = document.body.clientHeight - 100
+          notification.config({
+            top: `${height}px`,
+            duration: 2,
+            maxCount: 3,
+          })
+          notification.error({ message: '仅支持小数点后五位', duration: 3 })
+          row[column.field] = changeValue.substr(0, valIndex + 5)
+          setTimeout(() => {
+            notification.destroy()
+            notification.config({
+              top: `100px`,
+              duration: 2,
+              maxCount: 3,
             })
-            // if (this.pType === 'secOrder' && !this.inTableLoad && this.$route.name === 'BookingDetail') {
-            //   this.init()
-            // }
-          }
-        },
-        deep: true,
-      },
-      tableData: {
-        handler(nval, oval) {
-          this.details.ctnInputs = nval
-        },
-        deep: true,
-      },
-      '$route.query': {
-        immediate: true,
-        handler(nD, oD) {
-          if (this.$route.query.isCopy) {
-            this.id = ''
-          } else {
-            this.id = this.$route.query.id
+          }, 2000)
+        } else {
+          const arrayNum = changeValue.split('.')
+          if (!/\./.test(changeValue)) {
+            row[column.field] = changeValue + '.00'
+          } else if (arrayNum[1].length < 2) {
+            row[column.field] = changeValue + '0'
           }
-
-          if (this.$route.name === 'BookingDetail') {
-            this.init()
+        }
+      }
+      if (column.field === 'pkgs') {
+        if (!/(^[1-9]\d*$)/.test(changeValue)) {
+          const height = document.body.clientHeight - 100
+          notification.config({
+            top: `${height}px`,
+            duration: 2,
+            maxCount: 3,
+          })
+          notification.error({ message: '件数请输入整数', duration: 3 })
+          const cNum = changeValue.indexOf('.')
+          row[column.field] = changeValue.substr(0, cNum)
+          setTimeout(() => {
+            notification.destroy()
+            notification.config({
+              top: `100px`,
+              duration: 2,
+              maxCount: 3,
+            })
+          }, 2000)
+        } else {
+        }
+        let num = 0
+        tableData.value.map((item, index) => {
+          if (item.pkgs) {
+            num += Number(item.pkgs)
           }
-        },
-      },
-      totalKgs() {
-        this.$emit('changeTotal', {
-          type: 'totalKgs',
-          val: this.totalKgs,
-        })
-      },
-      totalPkgs() {
-        this.$emit('changeTotal', {
-          type: 'totalPkgs',
-          val: this.totalPkgs,
-        })
-      },
-      totalCbm() {
-        this.$emit('changeTotal', {
-          type: 'totalCbm',
-          val: this.totalCbm,
         })
-      },
-      openEdit(nval, oval) {},
-    },
-    created() {
-      this.init()
-    },
-    mounted() {
-      const editDom = document.getElementsByClassName('ve-table-body-tr')
-      document.onkeydown = (event) => {
-        editDom.forEach((item, index) => {
-          item.children.forEach((ite) => {
-            if (ite.classList.contains('ve-table-cell-selection')) {
-              this.kindpkgsViewIndex = index
-            }
-          })
+        totalPkgs.value = num
+      }
+      if (column.field === 'kgs') {
+        let num: any = 0
+        tableData.value.map((item, index) => {
+          num = (num * 10000 + Number(item.kgs) * 10000) / 10000
+          // num += Number(item.kgs)
         })
-        if (event.key === 'Backspace' && this.kindpkgsViewIndex !== null) {
-          const val = document
-            .getElementsByClassName('kindpkgsView')
-            [this.kindpkgsViewIndex].getElementsByTagName('input')[0].value
-          document
-            .getElementsByClassName('kindpkgsView')
-            [this.kindpkgsViewIndex].getElementsByTagName('input')[0].value = val.substr(
-            0,
-            val.length - 1,
-          )
-          var evt = document.createEvent('HTMLEvents')
-          evt.initEvent('input', true, false)
-          document
-            .getElementsByClassName('kindpkgsView')
-            [this.kindpkgsViewIndex].getElementsByTagName('input')[0]
-            .dispatchEvent(evt)
+        num += ''
+        const pNum = num.split('.')
+        if (!/\./.test(num)) {
+          totalKgs.value = num + '.00'
+        } else if (pNum[1].length < 2) {
+          totalKgs.value = num + '0'
+        } else {
+          totalKgs.value = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
+          // totalKgs.value = num
         }
-        if (event.key === 'Backspace' && this.kindpkgsViewIndex !== null) {
-          const val = document
-            .getElementsByClassName('ctnallView')
-            [this.kindpkgsViewIndex].getElementsByTagName('input')[0].value
-          document
-            .getElementsByClassName('ctnallView')
-            [this.kindpkgsViewIndex].getElementsByTagName('input')[0].value = val.substr(
-            0,
-            val.length - 1,
-          )
-          var evt = document.createEvent('HTMLEvents')
-          evt.initEvent('input', true, false)
-          document
-            .getElementsByClassName('ctnallView')
-            [this.kindpkgsViewIndex].getElementsByTagName('input')[0]
-            .dispatchEvent(evt)
+      }
+      if (column.field === 'cbm') {
+        let num: any = 0
+        tableData.value.map((item, index) => {
+          // num += Number(item.cbm)
+          num = (num * 10000 + Number(item.cbm) * 10000) / 10000
+        })
+        num += ''
+        const pNum = num.split('.')
+        if (!/\./.test(num)) {
+          totalCbm.value = num + '.00'
+        } else if (pNum[1].length < 2) {
+          totalCbm.value = num + '0'
+        } else {
+          // totalCbm.value = num
+          totalCbm.value = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
         }
-        const arr = []
-        if (document.getElementsByClassName('ant-select-dropdown').length > 0) {
-          document.getElementsByClassName('ant-select-dropdown').forEach((item) => {
-            const style = item.style
-            if (style.display !== 'none') {
-              arr.push(1)
-            }
-          })
+      }
+      if (column.field === 'kgs' || column.field === 'tareweight') {
+        row['weighkgs'] = calc(Number(row['kgs']), Number(row['tareweight']), '+')
+        const kgsVal = row['weighkgs'] + ''
+        const kgsIndex: any = kgsVal.includes('.') ? kgsVal.indexOf('.') + 1 : false
+        const kgsCount: any = kgsVal.includes('.') ? kgsVal.length - kgsIndex : false
+        if (kgsCount > 4) {
+          row['weighkgs'] = kgsVal.substr(0, kgsIndex + 5)
+        } else if (!kgsIndex) {
+          row['weighkgs'] = kgsVal + '.00'
+        } else {
+          const arrayNum = kgsVal.split('.')
+          if (!/\./.test(kgsVal)) {
+            row['weighkgs'] = kgsVal + '.00'
+          } else if (arrayNum[1].length < 2) {
+            row['weighkgs'] = kgsVal + '0'
+          }
         }
-        if (arr.length === 0) {
-          this.cellSelectionOption.enable = true
-          if ([37, 38, 39, 40, 9].includes(event.keyCode)) {
-            if (arr.length === 0) {
-              setTimeout(() => {
-                if (document.getElementsByClassName('ve-table-cell-selection')) {
-                  const activeDom =
-                    document.getElementsByClassName('ve-table-cell-selection')[0].firstChild
-                  if (this.isDOM(activeDom)) {
-                    activeDom.click()
-                  }
-                }
-              }, 200)
+      }
+      if (column.field === 'ctnnum') {
+        const map = {}
+        const dest: any[] = []
+        for (var i = 0; i < tableData.value.length; i++) {
+          var ai = tableData.value[i]
+          if (!map[ai.ctnall]) {
+            dest.push({
+              ctnall: ai.ctnall,
+              ctnnum: ai.ctnnum,
+            })
+            map[ai.ctnall] = ai
+          } else {
+            for (var j = 0; j < dest.length; j++) {
+              var dj = dest[j]
+              if (dj.ctnall == ai.ctnall) {
+                dj.ctnnum = (parseFloat(dj.ctnnum) + parseFloat(ai.ctnnum)).toString()
+                break
+              }
             }
           }
-        } else {
-          this.cellSelectionOption.enable = false
         }
+        changeEmit1(dest)
       }
     },
-    methods: {
-      keydown(e) {
-        console.log(e)
-      },
-      handleRefsh() {
-        this.$emit('handleRefshTable')
-      },
-      changeEmit(row) {
-        this.$emit('changeCtnInfo', { type: 'kindpkgs', val: row['kindpkgs'] })
-      },
-      isDOM(item) {
-        // 首先判断是否支持HTMLELement，如果支持，使用HTMLElement，如果不支持，通过判断DOM的特征，如果拥有这些特征说明就是ODM节点，特征使用的越多越准确
-        return typeof HTMLElement === 'function'
-          ? item instanceof HTMLElement
-          : item &&
-              typeof item === 'object' &&
-              item.nodeType === 1 &&
-              typeof item.nodeName === 'string'
-      },
-      // 给可控属性重新赋值
-      changeSelectedRowKeys(keys) {
-        this.selectArr = keys
-        this.checkboxOption.selectedRowKeys = keys
-      },
-      startEditingCell(rowKey, colKey, defaultValue) {
-        this.$refs['tableRef'].startEditingCell({ rowKey, colKey, defaultValue })
-      },
-      setCellSelection(rowKey, colKey) {
-        this.$refs['tableRef'].setCellSelection({ rowKey, colKey })
-      },
-      init() {
-        if (Object.keys(this.details).length > 0) {
-          const arr = []
-          const totalCtnall = {}
-          this.totalPkgs = 0
-          this.totalKgs = 0
-          this.totalCbm = 0
-          this.details.ctnInputs.map((item, index) => {
-            arr.push({
-              ...{ rowKey: index },
-              ...item,
+    cellValueChange: ({ row, column }) => {
+      console.log(row, column)
+    },
+  })
+  const rowKeyName = 'rowKey'
+  const rowStyleOption = ref({
+    clickHighlight: false,
+    hoverHighlight: false,
+  })
+  const clipboardOption = ref({
+    copy: true,
+    paste: true,
+    cut: true,
+    delete: true,
+    beforeCopy: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      log({ data, selectionRangeIndexes, selectionRangeKeys })
+    },
+    afterCopy: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      log({ data, selectionRangeIndexes, selectionRangeKeys })
+    },
+    beforePaste: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      const changeValue = data[0][selectionRangeKeys.endColKey]
+      if (inTableLoad.value) {
+        return false
+      }
+      if (
+        ['pkgs', 'kgs', 'cbm', 'tareweight'].includes(selectionRangeKeys.endColKey) &&
+        !new RegExp(/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(changeValue)
+      ) {
+        const height = document.body.clientHeight - 100
+        notification.config({
+          top: `${height}px`,
+          duration: 2,
+          maxCount: 3,
+        })
+        notification.error({
+          message: `输入的${enmuErrorLabel(selectionRangeKeys.endColKey)}不符合规则`,
+          duration: 3,
+        })
+        setTimeout(() => {
+          notification.destroy()
+          notification.config({
+            top: `100px`,
+            duration: 2,
+            maxCount: 3,
+          })
+        }, 2000)
+        return false
+      }
+      if (selectionRangeKeys.endColKey === 'cntrno') {
+        const res = checkCntrno(changeValue)
+        if (res !== '') {
+          const height = document.body.clientHeight - 100
+          notification.config({
+            top: `${height}px`,
+            duration: 2,
+            maxCount: 3,
+          })
+          notification.error({ message: res, duration: 3 })
+          // row['cntrno'] = ''
+          setTimeout(() => {
+            notification.destroy()
+            notification.config({
+              top: `100px`,
+              duration: 2,
+              maxCount: 3,
             })
-            if (!Object.keys(totalCtnall).includes(item.ctnall)) {
-              const cData = {
-                type: 'ctnall',
-                num: item.ctnnum,
-              }
-              this.$set(totalCtnall, item.ctnall, cData)
-            }
-            if (item.pkgs) {
-              this.totalPkgs = (this.totalPkgs * 100 + Number(item.pkgs) * 100) / 100
-            }
-            if (item.kgs) {
-              let onum = (this.totalKgs * 10000 + Number(item.kgs) * 10000) / 10000
-              onum += ''
-              const pNum = onum.split('.')
-              if (!/\./.test(onum)) {
-                this.totalKgs = onum + '.00'
-              } else if (pNum[1].length < 2) {
-                this.totalKgs = onum + '0'
-              } else {
-                this.totalKgs = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
-              }
-            }
-            if (item.cbm) {
-              let onum = (this.totalCbm * 10000 + Number(item.cbm) * 10000) / 10000
-              onum += ''
-              const pNum = onum.split('.')
-              if (!/\./.test(onum)) {
-                this.totalCbm = onum + '.00'
-              } else if (pNum[1].length < 2) {
-                this.totalCbm = onum + '0'
-              } else {
-                this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
-              }
-            }
+          }, 2000)
+        }
+      }
+    },
+    afterPaste: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      let changeValue = data[0][selectionRangeKeys.endColKey]
+      const index = selectionRangeIndexes.startRowIndex
+      if (inTableLoad.value) {
+        return false
+      }
+      if (['kgs', 'cbm', 'tareweight', 'weighkgs'].includes(selectionRangeKeys.endColKey)) {
+        changeValue = changeValue + ''
+        const valIndex = changeValue.includes('.') ? changeValue.indexOf('.') + 1 : false
+        const valCount = changeValue.length - valIndex
+        if (valIndex && valCount > 5) {
+          const height = document.body.clientHeight - 100
+          notification.config({
+            top: `${height}px`,
+            duration: 2,
+            maxCount: 3,
           })
-          this.tableData = arr
-          this.tableLoaded = true
-          this.totalCtnall = ''
-          this.$emit('changeTotal', { type: 'totalKgs', val: this.totalKgs })
-          this.$emit('changeTotal', { type: 'totalPkgs', val: this.totalPkgs })
-          this.$emit('changeTotal', { type: 'totalCbm', val: this.totalCbm })
+          notification.error({ message: '仅支持小数点后五位', duration: 3 })
+          tableData.value[index][selectionRangeKeys.endColKey] = changeValue.substr(0, valIndex + 5)
+          setTimeout(() => {
+            notification.destroy()
+            notification.config({
+              top: `100px`,
+              duration: 2,
+              maxCount: 3,
+            })
+          }, 2000)
         } else {
-          this.tableData = []
-          this.tableLoaded = true
-          this.totalCtnall = ''
-          this.totalPkgs = 0
-          this.totalKgs = 0
-          this.totalCbm = 0
-        }
-        const obj = {}
-        this.$options.filters['dictData']('BookingLockCtn').forEach((item) => {
-          obj[item.code] = true
-        })
-        this.BookingLockCtn = obj
-      },
-      filterOption1(input, option) {
-        return (
-          option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        )
-      },
-      filterOption(input, option) {
-        const search = option.componentOptions.children[0].text.toLowerCase()
-        const inputStr = input.toLowerCase()
-        const arr = []
-        for (let i = 0; i < inputStr.length; i++) {
-          if (inputStr[i] === search[i]) {
-            arr.push(1)
+          const arrayNum = changeValue.split('.')
+          if (!/\./.test(changeValue)) {
+            tableData.value[index][selectionRangeKeys.endColKey] = changeValue + '.00'
+          } else if (arrayNum[1].length < 2) {
+            tableData.value[index][selectionRangeKeys.endColKey] = changeValue + '0'
           }
         }
-        if (arr.length === inputStr.length) {
-          return true
+      }
+      if (selectionRangeKeys.endColKey === 'pkgs') {
+        if (!/(^[1-9]\d*$)/.test(changeValue)) {
+          const height = document.body.clientHeight - 100
+          notification.config({
+            top: `${height}px`,
+            duration: 2,
+            maxCount: 3,
+          })
+          notification.error({ message: '件数请输入整数', duration: 3 })
+          const cNum = changeValue.indexOf('.')
+          tableData.value[index][selectionRangeKeys.endColKey] = changeValue.substr(0, cNum)
+          setTimeout(() => {
+            notification.destroy()
+            notification.config({
+              top: `100px`,
+              duration: 2,
+              maxCount: 3,
+            })
+          }, 2000)
+        } else {
         }
-      },
-      enmuErrorLabel(val) {
-        switch (val) {
-          case 'cntrno':
-            return '箱型'
-          case 'pkgs':
-            return '件数'
-          case 'kgs':
-            return '重量'
-          case 'cbm':
-            return '尺码'
-          case 'tareweight':
-            return '箱皮重'
-          default:
-            return '内容'
+        let num = 0
+        tableData.value.map((item, index) => {
+          if (item.pkgs) {
+            num += Number(item.pkgs)
+          }
+        })
+        totalPkgs.value = num
+      }
+      if (selectionRangeKeys.endColKey === 'kgs') {
+        let num: any = 0
+        tableData.value.map((item, index) => {
+          num = (num * 10000 + Number(item.kgs) * 10000) / 10000
+          // num += Number(item.kgs)
+        })
+        num += ''
+        const pNum = num.split('.')
+        if (!/\./.test(num)) {
+          totalKgs.value = num + '.00'
+        } else if (pNum[1].length < 2) {
+          totalKgs.value = num + '0'
+        } else {
+          totalKgs.value = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
+          // totalKgs.value = num
         }
-      },
-      handleOpen() {
-        this.comparisonFlag = true
-        this.yardAutoForm = this.details.autoYardImport
-        if (this.yardAutoForm.yardJson) {
-          this.yardAutoForm.yardTable = JSON.parse(this.yardAutoForm.yardJson)
+      }
+      if (selectionRangeKeys.endColKey === 'cbm') {
+        let num: any = 0
+        tableData.value.map((item, index) => {
+          // num += Number(item.cbm)
+          num = (num * 10000 + Number(item.cbm) * 10000) / 10000
+        })
+        num += ''
+        const pNum = num.split('.')
+        if (!/\./.test(num)) {
+          totalCbm.value = num + '.00'
+        } else if (pNum[1].length < 2) {
+          totalCbm.value = num + '0'
+        } else {
+          // totalCbm.value = num
+          totalCbm.value = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
         }
-        if (this.yardAutoForm.ctnJson) {
-          this.yardAutoForm.ctnTable = JSON.parse(this.yardAutoForm.ctnJson)
+      }
+      if (selectionRangeKeys.endColKey === 'kgs' || selectionRangeKeys.endColKey === 'tareweight') {
+        tableData.value[index]['weighkgs'] = calc(
+          Number(tableData.value[index]['kgs']),
+          Number(tableData.value[index]['tareweight']),
+          '+',
+        )
+        const kgsVal = tableData.value[index]['weighkgs'] + ''
+        const kgsIndex: any = kgsVal.includes('.') ? kgsVal.indexOf('.') + 1 : false
+        const kgsCount: any = kgsVal.includes('.') ? kgsVal.length - kgsIndex : false
+        if (kgsCount > 4) {
+          tableData.value[index]['weighkgs'] = kgsVal.substr(0, kgsIndex + 5)
+        } else if (!kgsIndex) {
+          tableData.value[index]['weighkgs'] = kgsVal + '.00'
+        } else {
+          const arrayNum = kgsVal.split('.')
+          if (!/\./.test(kgsVal)) {
+            tableData.value[index]['weighkgs'] = kgsVal + '.00'
+          } else if (arrayNum[1].length < 2) {
+            tableData.value[index]['weighkgs'] = kgsVal + '0'
+          }
         }
-        ReadAutoYardImport({ bookId: this.$route.query.id }).then((res) => {})
-      },
-      addboxLine() {
-        const data = {
-          ctnall: '',
-          ctnnum: '1',
-          cntrno: '',
-          sealno: '',
-          pkgs: '',
-          kindpkgs: this.tableData.length > 0 ? this.tableData[0].kindpkgs : '',
-          kgs: '',
-          cbm: '',
-          tareweight: '',
-          weightype: '累加',
-          weighkgs: '',
-          weighdate: '',
-          rowKey:
-            this.tableData.length > 0
-              ? Number(this.tableData[this.tableData.length - 1].rowKey) + 1
-              : 0,
+      }
+    },
+    beforeCut: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      log({ data, selectionRangeIndexes, selectionRangeKeys })
+    },
+    afterCut: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      log({ data, selectionRangeIndexes, selectionRangeKeys })
+    },
+    beforeDelete: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      log({ data, selectionRangeIndexes, selectionRangeKeys })
+    },
+    afterDelete: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      log({ data, selectionRangeIndexes, selectionRangeKeys })
+    },
+  })
+  const cellSelectionOption = ref({
+    enable: true,
+  })
+  const totalCtnall = ref('')
+  const BookingLockCtn = ref({})
+  const moreModelconfirm = ref(false)
+  const modelColumns = ref([
+    {
+      field: '',
+      key: 'radio',
+      type: 'radio',
+      title: '',
+      width: 40,
+      operationColumn: true,
+      align: 'center',
+    },
+    {
+      field: 'ctnall',
+      key: 'ctnall',
+      title: '箱型',
+      align: 'left',
+      width: 80,
+    },
+    {
+      field: 'ctnnum',
+      key: 'ctnnum ',
+      title: '箱量',
+      align: 'left',
+    },
+    {
+      field: 'cntrno',
+      key: 'cntrno',
+      title: '箱号',
+      align: 'left',
+      width: 240,
+    },
+    {
+      field: 'sealno',
+      key: 'sealno',
+      title: '封号',
+      align: 'left',
+    },
+    {
+      field: 'pkgs',
+      key: 'pkgs',
+      title: '件数',
+      align: 'left',
+    },
+    {
+      field: 'kindpkgs',
+      key: 'kindpkgs',
+      title: '包装',
+      align: 'left',
+      width: 130,
+    },
+    {
+      field: 'kgs',
+      key: 'kgs',
+      title: '毛重',
+      align: 'left',
+    },
+    {
+      field: 'cbm',
+      key: 'cbm',
+      title: '尺码',
+      align: 'left',
+    },
+  ])
+  const radioOption = ref({
+    // 行选择改变事件
+    selectedRowChange: ({ row }) => {
+      childModelSelect.value = row
+      tableData.value.map((item, index) => {
+        if (item.rowKey === row.rowKey) {
+          childModelSelectIndex.value = index
         }
-        this.tableData.push(data)
-      },
-      removeLine() {
-        this.selectArr.map((item, index) => {
-          this.tableData.map((oitem, oindex) => {
-            if (item === oitem.rowKey) {
-              this.tableData.splice(oindex, 1)
-            }
-          })
-        })
-        let kgs = 0
-        this.tableData.map((item, index) => {
-          kgs += Number(item.kgs)
+      })
+      if (tableData.value[childModelSelectIndex.value].ctnDetailInputs) {
+        tableData.value[childModelSelectIndex.value].ctnDetailInputs.map((item, index) => {
+          item.rowKey = index
         })
-        this.totalKgs = kgs
-
-        let cbm = 0
-        this.tableData.map((item, index) => {
-          cbm += Number(item.cbm)
+        childTableData.value = tableData.value[childModelSelectIndex.value].ctnDetailInputs
+      } else {
+        childTableData.value = []
+      }
+    },
+  })
+  const childModelSelect: Ref<any> = ref(null)
+  const childModelSelectIndex: Ref<any> = ref(null)
+  const childTableData: Ref<any> = ref([])
+  const selectChildArr = ref([])
+  const childColumns = ref([
+    {
+      field: '',
+      key: 'checkbox',
+      type: 'checkbox',
+      title: '',
+      width: 40,
+      operationColumn: true,
+      align: 'center',
+    },
+    {
+      field: 'pkgs',
+      key: 'pkgs',
+      title: '件数',
+      align: 'left',
+      edit: true,
+    },
+    {
+      field: 'kindpkgs',
+      key: 'kindpkgs',
+      title: '包装',
+      align: 'left',
+      edit: false,
+      width: 130,
+      // renderBodyCell: ({ row, column, rowIndex }, h) => {
+      //   return (
+      //     <a-select
+      //       show-search
+      //       value={row['kindpkgs']}
+      //       option-filter-prop="children"
+      //       style="width: 120px"
+      //       on-change={(val) => {
+      //         const data = this.packageList[val]
+      //         row['kindpkgs'] = data.name
+      //         childTableData.value[rowIndex].kindpkgs = data.name
+      //         this.$forceUpdate()
+      //       }}
+      //     >
+      //       {this.packageList.map((item, index) => {
+      //         return <a-select-option value={index}>{item.name}</a-select-option>
+      //       })}
+      //     </a-select-option>
+      //   )
+      // },
+    },
+    {
+      field: 'kgs',
+      key: 'kgs',
+      title: '毛重',
+      align: 'left',
+      edit: true,
+    },
+    {
+      field: 'cbm',
+      key: 'cbm',
+      title: '尺码',
+      align: 'left',
+      edit: true,
+    },
+    {
+      field: 'hscode',
+      key: 'hscode',
+      title: 'HS代码',
+      align: 'left',
+      edit: true,
+    },
+    {
+      field: 'marks',
+      key: 'marks',
+      title: '唛头',
+      align: 'left',
+      edit: true,
+    },
+    {
+      field: 'description',
+      key: 'description',
+      title: '货描',
+      align: 'left',
+      width: '25%',
+      edit: true,
+    },
+  ])
+  const editChildOption = ref({
+    beforeCellValueChange: ({ row, column, changeValue }) => {
+      if (
+        ['pkgs', 'kgs', 'cbm'].includes(column.field) &&
+        !new RegExp(/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(changeValue)
+      ) {
+        notification.error({
+          message: `输入的${enmuErrorLabel(column.field)}不符合规则`,
+          duration: 3,
         })
-        this.totalCbm = cbm
+        row['cntrno'] = ''
+        setTimeout(() => {
+          notification.destroy()
+          notification.config({
+            top: `100px`,
+            duration: 2,
+            maxCount: 3,
+          })
+        }, 2000)
+        return false
+      }
+    },
+    afterCellValueChange: ({ row, column, changeValue }) => {
+      let num: any = null
+      childTableData.value.map((item: any, index) => {
+        if (row.rowKey === item.rowKey) {
+          // eslint-disable-next-line no-const-assign
+          num = index
+        }
+      })
+      childTableData.value[num][column.field] = changeValue
+      // 暂时屏蔽 - 根据需求放开
+      // props.details.ctnInputs[childModelSelect.valueIndex].ctnDetailInputs[num][column.field] = changeValue
+      that.$forceUpdate()
+    },
+    cellValueChange: ({ row, column }) => {
+      console.log(row, column)
+    },
+  })
+  const checkChildboxOption = ref({
+    hideSelectAll: false,
+    // 行选择改变事件
+    selectedRowChange: ({ row, isSelected, selectedRowKeys }) => {
+      console.log(row, isSelected, selectedRowKeys)
+      selectChildArr.value = selectedRowKeys
+    },
+    // 全选改变事件
+    selectedAllChange: ({ isSelected, selectedRowKeys }) => {
+      if (isSelected) {
+        selectChildArr.value = selectedRowKeys
+      } else {
+        selectChildArr.value = []
+      }
+    },
+  })
+  const clipboardChildOption = ref({
+    copy: true,
+    paste: true,
+    cut: true,
+    delete: true,
+    beforeCopy: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      log({ data, selectionRangeIndexes, selectionRangeKeys })
+    },
+    afterCopy: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      log({ data, selectionRangeIndexes, selectionRangeKeys })
+    },
+    beforePaste: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      log({ data, selectionRangeIndexes, selectionRangeKeys })
+    },
+    afterPaste: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      log({ data, selectionRangeIndexes, selectionRangeKeys })
+    },
+    beforeCut: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      log({ data, selectionRangeIndexes, selectionRangeKeys })
+    },
+    afterCut: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      log({ data, selectionRangeIndexes, selectionRangeKeys })
+    },
+    beforeDelete: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      log({ data, selectionRangeIndexes, selectionRangeKeys })
+    },
+    afterDelete: ({ data, selectionRangeIndexes, selectionRangeKeys }) => {
+      log({ data, selectionRangeIndexes, selectionRangeKeys })
+    },
+  })
+  const columnsAuto = ref([
+    {
+      dataIndex: 'CTNALL',
+      key: 'CTNALL',
+      title: '箱型',
+    },
+    {
+      dataIndex: 'CTNNUM',
+      key: 'CTNNUM',
+      title: '箱量',
+    },
+    {
+      dataIndex: 'CNTRNO',
+      key: 'CNTRNO',
+      title: '箱号',
+    },
+    {
+      dataIndex: 'SEALNO',
+      key: 'SEALNO',
+      title: '封号',
+    },
+    {
+      dataIndex: 'PKGS',
+      key: 'PKGS',
+      title: '件数',
+    },
+    {
+      dataIndex: 'KINDPKGS',
+      key: 'KINDPKGS',
+      title: '包装',
+    },
+    {
+      dataIndex: 'KGS',
+      key: 'KGS',
+      title: '重量',
+    },
+    {
+      dataIndex: 'CBM',
+      key: 'CBM',
+      title: '尺码',
+    },
+    {
+      dataIndex: 'TAREWEIGHT',
+      key: 'TAREWEIGHT',
+      title: '箱皮重',
+    },
+    {
+      dataIndex: 'WEIGHTYPE',
+      key: 'WEIGHTYPE',
+      title: '称重方式',
+    },
+    {
+      dataIndex: 'WEIGHKGS',
+      key: 'WEIGHKGS',
+      title: '称重重量',
+    },
+    {
+      dataIndex: 'WEIGHDATE',
+      key: 'WEIGHDATE',
+      title: '称重日期',
+    },
+  ])
 
-        let pkgs = 0
-        this.tableData.map((item, index) => {
-          pkgs += Number(item.pkgs)
-        })
-        this.totalPkgs = pkgs
-        this.checkboxOption.selectedRowKeys = []
-        this.selectArr = []
-        this.tableData.forEach((item, index) => {
-          item.rowKey = index
-        })
-      },
-      developboxLine() {
-        const arr = []
-        let key = 0
-        this.tableData.map((item, index) => {
-          const num = Number(item.ctnnum)
-          if (num > 1) {
-            let surplusPkgs = item.pkgs
-            let surpluskgs = item.kgs * 100000
-            let surpluscbm = item.cbm * 100000
-            for (let i = 0; i < num; i++) {
-              // eslint-disable-next-line prefer-const
-              let sunData = JSON.parse(JSON.stringify(item))
-              sunData.ctnnum = 1
-              sunData.rowKey = key
-              key++
-              if (!/(^[1-9]\d*$)/.test(sunData.pkgs / num)) {
-                if (i !== num - 1) {
-                  const averagePkgs = sunData.pkgs / num + ''
-                  const cNum = averagePkgs.indexOf('.')
-                  sunData.pkgs = Number(averagePkgs.substr(0, cNum))
-                  surplusPkgs = surplusPkgs - sunData.pkgs
-                } else {
-                  sunData.pkgs = surplusPkgs
-                }
-              } else {
-                sunData.pkgs = sunData.pkgs / num
-              }
+  init()
+  function init() {
+    tableLoaded.value = true
+    // if (Object.keys(props.details).length > 0) {
+    //   const arr: any[] = []
+    //   const DtotalCtnall = {}
+    //   totalPkgs.value = 0
+    //   totalKgs.value = 0
+    //   totalCbm.value = 0
+    //   props.details.ctnInputs.map((item, index) => {
+    //     arr.push({
+    //       ...{ rowKey: index },
+    //       ...item,
+    //     })
+    //     if (!Object.keys(DtotalCtnall).includes(item.ctnall)) {
+    //       const cData = {
+    //         type: 'ctnall',
+    //         num: item.ctnnum,
+    //       }
+    //       DtotalCtnall[item.ctnall] = cData
+    //     }
+    //     if (item.pkgs) {
+    //       totalPkgs.value = (totalPkgs.value * 100 + Number(item.pkgs) * 100) / 100
+    //     }
+    //     if (item.kgs) {
+    //       let onum: any = (totalKgs.value * 10000 + Number(item.kgs) * 10000) / 10000
+    //       onum += ''
+    //       const pNum = onum.split('.')
+    //       if (!/\./.test(onum)) {
+    //         totalKgs.value = onum + '.00'
+    //       } else if (pNum[1].length < 2) {
+    //         totalKgs.value = onum + '0'
+    //       } else {
+    //         totalKgs.value = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
+    //       }
+    //     }
+    //     if (item.cbm) {
+    //       let onum: any = (totalCbm.value * 10000 + Number(item.cbm) * 10000) / 10000
+    //       onum += ''
+    //       const pNum = onum.split('.')
+    //       if (!/\./.test(onum)) {
+    //         totalCbm.value = onum + '.00'
+    //       } else if (pNum[1].length < 2) {
+    //         totalCbm.value = onum + '0'
+    //       } else {
+    //         totalCbm.value = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
+    //       }
+    //     }
+    //   })
+    //   tableData.value = arr
+    //   tableLoaded.value = true
+    //   totalCtnall.value = ''
+    //   emit('changeTotal', { type: 'totalKgs', val: totalKgs.value })
+    //   emit('changeTotal', { type: 'totalPkgs', val: totalPkgs.value })
+    //   emit('changeTotal', { type: 'totalCbm', val: totalCbm.value })
+    // } else {
+    //   tableData.value = []
+    //   tableLoaded.value = true
+    //   totalCtnall.value = ''
+    //   totalPkgs.value = 0
+    //   totalKgs.value = 0
+    //   totalCbm.value = 0
+    // }
+    // const obj = {}
+    // // this.$options.filters['dictData']('BookingLockCtn').forEach((item) => {
+    // //   obj[item.code] = true
+    // // })
+    // BookingLockCtn.value = obj
+  }
+  function log({ data, selectionRangeIndexes, selectionRangeKeys }) {
+    console.log('data::', data)
+    console.log('selectionRangeIndexes::', selectionRangeIndexes)
+    console.log('selectionRangeKeys::', selectionRangeKeys)
+  }
+  function addboxLine() {
+    const data = {
+      ctnall: '',
+      ctnnum: '1',
+      cntrno: '',
+      sealno: '',
+      pkgs: '',
+      kindpkgs: tableData.value.length > 0 ? tableData.value[0].kindpkgs : '',
+      kgs: '',
+      cbm: '',
+      tareweight: '',
+      weightype: '累加',
+      weighkgs: '',
+      weighdate: '',
+      rowKey:
+        tableData.value.length > 0
+          ? Number(tableData.value[tableData.value.length - 1].rowKey) + 1
+          : 0,
+    }
+    tableData.value.push(data)
+  }
+  function removeLine() {
+    selectArr.value.map((item, index) => {
+      tableData.value.map((oitem: any, oindex) => {
+        if (item === oitem.rowKey) {
+          tableData.value.splice(oindex, 1)
+        }
+      })
+    })
+    let kgs = 0
+    tableData.value.map((item: any, index) => {
+      kgs += Number(item.kgs)
+    })
+    totalKgs.value = kgs
 
-              if (!/(^[1-9]\d*$)/.test((sunData.kgs * 100000) / num)) {
-                if (i !== num - 1) {
-                  const averagekgs = (sunData.kgs * 100000) / num + ''
-                  const cNum = averagekgs.indexOf('.')
-                  sunData.kgs = Number(averagekgs.substr(0, cNum)) / 100000
-                  surpluskgs = surpluskgs - Number(averagekgs.substr(0, cNum))
-                } else {
-                  sunData.kgs = surpluskgs / 100000
-                }
-              } else {
-                sunData.kgs = (sunData.kgs * 100000) / num / 100000
-              }
+    let cbm = 0
+    tableData.value.map((item: any, index) => {
+      cbm += Number(item.cbm)
+    })
+    totalCbm.value = cbm
 
-              if (!/(^[1-9]\d*$)/.test((sunData.cbm * 100000) / num)) {
-                if (i !== num - 1) {
-                  const averagecbm = (sunData.cbm * 100000) / num + ''
-                  const cNum = averagecbm.indexOf('.')
-                  sunData.cbm = Number(averagecbm.substr(0, cNum)) / 100000
-                  surpluscbm = surpluscbm - Number(averagecbm.substr(0, cNum))
-                } else {
-                  sunData.cbm = surpluscbm / 100000
-                }
-              } else {
-                sunData.cbm = (sunData.cbm * 100000) / num / 100000
-              }
-              if (sunData.weightype === '累加') {
-                sunData['weighkgs'] = this.calc(
-                  Number(sunData['kgs']),
-                  Number(sunData['tareweight']),
-                  '+',
-                )
-              }
-              arr.push(sunData)
+    let pkgs = 0
+    tableData.value.map((item: any, index) => {
+      pkgs += Number(item.pkgs)
+    })
+    totalPkgs.value = pkgs
+    checkboxOption.value.selectedRowKeys = []
+    selectArr.value = []
+    tableData.value.forEach((item: any, index) => {
+      item.rowKey = index
+    })
+  }
+  function changeSelectedRowKeys(keys) {
+    selectArr.value = keys
+    checkboxOption.value.selectedRowKeys = keys
+  }
+  function openDialog() {
+    if (tableData.value.length === 0) {
+      return false
+    }
+    moreVisible.value = true
+  }
+  function importYarn() {
+    if (!id.value) {
+      notification.error({ message: '请先保存订舱信息', duration: 3 })
+      return false
+    }
+    YarnLoading.value = true
+    GetYardData({
+      bookingId: id.value,
+      isWeb: false,
+    })
+      .then((res) => {
+        if (res.success) {
+          const data = JSON.parse(res.data)
+          const addTable: any[] = []
+          const kindpkgsOld = tableData.value[0] ? tableData.value[0].kindpkgs : ''
+          tableData.value = []
+          const lastNum =
+            tableData.value.length > 0
+              ? Number(tableData.value[tableData.value.length - 1].rowKey) + 1
+              : 0
+          data.map((item, index) => {
+            const _data = {
+              rowKey: lastNum + index,
+              ctnall: item.CTNALL,
+              ctnnum: '1',
+              cntrno: item.CNTRNO,
+              sealno: item.SEALNO,
+              ctncode: item.CtnCode,
+              pkgs: item.PKGS,
+              kindpkgs: kindpkgsOld || item.KINDPKGS,
+              kgs: item.KGS,
+              cbm: item.CBM,
+              tareweight: item.TAREWEIGHT,
+              weightype: '',
+              weighkgs: '',
+              weighdate: item.WEIGHDATE,
             }
-          } else {
-            item.rowKey = key
-            key++
-            arr.push(item)
-          }
-        })
-        this.tableData = arr
-      },
-      openDialog() {
-        if (this.tableData.length === 0) {
-          return false
-        }
-        this.moreVisible = true
-      },
-      handleModelSubmit() {},
-      handleModelCancel() {
-        this.moreVisible = false
-      },
-      addChildData() {
-        if (!this.childModelSelect) {
-          this.$message.error('请选择数据')
-          return false
-        }
-        let $pkgs = 0
-        let $kgs = 0
-        let $cbm = 0
-        this.childTableData.map((item, index) => {
-          $pkgs += Number(item.pkgs)
-          $kgs += Number(item.kgs)
-          $cbm += Number(item.cbm)
-        })
-        const data = {
-          rowKey:
-            this.childTableData.length > 0
-              ? Number(this.childTableData[this.childTableData.length - 1].rowKey) + 1
-              : 0,
-          pkgs:
-            Number(this.childModelSelect.pkgs) - $pkgs > 0
-              ? Number(this.childModelSelect.pkgs) - $pkgs
-              : 0,
-          kindpkgs: '',
-          kgs:
-            Number(this.childModelSelect.kgs) - $kgs > 0
-              ? Number(this.childModelSelect.kgs) - $kgs
-              : 0,
-          cbm:
-            Number(this.childModelSelect.cbm) - $cbm > 0
-              ? Number(this.childModelSelect.cbm) - $cbm
-              : 0,
-          hscode: this.details.hscode,
-          marks: this.details.marks,
-          description: this.details.description,
+            addTable.push(_data)
+          })
+
+          tableData.value = [...tableData.value, ...addTable]
+          console.log(tableData.value)
+          that.$forceUpdate()
+        } else {
+          notification.error({ message: res.message, duration: 3 })
         }
-        this.childTableData.push(data)
-      },
-      changeEmit1(arr) {
-        this.$emit('changectnall', arr)
-      },
-      removeChildData() {
-        this.selectChildArr.map((item, index) => {
-          this.childTableData.map((oitem, oindex) => {
-            if (item === oitem.rowKey) {
-              this.childTableData.splice(oindex, 1)
+        YarnLoading.value = false
+      })
+      .catch((err) => {
+        console.log(err)
+        YarnLoading.value = false
+      })
+  }
+  function importsealno() {
+    sealnoLoading.value = true
+    GetYardData({
+      bookingId: id.value,
+      isWeb: false,
+    })
+      .then((res) => {
+        if (res.success) {
+          let type = true
+          tableData.value.forEach((item) => {
+            if (item.sealno || item.cntrno) {
+              notification.error({ message: '请清空所有箱封号后再引入', duration: 3 })
+              type = false
             }
           })
-        })
-      },
-      saveChildData() {
-        if (!this.childModelSelect) {
-          this.$message.error('请选择数据')
-          return false
-        }
-        let $pkgs = 0
-        let $kgs = 0
-        let $cbm = 0
-        this.childTableData.map((item, index) => {
-          $pkgs += Number(item.pkgs)
-          $kgs += Number(item.kgs)
-          $cbm += Number(item.cbm)
-        })
-        if (Number(this.childModelSelect.pkgs) < $pkgs) {
-          this.$message.error('件数输入错误')
-          return false
-        }
-        if (Number(this.childModelSelect.kgs) < $kgs) {
-          this.$message.error('毛重输入错误')
-          return false
-        }
-        if (Number(this.childModelSelect.cbm) < $cbm) {
-          this.$message.error('尺码输入错误')
-          return false
-        }
-        this.details.ctnInputs[this.childModelSelectIndex].ctnDetailInputs = this.childTableData
-        this.$message.success('已保存')
-      },
-      importsealno() {
-        this.sealnoLoading = true
-        GetYardData({
-          bookingId: this.id,
-          isWeb: false,
-        })
-          .then((res) => {
-            if (res.success) {
-              let type = true
-              this.tableData.forEach((item) => {
-                if (item.sealno || item.cntrno) {
-                  this.$message.error('请清空所有箱封号后再引入')
-                  type = false
-                }
+          if (type) {
+            const data = JSON.parse(res.data)
+            if (data.length == tableData.value.length) {
+              data.forEach((item, index) => {
+                tableData.value[index].sealno = item.SEALNO
+                tableData.value[index].cntrno = item.CNTRNO
+                tableData.value[index].ctnnum = 1
               })
-              if (type) {
-                const data = JSON.parse(res.data)
-                if (data.length == this.tableData.length) {
-                  data.forEach((item, index) => {
-                    this.tableData[index].sealno = item.SEALNO
-                    this.tableData[index].cntrno = item.CNTRNO
-                    this.tableData[index].ctnnum = 1
+              const map = {}
+              const dest: any[] = []
+              for (var i = 0; i < tableData.value.length; i++) {
+                var ai = tableData.value[i]
+                if (!map[ai.ctnall]) {
+                  dest.push({
+                    ctnall: ai.ctnall,
+                    ctnnum: ai.ctnnum,
                   })
-                  const map = {}
-                  const dest = []
-                  for (var i = 0; i < this.tableData.length; i++) {
-                    var ai = this.tableData[i]
-                    if (!map[ai.ctnall]) {
-                      dest.push({
-                        ctnall: ai.ctnall,
-                        ctnnum: ai.ctnnum,
-                      })
-                      map[ai.ctnall] = ai
-                    } else {
-                      for (var j = 0; j < dest.length; j++) {
-                        var dj = dest[j]
-                        if (dj.ctnall == ai.ctnall) {
-                          dj.ctnnum = (parseFloat(dj.ctnnum) + parseFloat(ai.ctnnum)).toString()
-                          break
-                        }
-                      }
+                  map[ai.ctnall] = ai
+                } else {
+                  for (var j = 0; j < dest.length; j++) {
+                    var dj = dest[j]
+                    if (dj.ctnall == ai.ctnall) {
+                      dj.ctnnum = (parseFloat(dj.ctnnum) + parseFloat(ai.ctnnum)).toString()
+                      break
                     }
                   }
-                  this.changeEmit1(dest)
-                } else {
-                  this.$message.error('箱量与场站不一致')
                 }
               }
+              changeEmit1(dest)
             } else {
-              this.$message.error(res.message)
+              notification.error({ message: '箱量与场站不一致', duration: 3 })
             }
-            this.sealnoLoading = false
-          })
-          .catch((err) => {
-            console.log(err)
-            this.sealnoLoading = false
-          })
-      },
-      importYarn() {
-        if (!this.id) {
-          this.$message.error('请先保存订舱信息')
-          return false
+          }
+        } else {
+          notification.error({ message: res.message, duration: 3 })
         }
-        this.YarnLoading = true
-        GetYardData({
-          bookingId: this.id,
-          isWeb: false,
-        })
-          .then((res) => {
-            if (res.success) {
-              const data = JSON.parse(res.data)
-              const addTable = []
-              const cntrnoArr = []
-              const kindpkgsOld = this.tableData[0] ? this.tableData[0].kindpkgs : ''
-              this.tableData = []
-              const lastNum =
-                this.tableData.length > 0
-                  ? Number(this.tableData[this.tableData.length - 1].rowKey) + 1
-                  : 0
-              data.map((item, index) => {
-                const _data = {
-                  rowKey: lastNum + index,
-                  ctnall: item.CTNALL,
-                  ctnnum: '1',
-                  cntrno: item.CNTRNO,
-                  sealno: item.SEALNO,
-                  ctncode: item.CtnCode,
-                  pkgs: item.PKGS,
-                  kindpkgs: kindpkgsOld || item.KINDPKGS,
-                  kgs: item.KGS,
-                  cbm: item.CBM,
-                  tareweight: item.TAREWEIGHT,
-                  weightype: '',
-                  weighkgs: '',
-                  weighdate: item.WEIGHDATE,
-                }
-                addTable.push(_data)
-              })
-
-              this.tableData = [...this.tableData, ...addTable]
-              console.log(this.tableData)
-              this.$forceUpdate()
+        sealnoLoading.value = false
+      })
+      .catch((err) => {
+        console.log(err)
+        sealnoLoading.value = false
+      })
+  }
+  function changeEmit1(arr) {
+    emit('changectnall', arr)
+  }
+  function importWeight() {
+    if (!id.value) {
+      notification.error({ message: '请先保存订舱信息', duration: 3 })
+      return false
+    }
+    WeightLoading.value = true
+    GetYardData({
+      bookingId: id.value,
+      isWeb: false,
+    })
+      .then((res) => {
+        if (res.success) {
+          const data = JSON.parse(res.data)
+          const addTable: any[] = []
+          const cntrnoArr: any[] = []
+          console.log(data)
+          tableData.value.map((item: any, index) => {
+            if (!item.cntrno) {
+              // delete tableData.value[index]
+              tableData.value.splice(index, 1)
             } else {
-              this.$message.error(res.message)
+              cntrnoArr.push(item.cntrno)
             }
-            this.YarnLoading = false
-          })
-          .catch((err) => {
-            console.log(err)
-            this.YarnLoading = false
           })
-      },
-      arrowsWeight() {
-        console.log(`选中${this.selectArr}`)
-        if (this.selectArr.length != 1) {
-          this.$message.error('请选择一条数据')
-        } else {
-          console.log(this.tableData, this.selectArr[0])
-          console.log(this.tableData[this.selectArr[0]])
-          if (this.tableData[this.selectArr[0]].ctnnum > 1) {
-            console.log(
-              parseFloat(this.tableData[this.selectArr[0]].ctnnum),
-              parseFloat(this.tableData[this.selectArr[0]].pkgs),
-            )
-            if (
-              parseFloat(this.tableData[this.selectArr[0]].ctnnum) <=
-                parseFloat(this.tableData[this.selectArr[0]].pkgs) ||
-              !this.tableData[this.selectArr[0]].pkgs
-            ) {
-              const tableData = this.tableData
-              const data = []
-              let num = 0
-              let totalPkgs = 0
-              let totalKgs = 0
-              let totalCbm = 0
-              tableData.forEach((item, index) => {
-                parseFloat(item.pkgs) ? (totalPkgs = totalPkgs + parseFloat(item.pkgs)) : ''
-                parseFloat(item.kgs) ? (totalKgs = totalKgs + parseFloat(item.kgs)) : ''
-                parseFloat(item.cbm) ? (totalCbm = totalCbm + parseFloat(item.cbm)) : ''
-                if (index == this.selectArr[0]) {
-                  for (let index = 0; index < item.ctnnum; index++) {
-                    let pkgs = 0
-                    let kgs = 0
-                    let cbm = 0
-                    if (index == item.ctnnum - 1) {
-                      pkgs =
-                        parseInt(item.pkgs / item.ctnnum) +
-                        parseInt(item.pkgs) -
-                        parseInt(parseInt(item.pkgs / item.ctnnum) * item.ctnnum)
-                      kgs = (
-                        parseFloat((item.kgs / item.ctnnum).toFixed(2)) +
-                        parseFloat(item.kgs) -
-                        parseFloat(parseFloat((item.kgs / item.ctnnum).toFixed(2)) * item.ctnnum)
-                      ).toFixed(2)
-                      cbm = (
-                        parseFloat((item.cbm / item.ctnnum).toFixed(2)) +
-                        parseFloat(item.cbm) -
-                        parseFloat(parseFloat((item.cbm / item.ctnnum).toFixed(2)) * item.ctnnum)
-                      ).toFixed(2)
-                    } else {
-                      pkgs = parseInt(item.pkgs / item.ctnnum)
-                      kgs = parseFloat((item.kgs / item.ctnnum).toFixed(2))
-                      cbm = parseFloat((item.cbm / item.ctnnum).toFixed(2))
-                    }
-                    num = num + 1
-                    data.push({
-                      ...item,
-                      ctnnum: 1,
-                      rowKey: num,
-                      id: '',
-                      pkgs: pkgs,
-                      kgs: kgs,
-                      cbm: cbm,
-                    })
-                  }
-                } else {
-                  num = num + 1
-                  data.push({ ...item, rowKey: num })
-                }
-              })
-              this.totalPkgs = totalPkgs
-              this.totalKgs = totalKgs.toFixed(2)
-              this.totalCbm = totalCbm.toFixed(2)
-              data.forEach((item) => {
-                if (!this.tableData[this.selectArr[0]].pkgs) {
-                  item.pkgs = ''
-                }
-                if (!this.tableData[this.selectArr[0]].kgs) {
-                  item.kgs = ''
-                }
-                if (!this.tableData[this.selectArr[0]].cbm) {
-                  item.cbm = ''
-                }
-              })
-              this.tableData = data
-              this.$forceUpdate()
+          for (let i = tableData.value.length - 1; i >= 0; i--) {
+            if (!tableData.value[i].cntrno) {
+              tableData.value.splice(i, 1)
             } else {
-              this.$message.error('所选数据的件数应大于等于箱量')
+              cntrnoArr.push(tableData.value[i].cntrno)
             }
-          } else {
-            this.$message.error('所选数据的箱量应大于1')
           }
-        }
-      },
-      importWeight() {
-        if (!this.id) {
-          this.$message.error('请先保存订舱信息')
-          return false
-        }
-        this.WeightLoading = true
-        GetYardData({
-          bookingId: this.id,
-          isWeb: false,
-        })
-          .then((res) => {
-            if (res.success) {
-              const data = JSON.parse(res.data)
-              const addTable = []
-              const cntrnoArr = []
-              console.log(data)
-              this.tableData.map((item, index) => {
-                if (!item.cntrno) {
-                  // delete this.tableData[index]
-                  this.tableData.splice(index, 1)
-                } else {
-                  cntrnoArr.push(item.cntrno)
-                }
-              })
-              for (let i = this.tableData.length - 1; i >= 0; i--) {
-                if (!this.tableData[i].cntrno) {
-                  this.tableData.splice(i, 1)
-                } else {
-                  cntrnoArr.push(this.tableData[i].cntrno)
-                }
+          const lastNum =
+            tableData.value.length > 0
+              ? Number(tableData.value[tableData.value.length - 1].rowKey) + 1
+              : 0
+          data.map((item, index) => {
+            if (cntrnoArr.includes(item.CNTRNO)) {
+              const setWeighkgs = calc(
+                Number(tableData.value[cntrnoArr.indexOf(item.CNTRNO)].kgs),
+                Number(item.TAREWEIGHT),
+                '+',
+              )
+              tableData.value[cntrnoArr.indexOf(item.CNTRNO)] = {
+                rowKey: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].rowKey,
+                ctnall: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].ctnall,
+                ctnnum: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].ctnnum,
+                cntrno: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].cntrno,
+                sealno: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].sealno,
+                pkgs: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].pkgs,
+                kindpkgs: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].kindpkgs,
+                kgs: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].kgs,
+                cbm: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].cbm,
+                tareweight: item.TAREWEIGHT,
+                weightype: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].weightype,
+                weighkgs: setWeighkgs,
+                weighdate: tableData.value[cntrnoArr.indexOf(item.CNTRNO)].weighdate,
               }
-              const lastNum =
-                this.tableData.length > 0
-                  ? Number(this.tableData[this.tableData.length - 1].rowKey) + 1
-                  : 0
-              data.map((item, index) => {
-                if (cntrnoArr.includes(item.CNTRNO)) {
-                  const setWeighkgs = this.calc(
-                    Number(this.tableData[cntrnoArr.indexOf(item.CNTRNO)].kgs),
-                    Number(item.TAREWEIGHT),
-                    '+',
-                  )
-                  this.tableData[cntrnoArr.indexOf(item.CNTRNO)] = {
-                    rowKey: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].rowKey,
-                    ctnall: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].ctnall,
-                    ctnnum: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].ctnnum,
-                    cntrno: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].cntrno,
-                    sealno: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].sealno,
-                    pkgs: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].pkgs,
-                    kindpkgs: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].kindpkgs,
-                    kgs: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].kgs,
-                    cbm: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].cbm,
-                    tareweight: item.TAREWEIGHT,
-                    weightype: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].weightype,
-                    weighkgs: setWeighkgs,
-                    weighdate: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].weighdate,
-                  }
-                } else {
-                  const _data = {
-                    rowKey: lastNum + index,
-                    ctnall: '',
-                    ctnnum: '1',
-                    cntrno: '',
-                    sealno: '',
-                    pkgs: '',
-                    kindpkgs: '',
-                    kgs: '',
-                    cbm: '',
-                    tareweight: item.TAREWEIGHT,
-                    weightype: '',
-                    weighkgs: '',
-                    weighdate: '',
-                  }
-                  addTable.push(_data)
-                }
-              })
-              console.log(this.tableData, addTable)
-              this.tableData = [...this.tableData, ...addTable]
-              this.$forceUpdate()
             } else {
-              this.$message.error(res.message)
+              const _data = {
+                rowKey: lastNum + index,
+                ctnall: '',
+                ctnnum: '1',
+                cntrno: '',
+                sealno: '',
+                pkgs: '',
+                kindpkgs: '',
+                kgs: '',
+                cbm: '',
+                tareweight: item.TAREWEIGHT,
+                weightype: '',
+                weighkgs: '',
+                weighdate: '',
+              }
+              addTable.push(_data)
             }
-            this.WeightLoading = false
           })
-          .catch((err) => {
-            console.log(err)
-            this.WeightLoading = false
-          })
-      },
-      log({ data, selectionRangeIndexes, selectionRangeKeys }) {
-        // console.log('data::', data)
-        // console.log('selectionRangeIndexes::', selectionRangeIndexes)
-        // console.log('selectionRangeKeys::', selectionRangeKeys)
-      },
-      calc(num1, num2, calcStr) {
-        var str1 // 转换为字符串的数字
-        var str2
-        var ws1 = 0 // ws1，ws2 用来存储传入的num的小数点后的数字的位数
-        var ws2 = 0 // 赋默认值，解决当整数和小数运算时倍数计算错误导致的结果误差
-        var bigger // bigger和smaller用于加，减，除法找出小的那个数字，给后面补0，解决位数不对从而造成的计算错误的问题；乘法需要将结果除两个数字的倍数之和
-        var smaller // 例如：加减除法中1.001 + 2.03 ，如果不给2.03进行补0，最后会变成1001+203，数字错位导致结果错误；乘法中1.12*1.1会放大为112*11，所以结果需要除以1000才会是正确的结果，112*11/1000=1.232
-        var zeroCount // 需要补充0的个数
-        var isExistDot1 // 传入的数字是否存在小数点
-        var isExistDot2
-        var sum
-        var beishu = 1
-        // 将数字转换为字符串
-        str1 = num1.toString()
-        str2 = num2.toString()
-        // 是否存在小数点（判断需要计算的数字是不是包含小数）
-        isExistDot1 = str1.indexOf('.') != -1
-        isExistDot2 = str2.indexOf('.') != -1
-        // 取小数点后面的位数
-        if (isExistDot1) {
-          ws1 = str1.split('.')[1].length
+          console.log(tableData.value, addTable)
+          tableData.value = [...tableData.value, ...addTable]
+          that.$forceUpdate()
+        } else {
+          notification.error({ message: res.message, duration: 3 })
         }
+        WeightLoading.value = false
+      })
+      .catch((err) => {
+        console.log(err)
+        WeightLoading.value = false
+      })
+  }
+  function calc(num1, num2, calcStr) {
+    var str1 // 转换为字符串的数字
+    var str2
+    var ws1 = 0 // ws1，ws2 用来存储传入的num的小数点后的数字的位数
+    var ws2 = 0 // 赋默认值，解决当整数和小数运算时倍数计算错误导致的结果误差
+    var bigger // bigger和smaller用于加，减，除法找出小的那个数字，给后面补0，解决位数不对从而造成的计算错误的问题；乘法需要将结果除两个数字的倍数之和
+    var smaller // 例如：加减除法中1.001 + 2.03 ，如果不给2.03进行补0，最后会变成1001+203，数字错位导致结果错误；乘法中1.12*1.1会放大为112*11，所以结果需要除以1000才会是正确的结果，112*11/1000=1.232
+    var zeroCount // 需要补充0的个数
+    var isExistDot1 // 传入的数字是否存在小数点
+    var isExistDot2
+    var sum
+    var beishu = 1
+    // 将数字转换为字符串
+    str1 = num1.toString()
+    str2 = num2.toString()
+    // 是否存在小数点（判断需要计算的数字是不是包含小数）
+    isExistDot1 = str1.indexOf('.') != -1
+    isExistDot2 = str2.indexOf('.') != -1
+    // 取小数点后面的位数
+    if (isExistDot1) {
+      ws1 = str1.split('.')[1].length
+    }
 
-        if (isExistDot2) {
-          ws2 = str2.split('.')[1].length
-        }
-        // 如ws1 和 ws2 无默认值，如果num1 或 num2 不是小数的话则 ws1 或 ws2 的值将为 undefined
-        // bigger 和 smaller 的值会和预期不符
-        bigger = ws1 > ws2 ? ws1 : ws2
-        smaller = ws1 < ws2 ? ws1 : ws2
+    if (isExistDot2) {
+      ws2 = str2.split('.')[1].length
+    }
+    // 如ws1 和 ws2 无默认值，如果num1 或 num2 不是小数的话则 ws1 或 ws2 的值将为 undefined
+    // bigger 和 smaller 的值会和预期不符
+    bigger = ws1 > ws2 ? ws1 : ws2
+    smaller = ws1 < ws2 ? ws1 : ws2
 
-        switch (calcStr) {
-          // 加减法找出小的那个数字，给后面补0，解决位数不对从而造成的计算错误的问题
-          // 例如：1.001 + 2.03 ，如果不给2.03进行补0，最后会变成1001+203，数字错位导致结果错误
-          case '+':
-          case '-':
-          case '/':
-            zeroCount = bigger - smaller
-            for (var i = 0; i < zeroCount; i++) {
-              if (ws1 == smaller) {
-                str1 += '0'
-              } else {
-                str2 += '0'
-              }
-            }
-            break
-          case '*':
-            // 乘法需要将结果除两个数字的倍数之和
-            bigger = bigger + smaller
-            break
-          default:
-            return '暂不支持的计算类型，现已支持的有加法、减法、乘法、除法'
-            break
+    switch (calcStr) {
+      // 加减法找出小的那个数字，给后面补0，解决位数不对从而造成的计算错误的问题
+      // 例如：1.001 + 2.03 ，如果不给2.03进行补0，最后会变成1001+203，数字错位导致结果错误
+      case '+':
+      case '-':
+      case '/':
+        zeroCount = bigger - smaller
+        for (var i = 0; i < zeroCount; i++) {
+          if (ws1 == smaller) {
+            str1 += '0'
+          } else {
+            str2 += '0'
+          }
         }
+        break
+      case '*':
+        // 乘法需要将结果除两个数字的倍数之和
+        bigger = bigger + smaller
+        break
+      default:
+        return '暂不支持的计算类型，现已支持的有加法、减法、乘法、除法'
+        break
+    }
 
-        // 去除数字中的小数点
-        str1 = str1.replace('.', '')
-        str2 = str2.replace('.', '')
+    // 去除数字中的小数点
+    str1 = str1.replace('.', '')
+    str2 = str2.replace('.', '')
 
-        // 计算倍数，例如：1.001小数点后有三位，则需要乘 1000 变成 1001，变成整数后精度丢失问题则不会存在
-        for (var i = 0; i < bigger; i++) {
-          beishu *= 10 // 等价于beishu = beishu * 10;
-        }
-        num1 = parseInt(str1)
-        num2 = parseInt(str2)
-        // 进行最终计算并除相应倍数
-        switch (calcStr) {
-          case '+':
-            sum = (num1 + num2) / beishu
-            break
-          case '-':
-            sum = (num1 - num2) / beishu
-            break
-          case '*':
-            sum = (num1 * num2) / beishu
-            break
-          case '/':
-            sum = num1 / num2
-            /* 除数与被除数同时放大一定倍数，不影响结果，
-      所以对数字进行放大对应倍数并进行补0操作后不用另对倍数做处理 */
-            break
-          default:
-            return '暂不支持的计算类型，现已支持的有加法、减法、乘法、除法'
-        }
+    // 计算倍数，例如：1.001小数点后有三位，则需要乘 1000 变成 1001，变成整数后精度丢失问题则不会存在
+    for (var i = 0; i < bigger; i++) {
+      beishu *= 10 // 等价于beishu = beishu * 10;
+    }
+    num1 = parseInt(str1)
+    num2 = parseInt(str2)
+    // 进行最终计算并除相应倍数
+    switch (calcStr) {
+      case '+':
+        sum = (num1 + num2) / beishu
+        break
+      case '-':
+        sum = (num1 - num2) / beishu
+        break
+      case '*':
+        sum = (num1 * num2) / beishu
+        break
+      case '/':
+        sum = num1 / num2
+        /* 除数与被除数同时放大一定倍数，不影响结果，
+        所以对数字进行放大对应倍数并进行补0操作后不用另对倍数做处理 */
+        break
+      default:
+        return '暂不支持的计算类型，现已支持的有加法、减法、乘法、除法'
+    }
 
-        return sum
-      },
-      checkCntrno(val) {
-        let str = ''
-        if (val.length !== 11) {
-          str = '箱号长度不符合规则'
-        } else if (val.split('')[3] !== 'U' && val.split('')[3] !== 'u') {
-          str = '输入的箱号不符合规则'
+    return sum
+  }
+  function arrowsWeight() {
+    if (selectArr.value.length != 1) {
+      notification.error({ message: '请选择一条数据', duration: 3 })
+    } else {
+      console.log(tableData.value, selectArr.value[0])
+      console.log(tableData.value[selectArr.value[0]])
+      if (tableData.value[selectArr.value[0]].ctnnum > 1) {
+        console.log(
+          parseFloat(tableData.value[selectArr.value[0]].ctnnum),
+          parseFloat(tableData.value[selectArr.value[0]].pkgs),
+        )
+        if (
+          parseFloat(tableData.value[selectArr.value[0]].ctnnum) <=
+            parseFloat(tableData.value[selectArr.value[0]].pkgs) ||
+          !tableData.value[selectArr.value[0]].pkgs
+        ) {
+          const DtableData = tableData.value
+          const data: any[] = []
+          let num = 0
+          let DtotalPkgs = 0
+          let DtotalKgs = 0
+          let DtotalCbm = 0
+          DtableData.forEach((item, index) => {
+            parseFloat(item.pkgs) ? (DtotalPkgs = totalPkgs + parseFloat(item.pkgs)) : ''
+            parseFloat(item.kgs) ? (DtotalKgs = totalKgs + parseFloat(item.kgs)) : ''
+            parseFloat(item.cbm) ? (DtotalCbm = totalCbm + parseFloat(item.cbm)) : ''
+            if (index == selectArr.value[0]) {
+              for (let index = 0; index < item.ctnnum; index++) {
+                let pkgs: any = 0
+                let kgs: any = 0
+                let cbm: any = 0
+                if (index == item.ctnnum - 1) {
+                  pkgs =
+                    parseInt(item.pkgs / item.ctnnum) +
+                    parseInt(item.pkgs) -
+                    parseInt(parseInt(item.pkgs / item.ctnnum) * item.ctnnum)
+                  kgs = (
+                    parseFloat((item.kgs / item.ctnnum).toFixed(2)) +
+                    parseFloat(item.kgs) -
+                    parseFloat(parseFloat((item.kgs / item.ctnnum).toFixed(2)) * item.ctnnum)
+                  ).toFixed(2)
+                  cbm = (
+                    parseFloat((item.cbm / item.ctnnum).toFixed(2)) +
+                    parseFloat(item.cbm) -
+                    parseFloat(parseFloat((item.cbm / item.ctnnum).toFixed(2)) * item.ctnnum)
+                  ).toFixed(2)
+                } else {
+                  pkgs = parseInt(item.pkgs / item.ctnnum)
+                  kgs = parseFloat((item.kgs / item.ctnnum).toFixed(2))
+                  cbm = parseFloat((item.cbm / item.ctnnum).toFixed(2))
+                }
+                num = num + 1
+                data.push({
+                  ...item,
+                  ctnnum: 1,
+                  rowKey: num,
+                  id: '',
+                  pkgs: pkgs,
+                  kgs: kgs,
+                  cbm: cbm,
+                })
+              }
+            } else {
+              num = num + 1
+              data.push({ ...item, rowKey: num })
+            }
+          })
+          totalPkgs.value = DtotalPkgs
+          totalKgs.value = DtotalKgs.toFixed(2)
+          totalCbm.value = DtotalCbm.toFixed(2)
+          data.forEach((item) => {
+            if (!tableData.value[selectArr.value[0]].pkgs) {
+              item.pkgs = ''
+            }
+            if (!tableData.value[selectArr.value[0]].kgs) {
+              item.kgs = ''
+            }
+            if (!tableData.value[selectArr.value[0]].cbm) {
+              item.cbm = ''
+            }
+          })
+          tableData.value = data
+          that.$forceUpdate()
+        } else {
+          notification.error({ message: '所选数据的件数应大于等于箱量', duration: 3 })
         }
-        val.split('').map((item, index) => {
-          if (index < 3 && !new RegExp(/^[a-zA-Z]+$/).test(item)) {
-            str = '输入的箱号不符合规则'
-          } else if (index > 4 && !new RegExp(/^[0-9]+$/).test(item)) {
-            str = '输入的箱号不符合规则'
-          }
-        })
-        return str
-      },
-    },
+      } else {
+        notification.error({ message: '所选数据的箱量应大于1', duration: 3 })
+      }
+    }
+  }
+  function handleRefsh() {
+    emit('handleRefshTable')
+  }
+  function handleOpen() {
+    comparisonFlag.value = true
+    yardAutoForm.value = props.details.autoYardImport
+    if (yardAutoForm.value.yardJson) {
+      yardAutoForm.value.yardTable = JSON.parse(yardAutoForm.value.yardJson)
+    }
+    if (yardAutoForm.value.ctnJson) {
+      yardAutoForm.value.ctnTable = JSON.parse(yardAutoForm.value.ctnJson)
+    }
+    ReadAutoYardImport({ bookId: route.query.id }).then(() => {})
+  }
+  function enmuErrorLabel(val) {
+    switch (val) {
+      case 'cntrno':
+        return '箱型'
+      case 'pkgs':
+        return '件数'
+      case 'kgs':
+        return '重量'
+      case 'cbm':
+        return '尺码'
+      case 'tareweight':
+        return '箱皮重'
+      default:
+        return '内容'
+    }
+  }
+  function checkCntrno(val) {
+    let str = ''
+    if (val.length !== 11) {
+      str = '箱号长度不符合规则'
+    } else if (val.split('')[3] !== 'U' && val.split('')[3] !== 'u') {
+      str = '输入的箱号不符合规则'
+    }
+    val.split('').map((item, index) => {
+      if (index < 3 && !new RegExp(/^[a-zA-Z]+$/).test(item)) {
+        str = '输入的箱号不符合规则'
+      } else if (index > 4 && !new RegExp(/^[0-9]+$/).test(item)) {
+        str = '输入的箱号不符合规则'
+      }
+    })
+    return str
+  }
+  function handleModelCancel() {
+    moreVisible.value = false
+  }
+  function addChildData() {
+    if (!childModelSelect.value) {
+      notification.error({ message: '请选择数据', duration: 3 })
+      return false
+    }
+    let $pkgs = 0
+    let $kgs = 0
+    let $cbm = 0
+    childTableData.value.map((item: any, index) => {
+      $pkgs += Number(item.pkgs)
+      $kgs += Number(item.kgs)
+      $cbm += Number(item.cbm)
+    })
+    const data = {
+      rowKey:
+        childTableData.value.length > 0
+          ? Number(childTableData.value[childTableData.value.length - 1].rowKey) + 1
+          : 0,
+      pkgs:
+        Number(childModelSelect.value.pkgs) - $pkgs > 0
+          ? Number(childModelSelect.value.pkgs) - $pkgs
+          : 0,
+      kindpkgs: '',
+      kgs:
+        Number(childModelSelect.value.kgs) - $kgs > 0
+          ? Number(childModelSelect.value.kgs) - $kgs
+          : 0,
+      cbm:
+        Number(childModelSelect.value.cbm) - $cbm > 0
+          ? Number(childModelSelect.value.cbm) - $cbm
+          : 0,
+      hscode: props.details.hscode,
+      marks: props.details.marks,
+      description: props.details.description,
+    }
+    childTableData.value.push(data)
+  }
+  function removeChildData() {
+    selectChildArr.value.map((item, index) => {
+      childTableData.value.map((oitem: any, oindex) => {
+        if (item === oitem.rowKey) {
+          childTableData.value.splice(oindex, 1)
+        }
+      })
+    })
+  }
+  function saveChildData() {
+    if (!childModelSelect.value) {
+      notification.error({ message: '请选择数据', duration: 3 })
+      return false
+    }
+    let $pkgs = 0
+    let $kgs = 0
+    let $cbm = 0
+    childTableData.value.map((item: any, index) => {
+      $pkgs += Number(item.pkgs)
+      $kgs += Number(item.kgs)
+      $cbm += Number(item.cbm)
+    })
+    if (Number(childModelSelect.value.pkgs) < $pkgs) {
+      notification.error({ message: '件数输入错误', duration: 3 })
+      return false
+    }
+    if (Number(childModelSelect.value.kgs) < $kgs) {
+      notification.error({ message: '毛重输入错误', duration: 3 })
+      return false
+    }
+    if (Number(childModelSelect.value.cbm) < $cbm) {
+      notification.error({ message: '尺码输入错误', duration: 3 })
+      return false
+    }
+    props.details.ctnInputs[childModelSelectIndex.value].ctnDetailInputs = childTableData.value
+    notification.success({ message: '已保存', duration: 3 })
   }
 </script>
 <style lang="less" scoped>
diff --git a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/mailingInfo.vue b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/mailingInfo.vue
index cc45fe3e..349e3e61 100644
--- a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/mailingInfo.vue
+++ b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/mailingInfo.vue
@@ -1059,13 +1059,16 @@
   import textareaView from '../components/textareaView.vue'
   import selectView from '../components/selectView.vue'
   import datePickerView from '../components/datePickerView.vue'
+  import { useRoute } from 'vue-router'
+  const route = useRoute()
   const props = defineProps({
     details: { type: Object, default: {} },
     rules: { type: Object, default: {} },
     isLockBooking: { type: Boolean, default: false },
     ishd: { type: Boolean, default: false },
+    inSave: { type: Boolean, default: false },
   })
-  const emit = defineEmits(['pkgsEnCapital', 'editLineName', 'spliceMore'])
+  const emit = defineEmits(['pkgsEnCapital', 'editLineName', 'spliceMore', 'changeDetail'])
   let { ctx: that, proxy }: any = getCurrentInstance()
   const showKey = ref(['1'])
   const visible = ref(false)
@@ -1107,6 +1110,62 @@
   const yardType = ref('')
   const yardVisible = ref(false)
   const visibleJW = ref(false)
+  const id = ref()
+  const shippernameInput = ref()
+  const consigneenameInput = ref()
+  const notifypartynameInput = ref()
+  watch(
+    () => props.details,
+    (nval) => {
+      if (!props.details.notifypartY2) {
+        props.details.notifypartY2 = ''
+      }
+      if (!props.inSave) {
+        emit('changeDetail', {
+          detail: nval,
+          type: 'mailingInfo',
+        })
+      }
+    },
+    { deep: true },
+  )
+  watch(
+    () => route.query,
+    () => {
+      id.value = route.query.id
+      if (route.name === 'BookingDetail' && Object.keys(that.$refs).includes('shippernameInput')) {
+        shippernameInput.value.$data.value = ''
+        consigneenameInput.value.$data.value = ''
+        notifypartynameInput.value.$data.value = ''
+      }
+    },
+    { immediate: true },
+  )
+  onMounted(() => {
+    // const shipperScroll = document.getElementById('shipper-scroll')
+    // if (shipperScroll) {
+    //   shipperScroll.addEventListener('scroll', () => {
+    //     document.getElementById('shipper-scroll-right').scrollTop = shipperScroll.scrollTop
+    //   })
+    // }
+    // const consigneeScroll = document.getElementById('consignee-scroll')
+    // consigneeScroll.addEventListener('scroll', () => {
+    //   document.getElementById('consignee-scroll-right').scrollTop = consigneeScroll.scrollTop
+    // })
+    // const notifypartyScroll = document.getElementById('notifyparty-scroll')
+    // notifypartyScroll.addEventListener('scroll', () => {
+    //   document.getElementById('notifyparty-scroll-right').scrollTop = notifypartyScroll.scrollTop
+    // })
+    // const obj = {}
+    //   this.$options.filters['dictData']('BookingLockOrder').forEach(item => {
+    //     obj[item.code] = true
+    //   })
+    // this.BookingLockOrder = obj
+
+    setTimeout(() => {
+      changePkgs()
+    }, 2000)
+  })
   function tabStopFun() {
     return false
   }
diff --git a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/rightContent.vue b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/rightContent.vue
index 80c19faf..9bd45838 100644
--- a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/rightContent.vue
+++ b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/rightContent.vue
@@ -322,7 +322,7 @@
     </a-card>
     <a-collapse class="collapse-box" :bordered="false" expandIconPosition="right" v-model="showKey">
       <a-collapse-panel key="1">
-        <template slot="header">
+        <template #header>
           <div class="title"><i class="iconfont icon-rizhi"></i><span>日志</span></div>
         </template>
         <div class="cargo-info">
@@ -438,7 +438,6 @@
     >
       <a-textarea v-model="remarkVal" :auto-size="{ minRows: 5, maxRows: 7 }" />
     </a-modal>
-
     <a-modal
       title="添加附件"
       :width="900"
@@ -477,7 +476,6 @@
         </a-select>
       </div>
     </a-modal>
-
     <a-modal
       title="规则反馈需求"
       :width="1000"
@@ -556,7 +554,7 @@
           <a-date-picker valueFormat="YYYY-MM-DD HH:mm" show-time v-model="atdTime" />
         </div>
       </a-spin>
-      <template slot="footer">
+      <template #footer>
         <a-popconfirm
           title="确定修改吗"
           ok-text="确定"
@@ -569,7 +567,7 @@
     </a-modal>
   </div>
 </template>
-<script>
+<script lang="ts" setup>
   import {
     AddRemark,
     AddFile,
@@ -590,830 +588,586 @@
     SaveServiceStatus,
     CancelServiceStatus,
   } from '/@/views/operation/seaexport/api/BookingLedger'
+  import { ref, Ref, reactive, getCurrentInstance, h, watch, onMounted } from 'vue'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  const { notification } = useMessage()
   import { useAppStore } from '/@/store/modules/app'
   const appStore = useAppStore()
-  export default {
-    name: '',
-    props: {
-      details: {
-        type: Object,
-        default: () => {
-          return {}
-        },
-      },
-      excuteRules: {
-        type: Array,
-        default: () => {
-          return []
-        },
-      },
-      excuteRulesType: {
-        type: String,
-        default: () => {
-          return ''
-        },
-      },
-    },
-    data() {
-      return {
-        delayTime: 500,
-        roleFlag: false,
-        type: 2,
-        spinning: false,
-        ruleLog: [],
-        spinningRule: false,
-        StatusVisibleFlag: true,
-        goodStatusLoading: false,
-        id: this.id,
-        seriveLoading: false,
-        ruleForm: this.$form.createForm(this),
-        isCopy: this.$route.query.isCopy,
-        tstyle: { padding: '0 15px 15px', 'margin-bottom': '10px', background: '#fff' },
-        remarkModelvisible: false,
-        bookingModelconfirm: false,
-        remarkVal: '',
-        atdFlag: false,
-        showKey: [],
-        btnLoading: false,
-        fileModelvisible: false,
-        fileModelconfirm: false,
-        authorization: 'authorization-text',
-        file: {},
-        Cqtitle: '',
-        upFileList: [],
-        uploading: false,
-        realTimePercent: null,
-        CqType: 0,
-        bookingServiceItem: [],
-        atdLoading: false,
-        booGoodsStatusItem: [],
-        time: null,
-        bookingAttachType: [],
-        changeGoods: true,
-        attachName: '',
-        attachCode: '',
-        editRemarkVal: null,
-        GoodsStatusVisible: false,
-        atdTime: '',
-        GoodsStatusEditData: {},
-        StatusVisibleForm: this.$form.createForm(this),
-        roleData: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 8 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        labelCol2: {
-          xs: { span: 24 },
-          sm: { span: 4 },
-        },
-        wrapperCol2: {
-          xs: { span: 24 },
-          sm: { span: 20 },
-        },
+  import { useRoute, useRouter } from 'vue-router'
+  const router = useRouter()
+  const route = useRoute()
+  const props = defineProps({
+    details: { type: Object, default: {} },
+    excuteRules: { type: Array, default: [] },
+    excuteRulesType: { type: String, default: '' },
+  })
+  const emit = defineEmits([
+    'rules',
+    'bookingServiceItem',
+    'handleRefsh',
+    'upDateRight',
+    'fileNewUpadte',
+    'changeAtd',
+  ])
+  let { ctx: that, proxy }: any = getCurrentInstance()
+  const tstyle = ref({ padding: '0 15px 15px', 'margin-bottom': '10px', background: '#fff' })
+  const type = ref(2)
+  const spinningRule = ref(false)
+  const roleFlag = ref(false)
+  const roleData: Ref<any> = ref({})
+  const ruleLog: Ref<Array<any>> = ref([])
+  // const ruleForm = ref(this.$form.createForm(this))
+  const ruleForm = ref()
+  const id = ref()
+  const seriveLoading = ref(false)
+  const bookingServiceItem: Ref<Array<any>> = ref([])
+  const time: any = ref(null)
+  const spinning = ref(false)
+  const booGoodsStatusItem: Ref<Array<any>> = ref([])
+  const btnLoading = ref(false)
+  const atdFlag = ref(false)
+  const CqType = ref(0)
+  const Cqtitle = ref('')
+  const atdTime = ref('')
+  const delayTime = ref(500)
+  const changeGoods = ref(true)
+  const GoodsStatusEditData: Ref<any> = ref({})
+  const GoodsStatusVisible = ref(false)
+  // const StatusVisibleForm = ref(this.$form.createForm(this))
+  const StatusVisibleForm = ref()
+  const remarkModelvisible = ref(false)
+  const remarkVal = ref('')
+  const editRemarkVal: Ref<any> = ref(null)
+  const fileModelvisible = ref(false)
+  const pdfUrl = ref()
+  const showKey = ref([])
+  const goodStatusLoading = ref(false)
+  const labelCol = ref({
+    xs: { span: 24 },
+    sm: { span: 8 },
+  })
+  const wrapperCol = ref({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  })
+  const labelCol2 = ref({
+    xs: { span: 24 },
+    sm: { span: 4 },
+  })
+  const wrapperCol2 = ref({
+    xs: { span: 24 },
+    sm: { span: 20 },
+  })
+  const bookingModelconfirm = ref(false)
+  const uploading = ref(false)
+  const upFileList: Ref<Array<any>> = ref([])
+  const attachCode = ref('')
+  const attachName = ref('')
+  const bookingAttachType: Ref<Array<any>> = ref([])
+  const atdLoading = ref(false)
+
+  function handleOpenRule(rule, Dtype) {
+    type.value = Dtype
+    if (Dtype === 2) {
+      rule.ruleNotice = rule.resultName
+      spinningRule.value = true
+      roleFlag.value = true
+      roleData.value = rule
+      ruleLog.value = []
+      ruleForm.value.resetFields()
+      const data = {
+        ruleName: roleData.value.ruleName,
+        ruleNotice: roleData.value.ruleNotice,
       }
-    },
-    computed: {
-      locaService() {
-        if (!this.details || Object.keys(this.details).length === 0) {
-          return []
-        }
-        return this.details.item.map((item, index) => {
-          return item.code
-        })
-      },
-      locaGoodsStatus() {
-        if (!this.details) {
-          return []
-        }
-        if (this.details.goodsStatus) {
-          const data = []
-          this.details.goodsStatus.forEach((item) => {
-            if (item.setActDate || item.remark) {
-              data.push(item.configId)
-            }
-          })
-          return data
+      GetRuleOpinionLog(data).then((res) => {
+        if (res.data.succ) {
+          spinningRule.value = false
+          if (res.data.rows) {
+            ruleLog.value = res.data.rows
+          }
         } else {
-          return []
+          notification.error({ message: res.data.msg, duration: 3 })
+          spinningRule.value = false
         }
-      },
-    },
-    created() {
-      this.$bus.$on('WebTest001', (val) => {
-        this.WebTest001(val)
       })
-      // this.init()
-    },
-    watch: {
-      '$route.query': {
-        immediate: true,
-        handler(nD, oD) {
-          if (this.$route.name === 'BookingDetail') {
-            this.id = this.$route.query.id
-            setTimeout(() => {
-              this.init()
-            }, 200)
-          }
-        },
-      },
-    },
-    methods: {
-      handleCancel() {
-        this.roleFlag = false
-      },
-      handleOpenAtd(type) {
-        this.atdFlag = true
-        this.CqType = type
-        if (type === 1) {
-          this.Cqtitle = 'ETA'
-          this.atdTime = JSON.parse(JSON.stringify(this.details)).startETA
-        }
-        if (type === 2) {
-          this.Cqtitle = 'ATA'
-          this.atdTime = JSON.parse(JSON.stringify(this.details)).startATA
-        }
-        if (type === 3) {
-          this.Cqtitle = 'ETD'
-          this.atdTime = JSON.parse(JSON.stringify(this.details)).ygtETD
-        }
-        if (type === 4) {
-          this.Cqtitle = 'ATD'
-          this.atdTime = JSON.parse(JSON.stringify(this.details)).atd
-        }
-      },
-      handleSubimtAtd() {
-        const data = {
-          Id: this.details.id,
-        }
-        if (this.CqType === 1) {
-          data.startETA = this.atdTime
-        }
-        if (this.CqType === 2) {
-          data.startATA = this.atdTime
-        }
-        if (this.CqType === 3) {
-          data.ygtETD = this.atdTime
-        }
-        if (this.CqType === 4) {
-          data.atd = this.atdTime
-        }
-        this.atdLoading = true
-        SaveDataInList(data).then((res) => {
-          if (res.success) {
-            this.$message.success('修改成功')
-            this.$emit('changeAtd', this.atdTime, this.CqType)
-            appStore.setsaveNeedNumber(this.details.id)
-
-            this.atdFlag = false
+    } else {
+      roleFlag.value = true
+      roleData.value = rule
+      ruleLog.value = []
+      ruleForm.value.resetFields()
+    }
+  }
+  function checkFun() {
+    notification.open({ message: '校验中...', duration: 3 })
+    ExcuteRulesOceanBooking(id.value)
+      .then((res) => {
+        console.log(res)
+        if (res.success) {
+          notification.destroy()
+          if (res.data.rows && res.data.rows.length > 0) {
+            notification.error({ message: res.data.msg, duration: 3 })
           } else {
-            this.$message.error(res.message)
+            notification.error({ message: '校验完成', duration: 3 })
           }
-          this.atdLoading = false
-        })
-      },
-      handleOpenRule(rule, type) {
-        this.type = type
-        if (type === 2) {
-          rule.ruleNotice = rule.resultName
-          this.spinningRule = true
-          this.roleFlag = true
-          this.roleData = rule
-          this.ruleLog = []
-          this.ruleForm.resetFields()
-          const data = {
-            ruleName: this.roleData.ruleName,
-            ruleNotice: this.roleData.ruleNotice,
-          }
-          GetRuleOpinionLog(data).then((res) => {
-            if (res.data.succ) {
-              this.spinningRule = false
-              if (res.data.rows) {
-                this.ruleLog = res.data.rows
-              }
-            } else {
-              this.$message.error(res.data.msg)
-              this.spinningRule = false
-            }
+          emit('rules', {
+            rows: res.data.rows,
+            type: res.data.succ ? 'success' : 'fail',
           })
         } else {
-          this.roleFlag = true
-          this.roleData = rule
-          this.ruleLog = []
-          this.ruleForm.resetFields()
+          notification.error({ message: res.message, duration: 3 })
         }
-      },
-      handleRefsh() {
-        this.btnLoading = true
-        refreshSailingDate({ id: this.details.id }).then((res) => {
-          if (res.success) {
-            this.btnLoading = false
-            this.$emit('handleRefsh', res.data)
-          } else {
-            this.$message.error(res.message)
-            this.btnLoading = false
-          }
-        })
-      },
-      handleSubimtRole(e) {
-        e.preventDefault()
-        this.ruleForm.validateFields((err, values) => {
-          if (!err) {
-            this.roleFlag = true
-            const data = {
-              ruleName: this.roleData.ruleName,
-              ruleNotice: this.roleData.ruleNotice,
-              opinionType: this.type == 1 ? 'ADD' : 'MODIFY',
-              opinionContent: values.opinionContent,
-            }
-            SubmitRule0pinion(data).then((res) => {
-              if (res.data.succ) {
-                this.$message.success('提交成功')
-                this.roleFlag = false
-                this.roleFlag = false
-              } else {
-                this.$message.error(res.data.msg)
-                this.roleFlag = false
-              }
-            })
-          }
-        })
-      },
-      handleTime(time) {
-        let Rdata = '-'
-        if (time && time.split(':').length == 3) {
-          Rdata = `${time.split(':')[0]}:${time.split(':')[1]}`
+      })
+      .catch(() => {
+        notification.destroy()
+        notification.success({ message: '校验失败', duration: 3 })
+      })
+  }
+  function saveService(data) {
+    var date = new Date()
+    console.log(date.valueOf())
+    if (!id.value) {
+      notification.error({ message: '请先保存主单', duration: 3 })
+      return false
+    }
+    const obj = {
+      bookingId: route.query.id,
+      projectCodes: [data.projectCode],
+    }
+    if (!data.isYield) {
+      bookingServiceItem.value.forEach((item) => {
+        if (item.projectCode == data.projectCode) {
+          item.isYield = !item.isYield
         }
-        return Rdata
-      },
-      init() {
-        this.bookingAttachType = this.$options.filters['dictData']('booking_attach_type')
-        if (this.$route.query.id && !this.$route.query.isCopy) {
-          this.getServiceItemList(1)
-          this.getStatusServiceList(1)
+      })
+      SaveServiceProject(obj).then((res) => {
+        if (res.data.succ) {
+          if (time.value !== null) {
+            stopTimer()
+          }
+          time.value = setTimeout(() => {
+            spinning.value = true
+            getServiceItemList(2, data.projectCode)
+          }, 500)
         } else {
-          this.bookingServiceItem = []
-          this.booGoodsStatusItem = []
-        }
-      },
-      getStatusServiceList(type, code) {
-        const data = {
-          bookingId: this.$route.query.id,
-          queryType: 2,
+          notification.error({ message: res.message, duration: 3 })
+          spinning.value = false
+          getServiceItemList(1, null)
         }
-        if (type == 2) {
-          this.booGoodsStatusItem.forEach((item) => {
-            if (item.statusSKUCode == code) {
-              item.isYield = !item.isYield
-            }
-          })
+      })
+    } else {
+      bookingServiceItem.value.forEach((item) => {
+        if (item.projectCode == data.projectCode) {
+          item.isYield = !item.isYield
         }
-        this.spinning = true
-        GetServiceStatusList(data).then((res) => {
-          if (res.data.succ) {
-            // res.data.ext.forEach((item, index) => {
-            //   item.isBr = false
-            //   console.log(item.isBr, index)
-            //   if (item.isEnd) {
-            //     console.log(index)
-            //     res.data.ext.splice(index + 1, 0, { isBr: true })
-            //   }
-            // })
-            for (let i = 0; i < res.data.ext.length; i++) {
-              if (res.data.ext[i].isEnd) {
-                res.data.ext.splice(i + 1, 0, { isBr: true })
-              }
-            }
-            this.booGoodsStatusItem = res.data.ext
-          } else {
-            this.$message.error(res.data.msg)
-          }
-          this.spinning = false
-        })
-      },
-      getServiceItemList(type, code) {
-        if (type == 1) {
-          this.seriveLoading = true
-          const data = {
-            bookingId: this.$route.query.id,
-            queryType: 0,
+      })
+      CancelSeryiceProject(obj).then((res) => {
+        if (res.data.succ) {
+          if (time.value !== null) {
+            stopTimer()
           }
-          GetSeryiceProjectList(data).then((res) => {
-            if (res.data.succ) {
-              this.bookingServiceItem = res.data.ext
-              this.$bus.$emit('bookingServiceItem', res.data.ext)
-            } else {
-              this.$message.error(res.data.msg)
-            }
-            this.seriveLoading = false
-          })
+          time.value = setTimeout(() => {
+            spinning.value = true
+            getServiceItemList(2, data.projectCode)
+          }, 500)
         } else {
-          // this.bookingServiceItem.forEach(item => {
-          //   if (item.projectCode == code) {
-          //     item.isYield = !item.isYield
-          //   }
-          // })
-          this.spinning = true
-          this.getStatusServiceList(1)
+          notification.error({ message: res.message, duration: 3 })
+          spinning.value = false
+          getServiceItemList(1, null)
         }
-      },
-      checkFun() {
-        this.$message.loading({ content: '校验中...' })
-        ExcuteRulesOceanBooking(this.id)
-          .then((res) => {
-            console.log(res)
-            if (res.success) {
-              this.$message.destroy()
-              if (res.data.rows && res.data.rows.length > 0) {
-                this.$message.error(res.data.msg)
-              } else {
-                this.$message.success({ content: '校验完成' })
-              }
-              this.$emit('rules', {
-                rows: res.data.rows,
-                type: res.data.succ ? 'success' : 'fail',
-              })
-            } else {
-              this.$message.error(res.message)
-            }
-          })
-          .catch(() => {
-            this.$message.destroy()
-            this.$message.success({ content: '校验失败' })
-          })
-      },
-      addRemark() {
-        if (!this.id) {
-          this.$message.error('请先保存主单')
-          return false
-        }
-        this.remarkModelvisible = true
-        this.remarkVal = ''
-      },
-      handleModelSubmit() {
-        if (!this.id) {
-          this.$message.error('请先保存主单')
-          return false
-        }
-        AddRemark({
-          id: this.editRemarkVal ? this.editRemarkVal.id : 0,
-          pId: this.id,
-          remark: this.remarkVal,
-        })
-          .then((res) => {
-            if (res.success) {
-              this.$message.info('备注提交成功')
-              this.editRemarkVal = null
-              this.handleModelCancel()
-              this.$emit('upDateRight')
-            }
-          })
-          .catch((err) => {
-            console.log(err)
-          })
-      },
-      editRemark(data) {
-        this.remarkModelvisible = true
-        this.remarkVal = data.remark
-        this.editRemarkVal = data
-      },
-      deleteRemark(data) {
-        BookingOrderDeleteRemark(data.id).then((res) => {
-          this.$message.success('成功删除')
-          this.$emit('upDateRight')
-        })
-      },
-      handleModelCancel() {
-        this.remarkModelvisible = false
-        this.editRemarkVal = null
-      },
-
-      getFileType(val) {
-        if (val) {
-          return val.substr(val.lastIndexOf('.') + 1)
+      })
+    }
+  }
+  function stopTimer() {
+    window.clearTimeout(time.value)
+  }
+  function getServiceItemList(type, code) {
+    if (type == 1) {
+      seriveLoading.value = true
+      const data = {
+        bookingId: route.query.id,
+        queryType: 0,
+      }
+      GetSeryiceProjectList(data).then((res) => {
+        if (res.data.succ) {
+          bookingServiceItem.value = res.data.ext
+          // this.$bus.$emit('bookingServiceItem', res.data.ext)
+          emit('bookingServiceItem', res.data.ext)
         } else {
-          return ''
-        }
-      },
-      addFile() {
-        // if (!this.id) {
-        //   this.$message.error('请先保存主单')
-        //   return false
-        // }
-        this.fileModelvisible = true
-      },
-      fileModelCancel() {
-        this.upFileList = []
-        this.attachCode = ''
-        this.attachName = ''
-        this.fileModelvisible = false
-      },
-      handleRemove(file) {
-        const index = this.upFileList.indexOf(file)
-        const newFileList = this.upFileList.slice()
-        newFileList.splice(index, 1)
-        this.upFileList = newFileList
-      },
-      beforeUpload(file) {
-        if (this.upFileList.length > 1) {
-          return false
+          notification.error({ message: res.data.msg, duration: 3 })
         }
-        this.upFileList = [...this.upFileList, file]
-        return false
-      },
-      WebTest001(val) {
-        this.beforeUpload(val.upFileList)
-        this.attachCode = val.attachCode
-        this.attachName = val.attachName
-        this.handleUpload()
-      },
-      handleUpload() {
-        const { upFileList, attachCode, attachName } = this
-        if (upFileList.length === 0) {
-          this.$message.error('请上传文件')
-          return false
-        }
-        if (!attachCode || !attachName) {
-          this.$message.error('请选择附件类型')
-          return false
+        seriveLoading.value = false
+      })
+    } else {
+      spinning.value = true
+      getStatusServiceList(1, null)
+    }
+  }
+  function getStatusServiceList(type, code) {
+    const data = {
+      bookingId: route.query.id,
+      queryType: 2,
+    }
+    if (type == 2) {
+      booGoodsStatusItem.value.forEach((item: any) => {
+        if (item.statusSKUCode == code) {
+          item.isYield = !item.isYield
         }
-        let id = this.id
-        if (this.$route.query.isCopy) {
-          id = 0
+      })
+    }
+    spinning.value = true
+    GetServiceStatusList(data).then((res) => {
+      if (res.data.succ) {
+        for (let i = 0; i < res.data.ext.length; i++) {
+          if (res.data.ext[i].isEnd) {
+            res.data.ext.splice(i + 1, 0, { isBr: true })
+          }
         }
-        if (!this.id) {
-          id = 0
+        booGoodsStatusItem.value = res.data.ext
+      } else {
+        notification.error({ message: res.data.msg, duration: 3 })
+      }
+      spinning.value = false
+    })
+  }
+  function handleRefsh() {
+    btnLoading.value = true
+    refreshSailingDate({ id: props.details.id }).then((res) => {
+      if (res.success) {
+        btnLoading.value = false
+        emit('handleRefsh', res.data)
+      } else {
+        notification.error({ message: res.message, duration: 3 })
+        btnLoading.value = false
+      }
+    })
+  }
+  function handleOpenAtd(type) {
+    atdFlag.value = true
+    CqType.value = type
+    if (type === 1) {
+      Cqtitle.value = 'ETA'
+      atdTime.value = JSON.parse(JSON.stringify(props.details)).startETA
+    }
+    if (type === 2) {
+      Cqtitle.value = 'ATA'
+      atdTime.value = JSON.parse(JSON.stringify(props.details)).startATA
+    }
+    if (type === 3) {
+      Cqtitle.value = 'ETD'
+      atdTime.value = JSON.parse(JSON.stringify(props.details)).ygtETD
+    }
+    if (type === 4) {
+      Cqtitle.value = 'ATD'
+      atdTime.value = JSON.parse(JSON.stringify(props.details)).atd
+    }
+  }
+  function handleTime(time) {
+    let Rdata = '-'
+    if (time && time.split(':').length == 3) {
+      Rdata = `${time.split(':')[0]}:${time.split(':')[1]}`
+    }
+    return Rdata
+  }
+  function saveGoodsStatus(data) {
+    if (!id.value || route.query.isCopy) {
+      notification.error({ message: '请先保存', duration: 3 })
+      return false
+    }
+    const obj = {
+      bookingId: route.query.id,
+      statusCodes: [{ statusCode: data.statusSKUCode }],
+    }
+    // spinning.value = true
+    appStore.setsaveNeedNumber(route.query.id)
+    if (!data.isYield) {
+      booGoodsStatusItem.value.forEach((item) => {
+        if (item.statusSKUCode == data.statusSKUCode) {
+          item.isYield = !item.isYield
         }
-        const formData = new FormData()
-        formData.append('file', upFileList[0])
-        formData.append('BookingId', id)
-        formData.append('TypeCode', attachCode)
-        formData.append('TypeName', attachName)
-        this.uploading = true
-        AddFile(formData)
-          .then((res) => {
-            if (res.success) {
-              this.$message.success('上传成功')
-              if (id != 0) {
-                this.$emit('upDateRight')
-              }
-              if (id == 0) {
-                this.$emit('fileNewUpadte', {
-                  tempPathName: res.data,
-                  TypeCode: attachCode,
-                  TypeName: attachName,
-                })
-              }
-            } else {
-              this.$message.error(res.message)
-            }
-            this.uploading = false
-            this.fileModelCancel()
-          })
-          .catch((err) => {
-            this.$message.error(err.message)
-          })
-      },
-      getFileFun(data) {
-        this.$message.success(`下载打印文件 ${data.fileName} 中...`)
-        BookingOrderDownload({ id: data.id }).then((res) => {
-          this.pdfUrl = window.URL.createObjectURL(
-            new Blob([res], { type: 'application/pdf;charset=utf-8' }),
-          )
-          const fname = data.fileName // 下载文件的名字
-          const link = document.createElement('a')
-          link.href = this.pdfUrl
-          link.setAttribute('download', fname)
-          document.body.appendChild(link)
-          link.click()
-        })
-      },
-      handleAttachChange(index) {
-        this.attachCode = this.bookingAttachType[index].code
-        this.attachName = this.bookingAttachType[index].name
-      },
-      bookingShow(data) {
-        data.isChecked = !data.isChecked
-        this.$forceUpdate()
-      },
-      showLogMore(index) {
-        this.details.log[index].showMore = !this.details.log[index].showMore
-        this.$forceUpdate()
-      },
-      stopTimer() {
-        window.clearTimeout(this.time)
-      },
-      saveService(data) {
-        var date = new Date()
-        console.log(date.valueOf())
-        if (!this.id) {
-          this.$message.error('请先保存主单')
-          return false
+      })
+      SaveServiceStatus(obj).then((res) => {
+        if (res.data.succ) {
+        } else {
+          notification.error({ message: res.data.msg, duration: 3 })
+          getStatusServiceList(1, null)
         }
-        const obj = {
-          bookingId: this.$route.query.id,
-          projectCodes: [data.projectCode],
+        spinning.value = false
+      })
+    } else {
+      booGoodsStatusItem.value.forEach((item) => {
+        if (item.statusSKUCode == data.statusSKUCode) {
+          item.isYield = !item.isYield
         }
-        // this.seriveLoading = true
-        if (!data.isYield) {
-          this.bookingServiceItem.forEach((item) => {
-            if (item.projectCode == data.projectCode) {
-              item.isYield = !item.isYield
-            }
-          })
-          SaveServiceProject(obj).then((res) => {
-            if (res.data.succ) {
-              if (this.time !== null) {
-                this.stopTimer()
-              }
-              this.time = setTimeout(() => {
-                this.spinning = true
-                this.getServiceItemList(2, data.projectCode)
-              }, 500)
-            } else {
-              this.$message.error(res.message)
-              this.spinning = false
-              this.getServiceItemList(1)
-            }
-          })
+      })
+      CancelServiceStatus(obj).then((res) => {
+        if (res.data.succ) {
         } else {
-          this.bookingServiceItem.forEach((item) => {
-            if (item.projectCode == data.projectCode) {
-              item.isYield = !item.isYield
-            }
-          })
-          CancelSeryiceProject(obj).then((res) => {
-            if (res.data.succ) {
-              if (this.time !== null) {
-                this.stopTimer()
-              }
-              this.time = setTimeout(() => {
-                this.spinning = true
-                this.getServiceItemList(2, data.projectCode)
-              }, 500)
-            } else {
-              this.$message.error(res.message)
-              this.spinning = false
-              this.getServiceItemList(1)
-            }
-          })
+          notification.error({ message: res.data.msg, duration: 3 })
+          getStatusServiceList(1, null)
         }
-      },
-      saveServiceBasic(data) {
-        //  this.bookingServiceItem.forEach((item) => {
-        //   item.isYield = false
-        //   data.forEach((ite) => {
-        //     if (item.projectCode == ite) {
-        //       item.isYield = true
-        //     }
-        //   })
-        // })
-        const obj = {
-          bookingId: this.$route.query.id,
-          projectCodes: data,
-        }
-        this.bookingServiceItem.forEach((item) => {
-          data.forEach((ite) => {
-            if (item.projectCode == ite) {
-              item.isYield = true
-            }
-          })
+        spinning.value = false
+      })
+    }
+  }
+  function FnOpenEdit(data) {
+    if (route.query.isCopy) {
+      notification.error({ message: '请先保存', duration: 3 })
+      return false
+    }
+    setTimeout(() => {
+      GoodsStatusEditData.value = data
+      GoodsStatusVisible.value = true
+      that.$nextTick(() => {
+        StatusVisibleForm.value.setFieldsValue({
+          setActDate: data.actDate ? data.actDate : '',
+          actRemark: data.actRemark ? data.actRemark : '',
+          setActVal: data.actVal ? data.actVal : '',
         })
-        SaveServiceProject(obj).then((res) => {
-          if (res.data.succ) {
-            if (this.time !== null) {
-              this.stopTimer()
-            }
-            this.time = setTimeout(() => {
-              this.spinning = true
-              this.getServiceItemList(2, data)
-            }, 500)
-          } else {
-            this.$message.error(res.message)
-            this.spinning = false
-            this.getServiceItemList(1)
+      })
+    }, 100)
+  }
+  function addRemark() {
+    if (!id.value) {
+      notification.error({ message: '请先保存主单', duration: 3 })
+      return false
+    }
+    remarkModelvisible.value = true
+    remarkVal.value = ''
+  }
+  function editRemark(data) {
+    remarkModelvisible.value = true
+    remarkVal.value = data.remark
+    editRemarkVal.value = data
+  }
+  function deleteRemark(data) {
+    BookingOrderDeleteRemark(data.id).then((res) => {
+      notification.success({ message: '成功删除', duration: 3 })
+      emit('upDateRight')
+    })
+  }
+  function addFile() {
+    fileModelvisible.value = true
+  }
+  function getFileType(val) {
+    if (val) {
+      return val.substr(val.lastIndexOf('.') + 1)
+    } else {
+      return ''
+    }
+  }
+  function getFileFun(data) {
+    notification.success({ message: `下载打印文件 ${data.fileName} 中...`, duration: 3 })
+    BookingOrderDownload({ id: data.id }).then((res) => {
+      pdfUrl.value = window.URL.createObjectURL(
+        new Blob([res], { type: 'application/pdf;charset=utf-8' }),
+      )
+      const fname = data.fileName // 下载文件的名字
+      const link = document.createElement('a')
+      link.href = pdfUrl.value
+      link.setAttribute('download', fname)
+      document.body.appendChild(link)
+      link.click()
+    })
+  }
+  function bookingShow(data) {
+    data.isChecked = !data.isChecked
+    that.$forceUpdate()
+  }
+  function showLogMore(index) {
+    props.details.log[index].showMore = !props.details.log[index].showMore
+    that.$forceUpdate()
+  }
+  function GoodsStatusHandleOk() {
+    const {
+      StatusVisibleForm: { validateFields },
+    } = that
+    GoodsStatusVisible.value = true
+    validateFields((errors, values) => {
+      if (!errors || GoodsStatusEditData.value.systemCode === 'SQXS') {
+        for (const key in values) {
+          if (typeof values[key] === 'object' && !(values[key] === null)) {
+            values[key] = JSON.stringify(values[key])
           }
-        })
-      },
-      GoodsStatusHandleOk() {
-        const {
-          StatusVisibleForm: { validateFields },
-        } = this
-        this.GoodsStatusVisible = true
-        validateFields((errors, values) => {
-          if (!errors || this.GoodsStatusEditData.systemCode === 'SQXS') {
-            for (const key in values) {
-              if (typeof values[key] === 'object' && !(values[key] === null)) {
-                values[key] = JSON.stringify(values[key])
-              }
-            }
-
-            const data = {
-              bookingId: this.$route.query.id,
-              statusCodes: [
-                {
-                  setActDate: values.setActDate,
-                  actRemark: values.actRemark,
-                  setActVal: values.setActVal,
-                  statusCode: this.GoodsStatusEditData.statusSKUCode,
-                },
-              ],
-            }
-            this.goodStatusLoading = true
-            SaveServiceStatus(data).then((res) => {
-              if (res.data.succ) {
-                this.GoodsStatusVisible = false
-                this.getStatusServiceList(1)
-              } else {
-                this.$message.error(res.data.msg)
-              }
-              this.goodStatusLoading = false
-            })
-            // const AData = { ...this.GoodsStatusEditData, ...data }
-            // if (!this.id) {
-            //   this.$message.error('请先保存主单')
-            //   return false
-            // }
-            // if (!this.locaGoodsStatus.includes(this.GoodsStatusEditData.configId)) {
-            //   this.locaGoodsStatus.push(this.GoodsStatusEditData.configId)
-            //   this.details.goodsStatus.push({ ...AData })
-            // }
+        }
 
-            // const ApiData = {
-            //   bookingId: this.id,
-            //   item: []
-            // }
-            // console.log(this.details.goodsStatus)
-            // this.details.goodsStatus.forEach(item => {
-            //   if (item.setActDate || item.remark) {
-            //     if (item.configId == this.GoodsStatusEditData.configId) {
-            //       ApiData.item.push(AData)
-            //     } else {
-            //       ApiData.item.push(item)
-            //     }
-            //   }
-            // })
-            // BookingOrderSaveGoodsStatus(ApiData)
-            //   .then(res => {
-            //     if (res.success) {
-            //       this.$nextTick(() => {
-            //         this.booGoodsStatusItem = res.data
-            //         this.$emit('inGoodsSave', true)
-            //         this.details.goodsStatus = res.data
-            //         setTimeout(() => {
-            //           this.$emit('inGoodsSave', false)
-            //         }, 400)
-            //       })
-            //       this.$message.success('货物状态设置成功')
-            //       this.GoodsStatusVisible = false
-            //     }
-            //   })
-            //   .catch(err => {
-            //     console.log(err)
-            //   })
+        const data = {
+          bookingId: route.query.id,
+          statusCodes: [
+            {
+              setActDate: values.setActDate,
+              actRemark: values.actRemark,
+              setActVal: values.setActVal,
+              statusCode: GoodsStatusEditData.value.statusSKUCode,
+            },
+          ],
+        }
+        goodStatusLoading.value = true
+        SaveServiceStatus(data).then((res) => {
+          if (res.data.succ) {
+            GoodsStatusVisible.value = false
+            getStatusServiceList(1, null)
           } else {
-            console.log(errors, values)
+            notification.error({ message: res.data.msg, duration: 3 })
           }
+          goodStatusLoading.value = false
         })
-        // this.GoodsStatusVisible = false
-      },
-      FnOpenEdit(data) {
-        if (this.$route.query.isCopy) {
-          this.$message.error('请先保存')
-          return false
+      } else {
+        console.log(errors, values)
+      }
+    })
+  }
+  function handleModelSubmit() {
+    if (!id.value) {
+      notification.error({ message: '请先保存主单', duration: 3 })
+      return false
+    }
+    AddRemark({
+      id: editRemarkVal.value ? editRemarkVal.value.id : 0,
+      pId: id.value,
+      remark: remarkVal.value,
+    })
+      .then((res) => {
+        if (res.success) {
+          notification.info({ message: '备注提交成功', duration: 3 })
+          editRemarkVal.value = null
+          handleModelCancel()
+          emit('upDateRight')
         }
-        setTimeout(() => {
-          this.GoodsStatusEditData = data
-          this.GoodsStatusVisible = true
-          this.$nextTick(() => {
-            this.StatusVisibleForm.setFieldsValue({
-              setActDate: data.actDate ? data.actDate : '',
-              actRemark: data.actRemark ? data.actRemark : '',
-              setActVal: data.actVal ? data.actVal : '',
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+  }
+  function handleModelCancel() {
+    remarkModelvisible.value = false
+    editRemarkVal.value = null
+  }
+  function handleUpload() {
+    const { upFileList, attachCode, attachName } = that
+    if (upFileList.length === 0) {
+      notification.error({ message: '请上传文件', duration: 3 })
+      return false
+    }
+    if (!attachCode || !attachName) {
+      notification.error({ message: '请选择附件类型', duration: 3 })
+      return false
+    }
+    let Did = id.value
+    if (route.query.isCopy) {
+      Did = 0
+    }
+    if (!id.value) {
+      Did = 0
+    }
+    const formData = new FormData()
+    formData.append('file', upFileList[0])
+    formData.append('BookingId', Did)
+    formData.append('TypeCode', attachCode)
+    formData.append('TypeName', attachName)
+    uploading.value = true
+    AddFile(formData)
+      .then((res) => {
+        if (res.success) {
+          notification.success({ message: '上传成功', duration: 3 })
+          if (Did != 0) {
+            emit('upDateRight')
+          }
+          if (Did == 0) {
+            emit('fileNewUpadte', {
+              tempPathName: res.data,
+              TypeCode: attachCode,
+              TypeName: attachName,
             })
-          })
-        }, 100)
-      },
-      saveGoodsStatus(data) {
-        if (!this.id || this.$route.query.isCopy) {
-          this.$message.error('请先保存')
-          return false
-        }
-        const obj = {
-          bookingId: this.$route.query.id,
-          statusCodes: [{ statusCode: data.statusSKUCode }],
-        }
-        // this.spinning = true
-        appStore.setsaveNeedNumber(this.$route.query.id)
-        if (!data.isYield) {
-          this.booGoodsStatusItem.forEach((item) => {
-            if (item.statusSKUCode == data.statusSKUCode) {
-              item.isYield = !item.isYield
-            }
-          })
-          SaveServiceStatus(obj).then((res) => {
-            if (res.data.succ) {
-            } else {
-              this.$message.error(res.data.msg)
-              this.getStatusServiceList(1)
-            }
-            this.spinning = false
-          })
+          }
         } else {
-          this.booGoodsStatusItem.forEach((item) => {
-            if (item.statusSKUCode == data.statusSKUCode) {
-              item.isYield = !item.isYield
-            }
-          })
-          CancelServiceStatus(obj).then((res) => {
-            if (res.data.succ) {
-            } else {
-              this.$message.error(res.data.msg)
-              this.getStatusServiceList(1)
-            }
-            this.spinning = false
-          })
+          notification.error({ message: res.message, duration: 3 })
         }
-
-        // if (!this.locaGoodsStatus.includes(data.configId) || !data.setActDate) {
-        //   // this.locaGoodsStatus.push(data.configId)
-        //   // this.details.goodsStatus.push({ ...data })
-        //   this.savegoodsStatusItem(data, 'push')
-        // } else {
-        //   const that = this
-        //   this.$confirm({
-        //     title: '是否取消',
-        //     okText: '是',
-        //     okType: 'danger',
-        //     cancelText: '否',
-        //     onOk() {
-        //       const index = that.locaGoodsStatus.indexOf(data.configId)
-
-        //       that.locaGoodsStatus.splice(index, 1)
-        //       that.details.goodsStatus.forEach((item, index2) => {
-        //         if (item.configId == data.configId) {
-        //           that.$emit('inGoodsSave', true)
-        //           that.details.goodsStatus.splice(index2, 1)
-        //           setTimeout(() => {
-        //             that.$emit('inGoodsSave', false)
-        //           }, 1200)
-        //         }
-        //       })
-
-        //       that.savegoodsStatusItem(data, 'splice')
-        //     },
-        //     onCancel() {
-        //       return false
-        //     }
-        //   })
-        // }
-      },
-      savegoodsStatusItem(data, type) {
-        const ApiData = {
-          bookingId: this.$route.query.id,
-          item: [],
+        uploading.value = false
+        fileModelCancel()
+      })
+      .catch((err) => {
+        notification.error({ message: err.message, duration: 3 })
+      })
+  }
+  function fileModelCancel() {
+    upFileList.value = []
+    attachCode.value = ''
+    attachName.value = ''
+    fileModelvisible.value = false
+  }
+  function handleRemove(file: any) {
+    const index = upFileList.value.indexOf(file)
+    const newFileList = upFileList.value.slice()
+    newFileList.splice(index, 1)
+    upFileList.value = newFileList
+  }
+  function beforeUpload(file) {
+    if (upFileList.value.length > 1) {
+      return false
+    }
+    upFileList.value = [...upFileList.value, file]
+    return false
+  }
+  function handleAttachChange(index) {
+    attachCode.value = bookingAttachType.value[index].code
+    attachName.value = bookingAttachType.value[index].name
+  }
+  function handleSubimtRole(e) {
+    e.preventDefault()
+    ruleForm.value.validateFields((err, values) => {
+      if (!err) {
+        roleFlag.value = true
+        const data = {
+          ruleName: roleData.value.ruleName,
+          ruleNotice: roleData.value.ruleNotice,
+          opinionType: type.value == 1 ? 'ADD' : 'MODIFY',
+          opinionContent: values.opinionContent,
         }
-        this.details.goodsStatus.forEach((item) => {
-          if (item.setActDate || item.remark) {
-            ApiData.item.push(item)
+        SubmitRule0pinion(data).then((res) => {
+          if (res.data.succ) {
+            notification.success({ message: '提交成功', duration: 3 })
+            roleFlag.value = false
+            roleFlag.value = false
+          } else {
+            notification.error({ message: res.data.msg, duration: 3 })
+            roleFlag.value = false
           }
         })
+      }
+    })
+  }
+  function handleCancel() {
+    roleFlag.value = false
+  }
+  function handleSubimtAtd() {
+    const data: any = {
+      Id: props.details.id,
+    }
+    if (CqType.value === 1) {
+      data.startETA = atdTime.value
+    }
+    if (CqType.value === 2) {
+      data.startATA = atdTime.value
+    }
+    if (CqType.value === 3) {
+      data.ygtETD = atdTime.value
+    }
+    if (CqType.value === 4) {
+      data.atd = atdTime.value
+    }
+    atdLoading.value = true
+    SaveDataInList(data).then((res) => {
+      if (res.success) {
+        notification.success({ message: '修改成功', duration: 3 })
+        emit('changeAtd', atdTime.value, CqType.value)
+        appStore.setsaveNeedNumber(props.details.id)
 
-        if (type === 'push' && !data.remark) {
-          const date = new Date(+new Date() + 8 * 3600 * 1000)
-          ApiData.item.push({ ...data, setActDate: date.toISOString() })
-        }
-        if (type === 'push' && data.remark) {
-          const date = new Date(+new Date() + 8 * 3600 * 1000)
-          ApiData.item.forEach((ite) => {
-            if (ite.systemCode === data.systemCode) {
-              ite.setActDate = date.toISOString()
-            }
-          })
-        }
-        this.spinning = true
-        BookingOrderSaveGoodsStatus(ApiData)
-          .then((res) => {
-            if (res.success) {
-              this.booGoodsStatusItem = res.data
-              this.$emit('inGoodsSave', true)
-              this.details.goodsStatus = res.data
-              appStore.setsaveNeedNumber(this.details.id)
-              setTimeout(() => {
-                this.$emit('inGoodsSave', false)
-              }, 400)
-            }
-            this.spinning = false
-          })
-          .catch((err) => {
-            console.log(err)
-            this.spinning = false
-          })
-      },
-    },
+        atdFlag.value = false
+      } else {
+        notification.error({ message: res.message, duration: 3 })
+      }
+      atdLoading.value = false
+    })
   }
 </script>
 <style lang="less" scoped>
diff --git a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/sedOrder.vue b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/sedOrder.vue
index 30258008..2b65afef 100644
--- a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/sedOrder.vue
+++ b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/sedOrder.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="booking-detail" style="margin-top: 0">
+  <div class="booking-detail" style="margin: 0">
     <a-row
       :gutter="24"
       :class="showSecNav ? 'show-content' : 'hide-content'"
@@ -8,7 +8,7 @@
       <div class="nav-min-icon" v-if="!showSecNav" @click="openNav"
         ><i class="iconfont icon-liebiao"></i
       ></div>
-      <a-col :span="showSecNav ? 5 : 0" v-if="showSecNav">
+      <a-col :span="showSecNav ? 5 : 0" v-if="showSecNav" style="padding-left: 0">
         <div class="sed-order-list">
           <div class="sed-order-title">
             <i class="iconfont icon-liebiao"></i><span class="tit">分提单列表</span
@@ -74,7 +74,7 @@
                 <div class="pane-box">
                   <!-- 基本信息 -->
                   <basicInfo
-                    ref="basicInfo"
+                    ref="RefbasicInfo"
                     :type="type"
                     :details="editDetails"
                     :rules="basicRules"
@@ -85,7 +85,7 @@
                   ></basicInfo>
                   <!-- 收发通信息 -->
                   <mailingInfo
-                    ref="mailingInfo"
+                    ref="RefmailingInfo"
                     :details="editDetails"
                     :rules="mailingRules"
                     :inSave="inSave"
@@ -95,7 +95,7 @@
                   ></mailingInfo>
                   <!-- 货物信息 -->
                   <cargoInfo
-                    ref="cargoInfo"
+                    ref="RefcargoInfo"
                     :details="editDetails"
                     :rules="cargoRules"
                     :inSave="inSave"
@@ -105,7 +105,7 @@
                   ></cargoInfo>
                   <!-- 箱型 -->
                   <goodsTable
-                    ref="goodsTable"
+                    ref="RefgoodsTable"
                     :details="editDetails"
                     :rules="tableRules"
                     isParent="parent"
@@ -120,7 +120,7 @@
               <div id="tab-content2" class="tab-content" v-show="mainOrderActiveKey === '2'">
                 <ediMore
                   class="pane-box"
-                  ref="ediMore"
+                  ref="RefediMore"
                   :rules="ediRules"
                   :details="editDetails"
                   :inSave="inSave"
@@ -144,7 +144,7 @@
     </a-row>
   </div>
 </template>
-<script>
+<script lang="ts" setup>
   import sedOperationArea from './sedOperationArea.vue'
   import basicInfo from './basicInfo.vue'
   import mailingInfo from './mailingInfo.vue'
@@ -158,164 +158,20 @@
     BookingOrderSave,
     DeleteBookingOrder,
   } from '/@/views/operation/seaexport/api/BookingLedger'
-  const sedDetail = {
-    id: 0,
-    parentId: 0,
-    customername: '',
-    customerid: '',
-    carrier: 'CMA',
-    carrierid: 'CMA',
-    forwarder: '',
-    forwarderid: '',
-    pono: '',
-    mblno: '',
-    hblno: '',
-    epCode: '',
-    custno: '',
-    contractno: '',
-    vessel: '',
-    voyno: '',
-    voynoinner: '',
-    lanecode: '',
-    etd: '',
-    atd: '',
-    lanename: '',
-    shipagency: '',
-    shipagencyid: '',
-    lineName: '',
-    sale: '',
-    saleid: '',
-    op: '',
-    opid: '',
-    doc: '',
-    docid: '',
-    custservice: '',
-    custserviceid: '',
-    route: '',
-    routeid: '',
-    dzRemark: '',
-    czRemark: '',
-    shipper: '',
-    feeself: false,
-    consignee: '',
-    notifyparty: '',
-    yard: '',
-    yardid: '',
-    customser: '',
-    customserid: '',
-    trucker: '',
-    truckerid: '',
-    agentname: '',
-    agentid: '',
-    warehouse: '',
-    warehouseID: '',
-    eta: '',
-    closingdate: '',
-    closedocdate: '',
-    closevgmdate: '',
-    portload: '',
-    portloadid: '',
-    transport: '',
-    transportid: '',
-    portdischarge: '',
-    portdischargeid: '',
-    destination: '',
-    destinationid: '',
-    placedelivery: '',
-    placedeliveryid: '',
-    placereceipt: '',
-    placereceiptid: '',
-    pkgs: 0,
-    kindpkgs: '',
-    kgs: 0,
-    cbm: 0,
-    yardremark: '',
-    yardcontract: '',
-    yardcontracttel: '',
-    yardcontractemail: '',
-    pkgstotal: '',
-    kgstotal: '',
-    cbmtotal: '',
-    marks: '',
-    goodsname: '',
-    goodscode: '',
-    cargoid: '',
-    hscode: '',
-    description: '',
-    totalno: '',
-    issuetype: '',
-    issuedate: '',
-    issueplace: '',
-    issueplaceid: '',
-    nobill: '',
-    copynobill: '',
-    prepardat: '',
-    prepardatid: '',
-    payableat: '',
-    payableatid: '',
-    blfrt: '',
-    thirdpayaddr: '',
-    service: '',
-    reeferf: '',
-    tempset: '',
-    tempid: '',
-    tempmin: '',
-    tempmax: '',
-    humidity: '',
-    dclass: '',
-    dunno: '',
-    dpage: '',
-    dlabel: '',
-    linkman: '',
-    soremark: '',
-    siremark: '',
-    ctnInputs: [],
-    weituo: '',
-    freightpayer: '',
-    scaccode: '',
-    itncode: '',
-    iscontainersoc: 0,
-    bookingEDIExt: {
-      weiTuoFang: '',
-      ediAttn: '',
-      ediAttnTel: '',
-      ediAttnMail: '',
-      sendCode: '',
-      receiveCode: '',
-      amsConsignee: '',
-      amsNotifyParty: '',
-      opEName: '',
-      opTel: '',
-      opEmail: '',
-      goodsName: '',
-      orderRemark: '',
-      kingTareweight: '',
-      exRemark1: '',
-      exRemark2: '',
-      exRemark3: '',
-      exRemark4: '',
-      consigneeEdiCode: '',
-      shipperEdiCode: '',
-      notifyCdoe: '',
-      salerCode: '',
-      salerCodeName: '',
-      emanifestHbl: '',
-      masterBolIndicator: '',
-      masterBolIndicatorName: '',
-      s0CC0C: '',
-      ckhi: '',
-      cncm: '',
-      wncm: '',
-      acihbl: '',
-    },
-    hbList: [],
-    remark: [],
-    file: [],
-    log: [],
-    item: [],
-    statuslog: [],
-  }
-
+  import { ref, Ref, reactive, getCurrentInstance, h, watch, onMounted } from 'vue'
+  import { useRoute } from 'vue-router'
+  const route = useRoute()
+  import { useMessage } from '/@/hooks/web/useMessage'
+  const { notification } = useMessage()
+  const props = defineProps({
+    parSedOrderList: { type: Array, default: [] },
+    isAdd: { type: Boolean, default: false },
+    details: { type: Object, default: {} },
+    checkFrom: { type: Array, default: [] },
+    scrollTop: { type: Number, default: 0 },
+  })
+  const emit = defineEmits(['sedOrderRemove', 'changeHB'])
+  let { ctx: that, proxy }: any = getCurrentInstance()
   const bookingEDIExt = {
     weiTuoFang: '',
     ediAttn: '',
@@ -349,568 +205,456 @@
     wncm: '',
     acihbl: '',
   }
-  export default {
-    name: 'SedOrder',
-    props: {
-      parSedOrderList: {
-        type: Array,
-        default: () => {
-          return []
-        },
-      },
-      isAdd: {
-        type: Boolean,
-        default: false,
-      },
-      details: {
-        type: Object,
-        default: () => {
-          return {}
-        },
-      },
-      checkFrom: {
-        type: Array,
-        default: () => {
-          return []
-        },
-      },
-      scrollTop: {
-        type: Number,
-        default: 0,
-      },
-    },
-    components: {
-      sedOperationArea,
-      basicInfo,
-      mailingInfo,
-      cargoInfo,
-      billInfo,
-      remarksInfo,
-      goodsTable,
-      ediMore,
-    },
-    data() {
-      return {
-        type: this.$route.query.type,
-        id: this.$route.query.id,
-        inPageLoading: false,
-        editDetails: null,
-        editIndex: 0,
-        showSecNav: true,
-        oldBookingDetails: {},
-        inSecLoad: false,
-        mainOrderActiveKey: '1',
-        basicRules: rules.basicRules,
-        mailingRules: rules.mailingRules,
-        cargoRules: rules.cargoRules,
-        billRules: rules.billRules,
-        remarksRules: rules.remarksRules,
-        ediRules: rules.ediRules,
-        hasEdiRules: false,
-        tableRules: rules.tableRules,
-        hasTableRules: false,
-        inSave: false,
-        sedOrderList: JSON.parse(JSON.stringify(this.parSedOrderList)) || [],
+  const id = ref()
+  const showSecNav: Ref<boolean> = ref(true)
+  const sedOrderList: Ref<any> = ref(props.parSedOrderList) || []
+  const editIndex: Ref<number> = ref(0)
+  const editDetails: Ref<any> = ref(null)
+  const inSecLoad: Ref<Boolean> = ref(false)
+  const mainOrderActiveKey: Ref<string> = ref('1')
+  const ediRules: Ref<object> = ref(rules.ediRules)
+  const hasEdiRules: Ref<boolean> = ref(false)
+  const hasTableRules: Ref<boolean> = ref(false)
+  const tableRules: Ref<object> = ref(rules.tableRules)
+  const inSave: Ref<boolean> = ref(false)
+  const oldBookingDetails: Ref<object> = ref({})
+  const type: Ref<any> = ref(route.query.type)
+  const basicRules: Ref<object> = ref(rules.basicRules)
+  const mailingRules: Ref<object> = ref(rules.mailingRules)
+  const cargoRules: Ref<object> = ref(rules.cargoRules)
+  const billRules: Ref<object> = ref(rules.billRules)
+  const remarksRules: Ref<object> = ref(rules.remarksRules)
+  const inPageLoading: Ref<Boolean> = ref(false)
+  const RefgoodsTable = ref()
+  const RefbasicInfo = ref()
+  const RefmailingInfo = ref()
+  const RefcargoInfo = ref()
+  const RefediMore = ref()
+  watch(
+    () => route.query,
+    () => {
+      id.value = route.query.id
+      inSave.value = true
+      setTimeout(() => {
+        inSave.value = false
+      }, 1200)
+      if (RefbasicInfo.value) {
+        RefbasicInfo.value.$refs.basicFrom.clearValidate()
+        RefmailingInfo.value.$refs.mailingFrom.clearValidate()
+        RefcargoInfo.value.$refs.cargoFrom.clearValidate()
       }
     },
-    watch: {
-      parSedOrderList: {
-        handler(nval, oval) {},
-        deep: true,
-      },
-      editDetails: {
-        handler(nval, oval) {},
-        deep: true,
-      },
-      '$route.query': {
-        immediate: true,
-        handler(nD, oD) {
-          this.id = this.$route.query.id
-          this.inSave = true
-          setTimeout(() => {
-            this.inSave = false
-          }, 1200)
-          if (this.$refs.basicInfo) {
-            this.$refs.basicInfo.$refs.basicFrom.clearValidate()
-            this.$refs.mailingInfo.$refs.mailingFrom.clearValidate()
-            this.$refs.cargoInfo.$refs.cargoFrom.clearValidate()
-            // this.$refs.billInfo.$refs.billFrom.clearValidate()
-            // this.$refs.remarksInfo.$refs.remarkFrom.clearValidate()
-          }
-        },
-      },
-      checkFrom(nval, oval) {
-        this.checkFromInit()
-      },
-    },
-    created() {},
-    mounted() {
-      this.checkFromInit()
+    { immediate: true },
+  )
+  watch(
+    () => props.checkFrom,
+    () => {
+      checkFromInit()
     },
-    methods: {
-      init(data = []) {
-        this.inSecLoad = true
-        if (Object.keys(data).length > 0) {
-          this.sedOrderList = JSON.parse(JSON.stringify(data))
-        } else {
-          this.sedOrderList = []
-        }
-        if (this.sedOrderList.length > 0) {
-          this.sedOrderList.map((item, index) => {
-            item.isNoSave = false
-          })
-          this.editIndex = 0
-          const $data = JSON.parse(JSON.stringify(this.sedOrderList[0]))
-          if (!$data.bookingEDIExt) {
-            $data.bookingEDIExt = bookingEDIExt
-          }
-          this.editDetails = $data
-          this.oldBookingDetails = JSON.parse(JSON.stringify($data))
-          setTimeout(() => {
-            this.$refs.goodsTable.init()
-          }, 1000)
-          setTimeout(() => {
-            this.inSecLoad = false
-          }, 2000)
+  )
+  onMounted(() => {
+    checkFromInit()
+  })
+  function checkFromInit() {
+    Object.keys(basicRules.value).map((item, index) => {
+      if (props.checkFrom.includes(item)) {
+        basicRules.value[item][0].required = true
+      }
+    })
+    Object.keys(mailingRules.value).map((item, index) => {
+      if (props.checkFrom.includes(item)) {
+        mailingRules.value[item][0].required = true
+      }
+    })
+    Object.keys(cargoRules.value).map((item, index) => {
+      if (props.checkFrom.includes(item)) {
+        cargoRules.value[item][0].required = true
+      }
+    })
+    Object.keys(billRules.value).map((item, index) => {
+      if (props.checkFrom.includes(item)) {
+        billRules.value[item][0].required = true
+      }
+    })
+    Object.keys(remarksRules.value).map((item, index) => {
+      if (props.checkFrom.includes(item)) {
+        remarksRules.value[item][0].required = true
+      }
+    })
+    Object.keys(ediRules.value).map((item, index) => {
+      if (props.checkFrom.includes(item)) {
+        ediRules.value[item][0].required = true
+      }
+      if (props.checkFrom.includes('bookingEDIExt.scaccode')) {
+        ediRules.value['scaccode'][0].required = true
+      }
+      if (props.checkFrom.includes('bookingEDIExt.itncode')) {
+        ediRules.value['itncode'][0].required = true
+      }
+      if (props.checkFrom.includes('bookingEDIExt.freightpayer')) {
+        ediRules.value['freightpayer'][0].required = true
+      }
+    })
+    Object.keys(tableRules.value).map((item, index) => {
+      if (props.checkFrom.includes(item)) {
+        tableRules.value[item].required = true
+        hasTableRules.value = true
+      }
+    })
+    that.$forceUpdate()
+  }
+  function openNav() {
+    showSecNav.value = !showSecNav.value
+  }
+  function changeOrder(index) {
+    editIndex.value = index
+    const data = sedOrderList.value[index]
+    if (!data.bookingEDIExt) {
+      data.bookingEDIExt = bookingEDIExt
+    }
+    editDetails.value = data
+    inSecLoad.value = true
+    setTimeout(() => {
+      inSecLoad.value = false
+      RefgoodsTable.value.init(data)
+    }, 200)
+  }
+  function removeSedOrderFun(data, index) {
+    deleteBookingOrder(data.id, index)
+  }
+  function deleteBookingOrder(id, index) {
+    // eslint-disable-next-line eqeqeq
+    if (id == 0) {
+      removeSucc(id, index)
+      return false
+    }
+    inSecLoad.value = true
+    DeleteBookingOrder([id].toString())
+      .then((res) => {
+        if (res.success) {
+          notification.success({ message: '删除成功', duration: 3 })
+          removeSucc(id, index)
         } else {
-          this.editDetails = JSON.parse(JSON.stringify(sedDetail))
-          this.oldBookingDetails = JSON.parse(JSON.stringify(sedDetail))
-          setTimeout(() => {
-            this.inSecLoad = false
-          }, 2000)
-        }
-      },
-      spliceMorefun(str) {
-        this.moreStr = str
-      },
-      pkgsEnCapitalFun(data) {
-        this.bookingDetails.totalno = data
-      },
-      diffObj(obj1, obj2) {
-        function getTypeByObj(obj) {
-          return Object.prototype.toString.call(obj).match(/^\[object ([a-zA-Z]*)\]$/)[1]
-        }
-        function isEmptyObject(obj) {
-          for (const key in obj) {
-            return false
-          }
-          return true
-        }
-        if (!obj1 || isEmptyObject(obj1) || !obj2 || isEmptyObject(obj2)) {
-          return null
-        }
-        const diffRes = {
-          old_val: {},
-          new_val: {},
-        }
-        for (const k in obj2) {
-          // 判断数据类型是否一致
-          if (getTypeByObj(obj2[k]) === getTypeByObj(obj1[k])) {
-            // 比较 “Array”和“Object”类型
-            if (getTypeByObj(obj2[k]) === 'Array' || getTypeByObj(obj2[k]) === 'Object') {
-              const diffData = this.diffObj(obj1[k], obj2[k])
-              if (!isEmptyObject(diffData)) {
-                diffRes.old_val[k] = diffData.old_val
-                diffRes.new_val[k] = diffData.new_val
-              }
-            } else if (obj1[k] !== obj2[k]) {
-              // 比较其他类型数据
-              diffRes.old_val[k] = obj1[k]
-              diffRes.new_val[k] = obj2[k]
-            }
-          } else {
-            if (
-              [undefined, null, ''].includes(obj1[k]) &&
-              [undefined, null, ''].includes(obj2[k])
-            ) {
-              // 这三类数据可视为相等，不做处理
-            } else {
-              diffRes.old_val[k] = obj1[k]
-              diffRes.new_val[k] = obj2[k]
-            }
-          }
-        }
-        // 若没有变化，返回null
-        if (isEmptyObject(diffRes.old_val) || isEmptyObject(diffRes.new_val)) {
-          return null
-        }
-        return diffRes
-      },
-
-      checkFromInit() {
-        Object.keys(this.basicRules).map((item, index) => {
-          if (this.checkFrom.includes(item)) {
-            this.basicRules[item][0].required = true
-          }
-        })
-        Object.keys(this.mailingRules).map((item, index) => {
-          if (this.checkFrom.includes(item)) {
-            this.mailingRules[item][0].required = true
-          }
-        })
-        Object.keys(this.cargoRules).map((item, index) => {
-          if (this.checkFrom.includes(item)) {
-            this.cargoRules[item][0].required = true
-          }
-        })
-        Object.keys(this.billRules).map((item, index) => {
-          if (this.checkFrom.includes(item)) {
-            this.billRules[item][0].required = true
-          }
-        })
-        Object.keys(this.remarksRules).map((item, index) => {
-          if (this.checkFrom.includes(item)) {
-            this.remarksRules[item][0].required = true
-          }
-        })
-        Object.keys(this.ediRules).map((item, index) => {
-          if (this.checkFrom.includes(item)) {
-            this.ediRules[item][0].required = true
-          }
-          if (this.checkFrom.includes('bookingEDIExt.scaccode')) {
-            this.ediRules['scaccode'][0].required = true
-          }
-          if (this.checkFrom.includes('bookingEDIExt.itncode')) {
-            this.ediRules['itncode'][0].required = true
-          }
-          if (this.checkFrom.includes('bookingEDIExt.freightpayer')) {
-            this.ediRules['freightpayer'][0].required = true
-          }
-        })
-        Object.keys(this.tableRules).map((item, index) => {
-          if (this.checkFrom.includes(item)) {
-            this.tableRules[item].required = true
-            this.hasTableRules = true
-          }
-        })
-        this.$forceUpdate()
-      },
-
-      addSedOrder() {
-        if (this.isAdd) {
-          this.$message.error('请先保存主单')
-          return false
-        }
-        const data = JSON.parse(JSON.stringify(this.details))
-        data.isNoSave = true
-        data.hblno = ''
-        data.shipper = ''
-        data.consignee = ''
-        data.notifyparty = ''
-        data.prepardat = ''
-        data.prepardatid = ''
-        data.pid = this.$route.query.id
-        data.id = 0
-        if (!data.bookingEDIExt) {
-          data.bookingEDIExt = bookingEDIExt
-        }
-        if (data.ctnInputs.length > 0) {
-          data.ctnInputs.map((item, index) => {
-            delete item.id
-          })
-        }
-        if (data.hbList.length > 0) {
-          delete data.hbList
-        }
-        this.editDetails = data
-        this.editIndex = this.sedOrderList.length
-        this.sedOrderList.push(data)
-        this.$emit('changeHB', this.sedOrderList)
-      },
-
-      changeDetailFun(data) {
-        if (this.inSave || this.inSecLoad || this.sedOrderList.length === 0) {
-          return false
-        }
-        const { detail, type } = data
-        if (!detail.bookingEDIExt) {
-          detail.bookingEDIExt = bookingEDIExt
+          notification.error({ message: res.message, duration: 3 })
         }
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+  }
+  function removeSucc(id, index) {
+    const removeIndex = index
+    sedOrderList.value.splice(removeIndex, 1)
+    emit('sedOrderRemove', sedOrderList.value)
+    if (sedOrderList.value.length === 0) {
+      editIndex.value = 0
+      editDetails.value = null
+      return false
+    }
+    if (editDetails.value.id === id) {
+      const num: number = editIndex.value === 0 ? 0 : editIndex.value - 1
+      editIndex.value = num > sedOrderList.value.length ? sedOrderList.value.length - 1 : num
+      editDetails.value = sedOrderList.value[editIndex.value]
+    } else {
+      editIndex.value = removeIndex < editIndex.value ? editIndex.value - 1 : editIndex.value
+    }
+    setTimeout(() => {
+      inSecLoad.value = false
+    }, 200)
+    that.$forceUpdate()
+  }
+  function cancelRemove() {
+    console.log('== 取消删除 ==')
+  }
+  function addSedOrder() {
+    if (props.isAdd) {
+      notification.error({ message: '请先保存主单', duration: 3 })
+      return false
+    }
+    const data = props.details
+    data.isNoSave = true
+    data.hblno = ''
+    data.shipper = ''
+    data.consignee = ''
+    data.notifyparty = ''
+    data.prepardat = ''
+    data.prepardatid = ''
+    data.pid = route.query.id
+    data.id = 0
+    if (!data.bookingEDIExt) {
+      data.bookingEDIExt = bookingEDIExt
+    }
+    if (data.ctnInputs.length > 0) {
+      data.ctnInputs.map((item, index) => {
+        delete item.id
+      })
+    }
+    if (data.hbList.length > 0) {
+      delete data.hbList
+    }
+    editDetails.value = data
+    editIndex.value = sedOrderList.value.length
+    sedOrderList.value.push(data)
+    emit('changeHB', sedOrderList.value)
+  }
+  function saveFun() {
+    bookingOrderSave()
+  }
+  function bookingOrderSave() {
+    if (!editDetails.value.hblno) {
+      notification.error({ message: '请输入分提单号', duration: 3 })
+      return false
+    }
+    let basicFrom = true
+    RefbasicInfo.value.$refs.basicFrom.validate((valid, err) => {
+      console.log(err)
+      basicFrom = valid
+    })
+    let mailingFrom = true
+    RefmailingInfo.value.$refs.mailingFrom.validate((valid) => {
+      mailingFrom = valid
+    })
+    let cargoFrom = true
+    RefcargoInfo.value.$refs.cargoFrom.validate((valid) => {
+      cargoFrom = valid
+    })
+    console.log(editDetails.value)
+    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'
+        notification.error({ message: '保存失败，请检查EDI必填项', duration: 3 })
+        return false
+      }
+    } else {
+      Object.keys(ediRules.value).map((item) => {
         if (
-          this.ifCompare(this.sedOrderList[this.editIndex], detail) &&
-          !this.inSecLoad &&
-          type !== 'save'
+          props.checkFrom.includes(item) &&
+          !editDetails.value[item.split('.')[0]][item.split('.')[1]]
         ) {
-          this.sedOrderList[this.editIndex].isNoSave = true
-        }
-        this.editDetails = detail
-        this.sedOrderList[this.editIndex] = detail
-        this.$emit('changeHB', this.sedOrderList)
-        this.$forceUpdate()
-      },
-
-      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
-      },
-      saveFun() {
-        this.bookingOrderSave()
-      },
-      changeTotalFun(data) {
-        const { type, val } = data
-        if (type === 'totalKgs') {
-          this.editDetails.kgs = val || this.editDetails.kgs
-        } else if (type === 'totalPkgs') {
-          this.editDetails.pkgs = val || this.editDetails.pkgs
-          const enCapitalRes = this.$refs.cargoInfo.SetTOTALNO(this.editDetails.pkgs)
-          this.editDetails.totalno = enCapitalRes
-        } else if (type === 'totalCbm') {
-          this.editDetails.cbm = val || this.editDetails.cbm
+          hasEdiRules.value = true
         }
-      },
-      changectnall(arr) {
-        let str = ''
-        arr.forEach((item, index) => {
-          str += item.ctnall + '*' + item.ctnnum
-          if (index != arr.length - 1) {
-            str += '/'
+      })
+      if (hasEdiRules.value) {
+        mainOrderActiveKey.value = '2'
+        notification.error({ message: '保存失败，请检查EDI必填项', duration: 3 })
+        return false
+      }
+    }
+    if (hasTableRules.value && editDetails.value.carrierid !== 'GGPX') {
+      if (editDetails.value.ctnInputs.length === 0) {
+        notification.error({ message: '保存失败，箱信息未填写', duration: 3 })
+        return false
+      }
+      let tableErrTip = ''
+      editDetails.value.ctnInputs.map((item, index) => {
+        Object.keys(item).map((label, lindex) => {
+          if (tableRules.value[label] && tableRules.value[label].required && item[label] === '') {
+            tableErrTip = `${tableErrTip}  序号${index + 1}中${
+              tableRules.value[label].title
+            }未填写,`
           }
         })
-        this.editDetails.cntrtotal = str
-      },
-      changeCtnInfoFun({ type, val }) {
-        if (type === 'kindpkgs') {
-          this.editDetails.kindpkgs = val
-          const enCapitalRes = this.$refs.cargoInfo.SetTOTALNO(this.editDetails.pkgs)
-          this.editDetails.totalno = enCapitalRes
-        }
-      },
-      bookingOrderSave() {
-        if (!this.editDetails.hblno) {
-          this.$message.error('请输入分提单号')
-          return false
-        }
-        let basicFrom = true
-        this.$refs.basicInfo.$refs.basicFrom.validate((valid, err) => {
-          console.log(err)
-          basicFrom = valid
-        })
-        let mailingFrom = true
-        this.$refs.mailingInfo.$refs.mailingFrom.validate((valid) => {
-          mailingFrom = valid
+      })
+      if (tableErrTip !== '') {
+        notification.error({
+          message: `保存失败， 箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`,
+          duration: 3,
         })
-        let cargoFrom = true
-        this.$refs.cargoInfo.$refs.cargoFrom.validate((valid) => {
-          cargoFrom = valid
-        })
-        // let billFrom = true
-        // this.$refs.billInfo.$refs.billFrom.validate(valid => {
-        //   billFrom = valid
-        // })
-        // let remarksFrom = true
-        // this.$refs.remarksInfo.$refs.remarkFrom.validate(valid => {
-        //   remarksFrom = valid
-        // })
-        console.log(this.editDetails)
-        if (!basicFrom || !mailingFrom || !cargoFrom) {
-          this.$message.error('保存失败，请检查必填项')
-          return false
-        }
-        if (this.$refs.ediMore) {
-          let ediFrom = true
-          this.$refs.ediMore.$refs.ediFrom.validate((valid) => {
-            ediFrom = valid
-          })
-          if (!ediFrom) {
-            this.mainOrderActiveKey = '2'
-            this.$message.error('保存失败，请检查EDI必填项')
-            return false
-          }
-        } else {
-          Object.keys(this.ediRules).map((item, index) => {
-            if (
-              this.checkFrom.includes(item) &&
-              !this.editDetails[item.split('.')[0]][item.split('.')[1]]
-            ) {
-              this.hasEdiRules = true
-            }
-          })
-          if (this.hasEdiRules) {
-            this.mainOrderActiveKey = '2'
-            this.$message.error('保存失败，请检查EDI必填项')
-            return false
-          }
-        }
-        if (this.hasTableRules && this.editDetails.carrierid !== 'GGPX') {
-          if (this.editDetails.ctnInputs.length === 0) {
-            this.$message.error('保存失败，箱信息未填写')
-            return false
-          }
-          let tableErrTip = ''
-          this.editDetails.ctnInputs.map((item, index) => {
-            Object.keys(item).map((label, lindex) => {
-              if (this.tableRules[label] && this.tableRules[label].required && item[label] === '') {
-                tableErrTip = `${tableErrTip}  序号${index + 1}中${
-                  this.tableRules[label].title
-                }未填写,`
-              }
-            })
-          })
-          if (tableErrTip !== '') {
-            this.$message.error(
-              `保存失败， 箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`,
-              3,
-            )
-            return false
-          }
-        }
-        this.inSave = true
-        const data = JSON.parse(JSON.stringify(this.editDetails))
-        delete data.isNoSave
-        if (this.$route.query.isCopy) {
-          delete data.bookingno
-          data.ctnInputs.map((item, index) => {
-            delete item.id
-          })
-        }
-        data.parentId = this.$route.query.id
-        if (
-          this.editDetails.id !== 0 &&
-          Number(this.editDetails.id) !== Number(this.$route.query.id)
-        ) {
-          // this.bookingOrderUpdate()
+        return false
+      }
+    }
+    inSave.value = true
+    const data = JSON.parse(JSON.stringify(editDetails.value))
+    delete data.isNoSave
+    if (route.query.isCopy) {
+      delete data.bookingno
+      data.ctnInputs.map((item, index) => {
+        delete item.id
+      })
+    }
+    data.parentId = route.query.id
+    if (editDetails.value.id !== 0 && Number(editDetails.value.id) !== Number(route.query.id)) {
+      // this.bookingOrderUpdate()
+    } else {
+      data.id = 0
+      data.ctnInputs.map((item, index) => {
+        item.id = 0
+      })
+    }
+    const changedFields: any = 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) {
+      data.changedFields = Object.keys(changedFields.new_val)
+    }
+    console.log(changedFields, oldBookingDetails.value, 'changedFields')
+    BookingOrderSave(data)
+      .then((res) => {
+        if (res.success) {
+          notification.success({ message: '保存成功', duration: 3 })
+          sedOrderList.value.splice(editIndex.value, 1, res.data)
+          editDetails.value = res.data
+          sedOrderList.value[editIndex.value].isNoSave = false
+          editDetails.value.isNoSave = false
+          setTimeout(() => {
+            inSave.value = false
+            changeDetailFun({ detail: editDetails.value, type: 'save' })
+          }, 1000)
+          that.$forceUpdate()
         } else {
-          data.id = 0
-          data.ctnInputs.map((item, index) => {
-            item.id = 0
-          })
+          notification.error({ message: res.message, duration: 3 })
         }
-        const changedFields = this.diffObj(this.oldBookingDetails, 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
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+  }
+  function diffObj(obj1, obj2) {
+    function getTypeByObj(obj) {
+      return Object.prototype.toString.call(obj).match(/^\[object ([a-zA-Z]*)\]$/)[1]
+    }
+    function isEmptyObject(obj) {
+      for (const key in obj) {
+        return false
+      }
+      return true
+    }
+    if (!obj1 || isEmptyObject(obj1) || !obj2 || isEmptyObject(obj2)) {
+      return null
+    }
+    const diffRes = {
+      old_val: {},
+      new_val: {},
+    }
+    for (const k in obj2) {
+      // 判断数据类型是否一致
+      if (getTypeByObj(obj2[k]) === getTypeByObj(obj1[k])) {
+        // 比较 “Array”和“Object”类型
+        if (getTypeByObj(obj2[k]) === 'Array' || getTypeByObj(obj2[k]) === 'Object') {
+          const diffData: any = diffObj(obj1[k], obj2[k])
+          if (!isEmptyObject(diffData)) {
+            diffRes.old_val[k] = diffData.old_val
+            diffRes.new_val[k] = diffData.new_val
           }
+        } else if (obj1[k] !== obj2[k]) {
+          // 比较其他类型数据
+          diffRes.old_val[k] = obj1[k]
+          diffRes.new_val[k] = obj2[k]
         }
-        if (changedFields) {
-          data.changedFields = Object.keys(changedFields.new_val)
-        }
-        console.log(changedFields, this.oldBookingDetails, 'changedFields')
-        BookingOrderSave(data)
-          .then((res) => {
-            if (res.success) {
-              this.$message.success('保存成功')
-              this.sedOrderList.splice(this.editIndex, 1, res.data)
-              this.editDetails = res.data
-              this.$set(this.sedOrderList[this.editIndex], 'isNoSave', false)
-              this.$set(this.editDetails, 'isNoSave', false)
-              setTimeout(() => {
-                this.inSave = false
-                this.changeDetailFun({ detail: this.editDetails, type: 'save' })
-              }, 1000)
-              this.$forceUpdate()
-            } else {
-              this.$message.error(res.message)
-            }
-          })
-          .catch((err) => {
-            console.log(err)
-          })
-      },
-
-      changeOrder(index) {
-        this.editIndex = index
-        const data = this.sedOrderList[index]
-        if (!data.bookingEDIExt) {
-          data.bookingEDIExt = bookingEDIExt
-        }
-        this.editDetails = data
-        this.inSecLoad = true
-        setTimeout(() => {
-          this.inSecLoad = false
-          this.$refs.goodsTable.init(data)
-        }, 200)
-      },
-
-      copyFun() {
-        const _data = JSON.parse(JSON.stringify(this.editDetails))
-        _data.isNoSave = true
-        _data.hblno = ''
-        _data.pid = this.$route.query.id
-        _data.id = 0
-        if (!_data.bookingEDIExt) {
-          _data.bookingEDIExt = bookingEDIExt
-        }
-        this.editDetails = _data
-        this.editIndex = this.sedOrderList.length
-        this.sedOrderList.push(_data)
-      },
-
-      openNav() {
-        this.showSecNav = !this.showSecNav
-      },
-      pkgsEnCapitalFun(data) {
-        this.editDetails.totalno = data
-      },
-      changeMainTab(e) {
-        this.mainOrderActiveKey = e
-      },
-      changeParentTabs(type) {
-        this.mainOrderActiveKey = type
-      },
-      removeSedOrderFun(data, index) {
-        this.deleteBookingOrder(data.id, index)
-      },
-      removeFun() {
-        this.deleteBookingOrder(this.editDetails.id, this.editIndex)
-      },
-      deleteBookingOrder(id, index) {
-        // eslint-disable-next-line eqeqeq
-        if (id == 0) {
-          this.removeSucc(id, index)
-          return false
-        }
-        this.inSecLoad = true
-        DeleteBookingOrder([id].toString())
-          .then((res) => {
-            if (res.success) {
-              this.$message.success('删除成功')
-              this.removeSucc(id, index)
-            } else {
-              this.$message.error(res.message)
-            }
-          })
-          .catch((err) => {
-            console.log(err)
-          })
-      },
-      removeSucc(id, index) {
-        const removeIndex = index
-        this.sedOrderList.splice(removeIndex, 1)
-        this.$emit('sedOrderRemove', this.sedOrderList)
-        if (this.sedOrderList.length === 0) {
-          this.editIndex = 0
-          this.editDetails = null
-          return false
-        }
-        if (this.editDetails.id === id) {
-          const num = this.editIndex === 0 ? 0 : this.editIndex - 1
-          this.editIndex = num > this.sedOrderList.length ? this.sedOrderList.length - 1 : num
-          this.editDetails = this.sedOrderList[this.editIndex]
+      } else {
+        if ([undefined, null, ''].includes(obj1[k]) && [undefined, null, ''].includes(obj2[k])) {
+          // 这三类数据可视为相等，不做处理
         } else {
-          this.editIndex = removeIndex < this.editIndex ? this.editIndex - 1 : this.editIndex
+          diffRes.old_val[k] = obj1[k]
+          diffRes.new_val[k] = obj2[k]
         }
-        setTimeout(() => {
-          this.inSecLoad = false
-        }, 200)
-        this.$forceUpdate()
-      },
-      cancelRemove() {
-        console.log('== 取消删除 ==')
-      },
-    },
+      }
+    }
+    // 若没有变化，返回null
+    if (isEmptyObject(diffRes.old_val) || isEmptyObject(diffRes.new_val)) {
+      return null
+    }
+    return diffRes
+  }
+  function changeDetailFun(data) {
+    if (inSave.value || inSecLoad.value || sedOrderList.value.length === 0) {
+      return false
+    }
+    const { detail, type } = data
+    if (!detail.bookingEDIExt) {
+      detail.bookingEDIExt = bookingEDIExt
+    }
+    if (
+      ifCompare(sedOrderList.value[editIndex.value], detail) &&
+      !inSecLoad.value &&
+      type !== 'save'
+    ) {
+      sedOrderList.value[editIndex.value].isNoSave = true
+    }
+    editDetails.value = detail
+    sedOrderList.value[editIndex.value] = detail
+    emit('changeHB', sedOrderList.value)
+    that.$forceUpdate()
+  }
+  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 copyFun() {
+    const _data = JSON.parse(JSON.stringify(editDetails.value))
+    _data.isNoSave = true
+    _data.hblno = ''
+    _data.pid = route.query.id
+    _data.id = 0
+    if (!_data.bookingEDIExt) {
+      _data.bookingEDIExt = bookingEDIExt
+    }
+    editDetails.value = _data
+    editIndex.value = sedOrderList.value.length
+    sedOrderList.value.push(_data)
+  }
+  function removeFun() {
+    deleteBookingOrder(editDetails.value.id, editIndex.value)
+  }
+  function changeParentTabs(type) {
+    mainOrderActiveKey.value = type
+  }
+  function pkgsEnCapitalFun(data) {
+    console.log(data)
+    // this.bookingDetails.totalno = data
+  }
+  function changectnall(arr) {
+    let str = ''
+    arr.forEach((item, index) => {
+      str += item.ctnall + '*' + item.ctnnum
+      if (index != arr.length - 1) {
+        str += '/'
+      }
+    })
+    editDetails.value.cntrtotal = str
+  }
+  function changeTotalFun(data) {
+    const { type, val } = data
+    if (type === 'totalKgs') {
+      editDetails.value.kgs = val || editDetails.value.kgs
+    } else if (type === 'totalPkgs') {
+      editDetails.value.pkgs = val || editDetails.value.pkgs
+      const enCapitalRes = RefcargoInfo.value.SetTOTALNO(editDetails.value.pkgs)
+      editDetails.value.totalno = enCapitalRes
+    } else if (type === 'totalCbm') {
+      editDetails.value.cbm = val || editDetails.value.cbm
+    }
+  }
+  function changeCtnInfoFun({ type, val }) {
+    if (type === 'kindpkgs') {
+      editDetails.value.kindpkgs = val
+      const enCapitalRes = RefcargoInfo.value.SetTOTALNO(editDetails.value.pkgs)
+      editDetails.value.totalno = enCapitalRes
+    }
   }
 </script>
 <style lang="less" scoped>
diff --git a/ds-wms-client-web/src/views/operation/seaexport/detail/rules.js b/ds-wms-client-web/src/views/operation/seaexport/detail/rules.js
index 93aa214b..44357de7 100644
--- a/ds-wms-client-web/src/views/operation/seaexport/detail/rules.js
+++ b/ds-wms-client-web/src/views/operation/seaexport/detail/rules.js
@@ -27,7 +27,7 @@ export default {
     route: [{ required: false, message: '请选择航线操作', trigger: 'change' }],
     lineManage: [{ required: false, message: '请选择航线管理', trigger: 'change' }],
     dzRemark: [{ required: false, message: '请选择单证备注', trigger: 'change' }],
-    czRemark: [{ required: false, message: '请选择操作备注', trigger: 'change' }]
+    czRemark: [{ required: false, message: '请选择操作备注', trigger: 'change' }],
   },
   mailingRules: {
     shipper: [{ required: false, message: '请输入发货人', trigger: 'submit' }],
@@ -59,14 +59,14 @@ export default {
     kindpkgs: [{ required: false, message: '请输入包装', trigger: 'change' }],
     kgs: [{ required: false, message: '请输入毛重', trigger: 'change' }],
     cbm: [{ required: false, message: '请输入尺寸', trigger: 'change' }],
-    blfrt: [{ 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' }]
+    goodsname: [{ required: false, message: '请选择品名', trigger: 'change' }],
   },
   billRules: {
     issuetype: [{ required: false, message: '请选择签单方式', trigger: 'change' }],
@@ -90,46 +90,82 @@ export default {
     dunno: [{ required: false, message: '请输入危险品编号', trigger: 'change' }],
     dpage: [{ required: false, message: '请输入危险品页号', trigger: 'change' }],
     dlabel: [{ required: false, message: '请输入危险品标签', trigger: 'change' }],
-    linkman: [{ required: false, message: '请输入危险品联系人', trigger: 'change' }]
+    linkman: [{ required: false, message: '请输入危险品联系人', trigger: 'change' }],
   },
   remarksRules: {
     soremark: [{ required: false, message: '请输入订舱备注', trigger: 'change' }],
-    siremark: [{ 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.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' }],
+    'bookingEDIExt.orderRemark': [
+      { required: false, message: '请输入订舱人说明', trigger: 'change' },
+    ],
     freightpayer: [{ required: false, message: '请输入付款方', trigger: 'change' }],
-    'bookingEDIExt.kingTareweight': [{ 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.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.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.wncm': [
+      { required: false, message: '请输入巴西线木质包装情况', trigger: 'change' },
+    ],
+    'bookingEDIExt.acihbl': [{ required: false, message: '请输入ACI HBL', trigger: 'change' }],
   },
   tableRules: {
     ctnall: { required: false, title: '箱型', message: '请选择箱型', trigger: 'change' },
@@ -142,7 +178,7 @@ export default {
     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' }
+    weighkgs: { required: false, title: '称重重量', message: '请选择称重重量', trigger: 'change' },
   },
   preRules: {
     ctn: { required: false, title: '箱型', message: '请选择箱型', trigger: 'change' },
@@ -151,6 +187,6 @@ export default {
     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' }
-  }
+    cbm: { required: false, title: '尺码', message: '请选择尺码', trigger: 'change' },
+  },
 }
diff --git a/ds-wms-client-web/src/views/operation/seaexport/detail/style/cargoInfo.less b/ds-wms-client-web/src/views/operation/seaexport/detail/style/cargoInfo.less
index 64b4c487..d975e7ed 100644
--- a/ds-wms-client-web/src/views/operation/seaexport/detail/style/cargoInfo.less
+++ b/ds-wms-client-web/src/views/operation/seaexport/detail/style/cargoInfo.less
@@ -126,7 +126,7 @@
       line-height: 36px !important;
     }
     /deep/ .ant-form-item-control{
-      height:36px !important;
+      // height:36px !important;
       line-height: 36px !important;
     }
     .line{
diff --git a/ds-wms-client-web/src/views/operation/seaexport/detail/style/sedOrder.less b/ds-wms-client-web/src/views/operation/seaexport/detail/style/sedOrder.less
index 640b5b6d..10c886cb 100644
--- a/ds-wms-client-web/src/views/operation/seaexport/detail/style/sedOrder.less
+++ b/ds-wms-client-web/src/views/operation/seaexport/detail/style/sedOrder.less
@@ -315,7 +315,7 @@
     list-style: none;
     position: relative;
     text-align: left;
-    padding: 29px 18px 0 0;
+    padding: 29px 0 0 0;
     .parents-tabs-top {
       position: absolute;
       top: 0;
diff --git a/ds-wms-client-web/src/views/operation/seaexport/index.vue b/ds-wms-client-web/src/views/operation/seaexport/index.vue
index f95cf895..fd1a199a 100644
--- a/ds-wms-client-web/src/views/operation/seaexport/index.vue
+++ b/ds-wms-client-web/src/views/operation/seaexport/index.vue
@@ -1757,7 +1757,7 @@
   const AdvancedQueryData = ref<FilterRules>({ logicalOperator: 'and', conditions: [], groups: [] })
   const fields = ref<Field[]>([])
   const permissionId = ref<String>('')
-  const ConditionalList = ref<String>('')
+  const ConditionalList: Ref<any> = ref()
   // ========
   onBeforeRouteLeave((to, from, next) => {
     appStore.setbookingGridOptions(gridOptions)
@@ -1817,13 +1817,16 @@
   onMounted(() => {
     onresize()
   })
-  // ========
+  // ====================================================
+  //打开高级查询弹窗
   function FnOpenAdvancedQuery() {
     AdvancedQueryVisible.value = true
   }
+  //关闭高级查询弹窗
   function FnCancelAdvancedQuery() {
     AdvancedQueryVisible.value = false
   }
+  //执行高级查询
   async function FnAdvancedQuery() {
     let Api = (data) => {
       let Obj: any = {}
@@ -1863,7 +1866,10 @@
       }
       return Obj
     }
-    ConditionalList.value = JSON.stringify(Api(AdvancedQueryData.value).ConditionalList)
+
+    ConditionalList.value = {
+      ConditionalList: Api(AdvancedQueryData.value).ConditionalList,
+    }
 
     let ApiData = {
       permissionId: permissionId.value,
@@ -1872,10 +1878,165 @@
     const res: API.DataResult = await UpdateUserQuerySet(ApiData)
     if (res.succeeded) {
       console.log(res)
-      getList(searchData.value)
+      getList(searchData.value, false, 'normal', true)
       FnCancelAdvancedQuery()
     }
   }
+  // 查询列表数据
+  function getList(queryParam = {}, isInit = false, isAdd = 'normal', isAdv = false) {
+    gridOptions.loading = true
+    const { currentPage, pageSize } = gridOptions.pagerConfig
+    let query = {
+      pageCondition: {
+        pageIndex: currentPage,
+        pageSize: pageSize,
+        sortConditions: [],
+      },
+      queryCondition: [],
+    }
+    Object.keys(formRes.value).forEach((item) => {
+      console.log({
+        FieldName: item,
+        FieldValue: formRes.value[item],
+        ConditionalType: 1,
+      })
+      query.queryCondition.push({
+        FieldName: item,
+        FieldValue: formRes.value[item],
+        ConditionalType: 1,
+      })
+    })
+    console.log(queryParam, formRes.value)
+    // Object.keys(query).map((item, index) => {
+    //   if (!query[item]) {
+    //     delete query[item]
+    //   }
+    // })
+    // if (query.queryCondition.MBLNO && query.queryCondition.MBLNO.split(/，|,/).length > 0) {
+    //   const arr = searchData.value.MBLNO.split(/，|,/)
+    //   query.queryCondition.MBLNO = arr.toString()
+    // }
+    // // const firstFlag = appStore.getfirstFlag
+    // // if (firstFlag || nowFirst.value) {
+    // //   query.queryCondition.firstFlag = true
+    // // }
+    // if (
+    //   (!searchData.value.multisort || searchData.value.multisort.length === 0) &&
+    //   (!queryParam.multisort || queryParam.multisort.length === 0) &&
+    //   tableOrderLabel.value &&
+    //   tableOrderType.value
+    // ) {
+    //   query.queryCondition.multisort = [
+    //     {
+    //       sortField: tableOrderLabel.value,
+    //       descSort: tableOrderType.value === 'desc',
+    //     },
+    //   ]
+    // }
+    // if (searchData.value.multisort && searchData.value.multisort.length > 0) {
+    //   query.queryCondition.multisort = searchData.value.multisort
+    // }
+    if (isAdv) {
+      query.queryCondition.push(ConditionalList.value)
+    }
+
+    PageDataByBooking({
+      pageCondition: query.pageCondition,
+      queryCondition: JSON.stringify(query.queryCondition),
+    })
+      .then((res) => {
+        if (res.succeeded) {
+          let newBookingList = {}
+          if (query.queryCondition.PageNo !== 1) {
+            newBookingList = appStore.getbookingList
+          }
+          const _data = res.data.map((item, index) => {
+            item.index = (currentPage - 1) * pageSize + index
+            const bookstatus = [
+              { staCode: 'sta_cangdan', isChecked: false },
+              { staCode: 'sta_haifang', isChecked: false },
+              { staCode: 'sta_zhuangzai', isChecked: false },
+              { staCode: 'sta_mafang', isChecked: false },
+              { staCode: 'sta_zhuangchuan', isChecked: false },
+              { staCode: 'sta_atd', isChecked: false },
+            ]
+            if (item.bookstatus.length > 0) {
+              bookstatus.map((book, bindex) => {
+                item.bookstatus.map((item, index) => {
+                  if (item.staCode === book.staCode) {
+                    bookstatus[bindex] = item
+                    bookstatus[bindex].isChecked = true
+                  }
+                })
+              })
+            }
+            if (item.bsstatusname) {
+              if (appStore.getstatusDIct) {
+                appStore.getstatusDIct.forEach((ite) => {
+                  if (ite.name == item.bsstatusname) {
+                    item.bsstatusnameColor = ite.remark
+                  }
+                })
+              }
+            }
+            item.bookstatus = bookstatus
+            item.refshYzitemLoad = false
+            item.webDataLoad = false
+            item.atdLoading = false
+            item.serviceLoad = false
+            item.rowDzMark = false
+            item.rowCzMark = false
+            item.rowCustno = false
+            item.rowSqxs = false
+            item.rowPono = false
+            item.czmarkLoading = false
+            item.custnoLoading = false
+            item.dzmarkLoading = false
+            item.sqxsLoading = false
+            item.ponoLoading = false
+            if (!item.shenQingXiangShi) {
+              item.shenQingXiangShi = ''
+            }
+            let hasGoods = 0
+            if (item.goodsStatusList) {
+              item.goodsStatusList.map((gitem, gindex) => {
+                if (gitem.finishTime || gitem.remark) {
+                  hasGoods++
+                }
+              })
+            }
+            item.hasGoods = hasGoods
+            newBookingList[item.id] = item
+            return item
+          })
+          gridOptions.pagerConfig.columns = JSON.parse(JSON.stringify(initData.columns))
+          gridOptions.data = [..._data]
+          xGrid.value.reloadData(_data).then(() => {
+            gridOptions.loading = false
+            console.log(gridOptions.loading)
+          })
+          gridOptions.pagerConfig.total = res.data.totalCount
+          appStore.setbookingList(newBookingList)
+          if (tableOrderType.value) {
+            xGrid.value.sort(tableOrderLabel.value, tableOrderType.value)
+          } else {
+            xGrid.value.clearSort()
+          }
+          // that.$forceUpdate()
+        } else {
+          gridOptions.data = [...[]]
+          gridOptions.loading = false
+          // that.$forceUpdate()
+        }
+        ResetType.value = true
+        appStore.setfirstFlag(false)
+        console.log(gridOptions.loading)
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+  }
+  // ====================================================
   function getListByone(listId, listIndex) {
     PageDataByBooking({ id: listId }).then((res) => {
       const item = res.data[0]
@@ -2323,142 +2484,7 @@
     gridOptions.data = []
     getList(queryParam)
   }
-  function getList(queryParam = {}, isInit = false, isAdd = 'normal') {
-    gridOptions.loading = true
-    const { currentPage, pageSize } = gridOptions.pagerConfig
-    const query = {
-      pageCondition: {
-        pageIndex: currentPage,
-        pageSize: pageSize,
-        sortConditions: [],
-      },
-      queryCondition: [],
-    }
-    Object.keys(query).map((item, index) => {
-      if (!query[item]) {
-        delete query[item]
-      }
-    })
-    if (query.queryCondition.MBLNO && query.queryCondition.MBLNO.split(/，|,/).length > 0) {
-      const arr = searchData.value.MBLNO.split(/，|,/)
-      query.queryCondition.MBLNO = arr.toString()
-    }
-    // const firstFlag = appStore.getfirstFlag
-    // if (firstFlag || nowFirst.value) {
-    //   query.queryCondition.firstFlag = true
-    // }
-    if (
-      (!searchData.value.multisort || searchData.value.multisort.length === 0) &&
-      (!queryParam.multisort || queryParam.multisort.length === 0) &&
-      tableOrderLabel.value &&
-      tableOrderType.value
-    ) {
-      query.queryCondition.multisort = [
-        {
-          sortField: tableOrderLabel.value,
-          descSort: tableOrderType.value === 'desc',
-        },
-      ]
-    }
-    if (searchData.value.multisort && searchData.value.multisort.length > 0) {
-      query.queryCondition.multisort = searchData.value.multisort
-    }
-    PageDataByBooking({
-      ...query,
-      ConditionalList: ConditionalList.value,
-    })
-      .then((res) => {
-        if (res.succeeded) {
-          let newBookingList = {}
-          if (query.queryCondition.PageNo !== 1) {
-            newBookingList = appStore.getbookingList
-          }
-          const _data = res.data.map((item, index) => {
-            item.index = (currentPage - 1) * pageSize + index
-            const bookstatus = [
-              { staCode: 'sta_cangdan', isChecked: false },
-              { staCode: 'sta_haifang', isChecked: false },
-              { staCode: 'sta_zhuangzai', isChecked: false },
-              { staCode: 'sta_mafang', isChecked: false },
-              { staCode: 'sta_zhuangchuan', isChecked: false },
-              { staCode: 'sta_atd', isChecked: false },
-            ]
-            if (item.bookstatus.length > 0) {
-              bookstatus.map((book, bindex) => {
-                item.bookstatus.map((item, index) => {
-                  if (item.staCode === book.staCode) {
-                    bookstatus[bindex] = item
-                    bookstatus[bindex].isChecked = true
-                  }
-                })
-              })
-            }
-            if (item.bsstatusname) {
-              if (appStore.getstatusDIct) {
-                appStore.getstatusDIct.forEach((ite) => {
-                  if (ite.name == item.bsstatusname) {
-                    item.bsstatusnameColor = ite.remark
-                  }
-                })
-              }
-            }
-            item.bookstatus = bookstatus
-            item.refshYzitemLoad = false
-            item.webDataLoad = false
-            item.atdLoading = false
-            item.serviceLoad = false
-            item.rowDzMark = false
-            item.rowCzMark = false
-            item.rowCustno = false
-            item.rowSqxs = false
-            item.rowPono = false
-            item.czmarkLoading = false
-            item.custnoLoading = false
-            item.dzmarkLoading = false
-            item.sqxsLoading = false
-            item.ponoLoading = false
-            if (!item.shenQingXiangShi) {
-              item.shenQingXiangShi = ''
-            }
-            let hasGoods = 0
-            if (item.goodsStatusList) {
-              item.goodsStatusList.map((gitem, gindex) => {
-                if (gitem.finishTime || gitem.remark) {
-                  hasGoods++
-                }
-              })
-            }
-            item.hasGoods = hasGoods
-            newBookingList[item.id] = item
-            return item
-          })
-          gridOptions.pagerConfig.columns = JSON.parse(JSON.stringify(initData.columns))
-          gridOptions.data = [..._data]
-          xGrid.value.reloadData(_data).then(() => {
-            gridOptions.loading = false
-            console.log(gridOptions.loading)
-          })
-          gridOptions.pagerConfig.total = res.data.totalCount
-          appStore.setbookingList(newBookingList)
-          if (tableOrderType.value) {
-            xGrid.value.sort(tableOrderLabel.value, tableOrderType.value)
-          } else {
-            xGrid.value.clearSort()
-          }
-          // that.$forceUpdate()
-        } else {
-          gridOptions.data = [...[]]
-          gridOptions.loading = false
-          // that.$forceUpdate()
-        }
-        ResetType.value = true
-        appStore.setfirstFlag(false)
-        console.log(gridOptions.loading)
-      })
-      .catch((err) => {
-        console.log(err)
-      })
-  }
+
   function getCompleteListFun({ form, value }) {
     let query = {}
     if (