From 15b26f7dc1a398616de0e2a892098124a9dce265 Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Fri, 12 Jul 2024 18:12:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8D=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common/index.ts                       |   2 +-
 src/assets/images/DOC2.png                    | Bin 0 -> 2385 bytes
 src/assets/images/PDF2.png                    | Bin 0 -> 2355 bytes
 src/assets/images/xksx2.png                   | Bin 0 -> 2515 bytes
 src/components/ActionBar/index.vue            |   3 +-
 src/components/Print/index.vue                | 162 ++++++--
 src/design/public.less                        |   3 +
 src/store/modules/configOptions.ts            |  12 +-
 src/store/modules/options.ts                  |   6 +-
 src/styles/common.scss                        |   6 +
 .../seaexport/detail/components/container.vue | 357 +++++++++++-------
 .../detail/components/ladingInfo.vue          |   8 +-
 12 files changed, 364 insertions(+), 195 deletions(-)
 create mode 100644 src/assets/images/DOC2.png
 create mode 100644 src/assets/images/PDF2.png
 create mode 100644 src/assets/images/xksx2.png

diff --git a/src/api/common/index.ts b/src/api/common/index.ts
index 0e752d68..159634aa 100644
--- a/src/api/common/index.ts
+++ b/src/api/common/index.ts
@@ -67,7 +67,7 @@ enum Api {
   GetFeeCodeSelectList = '/mainApi/ClientCommon/GetFeeCodeSelectList',
   // 获取箱型下拉数据
   GetCtnSelectList = '/mainApi/ClientCommon/GetCtnSelectList',
-  // 保证类型下拉数据
+  // 包装类型下拉数据
   GetPackageSelectList = '/mainApi/ClientCommon/GetPackageSelectList',
   // 签约方式下拉数据
   GetIssueTypeSelectList = '/mainApi/ClientCommon/GetIssueTypeSelectList',
diff --git a/src/assets/images/DOC2.png b/src/assets/images/DOC2.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd036b32979c1233cdfb95554383cf3c6ccba098
GIT binary patch
literal 2385
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
Np;J95WzNAV{{uo}`V0U7

literal 0
HcmV?d00001

diff --git a/src/assets/images/PDF2.png b/src/assets/images/PDF2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3142592050e45b6a402755e3ebaf97d6550241ed
GIT binary patch
literal 2355
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/xksx2.png b/src/assets/images/xksx2.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d160c91d05b27dbb11c992e24fade89aaaa7a4b
GIT binary patch
literal 2515
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

literal 0
HcmV?d00001

diff --git a/src/components/ActionBar/index.vue b/src/components/ActionBar/index.vue
index e1eac991..a9945674 100644
--- a/src/components/ActionBar/index.vue
+++ b/src/components/ActionBar/index.vue
@@ -165,9 +165,8 @@
   .ds-action-bar {
     position: fixed;
     right: 30px;
-
     height: auto;
-    z-index: 99;
+    z-index: 999;
     cursor: pointer;
     width: 52px;
     opacity: 1;
diff --git a/src/components/Print/index.vue b/src/components/Print/index.vue
index d76c418a..7ed9edf9 100644
--- a/src/components/Print/index.vue
+++ b/src/components/Print/index.vue
@@ -6,45 +6,63 @@
 <template>
    <div>
     <a-modal 
-      class="ds-form-detail ds-print"
+      class="ds-form-detail ds-print ds-modal-small"
       v-model:visible="visible"
       v-if="visible"
       title="打印"
-      width="600px"
+      width="850px"
       :maskClosable="false"
     >
       <a-spin :spinning="loading">
-        <a-form
-          ref="fileForm"
-          name="basic"
-          layout="vertical"
-          autocomplete="off"
-        >
-          <a-form-item
-            label="打印格式"
+        <div>
+          <a-form
+            layout="vertical"
+            autocomplete="off"
+            class="ant-form-small"
           >
-            <a-radio-group v-model:value="type">
-              <a-radio value="1">.pdf</a-radio>
-              <a-radio value="2">.xlsx</a-radio>
-              <a-radio value="3">.docx</a-radio>
-            </a-radio-group>
-            <p class="message">默认打印格式为pdf,如需其他格式请选择</p>
-          </a-form-item>
-          <a-spin :spinning="loading">
-            <a-form-item
-              label="点击选择模版将跳转打印预览页"
-            >
-              <a-row :gutter="15">
-                <a-col :span="12" v-for="item in modelData" :key="item.id" @click="toPrint(item.id)">
-                  <div class="model-card">
-                    <span class="iconfont icon-printing" :style="{ fontSize: '13px' }"></span>
-                    {{ item.templateName }}
-                  </div>
-                </a-col>
-              </a-row>
-            </a-form-item>
-          </a-spin>
-        </a-form>
+            <div class="flex" style="justify-content: space-between;">
+              <a-form-item
+                label="关键字"
+              >
+                <a-input v-model:value="name" @keyup.enter="search" style="width: 400px;"></a-input>
+              </a-form-item>
+              <div>
+                <a-button @click="reset">重 置</a-button>
+                <a-button @click="search" type="primary">查 询</a-button>
+              </div>
+            </div>
+          </a-form>
+        </div>
+        <div>
+          <h4>模版</h4>
+        </div>
+        <a-row :gutter="10">
+          <a-col :span="12" v-for="item in modelData" class="mb10" :key="item.id">
+            <div class="model-card">
+              <span class="tem-name">
+                {{ item.templateName }}
+              </span>
+              <span class="flex flex-btns">
+                <dl @click="toPrint(item.id, '1')">
+                  <dt><img src="../../assets/images/PDF2.png" alt=""></dt>
+                  <dd>pdf</dd>
+                </dl>
+                <dl @click="toPrint(item.id, '2', item.name)">
+                  <dt><img src="../../assets/images/xksx2.png" alt=""></dt>
+                  <dd>xlsx</dd>
+                </dl>
+                <dl @click="toPrint(item.id, '3')">
+                  <dt><img src="../../assets/images/DOC2.png" alt=""></dt>
+                  <dd>doc</dd>
+                </dl>
+              </span>  
+            </div>
+          </a-col>
+        </a-row>
+        <div v-show="!modelData.length" class="no-data">
+          <span class="iconfont icon-wushuju" :style="{ fontSize: '50px' }"></span>
+          <div class="mb10">暂无数据</div>
+        </div>
       </a-spin>
       <template #footer>
       </template>
@@ -64,6 +82,8 @@
       default: null
     }
   })
+  // 关键字名称
+  const name = ref()
   // 弹窗开关
   const visible = ref(false)
   const loading = ref(false)
@@ -73,6 +93,8 @@
   const modelData = ref([])
   // 保存打印的数据
   const jsonDataStr = ref()
+  // 附件原始数据
+  const sourceData = ref([])
   // 组件初始化接口 (接收打印的数据list)
   const init = (v) => {
     visible.value = true
@@ -80,12 +102,26 @@
     loading.value = true
     GetOpenPrintTemplateList({ id: props.id }).then(r => {
       loading.value = false
+      // 保存原始数据
       modelData.value = r.data
+      sourceData.value = JSON.parse(JSON.stringify(r.data))
     }).catch(() => {
       loading.value = false
     })
   }
-
+  // 重置
+  const reset = () => {
+    name.value = null
+    modelData.value = sourceData.value
+  }
+  // 查询
+  const search = () => {
+    if (!name.value) return reset()
+    const source = JSON.parse(JSON.stringify(sourceData.value))
+    modelData.value = source.filter(item => {
+      return item.templateName.includes(name.value)
+    })
+  }
   const handleOk = () => {
     visible.value = false
   }
@@ -95,18 +131,24 @@
   }
 
   // 跳转打印
-  const toPrint = (id) => {
+  const toPrint = (id, type, name) => {
     const postData = {
       jsonDataStr: jsonDataStr.value,
-      printType: Number(type.value),
+      printType: type,
       templateId: id
     }
+    loading.value = true
     GetOpenJsonPrintInfo(postData).then(res => {
+      loading.value = false
       if (!res.succeeded) {
         createMessage.error(res.message)
       } else {
         let fileURL = `http://60.209.125.238:3009/PrintTempFile/${res.data}`
-        window.open(fileURL)
+        if (type == 1) {
+          window.open(fileURL)
+        } else {
+          window.open(`//60.209.125.238:3009/PrintTempFile/${res.data}`, '_blank')
+        }
       }
     })
   }
