From e9c89e012a89fc6c342a1707e7ba8f50f4439106 Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Sat, 2 Nov 2024 13:22:47 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=8F=90=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/finance/feeSettlement/api.js        |    8 +
 src/views/finance/feeSettlement/columns.tsx   |   19 +-
 src/views/operation/bill/columns.tsx          |    2 +-
 src/views/operation/invoiceApply/columns.tsx  |    3 +
 .../invoiceApply/detail/InvoiceDetails.vue    |   68 +-
 .../invoiceApply/detail/feeTable.vue          |    1 +
 src/views/operation/invoiceApply/index.vue    |    1 +
 src/views/operation/invoiceIssue/columns.tsx  |    3 +-
 .../invoiceIssue/detail/applyInvoice.vue      |   14 +-
 .../seaexport/detail/modules/cargoInfo.vue    |    1 -
 .../seaexport/detail/modules/preOrder.tsx     |    2 -
 .../seaexport/detail/modules/preOrder.vue     | 1889 +++++++++--------
 src/views/system/org/columns.tsx              |   16 +
 13 files changed, 1059 insertions(+), 968 deletions(-)

diff --git a/src/views/finance/feeSettlement/api.js b/src/views/finance/feeSettlement/api.js
index 83670271..debd5bbd 100644
--- a/src/views/finance/feeSettlement/api.js
+++ b/src/views/finance/feeSettlement/api.js
@@ -148,4 +148,12 @@ export function PaymentFreeSettlementGetExchangesAsync(parameter) {
     method: 'post',
     data: parameter,
   })
+}
+
+export function GetOrgBankList(parameter) {
+  return request({
+    url: '/mainApi/ClientCommon/GetOrgBankList',
+    method: 'get',
+    data: parameter,
+  })
 }
\ No newline at end of file
diff --git a/src/views/finance/feeSettlement/columns.tsx b/src/views/finance/feeSettlement/columns.tsx
index 7a8369fb..bb66760c 100644
--- a/src/views/finance/feeSettlement/columns.tsx
+++ b/src/views/finance/feeSettlement/columns.tsx
@@ -7,7 +7,7 @@ const feeDict = ref([])
 import {
   GetVesselSelectList,
 } from '/@/views/operation/seaexport/api/BookingLedger'
-import { GetOrgList, ClientCommonGetStlMode, GetClientBankList } from './api'
+import { GetOrgList, ClientCommonGetStlMode, GetClientBankList,GetOrgBankList } from './api'
 let businessType: any = [
   { value: 1, label: '海运出口' },
 ]
