diff --git a/.env.development b/.env.development
index e850e394..1607cbaf 100644
--- a/.env.development
+++ b/.env.development
@@ -20,8 +20,8 @@ VITE_PROXY=[["/api","http://60.209.125.238:3008"],["/stage-api","https://www.666
 VITE_DROP_CONSOLE = false
 
 # 后台接口父地址(必填)
-VITE_GLOB_API_URL=http://localhost:3008
-# VITE_GLOB_API_URL="/api"   # 开发 测试环境
+# VITE_GLOB_API_URL=http://localhost:3008
+VITE_GLOB_API_URL="/api"   # 开发 测试环境
 
 # File upload address， optional
 #VITE_GLOB_UPLOAD_URL=http://localhost:8091/api/Common/UploadFile
diff --git a/src/api/system/org.ts b/src/api/system/org.ts
index 10b11894..7bb3c600 100644
--- a/src/api/system/org.ts
+++ b/src/api/system/org.ts
@@ -8,6 +8,10 @@ enum Api {
   GetOrgInfo = '/mainApi/Org/GetOrgInfo',
   GetOrgTree = '/mainApi/Org/GetOrgTree',
   GetOrgList = '/mainApi/Common/GetOrgList',
+
+  GetBankList = '/mainApi/Bank/GetBankList',
+  EditBank = '/mainApi/Bank/EditBank',
+  GetBankInfo = '/mainApi/Bank/GetBankInfo',
 }
 export function getOrgList(data: PageRequest) {
   return request<DataResult>({
@@ -45,3 +49,25 @@ export function getOrgListData(query: { id: string }) {
     params: query,
   })
 }
+
+export function getBankList(data: any) {
+  return request<DataResult>({
+    url: Api.GetBankList,
+    method: 'post',
+    data,
+  })
+}
+export function editBank(data: any) {
+  return request<DataResult>({
+    url: Api.EditBank,
+    method: 'post',
+    data,
+  })
+}
+export function getBankInfo(query: { id: string }) {
+  return request<DataResult>({
+    url: Api.GetBankInfo,
+    method: 'get',
+    params: query,
+  })
+}
\ No newline at end of file
diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
index 4a6db48a..e5d5ee46 100644
--- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx
+++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
@@ -907,104 +907,104 @@ export const mailingInfoFormSchemaL: FormSchema[] = [
       }
     },
   },
-  {
-    label: '',
-    field: 'consigneeContent',
-    component: 'Input',
-    // defaultValue: '',
-    show: false,
-  },
-  {
-    label: '',
-    field: 'consignee',
-    component: 'Input',
-    // defaultValue: '',
-    show: false,
-  },
-  {
-    label: '',
-    field: 'consigneeId',
-    component: 'Input',
-    // defaultValue: '',
-    show: false,
-  },
-  {
-    field: 'shr',
-    component: 'SelectTextArea',
-    colProps: { span: 24 },
-    componentProps: ({ formModel }) => {
-      return {
-        label: '收货人',
-        details: formModel,
-        field: 'consignee',
-        onChange: (e) => {
-          if (e) {
-            if (e.type == 'Id') {
-              formModel.consignee = e.res.shortName
-              formModel.consigneeId = e.res.id
-            } else {
-              formModel[`consignee${e.type}`] = e.res
-            }
-          }
-        },
-      }
-    },
-  },
-  {
-    label: '',
-    field: 'notifyPartyContent',
-    component: 'Input',
-    // defaultValue: '',
-    show: false,
-  },
-  {
-    label: '',
-    field: 'notifyParty',
-    component: 'Input',
-    // defaultValue: '',
-    show: false,
-  },
-  {
-    label: '',
-    field: 'notifyPartyId',
-    component: 'Input',
-    // defaultValue: '',
-    show: false,
-  },
-  {
-    field: 'tzr',
-    component: 'SelectTextArea',
-    colProps: { span: 24 },
-    componentProps: ({ formModel }) => {
-      return {
-        label: '通知人',
-        details: formModel,
-        field: 'notifyParty',
-        onChange: (e) => {
-          if (e) {
-            if (e.type == 'Id') {
-              formModel.notifyParty = e.res.shortName
-              formModel.notifyPartyId = e.res.id
-            } else {
-              formModel[`notifyParty${e.type}`] = e.res
-            }
-          }
-        },
-      }
-    },
-  },
-  {
-    field: 'agent',
-    label: 'AGENT',
-    component: 'InputTextArea',
-    required: false,
-    dynamicDisabled: false,
-    // defaultValue: '',
-    colProps: { span: 24 },
-    componentProps: {
-      rows: 3,
-    },
-  },
+  // {
+  //   label: '',
+  //   field: 'consigneeContent',
+  //   component: 'Input',
+  //   // defaultValue: '',
+  //   show: false,
+  // },
+  // {
+  //   label: '',
+  //   field: 'consignee',
+  //   component: 'Input',
+  //   // defaultValue: '',
+  //   show: false,
+  // },
+  // {
+  //   label: '',
+  //   field: 'consigneeId',
+  //   component: 'Input',
+  //   // defaultValue: '',
+  //   show: false,
+  // },
+  // {
+  //   field: 'shr',
+  //   component: 'SelectTextArea',
+  //   colProps: { span: 24 },
+  //   componentProps: ({ formModel }) => {
+  //     return {
+  //       label: '收货人',
+  //       details: formModel,
+  //       field: 'consignee',
+  //       onChange: (e) => {
+  //         if (e) {
+  //           if (e.type == 'Id') {
+  //             formModel.consignee = e.res.shortName
+  //             formModel.consigneeId = e.res.id
+  //           } else {
+  //             formModel[`consignee${e.type}`] = e.res
+  //           }
+  //         }
+  //       },
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '',
+  //   field: 'notifyPartyContent',
+  //   component: 'Input',
+  //   // defaultValue: '',
+  //   show: false,
+  // },
+  // {
+  //   label: '',
+  //   field: 'notifyParty',
+  //   component: 'Input',
+  //   // defaultValue: '',
+  //   show: false,
+  // },
+  // {
+  //   label: '',
+  //   field: 'notifyPartyId',
+  //   component: 'Input',
+  //   // defaultValue: '',
+  //   show: false,
+  // },
+  // {
+  //   field: 'tzr',
+  //   component: 'SelectTextArea',
+  //   colProps: { span: 24 },
+  //   componentProps: ({ formModel }) => {
+  //     return {
+  //       label: '通知人',
+  //       details: formModel,
+  //       field: 'notifyParty',
+  //       onChange: (e) => {
+  //         if (e) {
+  //           if (e.type == 'Id') {
+  //             formModel.notifyParty = e.res.shortName
+  //             formModel.notifyPartyId = e.res.id
+  //           } else {
+  //             formModel[`notifyParty${e.type}`] = e.res
+  //           }
+  //         }
+  //       },
+  //     }
+  //   },
+  // },
+  // {
+  //   field: 'agent',
+  //   label: 'AGENT',
+  //   component: 'InputTextArea',
+  //   required: false,
+  //   dynamicDisabled: false,
+  //   // defaultValue: '',
+  //   colProps: { span: 24 },
+  //   componentProps: {
+  //     rows: 3,
+  //   },
+  // },
 ]
 
 export const mailingInfoFormSchemaR: FormSchema[] = [
diff --git a/src/views/operation/seaexport/detail/modules/operationArea copy.vue b/src/views/operation/seaexport/detail/modules/operationArea copy.vue
deleted file mode 100644
index 4f07fedf..00000000
--- a/src/views/operation/seaexport/detail/modules/operationArea copy.vue	
+++ /dev/null
@@ -1,3105 +0,0 @@
-<template>
-  <div class="operation-area">
-    <a-card
-      :bordered="false"
-      :bodyStyle="{ 'padding-top': ' 6px', 'padding-left': '5px', 'padding-bottom': '0px', 'margin-bottom': '4px' }">
-      <div class="btn-list more-view">
-        <a-popconfirm
-          placement="bottom"
-          title="刷新页面将丢失未保存数据，是否继续？"
-          ok-text="是"
-          cancel-text="否"
-          @confirm="refreshPage"
-          @cancel="cancelRefresh">
-          <button><span class="iconfont icon-shuaxin" :style="{ fontSize: '17px' }"></span>刷新</button>
-        </a-popconfirm>
-        <button @click="copyBooking"><span class="iconfont icon-fuzhi1"></span>复制</button>
-        <button :disabled="saveFlag" @click="saveFun">
-          <span class="iconfont icon-icon_baocun" :style="{ fontSize: '15px', marginLeft: '2px' }"></span>保存
-        </button>
-        <button @click="FSnhowPrintModal">
-          <span class="iconfont icon-printing" :style="{ fontSize: '14px' }"></span>打印
-        </button>
-      </div>
-      <div class="btn-list more-view-1">
-        <button @click="openModel('bookingSpace')"><span class="iconfont icon-chuanbo"></span>订舱</button>
-        <button @click="openModel('cutOff')" :style="{ marginLeft: '4px' }">
-          <span class="iconfont icon-daibanshixiang"></span>截单
-        </button>
-        <a-popconfirm
-          title="您当前未选择服务项目，是否继续操作？"
-          :visible="visible1"
-          ok-text="是"
-          cancel-text="否"
-          @visibleChange="handleVisibleChange1"
-          @confirm="openModel('vgm')">
-          <button><span class="iconfont icon-dingdan"></span>VGM</button>
-        </a-popconfirm>
-        <button @click="openModel('trace')">
-          <span class="iconfont icon-yunshu1" style="font-size:18px;"></span>运踪
-        </button>
-        <a-popconfirm
-          title="您当前未选择服务项目，是否继续操作？"
-          :visible="visible"
-          ok-text="是"
-          cancel-text="否"
-          @visibleChange="handleVisibleChange"
-          @confirm="openPreOrderFun">
-          <button>
-            <span class="iconfont icon-yunshu1" style="font-size:18px;"></span>舱单
-          </button>
-        </a-popconfirm>
-        <button @click="openModel('paper')">
-          <span class="iconfont icon-zhizhishu" style="font-size:18px;"></span>下货纸
-        </button>
-      </div>
-      <div class="btn-list more-view-2">
-        <button @click="openModel('initCabin')">
-          <span class="iconfont icon-chuanfanguanli-chuanfanshenqing"></span>放舱
-        </button>
-        <button @click="openModel('ladingBill')" :style="{ marginLeft: '32px' }">
-          <span class="iconfont icon-zhcc_tidan"></span>提单确认
-        </button>
-        <button @click="openModel('vgmlink')"><span class="iconfont icon-lianjie"></span>VGM链接</button>
-        <button @click="TxxpLink"><span class="iconfont icon-dayinxiaopiao"></span>提箱小票</button>
-      </div>
-      <div class="btn-list single-view-4" :style="{ width: '90px' }">
-        <a-upload :file-list="fileList" :before-upload="beforeUpload" name="file" :customRequest="uploadFile">
-          <button @click="ShowOCR"><span class="iconfont icon-OCR"></span>OCR</button>
-        </a-upload>
-        <button style="font-size: 12px;" v-if="showPushBtn" @click="handlePushBC">
-          SO号回填
-        </button>
-        <button v-if="cabinShow && slotShow" @click="openModel('cabinSpace')">
-          引入舱位
-        </button>
-        <button v-if="!cabinShow && slotShow" @click="handleCancelCabin">
-          <a-spin :spinning="cabinLoad">取消舱位</a-spin>
-        </button>
-      </div>
-      <div class="btn-list single-view-1" :style="{ width: '110px' }">
-        <a-spin :spinning="telxLoad">
-          <button @click="handleSubmitTelex">
-            <span class="iconfont icon-dengjizongshu"></span>船司电放
-          </button>
-        </a-spin>
-      </div>
-      <div class="btn-list single-view-1" :style="{ width: '110px' }">
-        <a-popconfirm title="确定删除当前订舱？" ok-text="是" cancel-text="否" @confirm="removeOrder" @cancel="cancelRemove">
-          <button><span class="iconfont icon-shanchu1"></span>删除</button>
-        </a-popconfirm>
-        <button @click="addChild()" v-if="!details.hbList || details.hbList.length === 0">
-          <span class="iconfont icon-zhizhishu"></span>添加分单
-        </button>
-      </div>
-      <div class="btn-list single-view-4">
-        <button @click="FnGoSendCar"><span class="iconfont icon-yunshu1"></span>派车</button>
-        <button @click="FnGoExpress"><span class="iconfont icon-goods"></span>快递</button>
-      </div>
-      <div class="btn-list single-view-1" :class="{ inLoad: inChildLoading || !changeFlag }">
-        <button @click="changePage('prev')"><span class="iconfont icon-shang"></span>上一票</button>
-        <button @click="changePage('next')">
-          <span class="iconfont icon-xia" :style="{ fontSize: '17px' }"></span>下一票
-        </button>
-      </div>
-      <div v-if="scrollTop > 100" class="btn-list single-view-2">
-        <div>提单号:{{ details.mblno }}</div>
-        <div>委托单位:{{ details.customername }}</div>
-      </div>
-    </a-card>
-
-    <!-- 弹窗部分 start -->
-    <a-modal
-      :title="emnuHeader(modelType)"
-      v-drag
-      :destroyOnClose="true"
-      :width="['bookingSpace', 'cutOff'].includes(modelType) ? 600 : 1200"
-      :visible="bookingModelvisible"
-      :confirmLoading="bookingModelconfirm"
-      :maskClosable="false"
-      @ok="handleModelSubmit"
-      @cancel="handleModelCancel">
-      <template v-if="['bookingSpace', 'cutOff'].includes(modelType)">
-        <a-form>
-          <a-row :gutter="16">
-            <a-col :span="24">
-              <a-form-item
-                label="文件功能"
-                :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
-                :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                has-feedback
-                class="ant-form-file">
-                <a-radio-group v-model="bookingModelFrom.fileRole">
-                  <a-radio :style="radioStyle" :value="9"> 原始 </a-radio>
-                  <a-radio :disabled="forwarderFlag" :style="radioStyle" :value="1"> 更新 </a-radio>
-                  <a-radio :disabled="forwarderFlag" :style="radioStyle" :value="5"> 退舱 </a-radio>
-                </a-radio-group>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-        <template slot="footer">
-          <a-button @click="handleModelCancel">关闭</a-button>
-          <!-- <a-button @click="handleOPenMsk">msk</a-button> -->
-          <a-button type="primary" @click="handleModelSubmit('save')" :loading="EDISloading">保存 <template
-            v-if="modelType === 'cutOff'">ESI</template><template v-else>EDI</template>文件</a-button>
-          <a-button type="primary" @click="handleModelSubmit('send')" :loading="EDIUloading">上传 <template
-            v-if="modelType === 'cutOff'">ESI</template><template v-else>EDI</template></a-button>
-        </template>
-      </template>
-
-      <template v-else-if="['initCabin', 'ladingBill', 'vgmlink'].includes(modelType)">
-        <div class="model-btn-list" v-if="modelType === 'initCabin' || modelType === 'ladingBill'">
-          <a-button class="btn" @click="saveModel" :loading="SaveLoading">保存</a-button>
-          <a-button
-            class="btn"
-            type="primary"
-            @click="removeModel"
-            :loading="DelLoading"
-            v-if="['initCabin'].includes(modelType) || ['ladingBill'].includes(modelType)">
-            删除
-          </a-button>
-          <template v-if="modelType === 'initCabin' || modelType === 'ladingBill'">
-            <a-button class="btn" type="primary" @click="downLoadFile">
-              打印
-            </a-button>
-            <!-- <a-button class="btn" type="primary" @click="downLoadFile(2, 'EXCEL')" :loading="downLoadEXCELLoading">
-              EXCEL
-            </a-button>
-            <a-button class="btn" type="primary" @click="downLoadFile(1, 'PDF')" :loading="downLoadPDFLoading">
-              PDF
-            </a-button>
-            <a-button class="btn" type="primary" @click="downLoadFile(3, 'DOCX')" :loading="downLoadDOCXLoading">
-              DOCX
-            </a-button> -->
-          </template>
-          <a-button
-            class="btn"
-            type="primary"
-            v-if="modelType == 'initCabin'"
-            @click="sendModel"
-            :loading="SendLoading">
-            发送
-          </a-button>
-          <a-button class="btn" type="primary" v-if="modelType == 'initCabin'" @click="handleOpenHis">
-            引入
-          </a-button>
-          <a-button class="btn" type="primary" v-if="modelType == 'initCabin'" @click="handleOpenHisData">
-            历史
-          </a-button>
-        </div>
-        <a-form>
-          <a-row :gutter="16">
-            <div class="item-box to-box" :style="{ paddingTop: '0px' }">
-              <!-- to -->
-              <a-col :span="24">
-                <a-col :span="18">
-                  <a-form-item
-                    label="TO"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 2 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 21 } }"
-                    has-feedback
-                    :style="{ marginLeft: '-18px' }">
-                    <a-input :allowClear="true" v-model="initCabinFrom.toName" />
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6" v-if="modelType == 'initCabin'">
-                  <a-form-item
-                    label="打印格式"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    <!-- <a-input :allowClear="true" v-model="initCabinFrom.attn" /> -->
-                    <a-select :allowClear="true" v-model="initCabinFrom.templateId">
-                      <a-select-option v-for="item in initCabinSendData" :value="item.id" :key="item.id">
-                        {{ item.displayName }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                </a-col>
-              </a-col>
-
-              <a-col :span="6">
-                <a-form-item
-                  label="ATTN"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                  has-feedback>
-                  <a-input :allowClear="true" v-model="initCabinFrom.attn" />
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item
-                  label="电话"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                  has-feedback>
-                  <a-input :allowClear="true" v-model="initCabinFrom.attnTel" />
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item
-                  label="邮箱"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                  has-feedback>
-                  <a-input :allowClear="true" v-model="initCabinFrom.attnMail" />
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item
-                  label="手机"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                  has-feedback>
-                  <a-input :allowClear="true" v-model="initCabinFrom.attnPhone" />
-                </a-form-item>
-              </a-col>
-              <!-- from -->
-              <a-col :span="6">
-                <a-form-item
-                  label="FROM"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                  has-feedback>
-                  <a-input :allowClear="true" v-model="initCabinFrom.fromName" />
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item
-                  label="电话"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                  has-feedback>
-                  <a-input :allowClear="true" v-model="initCabinFrom.fromTel" />
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item
-                  label="邮箱"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                  has-feedback>
-                  <a-input :allowClear="true" v-model="initCabinFrom.fromMail" />
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item
-                  label="手机"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                  has-feedback>
-                  <a-input :allowClear="true" v-model="initCabinFrom.fromPhone" />
-                </a-form-item>
-              </a-col>
-            </div>
-            <template v-if="modelType === 'initCabin'">
-              <div class="item-box cabin-box" :style="{ paddingTop: '0px' }">
-                <a-col :span="24">
-                  <a-form-item
-                    label="提箱小票链接"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    <div class="box-flex">
-                      <a-input class="box-input" :allowClear="true" v-model="initCabinFrom.orderUrl.urlTxxp" />
-                      <span @click="copyFun(initCabinFrom.orderUrl.urlTxxp)"><i class="iconfont icon-fuzhi2"></i></span>
-                    </div>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="24">
-                  <a-form-item
-                    label="VGM链接"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    <div class="box-flex">
-                      <a-input class="box-input" :allowClear="true" v-model="initCabinFrom.orderUrl.urlVgm" />
-                      <span @click="copyFun(initCabinFrom.orderUrl.urlVgm)"><i class="iconfont icon-fuzhi2"></i></span>
-                    </div>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="24">
-                  <a-form-item
-                    label="SI&VGM链接"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    <div class="box-flex">
-                      <a-input class="box-input" :allowClear="true" v-model="initCabinFrom.orderUrl.urlVgmSi" />
-                      <span @click="copyFun(initCabinFrom.orderUrl.urlVgmSi)"><i
-                        class="iconfont icon-fuzhi2"></i></span>
-                    </div>
-                  </a-form-item>
-                </a-col>
-              </div>
-              <div class="item-box vgm-info">
-                <a-col :span="8">
-                  <a-form-item
-                    label="场站"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    <a-select
-                      class="customer-input"
-                      style="width:195px;"
-                      :default-value="initCabinFrom.yard"
-                      v-model="initCabinFrom.yard"
-                      @change="handleYardChange"
-                      show-search
-                      :filter-option="filterOption"
-                      :dropdownMatchSelectWidth="false">
-                      <a-select-option v-for="(yard, yindex) in yardSelectData" :key="yindex" :value="yindex">
-                        {{ yard.selectShowTab }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="8">
-                  <a-form-item
-                    label="联系人"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    <a-input
-                      class="box-input"
-                      style="width:195px;"
-                      :allowClear="true"
-                      v-model="initCabinFrom.yardcontract" />
-                  </a-form-item>
-                </a-col>
-                <a-col :span="8">
-                  <a-form-item
-                    label="电话"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    <a-input
-                      class="box-input"
-                      style="width:195px;"
-                      :allowClear="true"
-                      v-model="initCabinFrom.yardcontracttel" />
-                  </a-form-item>
-                </a-col>
-                <a-col :span="8">
-                  <a-form-item
-                    label="截港时间"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    <!-- {{ details.closingdate || '--' }} -->
-                    <a-date-picker
-                      :show-time="{ format: 'HH:00:00' }"
-                      style="width:120px;"
-                      format="YYYY-MM-DD HH:00:00"
-                      v-model="initCabinFrom.closingTime"
-                      @change="closingdateChange">
-                      <a-icon slot="suffixIcon" type="time" style="display: none" />
-                    </a-date-picker>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="8">
-                  <a-form-item
-                    label="截单时间"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    <!-- {{ details.closedocdate || '--' }} -->
-                    <a-date-picker
-                      style="width:120px;"
-                      :show-time="{ format: 'HH:00:00' }"
-                      format="YYYY-MM-DD HH:00:00"
-                      v-model="initCabinFrom.closeDocTime"
-                      @change="closedocdateChange">
-                      <a-icon slot="suffixIcon" type="time" style="display: none" />
-                    </a-date-picker>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="8">
-                  <a-form-item
-                    label="截VGM时间"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    <!-- {{ details.closevgmdate || '--' }} -->
-                    <a-date-picker
-                      show-time
-                      style="width:120px;"
-                      format="YYYY-MM-DD HH:mm:ss"
-                      v-model="initCabinFrom.vgmTime"
-                      @change="closevgmdateChange">
-                      <a-icon slot="suffixIcon" type="time" style="display: none" />
-                    </a-date-picker>
-                  </a-form-item>
-                </a-col>
-              </div>
-              <div class="item-box vgm-remarks" style="padding-top:0px;padding-bottom:0px;height:166px;">
-                <a-col :span="24">
-                  <a-form-item
-                    label="备注"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    <div class="box-flex">
-                      <a-textarea
-                        class="remark-input"
-                        style="width:1000px !important; text-align: left;"
-                        :allowClear="true"
-                        :auto-size="{ minRows: 7, maxRows: 7 }"
-                        v-model="initCabinFrom.remark" />
-                    </div>
-                    <!-- <div class="box-flex">
-                      <a-input
-                        class="remark-input"
-                        style="width:1000px !important; text-align: left;"
-                        :allowClear="true"
-                        :auto-size="{ minRows: 3, maxRows: 5 }"
-                        v-model="initCabinFrom.remark"
-                      />
-                    </div> -->
-                  </a-form-item>
-                </a-col>
-              </div>
-            </template>
-            <template v-if="modelType === 'vgmlink'">
-              <div class="item-box" style="padding-top:0px;padding-bottom:0px;">
-                <a-col :span="24">
-                  <a-form-item
-                    label="VGM提交地址"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    <div class="box-flex">
-                      <a-input
-                        style="width:1000px !important; text-align: left;"
-                        :allowClear="true"
-                        v-model="initCabinFrom.orderUrl.urlVgm" />
-                      <span style="margin-left:7px;"><i class="iconfont icon-fuzhi2"><!--复制--></i></span>
-                    </div>
-                  </a-form-item>
-                </a-col>
-              </div>
-              <div class="item-box vgm-info">
-                <a-col :span="6">
-                  <a-form-item
-                    label="主提单号"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    {{ details.mblno || '--' }}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item
-                    label="分提单号"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    {{ details.hblno || '--' }}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item
-                    label="海关航次"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    {{ details.voyno || '--' }}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item
-                    label="开船日期"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    {{ details.etd || '--' }}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item
-                    label="截港时间"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    {{ details.closingdate || '--' }}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item
-                    label="截单时间"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    {{ details.closedocdate || '--' }}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-item
-                    label="截VGM时间"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 4 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    {{ details.closevgmdate || '--' }}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item
-                    label="装货港"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    {{ details.portload || '--' }}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item
-                    label="卸货港"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    {{ details.portdischarge || '--' }}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item
-                    label="目的地"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    {{ details.destination || '--' }}
-                  </a-form-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-item
-                    label="件重尺"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 8 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    {{ details.pkgs || '--' }} / {{ details.kgs || '--' }} / {{ details.cbm || '--' }}
-                  </a-form-item>
-                </a-col>
-              </div>
-              <div class="item-box vgm-remarks" style="padding-top:0px;padding-bottom:0px;height:85px">
-                <a-col :span="24">
-                  <a-form-item
-                    label="备注"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                    has-feedback>
-                    <div class="box-flex">
-                      <a-textarea
-                        style="width:1000px !important; text-align: left;"
-                        :allowClear="true"
-                        :auto-size="{ minRows: 3, maxRows: 3 }"
-                        v-model="initCabinFrom.remark" />
-                    </div>
-                  </a-form-item>
-                </a-col>
-              </div>
-            </template>
-            <!-- ==== -->
-            <!-- <template v-if="modelType === 'ladingBill'">
-              <iframe class="pdf-view" src="billPdf" width="100%" height="100%" v-if="hsaBillPdf"></iframe>
-              <div class="no-pdf" v-else>{{ billPdfTip }}</div>
-            </template> -->
-          </a-row>
-        </a-form>
-        <template slot="footer">
-          <!-- <template v-if="['initCabin'].includes(modelType)"> -->
-          <a-button @click="handleModelCancel">关闭</a-button>
-          <!-- </template> -->
-          <!-- <template v-else>
-            <a-button @click="saveModel" :loading="SaveLoading">保存</a-button>
-            <a-button type="primary" @click="sendModel" :loading="SendLoading">发送</a-button>
-          </template> -->
-        </template>
-      </template>
-    </a-modal>
-    <!-- 弹窗部分 end -->
-    <!-- 打印弹窗 start -->
-    <a-modal :zIndex="1005" width="50vw" :maskClosable="false" v-model="PrintModalVisible" title="打印">
-      <template slot="footer"> <span></span> </template>
-      <a-spin tip="数据加载中..." :spinning="spinning">
-        <div class="PrintMain">
-          <div class="PrintTitle">
-            <p>默认打印格式为<span>pdf</span>,如需其他格式请选择</p>
-            <p>
-              打印格式：
-              <a-radio-group v-model="PrintType" name="radioGroup">
-                <a-radio value="1">pdf</a-radio>
-                <a-radio value="2">xlsx</a-radio>
-                <a-radio value="3">docx</a-radio>
-                <a-radio value="4">精确打印</a-radio>
-              </a-radio-group>
-            </p>
-          </div>
-
-          <a-row class="PrintMainBox">
-            <a-col
-              v-for="(item, index) in templateType"
-              :key="item.id"
-              @click="FnCilckTemplateType(item.id)"
-              class="items"
-              :span="11"
-              :offset="index % 2 == 0 ? 0 : 1">
-              <span>·</span>{{ item.displayName }}
-            </a-col>
-          </a-row>
-        </div>
-      </a-spin>
-    </a-modal>
-    <!-- 打印弹窗 end -->
-
-    <!-- OCR抽屉 start -->
-    <a-drawer
-      title="OCR"
-      width="45vw"
-      :destroyOnClose="true"
-      :mask="false"
-      placement="right"
-      :visible="OcrVisible"
-      @close="OcrOnClose"
-      class="OCRBox">
-      <a-row justify="end" :style="{ width: '100%', marginTop: '5px' }">
-        <a-col :span="6" :offset="18">
-          <span>缩放比例：</span>
-          <a-select size="small" v-model="scale" style="width: 120px">
-            <a-select-option value="1.0">100%</a-select-option>
-            <a-select-option value="1.2">120%</a-select-option>
-            <a-select-option value="1.5">150%</a-select-option>
-            <a-select-option value="2.0">200%</a-select-option>
-          </a-select>
-        </a-col>
-      </a-row>
-
-      <canvas
-        class="CV"
-        id="myCanvas"
-        ref="myCanvas"
-        width="893"
-        height="1262"
-        @mousedown="mousedown"
-        @mouseup="mouseup"
-        @mousemove="mousemove"
-        :style="{ backgroundImage: `url(${imgSrc})` }"></canvas>
-      <ul class="CvBox" v-if="CvBoxType" :style="{ left: `${Bx}px`, top: `${By}px` }">
-        <li v-for="item in BCvData" :key="item.name" @click="FnClickCvBox(item)">{{ item.name }}</li>
-      </ul>
-    </a-drawer>
-
-    <!-- OCR抽屉 end -->
-
-    <!-- 运踪弹窗 start -->
-    <a-modal width="50vw" :maskClosable="false" v-model="traceModalVisible" title="运踪订阅">
-      <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-checkbox-group
-                  class="trace-check"
-                  v-model="traceValue"
-                  name="checkboxgroup"
-                  :options="traceOptions"
-                  @change="onTraceChange" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-      <template slot="footer">
-        <a-button type="primary" @click="traceSend">订阅</a-button>
-      </template>
-    </a-modal>
-    <!-- 运踪弹窗 end -->
-    <a-modal width="1100px" ref="form" :maskClosable="false" v-model="historyFlag" title="历史引入">
-      <a-spin :spinning="hisLoading">
-        <div class="hisBox">
-          <a-form-model :label-col="labelCol" :wrapper-col="wrapperCol" :model="hisSearch">
-            <a-row>
-              <a-col :span="8">
-                <a-form-model-item label="业务编号">
-                  <a-input size="small" v-model="hisSearch.bookingno" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-model-item label="委托单位">
-                  <selectView
-                    ref="select"
-                    type="customername"
-                    searchApi="DjyCustomerSuggest"
-                    :searchQuery="{ keyword: '', type: 'consignor' }"
-                    :showLabel="['shortName']"
-                    :openSearch="true"
-                    :isCopy="false"
-                    @change="getSelectViewRes"></selectView>
-                </a-form-model-item>
-              </a-col>
-            </a-row>
-            <a-row>
-              <a-col :span="8">
-                <a-form-model-item label="主提单号">
-                  <a-input size="small" v-model="hisSearch.mblno" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-model-item label="分提单号">
-                  <a-input size="small" v-model="hisSearch.hblno" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-model-item label="开船日期">
-                  <a-range-picker valueFormat="YYYY-MM-DD" v-model="hisSearch.etd" />
-                </a-form-model-item>
-              </a-col>
-            </a-row>
-            <a-row>
-              <a-col :span="24">
-                <div style="margin-top: 10px;text-align: right;" class="model-btn-list">
-                  <a-button class="btn" @click="handleSearch" style="margin-right: 10px;" type="primary">搜索</a-button>
-                  <a-button class="btn" type="primary" @click="handleRest">重置</a-button>
-                </div>
-              </a-col>
-            </a-row>
-          </a-form-model>
-        </div>
-        <a-table
-          :scroll="{ x: '900' }"
-          @change="tablePaginationChange"
-          :pagination="pagination"
-          :columns="columns"
-          :data-source="data">
-          <a slot="action" slot-scope="text, record" @click="handleInto(record)">引入</a>
-        </a-table>
-      </a-spin>
-    </a-modal>
-    <a-modal width="1100px" ref="form" :maskClosable="false" v-model="historyDataFlag" title="历史信息">
-      <a-spin :spinning="hisLoading">
-        <div class="hisBox"></div>
-        <a-table
-          :scroll="{ x: '900' }"
-          @change="tablePaginationChange"
-          :pagination="pagination"
-          :columns="hisColums"
-          :data-source="hisData">
-        </a-table>
-      </a-spin>
-    </a-modal>
-
-    <a-modal width="1100px" v-model="voltaFlag" title="VOLTA截单详情">
-      <a-spin :spinning="voltaLoading">
-        <a-form-model
-          class="voltaForm"
-          ref="voltaForm"
-          :rules="rules"
-          :model="voltaForm"
-          :label-col="labelCol"
-          :wrapper-col="wrapperCol">
-          <a-row>
-            <a-col :span="12">
-              <a-form-model-item prop="shpperName" label="发货人">
-                <div class="bottom">
-                  <textareaView
-                    id="shipper-scroll"
-                    :height="60"
-                    :parentVal="voltaForm.shpperName"
-                    type="shpperName"
-                    :openToCDB="true"
-                    @getTextareaChange="getTextareaChange" />
-                  <div
-                    class="line-count"
-                    id="shipper-scroll-right"
-                    v-if="Object.keys(voltaForm).length > 1 && voltaForm.shpperName.length > 0">
-                    <div v-for="(num, index) in voltaForm.shpperName.split('\n')" :key="index">{{ num.length }}</div>
-                  </div>
-                </div>
-              </a-form-model-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-model-item prop="consigneeName" label="收货人">
-                <div class="bottom">
-                  <textareaView
-                    id="consignee-scroll"
-                    :height="60"
-                    :parentVal="voltaForm.consigneeName"
-                    type="consigneeName"
-                    :openToCDB="true"
-                    @getTextareaChange="getTextareaChange" />
-                  <div
-                    class="line-count"
-                    id="consignee-scroll-right"
-                    v-if="Object.keys(voltaForm).length > 1 && voltaForm.consigneeName.length > 0">
-                    <div v-for="(num, index) in voltaForm.consigneeName.split('\n')" :key="index">{{ num.length }}</div>
-                  </div>
-                </div>
-              </a-form-model-item>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col :span="12">
-              <a-form-model-item prop="shpperAddr" label="发货人地址">
-                <div class="bottom">
-                  <textareaView
-                    id="shipper-scroll"
-                    :parentVal="voltaForm.shpperAddr"
-                    :height="95"
-                    type="shpperAddr"
-                    :openToCDB="true"
-                    @getTextareaChange="getTextareaChange" />
-                  <div
-                    class="line-count"
-                    id="shipper-scroll-right"
-                    v-if="Object.keys(voltaForm).length > 1 && voltaForm.shpperAddr.length > 0">
-                    <div v-for="(num, index) in voltaForm.shpperAddr.split('\n')" :key="index">{{ num.length }}</div>
-                  </div>
-                </div>
-              </a-form-model-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-model-item prop="consigneeAddr" label="收货人地址">
-                <div class="bottom">
-                  <textareaView
-                    id="consignee-scroll"
-                    :parentVal="voltaForm.consigneeAddr"
-                    :height="95"
-                    type="consigneeAddr"
-                    :openToCDB="true"
-                    @getTextareaChange="getTextareaChange" />
-                  <div
-                    class="line-count"
-                    id="consignee-scroll-right"
-                    v-if="Object.keys(voltaForm).length > 1 && voltaForm.consigneeAddr.length > 0">
-                    <div v-for="(num, index) in voltaForm.consigneeAddr.split('\n')" :key="index">{{ num.length }}</div>
-                  </div>
-                </div>
-              </a-form-model-item>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col :span="12">
-              <div class="model-btn-list" style="margin-left: 130px;">
-                <a-button @click="handleSame" class="btn" type="primary" size="small">SAME AS CNEE</a-button>
-              </div>
-            </a-col>
-            <a-col :span="12">
-              <div class="model-btn-list" style="margin-left: 130px;">
-                <a-button @click="handleSame1" class="btn" type="primary" size="small">SAME AS CNEE</a-button>
-              </div>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col :span="12">
-              <a-form-model-item label="通知人">
-                <div class="bottom">
-                  <textareaView
-                    id="shipper-scroll"
-                    :parentVal="voltaForm.notifyName"
-                    :height="60"
-                    type="notifyName"
-                    :openToCDB="true"
-                    @getTextareaChange="getTextareaChange" />
-                  <div
-                    class="line-count"
-                    id="shipper-scroll-right"
-                    v-if="Object.keys(voltaForm).length > 1 && voltaForm.notifyName.length > 0">
-                    <div v-for="(num, index) in voltaForm.notifyName.split('\n')" :key="index">{{ num.length }}</div>
-                  </div>
-                </div>
-              </a-form-model-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-model-item label="通知人1">
-                <div class="bottom">
-                  <textareaView
-                    id="consignee-scroll"
-                    :parentVal="voltaForm.notifySecondName"
-                    :height="60"
-                    type="notifySecondName"
-                    :openToCDB="true"
-                    @getTextareaChange="getTextareaChange" />
-                  <div
-                    class="line-count"
-                    id="consignee-scroll-right"
-                    v-if="Object.keys(voltaForm).length > 1 && voltaForm.notifySecondName && voltaForm.notifySecondName.length > 0">
-                    <div v-for="(num, index) in voltaForm.notifySecondName.split('\n')" :key="index">{{ num.length }}
-                    </div>
-                  </div>
-                </div>
-              </a-form-model-item>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col :span="12">
-              <a-form-model-item label="通知人地址">
-                <div class="bottom">
-                  <textareaView
-                    id="shipper-scroll"
-                    :parentVal="voltaForm.notifyAddr"
-                    :height="95"
-                    type="notifyAddr"
-                    :openToCDB="true"
-                    @getTextareaChange="getTextareaChange" />
-                  <div
-                    class="line-count"
-                    id="shipper-scroll-right"
-                    v-if="Object.keys(voltaForm).length > 1 && voltaForm.notifyAddr.length > 0">
-                    <div v-for="(num, index) in voltaForm.notifyAddr.split('\n')" :key="index">{{ num.length }}</div>
-                  </div>
-                </div>
-              </a-form-model-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-model-item label="通知人1地址">
-                <div class="bottom">
-                  <textareaView
-                    id="consignee-scroll"
-                    :parentVal="voltaForm.notifySecondAddr"
-                    type="notifySecondAddr"
-                    :height="95"
-                    :openToCDB="true"
-                    @getTextareaChange="getTextareaChange" />
-                  <div
-                    class="line-count"
-                    id="consignee-scroll-right"
-                    v-if="Object.keys(voltaForm).length > 1 && voltaForm.notifySecondAddr && voltaForm.notifySecondAddr.length > 0">
-                    <div v-for="(num, index) in voltaForm.notifySecondAddr.split('\n')" :key="index">{{ num.length }}
-                    </div>
-                  </div>
-                </div>
-              </a-form-model-item>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col :span="12">
-              <a-form-model-item prop="cargoDescription" label="品名">
-                <a-textarea :rows="4" style="line-height: 22px;" v-model="voltaForm.cargoDescription"></a-textarea>
-              </a-form-model-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-model-item label="唛头">
-                <a-textarea :rows="2" style="line-height: 22px;" v-model="voltaForm.marks"></a-textarea>
-              </a-form-model-item>
-            </a-col>
-          </a-row>
-          <a-row>
-            <div style="display:flex;padding-left: 49px;">
-              <a-form-model-item style="width: 33%;" prop="placeOfOrigin" label="发货地">
-                <a-input v-model="voltaForm.placeOfOrigin"></a-input>
-              </a-form-model-item>
-              <a-form-model-item
-                :label-col="{ span: 8 }"
-                :wrapper-col="{ span: 16 }"
-                style="width: 33%;"
-                prop="loadPort"
-                label="起运港">
-                <a-input v-model="voltaForm.loadPort"></a-input>
-              </a-form-model-item>
-              <a-form-model-item
-                :label-col="{ span: 8 }"
-                :wrapper-col="{ span: 16 }"
-                style="width: 33%;"
-                prop="dischargePort"
-                label="卸货港">
-                <a-input v-model="voltaForm.dischargePort"></a-input>
-              </a-form-model-item>
-            </div>
-          </a-row>
-          <a-row>
-            <div style="display:flex;padding-left: 49px;">
-              <a-form-model-item style="width: 33%;" prop="finalDestination" label="最终目的港">
-                <a-input v-model="voltaForm.finalDestination"></a-input>
-              </a-form-model-item>
-              <a-form-model-item
-                prop="placeOfDelivery"
-                :label-col="{ span: 8 }"
-                :wrapper-col="{ span: 16 }"
-                style="width: 33%;"
-                label="最终交货地">
-                <a-input v-model="voltaForm.placeOfDelivery"></a-input>
-              </a-form-model-item>
-            </div>
-          </a-row>
-          <a-row>
-          </a-row>
-        </a-form-model>
-        <a-table :pagination="false" :columns="voltaColumns" :data-source="voltaData"></a-table>
-        <div style="font-size: 16px;color: black;text-align: right;">
-          毛重合计：{{ voltaForm.totalGWt }}
-          <span style="margin: 0 20px;">净重合计：{{ voltaForm.totalNWt }}</span>
-          尺寸合计：{{ voltaForm.totalCBM }}
-        </div>
-      </a-spin>
-      <template slot="footer">
-        <a-spin :spinning="voltaLoading">
-          <a-popconfirm title="确认发送?" ok-text="是" cancel-text="否" @confirm="handleSend">
-            <a-button type="primary">发送</a-button>
-          </a-popconfirm>
-
-          <a-button type="primary" @click="handleDownBW">下载报文</a-button>
-          <a-button @click="voltaFlag = false">关闭</a-button>
-        </a-spin>
-      </template>
-    </a-modal>
-
-    <a-modal
-      @ok="handleSaveCabin"
-      @cancel="cabinSpaceFlag = false"
-      width="1300px"
-      v-model="cabinSpaceFlag"
-      title="引入舱位">
-      <a-form :model="cabinQueryForm" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
-        <a-row>
-          <a-col :span="5">
-            <a-form-item label="装货地">
-              <a-input v-model="cabinQueryForm.placereceipt" allow-clear placeholder="请输入装货地" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="5">
-            <a-form-item label="交货地">
-              <a-input v-model="cabinQueryForm.placedelivery" allow-clear placeholder="请输入交货地" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="5">
-            <a-form-item label="船名">
-              <a-input v-model="cabinQueryForm.VESSEL" allow-clear placeholder="请输入船名" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="5">
-            <a-form-item label="订舱编号">
-              <a-input v-model="cabinQueryForm.SLOT_BOOKING_NO" allow-clear placeholder="请输入订舱编号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="4">
-            <a-form-item label="航次">
-              <a-input v-model="cabinQueryForm.VOYNO" allow-clear placeholder="请输入航次" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="5">
-            <a-form-item label="承运模式">
-              <a-select v-model="cabinQueryForm.CARRIAGE_TYPE">
-                <a-select-option value="DIRECT_SHIP">
-                  直达
-                </a-select-option>
-                <a-select-option value="TRANSFER_SHIP">
-                  中转
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="5">
-            <a-form-item label="订舱方式">
-              <a-select v-model="cabinQueryForm.BOOKING_SLOT_TYPE">
-                <a-select-option value="CONTRACT_ORDER">
-                  合约订舱
-                </a-select-option>
-                <a-select-option value="SPOT_ORDER">
-                  SPOT订舱
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="5">
-            <a-form-item label="箱型箱量">
-              <a-select
-                mode="multiple"
-                allowClear
-                v-model="cabinQueryForm.ctN_STAT"
-                style="width: 100%"
-                placeholder="请选择箱型箱量">
-                <a-select-option v-for="(item, index) in ctnallList" :key="index" :value="item.code">{{ item.name
-                }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="5">
-            <div class="model-btn-list" style="margin-bottom: 0px;margin-left: 38px;margin-top: 3px;">
-              <a-button class="btn" type="primary" @click="getCabinList">查询</a-button>
-              <a-button class="btn" style="margin-left: 8px" @clikc="refshCabin">重置</a-button>
-            </div>
-          </a-col>
-        </a-row>
-      </a-form>
-      <a-table
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio', }"
-        :scroll="{ x: 1200, y: 500 }"
-        size="small"
-        :pagination="paginationCab"
-        :loading="cabLoad"
-        @change="tablePaginationChangeCab"
-        :columns="cabinColums"
-        :data-source="cabinList">
-        <div slot="vessel" slot-scope="text,record">{{ record.vessel }}/{{ record.voyno }}</div>
-        <div
-          slot="opera"
-          slot-scope="text,record,index"
-          @click="handleOpentear(record, index)"
-          style="cursor: pointer;color: rgb(11, 124, 199);">选择</div>
-      </a-table>
-    </a-modal>
-
-    <a-modal @cancel="tearFlag = false" width="700px" @ok="handleSaveTear" v-model="tearFlag">
-      <div>订舱提单号:{{ editTear.sloT_BOOKING_NO }}</div>
-      <div class="tear-list">
-        <div class="item" v-for="item in editTear.ctnList" :key="item.gid">
-          <span class="item-left">{{ item.ctnall }}</span>
-          <a-input-number style="width:50px;" v-model="item.ctnnum" :min="0" :max="item.maxNum"> </a-input-number>
-        </div>
-      </div>
-      <div>
-        <span style="color:rgb(114, 184, 9);">已选箱型：{{ boxTotal }}</span>
-        剩余箱型：{{ boxRemaining }}
-      </div>
-    </a-modal>
-
-    <pre-order ref="preOrder" :details="details" @frompre="frompre" />
-    <mskBookingOrder ref="mskBookingOrder"></mskBookingOrder>
-  </div>
-</template>
-<script>
-import {
-  SendBookingOrClosingEDI,
-  SendXHZ,
-  yardLetterYardHis,
-  VgmSend,
-  LetterYard,
-  SampleBill,
-  SendLetterYard,
-  SaveBookingLetteryard,
-  SaveBookingSampleBill,
-  SampleBillPdf,
-  TxxpLink,
-  ExcuteRulesOceanBooking,
-  BookingOrderPrintOrder,
-  BookingOrderOcrUpFile,
-  BookingOrderOcrGetImg,
-  BookingOrderOcrGetText,
-  BookingOrderPrintTemplateWithHistoryList,
-  DownloadBookingOrClosingEDI,
-  DeleteLetterYard,
-  SendTrace,
-  GetYardlist,
-  LetterYardHis,
-  CheckAndInitVOLTAEdi,
-  DownloadVOLTAEdiSI,
-  SendVOLTAEdiSI,
-  BookingSlotGetAvailableSlots,
-  CancelAllocationSlot,
-  PushBcInfo,
-  SubmitTelex
-} from '@/api/modular/main/BookingLedger'
-import { BookingTruckGetTruckListByBooking } from '@/api/modular/main/SendCar'
-import mskBookingOrder from '@/components/mskBookingOrder'
-import { mapGetters } from 'vuex'
-import selectView from '../components/selectView'
-import textareaView from '../components/textareaView'
-import preOrder from './preOrder'
-export default {
-  props: {
-    details: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    scrollTop: {
-      type: Number,
-      default: 0
-    },
-    inChildLoading: {
-      type: Boolean,
-      default: false
-    }
-  },
-  computed: {
-    ...mapGetters(['saveFlag', 'slotShow', 'ctnallList'])
-  },
-  components: {
-    preOrder, selectView, textareaView, mskBookingOrder
-  },
-  data() {
-    return {
-      id: this.$route.query.id,
-      labelCol: { span: 6 },
-      voltaData: [],
-      showPushBtn: false,
-      cabinLoad: false,
-      cabinShow: true,
-      boxRemaining: '',
-      cabLoad: false,
-      boxTotal: '',
-      selectedRowKeys: [],
-      tearFlag: false,
-      editTear: {},
-      cabinQueryForm: {},
-      visible1: false,
-      voltaColumns: [
-        {
-          dataIndex: 'sNo',
-          key: 'sNo',
-          title: 'No'
-        },
-        {
-          dataIndex: 'contaNo',
-          title: '箱号',
-          key: 'contaNo'
-        },
-        {
-          dataIndex: 'sealNo',
-          key: 'sealNo',
-          title: '封号'
-        },
-        {
-          dataIndex: 'gWt',
-          key: 'gWt',
-          title: '毛重',
-          align: 'right'
-        },
-        {
-          dataIndex: 'nWt',
-          key: 'nWt',
-          title: '净重',
-          align: 'right'
-        },
-        {
-          dataIndex: 'wtUnit',
-          key: 'wtUnit',
-          title: '单位尺寸'
-        },
-        {
-          dataIndex: 'qty',
-          key: 'qty',
-          title: '件数',
-          align: 'right'
-        },
-        {
-          dataIndex: 'ediPkgs',
-          key: 'ediPkgs',
-          title: '包装'
-        },
-        {
-          dataIndex: 'cbm',
-          key: 'cbm',
-          title: '尺寸',
-          align: 'right'
-        }
-      ],
-      wrapperCol: { span: 18 },
-      historyDataFlag: false,
-      hisLoading: false,
-      voltaFlag: false,
-      modelType: '',
-      cabinColums: [
-        {
-          dataIndex: 'sloT_BOOKING_NO',
-          key: 'sloT_BOOKING_NO',
-          title: '舱位提单号',
-          width: 150
-        },
-        {
-          dataIndex: 'contracT_NO',
-          key: 'contracT_NO',
-          title: '合约号',
-          width: 100
-        },
-        {
-          dataIndex: 'carrier',
-          key: 'carrier',
-          title: '船公司',
-          width: 100,
-          ellipsis: true
-        },
-        {
-          title: '订舱抬头',
-          dataIndex: 'bookinG_PARTY',
-          key: 'bookinG_PARTY',
-          width: 100
-        },
-        {
-          title: '订舱方式',
-          dataIndex: 'bookinG_SLOT_TYPE_NAME',
-          key: 'bookinG_SLOT_TYPE_NAME',
-          width: 80
-        },
-        {
-          title: '承运模式',
-          key: 'carriagE_TYPE_NAME',
-          dataIndex: 'carriagE_TYPE_NAME',
-          width: 80
-        },
-        {
-          title: '船名/航次',
-          key: 'vessel',
-          dataIndex: 'vessel',
-          scopedSlots: { customRender: 'vessel' },
-          width: 120,
-          ellipsis: true
-        },
-        {
-          title: '装货地',
-          key: 'placereceipt',
-          dataIndex: 'placereceipt',
-          width: 150,
-          ellipsis: true
-        },
-        {
-          title: '交货地',
-          key: 'placedelivery',
-          dataIndex: 'placedelivery',
-          width: 150,
-          ellipsis: true
-        },
-        {
-          title: '箱型箱量（余量）',
-          key: 'ctN_STAT',
-          dataIndex: 'ctN_STAT',
-          width: 200,
-          ellipsis: true
-        },
-        {
-          title: 'ETD',
-          key: 'etd',
-          dataIndex: 'etd',
-          width: 180
-        },
-        {
-          title: 'ETA',
-          key: 'eta',
-          dataIndex: 'eta',
-          width: 180
-        },
-        {
-          title: '操作',
-          key: 'opera',
-          dataIndex: 'opera',
-          scopedSlots: { customRender: 'opera' },
-          width: 60,
-          fixed: 'right'
-        }
-      ],
-      voltaLoading: false,
-      voltaForm: {
-        notifyAddr: '',
-        shpperName: '',
-        consigneeName: '',
-        shpperAddr: '',
-        consigneeAddr: '',
-        notifyName: '',
-        notifySecondName: '',
-        notifySecondAddr: ''
-      },
-      telxLoad: false,
-      rules: {
-        shpperName: [{ required: true, message: '请输入发货人', trigger: 'blur' }],
-        shpperAddr: [{ required: true, message: '请输入发货人地址', trigger: 'blur' }],
-        consigneeName: [{ required: true, message: '请输入收货人名称', trigger: 'blur' }],
-        consigneeAddr: [{ required: true, message: '请输入收货人地址', trigger: 'blur' }],
-        notifyName: [{ required: true, message: '请输入通知人名称', trigger: 'blur' }],
-        notifyAddr: [{ required: true, message: '请输入通知人地址', trigger: 'blur' }],
-        placeOfOrigin: [{ required: true, message: '请输入发货地', trigger: 'blur' }],
-        loadPort: [{ required: true, message: '请输入起运港', trigger: 'blur' }],
-        dischargePort: [{ required: true, message: '请输入卸货港', trigger: 'blur' }],
-        finalDestination: [{ required: true, message: '请输入最终目的港', trigger: 'blur' }],
-        cargoDescription: [{ required: true, message: '请输入品名', trigger: 'blur' }],
-        placeOfDelivery: [{ required: true, message: '请输入最终交货地', trigger: 'blur' }]
-      },
-      pagination: {
-        current: 1,
-        total: 0, // 总数
-        showSizeChanger: true,
-        pageSizeOptions: ['1', '10', '20', '40', '80', '100'],
-        pageSize: 10
-      },
-      paginationCab: {
-        current: 1,
-        total: 0, // 总数
-        showSizeChanger: true,
-        pageSizeOptions: ['1', '10', '20', '40', '80', '100'],
-        pageSize: 20
-      },
-      hisColums: [
-        {
-          title: '创建人',
-          key: 'createdUserName',
-          dataIndex: 'createdUserName',
-          width: 120
-        },
-        {
-          title: '创建时间',
-          key: 'createdTime',
-          dataIndex: 'createdTime',
-          width: 200
-        },
-        {
-          title: 'ATTN',
-          key: 'attn',
-          dataIndex: 'attn',
-          width: 120
-        },
-        {
-          title: 'ATTN电话',
-          key: 'attnTel',
-          dataIndex: 'attnTel',
-          width: 180
-        },
-        {
-          title: 'ATTN邮箱',
-          key: 'attnMail',
-          dataIndex: 'attnMail',
-          width: 180
-        },
-        {
-          title: 'ATTN手机',
-          key: 'attnPhone',
-          dataIndex: 'attnPhone',
-          width: 120
-        },
-        {
-          title: 'FROM电话',
-          key: 'fromTel',
-          dataIndex: 'fromTel',
-          width: 180
-        },
-        {
-          title: 'FROM',
-          key: 'fromName',
-          dataIndex: 'fromName',
-          width: 120
-        },
-        {
-          title: 'FROM邮箱',
-          key: 'fromMail',
-          dataIndex: 'fromMail',
-          width: 180
-        },
-        {
-          title: 'FROM手机',
-          key: 'fromPhone',
-          dataIndex: 'fromPhone',
-          width: 120
-        },
-        {
-          title: '截单时间',
-          key: 'closeDocTime',
-          dataIndex: 'closeDocTime',
-          width: 120
-        },
-        {
-          title: '截港时间',
-          key: 'closingTime',
-          dataIndex: 'closingTime',
-          width: 120
-        },
-        {
-          title: '截VGM时间',
-          key: 'vgmTime',
-          dataIndex: 'vgmTime',
-          width: 120
-        },
-        {
-          title: '场站',
-          key: 'yard',
-          dataIndex: 'yard',
-          width: 120
-        }
-      ],
-      changeFlag: true,
-      columns: [
-        {
-          dataIndex: 'mblno',
-          key: 'mblno',
-          title: '主提单号',
-          width: 150
-        },
-        {
-          title: '分提单号',
-          dataIndex: 'hblno',
-          key: 'hblno',
-          width: 120
-        },
-        {
-          title: '业务编号',
-          dataIndex: 'address',
-          key: 'address',
-          width: 120
-        },
-        {
-          title: '开船日期',
-          key: 'etd',
-          dataIndex: 'etd',
-          width: 120
-        },
-        {
-          title: '客户',
-          key: 'customername',
-          dataIndex: 'customername',
-          width: 120
-        },
-        {
-          title: 'To',
-          key: 'toName',
-          dataIndex: 'toName',
-          width: 120
-        },
-        {
-          title: 'ATTN',
-          key: 'attn',
-          dataIndex: 'attn',
-          width: 120
-        },
-        {
-          title: 'ATTN电话',
-          key: 'attnTel',
-          dataIndex: 'attnTel',
-          width: 180
-        },
-        {
-          title: 'ATTN邮箱',
-          key: 'attnMail',
-          dataIndex: 'attnMail',
-          width: 180
-        },
-        {
-          title: 'ATTN手机',
-          key: 'attnPhone',
-          dataIndex: 'attnPhone',
-          width: 120
-        },
-        {
-          title: 'FROM电话',
-          key: 'fromTel',
-          dataIndex: 'fromTel',
-          width: 180
-        },
-        {
-          title: 'FROM',
-          key: 'fromName',
-          dataIndex: 'fromName',
-          width: 120
-        },
-        {
-          title: 'FROM邮箱',
-          key: 'fromMail',
-          dataIndex: 'fromMail',
-          width: 180
-        },
-        {
-          title: 'FROM手机',
-          key: 'fromPhone',
-          dataIndex: 'fromPhone',
-          width: 120
-        },
-        {
-          title: '截单时间',
-          key: 'closeDocTime',
-          dataIndex: 'closeDocTime',
-          width: 120
-        },
-        {
-          title: '截港时间',
-          key: 'closingTime',
-          dataIndex: 'closingTime',
-          width: 120
-        },
-        {
-          title: '截VGM时间',
-          key: 'vgmTime',
-          dataIndex: 'vgmTime',
-          width: 120
-        },
-        {
-          title: '场站',
-          key: 'yard',
-          dataIndex: 'yard',
-          width: 120
-        },
-        {
-          title: '操作',
-          key: 'action',
-          fixed: 'right',
-          dataIndex: 'action',
-          scopedSlots: { customRender: 'action' },
-          width: 80
-        }
-      ],
-      data: [],
-      bookingModelvisible: false,
-      bookingModelconfirm: false,
-      bookingModelFrom: {
-        id: this.$route.query.id,
-        orderNo: this.details.mblno,
-        useForwarderCode: false,
-        forwarderCode: '',
-        forwarderName: '',
-        fileRole: 9,
-        sendType: 'B',
-        send: false
-      },
-      radioStyle: {
-        display: 'block',
-        height: '30px',
-        lineHeight: '30px'
-      },
-      initCabinFrom: {
-        toName: '',
-        attn: '',
-        attnTel: '',
-        attnMail: '',
-        attnPhone: '',
-        fromName: '',
-        fromTel: '',
-        fromMail: '',
-        fromPhone: '',
-        orderUrl: {
-          urlTxxp: '',
-          urlVgm: '',
-          urlVgmSi: ''
-        },
-        remark: ''
-      },
-      hsaBillPdf: false,
-      billPdf: '',
-      billPdfTip: '',
-      templateType: [],
-      EDISloading: false,
-      EDIUloading: false,
-      SaveLoading: false,
-      SendLoading: false,
-      DelLoading: false,
-      cabinSpaceFlag: false,
-      PrintModalVisible: false,
-      OcrVisible: false,
-      fileList: [],
-      hisData: [],
-      fileName: '',
-      flag: false,
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0,
-      Bx: 0,
-      By: 0,
-      historyFlag: false,
-      forwarderFlag: false,
-      CvBoxType: false,
-      imgSrc: '',
-      CvData: [
-        { name: '发货人', code: 'shipper' },
-        { name: '收货人', code: 'consignee' },
-        { name: '装货港', code: 'portload' },
-        { name: '目的地', code: 'destination' },
-        { name: '唛头', code: 'marks' },
-        { name: '货物描述', code: 'description' },
-        { name: '包装', code: 'kindpkgs' },
-        { name: '件数', code: 'pkgs' },
-        { name: '尺寸', code: 'cbm' },
-        { name: '毛重', code: 'kgs' },
-        { name: '卸货港', code: 'portdischarge' },
-        { name: '通知人', code: 'notifyparty' }
-      ],
-      BCvData: [],
-      Rdata: '',
-      scale: '1.5',
-      PrintType: '1',
-      hisSearch: {},
-      downLoadEXCELLoading: false,
-      downLoadPDFLoading: false,
-      downLoadDOCXLoading: false,
-      traceOptions: [
-        { label: '起运港', value: '1' },
-        { label: '目的港', value: '2' }
-      ],
-      traceValue: [],
-      traceModalVisible: false,
-      tearIndex: 0,
-      visible: false,
-      cateCode: '',
-      spinning: false,
-      cabinList: [],
-      yardSelectData: null,
-      initCabinSendData: [],
-      serviceItem: []
-    }
-  },
-  mounted() {
-    this.BCvData = [...this.CvData]
-    this.serviceItem = []
-    this.$bus.$on('bookingServiceItem', val => {
-      this.serviceItem = val
-    })
-  },
-  watch: {
-    scale() {
-      if (this.fileName) {
-        BookingOrderOcrGetImg({ fileName: this.fileName, scale: this.scale }).then(res => {
-          this.imgSrc = window.URL.createObjectURL(new Blob([res]))
-        })
-      }
-    },
-    '$route': {
-      immediate: true,
-      handler(nD, oD) {
-        if (nD.name === 'BookingDetail') {
-          this.id = this.$route.query.id
-          this.bookingModelFrom.id = this.$route.query.id
-          if (nD.addNum) {
-            this.cabinShow = true
-            this.selectedRowKeys = []
-          }
-          if (process.env.VUE_APP_TYPE === 'yunyingduan') {
-            this.showPushBtn = true
-          }
-        }
-      }
-    },
-    PrintType(newdata, oldData) {
-      const printType = newdata == 4 ? 20 : 10
-      const print = oldData == 4 ? 20 : 10
-      if (printType != print) {
-        this.GetPrintData(this.cateCode, printType)
-      }
-    },
-    editTear: {
-      handler(nval, oval) {
-        if (nval.ctnList && nval.ctnList.length > 0) {
-          let str = ''
-          let str1 = ''
-          nval.ctnList.forEach(item => {
-            if (item.ctnnum > 0) {
-              str += item.ctnall + '*' + ' ' + item.ctnnum + ' '
-            }
-          })
-          nval.ctnListCopy.forEach(ite => {
-            nval.ctnList.forEach(item => {
-              if (item.ctnall === ite.ctnall) {
-                if (item.ctnnum < ite.ctnnum) {
-                  const num = ite.ctnnum - item.ctnnum
-                  str1 += item.ctnall + '*' + ' ' + num + ' '
-                }
-              }
-            })
-          })
-          this.boxTotal = str
-          this.boxRemaining = str1
-        } else {
-          this.boxTotal = ''
-          this.boxRemaining = ''
-        }
-      },
-      deep: true,
-      immediate: true
-    },
-    'details.slots': {
-      handler(nval, oval) {
-        if (nval && nval.length === 0) {
-          this.cabinShow = true
-          this.selectedRowKeys = []
-        }
-        if (nval && nval.length > 0) {
-          if (Object.keys(nval[0]).length > 2) {
-            this.cabinShow = true
-            this.selectedRowKeys = []
-          } else {
-            this.cabinShow = false
-          }
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    frompre(data) {
-      this.$emit('frompre', data)
-    },
-    handleCancelCabin() {
-      this.cabinLoad = true
-      CancelAllocationSlot(this.details.id).then(res => {
-        if (res.success) {
-          this.$message.success('取消成功')
-          this.$emit('handleSetCtnList')
-        } else {
-          this.$message.error(res.message)
-        }
-        this.cabinLoad = false
-      })
-    },
-    handleSaveTear() {
-      this.$set(this.cabinList, this.tearIndex, this.editTear)
-      this.$forceUpdate()
-      this.tearFlag = false
-    },
-    handleSubmitTelex() {
-      this.telxLoad = true
-      SubmitTelex([this.$route.query.id]).then(res => {
-        if (res.success) {
-          if (res.data[0].isSuccess) {
-            this.$message.success('提交成功')
-          } else {
-            this.$message.warning(res.data[0].failReason)
-          }
-        } else {
-          this.$message.error(res.message)
-        }
-        this.telxLoad = false
-      })
-    },
-    handleOpentear(row, index) {
-      this.editTear = JSON.parse(JSON.stringify(row))
-      this.tearFlag = true
-      this.tearIndex = index
-    },
-    refshCabin() {
-      this.cabinQueryForm = {}
-    },
-    getCabinList() {
-      if (this.cabinQueryForm.ctN_STAT) {
-        this.cabinQueryForm.ctN_STAT = this.cabinQueryForm.ctN_STAT.join(',')
-      }
-      this.cabLoad = true
-      this.cabinQueryForm.PageSize = this.paginationCab.PageSize
-      this.cabinQueryForm.PageNo = this.paginationCab.current
-      BookingSlotGetAvailableSlots(this.cabinQueryForm).then(res => {
-        if (res.success) {
-          res.data.items.forEach(item => {
-            item.ctN_STAT = ''
-            if (item.ctnList) {
-              item.ctnListCopy = JSON.parse(JSON.stringify(item.ctnList))
-            }
-            item.ctnList.forEach(ite => {
-              item.ctN_STAT += ite.ctnall + '*' + ite.ctnnum + ' '
-              ite.maxNum = JSON.parse(JSON.stringify(ite.ctnnum))
-            })
-          })
-          this.cabinList = res.data.items
-          this.paginationCab.total = res.data.totalCount
-        } else {
-          this.$message.error(res.message)
-        }
-        this.cabLoad = false
-      })
-    },
-    onSelectChange(selectedRowKeys) {
-      this.selectedRowKeys = selectedRowKeys;
-    },
-    handleDownBW() {
-      this.$refs.voltaForm.validate(valid => {
-        if (valid) {
-          const data = {
-            bookingId: this.details.bookingno,
-            id: this.details.id,
-            ...this.voltaForm
-          }
-          this.voltaLoading = true
-          DownloadVOLTAEdiSI(data).then(res => {
-            const reader = new FileReader(); // 使用 new FileReader()，将 blob 转为 json，然后进行处理
-            reader.readAsText(res.data)
-            const that = this
-            reader.onload = function (result1) {
-              try {
-                const resData = JSON.parse(result1.target.result);
-                that.$message.error(resData.message)
-              } catch (err) {
-                var blob = new Blob([res.data], { type: 'application/octet-stream;charset=UTF-8' })
-                var contentDisposition = res.headers['content-disposition']
-                var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
-                var result = patt.exec(contentDisposition)
-                var filename = result[1]
-                var downloadElement = document.createElement('a')
-                var href = window.URL.createObjectURL(blob) // 创建下载的链接
-                var reg = /^["](.*)["]$/g
-                downloadElement.style.display = 'none'
-                downloadElement.href = href
-                downloadElement.download = decodeURI(filename.replace(reg, '$1')) // 下载后文件名
-                document.body.appendChild(downloadElement)
-                downloadElement.click() // 点击下载
-                document.body.removeChild(downloadElement) // 下载完成移除元素
-                window.URL.revokeObjectURL(href)
-              }
-            };
-            this.voltaLoading = false
-          })
-        } else {
-          return false;
-        }
-      });
-    },
-    handleSend() {
-      this.$refs.voltaForm.validate(valid => {
-        if (valid) {
-          const data = {
-            bookingId: this.details.bookingno,
-            id: this.details.id,
-            ...this.voltaForm
-          }
-          this.voltaLoading = true
-          SendVOLTAEdiSI(data).then(res => {
-            if (res.code === 200) {
-              this.$message.success('操作成功')
-              this.voltaFlag = false
-              this.bookingModelvisible = false
-            } else {
-              this.$message.error(res.message)
-            }
-            this.voltaLoading = false
-          })
-        } else {
-          return false;
-        }
-      });
-    },
-    handleSame() {
-      this.voltaForm.notifyName = JSON.parse(JSON.stringify(this.voltaForm.consigneeName))
-      this.voltaForm.notifyAddr = JSON.parse(JSON.stringify(this.voltaForm.consigneeAddr))
-      this.$forceUpdate()
-    },
-    handleSame1() {
-      const str = JSON.parse(JSON.stringify(this.voltaForm.consigneeName))
-      const str1 = JSON.parse(JSON.stringify(this.voltaForm.consigneeAddr))
-      this.$set(this.voltaForm, 'notifySecondName', str)
-      this.$set(this.voltaForm, 'notifySecondAddr', str1)
-      this.$forceUpdate()
-    },
-    getTextareaChange({ type, value }) {
-      let val = ''
-      for (var i in value) {
-        let k = ''
-        if (value[i] === String.fromCharCode(160)) {
-          k = ' '
-        } else {
-          k = value[i]
-        }
-        val += k
-      }
-      this.voltaForm[type] = val
-      this.$forceUpdate()
-    },
-    handleInto(row) {
-      row.orderUrl = {
-        urlTxxp: '',
-        urlVgm: '',
-        urlVgmSi: ''
-      }
-      row.id = this.initCabinFrom.id
-      row.bookingId = this.initCabinFrom.bookingId
-      this.initCabinFrom = row
-      this.historyFlag = false
-    },
-    handleRest() {
-      this.hisSearch = {}
-      this.$refs.select.value = ''
-    },
-    tablePaginationChange(pagination) {
-      this.pagination.current = pagination.current
-      this.pagination.pageSize = pagination.pageSize
-      this.getList()
-    },
-    tablePaginationChangeCab(pagination) {
-      this.paginationCab.current = pagination.current
-      this.paginationCab.pageSize = pagination.pageSize
-      this.getCabinList()
-    },
-    handleSearch() {
-      this.getList()
-    },
-    handleOpenHis() {
-      this.historyFlag = true
-      this.getList()
-    },
-    handleOpenHisData() {
-      this.historyDataFlag = true
-      this.getHisList()
-    },
-    getList() {
-      const data = {
-        pageNo: this.pagination.current,
-        pageSize: this.pagination.pageSize,
-        ...this.hisSearch
-      }
-      this.hisLoading = true
-      if (data.etd && data.etd.length > 0) {
-        data.betd = data.etd[0]
-        data.eetd = data.etd[1]
-      }
-      LetterYardHis(data).then(res => {
-        if (res.success) {
-          this.data = res.data.items
-          this.hisLoading = false
-          this.pagination.total = res.data.totalCount
-        } else {
-          this.$message.error(res.data.message)
-          this.hisLoading = false
-        }
-      })
-    },
-    getHisList() {
-      const data = {
-        bookingId: this.details.id
-      }
-      this.hisLoading = true
-      yardLetterYardHis(data).then(res => {
-        if (res.success) {
-          this.hisData = res.data
-          this.hisLoading = false
-        } else {
-          this.$message.error(res.message)
-          this.hisLoading = false
-        }
-      })
-    },
-    handleVisibleChange(visible) {
-      if (!visible) {
-        this.visible = false;
-        return;
-      }
-      const arr = []
-      this.serviceItem.forEach(item => {
-        if (item.isYield) {
-          arr.push(1)
-        }
-      })
-      if (arr.length === 0) {
-        this.visible = true;
-      } else {
-        this.openPreOrderFun()
-      }
-    },
-    handleOPenMsk() {
-      this.$refs.mskBookingOrder.showFlag = true
-    },
-    handleVisibleChange1(visible) {
-      if (!visible) {
-        this.visible1 = false;
-        return;
-      }
-      const arr = []
-      this.serviceItem.forEach(item => {
-        if (item.isYield) {
-          arr.push(1)
-        }
-      })
-      if (arr.length === 0) {
-        this.visible1 = true;
-      } else {
-        this.openModel('vgm')
-      }
-    },
-    getSelectViewRes({ type, res }) {
-      if (type === 'customername') {
-        this.hisSearch.customername = res.shortName || ''
-      }
-    },
-    FnGoSendCar() {
-      BookingTruckGetTruckListByBooking({ bookingId: this.id }).then(res => {
-        console.log(res)
-        this.$router.push({
-          name: 'SendCarAdd',
-          query: {
-            type: 'Edit',
-            BookingId: this.id
-          }
-        })
-      })
-    },
-    FnGoExpress() {
-      console.log(this.id)
-      this.$router.push({
-        name: 'ExpressModuleDetails',
-        query: {
-          type: 'Add',
-          Ids: `${this.id}`
-        }
-      })
-    },
-    // ========== OCR ==========
-    FnClickCvBox(data) {
-      const Arr = ['pkgs', 'cbm', 'kgs', 'portdischarge', 'destination', 'kindpkgs']
-      let Type = false
-      Arr.forEach(item => {
-        if (data.code == item) {
-          Type = true
-        }
-      })
-      if (Type) {
-        if (data.code == 'pkgs' || data.code == 'cbm' || data.code == 'kgs') {
-          this.details[data.code] = parseFloat(this.Rdata)
-        } else {
-          this.details[data.code] = this.Rdata
-        }
-      } else {
-        this.details[data.code] = this.details[data.code] + this.Rdata
-      }
-      console.log(data)
-      console.log(data.code)
-      console.log(this.details)
-      console.log(this.details[data.code])
-      console.log(this.Rdata)
-      // this.details[data.code] = this.details[data.code] + this.Rdata
-      this.CvBoxType = false
-      this.BCvData.forEach((item, index) => {
-        if (item.code == data.code) {
-          this.BCvData.splice(index, 1)
-          this.BCvData.push(item)
-        }
-      })
-    },
-    drawRect(e) {
-      if (this.flag) {
-        const canvas = this.$refs.myCanvas
-        var ctx = canvas.getContext('2d')
-        const x = this.x
-        const y = this.y
-
-        ctx.clearRect(0, 0, canvas.width, canvas.height)
-        ctx.beginPath()
-
-        // 设置线条颜色，必须放在绘制之前
-        ctx.strokeStyle = '#e1271d'
-        // 线宽设置，必须放在绘制之前
-        ctx.lineWidth = 1
-        this.width = e.offsetX - x
-        this.height = e.offsetY - y
-
-        ctx.strokeRect(x, y, e.offsetX - x, e.offsetY - y)
-      }
-    },
-    mousemove(e) {
-      if (this.imgSrc) {
-        this.drawRect(e)
-      }
-    },
-    mousedown(e) {
-      this.$refs.myCanvas.getContext('2d').clearRect(0, 0, this.$refs.myCanvas.width, this.$refs.myCanvas.height)
-      if (this.imgSrc) {
-        this.flag = true
-        this.x = e.offsetX // 鼠标落下时的X
-        this.y = e.offsetY // 鼠标落下时的Y
-        this.CvBoxType = false
-        this.width = 0
-        this.height = 0
-      }
-    },
-    mouseup(e) {
-      // console.log(this.width, this.flag, this.imgSrc)
-      this.flag = false
-      if (this.imgSrc && this.width != 0 && this.height != 0) {
-        BookingOrderOcrGetText({
-          fileName: this.fileName,
-          x: this.x,
-          y: this.y,
-          w: this.width,
-          h: this.height,
-          scale: this.scale
-        }).then(res => {
-          this.Rdata = res.data
-          this.Bx = this.x + this.width
-          this.By = this.y + this.height
-          this.CvBoxType = true
-        })
-      }
-    },
-    beforeUpload(file) {
-      // this.$bus.$emit('WebTest001', { upFileList: file, attachCode: 'other', attachName: '其他' })
-    },
-    handleSaveCabin() {
-      const arr = []
-      const cabArr = []
-      this.cabinList.forEach((item, index) => {
-        this.selectedRowKeys.forEach(ite => {
-          if (index == ite) {
-            if (item.ctnList) {
-              arr.push(JSON.parse(JSON.stringify(item.ctnList)))
-            }
-            cabArr.push(item)
-          }
-        })
-      })
-      const arr2 = arr.reduce((a, b) => { return a.concat(b) });
-      const newArr = []
-      arr2.forEach(el => {
-        const res = newArr.findIndex(ol => {
-          return el.ctnall === ol.ctnall;
-        });
-        if (res !== -1) {
-          newArr[res].ctnnum = newArr[res].ctnnum + el.ctnnum
-        } else {
-          newArr.push(el);
-        }
-      })
-      if (!this.$route.query.id) {
-        this.$emit('handleSaveCtnListCover', newArr, cabArr)
-      } else {
-        const that = this
-        this.$confirm({
-          content: '已有记录是否覆盖',
-          onOk() {
-            that.$emit('handleSaveCtnListCover', newArr, cabArr)
-          },
-          onCancel() {
-            that.$emit('handleSaveCtnList', newArr, cabArr)
-          }
-        });
-      }
-      this.cabinSpaceFlag = false
-    },
-    handlePushBC() {
-      PushBcInfo({ id: this.$route.query.id }).then(res => {
-        if (res.success) {
-          this.$message.success('推送成功')
-        } else {
-          this.$message.error(res.message)
-        }
-      })
-    },
-    uploadFile(file) {
-      const formData = new FormData()
-      formData.append('file', file.file)
-      // formData.append('bookingId', this.id)
-      const type = file.file.type
-      let id = this.id
-      if (this.$route.query.isCopy) {
-        id = 0
-      }
-      if (!this.id) {
-        id = 0
-      }
-      BookingOrderOcrUpFile({ data: formData, parameter: { bookingId: id } }).then(res => {
-        if (res.success) {
-          this.fileName = res.data.ocrFileName
-          if (id == 0) {
-            this.$emit('ocrUpflie', res.data.uploadFileName)
-          }
-          BookingOrderOcrGetImg({ fileName: this.fileName, scale: this.scale }).then(res => {
-            this.imgSrc = window.URL.createObjectURL(new Blob([res], { type: `${type};chartset=UTF-8` }))
-          })
-        } else {
-          this.$message.error(res.message)
-        }
-      })
-    },
-    ShowOCR() {
-      if (this.OcrVisible) {
-        this.OcrOnClose()
-      } else {
-        this.OcrVisible = true
-      }
-    },
-    OcrOnClose() {
-      this.imgSrc = ''
-      this.OcrVisible = false
-      this.CvBoxType = false
-    },
-    GetPrintData(cateCode, printType) {
-      const Data = {
-        cateCode,
-        printType
-      }
-      this.spinning = true
-      BookingOrderPrintTemplateWithHistoryList(Data).then(res => {
-        this.templateType = res.data
-        this.spinning = false
-        this.PrintModalVisible = true
-      })
-    },
-    FSnhowPrintModal() {
-      this.cateCode = 'zhudan_print'
-      let printType = ''
-      if (this.printType == 4) {
-        printType = 20
-      } else {
-        printType = 10
-      }
-      this.PrintType = '1'
-      this.GetPrintData(this.cateCode, printType)
-    },
-    FnCilckTemplateType(templateId) {
-      this.$message.success(`搜索文件中...`)
-      const printType = this.PrintType == 4 ? 20 : 10
-      BookingOrderPrintOrder({
-        templateId,
-        bookingId: this.id,
-        cateCode: this.cateCode,
-        type: this.PrintType,
-        printType
-      })
-        .then(res => {
-          if (!res.success) {
-            this.$message.error(res.message)
-          } else {
-            // this.$message.success(res.data)
-            if (this.PrintType == 1) {
-              window.open(` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/ViewPrintPdf/${res.data}`, '_blank')
-            } else {
-              window.open(
-                ` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/downloadPrint?filename=${res.data}`,
-                '_blank'
-              )
-            }
-          }
-        })
-        .catch(err => {
-          console.log(err)
-        })
-    },
-
-    refreshPage() {
-      this.$emit('refresh')
-    },
-    cancelRefresh() {
-      return false
-    },
-    openModel(type) {
-      this.forwarderFlag = false
-      if (['initCabin', 'ladingBill', 'vgmlink'].includes(type)) {
-        if (!this.$route.query.id) {
-          this.$message.error('请保存主单后，进行操作')
-          return false
-        }
-      }
-      if (type == 'ladingBill') {
-        this.cateCode = 'tidan'
-        // let a = {
-        //   zhudan_print: '主单打印',
-        //   fendan_print: '分单打印',
-        //   fangcang: '放舱',
-        //   tidan: '提单'
-        // }
-      } else if (type == 'initCabin') {
-        this.cateCode = 'fangcang'
-      }
-      if (['bookingSpace', 'cutOff', 'initCabin', 'ladingBill', 'vgmlink'].includes(type)) {
-        if (type === 'bookingSpace') {
-          if (localStorage.getItem('pro__DICT_TYPE_TREE_DATA')) {
-            const data = JSON.parse(localStorage.getItem('pro__DICT_TYPE_TREE_DATA'))
-            data.value.forEach(item => {
-              if (item.code === 'EdiPipelineRelation') {
-                if (item.children[0].name == this.details.forwarder) {
-                  this.forwarderFlag = true
-                }
-              }
-            })
-          }
-        }
-        this.modelType = type
-        this.bookingModelvisible = true
-      } else if (['vgm', 'paper'].includes(type)) {
-        this.openDialog(type)
-      } else if (type === 'trace') {
-        this.traceModalVisible = true
-      }
-      if (['initCabin', 'ladingBill', 'vgmlink'].includes(type)) {
-        this.initCabinFrom = {
-          toName: '',
-          attn: '',
-          attnTel: '',
-          attnMail: '',
-          attnPhone: '',
-          fromName: '',
-          fromTel: '',
-          fromMail: '',
-          fromPhone: '',
-          orderUrl: {
-            urlTxxp: '',
-            urlVgm: '',
-            urlVgmSi: ''
-          },
-          remark: '',
-          yard: this.details.yard,
-          yardid: this.details.yardid,
-          closeDocTime: this.details.closedocdate,
-          closingTime: this.details.closingdate,
-          vgmTime: this.details.closevgmdate,
-          yardcontract: this.details.yardcontract,
-          yardcontracttel: this.details.yardcontracttel
-        }
-        this.getYardlist()
-      }
-      if (type === 'initCabin') {
-        console.log('放舱')
-        this.getLetterYard()
-        BookingOrderPrintTemplateWithHistoryList({
-          cateCode: 'fangcang',
-          printType: 10
-        }).then(res => {
-          console.log(res.data)
-          this.initCabinSendData = res.data
-        })
-      } else if (type === 'ladingBill') {
-        this.getSampleBill()
-        this.sampleBillPdf()
-      } else if (type === 'vgmlink') {
-        this.getVgmLink()
-      } else if (type === 'cabinSpace') {
-        this.cabinSpaceFlag = true
-        this.cabinList = []
-        this.getCabinList()
-      }
-    },
-    emnuHeader(type) {
-      let title = ''
-      switch (type) {
-        case 'bookingSpace':
-          title = '订舱'
-          break
-        case 'cutOff':
-          title = '截单'
-          break
-        case 'initCabin':
-          title = '放舱'
-          break
-        case 'ladingBill':
-          title = '样单'
-          break
-        case 'vgmlink':
-          title = 'vgm链接'
-          break
-      }
-      return title
-    },
-    handleModelSubmit(type) {
-      const data = {
-        'id': this.details.id,
-        'sendType': 'E'
-      }
-      this.EDISloading = true
-      CheckAndInitVOLTAEdi(data).then(res => {
-        if (res.code === 200) {
-          this.voltaForm = res.data.extra
-          this.voltaFlag = true
-          if (res.data.msg) {
-            this.$message.warning(res.data.msg)
-          }
-          if (!this.voltaForm.notifySecondAddr) {
-            this.voltaForm.notifySecondAddr = ''
-          }
-          if (!this.voltaForm.notifySecondName) {
-            this.voltaForm.notifySecondName = ''
-          }
-          this.voltaData = res.data.extra.contaList
-          this.EDISloading = false
-        } else {
-          // this.$message.error(res.message)
-          if (this.modelType === 'bookingSpace') {
-            this.bookingModelFrom.sendType = 'B'
-          } else if (this.modelType === 'cutOff') {
-            this.bookingModelFrom.sendType = 'E'
-          }
-          this.bookingModelFrom.send = type === 'send'
-          this.bookingModelFrom.orderNo = this.details.mblno
-          this.bookingModelFrom.id = this.$route.query.id
-          if (type == 'save') {
-            this.EDISloading = true
-            this.downloadBookingOrEDI(type)
-          } else {
-            this.EDIUloading = true
-            this.sendBookingOrEDI(type)
-          }
-        }
-      })
-    },
-    sendBookingOrEDI(type) {
-      SendBookingOrClosingEDI(this.bookingModelFrom)
-        .then(res => {
-          this.EDISloading = false
-          this.EDIUloading = false
-          // 未完成
-          if (res.success) {
-            this.$message.success('发送成功')
-            this.handleModelCancel()
-          } else {
-            const h = this.$createElement
-            this.$message.error({
-              content: () =>
-                h(
-                  'p',
-                  {
-                    style: {
-                      whiteSpace: 'pre-wrap'
-                    }
-                  },
-                  res.message
-                )
-            })
-            // this.$message.error(res.message)
-          }
-        })
-        .catch(() => {
-          this.EDISloading = false
-          this.EDIUloading = false
-        })
-    },
-    downloadBookingOrEDI(type) {
-      DownloadBookingOrClosingEDI(this.bookingModelFrom)
-        .then(res => {
-          this.EDISloading = false
-          this.EDIUloading = false
-          if (res.data.type === 'application/json') {
-            const reader = new FileReader()
-            reader.readAsText(res.data, 'utf-8')
-            reader.onload = () => {
-              const _res = JSON.parse(reader.result)
-              console.log(_res)
-              this.$message.error(_res.message)
-            }
-          } else {
-            var blob = new Blob([res.data], { type: 'application/octet-stream;charset=UTF-8' })
-            var contentDisposition = res.headers['content-disposition']
-            var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
-            var result = patt.exec(contentDisposition)
-            var filename = result[1]
-            var downloadElement = document.createElement('a')
-            var href = window.URL.createObjectURL(blob) // 创建下载的链接
-            var reg = /^["](.*)["]$/g
-            downloadElement.style.display = 'none'
-            downloadElement.href = href
-            downloadElement.download = decodeURI(filename.replace(reg, '$1')) // 下载后文件名
-            document.body.appendChild(downloadElement)
-            downloadElement.click() // 点击下载
-            document.body.removeChild(downloadElement) // 下载完成移除元素
-            window.URL.revokeObjectURL(href)
-          }
-        })
-        .catch(() => {
-          this.EDISloading = false
-          this.EDIUloading = false
-        })
-    },
-    handleModelCancel() {
-      this.modelType = ''
-      this.bookingModelvisible = false
-      this.EDISloading = false
-      this.EDIUloading = false
-      this.bookingModelFrom = {
-        id: this.$route.query.id,
-        orderNo: this.details.mblno,
-        useForwarderCode: false,
-        forwarderCode: '',
-        forwarderName: '',
-        fileRole: 9,
-        sendType: 'B',
-        send: false
-      }
-    },
-    openDialog(type) {
-      let content = null
-      const _this = this
-      if (type === 'vgm') {
-        content = h => <div>确认发送VGM吗?</div>
-      } else if (type === 'paper') {
-        content = h => <div>确认发送下货纸吗?</div>
-      }
-      this.$confirm({
-        title: '温馨提示',
-        content: content,
-        onOk() {
-          if (type === 'vgm') {
-            _this.vgmSend()
-          } else if (type === 'paper') {
-            _this.sendXHZ()
-          }
-        },
-        onCancel() { },
-        class: 'test'
-      })
-    },
-
-    sendXHZ() {
-      const hide = this.$message.loading('发送中..', 0)
-      SendXHZ(this.id)
-        .then(res => {
-          hide()
-          if (res.success) {
-            this.$message.success(`下货纸发送成功`)
-          } else {
-            this.$message.error(res.message)
-          }
-        })
-        .catch(err => {
-          console.log(err)
-        })
-    },
-    vgmSend() {
-      const hide = this.$message.loading('发送中..', 0)
-      VgmSend(this.id)
-        .then(res => {
-          hide()
-          if (res.success) {
-            if (res.data && res.data.length > 0) {
-              this.$notification.open({
-                message: 'VGM',
-                description: (<div>
-                  {res.data.map(item => {
-                    if (item.isSuccess) {
-                      return <div>{item.cntrno} 成功 </div>
-                    } else {
-                      return <div style={{ color: 'red' }} >{item.cntrno} 失败 {item.failReason}</div>
-                    }
-                  })}
-                </div>),
-                duration: 5
-              });
-            } else {
-              this.$message.success(`VGM发送成功`)
-            }
-          } else {
-            this.$message.error(res.message)
-          }
-        })
-        .catch(err => {
-          console.log(err)
-        })
-    },
-
-    getLetterYard() {
-      LetterYard(this.id)
-        .then(res => {
-          if (res.success) {
-            this.initCabinFrom = { ...this.initCabinFrom, ...res.data }
-          } else {
-            this.$message.error(res.message)
-          }
-        })
-        .catch(err => {
-          console.log(err)
-        })
-    },
-
-    getSampleBill() {
-      SampleBill(this.id)
-        .then(res => {
-          if (res.success) {
-            this.initCabinFrom = res.data
-          } else {
-            this.$message.error(res.message)
-          }
-        })
-        .catch(err => {
-          console.log(err)
-        })
-    },
-
-    getVgmLink() {
-      LetterYard(this.id)
-        .then(res => {
-          if (res.success) {
-            this.initCabinFrom = { ...this.initCabinFrom, ...res.data }
-            // VgmLink(this.id)
-            // .then(oRes => {
-            //   if (oRes.success) {
-            //   } else {
-            //     this.$message.error(oRes.message)
-            //   }
-            // })
-            // .catch(oErr => {
-            //   console.log(oErr)
-            // })
-          } else {
-            this.$message.error(res.message)
-          }
-        })
-        .catch(err => {
-          console.log(err)
-        })
-    },
-
-    sampleBillPdf() {
-      SampleBillPdf(this.id)
-        .then(res => {
-          if (res.success) {
-            this.hsaBillPdf = true
-            this.billPdf = res.data.description
-          } else {
-            this.hsaBillPdf = false
-            this.billPdfTip = res.message
-          }
-        })
-        .catch(err => {
-          console.log(err)
-        })
-    },
-
-    copyFun(data) {
-      const copyInput = document.createElement('input')
-      document.body.appendChild(copyInput)
-      copyInput.setAttribute('value', data)
-      copyInput.select()
-      document.execCommand('Copy', false, null)
-      this.$message.success('复制成功')
-      copyInput.remove()
-    },
-
-    openTab(type) {
-      this.$emit('openTab', { type: type })
-    },
-
-    saveFun() {
-      console.log(this.saveFlag)
-      if (!this.saveFlag) {
-        this.$emit('save')
-      }
-    },
-    bookingCheckChange(e) {
-      this.bookingModelFrom.useForwarderCode = e.target.checked
-    },
-
-    saveModel() {
-      this.SaveLoading = true
-      if (this.modelType === 'initCabin') {
-        this.saveBookingLetteryard()
-      } else if (this.modelType === 'vgmlink') {
-        console.log('暂无接口')
-      } else {
-        this.saveBookingSampleBill()
-      }
-    },
-
-    sendModel() {
-      this.SendLoading = true
-      console.log(this.modelType)
-      if (this.modelType === 'initCabin') {
-        if (this.initCabinFrom.templateId) {
-          this.sendLetterYard()
-        } else {
-          this.$message.error('请选择打印格式')
-          this.SendLoading = false
-        }
-      } else if (this.modelType === 'vgmlink') {
-        console.log('暂无接口')
-      } else {
-        console.log('暂无接口')
-      }
-    },
-
-    removeModel() {
-      if (this.modelType === 'initCabin') {
-        this.DelLoading = true
-        DeleteLetterYard(this.id)
-          .then(res => {
-            if (res.success) {
-              this.$message.success('删除成功')
-              this.handleModelCancel()
-            } else {
-              this.$message.error(res.message)
-            }
-            this.DelLoading = false
-          })
-          .catch(() => {
-            this.DelLoading = false
-          })
-      } else if (this.modelType === 'vgmlink') {
-        console.log('暂无接口')
-      }
-    },
-
-    saveBookingLetteryard() {
-      SaveBookingLetteryard(this.initCabinFrom)
-        .then(res => {
-          if (res.success) {
-            this.$message.success('保存成功')
-            // this.initCabinFrom = res.data
-          } else {
-            this.$message.error(res.message)
-          }
-          this.getLetterYard()
-          this.SaveLoading = false
-        })
-        .catch(() => {
-          this.SaveLoading = false
-        })
-    },
-
-    saveBookingSampleBill() {
-      SaveBookingSampleBill(this.initCabinFrom)
-        .then(res => {
-          if (res.success) {
-            this.initCabinFrom.id = res.data
-            this.$message.success('保存成功')
-          } else {
-            this.$message.error(res.message)
-          }
-          this.SaveLoading = false
-        })
-        .catch(() => {
-          this.SaveLoading = false
-        })
-    },
-
-    sendLetterYard() {
-      // initCabinFrom.templateId
-      SendLetterYard({ bookingId: this.id, templateId: this.initCabinFrom.templateId })
-        .then(res => {
-          if (res.success) {
-            this.$message.success('发送成功')
-          } else {
-            this.$message.error(res.message)
-          }
-          this.SendLoading = false
-        })
-        .catch(() => {
-          this.SendLoading = false
-        })
-    },
-
-    TxxpLink() {
-      TxxpLink(this.id)
-        .then(res => {
-          if (res.success) {
-            this.copyFun(res.data)
-          } else {
-            this.$message.error(res.message)
-          }
-        })
-        .catch(err => {
-          console.log(err)
-        })
-    },
-
-    checkFun() {
-      this.$message.loading({ content: '校验中...' })
-      ExcuteRulesOceanBooking(this.id)
-        .then(res => {
-          if (res.success) {
-            this.$message.destroy()
-            if (!res.data.succ) {
-              this.$message.error(res.data.msg)
-            } else {
-              this.$message.success({ content: '校验完成' })
-            }
-            this.$emit('rules', {
-              rows: res.data.rows,
-              type: res.data.succ ? 'success' : 'fail'
-            })
-          } else {
-            this.$message.error(res.message)
-          }
-        })
-        .catch(() => {
-          this.$message.destroy()
-          this.$message.success({ content: '校验失败' })
-        })
-    },
-
-    changePage(type) {
-      // if (this.inChildLoading) {
-      //   this.$message.error('加载中，请稍后')
-      //   return false
-      // }
-      if (!this.$route.query.id) {
-        this.$message.error('请先保存订单')
-        return false
-      }
-      if (this.changeFlag) {
-        this.$emit('changePage', type)
-        this.changeFlag = false
-        setTimeout(() => {
-          this.changeFlag = true
-        }, 4000)
-      }
-    },
-    copyBooking() {
-      this.$emit('copy')
-    },
-    addChild() {
-      if (process.env.VUE_APP_TYPE === 'hechuan') {
-        if (!this.details.hblno) {
-          this.$message.error('请输入分提单号')
-        } else {
-          this.$emit('addSedList')
-        }
-      } else {
-        this.$emit('addSedList')
-      }
-    },
-    downLoadFile(type, type2) {
-      if (!this.id || !this.initCabinFrom.id) {
-        this.$message.error('请先保存数据')
-        return false
-      }
-      let printType = ''
-      if (this.PrintType == 4) {
-        printType = 20
-      } else {
-        printType = 10
-      }
-      this.PrintType = '1'
-      this.GetPrintData(this.cateCode, printType)
-    },
-    onTraceChange(values) {
-      console.log(this.traceValue)
-    },
-    traceSend() {
-      if (!this.traceValue) {
-        this.$message.error('请选择订阅内容')
-        return false
-      }
-      if (this.traceValue.includes('1') && (!this.details.yard || !this.details.yardid)) {
-        this.$message.error('请选择场站')
-        return false
-      }
-      if (this.traceValue.includes('2') && (!this.details.carrierid || !this.details.carrier)) {
-        this.$message.error('请选择船公司')
-        return false
-      }
-      const query = {
-        businessId: this.$route.query.id,
-        mblno: this.details.mblno,
-        yard: this.traceValue.includes('1') ? this.details.yard : '',
-        yardCode: this.traceValue.includes('1') ? this.details.yardid : '',
-        carrierid: this.traceValue.includes('2') ? this.details.carrierid : '',
-        carrier: this.traceValue.includes('2') ? this.details.carrier : '',
-        isBook: !!this.traceValue.includes('2')
-      }
-      SendTrace([query])
-        .then(res => {
-          if (res.success) {
-            const tip = `订阅成功`
-            this.$message.success(tip)
-            this.traceModalVisible = false
-            this.traceValue = []
-          } else {
-            this.$message.success(res.message)
-            this.traceModalVisible = false
-            this.traceValue = []
-          }
-        })
-        .catch(err => {
-          console.log(err)
-        })
-    },
-    getYardlist(name = '') {
-      GetYardlist({
-        keyword: name
-      })
-        .then(res => {
-          if (res.code === 200) {
-            this.yardData = res.data
-            const arr = []
-            res.data.map((item, index) => {
-              arr.push({
-                ...{ selectShowTab: item.name + ' / ' + item.code },
-                ...item
-              })
-            })
-            this.yardSelectData = arr
-            this.$forceUpdate()
-          }
-        })
-        .catch(err => {
-          console.log(err)
-        })
-    },
-    yardSelect(value) {
-      this.details.yard = value
-      const index = this.yardDataArr.indexOf(value)
-      this.details.yardid = this.yardData[index].code
-    },
-    yardChange(value) {
-      // this.getYardlist(value)
-    },
-    handleYardChange(index) {
-      this.initCabinFrom.yard = this.yardSelectData[index].name
-      this.initCabinFrom.yardid = this.yardSelectData[index].code
-    },
-    filterOption(input, option) {
-      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-    },
-    closingdateChange(date, dateString) {
-      this.initCabinFrom.closingTime = dateString
-    },
-    closevgmdateChange(date, dateString) {
-      this.initCabinFrom.vgmTime = dateString
-    },
-    closedocdateChange(date, dateString) {
-      this.initCabinFrom.closeDocTime = dateString
-    },
-    removeOrder() {
-      this.$emit('removeOrder')
-    },
-    cancelRemove() {
-      console.log('== 取消删除 ==')
-    },
-    openPreOrderFun() {
-      if (!this.id) {
-        this.$message.error('请先保存主单')
-        return false
-      }
-      this.$refs.preOrder.init()
-    },
-    closeOpenPreOrder() {
-      this.$refs.preOrder.close()
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-@import url('../style/operationArea.less');
-
-.voltaForm {
-  /deep/ .ant-form-item {
-    margin-bottom: 4px;
-  }
-
-  .bottom {
-    display: flex;
-
-    textarea {
-      line-height: 22px;
-    }
-
-    .line-count {
-      width: 24px;
-      padding-top: 3px;
-      height: 100%;
-      overflow: auto;
-
-      &::-webkit-scrollbar {
-        display: none;
-      }
-
-      // max-height: 192px;
-      // overflow-y: auto;
-      div {
-        text-align: right;
-        height: 22px;
-        line-height: 22px;
-        font-size: 12px;
-        color: #999;
-      }
-    }
-  }
-
-}
-
-.tear-list {
-  display: flex;
-  flex-wrap: wrap;
-  margin: 15px 0;
-
-  .item {
-    margin-right: 20px;
-    margin-bottom: 10px;
-    display: flex;
-    align-items: flex-start;
-
-    .item-left {
-      background: #f59a23;
-      color: white;
-      text-align: center;
-      height: 31px;
-      line-height: 31px;
-      display: inline-block;
-      padding: 0 5px;
-    }
-  }
-}
-
-/deep/ .ant-input-number-handler-wrap {
-  opacity: 1;
-}
-</style>
diff --git a/src/views/system/org/BankModal.vue b/src/views/system/org/BankModal.vue
new file mode 100644
index 00000000..3ef36b92
--- /dev/null
+++ b/src/views/system/org/BankModal.vue
@@ -0,0 +1,124 @@
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    :use-wrapper="true"
+    :title="getTitle"
+    width="50%"
+    @register="registerModal"
+    @ok="handleSave"
+  >
+    <BasicForm @register="registerForm" />
+
+    <!--右下角按钮-->
+    <template #footer>
+      <a-button
+        pre-icon="ant-design:close-outlined"
+        type="warning"
+        :loading="loading"
+        ghost
+        style="margin-right: 0.8rem"
+        @click="closeModal"
+        >取消</a-button
+      >
+      <a-button
+        type="success"
+        :loading="loading"
+        pre-icon="ant-design:check-outlined"
+        style="margin-right: 0.8rem"
+        @click="handleSave(false)"
+        >仅保存</a-button
+      >
+      <a-button
+        pre-icon="ant-design:check-circle-outlined"
+        type="primary"
+        :loading="loading"
+        @click="handleSave(true)"
+        >保存并关闭</a-button
+      >
+    </template>
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { ref, computed, unref } from 'vue'
+  import { BasicModal, useModalInner } from '/@/components/Modal'
+  import { BasicForm, useForm } from '/@/components/Form/index'
+  import { BankformSchema } from './columns'
+
+  import { editBank, getBankInfo } from '/@/api/system/org'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  // 声明Emits
+  const emit = defineEmits(['success', 'register'])
+  const isUpdate = ref(true)
+  const loading = ref(false)
+  const rowId = ref('')
+  const linkId = ref('')
+  const { createMessage } = useMessage()
+  const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
+    labelWidth: 100,
+    schemas: BankformSchema,
+    showActionButtonGroup: false,
+  })
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    resetFields()
+    console.log(data, 1111111111)
+
+    // initData().then(async () => {
+    setModalProps({ confirmLoading: false, loading: true })
+    isUpdate.value = !!data?.isUpdate
+    linkId.value = data.linkId ? data.linkId : ''
+    if (unref(isUpdate)) {
+      rowId.value = data.record.id ? data.record.id : data.record.value
+      const res: API.DataResult = await getBankInfo({ id: unref(rowId) })
+      if (res.succeeded) {
+        setFieldsValue({
+          ...res.data,
+        })
+      }
+    } else {
+      setFieldsValue({ permissionIdentity: unref(2) })
+    }
+    setModalProps({ loading: false })
+    // })
+  })
+  const getTitle = computed(() => (!unref(isUpdate) ? '新增账户信息' : '编辑账户信息'))
+
+  async function handleSave(exit) {
+    try {
+      const values = await validate()
+      setModalProps({ confirmLoading: true, loading: true })
+      values.linkId = values.linkId ? values.linkId : linkId.value
+      const res: API.DataResult = await editBank(values)
+
+      if (res.succeeded) {
+        createMessage.success(res.message)
+        emit('success')
+        //刷新页面
+        if (!exit) {
+          if (unref(isUpdate)) {
+            await refresh()
+          } else {
+            rowId.value = res.data
+            isUpdate.value = true
+            await refresh()
+          }
+        }
+      } else {
+        createMessage.error(res.message)
+      }
+
+      exit && closeModal()
+    } finally {
+      // loading.value = false;
+      setModalProps({ confirmLoading: false, loading: false })
+    }
+  }
+  async function refresh() {
+    const res: API.DataResult = await getBankInfo({ id: unref(rowId) })
+    if (res.succeeded) {
+      await setFieldsValue({
+        ...res.data,
+      })
+    }
+  }
+</script>
diff --git a/src/views/system/org/OrgModal.vue b/src/views/system/org/OrgModal.vue
index ab53fa9d..4d23f100 100644
--- a/src/views/system/org/OrgModal.vue
+++ b/src/views/system/org/OrgModal.vue
@@ -3,11 +3,36 @@
     v-bind="$attrs"
     :use-wrapper="true"
     :title="getTitle"
-    width="30%"
+    width="60%"
     @register="registerModal"
     @ok="handleSave"
   >
-    <BasicForm @register="registerForm" />
+    <a-tabs v-model:activeKey="activeKey" tab-position="left">
+      <a-tab-pane key="0" tab="机构信息">
+        <BasicForm @register="registerForm" />
+      </a-tab-pane>
+      <a-tab-pane key="1" tab="账户信息" force-render>
+        <BasicTable @register="registerBankTable">
+          <template #toolbar>
+            <a-button type="primary" @click="AddBank"> 新增 </a-button>
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'action'">
+              <TableAction
+                :actions="[
+                  {
+                    icon: 'clarity:note-edit-line',
+                    tooltip: '编辑',
+                    onClick: EditBank.bind(null, record),
+                  },
+                ]"
+              />
+            </template>
+          </template>
+        </BasicTable>
+      </a-tab-pane>
+    </a-tabs>
+    <BankModal @register="registerBankModal" @success="handleSuccess" />
     <!--右下角按钮-->
     <template #footer>
       <a-button
@@ -39,11 +64,12 @@
 </template>
 <script lang="ts" setup>
   import { ref, computed, unref, h } from 'vue'
-  import { BasicModal, useModalInner } from '/@/components/Modal'
+  import { BasicModal, useModalInner, useModal } from '/@/components/Modal'
   import { BasicForm, useForm } from '/@/components/Form/index'
-  import { formSchema } from './columns'
-
-  import { editOrg, getOrgInfo, getOrgTree } from '/@/api/system/org'
+  import { BasicTable, useTable, TableAction } from '/@/components/Table'
+  import { formSchema, BankColumns } from './columns'
+  import BankModal from './BankModal.vue'
+  import { editOrg, getOrgInfo, getOrgTree, getBankList } from '/@/api/system/org'
   import { useUserStore } from '/@/store/modules/user'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { propTypes } from '/@/utils/propTypes'
@@ -56,33 +82,31 @@
   const loading = ref(false)
   const rowId = ref('')
   const treeData = ref([])
+  const activeKey = ref('0')
+  const linkId = ref()
   const { createMessage } = useMessage()
-  const [
-    registerForm,
-    { reload, resetFields, setFieldsValue, validate, updateSchema, getFieldsValue },
-  ] = useForm({
+  const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
     labelWidth: 100,
     schemas: formSchema,
     showActionButtonGroup: false,
   })
 
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    activeKey.value = '0'
     resetFields()
     initData().then(async () => {
       setModalProps({ confirmLoading: false, loading: true })
       isUpdate.value = !!data?.isUpdate
       if (unref(isUpdate)) {
-        // setModalProps({ confirmLoading: true });
         rowId.value = data.record.id ? data.record.id : data.record.value
         const res: API.DataResult = await getOrgInfo({ id: unref(rowId) })
         if (res.succeeded) {
+          linkId.value = res.data.id
           setFieldsValue({
             ...res.data,
           })
-          // console.log('返回数据Form', getFieldsValue());
-          // setFieldsValue({ trainId: unref(res.data.trainId) });
+          reload()
         }
-        // setModalProps({ confirmLoading: false });
       } else {
         setFieldsValue({ permissionIdentity: unref(2) })
       }
@@ -93,12 +117,6 @@
       } else {
         updateSchema({ field: 'isDepartment', componentProps: { disabled: false } })
       }
-
-      // if (!props.ParentId) {
-      //   updateSchema({ field: 'parentId', show: false })
-      // } else {
-      //   updateSchema({ field: 'parentId', show: false })
-      // }
     })
   })
   async function initData() {
@@ -175,4 +193,63 @@
       })
     }
   }
