From ec047af75d953574a6a2fa77c53ccb4c24bfdb0b Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Thu, 22 Aug 2024 17:20:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=AE=B1=E5=9E=8B=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CostEntry/feeTable.vue         |   1 -
 src/design/ant/table.less                     |   1 -
 .../seaexport/detail/components/container.vue |   1 -
 .../operation/seaexport/detail/index.vue      |  13 +-
 .../seaexport/detail/modules/baseInfo.tsx     | 178 ++++++------------
 .../seaexport/detail/modules/cargoInfo.vue    |  42 ++---
 .../seaexport/detail/modules/goodsTable.vue   |  33 +++-
 .../seaexport/detail/modules/preOrder.vue     |  12 +-
 src/views/system/user/columns.tsx             |  44 ++++-
 9 files changed, 145 insertions(+), 180 deletions(-)

diff --git a/src/components/CostEntry/feeTable.vue b/src/components/CostEntry/feeTable.vue
index 51472528..da624aac 100644
--- a/src/components/CostEntry/feeTable.vue
+++ b/src/components/CostEntry/feeTable.vue
@@ -169,7 +169,6 @@
       source: async (query, process) => {
         const res = feeDict.value.length ? feeDict.value : (await GetFeeCodeSelectList())?.data
         if (!feeDict.value.length) feeDict.value = res
-        console.log(res)
         const dict = res.map((res) => {
           return res.code + '-' + res.name
         })
diff --git a/src/design/ant/table.less b/src/design/ant/table.less
index 0b4657b4..ef4f9027 100644
--- a/src/design/ant/table.less
+++ b/src/design/ant/table.less
@@ -184,7 +184,6 @@
       .ht_master {
         .wtHolder {
           min-height: 200px!important;
-          overflow: visible!important;
         }
       }
     }
diff --git a/src/views/operation/seaexport/detail/components/container.vue b/src/views/operation/seaexport/detail/components/container.vue
index 05aae267..ecd54101 100644
--- a/src/views/operation/seaexport/detail/components/container.vue
+++ b/src/views/operation/seaexport/detail/components/container.vue
@@ -43,7 +43,6 @@
 <script lang="ts" setup>
   import { ref, nextTick, defineProps, defineComponent, onMounted, defineExpose } from 'vue'
   import { HotTable } from '@handsontable/vue3'
-  import { registerAllModules } from 'handsontable/registry'
   import 'handsontable/dist/handsontable.full.min.css'
   import { GetOpCtnList } from '/@/views/operation/seaexport/api/BookingLedger'
   import { GetCtnSelectList, GetPackageSelectList } from '/@/api/common'
diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue
index e57d16af..5b7969e0 100644
--- a/src/views/operation/seaexport/detail/index.vue
+++ b/src/views/operation/seaexport/detail/index.vue
@@ -98,10 +98,14 @@
                   :id="id"
                   businessType="1"
                 >
-                
-                  <a-button v-repeat v-if="route.query.status != 'WAIT_ORDER_AUDIT'" @click="completeTask" type="primary">
-                    {{ completeText }}
-                  </a-button>
+                  <span>
+                    <a-button v-repeat class="mr10" v-if="route.query.source == 'Create' && route.query.status == 'WAIT_ORDER_AUDIT'" @click="save" type="primary">
+                      保存
+                    </a-button>
+                    <a-button v-repeat v-if="route.query.status != 'WAIT_ORDER_AUDIT'" @click="completeTask" type="primary">
+                      {{ completeText }}
+                    </a-button>
+                  </span>
                 </ApproveBtns>
               </div>
             </div>