@@ -437,22 +437,7 @@ export const detailForm: FormSchema[] = [
       return {
         api: () => {
           return new Promise((resolve) => {
-            const queryStr = [
-              {
-                FieldName: 'ClientId',
-                FieldValue: formModel.customerId,
-                ConditionalType: '0',
-              },
-            ]
-            const data = {
-              pageCondition: {
-                pageIndex: 1,
-                pageSize: 20,
-                sortConditions: [],
-              },
-              queryCondition: JSON.stringify(queryStr),
-            }
-            GetClientBankList(data).then((res) => {
+            GetOrgBankList().then((res) => {
               res.data.forEach(item=>{
                 item.showName = item.bankName + ' ' + item.bankAccountNo
               })
diff --git a/src/views/operation/bill/columns.tsx b/src/views/operation/bill/columns.tsx
index 981b0953..fd04ba4f 100644
--- a/src/views/operation/bill/columns.tsx
+++ b/src/views/operation/bill/columns.tsx
@@ -191,7 +191,7 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'shipCertCheckOutDate',
+    field: 'checkOutDate',
     label: '签出日期',
     component: 'RangePicker',
     colProps: { span: 4 },
diff --git a/src/views/operation/invoiceApply/columns.tsx b/src/views/operation/invoiceApply/columns.tsx
index 04f61072..b0126b38 100644
--- a/src/views/operation/invoiceApply/columns.tsx
+++ b/src/views/operation/invoiceApply/columns.tsx
@@ -488,6 +488,9 @@ export const detailSearchFormSchema: FormSchema[] = [
         labelField: 'name',
         valueField: 'code',
         resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        }
       }
     },
   },
diff --git a/src/views/operation/invoiceApply/detail/InvoiceDetails.vue b/src/views/operation/invoiceApply/detail/InvoiceDetails.vue
index 9c4e928e..fb2184b0 100644
--- a/src/views/operation/invoiceApply/detail/InvoiceDetails.vue
+++ b/src/views/operation/invoiceApply/detail/InvoiceDetails.vue
@@ -1,12 +1,13 @@
 <template>
     <div>
-        <a-modal width="1600px" @cancel="open = false" :visible="open" title="添加发票申请明细" :footer="null">
+        <a-modal  width="1600px" @cancel="open = false" :visible="open" title="添加发票申请明细" :footer="null">
             <div style="padding-bottom:5px ;">
                 <div>
-                    <BasicTable class="ds-table" :rowClassName="rowClassName" @row-click="handleClick" @register="registerTable" @row-dbClick="(e) => {
-                        GoDetailed(true, e)
-                    }
-                        ">
+                    <BasicTable class="ds-table" :row-selection="{ onChange: onSelectChange }"
+                        :rowClassName="rowClassName" @row-click="handleClick" @register="registerTable" @row-dbClick="(e) => {
+                            GoDetailed(true, e)
+                        }
+                            ">
                         <template #right>
                             <div style="width: 40%;margin-left: 10px;margin-top:51px;">
                                 <div>
@@ -40,6 +41,13 @@
                             <div>
                                 <div class="bold">申请开票明细</div>
                                 <div style="display: flex;">
+                                    <div class="apply" :class="{ active: form.isRMB }">
+                                        <a-checkbox @change="handleChangeApply1"
+                                            :disabled="route.query.id ? true : false"
+                                            v-model:checked="form.isRMB">折算人民币申请</a-checkbox>
+                                        <span class="rmb" v-if="totalRmb != 0">{{ totalRmb }} RMB</span>
+                                        <span></span>
+                                    </div>
                                     <div class="apply" :class="{ active: form.isYB }">
                                         <a-checkbox :disabled="route.query.id ? true : false"
                                             v-model:checked="form.isYB" @change="handleChangeApply">
@@ -50,13 +58,6 @@
                                                     item.currency }}</span>
                                         </a-checkbox>
                                     </div>
-                                    <div class="apply" :class="{ active: form.isRMB }">
-                                        <a-checkbox @change="handleChangeApply1"
-                                            :disabled="route.query.id ? true : false"
-                                            v-model:checked="form.isRMB">折算人民币申请</a-checkbox>
-                                        <span class="rmb" v-if="totalRmb != 0">{{ totalRmb }} RMB</span>
-                                        <span></span>
-                                    </div>
                                 </div>
                                 <div>
                                     <span class="bold">发票申请明细</span>
@@ -211,9 +212,9 @@ const [registerTable, { getForm, setSelectedRowKeys, getSelectRows, setProps, ge
     },
     useSearchForm: true,
     showIndexColumn: false,
-    maxHeight: '600',
-    rowKey:'cindex',
-    id:'11',
+    maxHeight: 450,
+    rowKey: 'cindex',
+    id: '11',
     pagination: true,
     striped: true,
     showTableSetting: true,
@@ -228,7 +229,7 @@ const [registerTable1, { getSelectRows: getSelectRowsFee, setProps: setPropsFee,
     columns: columns,
     useSearchForm: false,
     showIndexColumn: false,
-    maxHeight: '600',
+    maxHeight: 450,
     pagination: false,
     dataSource: dataSource.value,
     striped: true,
@@ -238,16 +239,15 @@ const [registerTable1, { getSelectRows: getSelectRowsFee, setProps: setPropsFee,
     indexColumnProps: {
         width: 60,
     },
-    id:'22',
+    id: '22',
     canResize: true,
     immediate: false,
 })
 const exchangeFlag = ref(false)
-
 const loading = ref(false)
 const form = ref({
-    isYB: true,
-    isRMB: false
+    isYB: false,
+    isRMB: true
 }) as any
 function handleChangeApply(e) {
     form.value.isRMB = !e.target.checked
@@ -389,19 +389,15 @@ function handleClick(record, index) {
         loading.value = false
     })
 }
-function rowClassName(record, index){
-    if(index==activeRow.value){
+function rowClassName(record, index) {
+    if (index == activeRow.value) {
         return 'active-row'
     }
 }
 function init(data) {
     open.value = true
     setTimeout(() => {
-        setProps({
-            rowSelection: {
-                onChange: onSelectChange
-            },
-        })
+
         setPropsFee({
             rowSelection: {
                 onChange: onSelectAmount
@@ -420,6 +416,14 @@ function init(data) {
             form.value.isYB = true
             form.value.isRMB = false
         }
+        watch(
+            () => getSelectRows(),
+            (data) => {
+                console.log(data)
+                onSelectChange(data)
+            },
+            { immediate: false, deep: true }
+        )
     }, 500)
 }
 const rmbTotal = ref(0)
@@ -432,7 +436,7 @@ function onSelectChange(selectedRowKeys) {
     otherTotal.value = 0
     list.forEach(item => {
         selectedRowKeys.forEach(ite => {
-            if (item.id == ite) {
+            if (item.id == ite.id) {
                 rmbTotal.value += Number(item.unBilledRMB)
                 usdTotal.value += Number(item.unBilledUSD)
                 otherTotal.value += Number(item.unBilledOther)
@@ -683,12 +687,14 @@ defineExpose({ init, changeCustIn })
 /deep/ .ant-checkbox-wrapper-checked .ant-checkbox-disabled+span {
     color: #257afa;
 }
-:deep(.active-row){
-    .ant-table-cell{
+
+:deep(.active-row) {
+    .ant-table-cell {
         background: #dfe8f6;
     }
 }
-:deep(.flex){
+
+:deep(.flex) {
     align-items: flex-end !important;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/operation/invoiceApply/detail/feeTable.vue b/src/views/operation/invoiceApply/detail/feeTable.vue
index 8c11349e..d143228c 100644
--- a/src/views/operation/invoiceApply/detail/feeTable.vue
+++ b/src/views/operation/invoiceApply/detail/feeTable.vue
@@ -139,6 +139,7 @@ const [registerTable, { setTableData, setProps, getSelectRows, setLoading }] = u
   indexColumnProps: {
     width: 60,
   },
+  id:'33',
   canResize: true,
   immediate: false,
 })
diff --git a/src/views/operation/invoiceApply/index.vue b/src/views/operation/invoiceApply/index.vue
index dc6815e8..3936060c 100644
--- a/src/views/operation/invoiceApply/index.vue
+++ b/src/views/operation/invoiceApply/index.vue
@@ -154,6 +154,7 @@ const [registerTable, { reload, getPaginationRef, getSelectRows, getRawDataSourc
   indexColumnProps: {
     width: 60,
   },
+  id:'44',
   canResize: true,
   immediate: true,
   actionColumn: {
diff --git a/src/views/operation/invoiceIssue/columns.tsx b/src/views/operation/invoiceIssue/columns.tsx
index f04c16c1..6451579b 100644
--- a/src/views/operation/invoiceIssue/columns.tsx
+++ b/src/views/operation/invoiceIssue/columns.tsx
@@ -893,7 +893,7 @@ export const freeSearch: FormSchema[] = [
   {
     field: 'customerName',
     label: '费用对象',
-    required: true,
+    required: false,
     component: 'ApiSelect',
     colProps: { span: 4 },
     componentProps: ({ formModel }) => {
@@ -910,7 +910,6 @@ export const freeSearch: FormSchema[] = [
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
         onChange: (e, obj) => {
-          console.log(e, obj)
           if (e && obj) {
             formModel.customerId = obj.label
           }
diff --git a/src/views/operation/invoiceIssue/detail/applyInvoice.vue b/src/views/operation/invoiceIssue/detail/applyInvoice.vue
index 907e331a..8e56e999 100644
--- a/src/views/operation/invoiceIssue/detail/applyInvoice.vue
+++ b/src/views/operation/invoiceIssue/detail/applyInvoice.vue
@@ -3,7 +3,7 @@
         <a-modal width="1600px" @cancel="open = false" :visible="open" title="添加发票申请明细" :footer="null">
             <div style="padding-bottom:5px ;">
                 <div>
-                    <BasicTable class="ds-table" @row-click="handleClick" @register="registerTable">
+                    <BasicTable  :rowClassName="rowClassName" class="ds-table" @row-click="handleClick" @register="registerTable">
                         <template #right>
                             <div style="width: 40%;margin-left: 10px;margin-top:10px;">
                                 <div>
@@ -344,6 +344,11 @@ function handleAddDetial() {
     }
     changeApply()
 }
+function rowClassName(record, index) {
+    if (index == activeRow.value) {
+        return 'active-row'
+    }
+}
 function changeApply() {
     const arr = getSelectRowsFeeDetail()
     const exchangeArr = [] as any
@@ -522,8 +527,10 @@ function handleSureExhange() {
         }
     }
 }
+const activeRow = ref(null)
 function handleClick(record, index) {
     setSelectedRowKeys([record.id])
+    activeRow.value = index
     const data = {
         ids: [record.id],
         businessType: record.businessType,
@@ -781,4 +788,9 @@ defineExpose({ init, customerIdP })
 /deep/ .ant-checkbox-wrapper-checked .ant-checkbox-disabled+span {
     color: #257afa;
 }
+:deep(.active-row) {
+    .ant-table-cell {
+        background: #dfe8f6;
+    }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/operation/seaexport/detail/modules/cargoInfo.vue b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
index a19fca28..04f4e177 100644
--- a/src/views/operation/seaexport/detail/modules/cargoInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
@@ -709,7 +709,6 @@
   if (val.cargoId) cargoId.value = val.cargoId
   }
   defineExpose({
-    // RefcargoFrom,
     getFieldsValue,
     updateSchema,
     preOrderInit,
diff --git a/src/views/operation/seaexport/detail/modules/preOrder.tsx b/src/views/operation/seaexport/detail/modules/preOrder.tsx
index 51a33a0c..9ec5c912 100644
--- a/src/views/operation/seaexport/detail/modules/preOrder.tsx
+++ b/src/views/operation/seaexport/detail/modules/preOrder.tsx
@@ -337,10 +337,8 @@ export const mailingSchema: FormSchema[] = [
         },
         onChange: (e, obj) => {
           if (e && obj) {
-            console.log(obj)
             formModel.shipperId = obj.id
             formModel.shipperContent = obj.content
-
             formModel.shipperAddress = obj.address
             formModel.shipperName = obj.name
             formModel.shipperCountry = obj.country
diff --git a/src/views/operation/seaexport/detail/modules/preOrder.vue b/src/views/operation/seaexport/detail/modules/preOrder.vue
index e9a1f98f..e9cb4fe6 100644
--- a/src/views/operation/seaexport/detail/modules/preOrder.vue
+++ b/src/views/operation/seaexport/detail/modules/preOrder.vue
@@ -1,11 +1,5 @@
 <template>
-  <a-modal
-    class="ds-pre-order"
-    width="90vw"
-    :maskClosable="false"
-    v-model:visible="openPreOrderShow"
-    @cancel="close"
-  >
+  <a-modal class="ds-pre-order" width="90vw" :maskClosable="false" v-model:visible="openPreOrderShow" @cancel="close">
     <template #footer> </template>
     <div class="pre-order" style="padding-top: 30px">
       <div class="flex">
@@ -25,23 +19,13 @@
                 <span class="iconfont icon-baocun"></span>
                 保存
               </a-button>
-              <a-popconfirm
-                title="是否删除当前选中预配舱单？"
-                ok-text="是"
-                cancel-text="否"
-                @confirm="removeOrder()"
-              >
+              <a-popconfirm title="是否删除当前选中预配舱单？" ok-text="是" cancel-text="否" @confirm="removeOrder()">
                 <a-button type="link" class="pt0">
                   <span class="iconfont icon-shanchu21"></span>
                   删除
                 </a-button>
               </a-popconfirm>
-              <a-popconfirm
-                title="会覆盖当前数据，确认刷新吗？"
-                ok-text="是"
-                cancel-text="否"
-                @confirm="handleRef"
-              >
+              <a-popconfirm title="会覆盖当前数据，确认刷新吗？" ok-text="是" cancel-text="否" @confirm="handleRef">
                 <a-button type="link" class="pt0">
                   <span class="iconfont icon-shuaxin"></span>
                   刷新
@@ -54,11 +38,8 @@
                 <template v-for="(sedDetail, sindex) in orderList" :key="sindex + 'f'">
                   <div class="order-box" v-if="!sedDetail.isPart">
                     <a-checkbox class="check-btn mb10" v-model:checked="sedDetail.checked" />
-                    <span
-                      class="order-label"
-                      :class="{ active: sindex == editIndex }"
-                      @click.stop="changeOrder(sindex)"
-                    >
+                    <span class="order-label" :class="{ active: sindex == editIndex }"
+                      @click.stop="changeOrder(sindex)">
                       <template v-if="!sedDetail.isPart">
                         {{ sedDetail.mblno || '请填写主提单号' }}
                       </template>
@@ -71,11 +52,8 @@
                 <template v-for="(sedDetail, sindex) in orderList" :key="sindex">
                   <div class="order-box" v-if="sedDetail.isPart">
                     <a-checkbox class="check-btn mb10" v-model:checked="sedDetail.checked" />
-                    <span
-                      class="order-label"
-                      :class="{ active: sindex == editIndex }"
-                      @click.stop="changeOrder(sindex)"
-                    >
+                    <span class="order-label" :class="{ active: sindex == editIndex }"
+                      @click.stop="changeOrder(sindex)">
                       <template v-if="sedDetail.isPart">
                         {{ sedDetail.hblno || '请填写分单号' }}
                       </template>
@@ -97,33 +75,19 @@
             <BasicForm @register="mailingForm">
               <!-- 发货人 -->
               <template #shipper="{ model }">
-                <span
-                  title="保存到收发通模版(save)"
-                  class="iconfont icon-baocun save-btn"
-                  @click="save(model, 'shipper')"
-                ></span>
+                <span title="保存到收发通模版(save)" class="iconfont icon-baocun save-btn" @click="save(model, '2')"></span>
               </template>
               <!-- 收货人 -->
               <template #consignee="{ model }">
-                <span
-                  title="复制通知人"
-                  class="iconfont icon-fuzhi3 copy-btn"
-                  style="font-size: 13px"
-                  @click="copyNotify"
-                ></span>
-                <!-- <span title="保存到收发通模版(save)" class="iconfont icon-baocun save-btn"
-                  @click="save(model, 'consignee')"></span> -->
+                <span title="复制通知人" class="iconfont icon-fuzhi3 copy-btn" style="font-size: 13px"
+                  @click="copyNotify"></span>
+                <span title="保存到收发通模版(save)" class="iconfont icon-baocun save-btn" @click="save(model, '1')"></span>
               </template>
               <!-- 通知人 -->
               <template #notifyParty="{ model }">
-                <span
-                  title="复制收货人"
-                  class="iconfont icon-fuzhi3 copy-btn"
-                  style="font-size: 13px"
-                  @click="copyConsignee"
-                ></span>
-                <!-- <span title="保存到收发通模版(save)" class="iconfont icon-baocun save-btn"
-                  @click="save(model, 'notifyParty')"></span> -->
+                <span title="复制收货人" class="iconfont icon-fuzhi3 copy-btn" style="font-size: 13px"
+                  @click="copyConsignee"></span>
+                <span title="保存到收发通模版(save)" class="iconfont icon-baocun save-btn" @click="save(model, '3')"></span>
               </template>
             </BasicForm>
           </div>
@@ -151,61 +115,31 @@
                 <BasicForm @register="yardForm"> </BasicForm>
               </div>
             </div>
-            <hot-table
-              style="margin-left: 14px"
-              ref="hotpreOrder"
-              :data="ctnList"
-              :settings="settings"
-            >
+            <hot-table style="margin-left: 14px" ref="hotpreOrder" :data="ctnList" :settings="settings">
             </hot-table>
             <div class="table-calc">
               合计：
-              <span class="table-calc-box"
-                >件数: <span>{{ totalPkgs }}</span></span
-              >
-              <span class="table-calc-box"
-                >重量: <span>{{ totalKgs }}</span
-                >KGS</span
-              >
-              <span class="table-calc-box"
-                >尺码: <span>{{ totalCbm }}</span
-                >CBM</span
-              >
+              <span class="table-calc-box">件数: <span>{{ totalPkgs }}</span></span>
+              <span class="table-calc-box">重量: <span>{{ totalKgs }}</span>KGS</span>
+              <span class="table-calc-box">尺码: <span>{{ totalCbm }}</span>CBM</span>
             </div>
           </div>
         </div>
       </div>
-      <a-modal
-        width="50vw"
-        :maskClosable="false"
-        v-model:visible="showSendModel"
-        title="发送预配舱单"
-        @cancel="sendClose"
-      >
+      <a-modal width="50vw" :maskClosable="false" v-model:visible="showSendModel" title="发送预配舱单" @cancel="sendClose">
         <div class="trace-box">
           <a-form>
             <a-row :gutter="16">
               <a-col :span="24" class="book-model-box">
-                <a-form-item
-                  label="操作类型"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                  has-feedback
-                >
+                <a-form-item label="操作类型" :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }" has-feedback>
                   <a-radio-group :options="sendOption" v-model:value="sendType" />
                 </a-form-item>
 
-                <a-form-item
-                  label="备注"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                  has-feedback
-                >
-                  <a-textarea
-                    v-model:value="sendRemarkVal"
-                    placeholder="请输入备注"
-                    :auto-size="{ minRows: 3, maxRows: 5 }"
-                  />
+                <a-form-item label="备注" :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }" has-feedback>
+                  <a-textarea v-model:value="sendRemarkVal" placeholder="请输入备注"
+                    :auto-size="{ minRows: 3, maxRows: 5 }" />
                 </a-form-item>
               </a-col>
             </a-row>
@@ -216,931 +150,1060 @@
           <a-button type="primary" @click="sendClose">关闭</a-button>
         </template>
       </a-modal>
+      <a-modal class="ds-modal-small" title="保存模版" width="560" v-model:visible="temFlag" @ok="saveTem"
+        @cancel="temFlag = false">
+        <a-form ref="form" :rules="rules" :model="temForm" layout="vertical">
+          <a-form-item label="模版名称" name="templateName">
+            <a-input v-model:value="temForm.templateName"></a-input>
+          </a-form-item>
+        </a-form>
+      </a-modal>
     </div>
   </a-modal>
 </template>
 <script lang="ts" setup>
-  import { ref, reactive, onMounted, nextTick, watch } from 'vue'
-  import {
-    GetPackageSelectList,
-    GetShippingBillList,
-    SaveShippingBillAsync,
-    SendShippingBill,
-    BatchDelShippingBill,
-    GetCtnSelectList,
-    GetShippingBillCtnList,
-    GetClientPortInfoByCode,
-    GetShippingBillShortList,
-  } from '/@/views/operation/seaexport/api/BookingLedger'
-  import { preOrderD } from '/@/views/operation/seaexport/detail/modules/preOrderColumns'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  import cargoInfo from './cargoInfo.vue'
-  const { notification, createMessage } = useMessage()
-  import { useRoute } from 'vue-router'
-  const route = useRoute()
-  import { HotTable } from '@handsontable/vue3'
-  import { registerAllModules } from 'handsontable/registry'
-  import { BasicForm, useForm } from '/@/components/Form/index'
-  import { mailingSchema, baseSchema, yardSchema } from './preOrder'
-  import { resolve } from 'path'
-  registerAllModules()
-  const props = defineProps({
-    details: { type: Object, default: {} },
-  })
-  const book = {
-    marks: '11',
-  }
-  const openPreOrderShow = ref(false)
-  const id = ref(route.query.id)
-  // -----------------------弹窗相关------------------------
-  function init() {
-    // 打开窗口调接口 如果接口有数据就回显 没有数据用主单的信息
-    openPreOrderShow.value = true
-    orderList.valeue = []
-    // resetFieldsBase()
-    // resetFieldsMail()
-    if (id.value) {
-      FngetPageESeaeEdi()
-    } else {
-    }
-    nextTick(() => {
-      initTable()
-    })
+import { ref, reactive, onMounted, nextTick, watch } from 'vue'
+import {
+  GetPackageSelectList,
+  GetShippingBillList,
+  SaveShippingBillAsync,
+  SendShippingBill,
+  BatchDelShippingBill,
+  GetCtnSelectList,
+  GetShippingBillCtnList,
+  GetClientPortInfoByCode,
+  GetShippingBillShortList,
+} from '/@/views/operation/seaexport/api/BookingLedger'
+import { preOrderD } from '/@/views/operation/seaexport/detail/modules/preOrderColumns'
+import { useMessage } from '/@/hooks/web/useMessage'
+import cargoInfo from './cargoInfo.vue'
+const { notification, createMessage } = useMessage()
+import { useRoute } from 'vue-router'
+const route = useRoute()
+import { HotTable } from '@handsontable/vue3'
+import { registerAllModules } from 'handsontable/registry'
+import { BasicForm, useForm } from '/@/components/Form/index'
+import { mailingSchema, baseSchema, yardSchema } from './preOrder'
+import { resolve } from 'path'
+registerAllModules()
+const props = defineProps({
+  details: { type: Object, default: {} },
+})
+const book = {
+  marks: '11',
+}
+const openPreOrderShow = ref(false)
+const id = ref(route.query.id)
+// -----------------------弹窗相关------------------------
+function init() {
+  // 打开窗口调接口 如果接口有数据就回显 没有数据用主单的信息
+  openPreOrderShow.value = true
+  orderList.valeue = []
+  // resetFieldsBase()
+  // resetFieldsMail()
+  if (id.value) {
+    FngetPageESeaeEdi()
   }
-
-  // 基础信息
-  const [
-    baseForm,
-    {
-      getFieldsValue: getFieldsValueBase,
-      updateSchemaBase,
-      validateFieldsBase,
-      resetFields: resetFieldsBase,
-      setFieldsValue: setFieldsValueBase,
-      validateBase,
-    },
-  ] = useForm({
-    labelWidth: 80,
-    schemas: baseSchema,
-    showActionButtonGroup: false,
-    size: 'small',
+  nextTick(() => {
+    initTable()
   })
+}
 
-  // 收发通
-  const [
-    mailingForm,
-    {
-      getFieldsValue: getFieldsValueMail,
-      updateSchemaMail,
-      validateFieldsMail,
-      resetFields: resetFieldsMail,
-      setFieldsValue: setFieldsValueMail,
-      validateMail,
-    },
-  ] = useForm({
-    labelWidth: 80,
-    schemas: mailingSchema,
-    showActionButtonGroup: false,
-    size: 'small',
-  })
+// 基础信息
+const [
+  baseForm,
+  {
+    getFieldsValue: getFieldsValueBase,
+    updateSchemaBase,
+    validateFieldsBase,
+    resetFields: resetFieldsBase,
+    setFieldsValue: setFieldsValueBase,
+    validateBase,
+  },
+] = useForm({
+  labelWidth: 80,
+  schemas: baseSchema,
+  showActionButtonGroup: false,
+  size: 'small',
+})
 
-  // 场站
-  const [
-    yardForm,
-    {
-      getFieldsValue: getFieldsValueYard,
-      resetFields: resetFieldsYard,
-      setFieldsValue: setFieldsValueYard,
-    },
-  ] = useForm({
-    labelWidth: 80,
-    wrapperCol: { span: 24 },
-    schemas: yardSchema,
-    showActionButtonGroup: false,
-    size: 'small',
-  })
-  const ctnList = ref([]) as any
-  watch(
-    () => ctnList.value,
-    (val) => {
-      let totalPkgsStr = 0
-      let totalKgsStr = 0
-      let totalCbmStr = 0
-      val.forEach((item) => {
-        if (item.pkgs) {
-          totalPkgsStr += parseInt(item.pkgs)
-        }
-        if (item.kgs) {
-          totalKgsStr += Number(Number(item.kgs).toFixed(2))
-        }
-        if (item.cbm) {
-          totalCbmStr += Number(Number(item.cbm).toFixed(2))
-        }
-      })
-      totalPkgs.value = totalPkgsStr
-      totalKgs.value = totalKgsStr
-      totalCbm.value = totalCbmStr
-    },
-    { deep: true },
-  )
+// 收发通
+const [
+  mailingForm,
+  {
+    getFieldsValue: getFieldsValueMail,
+    updateSchema: updateSchemaL,
+    validateFieldsMail,
+    resetFields: resetFieldsMail,
+    setFieldsValue: setFieldsValueMail,
+    validateMail,
+  },
+] = useForm({
+  labelWidth: 80,
+  schemas: mailingSchema,
+  showActionButtonGroup: false,
+  size: 'small',
+})
 
-  onMounted(() => {})
-  function initTable() {
-    const hot = hotpreOrder.value.hotInstance
-    hot.addHook('beforeKeyDown', function (event) {
-      if (event.key === 'ArrowDown') {
-        if (
-          hot.getSelected()[0][0] == ctnList.value.length - 1 &&
-          !hot.getActiveEditor()?._opened
-        ) {
-          ctnList.value.push({})
-          nextTick(() => {
-            hot.selectCell(ctnList.value.length - 1, 3)
-          })
-          return false
-        }
+// 场站
+const [
+  yardForm,
+  {
+    getFieldsValue: getFieldsValueYard,
+    resetFields: resetFieldsYard,
+    setFieldsValue: setFieldsValueYard,
+  },
+] = useForm({
+  labelWidth: 80,
+  wrapperCol: { span: 24 },
+  schemas: yardSchema,
+  showActionButtonGroup: false,
+  size: 'small',
+})
+const ctnList = ref([]) as any
+watch(
+  () => ctnList.value,
+  (val) => {
+    let totalPkgsStr = 0
+    let totalKgsStr = 0
+    let totalCbmStr = 0
+    val.forEach((item) => {
+      if (item.pkgs) {
+        totalPkgsStr += parseInt(item.pkgs)
+      }
+      if (item.kgs) {
+        totalKgsStr += Number(Number(item.kgs).toFixed(2))
+      }
+      if (item.cbm) {
+        totalCbmStr += Number(Number(item.cbm).toFixed(2))
       }
     })
-  }
+    totalPkgs.value = totalPkgsStr
+    totalKgs.value = totalKgsStr
+    totalCbm.value = totalCbmStr
+  },
+  { deep: true },
+)
 
-  // 添加行
-  function addboxLine() {
-    ctnList.value.push({})
+onMounted(() => { })
+function initTable() {
+  const hot = hotpreOrder.value.hotInstance
+  hot.addHook('beforeKeyDown', function (event) {
+    if (event.key === 'ArrowDown') {
+      if (
+        hot.getSelected()[0][0] == ctnList.value.length - 1 &&
+        !hot.getActiveEditor()?._opened
+      ) {
+        ctnList.value.push({})
+        nextTick(() => {
+          hot.selectCell(ctnList.value.length - 1, 3)
+        })
+        return false
+      }
+    }
+  })
+}
+import { ApiEdit } from '/@/views/baseinfo/sendReciveTem/api'
+const form = ref(null)
+const temFlag = ref(false)
+var saveKey = '' as any
+var saveModel = {} as any
+const temForm = reactive({
+  templateName: ''
+})
+const saveTem = () => {
+  form.value.validate().then(() => {
+    let content = ''
+    if (saveKey == 1) content = 'consignee'
+    if (saveKey == 2) content = 'shipper'
+    if (saveKey == 3) content = 'notifyParty'
+    const data = {
+      id: '',
+      type: saveKey,
+      templateName: temForm.templateName,
+      content: saveModel[content + 'Content'],
+      tel:'',
+      countryName:'',
+      country:'',
+      name:'',
+      address:'',
+    }
+    if (saveKey == '2') {
+    data.tel = saveModel.shipperCountryTel
+    data.countryName = saveModel.shipperCountryName
+    data.country = saveModel.shipperCountry
+    data.name = saveModel.shipperName
+    data.address = saveModel.shipperAddress
+  } else if (saveKey == '1') {
+    data.tel = saveModel.consigneeCountryTel
+    data.countryName = saveModel.consigneeCountryName
+    data.country = saveModel.consigneeCountry
+    data.name = saveModel.consigneeName
+    data.address = saveModel.consigneeAddress
+  } else {
+    data.tel = saveModel.notifyPartyCountryTel
+    data.countryName = saveModel.notifyPartyCountryName
+    data.country = saveModel.notifyPartyCountry
+    data.name = saveModel.notifyPartyName
+    data.address = saveModel.notifyPartyAddress
   }
-  // 保存收发通模版
-  const save = (model, key) => {}
-  function copyNotify() {
-    const data = getFieldsValueMail()
-    setFieldsValueMail({
-      consigneeName: data.notifyPartyName,
-      consigneeAddress: data.notifyPartyAddress,
-      consigneeCountry: data.notifyPartyCountry,
-      consigneeCountryName: data.notifyPartyCountryName,
-      consigneeCountryTel: data.notifyPartyCountryTel,
+    ApiEdit(data).then(res => {
+      if (res.succeeded) {
+        createMessage.success('新增模版成功！')
+        updateSchemaL()
+        temFlag.value = false
+      }
     })
+  })
+}
+// 添加行
+function addboxLine() {
+  ctnList.value.push({})
+}
+// 保存收发通模版
+// 保存收发通模版
+const save = (model, key) => {
+  saveKey = key
+  saveModel = model
+  const postData = {
+    id: '',
+    templateName: '',
+    content: '',
+    tel: '',
+    countryName: '',
+    country: '',
+    name: '',
+    address: '',
   }
-  function copyConsignee() {
-    const data = getFieldsValueMail()
-    setFieldsValueMail({
-      notifyPartyName: data.consigneeName,
-      notifyPartyAddress: data.consigneeAddress,
-      notifyPartyCountry: data.consigneeCountry,
-      notifyPartyCountryName: data.consigneeCountryName,
-      notifyPartyCountryTel: data.consigneeCountryTel,
-    })
+  if (key == '2') {
+    postData.id = model.shipperId
+    postData.templateName = model.shipper
+    postData.content = model.shipperContent
+    postData.tel = model.shipperCountryTel
+    postData.countryName = model.shipperCountryName
+    postData.country = model.shipperCountry
+    postData.name = model.shipperName
+    postData.address = model.shipperAddress
+  } else if (key == '1') {
+    postData.id = model.consigneeId
+    postData.templateName = model.consignee
+    postData.content = model.consigneeContent
+    postData.tel = model.consigneeCountryTel
+    postData.countryName = model.consigneeCountryName
+    postData.country = model.consigneeCountry
+    postData.name = model.consigneeName
+    postData.address = model.consigneeAddress
+  } else {
+    postData.id = model.notifyPartyId
+    postData.templateName = model.notifyParty
+    postData.content = model.notifyPartyContent
+    postData.tel = model.notifyPartyCountryTel
+    postData.countryName = model.notifyPartyCountryName
+    postData.country = model.notifyPartyCountry
+    postData.name = model.notifyPartyName
+    postData.address = model.notifyPartyAddress
   }
-  const linkageForm = async (val) => {
-    orderList.value[editIndex.value].hblno = val
+  if (postData.id) {
+    ApiEdit(postData).then(res => {
+      if (res.succeeded) {
+        createMessage.success('保存成功！')
+      }
+    })
+  } else {
+    // 新建模版
+    temFlag.value = true
+    let content = ''
+    if (key == '2') {
+      content = model.shipperContent
+    } else if (key == '1') {
+      content = model.consigneeContent
+    } else {
+      content = model.notifyPartyContent
+    }
+    if (content) {
+      const index = content.indexOf("\n");
+      const firstline = content.substring(0, index);
+      temForm.templateName = firstline
+    } else {
+      temForm.templateName = null
+    }
   }
+}
+function copyNotify() {
+  const data = getFieldsValueMail()
+  setFieldsValueMail({
+    consigneeName: data.notifyPartyName,
+    consigneeAddress: data.notifyPartyAddress,
+    consigneeCountry: data.notifyPartyCountry,
+    consigneeCountryName: data.notifyPartyCountryName,
+    consigneeCountryTel: data.notifyPartyCountryTel,
+  })
+}
+function copyConsignee() {
+  const data = getFieldsValueMail()
+  setFieldsValueMail({
+    notifyPartyName: data.consigneeName,
+    notifyPartyAddress: data.consigneeAddress,
+    notifyPartyCountry: data.consigneeCountry,
+    notifyPartyCountryName: data.consigneeCountryName,
+    notifyPartyCountryTel: data.consigneeCountryTel,
+  })
+}
+const linkageForm = async (val) => {
+  orderList.value[editIndex.value].hblno = val
+}
 
-  function close() {
-    openPreOrderShow.value = false
+function close() {
+  openPreOrderShow.value = false
+}
+// -----------------------左侧------------------------
+const orderList = ref<any>([])
+const formState = ref<any>({})
+const editIndex = ref(0)
+const floading = ref(false)
+const RefcargoInfo = ref(null) as any
+const sendOption = ref([
+  { label: '新增', value: '0' },
+  { label: '修改', value: '1' },
+  { label: '删除', value: '2' },
+])
+// 获取列表数据
+function FngetPageESeaeEdi() {
+  floading.value = true
+  let ApiData = {
+    id: id.value,
   }
-  // -----------------------左侧------------------------
-  const orderList = ref<any>([])
-  const formState = ref<any>({})
-  const editIndex = ref(0)
-  const floading = ref(false)
-  const RefcargoInfo = ref(null) as any
-  const sendOption = ref([
-    { label: '新增', value: '0' },
-    { label: '修改', value: '1' },
-    { label: '删除', value: '2' },
-  ])
-  // 获取列表数据
-  function FngetPageESeaeEdi() {
-    floading.value = true
-    let ApiData = {
-      id: id.value,
-    }
-    GetShippingBillShortList(ApiData)
-      .then((res) => {
-        floading.value = false
-        if (res.succeeded) {
-          if (!res.data) {
-            res.data = []
-          }
-          // 有数据直接回显
-          if (res.data.length > 0) {
-            res.data.map((item, index) => {
-              item.checked = false
-              Object.assign(item, item.detail)
-              item.ctnInfo = item.ctnList
-              delete item.detail
-              delete item.ctnList
-              if (item.isPart === false) {
-                setFieldsValueBase(item)
-                if (!item.cargoId) {
-                  item.cargoId = 'S'
-                }
-                RefcargoInfo.value.preOrderInit(item)
-                setFieldsValueMail(item)
-                setFieldsValueYard(item)
-                ctnList.value = item.ctnInfo ? item.ctnInfo : []
-                hotpreOrder.value.hotInstance.loadData(ctnList.value)
-                editIndex.value = index
-              }
-            })
-            orderList.value = res.data
-          } else {
-            //处理接口没数据的情况
-            const propsDetail = JSON.parse(JSON.stringify(props.details))
-            propsDetail.id = '0'
-            propsDetail.isPart = false
-            //处理基础信息
-            setFieldsValueBase(propsDetail)
-            //拆分主单的收发通 发货人国家地区默认是中国 通知人和收货人为卸货港的国家地区
-            const arr = propsDetail.shipperContent ? propsDetail.shipperContent.split('\n') : []
-            const arr1 = propsDetail.consigneeContent
-              ? propsDetail.consigneeContent.split('\n')
-              : []
-            const arr2 = propsDetail.notifyPartyContent
-              ? propsDetail.notifyPartyContent.split('\n')
-              : []
-            setFieldsValueMail({
-              shipperName: arr[0],
-              shipperAddress: arr[1],
-              consigneeName: arr1[0],
-              consigneeAddress: arr1[1],
-              notifyPartyName: arr2[0],
-              notifyPartyAddress: arr2[1],
-              shipperCountryName: '中国(CHINA)',
-              shipperCountry: 'CN',
-            })
-            GetClientPortInfoByCode({ queryKey: propsDetail.dischargePortCode }).then((res) => {
-              const arr = localStorage.getItem('ds-country')
-                ? JSON.parse(localStorage.getItem('ds-country'))
-                : []
-              if (res.data) {
-                arr.forEach((item) => {
-                  if (item.id == res.data.countryId) {
-                    setFieldsValueMail({
-                      consigneeCountryName: item.countryName,
-                      consigneeCountry: item.countryCode,
-                      notifyPartyCountryName: item.countryName,
-                      notifyPartyCountry: item.countryCode,
-                    })
-                  }
-                })
+  GetShippingBillShortList(ApiData)
+    .then((res) => {
+      floading.value = false
+      if (res.succeeded) {
+        if (!res.data) {
+          res.data = []
+        }
+        // 有数据直接回显
+        if (res.data.length > 0) {
+          res.data.map((item, index) => {
+            item.checked = false
+            Object.assign(item, item.detail)
+            item.ctnInfo = item.ctnList
+            delete item.detail
+            delete item.ctnList
+            if (item.isPart === false) {
+              setFieldsValueBase(item)
+              if (!item.cargoId) {
+                item.cargoId = 'S'
               }
-            })
-            //处理货物信息
-            if (!propsDetail.cargoId) {
-              propsDetail.cargoId = 'S'
+              RefcargoInfo.value.preOrderInit(item)
+              setFieldsValueMail(item)
+              setFieldsValueYard(item)
+              ctnList.value = item.ctnInfo ? item.ctnInfo : []
+              hotpreOrder.value.hotInstance.loadData(ctnList.value)
+              editIndex.value = index
             }
-            RefcargoInfo.value.preOrderInit(propsDetail)
-            // 处理场站
-            setFieldsValueYard({
-              yardId: propsDetail.yardId,
-              yard: propsDetail.yard,
-            })
-            // 处理箱信息
-            ctnList.value = propsDetail.ctnInfo ? propsDetail.ctnInfo : []
-            ctnList.value.forEach((item) => {
-              delete item.id
-            })
-            hotpreOrder.value.hotInstance.loadData(ctnList.value)
-            const data = JSON.parse(JSON.stringify(propsDetail))
-            data.mblno = propsDetail.mblno
-            data.isPart = false
-            data.checked = false
-            orderList.value[0] = data
-          }
-        }
-      })
-      .catch((err) => {
-        floading.value = false
-      })
-  }
-  // 保存当前信息
-  function saveOrderInfo() {
-    return new Promise((resolve) => {
-      ctnList.value.forEach((item) => {
-        item.pid = getFieldsValueBase().id ? getFieldsValueBase().id : '0'
-      })
-      const data = {
-        ...getFieldsValueMail(),
-        ...getFieldsValueBase(),
-        ...getFieldsValueYard(),
-        ...RefcargoInfo.value.getFieldsValue(),
-        ctnInfo: ctnList.value,
-        businessId: id.value ? id.value : '',
-      }
-      orderList.value[editIndex.value] = data
-      resolve(true)
-    })
-  }
-  // 添加分单 保存当前单
-  function addOrder() {
-    saveOrderInfo().then((res) => {
-      // 分单内容要复制主单的
-      let mblData = {} as any
-      let hblList = [] as any
-      orderList.value.forEach((item) => {
-        if (!item.isPart) {
-          mblData = JSON.parse(JSON.stringify(item))
+          })
+          orderList.value = res.data
         } else {
-          hblList.push(JSON.parse(JSON.stringify(item)))
+          //处理接口没数据的情况
+          handelNoData()
         }
-      })
-      mblData.id = '0'
-      mblData.hblno = ''
-      if (mblData.ctnInfo) {
-        mblData.ctnInfo.forEach((item) => {
-          delete item.id
-        })
       }
-      console.log(mblData, hblList)
-      calcCtnInfo(mblData, hblList)
     })
-  }
-  // 添加分单计算箱信息 需要用主单减掉分单的信息
-  function calcCtnInfo(mblData, hblList) {
-    mblData.ctnInfo.forEach((item) => {
-      if (item.kgs) {
-        let totalKgs = 0
-        hblList.forEach((ite) => {
-          ite.ctnInfo.forEach((it) => {
-            console.log(it.cntrNo, item.cntrNo)
-            if (it.cntrNo === item.cntrNo) {
-              console.log(it.kgs, 12312331)
-              totalKgs += Number(it.kgs)
-            }
-          })
-        })
-        item.kgs = (Number(item.kgs) - totalKgs).toFixed(2)
-      }
-      if (item.cbm) {
-        let totalCbm = 0
-        hblList.forEach((ite) => {
-          ite.ctnInfo.forEach((it) => {
-            if (it.cntrNo === item.cntrNo) {
-              totalCbm += Number(it.cbm)
-            }
-          })
-        })
-        item.cbm = (Number(item.cbm) - totalCbm).toFixed(2)
-      }
-      if (item.pkgs) {
-        let totalPkgs = 0
-        hblList.forEach((ite) => {
-          ite.ctnInfo.forEach((it) => {
-            if (it.cntrNo === item.cntrNo) {
-              totalPkgs += Number(it.pkgs)
-            }
-          })
-        })
-        item.pkgs = Number(item.pkgs) - totalPkgs
-      }
+    .catch((err) => {
+      floading.value = false
     })
-    // data.ctnInfo.forEach(item => {
-    //   mblData.ctnInfo.forEach(ite => {
-    //     if (item.ctnInfo == ite.ctnInfo) {
-    //       item.kgs = (Number(ite.kgs) - hblTotalKgs).toFixed(2)
-    //       item.cbm = (Number(ite.cbm) - hblTotalCbm).toFixed(2)
-    //       item.pkgs =Number(ite.pkgs) - hblTotalPkgs
-    //     }
-    //   })
-    // })
-
-    // console.log(hblTotalKgs, hblTotalPkgs, hblTotalCbm);
-    setFieldsValueBase(mblData)
-    RefcargoInfo.value.preOrderInit(mblData)
-    setFieldsValueMail(mblData)
-    setFieldsValueYard(mblData)
-    ctnList.value = mblData.ctnInfo ? mblData.ctnInfo : []
-    hotpreOrder.value.hotInstance.loadData(ctnList.value)
-    mblData.isPart = true
-    orderList.value.push({ checked: true, isPart: true, ...mblData })
-    editIndex.value = orderList.value.length - 1
+}
+function handelNoData() {
+  const propsDetail = JSON.parse(JSON.stringify(props.details))
+  propsDetail.id = '0'
+  propsDetail.isPart = false
+  //处理基础信息
+  setFieldsValueBase(propsDetail)
+  //拆分主单的收发通 发货人国家地区默认是中国 通知人和收货人为卸货港的国家地区
+  const arr = propsDetail.shipperContent ? propsDetail.shipperContent.split('\n') : []
+  const arr1 = propsDetail.consigneeContent
+    ? propsDetail.consigneeContent.split('\n')
+    : []
+  const arr2 = propsDetail.notifyPartyContent
+    ? propsDetail.notifyPartyContent.split('\n')
+    : []
+  setFieldsValueMail({
+    shipperName: arr[0],
+    shipperAddress: arr[1],
+    consigneeName: arr1[0],
+    consigneeAddress: arr1[1],
+    notifyPartyName: arr2[0],
+    notifyPartyAddress: arr2[1],
+    shipperCountryName: '中国(CHINA)',
+    shipperCountry: 'CN',
+  })
+  GetClientPortInfoByCode({ queryKey: propsDetail.dischargePortCode }).then((res) => {
+    const arr = localStorage.getItem('ds-country')
+      ? JSON.parse(localStorage.getItem('ds-country'))
+      : []
+    if (res.data) {
+      arr.forEach((item) => {
+        if (item.id == res.data.countryId) {
+          setFieldsValueMail({
+            consigneeCountryName: item.countryName,
+            consigneeCountry: item.countryCode,
+            notifyPartyCountryName: item.countryName,
+            notifyPartyCountry: item.countryCode,
+          })
+        }
+      })
+    }
+  })
+  //处理货物信息
+  if (!propsDetail.cargoId) {
+    propsDetail.cargoId = 'S'
   }
-  // 保存
-  function saveOrder() {
-    saveOrderInfo().then((res) => {
-      floading.value = true
-      SaveShippingBillAsync(orderList.value)
-        .then((res) => {
-          floading.value = false
-          if (res.succeeded) {
-            orderList.value[editIndex.value].id = res.data
-            createMessage.success(res.message)
-            FngetPageESeaeEdi()
-          }
-        })
-        .catch(() => {
-          floading.value = false
-        })
+  RefcargoInfo.value.preOrderInit(propsDetail)
+  // 处理场站
+  setFieldsValueYard({
+    yardId: propsDetail.yardId,
+    yard: propsDetail.yard,
+  })
+  // 处理箱信息
+  ctnList.value = propsDetail.ctnInfo ? propsDetail.ctnInfo : []
+  ctnList.value.forEach((item) => {
+    delete item.id
+  })
+  hotpreOrder.value.hotInstance.loadData(ctnList.value)
+  const data = JSON.parse(JSON.stringify(propsDetail))
+  data.mblno = propsDetail.mblno
+  data.isPart = false
+  data.checked = false
+  orderList.value[0] = data
+}
+// 保存当前信息
+function saveOrderInfo() {
+  return new Promise((resolve) => {
+    ctnList.value.forEach((item) => {
+      item.pid = getFieldsValueBase().id ? getFieldsValueBase().id : '0'
     })
-  }
-  // 删除
-  function removeOrder() {
-    const arr = [] as any
-    for (let i = orderList.value.length - 1; i >= 0; i--) {
-      if (orderList.value[i].checked && !orderList.value[i].isPart) {
-        createMessage.error('主单不能被删除')
-        return false
-      }
+    const data = {
+      ...getFieldsValueMail(),
+      ...getFieldsValueBase(),
+      ...getFieldsValueYard(),
+      ...RefcargoInfo.value.getFieldsValue(),
+      ctnInfo: ctnList.value,
+      businessId: id.value ? id.value : '',
     }
-    for (let i = orderList.value.length - 1; i >= 0; i--) {
-      if (orderList.value[i].checked && orderList.value[i].isPart) {
-        arr.push(orderList.value[i].id)
-        orderList.value.splice(i, 1)
-      }
-    }
-    for (let i = arr.length - 1; i >= 0; i--) {
-      if (arr[i] == 0) {
-        arr.splice(i, 1)
+    orderList.value[editIndex.value] = data
+    resolve(true)
+  })
+}
+// 添加分单 保存当前单
+function addOrder() {
+  saveOrderInfo().then((res) => {
+    // 分单内容要复制主单的
+    let mblData = {} as any
+    let hblList = [] as any
+    orderList.value.forEach((item) => {
+      if (!item.isPart) {
+        mblData = JSON.parse(JSON.stringify(item))
+      } else {
+        hblList.push(JSON.parse(JSON.stringify(item)))
       }
+    })
+    mblData.id = '0'
+    mblData.hblno = ''
+    if (mblData.ctnInfo) {
+      mblData.ctnInfo.forEach((item) => {
+        delete item.id
+      })
     }
-    if (arr.length > 0) {
-      floading.value = true
-      BatchDelShippingBill({ ids: arr })
-        .then((res) => {
-          if (res.succeeded) {
-            editOrder(0)
+    console.log(mblData, hblList)
+    calcCtnInfo(mblData, hblList)
+  })
+}
+// 添加分单计算箱信息 需要用主单减掉分单的信息
+function calcCtnInfo(mblData, hblList) {
+  mblData.ctnInfo.forEach((item) => {
+    if (item.kgs) {
+      let totalKgs = 0
+      hblList.forEach((ite) => {
+        ite.ctnInfo.forEach((it) => {
+          console.log(it.cntrNo, item.cntrNo)
+          if (it.cntrNo === item.cntrNo) {
+            console.log(it.kgs, 12312331)
+            totalKgs += Number(it.kgs)
           }
-          floading.value = false
         })
-        .catch(() => {
-          floading.value = false
-        })
-    } else {
-      editOrder(0)
+      })
+      item.kgs = (Number(item.kgs) - totalKgs).toFixed(2)
     }
-  }
-  const showSendModel = ref(false)
-  const sendType = ref('')
-  const sendRemarkVal = ref('')
-  const sendLoading = ref(false)
-
-  // 发送
-  function sendOrderFun() {
-    const SelectArr = [] as any
-    for (let i = 0; i < orderList.value.length; i++) {
-      if (orderList.value[i].checked && orderList.value[i].id == 0) {
-        createMessage.error('请先保存')
-        return false
-      }
+    if (item.cbm) {
+      let totalCbm = 0
+      hblList.forEach((ite) => {
+        ite.ctnInfo.forEach((it) => {
+          if (it.cntrNo === item.cntrNo) {
+            totalCbm += Number(it.cbm)
+          }
+        })
+      })
+      item.cbm = (Number(item.cbm) - totalCbm).toFixed(2)
     }
-    for (let i = 0; i < orderList.value.length; i++) {
-      if (orderList.value[i].checked) {
-        SelectArr.push(orderList.value[i])
-      }
+    if (item.pkgs) {
+      let totalPkgs = 0
+      hblList.forEach((ite) => {
+        ite.ctnInfo.forEach((it) => {
+          if (it.cntrNo === item.cntrNo) {
+            totalPkgs += Number(it.pkgs)
+          }
+        })
+      })
+      item.pkgs = Number(item.pkgs) - totalPkgs
     }
+  })
+  // data.ctnInfo.forEach(item => {
+  //   mblData.ctnInfo.forEach(ite => {
+  //     if (item.ctnInfo == ite.ctnInfo) {
+  //       item.kgs = (Number(ite.kgs) - hblTotalKgs).toFixed(2)
+  //       item.cbm = (Number(ite.cbm) - hblTotalCbm).toFixed(2)
+  //       item.pkgs =Number(ite.pkgs) - hblTotalPkgs
+  //     }
+  //   })
+  // })
 
-    if (SelectArr.length) {
-      showSendModel.value = true
-    } else {
-      notification.error({ message: '请选择发送单号', duration: 3 })
+  // console.log(hblTotalKgs, hblTotalPkgs, hblTotalCbm);
+  setFieldsValueBase(mblData)
+  RefcargoInfo.value.preOrderInit(mblData)
+  setFieldsValueMail(mblData)
+  setFieldsValueYard(mblData)
+  ctnList.value = mblData.ctnInfo ? mblData.ctnInfo : []
+  hotpreOrder.value.hotInstance.loadData(ctnList.value)
+  mblData.isPart = true
+  orderList.value.push({ checked: true, isPart: true, ...mblData })
+  editIndex.value = orderList.value.length - 1
+}
+// 保存
+function saveOrder() {
+  saveOrderInfo().then((res) => {
+    floading.value = true
+    SaveShippingBillAsync(orderList.value)
+      .then((res) => {
+        floading.value = false
+        if (res.succeeded) {
+          orderList.value[editIndex.value].id = res.data
+          createMessage.success(res.message)
+          FngetPageESeaeEdi()
+        }
+      })
+      .catch(() => {
+        floading.value = false
+      })
+  })
+}
+// 删除
+function removeOrder() {
+  const arr = [] as any
+  for (let i = orderList.value.length - 1; i >= 0; i--) {
+    if (orderList.value[i].checked && !orderList.value[i].isPart) {
+      createMessage.error('主单不能被删除')
+      return false
     }
   }
-  function delboxLine() {
-    for (let i = ctnList.value.length - 1; i >= 0; i--) {
-      if (ctnList.value[i].selected) {
-        ctnList.value.splice(i, 1)
-      }
+  for (let i = orderList.value.length - 1; i >= 0; i--) {
+    if (orderList.value[i].checked && orderList.value[i].isPart) {
+      arr.push(orderList.value[i].id)
+      orderList.value.splice(i, 1)
     }
-    hotpreOrder.value.hotInstance.loadData(ctnList.value)
   }
-  function copyboxLine() {
-    const arr = [] as any
-    ctnList.value.forEach((item) => {
-      if (item.selected) {
-        arr.push(item)
-      }
-    })
-    if (arr.length > 1) {
-      createMessage.error('请选择一条数据复制')
-      return false
-    }
-    if (arr.length == 1) {
-      ctnList.value.push(JSON.parse(JSON.stringify(arr[0])))
-      hotpreOrder.value.hotInstance.loadData(ctnList.value)
+  for (let i = arr.length - 1; i >= 0; i--) {
+    if (arr[i] == 0) {
+      arr.splice(i, 1)
     }
-    console.log(arr)
   }
-  // 确认发送
-  function sendSubmit() {
-    sendLoading.value = true
-    let SendIds: any = []
-    orderList.value.forEach((e) => {
-      if (e.checked) {
-        SendIds.push(e.id)
-      }
-    })
-    let ApiData = {
-      ids: SendIds,
-      type: sendType.value,
-      sendRemark: sendRemarkVal.value,
-    }
-    SendShippingBill(ApiData)
+  if (arr.length > 0) {
+    floading.value = true
+    BatchDelShippingBill({ ids: arr })
       .then((res) => {
-        let message = ''
         if (res.succeeded) {
-          switch (sendType.value) {
-            case '0':
-              message = '新增发送成功'
-              break
-            case '1':
-              message = '修改发送成功'
-              break
-            default:
-              message = '删除发送成功'
-              break
-          }
-          notification.success({ message: message, duration: 3 })
-          sendClose()
+          editOrder(0)
         }
-        sendLoading.value = false
+        floading.value = false
       })
-      .catch((err) => {
-        sendLoading.value = false
+      .catch(() => {
+        floading.value = false
       })
+  } else {
+    editOrder(0)
   }
-  // 关闭
-  function sendClose() {
-    showSendModel.value = false
-    sendType.value = ''
-    sendRemarkVal.value = ''
+}
+const showSendModel = ref(false)
+const sendType = ref('')
+const sendRemarkVal = ref('')
+const sendLoading = ref(false)
+
+// 发送
+function sendOrderFun() {
+  const SelectArr = [] as any
+  for (let i = 0; i < orderList.value.length; i++) {
+    if (orderList.value[i].checked && orderList.value[i].id == 0) {
+      createMessage.error('请先保存')
+      return false
+    }
   }
-  // 刷新
-  function handleRef() {
-    init()
+  for (let i = 0; i < orderList.value.length; i++) {
+    if (orderList.value[i].checked) {
+      SelectArr.push(orderList.value[i])
+    }
   }
-  // 点击列表 保存原先信息 然后切换
 
-  function changeOrder(index) {
-    saveOrderInfo().then((res) => {
-      editOrder(index)
-    })
+  if (SelectArr.length) {
+    showSendModel.value = true
+  } else {
+    notification.error({ message: '请选择发送单号', duration: 3 })
   }
-  function editOrder(index) {
-    editIndex.value = index
-    const data = orderList.value[index]
-    orderList.value.forEach((item) => {
-      item.checked = false
-    })
-    orderList.value[index].checked = true
-    setFieldsValueBase(data)
-    RefcargoInfo.value.preOrderInit(data)
-    setFieldsValueMail(data)
-    setFieldsValueYard(data)
-    setFieldsValueMail({
-      shipper: '',
-      shipperId: '',
-      consignee: '',
-      consigneeId: '',
-      notifyParty: '',
-      notifyPartyId: '',
-    })
-    ctnList.value = data.ctnInfo ? data.ctnInfo : []
+}
+function delboxLine() {
+  for (let i = ctnList.value.length - 1; i >= 0; i--) {
+    if (ctnList.value[i].selected) {
+      ctnList.value.splice(i, 1)
+    }
+  }
+  hotpreOrder.value.hotInstance.loadData(ctnList.value)
+}
+function copyboxLine() {
+  const arr = [] as any
+  ctnList.value.forEach((item) => {
+    if (item.selected) {
+      arr.push(item)
+    }
+  })
+  if (arr.length > 1) {
+    createMessage.error('请选择一条数据复制')
+    return false
+  }
+  if (arr.length == 1) {
+    ctnList.value.push(JSON.parse(JSON.stringify(arr[0])))
     hotpreOrder.value.hotInstance.loadData(ctnList.value)
   }
+  console.log(arr)
+}
+// 确认发送
+function sendSubmit() {
+  sendLoading.value = true
+  let SendIds: any = []
+  orderList.value.forEach((e) => {
+    if (e.checked) {
+      SendIds.push(e.id)
+    }
+  })
+  let ApiData = {
+    ids: SendIds,
+    type: sendType.value,
+    sendRemark: sendRemarkVal.value,
+  }
+  SendShippingBill(ApiData)
+    .then((res) => {
+      let message = ''
+      if (res.succeeded) {
+        switch (sendType.value) {
+          case '0':
+            message = '新增发送成功'
+            break
+          case '1':
+            message = '修改发送成功'
+            break
+          default:
+            message = '删除发送成功'
+            break
+        }
+        notification.success({ message: message, duration: 3 })
+        sendClose()
+      }
+      sendLoading.value = false
+    })
+    .catch((err) => {
+      sendLoading.value = false
+    })
+}
+// 关闭
+function sendClose() {
+  showSendModel.value = false
+  sendType.value = ''
+  sendRemarkVal.value = ''
+}
+// 刷新
+function handleRef() {
+  handelNoData()
+}
+// 点击列表 保存原先信息 然后切换
 
-  // -----------------------下侧表格------------------------
-  const list = ref<any>([])
-  const ctnDict = ref([])
-  const kindPkgsDict = ref([])
-  const hotpreOrder = ref(null) as any
-  const mainPkgs = ref([]) as any
-  const totalPkgs = ref(0)
-  const totalKgs = ref(0)
-  const totalCbm = ref(0)
-  const columns = [
-    {
-      data: 'selected',
-      type: 'checkbox',
-      title: ' ',
-      width: 32,
-      className: 'htCenter',
-      readOnly: false,
+function changeOrder(index) {
+  saveOrderInfo().then((res) => {
+    editOrder(index)
+  })
+}
+function editOrder(index) {
+  editIndex.value = index
+  const data = orderList.value[index]
+  orderList.value.forEach((item) => {
+    item.checked = false
+  })
+  orderList.value[index].checked = true
+  setFieldsValueBase(data)
+  RefcargoInfo.value.preOrderInit(data)
+  setFieldsValueMail(data)
+  setFieldsValueYard(data)
+  setFieldsValueMail({
+    shipper: '',
+    shipperId: '',
+    consignee: '',
+    consigneeId: '',
+    notifyParty: '',
+    notifyPartyId: '',
+  })
+  ctnList.value = data.ctnInfo ? data.ctnInfo : []
+  hotpreOrder.value.hotInstance.loadData(ctnList.value)
+}
+
+// -----------------------下侧表格------------------------
+const list = ref<any>([])
+const ctnDict = ref([])
+const kindPkgsDict = ref([])
+const hotpreOrder = ref(null) as any
+const mainPkgs = ref([]) as any
+const totalPkgs = ref(0)
+const totalKgs = ref(0)
+const totalCbm = ref(0)
+const columns = [
+  {
+    data: 'selected',
+    type: 'checkbox',
+    title: ' ',
+    width: 32,
+    className: 'htCenter',
+    readOnly: false,
+  },
+  {
+    title: '箱型代码',
+    width: 80,
+    data: 'ctnCode',
+  },
+  {
+    title: '箱型',
+    width: 120,
+    data: 'ctn',
+    type: 'dropdown',
+    source: async (query, process) => {
+      const res = ctnDict.value.length ? ctnDict.value : (await GetCtnSelectList())?.data
+      if (!ctnDict.value.length) ctnDict.value = res
+      const dict = res.map((res) => {
+        return res.ctnName
+      })
+      process(dict)
     },
-    {
-      title: '箱型代码',
-      width: 80,
-      data: 'ctnCode',
+  },
+  {
+    title: '箱号',
+    width: 150,
+    data: 'cntrNo',
+  },
+  {
+    title: '封号',
+    width: 150,
+    data: 'sealNo',
+  },
+  {
+    title: '件数',
+    width: 100,
+    data: 'pkgs',
+  },
+  {
+    title: '包装',
+    width: 120,
+    data: 'kindPkgsName',
+    type: 'dropdown',
+    // 下拉框数据，可以同步或者异步返回(异步需要process返回)
+    source: async (query, process) => {
+      const res = (await GetPackageSelectList({ queryKey: query }))?.data
+      mainPkgs.value = res
+      const dict = res.map((res) => {
+        return res.packageName
+      })
+      process(dict)
     },
-    {
-      title: '箱型',
-      width: 120,
-      data: 'ctn',
-      type: 'dropdown',
-      source: async (query, process) => {
+  },
+  {
+    title: '重量',
+    width: 100,
+    data: 'kgs',
+  },
+  {
+    title: '尺码',
+    width: 100,
+    data: 'cbm',
+  },
+  {
+    title: 'hs编码',
+    width: 120,
+    data: 'hsCode',
+  },
+]
+// 表格配置项
+const settings = {
+  height: '208',
+  autoWrapRow: true,
+  autoWrapCol: true,
+  // 每行的高度
+  rowHeights: 26,
+  fixedColumnsLeft: 1,
+  // 需要隐藏的列
+  hiddenColumns: {
+    columns: [1],
+    indicators: true,
+  },
+  // 控制回车移动
+  enterMoves: 'row',
+  columnSorting: true,
+  // 如果通过复制或者填写校验出现错误，清空输入框
+  afterValidate: function (isValid, value, row, prop, source) {
+    if (!isValid) {
+      hotpreOrder.value.hotInstance.setDataAtRowProp(row, prop, '')
+    }
+  },
+  columns: columns,
+  // 此行直接复制，必须(非商用)
+  licenseKey: 'non-commercial-and-evaluation',
+  // 定义所有单元格发生变化的回调处理
+  async afterChange(changes, source) {
+    // 这里定义了编辑，自动填充和拷贝数据的处理逻辑
+    if (source === 'edit' || source === 'Autofill.fill' || source === 'CopyPaste.paste') {
+      let dict: any = {}
+      // 选择箱型联动逻辑
+      if (changes[0][1] === 'ctn') {
         const res = ctnDict.value.length ? ctnDict.value : (await GetCtnSelectList())?.data
         if (!ctnDict.value.length) ctnDict.value = res
-        const dict = res.map((res) => {
-          return res.ctnName
+        const item = res.filter((item) => {
+          return item.ctnName === changes[0][3]
         })
-        process(dict)
-      },
-    },
-    {
-      title: '箱号',
-      width: 150,
-      data: 'cntrNo',
-    },
-    {
-      title: '封号',
-      width: 150,
-      data: 'sealNo',
-    },
-    {
-      title: '件数',
-      width: 100,
-      data: 'pkgs',
-    },
-    {
-      title: '包装',
-      width: 120,
-      data: 'kindPkgsName',
-      type: 'dropdown',
-      // 下拉框数据，可以同步或者异步返回(异步需要process返回)
-      source: async (query, process) => {
-        const res = (await GetPackageSelectList({ queryKey: query }))?.data
-        mainPkgs.value = res
-        const dict = res.map((res) => {
-          return res.packageName
-        })
-        process(dict)
-      },
-    },
-    {
-      title: '重量',
-      width: 100,
-      data: 'kgs',
-    },
-    {
-      title: '尺码',
-      width: 100,
-      data: 'cbm',
-    },
-    {
-      title: 'hs编码',
-      width: 120,
-      data: 'hsCode',
-    },
-  ]
-  // 表格配置项
-  const settings = {
-    height: '208',
-    autoWrapRow: true,
-    autoWrapCol: true,
-    // 每行的高度
-    rowHeights: 26,
-    fixedColumnsLeft: 1,
-    // 需要隐藏的列
-    hiddenColumns: {
-      columns: [1],
-      indicators: true,
-    },
-    // 控制回车移动
-    enterMoves: 'row',
-    columnSorting: true,
-    // 如果通过复制或者填写校验出现错误，清空输入框
-    afterValidate: function (isValid, value, row, prop, source) {
-      if (!isValid) {
-        hotpreOrder.value.hotInstance.setDataAtRowProp(row, prop, '')
-      }
-    },
-    columns: columns,
-    // 此行直接复制，必须(非商用)
-    licenseKey: 'non-commercial-and-evaluation',
-    // 定义所有单元格发生变化的回调处理
-    async afterChange(changes, source) {
-      // 这里定义了编辑，自动填充和拷贝数据的处理逻辑
-      if (source === 'edit' || source === 'Autofill.fill' || source === 'CopyPaste.paste') {
-        let dict: any = {}
-        // 选择箱型联动逻辑
-        if (changes[0][1] === 'ctn') {
-          const res = ctnDict.value.length ? ctnDict.value : (await GetCtnSelectList())?.data
-          if (!ctnDict.value.length) ctnDict.value = res
-          const item = res.filter((item) => {
-            return item.ctnName === changes[0][3]
-          })
-          if (item) dict = item[0]
-          ctnList.value[changes[0][0]]['ctn'] = dict?.ctnName
-          ctnList.value[changes[0][0]]['ctnCode'] = dict?.ediCode
-          ctnList.value[changes[0][0]]['size'] = dict?.ctnSize
-          if (ctnList.value[changes[0][0]]['ctnNum']) {
-            ctnList.value[changes[0][0]]['teu'] =
-              parseInt(dict.teu || 0) * parseInt(ctnList.value[changes[0][0]]['ctnNum'])
-          }
-          ctnList.value[changes[0][0]]['tareWeight'] = dict?.ctnWeight
+        if (item) dict = item[0]
+        ctnList.value[changes[0][0]]['ctn'] = dict?.ctnName
+        ctnList.value[changes[0][0]]['ctnCode'] = dict?.ediCode
+        ctnList.value[changes[0][0]]['size'] = dict?.ctnSize
+        if (ctnList.value[changes[0][0]]['ctnNum']) {
+          ctnList.value[changes[0][0]]['teu'] =
+            parseInt(dict.teu || 0) * parseInt(ctnList.value[changes[0][0]]['ctnNum'])
         }
-        if (changes[0][1] === 'kindPkgsName') {
-          const res = mainPkgs.value
-          const item = res.filter((item) => {
-            return item.packageName === changes[0][3]
-          })
-          if (item) dict = item[0]
-          ctnList.value[changes[0][0]]['kindPkgs'] = dict?.id
-          ctnList.value[changes[0][0]]['kindPkgsName'] = dict?.packageName
-        }
-        // // 计算件数
-        // if (changes[0][1] === 'pkgs') {
-        //   let RData = 0
-        //   ctnList.value.forEach((e) => {
-        //     if (e.pkgs) {
-        //       RData = RData + parseInt(e.pkgs)
-        //     }
-        //   })
-        //   totalPkgs.value = RData
-        // }
-        // // 计算毛重
-        // if (changes[0][1] === 'kgs') {
-        //   let RData = 0
-        //   ctnList.value.forEach((e) => {
-        //     if (e.kgs) {
-        //       RData = RData + Number(e.kgs)
-        //     }
-        //   })
-        //   totalKgs.value = RData.toFixed(2)
-        // }
-        // // 计算尺码
-        // if (changes[0][1] === 'cbm') {
-        //   let RData = 0
-        //   ctnList.value.forEach((e) => {
-        //     if (e.cbm) {
-        //       RData = RData + Number(e.cbm)
-        //     }
-        //   })
-        //   totalCbm.value = RData.toFixed(2)
-        // }
+        ctnList.value[changes[0][0]]['tareWeight'] = dict?.ctnWeight
       }
-    },
-  }
-  function GetCtnList() {
-    if (orderList.value[editIndex.value].id) {
-      let ApiData = {
-        queryCondition: JSON.stringify([
-          {
-            FieldName: 'pid',
-            FieldValue: orderList.value[editIndex.value].id,
-            ConditionalType: 1,
-          },
-        ]),
-        pageCondition: {
-          pageIndex: 1,
-          pageSize: 999,
-          sortConditions: [],
-        },
+      if (changes[0][1] === 'kindPkgsName') {
+        const res = mainPkgs.value
+        const item = res.filter((item) => {
+          return item.packageName === changes[0][3]
+        })
+        if (item) dict = item[0]
+        ctnList.value[changes[0][0]]['kindPkgs'] = dict?.id
+        ctnList.value[changes[0][0]]['kindPkgsName'] = dict?.packageName
       }
-      GetShippingBillCtnList(ApiData).then((res) => {
-        list.vale = res.data
-      })
+      // // 计算件数
+      // if (changes[0][1] === 'pkgs') {
+      //   let RData = 0
+      //   ctnList.value.forEach((e) => {
+      //     if (e.pkgs) {
+      //       RData = RData + parseInt(e.pkgs)
+      //     }
+      //   })
+      //   totalPkgs.value = RData
+      // }
+      // // 计算毛重
+      // if (changes[0][1] === 'kgs') {
+      //   let RData = 0
+      //   ctnList.value.forEach((e) => {
+      //     if (e.kgs) {
+      //       RData = RData + Number(e.kgs)
+      //     }
+      //   })
+      //   totalKgs.value = RData.toFixed(2)
+      // }
+      // // 计算尺码
+      // if (changes[0][1] === 'cbm') {
+      //   let RData = 0
+      //   ctnList.value.forEach((e) => {
+      //     if (e.cbm) {
+      //       RData = RData + Number(e.cbm)
+      //     }
+      //   })
+      //   totalCbm.value = RData.toFixed(2)
+      // }
+    }
+  },
+}
+function GetCtnList() {
+  if (orderList.value[editIndex.value].id) {
+    let ApiData = {
+      queryCondition: JSON.stringify([
+        {
+          FieldName: 'pid',
+          FieldValue: orderList.value[editIndex.value].id,
+          ConditionalType: 1,
+        },
+      ]),
+      pageCondition: {
+        pageIndex: 1,
+        pageSize: 999,
+        sortConditions: [],
+      },
     }
+    GetShippingBillCtnList(ApiData).then((res) => {
+      list.vale = res.data
+    })
   }
+}
 
-  defineExpose({
-    init,
-  })
+defineExpose({
+  init,
+})
 </script>
 <style lang="less" scoped>
-  .ds-pre-order {
-    .pl0 {
-      padding-left: 0 !important;
-    }
+.ds-pre-order {
+  .pl0 {
+    padding-left: 0 !important;
+  }
 
-    .pb0 {
-      padding-bottom: 0 !important;
-    }
+  .pb0 {
+    padding-bottom: 0 !important;
+  }
 
-    .pt0 {
-      padding-top: 0 !important;
-    }
+  .pt0 {
+    padding-top: 0 !important;
+  }
 
-    .ant-modal-body .ant-form {
-      background: #ffffff;
-      padding: 0 15px;
-    }
+  .ant-modal-body .ant-form {
+    background: #ffffff;
+    padding: 0 15px;
+  }
 
-    .sft-save-btn {
-      position: absolute;
-      right: -10px;
-      top: -26px;
-    }
+  .sft-save-btn {
+    position: absolute;
+    right: -10px;
+    top: -26px;
+  }
 
-    .sft-select {
-      position: absolute;
-      left: 40px;
-      top: -18px;
-      width: 90px;
+  .sft-select {
+    position: absolute;
+    left: 40px;
+    top: -18px;
+    width: 90px;
 
-      .ant-select-selector {
-        height: 16px !important;
+    .ant-select-selector {
+      height: 16px !important;
 
-        .ant-select-selection-item {
-          height: 20px;
-          position: relative;
-          top: -5px;
-        }
+      .ant-select-selection-item {
+        height: 20px;
+        position: relative;
+        top: -5px;
       }
     }
   }
+}
 
-  .baseinfo {
-    .ds-textarea {
-      position: relative;
-      top: -6px;
+.baseinfo {
+  .ds-textarea {
+    position: relative;
+    top: -6px;
 
-      textarea {
-        height: 102px;
-      }
-    }
-
-    .ant-divider-horizontal {
-      margin: 8px 0 8px !important;
-      background: #e8ebed;
-    }
-
-    h4 {
-      margin: 12px 0 5px 0;
+    textarea {
+      height: 102px;
     }
+  }
 
-    .iconfont {
-      display: inline-block;
-      height: 18px;
-      width: 32px;
-      border-radius: 2px;
-      font-size: 12px;
-      text-align: center;
-      background: #f5f9fc;
-      color: #257afa;
-      margin-right: 0;
-      margin-left: 4px;
-      margin-bottom: 4px;
-      cursor: pointer;
-    }
+  .ant-divider-horizontal {
+    margin: 8px 0 8px !important;
+    background: #e8ebed;
+  }
 
-    .copy-btn,
-    .save-btn {
-      float: right;
-    }
+  h4 {
+    margin: 12px 0 5px 0;
   }
 
-  .title {
+  .iconfont {
+    display: inline-block;
+    height: 18px;
+    width: 32px;
+    border-radius: 2px;
     font-size: 12px;
-    font-weight: bold;
-    color: black;
-    margin-bottom: 5px;
-    padding-left: 14px;
-    display: flex;
-    align-items: center;
+    text-align: center;
+    background: #f5f9fc;
+    color: #257afa;
+    margin-right: 0;
+    margin-left: 4px;
+    margin-bottom: 4px;
+    cursor: pointer;
   }
 
-  .box {
-    margin-bottom: 10px;
+  .copy-btn,
+  .save-btn {
+    float: right;
   }
+}
 
-  .right {
-    width: calc(100% - 320px);
-    height: 80vh;
-    overflow-y: auto;
-    overflow-x: hidden;
-  }
+.title {
+  font-size: 12px;
+  font-weight: bold;
+  color: black;
+  margin-bottom: 5px;
+  padding-left: 14px;
+  display: flex;
+  align-items: center;
+}
 
-  .left-title {
-    display: flex;
+.box {
+  margin-bottom: 10px;
+}
 
-    /deep/ .ant-btn-link {
-      padding: 0px !important;
-      margin-right: 10px;
-    }
+.right {
+  width: calc(100% - 320px);
+  height: 80vh;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
 
-    border-bottom: 1px solid #e8ebed;
-    margin-bottom: 10px;
+.left-title {
+  display: flex;
+
+  /deep/ .ant-btn-link {
+    padding: 0px !important;
+    margin-right: 10px;
   }
 
-  .order-label {
-    margin-left: 10px;
-    cursor: pointer;
+  border-bottom: 1px solid #e8ebed;
+  margin-bottom: 10px;
+}
 
-    &.active {
-      color: #257afa;
-    }
-  }
+.order-label {
+  margin-left: 10px;
+  cursor: pointer;
 
-  .sec-order {
-    border-bottom: 1px solid #e8ebed;
+  &.active {
+    color: #257afa;
   }
+}
 
-  .yard {
-    width: 400px;
-  }
+.sec-order {
+  border-bottom: 1px solid #e8ebed;
+}
 
-  .table-calc {
-    margin-top: 8px;
-    font-size: 12px;
+.yard {
+  width: 400px;
+}
 
-    &-box {
-      display: inline-block;
-      background: #f5f9fc;
-      padding: 2px 6px;
-      margin-right: 6px;
+.table-calc {
+  margin-top: 8px;
+  font-size: 12px;
 
-      span {
-        color: #257afa;
-      }
+  &-box {
+    display: inline-block;
+    background: #f5f9fc;
+    padding: 2px 6px;
+    margin-right: 6px;
+
+    span {
+      color: #257afa;
     }
   }
+}
 </style>
diff --git a/src/views/system/org/columns.tsx b/src/views/system/org/columns.tsx
index 76453e2f..27843ede 100644
--- a/src/views/system/org/columns.tsx
+++ b/src/views/system/org/columns.tsx
@@ -440,6 +440,22 @@ export const formSchema: FormSchema[] = [
       span: 6,
     },
   },
+  {
+    field: 'IsSettlementOrg',
+    component: 'Switch',
+    label: '是否结算机构',
+    required: false,
+    componentProps: {
+      options: [
+        { label: '是', value: 0 },
+        { label: '否', value: 1 },
+      ],
+    },
+    defaultValue: true,
+    colProps: {
+      span: 6,
+    },
+  },
   {
     field: 'files',
     slot: 'files',

From bb5f3cd860dd7e5b379cc8c2740896ed51899aad Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Sat, 2 Nov 2024 14:08:20 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invoiceIssue/detail/applyInvoice.vue      | 46 +++++++++++++------
 .../operation/invoiceIssue/detail/index.vue   | 28 ++++++++---
 2 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/src/views/operation/invoiceIssue/detail/applyInvoice.vue b/src/views/operation/invoiceIssue/detail/applyInvoice.vue
index 8e56e999..f98ac614 100644
--- a/src/views/operation/invoiceIssue/detail/applyInvoice.vue
+++ b/src/views/operation/invoiceIssue/detail/applyInvoice.vue
@@ -3,9 +3,10 @@
         <a-modal width="1600px" @cancel="open = false" :visible="open" title="添加发票申请明细" :footer="null">
             <div style="padding-bottom:5px ;">
                 <div>
-                    <BasicTable  :rowClassName="rowClassName" class="ds-table" @row-click="handleClick" @register="registerTable">
+                    <BasicTable :rowClassName="rowClassName" class="ds-table" @row-click="handleClick"
+                        @register="registerTable">
                         <template #right>
-                            <div style="width: 40%;margin-left: 10px;margin-top:10px;">
+                            <div style="width: 40%;margin-left: 10px;">
                                 <div>
                                     <BasicTable class="ds-table" @register="registerTable1">
                                         <template #tableTitle>
@@ -74,7 +75,8 @@
         <a-modal width="1600px" @cancel="freeFlag = false" :visible="freeFlag" title="添加发票申请明细" :footer="null">
             <div style="padding-bottom:5px ;">
                 <div>
-                    <BasicTable class="ds-table" @row-click="handleClickFree" @register="registerTableFree">
+                    <BasicTable :rowClassName="rowClassName" class="ds-table" @row-click="handleClickFree"
+                        @register="registerTableFree">
                         <template #right>
                             <div style="width: 40%;margin-left: 10px;">
                                 <div>
@@ -219,10 +221,11 @@ const freeDetailList = ref([]) as any
 const [registerTable, { getForm, setSelectedRowKeys, getSelectRows, setProps, getRawDataSource, setLoading }] = useTable({
     api: async (p) => {
         const res: API.DataResult = await GetApplicationList(p)
-        res.data.forEach(item => {
+        res.data.forEach((item, index) => {
             item.amountUSDTotal = item.amountUSD
             item.amountOtherTotal = item.amountOther
             item.amountRMBTotal = item.amountRMB
+            item.cindex = index
         })
         return new Promise((resolve) => {
             resolve({ data: [...res.data], total: res.count })
@@ -240,6 +243,9 @@ const [registerTable, { getForm, setSelectedRowKeys, getSelectRows, setProps, ge
     showIndexColumn: false,
     maxHeight: '600',
     pagination: true,
+    rowKey: 'cindex',
+    id: '11',
+    showTableSetting: true,
     rowSelection: {},
     striped: true,
     bordered: true,
@@ -258,6 +264,8 @@ const [registerTable1, { getSelectRows: getSelectRowsFee, setProps: setPropsFee,
     dataSource: dataSource.value,
     striped: true,
     rowKey: 'recordId',
+    id: '22',
+    showTableSetting: true,
     bordered: true,
     indexColumnProps: {
         width: 60,
@@ -269,6 +277,9 @@ const [registerTableFree, { getForm: getFormFree, setSelectedRowKeys: setSelecte
     api: async (p) => {
         const res: API.DataResult = await FreeInvoiceGetBizList(p)
         return new Promise((resolve) => {
+            res.data.forEach((item, index) => {
+                item.cindex = index
+            })
             resolve({ data: [...res.data], total: res.count })
         })
     },
@@ -289,6 +300,9 @@ const [registerTableFree, { getForm: getFormFree, setSelectedRowKeys: setSelecte
     useSearchForm: true,
     showIndexColumn: false,
     maxHeight: '600',
+    rowKey: 'cindex',
+    id: '33',
+    showTableSetting: true,
     pagination: true,
     striped: true,
     bordered: true,
@@ -310,10 +324,9 @@ const [registerTableFreeDetail, { getSelectRows: getSelectRowsFeeDetail, setProp
     dataSource: freeDetailList.value,
     striped: true,
     rowKey: 'recordId',
-    rowSelection: {
-        // onChange: onSelectAmount
-    },
     bordered: true,
+    id: '44',
+    showTableSetting: true,
     indexColumnProps: {
         width: 60,
     },
@@ -324,12 +337,10 @@ const rmbTotal = ref(0)
 const usdTotal = ref(0)
 const otherTotal = ref(0)
 function onSelectChange(selectedRowKeys) {
-    const list = getSelectRowsFree()
-    console.log(list, selectedRowKeys)
     rmbTotal.value = 0
     usdTotal.value = 0
     otherTotal.value = 0
-    list.forEach(item => {
+    selectedRowKeys.forEach(item => {
         rmbTotal.value += Number(item.unBilledRMB)
         usdTotal.value += Number(item.unBilledUSD)
         otherTotal.value += Number(item.unBilledOther)
@@ -345,6 +356,7 @@ function handleAddDetial() {
     changeApply()
 }
 function rowClassName(record, index) {
+    console
     if (index == activeRow.value) {
         return 'active-row'
     }
@@ -529,7 +541,7 @@ function handleSureExhange() {
 }
 const activeRow = ref(null)
 function handleClick(record, index) {
-    setSelectedRowKeys([record.id])
+    setSelectedRowKeys([index])
     activeRow.value = index
     const data = {
         ids: [record.id],
@@ -549,12 +561,13 @@ function handleClick(record, index) {
     })
 }
 function handleClickFree(record, index) {
-    setSelectedRowKeysFree([record.id])
+    setSelectedRowKeysFree([index])
     const data = {
         id: record.id,
         businessType: record.businessType,
         customerId: record.customerId
     }
+    activeRow.value = index
     loading.value = true
     FreeInvoiceGetFees([data]).then(res => {
         if (res.succeeded) {
@@ -575,7 +588,6 @@ function init(data) {
     if (route.query.type == 'free') {
         freeFlag.value = true
     }
-    console.log(customerIdP.value)
     setTimeout(() => {
         if (customerIdP.value) {
             if (route.query.type == 'free') {
@@ -588,6 +600,13 @@ function init(data) {
                 })
             }
         }
+        watch(
+            () => getSelectRowsFree(),
+            (data) => {
+                onSelectChange(data)
+            },
+            { immediate: false, deep: true }
+        )
     }, 200)
 
 }
@@ -788,6 +807,7 @@ defineExpose({ init, customerIdP })
 /deep/ .ant-checkbox-wrapper-checked .ant-checkbox-disabled+span {
     color: #257afa;
 }
+
 :deep(.active-row) {
     .ant-table-cell {
         background: #dfe8f6;
diff --git a/src/views/operation/invoiceIssue/detail/index.vue b/src/views/operation/invoiceIssue/detail/index.vue
index c5249bb8..3428ad1f 100644
--- a/src/views/operation/invoiceIssue/detail/index.vue
+++ b/src/views/operation/invoiceIssue/detail/index.vue
@@ -72,12 +72,15 @@
                     <a-button v-repeat type="link" v-if="route.query.id">
                         <span class="iconfont icon-ic_search24px"></span>查看发票
                     </a-button>
+                    <a-button @click="openHand" v-repeat type="link" v-if="route.query.id">
+                        <span class="iconfont icon-ic_search24px"></span>手动登记
+                    </a-button>
                 </div>
             </div>
             <div class="content">
                 <div class="left">
                     <div class="left-top">
-                        <div class="left-top-item" style="padding-right: 60px">
+                        <div class="left-top-item">
                             <editCompent :showEdit="false" ref="editCompentRef" label="发票币别:">
                                 <template #text>
                                     <span> {{ form.currency }}</span>
@@ -104,7 +107,7 @@
                                 </template>
                             </editCompent>
                         </div>
-                        <div class="left-top-item middle" style="padding-left: 9%;">
+                        <div class="left-top-item middle" >
                             <a-dropdown>
                                 <a style="color: rgba(158, 83, 9, 1);">
                                     {{ getCategory() }}
@@ -122,7 +125,7 @@
                                 </template>
                             </a-dropdown>
                         </div>
-                        <div class="left-top-item" style="padding-left: 120px">
+                        <div class="left-top-item" >
                             <editCompent :showEdit="false" ref="editCompentRef" label="发票号:">
                                 <template #text>
                                     <span>{{ form.invoiceNO }}</span>
@@ -366,8 +369,18 @@
                 </template>
             </BasicTable>
         </a-modal>
+        <a-modal width="600px" @cancel="handFlag = false" @ok="handFlag = false" :visible="handFlag" title="手工登记">
+            <a-form :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
+                <a-form-item label="发票号">
+                    <a-input v-model:value="form.invoiceNO" />
+                </a-form-item>
+                <a-form-item label="开票日期">
+                    <a-date-picker size="small" style="width: 100%" valueFormat="YYYY-MM-DD"
+                        v-model:value="form.invoiceDate" />
+                </a-form-item>
+            </a-form>
+        </a-modal>
         <invoiceFile ref="invoiceFileRef"></invoiceFile>
-
     </div>
 </template>
 <script lang="ts" setup>
@@ -734,7 +747,6 @@ function handleSave() {
             loading.value = false
         })
     }
-
 }
 function getDetail() {
     loading.value = true
@@ -772,6 +784,10 @@ function getDetail() {
         loading.value = false
     })
 }
+const handFlag = ref(false)
+function openHand() {
+    handFlag.value = true
+}
 const invoiceFileRef = ref('')
 function openFile() {
     invoiceFileRef.value.init()
@@ -1378,7 +1394,7 @@ watchEffect(() => {
     margin-right: 5px;
     font-weight: 400;
     color: rgba(158, 83, 9, 1);
-    flex-shrink: 1;
+    flex-shrink: 0;
     display: inline-block;
     font-size: 12px;
     min-width: 27px;

From bfd08e3880cdfd2799c00345a3a18b1509cfc5dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Sat, 2 Nov 2024 14:10:23 +0800
Subject: [PATCH 3/6] =?UTF-8?q?11/02=20=E8=87=AA=E5=8A=A8=E5=AF=B9?=
 =?UTF-8?q?=E8=B4=A6=E6=A8=A1=E6=9D=BF=20=E5=BE=80=E6=9D=A5=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=20=E8=B4=A6=E5=8A=A1=20=20=E9=93=B6=E8=A1=8C/?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common/index.ts                       |   9 +-
 .../infoclient/ClientAccountDateModal.vue     | 179 +---------
 src/views/baseinfo/infoclient/EditColumns.tsx |   4 +-
 .../FeeCustTemplate/TenantAuditStepModal.vue  |  88 ++++-
 .../infoclient/FeeCustTemplate/columns.tsx    |  77 ++++-
 .../infoclient/FeeCustTemplate/feeField.vue   | 326 ++----------------
 .../infoclient/FeeCustTemplate/index.vue      |  12 +-
 src/views/baseinfo/infoclient/columns.tsx     | 214 ++++++++----
 .../FeeCustTemplate/TenantAuditStepModal.vue  |  95 ++++-
 src/views/fee/FeeCustTemplate/columns.tsx     |  84 ++++-
 src/views/fee/FeeCustTemplate/feeField.vue    |  22 +-
 src/views/fee/FeeCustTemplate/index.vue       |  13 +-
 12 files changed, 527 insertions(+), 596 deletions(-)

diff --git a/src/api/common/index.ts b/src/api/common/index.ts
index 7d042e64..1c3c18fa 100644
--- a/src/api/common/index.ts
+++ b/src/api/common/index.ts
@@ -509,7 +509,14 @@ export function GetCarrierSelectList(params) {
     params,
   })
 }
-
+// // 船公司下拉 客户端
+// export function GetCarrierSelectList(params) {
+//   return request({
+//     url: '/mainApi/ClientCommon/GetCarrierSelectList',
+//     method: 'get',
+//     params,
+//   })
+// }
 // 切换组织机构
 export function ChangeOrg(params) {
   return request({
diff --git a/src/views/baseinfo/infoclient/ClientAccountDateModal.vue b/src/views/baseinfo/infoclient/ClientAccountDateModal.vue
index 945df593..b2010f54 100644
--- a/src/views/baseinfo/infoclient/ClientAccountDateModal.vue
+++ b/src/views/baseinfo/infoclient/ClientAccountDateModal.vue
@@ -8,42 +8,6 @@
     @ok="handleSave"
   >
     <BasicForm @register="registerForm" />
-    <div class="HotTable">
-      <div>
-        <a-button type="link" @click="TableAdd" class="pl0">
-          <span class="iconfont icon-new_document"></span>
-          新增
-        </a-button>
-        <a-popconfirm
-          title="确定要删除所选数据?"
-          ok-text="确定"
-          cancel-text="取消"
-          @confirm="FnClickDel"
-        >
-          <a-button type="link" class="pl0">
-            <span class="iconfont icon-shanchu21"></span>
-            删除
-          </a-button>
-        </a-popconfirm>
-      </div>
-      <div style="position: relative">
-        <input
-          class="ds-tb-check ds-goods-tb-check"
-          type="checkbox"
-          v-model="allCheck"
-          :indeterminate="someCheck"
-          v-if="list.length !== 0"
-        />
-        <hot-table ref="hotTb" :data="list" :settings="settings">
-          <img
-            v-show="!list.length"
-            class="hot-tb-no-data"
-            src="../../../assets/images/nodata.png"
-            alt=""
-          />
-        </hot-table>
-      </div>
-    </div>
     <!--右下角按钮-->
     <template #footer>
       <a-button
@@ -74,15 +38,12 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { ref, computed, unref, watchEffect, watch } from 'vue'
+  import { ref, computed, unref } from 'vue'
   import { BasicModal, useModalInner } from '/@/components/Modal'
   import { BasicForm, useForm } from '/@/components/Form/index'
   import { CADformSchema } from './columns'
   import { editClientBank, getClientBankInfo } from './api'
   import { useMessage } from '/@/hooks/web/useMessage'
-  import { HotTable } from '@handsontable/vue3'
-  import { registerAllModules } from 'handsontable/registry'
-  registerAllModules()
   // 声明Emits
   const emit = defineEmits(['success', 'register'])
   const isUpdate = ref(true)
@@ -97,9 +58,6 @@
 
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
     resetFields()
-    list.value.splice(0)
-    allCheck.value = false
-    someCheck.value = false
     setModalProps({ confirmLoading: false, loading: true })
     isUpdate.value = !!data?.isUpdate
     rowId.value = data.record.id
@@ -110,9 +68,6 @@
         setFieldsValue({
           ...res.data,
         })
-        res.data.invoiceHeaders.forEach((item) => {
-          list.value.push(item)
-        })
       }
       setModalProps({ confirmLoading: false })
     } else {
@@ -126,7 +81,7 @@
   async function handleSave(exit) {
     try {
       const values = await validate()
-      values.invoiceHeaders = list.value
+
       setModalProps({ confirmLoading: true, loading: true })
       // TODO custom api
 
@@ -152,131 +107,7 @@
       setModalProps({ confirmLoading: false, loading: false })
     }
   }
-  // -------------------发票抬头--------------------
-  const list = ref<any>([])
-  // 全部勾选
-  const allCheck = ref(false)
-  // 部分勾选
-  const someCheck = ref(false)
-  const hotTb = ref()
-  watchEffect(() => {
-    // 全选
-    if (allCheck.value) {
-      list.value.forEach((item: any) => {
-        item.selected = true
-      })
-    } else {
-      // 取消全选
-      list.value.forEach((item: any) => {
-        item.selected = false
-      })
-    }
-  })
-  watch(
-    list.value,
-    (val) => {
-      let a = 0
-      let b = 0
-      val.forEach((item: any) => {
-        if (item.selected) {
-          a += 1
-        } else {
-          b += 1
-        }
-      })
-      if (a == 0) {
-        allCheck.value = false
-      }
-      if (b == 0) {
-        allCheck.value = true
-      }
-      if (a != 0 && b != 0) {
-        someCheck.value = true
-      } else {
-        someCheck.value = false
-      }
-    },
-    {
-      deep: true,
-    },
-  )
-  const columns = [
-    {
-      data: 'selected',
-      type: 'checkbox',
-      title: ' ',
-      width: 32,
-      className: 'htCenter',
-      readOnly: false,
-    },
-    {
-      title: '主键ID',
-      width: 200,
-      data: 'id',
-    },
-    {
-      title: '关联ID',
-      width: 200,
-      data: 'relativeId',
-    },
-    {
-      title: '发票抬头',
-      width: 200,
-      data: 'header',
-    },
-    {
-      title: '地址电话',
-      width: 300,
-      data: 'addressTel',
-    },
-  ]
-  const settings = {
-    height: '260',
-    autoWrapRow: true,
-    autoWrapCol: true,
-    // 每行的高度
-    rowHeights: 26,
-    fixedColumnsLeft: 1,
-    // 需要隐藏的列
-    hiddenColumns: {
-      columns: [1, 2],
-      indicators: true,
-    },
-    // 控制回车移动
-    enterMoves: 'row',
-    columnSorting: true,
-    // 如果通过复制或者填写校验出现错误，清空输入框
-    afterValidate: function (isValid, value, row, prop, source) {
-      if (!isValid) {
-        hotTb.value.hotInstance.setDataAtRowProp(row, prop, '')
-      }
-    },
-    columns: columns,
-    // 此行直接复制，必须(非商用)
-    licenseKey: 'non-commercial-and-evaluation',
-    // 定义所有单元格发生变化的回调处理
-    async afterChange(changes, source) {},
-  }
-  function TableAdd() {
-    if (rowId.value) {
-      list.value.push({ selected: false, relativeId: rowId.value })
-    } else {
-      notification.warning({ message: '请先保存', duration: 3 })
-    }
-  }
-  function FnClickDel() {
-    if (rowId.value) {
-      list.value.forEach((e: any, i) => {
-        if (e.selected) {
-          if (e.id) {
-            list.value.splice(i, 1)
-          }
-        }
-      })
-    } else {
-      notification.warning({ message: '请先保存', duration: 3 })
-    }
-  }
+
   async function refresh() {
     const res: API.DataResult = await getClientBankInfo({ id: unref(rowId) })
     if (res.succeeded) {
@@ -284,10 +115,6 @@
       setFieldsValue({
         ...res.data,
       })
-      list.value.splice(0)
-      res.data.invoiceHeaders.forEach((item) => {
-        list.value.push(item)
-      })
     }
   }
 </script>
diff --git a/src/views/baseinfo/infoclient/EditColumns.tsx b/src/views/baseinfo/infoclient/EditColumns.tsx
index cc9ab315..25d9c732 100644
--- a/src/views/baseinfo/infoclient/EditColumns.tsx
+++ b/src/views/baseinfo/infoclient/EditColumns.tsx
@@ -64,7 +64,7 @@ const res14: API.DataResult = await GetTenantBanks({ currency: 'CNY' })
 if (res14.succeeded) {
   rmbAccountData = []
   res14.data.forEach((e) => {
-    rmbAccountData.push({ label: e.accountName, value: e.id, ...e })
+    rmbAccountData.push({ label: `${e.bankName}-${e.bankAccountNo}`, value: e.id, ...e })
   })
 }
 let usdAccountData: any = []
@@ -72,7 +72,7 @@ const res15: API.DataResult = await GetTenantBanks({ currency: 'USD' })
 if (res15.succeeded) {
   usdAccountData = []
   res15.data.forEach((e) => {
-    usdAccountData.push({ label: e.accountName, value: e.id, ...e })
+    usdAccountData.push({ label: `${e.bankName}-${e.bankAccountNo}`, value: e.id, ...e })
   })
 }
 export const EditformSchema: FormSchema[] = [
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue
index eaa08723..f0cea9a9 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue
@@ -52,7 +52,7 @@
   // 字段数据
   import { formSchema } from './columns'
   // 相关接口
-  import { ApiEdit, ApiBulkEdit, ApiInfo } from './api'
+  import { ApiEdit, ApiBulkEdit, ApiBulkEditDetails, ApiInfo } from './api'
   import { feeUnitDict } from '/@/hooks/dict/index'
   // 提升消息混入
   import { useMessage } from '/@/hooks/web/useMessage'
@@ -73,14 +73,29 @@
   const loading = ref(false)
   const rowId = ref('')
   const { createMessage } = useMessage()
-  const [registerForm, { resetFields, setFieldsValue, getFieldsValue, validate, updateSchema }] =
-    useForm({
-      labelWidth: 100,
-      schemas: formSchema,
-      showActionButtonGroup: false,
-    })
+  const [
+    registerForm,
+    {
+      resetFields,
+      setFieldsValue,
+      appendSchemaByField,
+      removeSchemaByField,
+      getFieldsValue,
+      validate,
+      updateSchema,
+    },
+  ] = useForm({
+    labelWidth: 100,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+  })
+  const unitArr = ref<any>([])
+  const BulkInfoArr = ref<any>([])
   const [registerModal, { setModalProps, closeModal, updateFormField }] = useModalInner(
     async (data) => {
+      unitArr.value.forEach((item) => {
+        removeSchemaByField(`${item}unitP`)
+      })
       resetFields()
       setModalProps({ confirmLoading: false, loading: true })
       isUpdate.value = !!data?.isUpdate
@@ -129,13 +144,54 @@
             feeField.value.condition = res.data.condition
             // detailId.value = res.data.id
           }
+        } else if (isBulk.value) {
+          detailId.value = ''
+          setFieldsValue({
+            customerName: props.customerName,
+            customerId: props.customerId,
+            isBulk: true,
+          })
+          // 添加 对应单位 单票输入
+          const UnitList = await feeUnitDict()
+          unitArr.value.splice(0)
+          BulkInfoArr.value.splice(0)
+          ids.value.forEach(async (e) => {
+            const res: any = await ApiInfo({ id: unref(e) })
+            BulkInfoArr.value.push(res.data)
+            if (res.succeeded) {
+              res.data.details.forEach((item: any) => {
+                if (unitArr.value.indexOf(item.unit) == -1) {
+                  unitArr.value.push(item.unit)
+                  UnitList.forEach((Unit: any) => {
+                    if (item.unit == Unit.value) {
+                      appendSchemaByField(
+                        [
+                          {
+                            field: `${Unit.value}unitP`,
+                            label: `${Unit.label}含税单价`,
+                            component: 'Input',
+                            colProps: { span: 6 },
+                            componentProps: {
+                              placeholder: `${Unit.label}含税单价`,
+                            },
+                          },
+                        ],
+                        undefined,
+                      )
+                    }
+                  })
+                }
+              })
+            }
+          })
+          feeField.value.SetData([])
+          feeField.value.condition = ''
         } else {
           detailId.value = ''
           setFieldsValue({
             customerName: props.customerName,
             customerId: props.customerId,
             saleOrgId: userStore.getUserInfo.userOrgs[0].orgId,
-            isBulk: isBulk.value ? true : false,
           })
           feeField.value.SetData([])
           feeField.value.condition = ''
@@ -164,7 +220,9 @@
       detailId.value = res.data.id
     }
   }
-  const getTitle = computed(() => (!unref(isUpdate) ? '新增' : '编辑'))
+  const getTitle = computed(() =>
+    !unref(isUpdate) ? (!unref(isBulk) ? '批量编辑' : '新增') : '编辑',
+  )
   // 费用表格
   const feeField = ref()
   async function handleSave(exit) {
@@ -181,6 +239,18 @@
       let res: any = null
       console.log(isBulk.value, 11111111111)
       if (isBulk.value) {
+        let ApiDetailsData: any = []
+        // 批量修改 费用明细
+        BulkInfoArr.value.forEach((e) => {
+          e.details.forEach((item) => {
+            unitArr.value.forEach((item2) => {
+              if (item2 == item.unit && values[`${item2}unitP`]) {
+                ApiDetailsData.push({ ...item, taxUnitPrice: values[`${item2}unitP`] })
+              }
+            })
+          })
+        })
+        await ApiBulkEditDetails(ApiDetailsData)
         let ApiData: any = []
         ids.value.forEach((e) => {
           ApiData.push({ ...values, id: e })
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
index b8684c21..452b84eb 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
@@ -5,7 +5,12 @@ import { Tag } from 'ant-design-vue'
 import { getDictOption } from '/@/utils/dictUtil'
 import { useUserStore } from '/@/store/modules/user'
 const userStore: any = useUserStore()
-import { getOrgList, GetClientPortSelectList, GetCarrierSelectList } from '/@/api/common'
+import {
+  getOrgList,
+  GetClientPortSelectList,
+  GetCarrierSelectList,
+  GetSupplierListByCode,
+} from '/@/api/common'
 import {
   GetClientLanesSelectList,
   GetAgentCnClientList,
@@ -32,13 +37,17 @@ GetCarrierSelectList().then((res) => {
   carrierIdList.value = res.data
 })
 const forwarderIdList = ref([])
-GetAgentCnClientList().then((res) => {
+GetSupplierListByCode().then((res) => {
   forwarderIdList.value = res.data
 })
 const mblFrtCodeList = ref([])
 GetClientFrtSelectList().then((res) => {
   mblFrtCodeList.value = res.data
 })
+const PortList = ref([])
+GetClientPortSelectList().then((res) => {
+  PortList.value = res.data
+})
 // 业务来源明细数据
 const sourceDetailId = ref<any>([])
 export const columns: BasicColumn[] = [
@@ -78,12 +87,34 @@ export const columns: BasicColumn[] = [
   {
     title: '起运港',
     dataIndex: 'polCode',
+    sorter: true,
     width: 200,
+    customRender: ({ record }) => {
+      let name = ''
+      PortList.value.some((item: any) => {
+        if (record.polCode == item.ediCode) {
+          name = `${item.cnName}/${item.portName}`
+          return true
+        }
+      })
+      return name
+    },
   },
   {
     title: '卸货港',
     dataIndex: 'podCode',
+    sorter: true,
     width: 200,
+    customRender: ({ record }) => {
+      let name = ''
+      PortList.value.some((item: any) => {
+        if (record.podCode == item.ediCode) {
+          name = `${item.cnName}/${item.portName}`
+          return true
+        }
+      })
+      return name
+    },
   },
   {
     dataIndex: 'laneId',
@@ -137,12 +168,12 @@ export const columns: BasicColumn[] = [
     dataIndex: 'forwarderId',
     title: '订舱口',
     sorter: true,
-    width: 200,
+    width: 280,
     customRender: ({ record }) => {
       let name = ''
       forwarderIdList.value.some((item: any) => {
         if (record.forwarderId == item.id) {
-          name = item.shortName
+          name = item.pinYinCode
           return true
         }
       })
@@ -275,12 +306,32 @@ export const viewColumns: BasicColumn[] = [
     dataIndex: 'polCode',
     sorter: true,
     width: 200,
+    customRender: ({ record }) => {
+      let name = ''
+      PortList.value.some((item: any) => {
+        if (record.polCode == item.ediCode) {
+          name = `${item.cnName}/${item.portName}`
+          return true
+        }
+      })
+      return name
+    },
   },
   {
     title: '卸货港',
     dataIndex: 'podCode',
     sorter: true,
     width: 200,
+    customRender: ({ record }) => {
+      let name = ''
+      PortList.value.some((item: any) => {
+        if (record.podCode == item.ediCode) {
+          name = `${item.cnName}/${item.portName}`
+          return true
+        }
+      })
+      return name
+    },
   },
   {
     dataIndex: 'laneName',
@@ -547,16 +598,19 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    label: '订舱口',
     field: 'forwarderId',
+    label: '订舱口',
     component: 'ApiSelect',
     required: false,
+    // labelSlot: 'yardId',
     dynamicDisabled: false,
     colProps: { span: 4 },
     componentProps: ({ formModel }) => {
       return {
-        api: GetAgentCnClientList,
-        labelField: 'shortName',
+        api: GetSupplierListByCode,
+        params: { code: 'Booking' },
+        labelField: 'pinYinCode',
+        showName: 'description',
         valueField: 'id',
         resultField: 'data',
         filterOption: (input: string, option: any) => {
@@ -927,16 +981,19 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '订舱口',
     field: 'forwarderId',
+    label: '订舱口',
     component: 'ApiSelect',
     required: false,
+    // labelSlot: 'yardId',
     dynamicDisabled: false,
     colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
-        api: GetAgentCnClientList,
-        labelField: 'shortName',
+        api: GetSupplierListByCode,
+        params: { code: 'Booking' },
+        labelField: 'pinYinCode',
+        showName: 'description',
         valueField: 'id',
         resultField: 'data',
         filterOption: (input: string, option: any) => {
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue
index 2fea6708..85bf45c1 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue
@@ -11,10 +11,14 @@
           <span class="iconfont icon-new_document"></span>
           添加
         </a-button>
-        <a-button type="link" @click="BulkEdit">
+        <a-button type="link" @click="copyRow">
+          <span class="iconfont icon-fuzhi"></span>
+          复制
+        </a-button>
+        <!-- <a-button type="link" @click="BulkEdit">
           <span class="iconfont icon-dengjizongshu"></span>
           批量编辑
-        </a-button>
+        </a-button> -->
         <a-popconfirm
           title="确定删除当前选中数据？"
           ok-text="是"
@@ -204,7 +208,7 @@
   // 标准字典
   let unitDict = []
   // 表格数据
-  const list = ref([])
+  const list = ref<any>([])
   // 费用名称字典
   const feeDict = ref([])
   // 结算对象下拉数据
@@ -302,29 +306,6 @@
       className: 'htCenter',
       readOnly: false,
     },
-    // {
-    //   title: '结算对象',
-    //   width: 130,
-    //   data: 'customerName',
-    //   type: 'dropdown',
-    //   source: async (query, process) => {
-    //     // 获取当前选中行
-    //     const rowIndex = hotTb.value.hotInstance.getActiveEditor().row
-    //     const code = list.value[rowIndex]?.customerType || null
-    //     GetClientListByCode({ code }).then((res) => {
-    //       const { data } = res
-    //       data.forEach((item) => {
-    //         item['label'] = item.shortName
-    //         item['value'] = item.codeName
-    //       })
-    //       companyDict.value = data
-    //       const dict = data.map((item) => {
-    //         return item.codeName + '-' + item.shortName
-    //       })
-    //       process(dict)
-    //     })
-    //   },
-    // },
     {
       title: '费用名称',
       width: 130,
@@ -357,7 +338,7 @@
     {
       title: '单位标准',
       width: 130,
-      data: 'unit',
+      data: 'unitText',
       type: 'dropdown',
       source: async (query, process) => {
         if (unitDict.value && unitDict.value.length) {
@@ -425,6 +406,7 @@
       data: 'unitPrice',
       type: 'numeric',
       format: '0.00',
+      readOnly: true,
     },
     {
       title: '汇率',
@@ -468,161 +450,6 @@
       data: 'isAdvancedPay',
       type: 'checkbox',
     },
-    // {
-    //   title: '费用英文名称',
-    //   width: 130,
-    //   data: 'feeEnName',
-    //   type: 'dropdown',
-    //   source: async (query, process) => {
-    //     const res = feeDict.value.length ? feeDict.value : (await GetFeeCodeSelectList())?.data
-    //     if (!feeDict.value.length) feeDict.value = res
-    //     const dict = res.map((res) => {
-    //       return res.enName
-    //     })
-    //     process(dict)
-    //   },
-    // },
-    // {
-    //   title: '客户类别',
-    //   width: 130,
-    //   data: 'customerTypeText',
-    //   type: 'dropdown',
-    //   source: async (query, process) => {
-    //     const results = await getDictOption('djy_cust_prop')
-    //     const dict = results.map((item) => {
-    //       return item.value + '-' + item.name
-    //     })
-    //     process(dict)
-    //   },
-    // },
-
-    // {
-    //   title: '数量',
-    //   width: 120,
-    //   data: 'quantity',
-    //   type: 'numeric',
-    //   format: '0',
-    // },
-    // {
-    //   title: '不含税单价',
-    //   width: 120,
-    //   data: 'noTaxPrice',
-    //   type: 'numeric',
-    //   readOnly: true,
-    // },
-    // {
-    //   title: '不含税金额',
-    //   width: 120,
-    //   data: 'noTaxAmount',
-    //   type: 'numeric',
-    //   format: '0.00',
-    //   readOnly: true,
-    // },
-    // {
-    //   title: '金额',
-    //   width: 120,
-    //   data: 'amount',
-    //   type: 'numeric',
-    // },
-
-    // {
-    //   title: '备注',
-    //   width: 120,
-    //   data: 'note',
-    // },
-
-    // {
-    //   title: '销项税额',
-    //   width: 100,
-    //   data: 'accTaxAmount',
-    //   readOnly: true,
-    // },
-    // {
-    //   title: '销项金额',
-    //   width: 100,
-    //   data: 'accAmount',
-    //   readOnly: true,
-    // },
-    // {
-    //   title: '是否机密',
-    //   width: 100,
-    //   data: 'isOpen',
-    //   type: 'checkbox',
-    // },
-
-    // {
-    //   title: 'FRT',
-    //   width: 120,
-    //   data: 'feeFrt',
-    //   type: 'dropdown',
-    //   source: ['PP', 'CC'],
-    // },
-    // {
-    //   title: '录入人',
-    //   width: 100,
-    //   data: 'createByName',
-    //   readOnly: true,
-    // },
-    // {
-    //   title: '录入日期',
-    //   width: 100,
-    //   data: 'createTime',
-    //   readOnly: true,
-    // },
-    // {
-    //   title: '结算金额',
-    //   width: 100,
-    //   data: 'settlementAmount',
-    //   readOnly: true,
-    // },
-    // {
-    //   title: '已开票金额',
-    //   width: 100,
-    //   data: 'invoiceAmount',
-    //   readOnly: true,
-    // },
-    // {
-    //   title: '对账编号',
-    //   width: 100,
-    //   data: 'debitNo',
-    //   readOnly: true,
-    // },
-    // {
-    //   title: '修改人',
-    //   width: 100,
-    //   data: 'updateByName',
-    //   readOnly: true,
-    // },
-    // {
-    //   title: '修改日期',
-    //   width: 100,
-    //   data: 'updateTime',
-    //   readOnly: true,
-    // },
-    // {
-    //   title: '发票申请金额',
-    //   width: 100,
-    //   data: 'orderInvoiceAmount',
-    //   readOnly: true,
-    // },
-    // {
-    //   title: '未开票金额',
-    //   width: 100,
-    //   data: 'debitNo',
-    //   readOnly: true,
-    // },
-    // {
-    //   title: '审核人',
-    //   width: 100,
-    //   data: 'auditOperator',
-    //   readOnly: true,
-    // },
-    // {
-    //   title: '审核日期',
-    //   width: 100,
-    //   data: 'auditDate',
-    //   readOnly: true,
-    // },
   ]
   // 表格配置项
   const settings = {
@@ -659,21 +486,8 @@
     afterChange(changes, source) {
       // 这里定义了编辑，自动填充和拷贝数据的处理逻辑
       if (source === 'edit' || source === 'Autofill.fill' || source === 'CopyPaste.paste') {
-        let dict = {}
+        let dict: any = {}
         changes.forEach((res) => {
-          // // 费用类型
-          // if (changes[0][1] === 'feeTypeName') {
-          //   const res = [
-          //     { label: '应收', value: 1 },
-          //     { label: '应付', value: 2 },
-          //   ]
-          //   const item = res.filter((item) => {
-          //     return item.label === changes[0][3]
-          //   })
-          //   if (item) dict = item[0]
-          //   list.value[changes[0][0]]['feeType'] = dict?.value
-          //   list.value[changes[0][0]]['feeTypeName'] = dict?.label
-          // }
           // 修改费用对象
           if (changes[0][1] === 'customerName') {
             const item = companyDict.value.filter((item) => {
@@ -691,61 +505,43 @@
             })
             if (item) dict = item[0]
             // feeType
+            console.log(dict)
             list.value[res[0]]['feeName'] = changes[0][3].split('-')[1]
             list.value[res[0]]['feeCode'] = dict['code']
             list.value[res[0]]['feeId'] = dict['id']
             list.value[res[0]]['unit'] = dict['defaultUnit']
+            list.value[res[0]]['unitText'] = dict['defaultUnitName']
             list.value[res[0]]['currency'] = dict['defaultCurrency']
+            if (dict['defaultCurrency'] == 'RMB') {
+              list.value[res[0]]['exchangeRate'] = 1
+            } else {
+              list.value[res[0]]['exchangeRate'] = '【根据设置汇率生成】'
+            }
             list.value[res[0]]['taxRate'] = dict['taxRate']
             list.value[res[0]]['isInvoice'] = dict['isInvoice']
             list.value[res[0]]['isAdvancedPay'] = dict['isAdvancedPay']
-            // list.value[res[0]]['feeEnName'] = dict['enName']
-            // list.value[res[0]]['unitText'] = dict['defaultUnitName']
-            // 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]]['feeFrt'] = dict['feeFrt']
           }
         })
+        // 修改币别
+        if (changes[0][1] === 'currency') {
+          if (changes[0][3] == 'RMB') {
+            list.value[changes[0][0]]['exchangeRate'] = 1
+          } else {
+            list.value[changes[0][0]]['exchangeRate'] = '【根据设置汇率生成】'
+          }
+        }
         // 修改单位
-        if (changes[0][1] === 'unit') {
+        if (changes[0][1] === 'unitText') {
           const item = unitDict.value.filter((item) => {
             return changes[0][3].includes(item.name)
           })
           if (item) dict = item[0]
+          if (!/^[\u3400-\u9FBF]+$/.test(dict.label)) {
+            list.value[changes[0][0]]['isCtn'] = true
+          }
           list.value[changes[0][0]]['unit'] = dict?.value
-          // list.value[changes[0][0]]['unitText'] = changes[0][3].split('-')[1]
-          // 业务数据有件数，修改单位，带出件数
-          // 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
+          list.value[changes[0][0]]['unitText'] = dict?.label
         }
-        // // 修改币别
-        // if (changes[0][1] === 'currencyName') {
-        //   const item = currencyDict.value.filter((item) => {
-        //     return item.name === changes[0][3]
-        //   })
-        //   if (item) dict = item[0]
-        //   list.value[changes[0][0]]['currency'] = dict?.codeName
-        // }
-        // ============================
-        // // 修改费用英文名称
-        // if (changes[0][1] === 'feeEnName') {
-        // }
 
         // 修改客户类别
         if (changes[0][1] === 'customerTypeText') {
@@ -758,61 +554,6 @@
             list.value[changes[0][0]]['customerTypeText'] = changes[0][3].split('-')[1]
           })
         }
-
-        // // 当前操作的行
-        // 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)
-        // }
       }
     },
   }
@@ -889,6 +630,13 @@
       deep: true,
     },
   )
+  const copyRow = () => {
+    list.value.forEach((item: any) => {
+      if (item.selected) {
+        list.value.push({ ...item, id: '' })
+      }
+    })
+  }
   // 删除行
   const deleteRow = async () => {
     // list.value.forEach((item: any, index) => {
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue
index 8b01bfc3..b0b7dd85 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue
@@ -4,7 +4,7 @@
       <template #tableTitle>
         <!-- <span class="title">自动费用模板</span> -->
         <div class="ShowView">
-          <a-switch @change="ChangeView" v-model:checked="ShowView" />
+          <a-switch @change="ChangeView" v-model:checked="ShowView" :loading="ShowViewLoading" />
           <span class="ShowViewText">按费用显示</span>
         </div>
         <a-button type="link" @click="handleCreate">
@@ -72,6 +72,7 @@
   })
   const [registerModal, { openModal }] = useModal()
   const ShowView = ref(false)
+  const ShowViewLoading = ref(false)
   const [registerTable, { reload, getSelectRows, setProps, getForm, getPaginationRef }] = useTable({
     title: '',
     api: async (p) => {
@@ -82,6 +83,7 @@
         res = await ApiList(p)
       }
       return new Promise((resolve) => {
+        ShowViewLoading.value = false
         resolve({ data: [...res.data], total: res.count })
       })
     },
@@ -106,6 +108,7 @@
     },
   })
   async function ChangeView(e) {
+    ShowViewLoading.value = true
     if (e) {
       setProps({
         columns: viewColumns,
@@ -142,14 +145,13 @@
   }
   function handleAudit(record: Recordable) {
     openModal(true, {
-      record,
-      // record: { clientId: props.clientId, ...record },
+      record: { ...record, id: ShowView.value ? record.templateId : record.id },
       isUpdate: true,
     })
   }
   function copyBooking(record) {
     openModal(true, {
-      record,
+      record: { ...record, id: ShowView.value ? record.templateId : record.id },
       isUpdate: false,
       isCopy: true,
     })
@@ -165,7 +167,7 @@
       return false
     } else {
       ApiData.ids = select.map((item) => {
-        return item.id
+        return ShowView.value ? item.templateId : item.id
       })
     }
 
diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx
index 1c5ed863..952265a6 100644
--- a/src/views/baseinfo/infoclient/columns.tsx
+++ b/src/views/baseinfo/infoclient/columns.tsx
@@ -68,7 +68,7 @@ if (res14.succeeded) {
   rmbAccountData = []
   res14.data.forEach((e) => {
     if (e.accountName && e.id) {
-      rmbAccountData.push({ label: e.accountName, value: e.id, ...e })
+      rmbAccountData.push({ label: `${e.bankName}-${e.bankAccountNo}`, value: e.id, ...e })
     }
   })
 }
@@ -78,7 +78,7 @@ if (res15.succeeded) {
   usdAccountData = []
   res15.data.forEach((e) => {
     if (e.accountName && e.id) {
-      usdAccountData.push({ label: e.accountName, value: e.id, ...e })
+      usdAccountData.push({ label: `${e.bankName}-${e.bankAccountNo}`, value: e.id, ...e })
     }
   })
 }
@@ -1541,20 +1541,20 @@ export const Tablecolumns: BasicColumn[] = [
     width: 120,
   },
   {
-    title: '银行地址',
+    title: '银行SWIFT',
     dataIndex: 'bankAddress',
     align: 'left',
     width: 120,
   },
   {
-    title: '财务软件代码',
-    dataIndex: 'financeSoftCode',
+    title: '所在国',
+    dataIndex: 'countryName',
     align: 'left',
     width: 120,
   },
   {
-    title: '科目代码',
-    dataIndex: 'subjectCode',
+    title: '银行地址',
+    dataIndex: 'bankAddress',
     align: 'left',
     width: 120,
   },
@@ -1565,22 +1565,23 @@ export const Tablecolumns: BasicColumn[] = [
     width: 120,
   },
   {
-    title: '银行账号',
-    dataIndex: 'bankAccountNo',
-    align: 'left',
-    width: 120,
-  },
-  {
-    title: '银行SWIFT',
-    dataIndex: 'swift',
+    title: '财务软件代码',
+    dataIndex: 'financeSoftCode',
     align: 'left',
     width: 120,
   },
   {
-    title: '所在国',
-    dataIndex: 'countryName',
+    title: '状态',
+    dataIndex: 'status',
     align: 'left',
     width: 120,
+    customRender: ({ text }) => {
+      if (text == 0) {
+        return <Tag color="success">启用</Tag>
+      } else {
+        return <Tag color="error">禁用</Tag>
+      }
+    },
   },
   {
     title: '是否开票默认账户',
@@ -1595,6 +1596,49 @@ export const Tablecolumns: BasicColumn[] = [
       }
     },
   },
+  {
+    title: '发票抬头',
+    dataIndex: 'invoiceHeader',
+    align: 'left',
+    width: 120,
+  },
+  {
+    title: '开票税号',
+    dataIndex: 'invoiceTaxNo',
+    align: 'left',
+    width: 120,
+  },
+
+  {
+    title: '开票地址',
+    dataIndex: 'invoiceAddress',
+    align: 'left',
+    width: 120,
+  },
+  {
+    title: '开票电话',
+    dataIndex: 'invoiceTel',
+    align: 'left',
+    width: 120,
+  },
+  {
+    title: '寄发票地址',
+    dataIndex: 'sendInvoiceAddress',
+    align: 'left',
+    width: 120,
+  },
+  {
+    title: '财务软件代码',
+    dataIndex: 'financeSoftCode',
+    align: 'left',
+    width: 120,
+  },
+  {
+    title: '科目代码',
+    dataIndex: 'subjectCode',
+    align: 'left',
+    width: 120,
+  },
   {
     title: '备注',
     dataIndex: 'note',
@@ -1653,36 +1697,6 @@ export const CADformSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 6 },
   },
-  {
-    field: 'bankAddress',
-    label: '银行地址',
-    component: 'Input',
-    colProps: { span: 6 },
-  },
-  {
-    field: 'financeSoftCode',
-    label: '财务软件代码',
-    component: 'Input',
-    colProps: { span: 6 },
-  },
-  {
-    field: 'subjectCode',
-    label: '科目代码',
-    component: 'Input',
-    colProps: { span: 6 },
-  },
-  {
-    field: 'bankAgentName',
-    label: '代理银行名称',
-    component: 'Input',
-    colProps: { span: 6 },
-  },
-  {
-    field: 'bankAccountNo',
-    label: '银行账号',
-    component: 'Input',
-    colProps: { span: 6 },
-  },
   {
     field: 'swift',
     label: '银行SWIFT',
@@ -1701,7 +1715,6 @@ export const CADformSchema: FormSchema[] = [
     label: '国家地区',
     component: 'Select',
     colProps: { span: 6 },
-
     componentProps: ({ formModel }) => {
       return {
         options: ClientCountryList,
@@ -1723,21 +1736,16 @@ export const CADformSchema: FormSchema[] = [
     },
   },
   {
-    field: 'isInvoiceDefault',
-    label: '是否开票默认账户',
-    component: 'Switch',
+    field: 'bankAddress',
+    label: '银行地址',
+    component: 'Input',
+    colProps: { span: 12 },
+  },
+  {
+    field: 'bankAgentName',
+    label: '代理银行名称',
+    component: 'Input',
     colProps: { span: 6 },
-    defaultValue: false,
-    componentProps: {
-      checkedChildren: '是',
-      checkedValue: true,
-      unCheckedChildren: '否',
-      unCheckedValue: false,
-      // options: [
-      //   { label: '是', value: true },
-      //   { label: '否', value: false },
-      // ],
-    },
   },
   {
     field: 'status',
@@ -1752,10 +1760,88 @@ export const CADformSchema: FormSchema[] = [
       unCheckedValue: 1,
     },
   },
+  {
+    field: 'isInvoiceDefault',
+    label: '是否开票默认账户',
+    component: 'Switch',
+    colProps: { span: 6 },
+    defaultValue: false,
+    componentProps: {
+      checkedChildren: '是',
+      checkedValue: true,
+      unCheckedChildren: '否',
+      unCheckedValue: false,
+    },
+  },
+  {
+    label: '',
+    field: 'Space1',
+    component: 'Space',
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    field: 'invoiceHeader',
+    label: '发票抬头',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    field: 'invoiceTaxNo',
+    label: '开票税号',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  // {
+  //   field: 'invoiceTaxNo',
+  //   label: '纳税人识别号',
+  //   component: 'Input',
+  //   colProps: { span: 6 },
+  // },
+  // {
+  //   field: 'invoiceAddress',
+  //   label: '开票地址/电话',
+  //   component: 'Input',
+  //   colProps: { span: 12 },
+  // },
+  {
+    field: 'invoiceAddress',
+    label: '开票地址',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    field: 'invoiceTel',
+    label: '开票电话',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    field: 'sendInvoiceAddress',
+    label: '寄发票地址',
+    component: 'Input',
+    colProps: { span: 12 },
+  },
+  {
+    field: 'financeSoftCode',
+    label: '财务软件代码',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    field: 'subjectCode',
+    label: '科目代码',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
   {
     field: 'note',
     label: '备注',
-    component: 'Input',
-    colProps: { span: 18 },
+    component: 'InputTextArea',
+    colProps: { span: 24 },
+    componentProps: {
+      rows: 3,
+    },
   },
 ]
diff --git a/src/views/fee/FeeCustTemplate/TenantAuditStepModal.vue b/src/views/fee/FeeCustTemplate/TenantAuditStepModal.vue
index 6323a252..58abf45a 100644
--- a/src/views/fee/FeeCustTemplate/TenantAuditStepModal.vue
+++ b/src/views/fee/FeeCustTemplate/TenantAuditStepModal.vue
@@ -52,7 +52,7 @@
   // 字段数据
   import { formSchema } from './columns'
   // 相关接口
-  import { ApiEdit, ApiBulkEdit, ApiInfo } from './api'
+  import { ApiEdit, ApiBulkEdit, ApiBulkEditDetails, ApiInfo } from './api'
   import { feeUnitDict } from '/@/hooks/dict/index'
   // 提升消息混入
   import { useMessage } from '/@/hooks/web/useMessage'
@@ -74,14 +74,29 @@
   const loading = ref(false)
   const rowId = ref('')
   const { createMessage } = useMessage()
-  const [registerForm, { resetFields, setFieldsValue, getFieldsValue, validate, updateSchema }] =
-    useForm({
-      labelWidth: 100,
-      schemas: formSchema,
-      showActionButtonGroup: false,
-    })
+  const [
+    registerForm,
+    {
+      resetFields,
+      setFieldsValue,
+      appendSchemaByField,
+      removeSchemaByField,
+      getFieldsValue,
+      validate,
+      updateSchema,
+    },
+  ] = useForm({
+    labelWidth: 100,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+  })
+  const unitArr = ref<any>([])
+  const BulkInfoArr = ref<any>([])
   const [registerModal, { setModalProps, closeModal, updateFormField }] = useModalInner(
     async (data) => {
+      unitArr.value.forEach((item) => {
+        removeSchemaByField(`${item}unitP`)
+      })
       resetFields()
       setModalProps({ confirmLoading: false, loading: true })
       isUpdate.value = !!data?.isUpdate
@@ -152,13 +167,53 @@
             feeField.value.condition = res.data.condition
             // detailId.value = res.data.id
           }
+        } else if (isBulk.value) {
+          detailId.value = ''
+          setFieldsValue({
+            customerName: props.customerName,
+            customerId: props.customerId,
+            isBulk: true,
+          })
+          // 添加 对应单位 单票输入
+          const UnitList = await feeUnitDict()
+          unitArr.value.splice(0)
+          BulkInfoArr.value.splice(0)
+          ids.value.forEach(async (e) => {
+            const res: any = await ApiInfo({ id: unref(e) })
+            BulkInfoArr.value.push(res.data)
+            if (res.succeeded) {
+              res.data.details.forEach((item: any) => {
+                if (unitArr.value.indexOf(item.unit) == -1) {
+                  unitArr.value.push(item.unit)
+                  UnitList.forEach((Unit: any) => {
+                    if (item.unit == Unit.value) {
+                      appendSchemaByField(
+                        [
+                          {
+                            field: `${Unit.value}unitP`,
+                            label: `${Unit.label}含税单价`,
+                            component: 'Input',
+                            colProps: { span: 6 },
+                            componentProps: {
+                              placeholder: `${Unit.label}含税单价`,
+                            },
+                          },
+                        ],
+                        undefined,
+                      )
+                    }
+                  })
+                }
+              })
+            }
+          })
+          feeField.value.SetData([])
+          feeField.value.condition = ''
         } else {
           detailId.value = ''
           setFieldsValue({
             customerName: props.customerName,
             customerId: props.customerId,
-            // saleOrgId: userStore.getUserInfo.userOrgs[0].orgId,
-            isBulk: isBulk.value ? true : false,
           })
           feeField.value.SetData([])
           feeField.value.condition = ''
@@ -187,13 +242,14 @@
       detailId.value = res.data.id
     }
   }
-  const getTitle = computed(() => (!unref(isUpdate) ? '新增' : '编辑'))
+  const getTitle = computed(() =>
+    !unref(isUpdate) ? (!unref(isBulk) ? '新增' : '批量编辑') : '编辑',
+  )
   // 费用表格
   const feeField = ref()
   async function handleSave(exit) {
     try {
       const feeList = JSON.parse(JSON.stringify(feeField.value.validate()))
-      console.log(feeList, 11111111111)
       let type = true
       feeList.forEach((item) => {
         if (item.exchangeRate == '【根据设置汇率生成】') {
@@ -203,23 +259,30 @@
           type = false
         }
       })
-      console.log(type, 11111111111)
       if (!type) {
         createMessage.warning('费用明细列表含税单价为必填项！')
         throw new Error('费用明细列表含税单价为必填项！')
       }
-      console.log(22222222)
       const values = await validate()
-      console.log(values, 11111111111)
       values['details'] = feeList
       values['condition'] = feeField.value.condition
       values['isShared'] = true
       loading.value = true
-      console.log(loading.value, 11111111111)
       setModalProps({ confirmLoading: true, loading: true })
       let res: any = null
-      console.log(isBulk.value, 11111111111)
       if (isBulk.value) {
+        let ApiDetailsData: any = []
+        // 批量修改 费用明细
+        BulkInfoArr.value.forEach((e) => {
+          e.details.forEach((item) => {
+            unitArr.value.forEach((item2) => {
+              if (item2 == item.unit && values[`${item2}unitP`]) {
+                ApiDetailsData.push({ ...item, taxUnitPrice: values[`${item2}unitP`] })
+              }
+            })
+          })
+        })
+        await ApiBulkEditDetails(ApiDetailsData)
         let ApiData: any = []
         ids.value.forEach((e) => {
           ApiData.push({ ...values, id: e })
diff --git a/src/views/fee/FeeCustTemplate/columns.tsx b/src/views/fee/FeeCustTemplate/columns.tsx
index 4490383f..312c07f4 100644
--- a/src/views/fee/FeeCustTemplate/columns.tsx
+++ b/src/views/fee/FeeCustTemplate/columns.tsx
@@ -10,6 +10,7 @@ import {
   GetClientPortSelectList,
   GetCarrierSelectList,
   GetClientListByCode,
+  GetSupplierListByCode,
 } from '/@/api/common'
 import {
   GetClientLanesSelectList,
@@ -37,7 +38,7 @@ GetCarrierSelectList().then((res) => {
   carrierIdList.value = res.data
 })
 const forwarderIdList = ref([])
-GetAgentCnClientList().then((res) => {
+GetSupplierListByCode().then((res) => {
   forwarderIdList.value = res.data
 })
 const mblFrtCodeList = ref([])
@@ -48,6 +49,10 @@ const businessTypeList = ref([])
 getDictOption('business_type').then((res) => {
   businessTypeList.value = res
 })
+const PortList = ref([])
+GetClientPortSelectList().then((res) => {
+  PortList.value = res.data
+})
 // 业务来源明细数据
 const sourceDetailId = ref<any>([])
 export const columns: BasicColumn[] = [
@@ -104,12 +109,32 @@ export const columns: BasicColumn[] = [
     dataIndex: 'polCode',
     sorter: true,
     width: 200,
+    customRender: ({ record }) => {
+      let name = ''
+      PortList.value.some((item: any) => {
+        if (record.polCode == item.ediCode) {
+          name = `${item.cnName}/${item.portName}`
+          return true
+        }
+      })
+      return name
+    },
   },
   {
     title: '卸货港',
     dataIndex: 'podCode',
     sorter: true,
     width: 200,
+    customRender: ({ record }) => {
+      let name = ''
+      PortList.value.some((item: any) => {
+        if (record.podCode == item.ediCode) {
+          name = `${item.cnName}/${item.portName}`
+          return true
+        }
+      })
+      return name
+    },
   },
   {
     title: '航线',
@@ -163,12 +188,12 @@ export const columns: BasicColumn[] = [
     dataIndex: 'forwarderId',
     title: '订舱口',
     sorter: true,
-    width: 200,
+    width: 280,
     customRender: ({ record }) => {
       let name = ''
       forwarderIdList.value.some((item: any) => {
         if (record.forwarderId == item.id) {
-          name = item.shortName
+          name = item.pinYinCode
           return true
         }
       })
@@ -307,12 +332,32 @@ export const viewColumns: BasicColumn[] = [
     dataIndex: 'polCode',
     sorter: true,
     width: 200,
+    customRender: ({ record }) => {
+      let name = ''
+      PortList.value.some((item: any) => {
+        if (record.polCode == item.ediCode) {
+          name = `${item.cnName}/${item.portName}`
+          return true
+        }
+      })
+      return name
+    },
   },
   {
     title: '卸货港',
     dataIndex: 'podCode',
     sorter: true,
     width: 200,
+    customRender: ({ record }) => {
+      let name = ''
+      PortList.value.some((item: any) => {
+        if (record.podCode == item.ediCode) {
+          name = `${item.cnName}/${item.portName}`
+          return true
+        }
+      })
+      return name
+    },
   },
   {
     dataIndex: 'laneName',
@@ -578,16 +623,19 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    label: '订舱口',
     field: 'forwarderId',
+    label: '订舱口',
     component: 'ApiSelect',
     required: false,
+    // labelSlot: 'yardId',
     dynamicDisabled: false,
     colProps: { span: 4 },
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
-        api: GetAgentCnClientList,
-        labelField: 'shortName',
+        api: GetSupplierListByCode,
+        params: { code: 'Booking' },
+        labelField: 'pinYinCode',
+        showName: 'description',
         valueField: 'id',
         resultField: 'data',
         filterOption: (input: string, option: any) => {
@@ -847,16 +895,19 @@ export const viewSearchFormSchema: FormSchema[] = [
     },
   },
   {
-    label: '订舱口',
     field: 'forwarderId',
+    label: '订舱口',
     component: 'ApiSelect',
     required: false,
+    // labelSlot: 'yardId',
     dynamicDisabled: false,
     colProps: { span: 4 },
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
-        api: GetAgentCnClientList,
-        labelField: 'shortName',
+        api: GetSupplierListByCode,
+        params: { code: 'Booking' },
+        labelField: 'pinYinCode',
+        showName: 'description',
         valueField: 'id',
         resultField: 'data',
         filterOption: (input: string, option: any) => {
@@ -1233,16 +1284,19 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '订舱口',
     field: 'forwarderId',
+    label: '订舱口',
     component: 'ApiSelect',
     required: false,
+    // labelSlot: 'yardId',
     dynamicDisabled: false,
     colProps: { span: 6 },
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
-        api: GetAgentCnClientList,
-        labelField: 'shortName',
+        api: GetSupplierListByCode,
+        params: { code: 'Booking' },
+        labelField: 'pinYinCode',
+        showName: 'description',
         valueField: 'id',
         resultField: 'data',
         filterOption: (input: string, option: any) => {
diff --git a/src/views/fee/FeeCustTemplate/feeField.vue b/src/views/fee/FeeCustTemplate/feeField.vue
index fd5989d4..234b40cc 100644
--- a/src/views/fee/FeeCustTemplate/feeField.vue
+++ b/src/views/fee/FeeCustTemplate/feeField.vue
@@ -11,10 +11,14 @@
           <span class="iconfont icon-new_document"></span>
           添加
         </a-button>
-        <a-button type="link" @click="BulkEdit">
+        <a-button type="link" @click="copyRow">
+          <span class="iconfont icon-fuzhi"></span>
+          复制
+        </a-button>
+        <!-- <a-button type="link" @click="BulkEdit">
           <span class="iconfont icon-dengjizongshu"></span>
           批量编辑
-        </a-button>
+        </a-button> -->
         <a-popconfirm
           title="确定删除当前选中数据？"
           ok-text="是"
@@ -242,6 +246,7 @@
     })
   }
   const loading = ref(false)
+
   // 添加行
   const addRow = () => {
     list.value.push({
@@ -405,6 +410,7 @@
       data: 'unitPrice',
       type: 'numeric',
       format: '0.00',
+      readOnly: true,
     },
     {
       title: '汇率',
@@ -484,7 +490,7 @@
     afterChange(changes, source) {
       // 这里定义了编辑，自动填充和拷贝数据的处理逻辑
       if (source === 'edit' || source === 'Autofill.fill' || source === 'CopyPaste.paste') {
-        let dict = {}
+        let dict: any = {}
         changes.forEach((res) => {
           // 修改费用对象
           if (changes[0][1] === 'customerName') {
@@ -534,6 +540,9 @@
             return changes[0][3].includes(item.name)
           })
           if (item) dict = item[0]
+          if (!/^[\u3400-\u9FBF]+$/.test(dict.label)) {
+            list.value[changes[0][0]]['isCtn'] = true
+          }
           list.value[changes[0][0]]['unit'] = dict?.value
           list.value[changes[0][0]]['unitText'] = dict?.label
         }
@@ -625,6 +634,13 @@
       deep: true,
     },
   )
+  const copyRow = () => {
+    list.value.forEach((item: any) => {
+      if (item.selected) {
+        list.value.push({ ...item, id: '' })
+      }
+    })
+  }
   // 删除行
   const deleteRow = async () => {
     // list.value.forEach((item: any, index) => {
diff --git a/src/views/fee/FeeCustTemplate/index.vue b/src/views/fee/FeeCustTemplate/index.vue
index 3d946afe..2f68648e 100644
--- a/src/views/fee/FeeCustTemplate/index.vue
+++ b/src/views/fee/FeeCustTemplate/index.vue
@@ -3,7 +3,7 @@
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
         <div class="ShowView">
-          <a-switch @change="ChangeView" v-model:checked="ShowView" />
+          <a-switch @change="ChangeView" v-model:checked="ShowView" :loading="ShowViewLoading" />
           <span class="ShowViewText">按费用显示</span>
         </div>
         <a-button type="link" @click="handleCreate">
@@ -71,6 +71,7 @@
   })
   const [registerModal, { openModal }] = useModal()
   const ShowView = ref(false)
+  const ShowViewLoading = ref(false)
   const [registerTable, { reload, getSelectRows, setProps, getForm, getPaginationRef }] = useTable({
     title: '',
     api: async (p) => {
@@ -81,6 +82,7 @@
         res = await ApiList(p)
       }
       return new Promise((resolve) => {
+        ShowViewLoading.value = false
         resolve({ data: [...res.data], total: res.count })
       })
     },
@@ -115,6 +117,7 @@
     },
   })
   async function ChangeView(e) {
+    ShowViewLoading.value = true
     if (e) {
       setProps({
         columns: viewColumns,
@@ -161,14 +164,13 @@
   }
   function handleAudit(record: Recordable) {
     openModal(true, {
-      record,
-      // record: { clientId: props.clientId, ...record },
+      record: { ...record, id: ShowView.value ? record.templateId : record.id },
       isUpdate: true,
     })
   }
   function copyBooking(record) {
     openModal(true, {
-      record,
+      record: { ...record, id: ShowView.value ? record.templateId : record.id },
       isUpdate: false,
       isCopy: true,
     })
@@ -184,10 +186,9 @@
       return false
     } else {
       ApiData.ids = select.map((item) => {
-        return item.id
+        return ShowView.value ? item.templateId : item.id
       })
     }
-
     ApiDel(ApiData).then((res) => {
       notification.success({ message: res.message, duration: 3 })
       reload()

From 635ae5447e4d4d003ef52ea1fa8eeb58d347178a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Sat, 2 Nov 2024 14:16:17 +0800
Subject: [PATCH 4/6] =?UTF-8?q?11/02=20=E8=87=AA=E5=8A=A8=E5=AF=B9?=
 =?UTF-8?q?=E8=B4=A6=E6=A8=A1=E6=9D=BF=20=E4=B8=9A=E5=8A=A1=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/fee/FeeCustTemplate/columns.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/fee/FeeCustTemplate/columns.tsx b/src/views/fee/FeeCustTemplate/columns.tsx
index 312c07f4..e13adf11 100644
--- a/src/views/fee/FeeCustTemplate/columns.tsx
+++ b/src/views/fee/FeeCustTemplate/columns.tsx
@@ -1219,9 +1219,11 @@ export const formSchema: FormSchema[] = [
             if (FnsourceDetailId.succeeded) {
               sourceDetailId.value.splice(0)
               FnsourceDetailId.data.forEach((e) => {
-                sourceDetailId.value.push({ label: e.detailName, value: e.id })
+                sourceDetailId.value.push({ label: e.detailName, value: e.id, ...e })
               })
             }
+            console.log(sourceDetailId.value)
+
             if (formActionType) {
               formModel.sourceDetailId = ''
             }

From 3980e874eedeb3d6f6b14c5f8685c080a6a87ef5 Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Sat, 2 Nov 2024 14:24:18 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/finance/feeSettlement/columns.tsx             | 2 +-
 src/views/finance/feeSettlement/detail/invoiceTable.vue | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/finance/feeSettlement/columns.tsx b/src/views/finance/feeSettlement/columns.tsx
index bb66760c..93f3fc31 100644
--- a/src/views/finance/feeSettlement/columns.tsx
+++ b/src/views/finance/feeSettlement/columns.tsx
@@ -430,7 +430,7 @@ export const detailForm: FormSchema[] = [
   },
   {
     field: 'orgBankName',
-    label: '银行账号',
+    label: '收款账号',
     colProps: { span: 4 },
     component: 'ApiSelect',
     componentProps: ({ formModel }) => {
diff --git a/src/views/finance/feeSettlement/detail/invoiceTable.vue b/src/views/finance/feeSettlement/detail/invoiceTable.vue
index f2af2190..896fdf03 100644
--- a/src/views/finance/feeSettlement/detail/invoiceTable.vue
+++ b/src/views/finance/feeSettlement/detail/invoiceTable.vue
@@ -156,7 +156,6 @@ const [registerTable, { getForm, getSelectRows, setSelectedRowKeys }] = useTable
       res.data.forEach((item, index) => {
         item.freeIndex = String(index)
       })
-      console.log(res.data)
     }
     if (route.query.type == 'invoice') {
       res = await InvoiceSettlementGetInvoiceList(p)
@@ -254,7 +253,7 @@ function getColumsDetail() {
 
 function getSearch() {
   if (route.query.type == 'invoice') {
-    return invoiceTableDetailColums
+    return invoiceSearchFormSchema
   }
   if (route.query.type == 'free') {
     return freeSearchFormSchema

From 62812e82982f7030c8aa39fa78aabb683d1a98c7 Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Sat, 2 Nov 2024 15:33:25 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/operation/invoiceApply/columns.tsx  |   2 +-
 .../invoiceApply/detail/InvoiceDetails.vue    | 127 ++++++++++++++----
 src/views/operation/invoiceIssue/columns.tsx  |  54 +++++---
 .../invoiceIssue/detail/applyInvoice.vue      | 120 ++++++++++++++---
 4 files changed, 234 insertions(+), 69 deletions(-)

diff --git a/src/views/operation/invoiceApply/columns.tsx b/src/views/operation/invoiceApply/columns.tsx
index b0126b38..18c4f3c8 100644
--- a/src/views/operation/invoiceApply/columns.tsx
+++ b/src/views/operation/invoiceApply/columns.tsx
@@ -486,7 +486,7 @@ export const detailSearchFormSchema: FormSchema[] = [
       return {
         api: GetFeeCodeSelectList,
         labelField: 'name',
-        valueField: 'code',
+        valueField: 'id',
         resultField: 'data',
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
diff --git a/src/views/operation/invoiceApply/detail/InvoiceDetails.vue b/src/views/operation/invoiceApply/detail/InvoiceDetails.vue
index fb2184b0..7d8a1cd1 100644
--- a/src/views/operation/invoiceApply/detail/InvoiceDetails.vue
+++ b/src/views/operation/invoiceApply/detail/InvoiceDetails.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <a-modal  width="1600px" @cancel="open = false" :visible="open" title="添加发票申请明细" :footer="null">
+        <a-modal width="1600px" @cancel="open = false" :visible="open" title="添加发票申请明细" :footer="null">
             <div style="padding-bottom:5px ;">
                 <div>
                     <BasicTable class="ds-table" :row-selection="{ onChange: onSelectChange }"
@@ -75,24 +75,25 @@
                                 <span v-if="record.businessType == 1">海运出口</span>
                             </template>
                         </template>
+                        <template #footer>
+                            <div class="main-statistic">
+                                <span>选中合计：</span>
+                                <span class="box">
+                                    <span class="title">RMB未开:</span>
+                                    <span class="count">{{ rmbTotal }}</span>
+                                </span>
+                                <span class="box">
+                                    <span class="title">USD未开:</span>
+                                    <span class="count">{{ usdTotal }}</span>
+                                </span>
+                                <span class="box">
+                                    <span class="title">其他未开:</span>
+                                    <span class="count">{{ otherTotal }}</span>
+                                </span>
+                            </div>
+                        </template>
                     </BasicTable>
-                    <div class="total">
-                        <span style="margin-right: 10px;">合计:</span>
-                        <span class="total-item">
-                            <span class="text">RMB未开:</span>
-                            <span class="number">{{ rmbTotal }}</span>
-                        </span>
-                        <span class="total-item">
-                            <span class="text">USD未开:</span>
-                            <span class="number">{{ usdTotal }}</span>
-                        </span>
-                        <span class="total-item">
-                            <span class="text">其他未开:</span>
-                            <span class="number">{{ otherTotal }}</span>
-                        </span>
-                    </div>
                 </div>
-
             </div>
         </a-modal>
         <a-modal width="400px" @cancel="exchangeFlag = false" @ok="handleSureExhange" :visible="exchangeFlag"
@@ -189,6 +190,7 @@ const columns = [
 ]
 const queryData = ref({}) as any
 const dataSource = ref([]) as any
+
 const [registerTable, { getForm, setSelectedRowKeys, getSelectRows, setProps, getRawDataSource, setLoading }] = useTable({
     api: async (p) => {
         const res: API.DataResult = await GetBizList(p)
@@ -202,7 +204,7 @@ const [registerTable, { getForm, setSelectedRowKeys, getSelectRows, setProps, ge
     beforeFetch: (p) => {
         const data = formatParams(p)
         data.otherQueryCondition = getForm().getFieldsValue().FeeRange
-        queryData.value = JSON.parse(JSON.stringify(p))
+        queryData.value = JSON.parse(JSON.stringify(formatParams(p)))
         return data
     },
     columns: detailColumns,
@@ -368,16 +370,38 @@ function handleSureExhange() {
     }
 }
 const activeRow = ref(null)
+// 
 function handleClick(record, index) {
     setSelectedRowKeys([index])
     activeRow.value = index
+    const queryDataStr = JSON.parse(queryData.value.queryCondition)
+    const arr = [] as any
+    queryDataStr.forEach(item => {
+        if (item.FieldName == 'feeType') {
+            arr.push(item)
+        }
+        if (item.FieldName == 'currency') {
+            arr.push(item)
+        }
+        if (item.FieldName == 'feeName') {
+            arr.push(item)
+        }
+        if (item.FieldName == 'FeeRange') {
+            arr.push(item)
+        }
+    })
     const data = {
-        id: record.id,
-        businessType: record.businessType,
-        customerId: record.customerId
+        items: [
+            {
+                id: record.id,
+                businessType: record.businessType,
+                customerId: record.customerId
+            }
+        ],
+        queryCondition: JSON.stringify(arr)
     }
     loading.value = true
-    InvoiceApplicationGetFees([data]).then(res => {
+    InvoiceApplicationGetFees(data).then(res => {
         if (res.succeeded) {
             dataSource.value = res.data.items
             dataSource.value.forEach(item => {
@@ -541,14 +565,34 @@ function addDetailed() {
     }
     setLoading(true)
     if (arrRight.length > 0 && form.value.isRMB) {
-        const data = [] as any
+        const items = [] as any
         arrRight.forEach(item => {
-            data.push({
+            items.push({
                 id: item.id,
                 businessType: item.businessType,
                 customerId: item.customerId
             })
         })
+        const queryDataStr = JSON.parse(queryData.value.queryCondition)
+        const arr = [] as any
+        queryDataStr.forEach(item => {
+            if (item.FieldName == 'feeType') {
+                arr.push(item)
+            }
+            if (item.FieldName == 'currency') {
+                arr.push(item)
+            }
+            if (item.FieldName == 'feeName') {
+                arr.push(item)
+            }
+            if (item.FieldName == 'FeeRange') {
+                arr.push(item)
+            }
+        })
+        const data = {
+            items: items,
+            queryCondition: JSON.stringify(arr)
+        }
         GetCurrencies(data).then(res => {
             const cuArr = [] as any
             currenciesData.value = res.data
@@ -697,4 +741,39 @@ defineExpose({ init, changeCustIn })
 :deep(.flex) {
     align-items: flex-end !important;
 }
+
+:deep(.ant-table-footer) {
+    padding: 0px !important;
+    background: white;
+}
+
+:deep(.ant-table-container) {
+    padding: 0px;
+}
+
+
+.main-statistic {
+    background: #ffffff;
+    font-size: 12px;
+    height: 34px;
+    display: flex;
+    align-items: center;
+
+    .title {
+        font-size: 14px;
+        font-weight: 600;
+    }
+
+    .count {
+        font-size: 14px;
+        font-weight: 600;
+        color: #257AFA;
+    }
+
+    .box {
+        background: #F5F9FC;
+        margin-left: 10px;
+        padding: 0 5px;
+    }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/operation/invoiceIssue/columns.tsx b/src/views/operation/invoiceIssue/columns.tsx
index 6451579b..edd730b3 100644
--- a/src/views/operation/invoiceIssue/columns.tsx
+++ b/src/views/operation/invoiceIssue/columns.tsx
@@ -554,31 +554,41 @@ export const applySearch: FormSchema[] = [
     colProps: { span: 4 },
   },
   {
+    field: 'customerName',
     label: '开票单位',
-    field: 'customerId',
     required: false,
     component: 'ApiSelect',
-    dynamicDisabled: false,
     colProps: { span: 4 },
-    componentProps: () => {
-        return {
-            api: () => {
-                return new Promise((resolve) => {
-                    GetControllerClientList().then((res) => {
-                        resolve(res)
-                    })
-                })
-            },
-            immediate: true,
-            labelField: 'shortName',
-            valueField: 'id',
-            resultField: 'data',
-            filterOption: (input: string, option: any) => {
-                return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-            },
-        }
+    componentProps: ({ formModel }) => {
+      return {
+        allowClear: true,
+        showSearch: true,
+        api: GetClientListByCode,
+        labelField: 'pinYinCode',
+        showName: 'shortName',
+        valueField: 'shortName',
+        resultField: 'data',
+        immediate: true,
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: (e, obj) => {
+          if (e && obj) {
+            formModel.customerId = obj.id
+          }
+          if (!obj && !e) {
+            formModel.customerId = ''
+          }
+        },
+      }
     },
   },
+  {
+    field: 'customerId',
+    label: '',
+    component: 'Input',
+    show: false
+  },
   {
     field: 'createTime',
     label: '申请日期',
@@ -903,7 +913,7 @@ export const freeSearch: FormSchema[] = [
         api: GetClientListByCode,
         labelField: 'pinYinCode',
         showName: 'shortName',
-        valueField: 'id',
+        valueField: 'shortName',
         resultField: 'data',
         immediate: true,
         filterOption: (input: string, option: any) => {
@@ -911,7 +921,7 @@ export const freeSearch: FormSchema[] = [
         },
         onChange: (e, obj) => {
           if (e && obj) {
-            formModel.customerId = obj.label
+            formModel.customerId = obj.id
           }
           if (!obj && !e) {
             formModel.customerId = ''
@@ -994,7 +1004,7 @@ export const freeSearch: FormSchema[] = [
       return {
         api: GetFeeCodeSelectList,
         labelField: 'name',
-        valueField: 'code',
+        valueField: 'id',
         resultField: 'data',
       }
     },
diff --git a/src/views/operation/invoiceIssue/detail/applyInvoice.vue b/src/views/operation/invoiceIssue/detail/applyInvoice.vue
index f98ac614..152d6e75 100644
--- a/src/views/operation/invoiceIssue/detail/applyInvoice.vue
+++ b/src/views/operation/invoiceIssue/detail/applyInvoice.vue
@@ -122,22 +122,24 @@
                                 <span v-if="record.businessType == 1">海运出口</span>
                             </template>
                         </template>
+                        <template #footer>
+                            <div class="main-statistic">
+                                <span>选中合计：</span>
+                                <span class="box">
+                                    <span class="title">RMB未开:</span>
+                                    <span class="count">{{ rmbTotal }}</span>
+                                </span>
+                                <span class="box">
+                                    <span class="title">USD未开:</span>
+                                    <span class="count">{{ usdTotal }}</span>
+                                </span>
+                                <span class="box">
+                                    <span class="title">其他未开:</span>
+                                    <span class="count">{{ otherTotal }}</span>
+                                </span>
+                            </div>
+                        </template>
                     </BasicTable>
-                    <div class="total">
-                        <span style="margin-right: 10px;">合计:</span>
-                        <span class="total-item">
-                            <span class="text">RMB未开:</span>
-                            <span class="number">{{ rmbTotal }}</span>
-                        </span>
-                        <span class="total-item">
-                            <span class="text">USD未开:</span>
-                            <span class="number">{{ usdTotal }}</span>
-                        </span>
-                        <span class="total-item">
-                            <span class="text">其他未开:</span>
-                            <span class="number">{{ otherTotal }}</span>
-                        </span>
-                    </div>
                 </div>
             </div>
         </a-modal>
@@ -215,7 +217,7 @@ const columnsFreeDetail = [
 
 
 ]
-const queryDataFree = ref({})
+const queryDataFree = ref({}) as any
 const dataSource = ref([]) as any
 const freeDetailList = ref([]) as any
 const [registerTable, { getForm, setSelectedRowKeys, getSelectRows, setProps, getRawDataSource, setLoading }] = useTable({
@@ -286,7 +288,7 @@ const [registerTableFree, { getForm: getFormFree, setSelectedRowKeys: setSelecte
     beforeFetch: (p) => {
         const data = formatParams(p)
         data.otherQueryCondition = getFormFree().getFieldsValue().FeeRange
-        queryDataFree.value = JSON.parse(JSON.stringify(p))
+        queryDataFree.value = formatParams(p)
         return data
     },
     columns: freeColums,
@@ -415,9 +417,29 @@ function addDetailFree() {
             customerId: item.customerId
         })
     })
+    const queryDataStr = JSON.parse(queryDataFree.value.queryCondition)
+    const arrQuery = [] as any
+    queryDataStr.forEach(item => {
+        if (item.FieldName == 'feeType') {
+            arr.push(item)
+        }
+        if (item.FieldName == 'currency') {
+            arr.push(item)
+        }
+        if (item.FieldName == 'feeName') {
+            arr.push(item)
+        }
+        if (item.FieldName == 'FeeRange') {
+            arr.push(item)
+        }
+    })
+    const data = {
+        items: freeList,
+        queryCondition: JSON.stringify(arrQuery)
+    }
     currenciesData.value = []
     exchangarr.value = []
-    GetCurrencies(freeList).then(res => {
+    GetCurrencies(data).then(res => {
         const cuArr = [] as any
         currenciesData.value = res.data
         res.data.forEach(item => {
@@ -562,14 +584,33 @@ function handleClick(record, index) {
 }
 function handleClickFree(record, index) {
     setSelectedRowKeysFree([index])
+    const queryDataStr = JSON.parse(queryDataFree.value.queryCondition)
+    const arr = [] as any
+    queryDataStr.forEach(item => {
+        if (item.FieldName == 'feeType') {
+            arr.push(item)
+        }
+        if (item.FieldName == 'currency') {
+            arr.push(item)
+        }
+        if (item.FieldName == 'feeName') {
+            arr.push(item)
+        }
+        if (item.FieldName == 'FeeRange') {
+            arr.push(item)
+        }
+    })
     const data = {
-        id: record.id,
-        businessType: record.businessType,
-        customerId: record.customerId
+        items: [{
+            id: record.id,
+            businessType: record.businessType,
+            customerId: record.customerId
+        }],
+        queryCondition: JSON.stringify(arr)
     }
     activeRow.value = index
     loading.value = true
-    FreeInvoiceGetFees([data]).then(res => {
+    FreeInvoiceGetFees(data).then(res => {
         if (res.succeeded) {
             freeDetailList.value = res.data.items
             freeDetailList.value.forEach(item => {
@@ -813,4 +854,39 @@ defineExpose({ init, customerIdP })
         background: #dfe8f6;
     }
 }
+
+:deep(.ant-table-footer) {
+    padding: 0px !important;
+    background: white;
+}
+
+:deep(.ant-table-container) {
+    padding: 0px;
+}
+
+
+.main-statistic {
+    background: #ffffff;
+    font-size: 12px;
+    height: 34px;
+    display: flex;
+    align-items: center;
+
+    .title {
+        font-size: 14px;
+        font-weight: 600;
+    }
+
+    .count {
+        font-size: 14px;
+        font-weight: 600;
+        color: #257AFA;
+    }
+
+    .box {
+        background: #F5F9FC;
+        margin-left: 10px;
+        padding: 0 5px;
+    }
+}
 </style>
\ No newline at end of file