+  const [registerBankTable, { reload, getPaginationRef }] = useTable({
+    title: '账户信息',
+    immediate: false,
+    api: async (p) => {
+      const res: API.DataResult = await getBankList(p)
+      return new Promise((resolve) => {
+        resolve({ data: [...res.data], total: res.count })
+      })
+    },
+    beforeFetch: () => {
+      var currentPageInfo: any = getPaginationRef()
+      const postParam: API.PageRequest = {
+        queryCondition: '',
+        pageCondition: {
+          pageIndex: currentPageInfo.current,
+          pageSize: currentPageInfo.pageSize,
+          sortConditions: [],
+        },
+      }
+      let condition: API.ConditionItem[] = []
+      condition.push({
+        FieldName: 'linkId',
+        FieldValue: linkId.value,
+        ConditionalType: 1,
+      })
+      postParam.queryCondition = JSON.stringify(condition)
+
+      return postParam
+    },
+    pagination: true,
+    canResize: true,
+    resizeHeightOffset: 330,
+    actionColumn: {
+      width: 80,
+      title: '操作',
+      dataIndex: 'action',
+      fixed: 'right',
+    },
+    columns: BankColumns,
+  })
+  const [registerBankModal, { openModal }] = useModal()
+  function AddBank() {
+    openModal(true, {
+      isParent: false,
+      isUpdate: false,
+      linkId: linkId.value,
+    })
+  }
+  function EditBank(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+    })
+  }
+  function handleSuccess() {
+    // ParentId.value = 0
+    initData()
+    reload()
+  }
 </script>