@@ -121,17 +163,55 @@
       font-size: 12px;
       color: #f05;
     }
+    .tem-name {
+      font-size: 12px;
+      color: #7A8798;
+    }
+    .ant-spin-container {
+      min-height: 270;
+    }
     .model-card {
       padding: 10px;
-      background: #eff6f5;
-      cursor: pointer;
-      border-radius: 5px;
+      background: #F5F9FC;
+      border-radius: 2px;
+      border-left: 1px solid #257AFA;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
     }
     .ant-modal-footer {
       display: none;
     }
-    .model-card:hover {
-      color: #4A54FF;
+    .ant-btn {
+      width: 80px;
+      margin-left: 10px;
+      margin-top: 25px;
+    }
+    h4 {
+      margin: 16px 0 13px;
+    }
+    dt {
+      img {
+        width: 16px;
+        height: 18px;
+      }
+    }
+    dd {
+      font-size: 10px;
+      margin: 0;
+      color: #257AFA;
+    }
+    dl {
+      margin: 0 10px 0 7px;
+      cursor: pointer;
+    }
+    .flex-btns {
+      position: relative;
+      top: 2px;
+    }
+    .no-data {
+      text-align: center;
+      color: #7A8798;
     }
   }
 </style>
diff --git a/src/design/public.less b/src/design/public.less
index dad383dc..7feba680 100644
--- a/src/design/public.less
+++ b/src/design/public.less
@@ -97,6 +97,9 @@
     width: 100%;
     font-size: 12px!important;
   }