@@ -754,7 +758,6 @@
   }
   // 订舱审核
   const approveDc = (remark) => {
-    save()
     const postData = {
       result: remark ? 2 : 1,
       ids: [id.value],
diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
index 226771f1..cb465d4c 100644
--- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx
+++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
@@ -5,7 +5,7 @@ import { ref, unref } from 'vue'
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { getDictOption } from '/@/utils/dictUtil'
 // 下拉框数据接口
-import { GetClientListByCode, GetCarrierSelectList, GetControllerClientList } from '/@/api/common'
+import { GetClientListByCode, GetCarrierSelectList, GetControllerClientList, getOrgList } from '/@/api/common'
 import {
   GetPackageSelectList,
   GetOrderContactListByClientId,
@@ -23,7 +23,8 @@ import {
   GetSaleList,
   GetCustomerServiceList,
   GetVouchingClerkList,
-  GetLaneUserList
+  GetLaneUserList,
+  GetClientSourceSelectList
 } from '/@/views/operation/seaexport/api/BookingLedger'
 import { useOptionsStore } from '/@/store/modules/options'
 const optionsStore = useOptionsStore()
@@ -2006,8 +2007,6 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel, formActionType }) => {
       return {
         api: GetSaleList,
-        allowClear: true,
-        showSearch: true,
         labelField: 'pinYinCode',
         showName: 'userName',
         valueField: 'userName',
@@ -2015,89 +2014,18 @@ export const otherInfoFormSchema: FormSchema[] = [
         resultField: 'data',
         onChange: async (e, obj) => {
           if (e && obj) {
-            const saleDeptIdArr: any = []
             formModel.saleId = obj.id
             formModel.saleOrgId = obj.defaultOrgId
             formModel.saleDeptId = obj.deptId
-            if (formActionType) {
-              const saleDeptDict: any = []
-              obj.saleOrgList.forEach((item) => {
-                saleDeptDict.push({ label: item.orgName, value: item.orgId })
-              })
-              if (obj.defaultOrgId) {
-                await GetDeptList({ orgId: obj.defaultOrgId }).then((res) => {
-                  res.data.forEach((item) => {
-                    saleDeptIdArr.push({ label: item.orgName, value: item.id })
-                  })
-                })
-              }
-              const { updateSchema } = formActionType
-              updateSchema([
-                {
-                  label: '所属分部',
-                  field: 'saleOrgId',
-                  component: 'Select',
-                  required: false,
-                  dynamicDisabled: false,
-                  calssName: 'saleOrgId',
-                  // defaultValue: '',
-                  colProps: { span: 12 },
-                  componentProps: {
-                    allowClear: true,
-                    options: saleDeptDict,
-                    showSearch: true,
-                    filterOption: (input: string, option: any) => {
-                      return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                    },
-                    onChange: (e, obj) => {
-                      formModel.saleDeptId = ''
-                      GetDeptList({ orgId: e }).then((res) => {
-                        let Arr: any = []
-                        res.data.forEach((item) => {
-                          Arr.push({ label: item.orgName, value: item.id })
-                        })
-                        updateSchema({
-                          label: '所属部门',
-                          field: 'saleDeptId',
-                          component: 'Select',
-                          required: false,
-                          dynamicDisabled: false,
-                          // defaultValue: '',
-                          colProps: { span: 12 },
-                          componentProps: {
-                            allowClear: true,
-                            options: Arr,
-                            showSearch: true,
-                            filterOption: (input: string, option: any) => {
-                              return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                            }
-                          }
-                        })
-                      })
-                    }
-                  }
-                },
-                {
-                  label: '所属部门',
-                  field: 'saleDeptId',
-                  component: 'Select',
-                  required: false,
-                  dynamicDisabled: false,
-                  // defaultValue: '',
-                  colProps: { span: 12 },
-                  componentProps: {
-                    allowClear: true,
-                    options: saleDeptIdArr,
-                    showSearch: true,
-                    filterOption: (input: string, option: any) => {
-                      return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                    },
-                  },
-                },
-              ])
-            }
-          } else {
+            formModel.saleDeptName = obj.deptName
+            formModel.saleOrgName = obj.defaultOrgName
+          }
+          if (!e && !obj) {
             formModel.saleId = null
+            formModel.saleOrgId = null
+            formModel.saleDeptId = null
+            formModel.saleDeptName = null
+            formModel.saleOrgName = null
           }
         }
       }
@@ -2327,38 +2255,38 @@ export const otherInfoFormSchema: FormSchema[] = [
   {
     label: '',
     component: 'Input',
-    field: 'sourceName',
+    field: 'sourceId',
     show: false
   },
   {
     label: '业务来源',
-    field: 'sourceId',
+    field: 'sourceName',
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
     colProps: { span: 12 },
     componentProps: ({ formModel }) => {
       return {
-        option: optionsStore.getOptionsByCode('GetClientSourceSelectList'),
+        api: GetClientSourceSelectList,
         labelField: 'sourceName',
-        valueField: 'id',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
+        valueField: 'sourceName',
+        immediate: false,
+        resultField: 'data',
         onChange: async (e, obj) => {
+          console.log(obj)
           if (e && obj) {
             formModel.sourceCode = obj.sourceCode
-            formModel.sourceCode = obj.sourceName
+            formModel.sourceId = obj.id
           }
           if (!e && !obj) {
             formModel.sourceCode = null
-            formModel.sourceCode = null
+            formModel.sourceId = null
           }
           formModel.sourceDetailId = null
           formModel.sourceDetailName = null
-        },
+        }
       }
-    },
+    }
   },
   {
     label: '来源明细',
@@ -2412,49 +2340,47 @@ export const otherInfoFormSchema: FormSchema[] = [
     colProps: { span: 12 }
   },
   {
-    label: '所属分部',
+    label: '',
     field: 'saleOrgId',
+    component: 'Input',
+    show: false,
+  },
+  {
+    label: '所属分部',
+    field: 'saleOrgName',
     component: 'ApiSelect',
     required: false,
     colProps: { span: 12 },
     calssName: 'saleOrgId',
-    dynamicDisabled: ({ values }) => {
-      return !values.saleId
-    },
     componentProps: ({ formModel }) => {
       return {
-        option: optionsStore.getOptionsByCode('GetOrgList'),
-        allowClear: true,
-        showSearch: true,
+        api: getOrgList,
         labelField: 'label',
         valueField: 'value',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
+        resultField: 'data',
+        immediate: false,
         onChange: (e, obj) => {
-          if (obj) {
+          console.log(obj)
+          if (e && obj) {
             formModel.saleOrgName = obj.label
-          } else {
-            formModel.saleOrgName = ''
+            formModel.saleOrgId = obj.id
+          }
+          if (!e && !obj) {
+            formModel.saleOrgName = null
+            formModel.saleOrgId = null
           }
         }
       }
     }
   },
   {
-    field: 'saleDeptName',
+    field: 'saleDeptId',
     label: '',
     component: 'Input',
     show: false
   },
   {
     field: 'saleDeptName',
-    label: '',
-    component: 'Input',
-    show: false
-  },
-  {
-    field: 'saleDeptId',
     label: '所属部门',
     component: 'ApiSelect',
     required: false,
@@ -2462,19 +2388,21 @@ export const otherInfoFormSchema: FormSchema[] = [
     colProps: { span: 12 },
     componentProps: ({ formModel }) => {
       return {
-        option: optionsStore.getOptionsByCode('GetDeptList'),
-        allowClear: true,
-        showSearch: true,
-        labelField: 'orgName',
-        valueField: 'id',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        api: GetDeptList,
+        params: {
+          orgId: formModel.saleOrgId
         },
+        labelField: 'orgName',
+        valueField: 'orgName',
+        resultField: 'data',
+        immediate: false,
         onChange: (e, obj) => {
-          if (obj) {
-            formModel.saleDeptName = obj.label
-          } else {
-            formModel.saleDeptName = ''
+          console.log(obj)
+          if (e && obj) {
+            formModel.saleDeptId = obj.id
+          }
+          if (!e && !obj) {
+            formModel.saleDeptId = null
           }
         }
       }
diff --git a/src/views/operation/seaexport/detail/modules/cargoInfo.vue b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
index d52459ee..bea4c208 100644
--- a/src/views/operation/seaexport/detail/modules/cargoInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
@@ -400,27 +400,27 @@
   // 判断页面来源
   const source = ref(route.query.source || 'edit') 
   onMounted(() => {
-    if (source.value != 'edit') {
-      cargoInfoFormSchema1.forEach(item => {
-        item.dynamicDisabled = true
-      })
-      cargoInfoFormSchema2.forEach(item => {
-        item.dynamicDisabled = true
-      })
-      cargoInfoFormSchema3.forEach(item => {
-        item.dynamicDisabled = true
-      })
-    } else {
-      cargoInfoFormSchema1.forEach(item => {
-        item.dynamicDisabled = false
-      })
-      cargoInfoFormSchema2.forEach(item => {
-        item.dynamicDisabled = false
-      })
-      cargoInfoFormSchema3.forEach(item => {
-        item.dynamicDisabled = false
-      })
-    }
+    // if (source.value != 'edit') {
+    //   cargoInfoFormSchema1.forEach(item => {
+    //     item.dynamicDisabled = true
+    //   })
+    //   cargoInfoFormSchema2.forEach(item => {
+    //     item.dynamicDisabled = true
+    //   })
+    //   cargoInfoFormSchema3.forEach(item => {
+    //     item.dynamicDisabled = true
+    //   })
+    // } else {
+    //   cargoInfoFormSchema1.forEach(item => {
+    //     item.dynamicDisabled = false
+    //   })
+    //   cargoInfoFormSchema2.forEach(item => {
+    //     item.dynamicDisabled = false
+    //   })
+    //   cargoInfoFormSchema3.forEach(item => {
+    //     item.dynamicDisabled = false
+    //   })
+    // }
   })
   function SetTOTALNO(SS) {
     let DSS = SS.toString()
diff --git a/src/views/operation/seaexport/detail/modules/goodsTable.vue b/src/views/operation/seaexport/detail/modules/goodsTable.vue
index 6757c0bc..ae4d63c6 100644
--- a/src/views/operation/seaexport/detail/modules/goodsTable.vue
+++ b/src/views/operation/seaexport/detail/modules/goodsTable.vue
@@ -1012,6 +1012,7 @@
     })
     list.value = res
     hotmain.value.hotInstance.loadData(res)
+    computing()
   }
   const moreVisible = ref(false)
   // 打开多品名
@@ -1307,13 +1308,13 @@
     },
   ])
 
-  init()
-  function init() {
-    GetCtnSelectList().then((res) => {
-      ctnDict.value = res.data
-    })
-    tableLoaded.value = true
-  }
+  // init()
+  // function init() {
+  //   GetCtnSelectList().then((res) => {
+  //     ctnDict.value = res.data
+  //   })
+  //   tableLoaded.value = true
+  // }
   function changeSelectedRowKeys(keys) {
     selectArr.value = keys
     checkboxOption.value.selectedRowKeys = keys
@@ -1358,6 +1359,12 @@
           const data = JSON.parse(res.data)
           // 回填船名航次
           if (data.length) {
+            // 去除原数组cntrNo为空的行
+            for (var i = 0; i < list.value.length; i++) {
+              if (!list.value[i].cntrNo) {
+                list.value.splice(i, 1)
+              }
+            }
             // 导入去重
             for (var i = 0; i < data.length; i++) {
               if (list.value.length) {
@@ -2004,7 +2011,15 @@
       }
     }
   }
-</style>
-<style>
 
 </style>
+<style lang='less'>
+.goods-table {
+  .handsontable {
+    .wtHider {
+      max-height: 240px!important;
+      min-height: 130px;
+    }
+  }
+}
+</style>
diff --git a/src/views/operation/seaexport/detail/modules/preOrder.vue b/src/views/operation/seaexport/detail/modules/preOrder.vue
index 86af06cf..3d191617 100644
--- a/src/views/operation/seaexport/detail/modules/preOrder.vue
+++ b/src/views/operation/seaexport/detail/modules/preOrder.vue
@@ -317,15 +317,6 @@ const linkageForm = async (val) => {
   orderList.value[editIndex.value].hblno = val
 }
 
-
-
-
-
-
-
-
-
-
 function close() {
   openPreOrderShow.value = false
 }
@@ -1013,6 +1004,9 @@ defineExpose({
 
 .right {
   width: calc(100% - 320px);
+  height: 80vh;
+  overflow-y: auto;
+  overflow-x: hidden;
 }
 
 .left-title {
diff --git a/src/views/system/user/columns.tsx b/src/views/system/user/columns.tsx
index 874f7676..f8606393 100644
--- a/src/views/system/user/columns.tsx
+++ b/src/views/system/user/columns.tsx
@@ -391,6 +391,12 @@ export const formSchema: FormSchema[] = [
       }
     },
   },
+  {
+    field: 'defaultOrgName',
+    label: '',
+    component: 'Input',
+    show: false
+  },
   {
     field: 'defaultOrgId',
     label: '默认机构',
@@ -398,7 +404,7 @@ export const formSchema: FormSchema[] = [
     component: 'Select',
     // defaultValue: '',
     colProps: { span: 12 },
-    componentProps: ({ formActionType }) => {
+    componentProps: ({ formModel, formActionType }) => {
       return {
         options: selectOrgList.value || [],
         resultField: 'data',
@@ -406,7 +412,7 @@ export const formSchema: FormSchema[] = [
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
-        onChange: async (e: ChangeEvent) => {
+        onChange: async (e, obj) => {
           const res: API.DataResult = await getDeptList({ orgId: e })
           if (res.succeeded) {
             selectDeptList.value = []
@@ -414,6 +420,12 @@ export const formSchema: FormSchema[] = [
               selectDeptList.value.push({ label: e.orgName, value: e.id })
             })
           }
+          if (e && obj) {
+            formModel.defaultOrgName = obj.label
+          }
+          if (!e && !obj) {
+            formModel.defaultOrgName = null
+          }
           if (formActionType) {
             formActionType.setFieldsValue({
               deptId: '',
@@ -423,18 +435,34 @@ export const formSchema: FormSchema[] = [
       }
     },
   },
+  {
+    field: 'deptName',
+    label: '',
+    component: 'Input',
+    show: false
+  },
   {
     field: 'deptId',
     label: '默认部门',
     component: 'Select',
     // defaultValue: '',
     colProps: { span: 12 },
-    componentProps: {
-      options: selectDeptList,
-      allowClear: true,
-      showSearch: true,
-      filterOption: (input: string, option: any) => {
-        return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    componentProps: ({ formModel }) => {
+      return {
+        options: selectDeptList,
+        allowClear: true,
+        showSearch: true,
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: (e, obj) => {
+          if (e && obj) {
+            formModel.deptName = obj.label
+          }
+          if (!e && !obj) {
+            formModel.deptName = null
+          }
+        }
       }
     },
     dynamicDisabled: ({ values }) => {

From f813030de52995df9ca58802bebe0316cf4594cb Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Fri, 23 Aug 2024 13:32:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=AE=B1=E5=9E=8B=E8=A1=A8=E6=A0=BCbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html                                    |  2 +-
 src/design/ant/table.less                     |  1 +
 src/views/operation/seaexport/columns.tsx     | 14 +++++++---
 .../operation/seaexport/detail/index.vue      |  3 ++-
 .../seaexport/detail/modules/baseInfo.tsx     | 23 ++++++++--------
 .../seaexport/detail/modules/basicInfo.vue    |  1 -
 .../seaexport/detail/modules/cargoInfo.vue    | 11 +++++++-
 .../seaexport/detail/modules/goodsTable.vue   |  7 +++++
 .../seaexport/detail/modules/rightContent.vue | 26 ++++++++++++++-----
 src/views/operation/seaexport/index.vue       |  7 ++++-
 10 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/index.html b/index.html
index 649142c7..5d1791aa 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,7 @@
     />
     <title><%= title %></title>
     <link rel="icon" href="/favicon.ico" />
-    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_j0sw6eo6ae.css" />
+    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_39sb3qu5lct.css" />
   </head>
   <body>
     <script>
diff --git a/src/design/ant/table.less b/src/design/ant/table.less
index ef4f9027..304a20a3 100644
--- a/src/design/ant/table.less
+++ b/src/design/ant/table.less
@@ -68,6 +68,7 @@
     padding: 0px;
   }
 }
+
 .ant-table-thead {
   th {
     background-color: rgba(240, 244, 250, 1) !important;
diff --git a/src/views/operation/seaexport/columns.tsx b/src/views/operation/seaexport/columns.tsx
index 94adad7d..4d897780 100644
--- a/src/views/operation/seaexport/columns.tsx
+++ b/src/views/operation/seaexport/columns.tsx
@@ -79,7 +79,7 @@ getDictOption('seaexport_ctn_map').then((res) => {
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'customerNo:mblno:hblno',
+    field: 'customerNo:mblno:hblno:bookingNo:contractNo:customerNum',
     label: '编号查询',
     component: 'Input',
     // defaultValue: '',
@@ -307,7 +307,7 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     field: 'contractNo',
-    label: '运费协议号',
+    label: '约号',
     component: 'Input',
     show: false
   },
@@ -553,7 +553,13 @@ export const columns: BasicColumn[] = [
   },
   {
     dataIndex: 'contractNo',
-    title: '运费协议号',
+    title: '约号',
+    sorter: true,
+    width: 150,
+  },
+  {
+    dataIndex: 'customerNum',
+    title: '客户编号',
     sorter: true,
     width: 150,
   },
@@ -1469,7 +1475,7 @@ export const BatchModificationFormSchema: FormSchema[] = [
   },
   {
     field: 'contractNo',
-    label: '运费协议号',
+    label: '约号',
     component: 'Input',
     required: false,
     dynamicDisabled: false,
diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue
index 5b7969e0..372d34c7 100644
--- a/src/views/operation/seaexport/detail/index.vue
+++ b/src/views/operation/seaexport/detail/index.vue
@@ -124,7 +124,7 @@
             </transition>
             <transition name="slide">
               <rightContent
-                v-if="id"
+                v-if="id && !isOpenSet"
                 class="right-content"
                 ref="RefrightContent"
                 :id="id"
@@ -217,6 +217,7 @@
   
   import { useMultipleTabStore } from '/@/store/modules/multipleTab'
   import { Divider } from 'ant-design-vue'
+import { fastCall } from 'handsontable/helpers'
   
   const go = useGo()
   // 页面loading
diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
index cb465d4c..a50bfa58 100644
--- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx
+++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
@@ -57,15 +57,11 @@ const FntradeTerm = ref([])
 getDictOption('packing_type').then((res) => {
   FntradeTerm.value = res
 })
-// 单提份数字典
+// 单提份数/副本份数字典
 const FnnoBill = ref([])
 getDictOption('no_bill').then((res) => {
   FnnoBill.value = res
-})
-// 副本份数字典
-const FncopyNoBill = ref([])
-getDictOption('copy_no_bill').then((res) => {
-  FncopyNoBill.value = res
+  console.log(FnnoBill.value)
 })
 // 销售字典
 const salerCodeDict = ref([])
@@ -210,11 +206,13 @@ export const basicInfoFormSchema: FormSchema[] = [
         mode: 'SECRET_COMBOBOX_MODE_DO_NOT_USE',
         onChange: (e, obj) => {
           if (e && obj) {
-            cno.value = e
+            cno.value = obj.contractNote
           }
         },
         onBlur: () => {
-          formActionType ? formActionType.linkageForm(cno) : null
+          if (cno.value) {
+            formActionType ? formActionType.linkageForm(cno) : null
+          }
         }
       }
     }
@@ -1304,7 +1302,7 @@ export const noteFormSchema: FormSchema[] = [
     component: 'Select',
     required: false,
     dynamicDisabled: false,
-    // defaultValue: '',
+    defaultValue: null,
     colProps: { span: 5 },
     componentProps: {
       options: FnnoBill,
@@ -1321,10 +1319,10 @@ export const noteFormSchema: FormSchema[] = [
     component: 'Select',
     required: false,
     dynamicDisabled: false,
-    // defaultValue: '',
+    defaultValue: null,
     colProps: { span: 5 },
     componentProps: {
-      options: FncopyNoBill,
+      options: FnnoBill,
       allowClear: true,
       showSearch: true,
       filterOption: (input: string, option: any) => {
@@ -1716,9 +1714,10 @@ export const cargoInfoFormSchema2: FormSchema[] = [
     field: 'goodsName',
     label: '品名',
     component: 'ApiSelect',
+    labelSlot: 'goodsName',
     required: false,
     dynamicDisabled: false,
-    // defaultValue: '',
+    defaultValue: null,
     colProps: { span: 12 },
     componentProps: ({ formModel }) => {
       return {
diff --git a/src/views/operation/seaexport/detail/modules/basicInfo.vue b/src/views/operation/seaexport/detail/modules/basicInfo.vue
index a4dd06f3..1aac4f11 100644
--- a/src/views/operation/seaexport/detail/modules/basicInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/basicInfo.vue
@@ -212,7 +212,6 @@
   // 5.自动带出所属分部和所属部门
   // 6.自动带出服务项目。
   const linkageForm = async (item) => {
-    console.log(item)
     if (item.key == 'contractNo') {
       // 修改合约号增加备注
       emitter.emit('seaAddNotes', item.value)
diff --git a/src/views/operation/seaexport/detail/modules/cargoInfo.vue b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
index bea4c208..5c9666f5 100644
--- a/src/views/operation/seaexport/detail/modules/cargoInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
@@ -36,7 +36,11 @@
             <BasicForm @register="registerForm1" class="goods-intro"/>
           </a-col>
           <a-col :span="9">
-            <BasicForm @register="registerForm2" @submit="submit" />
+            <BasicForm @register="registerForm2" @submit="submit">
+              <template #goodsName="{ model }">
+                <span class="iconfont icon-jichupeizhi"></span>
+              </template>
+            </BasicForm>
           </a-col>
         </a-row>
       </a-col>
@@ -648,6 +652,11 @@
       height: 130px;
     }
   }
+  .icon-jichupeizhi {
+    float: right;
+    color: #257AFA;
+    cursor: pointer;
+  }
   .icon-30jiantouxiangxiafill {
     margin-left: 3px;
   }
diff --git a/src/views/operation/seaexport/detail/modules/goodsTable.vue b/src/views/operation/seaexport/detail/modules/goodsTable.vue
index ae4d63c6..3eda83a4 100644
--- a/src/views/operation/seaexport/detail/modules/goodsTable.vue
+++ b/src/views/operation/seaexport/detail/modules/goodsTable.vue
@@ -1781,6 +1781,7 @@
         }
         // 计算箱量
         if (changes[0][1] === 'ctnNum') {
+          console.log(ctnDict.value)
           let RData = 0
           list.value.forEach((e) => {
             if (e.ctnNum) {
@@ -1788,6 +1789,8 @@
             }
           })
           let teu = 0
+          const res = ctnDict.value.length ? ctnDict.value : (await GetCtnSelectList())?.data
+          ctnDict.value = res
           ctnDict.value.forEach((item) => {
             if (item.ctnName == list.value[changes[0][0]]['ctn']) {
               teu = item.teu
@@ -2020,6 +2023,10 @@
       max-height: 240px!important;
       min-height: 130px;
     }
+    .htCheckboxRendererInput {
+      position: relative;
+      z-index: 1111;
+    }
   }
 }
 </style>
diff --git a/src/views/operation/seaexport/detail/modules/rightContent.vue b/src/views/operation/seaexport/detail/modules/rightContent.vue
index ba0309ff..07bc91c2 100644
--- a/src/views/operation/seaexport/detail/modules/rightContent.vue
+++ b/src/views/operation/seaexport/detail/modules/rightContent.vue
@@ -211,7 +211,10 @@
         <div style="max-height: 182px; overflow: auto;">
           <div class="remark" v-for="(remark, rindex) in RemarkList" :key="rindex">
             <div class="remark-main">
-              <div class="top"><i class="iconfont icon-yuandian"></i>{{ remark.remark }}</div>
+              <div class="top flex">
+                <i class="iconfont icon-yuandian"></i>
+                <div v-html="remark.remark"></div>
+              </div>
             </div>
             <div class="remark-btn">
               <i class="iconfont icon-bianji1 mr15" @click="editRemark(remark)"></i>
@@ -569,8 +572,12 @@
   function Getremark() {
     remarkSpinning.value = true
     GetSeaExportRemarkList({ id: props.id }).then((res) => {
+      const { data } = res
       remarkSpinning.value = false
-      RemarkList.value = res.data
+      data.forEach(item => {
+        if (item.remark) item.remark = item.remark.replace(/\n/g,'<br/>')
+      })
+      RemarkList.value = data
     })
   }
   //打开备注弹窗
@@ -994,6 +1001,7 @@
   }
   onMounted(() => {
     emitter.on('seaAddNotes', (v) => {
+      console.log(v)
       if (!props.id) return
       if (RemarkList) {
         for (var i = 0; i < RemarkList.value.length; i++) {
@@ -1002,16 +1010,17 @@
           }
         }
       }
+      if (!v) return
       EditSeaExportRemark({
         id: editRemarkVal.value ? editRemarkVal.value.id : 0,
         pId: props.id,
         remark: v,
       })
-        .then((res) => {
-          if (res.succeeded) {
-            Getremark()
-          }
-        })
+      .then((res) => {
+        if (res.succeeded) {
+          Getremark()
+        }
+      })
     })
   })
   defineExpose({
@@ -1029,6 +1038,9 @@
       cursor: pointer;
     }
   }
+  .top {
+    justify-content: flex-start;
+  }
   position: relative;
   top: -40px;
   background: #ffffff;
diff --git a/src/views/operation/seaexport/index.vue b/src/views/operation/seaexport/index.vue
index 9811d89a..cad82f4b 100644
--- a/src/views/operation/seaexport/index.vue
+++ b/src/views/operation/seaexport/index.vue
@@ -377,7 +377,7 @@ const calcColumns = [
   },
 ]
 // 合计数据
-const calcData = ref([])
+const calcData = ref([{}])
 // 批量编辑 弹窗
 const [registerModal, { openModal }] = useModal()
 const [registerTable, { reload, getForm, setLoading, getSelectRows }] = useTable({
@@ -613,6 +613,11 @@ onMounted(() => {
     color: #257afa;
     cursor: pointer;
   }
+  .ds-table {
+    .ant-table-body {
+      min-height: calc(100vh - 310px);
+    }
+  }
 }
 
 .compareIcon {