diff --git a/src/views/system/org/columns.tsx b/src/views/system/org/columns.tsx
index 4bb302a9..d99ea618 100644
--- a/src/views/system/org/columns.tsx
+++ b/src/views/system/org/columns.tsx
@@ -6,6 +6,16 @@ export const columns: BasicColumn[] = [
     dataIndex: 'orgName',
     width: 200,
   },
+  {
+    title: '机构全称',
+    dataIndex: 'orgFullName',
+    width: 200,
+  },
+  {
+    title: '机构英文名称',
+    dataIndex: 'orgEnName',
+    width: 200,
+  },
   {
     title: '负责人',
     dataIndex: 'leader',
@@ -16,6 +26,76 @@ export const columns: BasicColumn[] = [
     dataIndex: 'tel',
     width: 150,
   },
+  {
+    title: '地址',
+    dataIndex: 'address',
+    width: 150,
+  },
+  {
+    title: '英文地址',
+    dataIndex: 'enAddress',
+    width: 150,
+  },
+  {
+    title: '邮政编码',
+    dataIndex: 'postCode',
+    width: 150,
+  },
+  {
+    title: '办公电话',
+    dataIndex: 'officePhone',
+    width: 150,
+  },
+  {
+    title: '传真',
+    dataIndex: 'fax',
+    width: 150,
+  },
+  {
+    title: '电子邮箱',
+    dataIndex: 'email',
+    width: 150,
+  },
+  {
+    title: '公司网址',
+    dataIndex: 'webSiteUrl',
+    width: 150,
+  },
+  {
+    title: '工商登记号',
+    dataIndex: 'licenseCode',
+    width: 150,
+  },
+  {
+    title: '税务登记号',
+    dataIndex: 'taxCode',
+    width: 150,
+  },
+  {
+    title: '票号头字符',
+    dataIndex: 'banksHead',
+    width: 150,
+  },
+  {
+    title: '本地货币',
+    dataIndex: 'localCurrency',
+    width: 150,
+  },
+  {
+    title: '发票抬头',
+    dataIndex: 'invoiceTitle',
+    width: 150,
+  },
+  {
+    title: '支票抬头',
+    dataIndex: 'chequeTitle',
+    width: 150,
+  },
+  {
+    title: '财务软件代码',
+    dataIndex: 'financeSoftCode',
+    width: 150,
+  },
   {
     title: '排序',
     dataIndex: 'orderNo',
@@ -54,7 +134,25 @@ export const searchFormSchema: FormSchema[] = [
     field: 'OrgName',
     label: '机构名称',
     component: 'Input',
-    colProps: { span: 6 },
+    colProps: { span: 4 },
+  },
+  {
+    field: 'orgEnName',
+    label: '机构英文名称',
+    component: 'Input',
+    colProps: { span: 4 },
+  },
+  {
+    field: 'tel',
+    label: '电话',
+    component: 'Input',
+    colProps: { span: 4 },
+  },
+  {
+    field: 'address',
+    label: '地址',
+    component: 'Input',
+    colProps: { span: 4 },
   },
 ]
 export const formSchema: FormSchema[] = [
@@ -97,7 +195,7 @@ export const formSchema: FormSchema[] = [
       replaceFields: { children: 'children', title: 'value', key: 'value', value: 'value' },
     },
     colProps: {
-      span: 20,
+      span: 6,
     },
     show: ({ values }) => {
       return !!values.id
@@ -109,7 +207,25 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 20,
+      span: 6,
+    },
+  },
+  {
+    label: '机构全称',
+    field: 'orgFullName',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    label: '机构英文名称',
+    field: 'orgEnName',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
     },
   },
   {
@@ -118,7 +234,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 20,
+      span: 6,
     },
   },
   {
@@ -127,7 +243,133 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 20,
+      span: 6,
+    },
+  },
+  {
+    label: '地址',
+    field: 'address',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    label: '英文地址',
+    field: 'enAddress',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    label: '邮政编码',
+    field: 'postCode',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    label: '办公电话',
+    field: 'officePhone',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    label: '传真',
+    field: 'fax',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    label: '电子邮箱',
+    field: 'email',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    label: '公司网址',
+    field: 'webSiteUrl',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    label: '工商登记号',
+    field: 'licenseCode',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    label: '税务登记号',
+    field: 'taxCode',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    label: '票号头字符',
+    field: 'banksHead',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    label: '本地货币',
+    field: 'localCurrency',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    label: '发票抬头',
+    field: 'invoiceTitle',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    label: '支票抬头',
+    field: 'chequeTitle',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    label: '财务软件代码',
+    field: 'financeSoftCode',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 6,
     },
   },
   {
@@ -136,7 +378,7 @@ export const formSchema: FormSchema[] = [
     component: 'InputNumber',
     defaultValue: '',
     colProps: {
-      span: 20,
+      span: 6,
     },
   },
   {
@@ -152,7 +394,7 @@ export const formSchema: FormSchema[] = [
     },
     defaultValue: false,
     colProps: {
-      span: 20,
+      span: 6,
     },
   },
   {
@@ -168,156 +410,233 @@ export const formSchema: FormSchema[] = [
     },
     defaultValue: 0,
     colProps: {
-      span: 20,
+      span: 6,
+    },
+  },
+]
+
+export const BankColumns: BasicColumn[] = [
+  {
+    title: '代码',
+    dataIndex: 'codeName',
+    width: 230,
+    align: 'left',
+  },
+  {
+    title: '币别',
+    dataIndex: 'currency',
+    width: 230,
+    align: 'left',
+  },
+  {
+    title: '银行名称',
+    dataIndex: 'bankName',
+    width: 230,
+    align: 'left',
+  },
+  {
+    title: '银行名称2',
+    dataIndex: 'bankName2',
+    width: 230,
+    align: 'left',
+  },
+  {
+    title: '银行账户',
+    dataIndex: 'bankAccountNo',
+    width: 230,
+    align: 'left',
+  },
+  {
+    title: '户头名称',
+    dataIndex: 'accountName',
+    width: 230,
+    align: 'left',
+  },
+  {
+    title: '科目代码',
+    dataIndex: 'subjectCode',
+    width: 230,
+    align: 'left',
+  },
+  {
+    title: '财务软件代码',
+    dataIndex: 'financeSoftCode',
+    width: 230,
+    align: 'left',
+  },
+  {
+    title: '是否默认',
+    dataIndex: 'isDefault',
+    width: 100,
+    customRender: ({ text }) => {
+      if (text === true) {
+        return <Tag color="success">是</Tag>
+      } else if (text === false) {
+        return <Tag color="red">否</Tag>
+      }
+      return text
+    },
+  },
+  {
+    title: '排序',
+    dataIndex: 'orderNo',
+    width: 100,
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    width: 100,
+    customRender: ({ text }) => {
+      if (text === 0) {
+        return <Tag color="success">启用</Tag>
+      } else if (text === 1) {
+        return <Tag color="red">禁用</Tag>
+      }
+      return text
+    },
+  },
+  {
+    title: '备注',
+    dataIndex: 'note',
+    width: 100,
+  },
+]
+export const BankformSchema: FormSchema[] = [
+  {
+    field: 'divider-selects',
+    component: 'Divider',
+    label: '账户信息',
+    colProps: {
+      span: 24,
+    },
+  },
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    defaultValue: '',
+    show: false,
+  },
+  {
+    label: '',
+    field: 'linkId',
+    component: 'Input',
+    defaultValue: '',
+    show: false,
+  },
+  {
+    label: '代码',
+    field: 'codeName',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 12,
+    },
+  },
+  {
+    label: '币别',
+    field: 'currency',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 12,
+    },
+  },
+  {
+    label: '银行名称',
+    field: 'bankName',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 12,
+    },
+  },
+  {
+    label: '银行名称2',
+    field: 'bankName2',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 12,
+    },
+  },
+  {
+    label: '银行账户',
+    field: 'bankAccountNo',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 12,
+    },
+  },
+  {
+    label: '户头名称',
+    field: 'accountName',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 12,
+    },
+  },
+  {
+    label: '科目代码',
+    field: 'subjectCode',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 12,
+    },
+  },
+  {
+    label: '财务软件代码',
+    field: 'financeSoftCode',
+    component: 'Input',
+    defaultValue: '',
+    colProps: {
+      span: 12,
+    },
+  },
+  {
+    label: '排序',
+    field: 'orderNo',
+    component: 'InputNumber',
+    defaultValue: '',
+    colProps: {
+      span: 12,
+    },
+  },
+  {
+    field: 'isDefault',
+    component: 'RadioButtonGroup',
+    label: '是否默认',
+    required: true,
+    componentProps: {
+      options: [
+        // { label: '是', value: 1 },
+        // { label: '否', value: 0 },
+        { label: '是', value: true },
+        { label: '否', value: false },
+      ],
+    },
+    defaultValue: true,
+    colProps: {
+      span: 6,
+    },
+  },
+  {
+    field: 'status',
+    component: 'RadioButtonGroup',
+    label: '状态',
+    required: true,
+    componentProps: {
+      options: [
+        { label: '启用', value: 0 },
+        { label: '禁用', value: 1 },
+      ],
+    },
+    defaultValue: 0,
+    colProps: {
+      span: 6,
     },
   },