+  .ant-btn {
+    height: 26px;
+  }
 }
 
 .ant-col-5 {
diff --git a/src/store/modules/configOptions.ts b/src/store/modules/configOptions.ts
index 74afab59..3a9506fa 100644
--- a/src/store/modules/configOptions.ts
+++ b/src/store/modules/configOptions.ts
@@ -23,7 +23,7 @@ import {
   GetFactorySelectList,
 } from '/@/views/operation/seaexport/api/BookingLedger'
 import { getList } from '/@/views/flowcenter/flowInstances/api'
-import { GetFeeCurrencySelectList, GetClientListByCode } from '/@/api/common/index'
+import { GetFeeCurrencySelectList, GetClientListByCode, GetCtnSelectList } from '/@/api/common/index'
 import { getClientBankList } from '/@/views/baseinfo/infoclient/api'
 export default {
   // 业务来源
@@ -140,16 +140,22 @@ export default {
       return res.data
     })
   },
-  //派车调度人员
+  // 派车调度人员
   GetDispatcherList: () => {
     return GetDispatcherList().then((res) => {
       return res.data
     })
   },
-  //工厂信息
+  // 工厂信息
   GetFactorySelectList: () => {
     return GetFactorySelectList().then((res) => {
       return res.data
     })
+  },
+  // 箱型
+  GetCtnSelectList: () => {
+    return GetCtnSelectList().then((res) => {
+      return res.data
+    })
   }
 }