-  // {
-  //   field: 'userCode',
-  //   label: '机构唯一码',
-  //   component: 'Input',
-  //   required: true,
-  //   colProps: { span: 12 },
-  //   dynamicDisabled: ({ values }) => {
-  //     return !!values.id
-  //   },
-  // },
-  // {
-  //   field: 'sex',
-  //   component: 'RadioButtonGroup',
-  //   label: '性别',
-  //   required: true,
-  //   componentProps: {
-  //     options: [
-  //       { label: '男', value: 1 },
-  //       { label: '女', value: 2 },
-  //     ],
-  //   },
-  //   defaultValue: 1,
-  //   colProps: {
-  //     span: 8,
-  //   },
-  // },
-  // {
-  //   field: 'userName',
-  //   label: '机构名称',
-  //   component: 'Input',
-  //   required: true,
-  //   colProps: { span: 12 },
-  // },
-  // {
-  //   field: 'userType',
-  //   label: '机构类型',
-  //   component: 'RadioButtonGroup',
-  //   required: true,
-  //   colProps: {
-  //     span: 24
-  //   },
-  //   defaultValue: 2,
-  //   componentProps: {
-  //     options: [
-  //       // { label: '超级管理员', value: 0, disabled: true },
-  //       { label: '管理员', value: 1 },
-  //       { label: '普通机构', value: 2 },
-  //     ],
-  //   },
-  // },
-  // {
-  //   field: 'pinYinCode',
-  //   label: '助记码',
-  //   component: 'Input',
-  //   colProps: { span: 12 },
-  //   dynamicDisabled: () => {
-  //     return true
-  //   },
-  // },
-  // {
-  //   field: 'password',
-  //   label: '密码',
-  //   component: 'Input',
-  //   colProps: { span: 12 },
-  //   defaultValue: '0000',
-  //   // dynamicDisabled: () => {
-  //   //   return true
-  //   // },
-  //   itemProps: {
-  //     extra: '请设置复杂密码!',
-  //   },
-  // },
-  // {
-  //   field: 'birthday',
-  //   label: '出生日期',
-  //   component: 'DatePicker',
-  //   // required: true,
-  //   colProps: {
-  //     span: 24
-  //   },
-  //   componentProps: {},
-  // },
-  // {
-  //   field: 'nickName',
-  //   label: '机构昵称',
-  //   component: 'Input',
-  //   required: true,
-  //   colProps: { span: 12 },
-  // },
-  // {
-  //   field: 'phone',
-  //   label: '手机号',
-  //   component: 'Input',
-  //   colProps: { span: 12 },
-  // },
-  // {
-  //   field: 'email',
-  //   label: '邮箱',
-  //   component: 'Input',
-  //   colProps: { span: 12 },
-  // },
-  // {
-  //   field: 'duty',
-  //   label: '职位',
-  //   component: 'Input',
-  //   colProps: { span: 12 },
-  // },
-  // {
-  //   field: 'note',
-  //   label: '备注',
-  //   component: 'InputTextArea',
-  //   colProps: { span: 24 },
-  //   // ifShow: ({ values }) => !isButton(values.menuType),
-  // },
-  // {
-  //   field: 'divider-selects',
-  //   component: 'Divider',
-  //   label: '附属信息',
-  //   componentProps: {},
-  //   colProps: {
-  //     span: 24,
-  //   },
-  // },
-  // {
-  //   field: 'roleIds',
-  //   label: '所属角色',
-  //   component: 'ApiSelect',
-  //   // required: true,
-  //   defaultValue: [],
-  //   colProps: { span: 12 },
-  //   componentProps: {
-  //     // mode: 'multiple',
-  //     api: getRoleList,
-  //     resultField: 'data',
-  //   },
-  // },
-  // {
-  //   field: 'orgIds',
-  //   label: '所属机构',
-  //   component: 'ApiSelect',
-  //   // required: true,
-  //   defaultValue: [],
-  //   colProps: { span: 12 },
-  //   componentProps: {
-  //     mode: 'multiple',
-  //     api: getOrgList,
-  //     resultField: 'data',
-  //   },
-  // },
 ]
diff --git a/src/views/system/org/index.vue b/src/views/system/org/index.vue
index 2ea41d08..c7badf6b 100644
--- a/src/views/system/org/index.vue
+++ b/src/views/system/org/index.vue
@@ -63,11 +63,11 @@
     // api: getSysDictTypeList,
     api: async (p) => {
       const res: API.DataResult = await getOrgList(p)
-
       return new Promise((resolve) => {
         resolve({ data: [...res.data], total: res.count })
       })
     },
+    resizeHeightOffset: 50,
     beforeFetch: () => {
       var currentPageInfo: any = getPaginationRef()
       var data = getForm().getFieldsValue()
@@ -92,6 +92,27 @@
           ConditionalType: 1,
         })
       }
+      if (!!data.orgEnName) {
+        condition.push({
+          FieldName: 'orgEnName',
+          FieldValue: data.orgEnName,
+          ConditionalType: 1,
+        })
+      }
+      if (!!data.tel) {
+        condition.push({
+          FieldName: 'tel',
+          FieldValue: data.tel,
+          ConditionalType: 1,
+        })
+      }
+      if (!!data.address) {
+        condition.push({
+          FieldName: 'address',
+          FieldValue: data.address,
+          ConditionalType: 1,
+        })
+      }
       postParam.queryCondition = JSON.stringify(condition)
 
       return postParam