diff --git a/src/store/modules/options.ts b/src/store/modules/options.ts
index 5401ee96..6ff5ef78 100644
--- a/src/store/modules/options.ts
+++ b/src/store/modules/options.ts
@@ -49,9 +49,11 @@ export const useOptionsStore = defineStore({
     // 银行信息
     getClientBankList: null,
     // 派车调度人员
-    GetDispatcherList:null,
+    GetDispatcherList: null,
     // 工厂
-    GetFactorySelectList:null
+    GetFactorySelectList: null,
+    // 箱型
+    GetCtnSelectList: null
   }),
   getters: {
     // 通过code获取下拉字典（code)就是接口尾部单词
diff --git a/src/styles/common.scss b/src/styles/common.scss
index d4f0ad0d..24a0ef6c 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -168,6 +168,12 @@ h5 {
 .mt15 {
   margin-top: 15px;
 }
+.mb15 {
+  margin-bottom: 15px;
+}
+.ml15 {
+  margin-left: 15px;
+}
 
 // 表格状态使用
 .ds-green-tag,
diff --git a/src/views/operation/seaexport/detail/components/container.vue b/src/views/operation/seaexport/detail/components/container.vue
index 84182bce..b59a6b40 100644
--- a/src/views/operation/seaexport/detail/components/container.vue
+++ b/src/views/operation/seaexport/detail/components/container.vue
@@ -6,26 +6,153 @@
 
 <template>
   <div class="ds-sea-container-info">
+    <div class="flex">
+      <h4>集装箱信息</h4>
+      <a-button type="link" @click="addRow">
+        <span class="iconfont icon-icon_tianjia"></span>
+        添加
+      </a-button>
+      <a-popconfirm
+        :visible="deleteFlag"
+        title="确定要删除勾选的数据?"
+        ok-text="确定"
+        cancel-text="取消"
+        @confirm="deleteRow"
+        @cancel="cancelDelete"
+        @click="checkDelete"
+      >
+        <a-button danger type="link" >
+          <span class="iconfont icon-shanchu1"></span>
+          删除
+        </a-button>
+      </a-popconfirm>
+      <a-button type="link">
+        <span class="iconfont icon-refresh-1-copy"></span>
+        更新合计
+      </a-button>
+      <a-button type="link">
+        <span class="iconfont icon-a-17Btuichu"></span>
+        调入主单信息
+      </a-button>
+    </div>
     <hot-table ref="hotTb" :data="list" :settings="settings"></hot-table>
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, reactive, defineProps } from 'vue'
-  import { GetSeaExportBillManageList } from '../../api/BookingLedger'
+  import { ref, nextTick, defineProps, defineComponent, onMounted } from 'vue'
+  import { HotTable } from '@handsontable/vue3'
+  import { registerAllModules } from 'handsontable/registry'
+  import 'handsontable/dist/handsontable.full.min.css'
+  import { GetCtnSelectList, GetPackageSelectList } from '/@/api/common'
+  // 引入提示信息
+  import { useMessage } from '/@/hooks/web/useMessage'
+  const { createMessage } = useMessage()
+  defineComponent({
+    HotTable,
+  })
   const props = defineProps({
     id: {
       type: String
     }
   })
+  // 表格ref
   const hotTb = ref(null)
+  // 存箱型数据
+  let ctnList = []
+  // 存包装数据
+  let packageList = []
   // 表格列数据
   const columns = [
-    
+    {
+      data: 'selected',
+      type: 'checkbox',
+      title: ' ',
+      width: 32,
+      className: 'htCenter',
+      readOnly: false,
+    },
+    {
+      title: '箱型',
+      width: 80,
+      data: 'ctn',
+      type: 'dropdown',
+      source: async (query, process) => {
+        const results = await GetCtnSelectList()
+        ctnList = results.data
+        const dict = results.data.map((item) => {
+          return item.ctnName
+        })
+        process(dict)
+      },
+    },
+    {
+      title: '箱量',
+      width: 80,
+      data: 'ctnNum',
+      type: 'numeric',
+    },
+    {
+      title: '箱号',
+      width: 80,
+      data: 'cntrNo',
+      type: 'numeric',
+    },
+    {
+      title: '封号',
+      width: 80,
+      data: 'sealNo',
+      type: 'numeric',
+    },
+    {
+      title: '件数',
+      width: 80,
+      data: 'pkgs',
+      type: 'numeric',
+    },
+    {
+      title: '件数包装',
+      width: 80,
+      data: 'kindPkgsName',
+      type: 'dropdown',
+      source: async (query, process) => {
+        const results = await GetPackageSelectList()
+        packageList = results.data
+        const dict = results.data.map((item) => {
+          return item.packageName
+        })
+        process(dict)
+      },
+    },
+    {
+      title: '重量',
+      width: 80,
+      data: 'kgs',
+      type: 'numeric'
+    },
+    {
+      title: '尺码',
+      width: 80,
+      data: 'cbm',
+      type: 'numeric'
+    },
+    {
+      title: '箱皮重',
+      width: 80,
+      data: 'tareWeight',
+      type: 'numeric'
+    },
+    {
+      title: '备注',
+      width: 80,
+      data: 'note',
+      type: 'numeric'
+    },
   ]
   // 表格绑定数据
   const list = ref([])
-    // 表格配置项
-    const settings = {
+  // 表格配置项
+  const settings = {
+    height: '600',
     width: '100%',
     autoWrapRow: true,
     autoWrapCol: true,
@@ -50,156 +177,98 @@
       if (source === 'edit' || source === 'Autofill.fill' || source === 'CopyPaste.paste') {
         let dict = {}
         changes.forEach((res) => {
-          // 修改费用名称
-          if (res[1] === 'feeName') {
-            // 获取当前选中的字典对象数据
-            const item = feeDict.value.filter((item) => {
-              return changes[0][3].includes(item.name)
+          // 修改箱型
+          if (changes[0][1] === 'ctn') {
+            const item = ctnList.filter((item) => {
+              return item.ctn === changes[0][3]
             })
             if (item) dict = item[0]
-            list.value[res[0]]['feeName'] = changes[0][3].split('-')[1]
-            list.value[res[0]]['feeEnName'] = dict['enName']
-            list.value[res[0]]['currency'] = dict['defaultCurrency']
-            list.value[res[0]]['unitText'] = dict['defaultUnitName']
-            list.value[res[0]]['unit'] = dict['defaultUnit']
-            list.value[res[0]]['customerTypeText'] = dict['defaultDebitName']
-            list.value[res[0]]['customerType'] = dict['defaultDebit']
-            list.value[res[0]]['isOpen'] = dict['isOpen']
-            list.value[res[0]]['isAdvancedPay'] = dict['isAdvancedPay']
-            list.value[res[0]]['isInvoice'] = dict['isInvoice']
-            list.value[res[0]]['feeFrt'] = dict['feeFrt']
-            list.value[res[0]]['feeCode'] = dict['code']
-            list.value[res[0]]['taxRate'] = dict['taxRate']
+            list.value[changes[0][0]]['ctnId'] = dict?.id
           }
-        })
-        // 修改费用英文名称
-        if (changes[0][1] === 'feeEnName') {
-        }
-        // 修改费用对象
-        if (changes[0][1] === 'customerName') {
-          const item = companyDict.value.filter((item) => {
-            return changes[0][3].includes(item.name)
-          })
-          if (item) dict = item[0]
-          list.value[changes[0][0]]['customerCode'] = dict?.value
-          list.value[changes[0][0]]['customerName'] = changes[0][3].split('-')[1]
-        }
-        // 修改客户类别
-        if (changes[0][1] === 'customerTypeText') {
-          getDictOption('djy_cust_prop').then((res) => {
-            const item = res.filter((item) => {
-              return changes[0][3].includes(item.name)
+          // 修改包装类型
+          if (changes[0][1] === 'kindPkgsName') {
+            const item = ctnList.filter((item) => {
+              return item.packageName === changes[0][3]
             })
             if (item) dict = item[0]
-            list.value[changes[0][0]]['customerType'] = dict?.value
-            list.value[changes[0][0]]['customerTypeText'] = changes[0][3].split('-')[1]
-            // 调用接口取费用对象
-            console.log(props.details)
-            GetClientSelectInfoByCode({ code: dict?.value, businessId: props.id, businessType: props.type }).then(res => {
-              list.value[changes[0][0]]['customerCode'] = res.data.clientId
-              list.value[changes[0][0]]['customerName'] = res.data.clientName
-            })
-          })
-        }
-        // 修改单位
-        if (changes[0][1] === 'unitText') {
-          const item = unitDict.value.filter((item) => {
-            return changes[0][3].includes(item.name)
-          })
-          if (item) dict = item[0]
-          list.value[changes[0][0]]['unit'] = dict?.value
-          list.value[changes[0][0]]['unitText'] = changes[0][3].split('-')[1]
-          GetUnitSelectInfo({ code: dict?.value, businessId: props.id, businessType: props.type }).then(res => {
-            list.value[changes[0][0]]['quantity'] = res.data.quantity
-          })
-          // 业务数据有件数，修改单位，带出件数
-          // const text = list.value[changes[0][0]]['unitText']
-          // if (text == '单票') {
-          //   list.value[changes[0][0]]['quantity'] = 1
-          // } else if (text == '件数') {
-          //   list.value[changes[0][0]]['quantity'] = props.details.pkgs
-          // } else if (text == '重量') {
-          //   list.value[changes[0][0]]['quantity'] = props.details.kgs
-          // } else if (text == '尺码') {
-          //   list.value[changes[0][0]]['quantity'] = props.details.cbm
-          // } else if (text == '计费吨') {
-          //   let r = props.details.kgs
-          //   const k = (props.details.pkgs || 0) / 1000
-          //   if (k > r) {
-          //     r = k
-          //   }
-          //   list.value[changes[0][0]]['quantity'] = r
-          
-        }
-        // 修改币别
-        if (changes[0][1] === 'currencyName') {
-          const item = currencyDict.value.filter((item) => {
-            return item.name === changes[0][3]
+            list.value[changes[0][0]]['kindPkgs'] = dict?.ediCode
+          }
+        })
+      }
+    }
+  }
+  const row = {
+    selected: false,
+    ctn: '',
+    ctnId: '',
+    id: '',
+    ctnNum: '',
+    cntrNo: '',
+    sealNo: '',
+    pkgs: '',
+    kindPkgs: '',
+    kindPkgsName: '',
+    kgs: '',
+    cbm: '',
+    tareWeight: '',
+    note: ''
+  }
+  // 添加行
+  const addRow = () => {
+    const deepCopyRow = JSON.parse(JSON.stringify(row))
+    list.value.push(deepCopyRow)
+  }
+  // 删除
+  const deleteFlag = ref(false)
+  // 校验是否选中行
+  const checkDelete = () => {
+    let flag = false
+    list.value.forEach(item => {
+      if (item.selected) flag = true
+    })
+    if (!flag) {
+      return createMessage.warning('请勾选要删除的数据！')
+    }
+    deleteFlag.value = true
+  }
+  // 删除选中行
+  const deleteRow = () => {
+    const res = list.value.filter(item => {
+      return !item.selected
+    })
+    deleteFlag.value = false
+    hotTb.value.hotInstance.loadData(res)
+  }
+  // 取消删除
+  const cancelDelete = () => {
+    deleteFlag.value = false
+  }
+  onMounted(() => {
+    const hot = hotTb.value.hotInstance
+    hot.addHook('afterOnCellMouseDown', function (event, coords, TD) {})
+    // 定义表格按键处理逻辑
+    hot.addHook('beforeKeyDown', function (event) {
+      // 检查按下的是否是特定的键（例如 'Enter'）
+      if (event.key === 'ArrowDown') {
+        if (hot.getSelected()[0][0] == list.value.length - 1 && !hot.getActiveEditor()?._opened) {
+          list.value.push(JSON.parse(JSON.stringify(row)))
+          nextTick(() => {
+            hot.selectCell(list.value.length - 1, 3)
           })
-          if (item) dict = item[0]
-          list.value[changes[0][0]]['currency'] = dict?.codeName
-        }
-        // 当前操作的行
-        const index = changes[0][0]
-        // 修改不含税单价计算
-        if (changes[0][1] === 'noTaxPrice') {
-          // 单价
-          list.value[index].unitPrice = Number(
-            (changes[0][3] || 0) * ((list.value[index].taxRate || 0) / 100 + 1),
-          ).toFixed(6)
-          // 金额
-          list.value[index].amount = Number(
-            (list.value[index].unitPrice || 0) * (list.value[index].quantity || 0),
-          ).toFixed(6)
-          // 不含税金额
-          list.value[index].noTaxAmount = Number(
-            (changes[0][3] || 0) * (list.value[index].quantity || 0),
-          ).toFixed(6)
-        }
-        // 修改单价计算
-        if (changes[0][1] === 'unitPrice') {
-          // 不含税单价
-          list.value[index].noTaxPrice = Number(
-            (changes[0][3] || 0) / ((list.value[index].taxRate || 0) / 100 + 1),
-          ).toFixed(6)
-          // 金额
-          list.value[index].amount = Number(
-            (changes[0][3] || 0) * (list.value[index].quantity || 0),
-          ).toFixed(6)
-          // 不含税金额
-          list.value[index].noTaxAmount = Number(
-            (list.value[index].noTaxPrice || 0) * (list.value[index].quantity || 0),
-          ).toFixed(6)
-        }
-        // 修改数量
-        if (changes[0][1] === 'quantity') {
-          // 金额
-          list.value[index].amount = Number(
-            (changes[0][3] || 0) * (list.value[index].unitPrice || 0),
-          ).toFixed(6)
-          // 不含税金额
-          list.value[index].noTaxAmount = Number(
-            (changes[0][3] || 0) * (list.value[index].noTaxPrice || 0),
-          ).toFixed(6)
-        }
-        // 修改税率
-        if (changes[0][1] === 'taxRate') {
-          // 不含税单价
-          list.value[index].noTaxPrice = Number(
-            (list.value[index].unitPrice || 0) / ((changes[0][3] || 0) / 100 + 1),
-          ).toFixed(6)
-          // 不含税金额
-          list.value[index].noTaxAmount = Number(
-            (list.value[index].noTaxPrice || 0) * (list.value[index].quantity || 0),
-          ).toFixed(6)
+          return false
         }
       }
-    },
-  }
+    })
+  })
 </script>
 
 <style lang="less" scoped>
 .ds-sea-container-info {
-
+  .flex {
+    align-items: center;
+    h4 {
+      margin: 0 15px 0 0;
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/operation/seaexport/detail/components/ladingInfo.vue b/src/views/operation/seaexport/detail/components/ladingInfo.vue
index 73352df1..2097ef9d 100644
--- a/src/views/operation/seaexport/detail/components/ladingInfo.vue
+++ b/src/views/operation/seaexport/detail/components/ladingInfo.vue
@@ -22,9 +22,12 @@
         <a-tab-pane key="1" tab="提单信息" size="small">
           <div class="flex">
             <!-- 收发通表单 -->
-            <BasicForm @register="registerForm" />
+            <BasicForm style="flex: 1;" @register="registerForm" />
             <!-- 集装箱组件 -->
-            
+            <container
+              class="ml15"
+              style="width: 700px;"
+            ></container>
           </div>
         </a-tab-pane>
         <a-tab-pane key="2" tab="其他信息" size="small">
@@ -39,6 +42,7 @@
   import { BasicForm, useForm } from '/@/components/Form/index'
   import { GetSeaExportBillManageList } from '../../api/BookingLedger'
   import { formSchema1 } from './ladingInfo'
+  import container from './container.vue'
   const props = defineProps({
     id: {
       type: String