@@ -111,7 +132,7 @@
     indexColumnProps: {
       fixed: 'left',
     },
-    canResize: false,
+    canResize: true,
     actionColumn: {
       width: 80,
       title: '操作',
diff --git a/src/views/system/user/UserModal.vue b/src/views/system/user/UserModal.vue
index 615dd976..0ab75522 100644
--- a/src/views/system/user/UserModal.vue
+++ b/src/views/system/user/UserModal.vue
@@ -3,7 +3,7 @@
     v-bind="$attrs"
     :use-wrapper="true"
     :title="getTitle"
-    width="50%"
+    width="60%"
     @register="registerModal"
     @ok="handleSave"
   >
diff --git a/src/views/system/user/columns.tsx b/src/views/system/user/columns.tsx
index 3a168f98..669845f0 100644
--- a/src/views/system/user/columns.tsx
+++ b/src/views/system/user/columns.tsx
@@ -57,10 +57,30 @@ export const columns: BasicColumn[] = [
     },
   },
   {
-    title: '手机',
+    title: '手机号',
     dataIndex: 'phone',
     width: 200,
   },
+  {
+    title: '电话',
+    dataIndex: 'tel',
+    width: 200,
+  },
+  {
+    title: '办公电话',
+    dataIndex: 'officePhone',
+    width: 200,
+  },
+  {
+    title: '传真',
+    dataIndex: 'fax',
+    width: 200,
+  },
+  {
+    title: '财务软件代码',
+    dataIndex: 'financeSoftCode',
+    width: 200,
+  },
   {
     title: '创建时间',
     dataIndex: 'createTime',
@@ -115,11 +135,18 @@ export const formSchema: FormSchema[] = [
     label: '用户唯一码',
     component: 'Input',
     required: true,
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     dynamicDisabled: ({ values }) => {
       return !!values.id
     },
   },
+  {
+    field: 'userName',
+    label: '用户名称',
+    component: 'Input',
+    required: true,
+    colProps: { span: 6 },
+  },
   {
     field: 'sex',
     component: 'RadioButtonGroup',
@@ -133,23 +160,16 @@ export const formSchema: FormSchema[] = [
     },
     defaultValue: 1,
     colProps: {
-      span: 8,
+      span: 6,
     },
   },
-  {
-    field: 'userName',
-    label: '用户名称',
-    component: 'Input',
-    required: true,
-    colProps: { span: 12 },
-  },
   {
     field: 'userType',
     label: '用户类型',
     component: 'RadioButtonGroup',
     required: true,
     colProps: {
-      span: 12,
+      span: 6,
     },
     defaultValue: 2,
     componentProps: {
@@ -164,7 +184,7 @@ export const formSchema: FormSchema[] = [
     field: 'pinYinCode',
     label: '助记码',
     component: 'Input',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     dynamicDisabled: () => {
       return true
     },
@@ -173,7 +193,7 @@ export const formSchema: FormSchema[] = [
     field: 'password',
     label: '密码',
     component: 'Input',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     defaultValue: '',
     required: true,
     // dynamicDisabled: () => {
@@ -188,7 +208,7 @@ export const formSchema: FormSchema[] = [
     label: '出生日期',
     component: 'DatePicker',
     colProps: {
-      span: 12,
+      span: 6,
     },
     componentProps: {
       style: {
@@ -201,26 +221,50 @@ export const formSchema: FormSchema[] = [
     label: '用户昵称',
     component: 'Input',
     required: true,
-    colProps: { span: 12 },
+    colProps: { span: 6 },
   },
   {
     field: 'phone',
     label: '手机号',
     component: 'Input',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
   },
   {
     field: 'email',
     label: '邮箱',
     component: 'Input',
     rules: [{ type: 'email', message: t('请填写正确的邮箱地址') }],
-    colProps: { span: 12 },
+    colProps: { span: 6 },
+  },
+  {
+    field: 'tel',
+    label: '电话',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    field: 'officePhone',
+    label: '办公电话',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    field: 'fax',
+    label: '传真',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    field: 'financeSoftCode',
+    label: '财务软件代码',
+    component: 'Input',
+    colProps: { span: 6 },
   },
   {
     field: 'duty',
     label: '职位',
     component: 'Input',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
   },
   {
     field: 'note',
@@ -300,7 +344,7 @@ export const formSchema: FormSchema[] = [
     component: 'Select',
     required: true,
     defaultValue: [],
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formActionType }) => {
       return {
         mode: 'multiple',
@@ -331,7 +375,7 @@ export const formSchema: FormSchema[] = [
     required: true,
     component: 'Select',
     defaultValue: '',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formActionType }) => {
       return {
         options: selectOrgList,
@@ -360,7 +404,7 @@ export const formSchema: FormSchema[] = [
     label: '默认部门',
     component: 'Select',
     defaultValue: '',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: {
       options: selectDeptList,
       allowClear: true,
@@ -375,7 +419,7 @@ export const formSchema: FormSchema[] = [
     component: 'ApiSelect',
     // required: true,
     defaultValue: [],
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: {
       mode: 'multiple',
       api: getRoleList,