From e5c026331cf25e519128f7395a74dc1ef765b71f Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Mon, 1 Jul 2024 08:44:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |   4 +-
 src/api/modular/main/BookingLedger.js         |  46 +-
 src/router/generator-routers.js               |   1 +
 .../BookingCustomerLedger/detail/index.vue    | 132 +--
 src/views/main/BookingDjy/detail/index.vue    |  20 +-
 .../main/BookingGangjie/detail/index.vue      |  35 +-
 .../detail/modules/basicInfo.vue              |  21 +-
 src/views/main/BookingGangjie/list/index.vue  |  16 +
 .../detail/childModules/mailBg.jpg            | Bin 0 -> 28213 bytes
 .../detail/childModules/sendMail.vue          | 394 ++++++++
 src/views/main/BookingLedger/detail/index.vue |  31 +-
 .../detail/modules/operationArea.vue          | 871 +++++++++++++-----
 src/views/main/BookingLedger/list/index.vue   |  16 +
 .../BookingLedger/list/modules/initData.js    |  16 +
 src/views/main/CabinManagement/details.vue    |  10 +-
 src/views/main/CabinManagement/index.vue      | 226 +++--
 src/views/main/Customer/addForm.vue           |  30 +-
 src/views/main/Customer/editForm.vue          |  30 +-
 .../main/Taskmanage/TaskmanageList/index.vue  | 291 ++++--
 .../TaskmanageList/modules/initData.js        |  26 +-
 src/views/main/customerParam/addItemForm.vue  |  80 +-
 src/views/main/customerParam/editItemForm.vue | 102 +-
 src/views/main/mskOrderList/index.vue         |  43 +-
 src/views/system/menu/addForm.vue             |  14 +-
 src/views/system/menu/editForm.vue            |  14 +-
 src/views/system/user/index.vue               |  10 +-
 src/views/system/user/userOrgForm.vue         |  93 +-
 27 files changed, 1877 insertions(+), 695 deletions(-)
 create mode 100644 src/views/main/BookingLedger/detail/childModules/mailBg.jpg
 create mode 100644 src/views/main/BookingLedger/detail/childModules/sendMail.vue

diff --git a/.env b/.env
index c84d1c6..ab44d3d 100644
--- a/.env
+++ b/.env
@@ -1,9 +1,9 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=true
 # VUE_APP_TYPE = 'customer'
-VUE_APP_TYPE = 'hechuan'
+# VUE_APP_TYPE = 'hechuan'
 # VUE_APP_TYPE = 'yunyingduan'
-# VUE_APP_TYPE = 'gangjie'
+VUE_APP_TYPE = 'gangjie'
 # 打包部署的三个端 客户端customer 和川端hechuan 运营端djy
 
 # 和川大简云正式
diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js
index 0ec4c5b..0fcb470 100644
--- a/src/api/modular/main/BookingLedger.js
+++ b/src/api/modular/main/BookingLedger.js
@@ -518,9 +518,8 @@ export function BookingOrderDownloadPrint(parameter) {
  */
 export function BookingOrderViewPrintPdf(parameter) {
   return axios({
-    url: '/BookingOrder/ViewPrintPdf',
-    method: 'get',
-    params: parameter
+    url: '/BookingOrder/ViewPrintPdf/' + parameter,
+    method: 'get'
   })
 }
 /**
@@ -1260,6 +1259,15 @@ export function DownloadVOLTAEdiSI(parameter) {
   })
 }
 
+export function DownloadSLSEdiSI(parameter) {
+  return axios({
+    url: '/BookingOrder/DownloadSLSEdiSI',
+    method: 'post',
+    data: parameter,
+    responseType: 'blob'
+  })
+}
+
 export function BachUpdateShipagency(parameter) {
   return axios({
     url: '/BookingOrder/BachUpdateShipagency',
@@ -1647,4 +1655,36 @@ export function QueryShipInfoEMC(parameter) {
     method: 'get',
     params: parameter
   })
+}
+
+export function PrintTuoshu(parameter) {
+  return axios({
+    url: '/BookingOrder/PrintTuoshu',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function SendTuoshu(parameter) {
+  return axios({
+    url: '/BookingOrder/SendTuoshu',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function GetFileByName(parameter) {
+  return axios({
+    url: '/BookingCustomerOrder/GetFileByName',
+    method: 'get',
+    params: parameter,
+    responseType: 'blob'
+  })
+}
+export function CancelBook(parameter) {
+  return axios({
+    url: '/BookingCustomerOrder/CancelBook',
+    method: 'post',
+    params: parameter
+  })
 }
\ No newline at end of file
diff --git a/src/router/generator-routers.js b/src/router/generator-routers.js
index 74e100d..e3cb285 100644
--- a/src/router/generator-routers.js
+++ b/src/router/generator-routers.js
@@ -1,4 +1,5 @@
 import { BasicLayout, BlankLayout, PageView, RouteView, Iframe } from '@/layouts'
+// 各个端用不同文件 但路由一样
 const getDetail = () => {
   if (process.env.VUE_APP_TYPE === 'customer') {
     return 'ledgerCustomerDetail'
diff --git a/src/views/main/BookingCustomerLedger/detail/index.vue b/src/views/main/BookingCustomerLedger/detail/index.vue
index a395426..ad6f6e4 100644
--- a/src/views/main/BookingCustomerLedger/detail/index.vue
+++ b/src/views/main/BookingCustomerLedger/detail/index.vue
@@ -26,19 +26,19 @@
               <a-col :span="'4-8'">
                 <a-form-model-item
                   class="from-label"
-                  label="船公司"
-                  prop="carrierid"
+                  label="收货地"
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
-                  has-feedback>
+                  has-feedback
+                  prop="placereceiptid">
                   <selectView
-                    ref="carrierid"
-                    type="carrierid"
-                    :defaultVal="details.carrierid"
-                    searchApi="GetCarrierlist"
-                    :searchQuery="{ keyword: '', type: 'consignor' }"
-                    :showLabel="['cnName', 'code']"
-                    :openSearch="false"
+                    type="placereceiptid"
+                    :defaultVal="details.placereceipt"
+                    searchApi="GetPortloadlist"
+                    :searchQuery="{ KeyWord: '' }"
+                    :showLabel="['enName', 'ediCode']"
+                    :openSearch="true"
+                    :isCopy="true"
                     @change="getSelectViewRes"></selectView>
                 </a-form-model-item>
               </a-col>
@@ -52,10 +52,10 @@
                   prop="portloadid">
                   <selectView
                     type="portloadid"
-                    :defaultVal="details.portloadid"
+                    :defaultVal="details.portload"
                     searchApi="GetPortloadlist"
                     :searchQuery="{ KeyWord: '' }"
-                    :showLabel="['ediCode', 'enName']"
+                    :showLabel="['enName', 'ediCode']"
                     :openSearch="true"
                     :isCopy="true"
                     @change="getSelectViewRes"></selectView>
@@ -64,17 +64,17 @@
               <a-col :span="'4-8'">
                 <a-form-model-item
                   class="from-label"
-                  label="目的地"
+                  label="卸货港"
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
                   has-feedback
                   prop="portdischargeid">
                   <selectView
                     type="portdischargeid"
-                    :defaultVal="details.portdischargeid"
+                    :defaultVal="details.portdischarge"
                     searchApi="GetPortlist"
                     :searchQuery="{ KeyWord: '' }"
-                    :showLabel="['ediCode', 'enName']"
+                    :showLabel="['enName', 'ediCode']"
                     :openSearch="true"
                     @change="getSelectViewRes"></selectView>
                 </a-form-model-item>
@@ -82,30 +82,34 @@
               <a-col :span="'4-8'">
                 <a-form-model-item
                   class="from-label"
-                  label="开船日期"
+                  label="目的地"
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
                   has-feedback
-                  prop="etd">
-                  <div class="date-box">
-                    <datePickerView
-                      class="date-picker"
-                      :parentVal="details.etd"
-                      type="etd"
-                      format="YYYY-MM-DD"
-                      @dateChange="dateChangeFun"></datePickerView>
-                  </div>
+                  prop="destinationid">
+                  <selectView
+                    type="destinationid"
+                    :defaultVal="details.destination"
+                    searchApi="GetPortlist"
+                    :searchQuery="{ KeyWord: '' }"
+                    :showLabel="['enName', 'ediCode']"
+                    :openSearch="true"
+                    @change="getSelectViewRes"></selectView>
                 </a-form-model-item>
               </a-col>
               <a-col :span="'4-8'">
                 <a-form-model-item
                   class="from-label"
-                  label="销售代码"
+                  label="合约号"
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
-                  has-feedback
-                  prop="saleCode">
-                  <inputView type="saleCode" :parentVal="details.saleCode" @getInputChange="inputChange" />
+                  has-feedback>
+                  <a-select size="small" v-model="details.contractType" style="width: 35%">
+                    <a-select-option v-for="(item, index) in contractnoList" :key="index" :value="item.code">{{
+                      item.code
+                    }}</a-select-option>
+                  </a-select>
+                  <a-input size="small" style="width:60%;margin-left:5%" v-model="details.contractno" />
                 </a-form-model-item>
               </a-col>
             </a-row>
@@ -113,27 +117,31 @@
               <a-col :span="'4-8'">
                 <a-form-model-item
                   class="from-label"
-                  label="船名"
+                  label="订舱账号"
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
                   has-feedback
-                  prop="vessel">
-                  <div class="copy-box">
-                    <selectView
-                      class="copy-input"
-                      ref="vesselView"
-                      type="vessel"
-                      :defaultVal="details.vessel"
-                      searchApi="getVesselInfoService"
-                      :searchQuery="{
-                        KeyWord: '',
-                        CarrierID: this.details.carrierid || 'CMA',
-                        ETD: this.details.etd || ''
-                      }"
-                      :showLabel="['vessel']"
-                      :openSearch="true"
-                      @change="getSelectViewRes"></selectView>
-                  </div>
+                  prop="bookingAccount">
+                  <a-select
+                    size="small"
+                    @change="handleChangeAccount"
+                    @search="handleSearchAccount"
+                    show-search
+                    v-model="details.bookingAccount"
+                    style="width: 100%">
+                    <a-select-option v-for="(item, index) in accountList" :key="index" :value="item.account">{{
+                      item.account }}</a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="'4-8'">
+                <a-form-model-item
+                  class="from-label"
+                  label="船名"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback>
+                  <a-input size="small" v-model="details.vessel" />
                 </a-form-model-item>
               </a-col>
               <a-col :span="'4-8'">
@@ -142,22 +150,40 @@
                   label="航次"
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
-                  has-feedback
-                  prop="voyno">
-                  <inputView type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
+                  has-feedback>
+                  <a-input size="small" v-model="details.voyno" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="'4-8'">
+                <a-form-model-item
+                  class="from-label"
+                  label="航线"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback>
+                  <a-input size="small" v-model="details.lanecode" />
                 </a-form-model-item>
               </a-col>
               <a-col :span="'4-8'">
                 <a-form-model-item
                   class="from-label"
-                  label="约号"
+                  label="开船日期"
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
                   has-feedback
-                  prop="contractno">
-                  <inputView type="contractno" :parentVal="details.contractno" @getInputChange="inputChange" />
+                  prop="etd">
+                  <div class="date-box">
+                    <datePickerView
+                      class="date-picker"
+                      :parentVal="details.etd"
+                      type="etd"
+                      format="YYYY-MM-DD"
+                      @dateChange="dateChangeFun1"></datePickerView>
+                  </div>
                 </a-form-model-item>
               </a-col>
+            </a-row>
+            <a-row>
               <a-col :span="'4-8'">
                 <a-form-model-item
                   class="from-label"
diff --git a/src/views/main/BookingDjy/detail/index.vue b/src/views/main/BookingDjy/detail/index.vue
index 5955962..550dc76 100644
--- a/src/views/main/BookingDjy/detail/index.vue
+++ b/src/views/main/BookingDjy/detail/index.vue
@@ -4,6 +4,14 @@
       <a-button :loading="autioLoading" @click="handleAccept" v-if="details.bsstatus !== '已审核'" type="primary">通过</a-button>
       <a-button :loading="autioLoading" type="primary" v-if="details.bsstatus == '待审核'" @click="handleAutio">驳回</a-button>
       <a-button :loading="sendLoading" type="primary" @click="handleSendApi">发送API订舱</a-button>
+      <a-popconfirm
+        title="确定作废吗?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="handleCancelBook"
+      >
+        <a-button :loading="sendLoading" type="danger" v-if="details.bsstatus == '已审核'" >作废</a-button>
+      </a-popconfirm>
       <span>订单状态:{{ details.bsstatus }}</span>
       <span v-if="details.bookingno" style="margin: 0 10px;">订单编号:</span>
       <span v-if="details.bookingno">{{ details.bookingno }}</span>
@@ -929,7 +937,8 @@ import {
   BookingCustomerOrderGet,
    BookingCustomerOrderSubmit,
    BookingCustomerOrderAuditBooking,
-   PostApiSO
+   PostApiSO,
+   CancelBook
 } from '@/api/modular/main/BookingLedger'
 import { mapGetters } from 'vuex'
 export default {
@@ -1014,6 +1023,15 @@ export default {
       this.id = this.$route.query.id
       this.getDetail()
     },
+    handleCancelBook() {
+      CancelBook({ id: this.$route.query.id }).then(res => {
+        if (res.success) {
+          this.$message.success('作废成功')
+        } else {
+          this.$message.error(res.message)
+        }
+      })
+    },
     init() {
       this.options = this.$options.filters['dictData']('booking_service_item')
       this.options.forEach(item => {
diff --git a/src/views/main/BookingGangjie/detail/index.vue b/src/views/main/BookingGangjie/detail/index.vue
index 2eb68cf..8307523 100644
--- a/src/views/main/BookingGangjie/detail/index.vue
+++ b/src/views/main/BookingGangjie/detail/index.vue
@@ -31,19 +31,23 @@
               </operationArea>
 
               <ul class="parent-tabs-box">
-                <div class="parents-tabs-top">
-                  <li @click="changeParentTabs('1-1')">
-                    <input type="radio" name="tabs" id="tab1" checked="true" />
-                    <label class="tabs-label" for="tab1">基础信息</label>
-                  </li>
-                  <li @click="changeParentTabs('2-2')">
-                    <input type="radio" name="tabs" id="tab2" checked="false" />
-                    <label class="tabs-label" for="tab2">EDI补充信息</label>
-                  </li>
-                  <li @click="changeParentTabs('3-3')" v-if="feeShow">
-                    <input type="radio" name="tabs" id="tab3" checked="false" />
-                    <label class="tabs-label" for="tab3">费用信息</label>
-                  </li>
+                <div class="parents-tabs-top" style="display: flex;align-items: center;width: 100%;justify-content: space-between;" >
+                  <div>
+                    <li @click="changeParentTabs('1-1')">
+                      <input type="radio" name="tabs" id="tab1" checked="true" />
+                      <label class="tabs-label" for="tab1">基础信息</label>
+                    </li>
+                    <li @click="changeParentTabs('2-2')">
+                      <input type="radio" name="tabs" id="tab2" checked="false" />
+                      <label class="tabs-label" for="tab2">EDI补充信息</label>
+                    </li>
+                    <li @click="changeParentTabs('3-3')" v-if="feeShow">
+                      <input type="radio" name="tabs" id="tab3" checked="false" />
+                      <label class="tabs-label" for="tab3">费用信息</label>
+                    </li>
+                  </div>
+                  <div v-if="bookingDetails.spliT_OR_MERGE_FLAG==1" style="background: #d78a6d;color: white;padding: 0 8px;" >已拆票</div>
+                  <div v-if="bookingDetails.spliT_OR_MERGE_FLAG==2" style="background: #d78a6d;color: white;padding: 0 8px;" >已合票</div>
                 </div>
                 <div class="parents-tabs-content">
                   <div id="tab-content1" class="tab-content" v-show="mainOrderActiveKey === '1-1'">
@@ -56,7 +60,6 @@
                         :inPageLoading="inPageLoading"
                         :isLockBooking="isLockBooking"
                         isParent="parent"
-                        @handleSaveService="handleSaveService"
                         @changeDetail="changeDetailFun"></basicInfo>
                       <mailingInfo
                         ref="mailingInfo"
@@ -94,9 +97,9 @@
                         :details="bookingDetails"
                         :rules="tableRules"
                         isParent="parent"
+                        :isWatch="true"
                         :isLockBooking="isLockBooking"
                         @changectnall="changectnall"
-                        @getInfoSet="getInfoSet"
                         @changeDetail="changeDetailFun"
                         @handleRefshTable="handleRefshTable"
                         @changeTotal="changeTotalFun"
@@ -123,7 +126,7 @@
                       ref="iframe"
                       @load="handleIframeLoad"
                       style="width: 100%;height: 1400px;"
-                      src="http://localhost:8080/#/index"
+                      src="http://60.209.125.238:35103/#/index"
                       frameborder="0"></iframe>
                   </div>
                 </div>
diff --git a/src/views/main/BookingGangjie/detail/modules/basicInfo.vue b/src/views/main/BookingGangjie/detail/modules/basicInfo.vue
index e977eb7..0b3d700 100644
--- a/src/views/main/BookingGangjie/detail/modules/basicInfo.vue
+++ b/src/views/main/BookingGangjie/detail/modules/basicInfo.vue
@@ -572,7 +572,22 @@
               </a-col>
             </a-row>
             <a-row :gutter="10">
-              <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="8">
+              <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="4">
+                <a-form-model-item
+                  class="from-label"
+                  label="ERP代码"
+                  :labelCol="{span:7}"
+                  :wrapperCol="{span:17}"
+                  has-feedback
+                  prop="erpCode">
+                  <inputView
+                    :ishd="isLockBooking"
+                    type="erpCode"
+                    :parentVal="details.erpCode"
+                    @getInputChange="inputChange" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="7">
                 <a-form-model-item
                   class="from-label"
                   label="操作备注"
@@ -587,7 +602,7 @@
                     @getInputChange="inputChange" />
                 </a-form-model-item>
               </a-col>
-              <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="8">
+              <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="7">
                 <a-form-model-item
                   class="from-label"
                   label="单证备注"
@@ -602,7 +617,7 @@
                     @getInputChange="inputChange" />
                 </a-form-model-item>
               </a-col>
-              <a-col :xs="24" :sm="6" :md="6" :lg="6" :xl="8">
+              <a-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">
                 <a-form-model-item
                   class="from-label"
                   label="申请箱使"
diff --git a/src/views/main/BookingGangjie/list/index.vue b/src/views/main/BookingGangjie/list/index.vue
index f607164..5bc22df 100644
--- a/src/views/main/BookingGangjie/list/index.vue
+++ b/src/views/main/BookingGangjie/list/index.vue
@@ -203,6 +203,22 @@
                     </a-popover>
                   </div>
                 </template>
+                <template #isSISubmitted="{ row }">
+                  <div v-if="row.isSISubmitted" style="text-align: center">
+                    <a-popover placement="topLeft">
+                      <div slot="content">{{ row.isSISubmitted }}</div>
+                      <i class="iconfont icon-chenggong flag-icon"></i>
+                    </a-popover>
+                  </div>
+                </template>
+                <template #isVGMSubmitted="{ row }">
+                  <div v-if="row.isVGMSubmitted" style="text-align: center">
+                    <a-popover placement="topLeft">
+                      <div slot="content">{{ row.isVGMSubmitted }}</div>
+                      <i class="iconfont icon-chenggong flag-icon"></i>
+                    </a-popover>
+                  </div>
+                </template>
                 <template #IsCanDan="{ row }">
                   <div v-if="row.isCanDan" style="text-align: center;">
                     <a-popover placement="topLeft">
diff --git a/src/views/main/BookingLedger/detail/childModules/mailBg.jpg b/src/views/main/BookingLedger/detail/childModules/mailBg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..45730286e249245df7478930f22c842a7b05b504
GIT binary patch
literal 28213
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

literal 0
HcmV?d00001

diff --git a/src/views/main/BookingLedger/detail/childModules/sendMail.vue b/src/views/main/BookingLedger/detail/childModules/sendMail.vue
new file mode 100644
index 0000000..46d2fcc
--- /dev/null
+++ b/src/views/main/BookingLedger/detail/childModules/sendMail.vue
@@ -0,0 +1,394 @@
+<template>
+  <div>
+    <a-modal width="1000px" :closable="false" :visible="visible" @cancel="visible = false">
+      <template slot="title">
+      </template>
+      <div class="main" >
+        <div class="main-title" >
+          <div style="display: flex;align-items: center;">
+            <div class="line" ></div>
+            <div>邮件发送</div>
+          </div>
+          <a-icon @click="visible=false" type="close" style="font-size: 20px;color: black;cursor: pointer;" />
+        </div>
+        <a-spin :spinning="load">
+          <a-form-model ref="ruleForm" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
+            <a-form-model-item prop="name">
+              <div class="label">收件人</div>
+              <a-select
+                :filter-option="filterOption"
+                show-search
+                v-model="form.sendTo"
+                mode="tags"
+                style="width: 100%">
+                <a-select-option v-for="item in contactsList" :key="item.id" :value="item.email">
+                  {{ item.name }}
+                  <span v-if="item.email">(</span>
+                  {{ item.email }}
+                  <span v-if="item.email">)</span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+            <a-form-model-item prop="name">
+              <div class="label">抄送</div>
+              <a-spin :spinning="poepleLoad">
+                <a-select
+                  v-model="form.ccTo"
+                  :filter-option="filterOption"
+                  show-search
+
+                  mode="tags"
+                  style="width: 100%">
+                  <a-select-option v-for="item in peopleList" :key="item.id" :value="item.email">
+                    {{ item.name }}
+                    <span v-if="item.email">(</span>
+                    {{ item.email }}
+                    <span v-if="item.email">)</span>
+                  </a-select-option>
+                </a-select>
+              </a-spin>
+            </a-form-model-item>
+            <a-form-model-item prop="name">
+              <div class="label">主题</div>
+              <a-input style="background: rgba(255,255,255,0);" v-model="form.title"></a-input>
+            </a-form-model-item>
+            <a-form-model-item>
+              <div style="display: flex;height: 28px;align-items: center;" >
+                <a-upload
+                  :customRequest="customRequest"
+                  :showUploadList="false"
+                  :multiple="true"
+                  name="file">
+                  <a-spin :spinning="downloading">
+                    <div style="cursor: pointer;" >
+                      <a-icon type="paper-clip" style="font-size: 20px;color:rgb(41,150,150);" />
+                      <span style="font-size: 13px;font-weight: 400;color:  rgb(41, 150, 150);margin-left: 10px;">添加附件</span>
+                    </div>
+                  </a-spin>
+                </a-upload>
+                <div style="display: flex;flex-wrap: wrap;margin-left: 20px;">
+                  <div v-for="(item, index) in fileList" class="fileList" :key="index">
+                    <span @click="handleDownFile(item)" style="cursor: pointer;" >{{ item.name }}</span>
+                    <a-icon style="color: red;font-size: 12px;margin-left: 10px;" @click.stop="handleDetleFile(index)" type="close" />
+                  </div>
+                </div>
+
+              </div>
+
+            </a-form-model-item>
+            <a-form-model-item prop="name">
+              <a-textarea v-model="form.body" :auto-size="{ minRows: 12, maxRows: 20 }"></a-textarea>
+            </a-form-model-item>
+          </a-form-model>
+          <a-row>
+
+          </a-row>
+        </a-spin>
+      </div>
+      <template slot="footer">
+        <a-button type="danger" @click="visible = false">取消</a-button>
+        <a-button type="primary" @click="handleSend">发送</a-button>
+      </template>
+    </a-modal>
+  </div>
+</template>
+<script>
+import { DjyCustomerdetail, GetSysUserPage, PrintTuoshu, GetFileByName, SendTuoshu } from '@/api/modular/main/BookingLedger'
+import { mapGetters } from 'vuex'
+import { UploadTempFile } from '@/api/modular/system/fileManage'
+export default {
+
+  props: {
+
+  },
+  data() {
+    return {
+      labelCol: { span: 2 },
+      wrapperCol: { span: 22 },
+      visible: false,
+      details: {},
+      contactsList: [],
+      peopleList: [],
+      fileList: [],
+      downloading: false,
+      load: false,
+      form: {
+        sendTo: [],
+        ccTo: []
+      },
+      poepleLoad: false,
+      rules: {}
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bookingInitData'
+    ])
+  },
+  methods: {
+    init(form) {
+      this.fileList = []
+      this.form = {
+        sendTo: [],
+        ccTo: []
+      }
+      const data = {
+        CodeName: form.forwarderid,
+        ShortName: form.forwarder
+      }
+      this.details = form
+      DjyCustomerdetail(data).then(res => {
+        if (res.success) {
+          const parm = res.data.paramValueList ? res.data.paramValueList : []
+          const arr = []
+          parm.forEach(item => {
+            if (item.paraCode === 'BookingRoute') {
+              arr.push(item)
+            }
+          })
+          if (arr.length === 0) {
+            this.$emit('noOpen')
+          } else {
+            if (arr[0].itemCode === 'EMAIL') {
+              this.getPeople(res.data)
+            } else {
+              this.$emit('noOpen')
+            }
+          }
+        } else {
+          this.$message.error(res.message)
+          this.$emit('noOpen')
+        }
+      })
+      PrintTuoshu({ bookingId: form.id }).then(res => {
+        this.fileList.push({
+          name: res.data,
+          path: res.data,
+          type: 'print'
+        })
+      })
+    },
+    handleDownFile(row) {
+      if (row.type === 'print') {
+        window.open(` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/ViewPrintPdf/${row.path}`, '_blank')
+      } else {
+        const data = {
+          fn: row.path,
+          isTemp: true
+        }
+        GetFileByName(data).then(res => {
+          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)
+        })
+      }
+    },
+    handleDetleFile(index) {
+      this.fileList.splice(index, 1)
+    },
+    handleSend() {
+      const data = {
+        body: this.form.body,
+        title: this.form.title,
+        bookingId: this.details.id
+      }
+      if (this.form.sendTo) {
+        data.sendTo = this.form.sendTo.join(';')
+      }
+      if (this.form.ccTo) {
+        data.ccTo = this.form.ccTo.join(';')
+      }
+      const arr = []
+      this.fileList.forEach(item => {
+        arr.push(item.path)
+      })
+      data.fileList = arr
+      console.log(data)
+      this.load = true
+      SendTuoshu(data).then(res => {
+        if (res.success) {
+          this.$message.success('发送成功')
+          this.visible = false
+        } else {
+          this.$message.error(res.message)
+        }
+        this.load = false
+      })
+    },
+    filterOption(input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      );
+    },
+    handleSearchPeople(val) {
+      this.poepleLoad = true
+      GetSysUserPage({ name: val }).then(res => {
+        const arr = []
+        res.data.forEach(item => {
+        if (item.email) {
+          arr.push(item)
+        }
+      })
+        this.peopleList = arr
+        this.poepleLoad = false
+      })
+    },
+    customRequest(data) {
+      const formData = new FormData()
+      formData.append('file', data.file)
+      this.downloading = true
+      UploadTempFile(formData, (percent) => this.setUploadProcess(percent)).then((res) => {
+        if (res.success) {
+          this.$message.success('上传成功')
+          const data = res.data.split('\\')
+          this.fileList.push({
+            name: data[1],
+            path: res.data
+          })
+        } else {
+          this.$message.error('上传失败：' + res.message)
+        }
+        this.downloading = false
+      })
+    },
+    getPeople(data) {
+      const arr = data.contacts ? data.contacts : []
+      const arr1 = []
+      const arr2 = []
+      arr.forEach(item => {
+        if (item.carrierProp === this.details.carrierid) {
+          if (item.email) {
+            arr1.push(item)
+          }
+        }
+      })
+      this.contactsList = arr1
+      if (arr1.length > 0) {
+        this.form.sendTo.push(arr1[0].email)
+      }
+      const peopleArr = this.bookingInitData ? this.bookingInitData.opInitList : []
+      const arr3 = []
+      peopleArr.forEach(item => {
+        if (item.email) {
+          arr3.push(item)
+        }
+      })
+      this.peopleList = arr3
+      if (this.details.opid) {
+        const oparr = []
+        peopleArr.forEach(item => {
+          if (item.id == this.details.opid) {
+            oparr.push(item)
+          }
+        })
+        if (oparr.length > 0) {
+          if (oparr[0].email) {
+            arr2.push(oparr[0].email)
+          }
+        } else {
+          GetSysUserPage({ name: this.details.op }).then(res => {
+            arr2.push(res.data[0].email)
+            if (res.data[0].email) {
+              arr2.push(res.data[0].email)
+            }
+          })
+        }
+      }
+      if (this.details.docid) {
+        const oparr1 = []
+        peopleArr.forEach(item => {
+          if (item.id == this.details.docid) {
+            oparr1.push(item)
+          }
+        })
+        if (oparr1.length > 0) {
+          if (oparr1[0].email) {
+            arr2.push(oparr1[0].email)
+          }
+        } else {
+          GetSysUserPage({ name: this.details.doc }).then(res => {
+            arr2.push(res.data[0].email)
+            if (res.data[0].email) {
+              arr2.push(res.data[0].email)
+            }
+          })
+        }
+      }
+      this.form.ccTo = arr2
+      const day = this.details.etd.slice(0, 10)
+      const str = this.details.erpCode + ' ' + this.details.portload + '-' + this.details.destination + ' ' + this.details.cntrtotal + ' ' + day
+      this.$set(this.form, 'title', str)
+      this.$set(this.form, 'body', this.details.description)
+      this.visible = true
+      this.$emit('cancelOpen')
+    }
+  }
+
+}
+</script>
+
+<style lang="less" scoped>
+/deep/ .ant-form-item {
+  margin-bottom: 15px !important;
+}
+
+.fileList {
+ background-color: rgb(237,242,242);
+ color: black;
+line-height: 20px;
+padding: 3px 5px;
+margin-right: 10px;
+}
+.main{
+  background: url('./mailBg.jpg');
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  height: 800px;
+  padding: 40px 37px 0 50px;
+  .main-title{
+    font-size: 20px;
+    font-weight: bold;
+    color: black;
+    line-height: 20px;
+    display: flex;
+    align-items: center;
+    margin-bottom: 45px;
+    justify-content: space-between;
+    .line{
+      background: rgba(19, 194, 194, 1);
+      height: 19px;
+      width: 2px;
+      margin-right: 10px;
+    }
+  }
+  .label{
+    font-size: 13px;
+    font-weight: bold;
+    line-height: 13px;
+    margin-bottom: 12px;
+    color: black;
+  }
+}
+/deep/ .ant-modal-body{
+  padding: 0px !important;
+}
+/deep/ .ant-select-selection--multiple{
+  background:  rgba(255, 255, 255, 0);
+}
+/deep/ .ant-select-selection__choice{
+  background: rgb(211,240,240);
+  color: rgb(41,150,150);
+}
+</style>
diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue
index f75b94f..87942da 100644
--- a/src/views/main/BookingLedger/detail/index.vue
+++ b/src/views/main/BookingLedger/detail/index.vue
@@ -34,17 +34,17 @@
                 <div class="parents-tabs-top" style="display: flex;align-items: center;width: 100%;justify-content: space-between;" >
                   <div>
                     <li @click="changeParentTabs('1-1')">
-                    <input type="radio" name="tabs" id="tab1" checked="true" />
-                    <label class="tabs-label" for="tab1">基础信息</label>
-                  </li>
-                  <li @click="changeParentTabs('2-2')">
-                    <input type="radio" name="tabs" id="tab2" checked="false" />
-                    <label class="tabs-label" for="tab2">EDI补充信息</label>
-                  </li>
-                  <li @click="changeParentTabs('3-3')" v-if="feeShow">
-                    <input type="radio" name="tabs" id="tab3" checked="false" />
-                    <label class="tabs-label" for="tab3">费用信息</label>
-                  </li>
+                      <input type="radio" name="tabs" id="tab1" checked="true" />
+                      <label class="tabs-label" for="tab1">基础信息</label>
+                    </li>
+                    <li @click="changeParentTabs('2-2')">
+                      <input type="radio" name="tabs" id="tab2" checked="false" />
+                      <label class="tabs-label" for="tab2">EDI补充信息</label>
+                    </li>
+                    <li @click="changeParentTabs('3-3')" v-if="feeShow">
+                      <input type="radio" name="tabs" id="tab3" checked="false" />
+                      <label class="tabs-label" for="tab3">费用信息</label>
+                    </li>
                   </div>
                   <div v-if="bookingDetails.spliT_OR_MERGE_FLAG==1" style="background: #d78a6d;color: white;padding: 0 8px;" >已拆票</div>
                   <div v-if="bookingDetails.spliT_OR_MERGE_FLAG==2" style="background: #d78a6d;color: white;padding: 0 8px;" >已合票</div>
@@ -190,7 +190,6 @@ import {
   GetAllData,
   DeleteBookingOrder,
   listYardBwCarrier,
-  ListAgentByCarrier,
   CheckCtnCover,
   GetCtnListRefsh,
   GetBookingVGMResult
@@ -1462,7 +1461,7 @@ export default {
       }
       return true
     },
-    handleSaveCtnListCover(data, slots,book) {
+    handleSaveCtnListCover(data, slots, book) {
       const arr = []
       data.forEach(item => {
         if (item.ctnnum > 0) {
@@ -1489,13 +1488,13 @@ export default {
       this.bookingDetails.portload = slots[0].portload
       this.bookingDetails.portdischargeid = slots[0].portdischargeid
       this.bookingDetails.portdischarge = slots[0].portdischarge
-      
-      if(book){
+
+      if (book) {
         this.bookingDetails.custno = book.bookingReferNo
         this.bookingDetails.mblno = book.newMBlNo
         this.bookingDetails.hblno = book.newSubBlNo
       }
-      
+
       this.$forceUpdate()
       this.$refs.goodsTable.refsh()
     },
diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue
index 20044f2..e1b1ead 100644
--- a/src/views/main/BookingLedger/detail/modules/operationArea.vue
+++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue
@@ -1,9 +1,15 @@
 <template>
   <div class="operation-area">
-    <a-card :bordered="false"
+    <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"
+        <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>
@@ -16,19 +22,33 @@
         </button>
       </div>
       <div class="btn-list more-view-1">
-        <button @click="openModel('bookingSpace')"><span class="iconfont icon-chuanbo"></span>订舱</button>
+        <button @click="openModel('bookingSpace')">
+          <a-spin size="small" :spinning="spaceLoad" style="display: inline-block;">
+            <span class="iconfont icon-chuanbo"></span>订舱
+          </a-spin>
+        </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')">
+        <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">
+        <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>
@@ -93,15 +113,26 @@
     </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">
+    <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-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>
@@ -114,17 +145,25 @@
         <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>
+          <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"
+          <a-button
+            class="btn"
+            type="primary"
+            @click="removeModel"
+            :loading="DelLoading"
             v-if="['initCabin'].includes(modelType) || ['ladingBill'].includes(modelType)">
             删除
           </a-button>
@@ -142,7 +181,11 @@
               DOCX
             </a-button> -->
           </template>
-          <a-button class="btn" type="primary" v-if="modelType == 'initCabin'" @click="sendModel"
+          <a-button
+            class="btn"
+            type="primary"
+            v-if="modelType == 'initCabin'"
+            @click="sendModel"
             :loading="SendLoading">
             发送
           </a-button>
@@ -159,14 +202,21 @@
               <!-- 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-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-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">
@@ -178,51 +228,75 @@
               </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-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-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-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-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-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-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-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-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>
@@ -230,8 +304,11 @@
             <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>
+                  <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>
@@ -239,8 +316,11 @@
                   </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>
+                  <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>
@@ -248,22 +328,34 @@
                   </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>
+                  <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>
+                        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"
+                  <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 }}
@@ -272,45 +364,78 @@
                   </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"
+                  <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"
+                  <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>
+                  <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-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>
+                  <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-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>
+                  <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-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>
@@ -318,11 +443,18 @@
               </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>
+                  <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" />
+                      <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
@@ -340,10 +472,15 @@
             <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>
+                  <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"
+                      <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>
@@ -352,79 +489,118 @@
               </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>
+                  <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>
+                  <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>
+                  <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>
+                  <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>
+                  <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>
+                  <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>
+                  <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>
+                  <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>
+                  <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>
+                  <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>
+                  <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>
+                  <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" />
+                      <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>
@@ -468,8 +644,13 @@
           </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">
+            <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>
@@ -479,8 +660,15 @@
     <!-- 打印弹窗 end -->
 
     <!-- OCR抽屉 start -->
-    <a-drawer title="OCR" width="45vw" :destroyOnClose="true" :mask="false" placement="right" :visible="OcrVisible"
-      @close="OcrOnClose" class="OCRBox">
+    <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>
@@ -493,8 +681,16 @@
         </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>
+      <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>
@@ -508,9 +704,16 @@
         <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"
+              <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>
@@ -534,9 +737,15 @@
               </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>
+                  <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>
@@ -567,7 +776,11 @@
             </a-row>
           </a-form-model>
         </div>
-        <a-table :scroll="{ x: '900' }" @change="tablePaginationChange" :pagination="pagination" :columns="columns"
+        <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>
@@ -576,23 +789,39 @@
     <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"
+        <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-modal width="1100px" v-model="voltaFlag" :title="voltaTitle">
       <a-spin :spinning="voltaLoading">
-        <a-form-model class="voltaForm" ref="voltaForm" :rules="rules" :model="voltaForm" :label-col="labelCol"
+        <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"
+                  <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>
@@ -602,9 +831,16 @@
             <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"
+                  <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>
@@ -616,9 +852,16 @@
             <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"
+                  <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>
@@ -628,9 +871,16 @@
             <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"
+                  <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>
@@ -654,9 +904,16 @@
             <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"
+                  <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>
@@ -666,9 +923,16 @@
             <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"
+                  <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>
@@ -681,9 +945,16 @@
             <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"
+                  <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>
@@ -693,9 +964,16 @@
             <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"
+                  <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>
@@ -712,7 +990,7 @@
             </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-textarea :rows="4" style="line-height: 22px;" v-model="voltaForm.marks"></a-textarea>
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -721,12 +999,20 @@
               <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-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-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>
@@ -736,12 +1022,50 @@
               <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-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 v-if="voltaForm.editPageCode === 'SLS'">
+            <div style="display:flex;padding-left: 49px;">
+              <a-form-model-item style="width: 33%;" prop="hsCode" label="HS CODE">
+                <a-input v-model="voltaForm.hsCode"></a-input>
+              </a-form-model-item>
+              <a-form-model-item
+                :label-col="{ span: 8 }"
+                :wrapper-col="{ span: 16 }"
+                style="width: 33%;"
+                prop="documentTypeCode"
+                label="文档类型">
+                <a-select v-model="voltaForm.documentTypeCode" style="width: 100%">
+                  <a-select-option value="silc">
+                    SI with Free Text
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+              <a-form-model-item
+                :label-col="{ span: 8 }"
+                :wrapper-col="{ span: 16 }"
+                style="width: 33%;"
+                prop="blfrt"
+                label="付款方式">
+                <a-select v-model="voltaForm.blfrt" style="width: 100%">
+                  <a-select-option value="PrePaid">
+                    预付-PrePaid
+                  </a-select-option>
+                  <a-select-option value="Collect">
+                    到付-Collect
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-row>
           <a-row>
           </a-row>
         </a-form-model>
@@ -758,13 +1082,17 @@
             <a-button type="primary">发送</a-button>
           </a-popconfirm>
 
-          <a-button type="primary" @click="handleDownBW">下载报文</a-button>
+          <a-button type="primary" @click="handleDownBW">导出excel</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"
+    <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>
@@ -821,10 +1149,14 @@
           </a-col>
           <a-col :span="5">
             <a-form-item label="箱型箱量">
-              <a-select mode="multiple" allowClear v-model="cabinQueryForm.ctN_STAT" style="width: 100%"
+              <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-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -841,11 +1173,20 @@
           </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">
+      <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)"
+        <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>
@@ -866,6 +1207,7 @@
 
     <pre-order ref="preOrder" :details="details" @frompre="frompre" />
     <mskBookingOrder ref="mskBookingOrder"></mskBookingOrder>
+    <sendMail @cancelOpen="cancelOpen" @noOpen="noOpen" ref="sendMail"></sendMail>
   </div>
 </template>
 <script>
@@ -894,6 +1236,7 @@ import {
   LetterYardHis,
   CheckAndInitVOLTAEdi,
   DownloadVOLTAEdiSI,
+  DownloadSLSEdiSI,
   SendVOLTAEdiSI,
   BookingSlotGetAvailableSlots,
   CancelAllocationSlot,
@@ -905,6 +1248,7 @@ import mskBookingOrder from '@/components/mskBookingOrder'
 import { mapGetters } from 'vuex'
 import selectView from '../components/selectView'
 import textareaView from '../components/textareaView'
+import sendMail from '../childModules/sendMail'
 import preOrder from './preOrder'
 export default {
   props: {
@@ -927,9 +1271,21 @@ export default {
     ...mapGetters(['saveFlag', 'slotShow', 'ctnallList'])
   },
   components: {
-    preOrder, selectView, textareaView, mskBookingOrder
+    preOrder, selectView, textareaView, mskBookingOrder, sendMail
   },
   data() {
+    const validatePass = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入'));
+      } else {
+        const regex = /[0-9]{2}\.[0-9]{2}\.[0-9]{2}\.[0-9]{2}/;
+        if (!regex.test(value)) {
+          callback(new Error('请输入正确的hscode格式如 0000.00.00.00'));
+        } else {
+          callback();
+        }
+      }
+    };
     return {
       id: this.$route.query.id,
       labelCol: { span: 6 },
@@ -976,7 +1332,7 @@ export default {
         {
           dataIndex: 'wtUnit',
           key: 'wtUnit',
-          title: '单位尺寸'
+          title: '重量单位'
         },
         {
           dataIndex: 'qty',
@@ -994,6 +1350,12 @@ export default {
           key: 'cbm',
           title: '尺寸',
           align: 'right'
+        },
+        {
+          dataIndex: 'cbmUnit',
+          key: 'cbmUnit',
+          title: '尺寸单位',
+          align: 'right'
         }
       ],
       wrapperCol: { span: 18 },
@@ -1001,6 +1363,7 @@ export default {
       hisLoading: false,
       voltaFlag: false,
       modelType: '',
+      voltaFlag1: false,
       cabinColums: [
         {
           dataIndex: 'sloT_BOOKING_NO',
@@ -1113,7 +1476,10 @@ export default {
         dischargePort: [{ required: true, message: '请输入卸货港', trigger: 'blur' }],
         finalDestination: [{ required: true, message: '请输入最终目的港', trigger: 'blur' }],
         cargoDescription: [{ required: true, message: '请输入品名', trigger: 'blur' }],
-        placeOfDelivery: [{ required: true, message: '请输入最终交货地', trigger: 'blur' }]
+        placeOfDelivery: [{ required: true, message: '请输入最终交货地', trigger: 'blur' }],
+        documentTypeCode: [{ required: true, message: '请选择文档类型', trigger: 'blur' }],
+        blfrt: [{ required: true, message: '请选择付款方式', trigger: 'blur' }],
+        hsCode: [{ validator: validatePass, trigger: 'blur' }]
       },
       pagination: {
         current: 1,
@@ -1129,6 +1495,8 @@ export default {
         pageSizeOptions: ['1', '10', '20', '40', '80', '100'],
         pageSize: 20
       },
+      spaceLoad: false,
+      voltaTitle: '',
       hisColums: [
         {
           title: '创建人',
@@ -1566,7 +1934,6 @@ export default {
         this.selectedRowKeys[0] = index
         this.$forceUpdate()
       }
-
     },
     refshCabin() {
       this.cabinQueryForm = {}
@@ -1610,39 +1977,54 @@ export default {
             ...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
+          if (this.voltaForm.editPageCode === 'SLS') {
+            if (data.documentTypeCode) {
+              data.documentType = 'General SI'
+            }
+            DownloadSLSEdiSI(data).then(res => {
+            this.handleReturn(res)
+          })
+          } else {
+            DownloadVOLTAEdiSI(data).then(res => {
+            this.handleReturn(res)
           })
+          }
         } else {
           return false;
         }
       });
     },
+    handleReturn(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
+    },
+    cancelOpen() {
+      this.spaceLoad = false
+    },
     handleSend() {
       this.$refs.voltaForm.validate(valid => {
         if (valid) {
@@ -1652,7 +2034,8 @@ export default {
             ...this.voltaForm
           }
           this.voltaLoading = true
-          SendVOLTAEdiSI(data).then(res => {
+          if (this.voltaForm.editPageCode != 'SLS') {
+            SendVOLTAEdiSI(data).then(res => {
             if (res.code === 200) {
               this.$message.success('操作成功')
               this.voltaFlag = false
@@ -1662,6 +2045,7 @@ export default {
             }
             this.voltaLoading = false
           })
+          }
         } else {
           return false;
         }
@@ -1921,8 +2305,8 @@ export default {
       // this.$bus.$emit('WebTest001', { upFileList: file, attachCode: 'other', attachName: '其他' })
     },
     handleSaveCabin() {
-      const arr = [] //选中的箱型箱量
-      const cabArr = [] //选中的数据
+      const arr = [] // 选中的箱型箱量
+      const cabArr = [] // 选中的数据
       this.cabinList.forEach((item, index) => {
         this.selectedRowKeys.forEach(ite => {
           if (index == ite) {
@@ -1934,7 +2318,7 @@ export default {
         })
       })
       const arr2 = arr.reduce((a, b) => { return a.concat(b) });
-      const newArr = [] //重新计算的箱型箱量
+      const newArr = [] // 重新计算的箱型箱量
       arr2.forEach(el => {
         const res = newArr.findIndex(ol => {
           return el.ctnall === ol.ctnall;
@@ -1945,17 +2329,17 @@ export default {
           newArr.push(el);
         }
       })
-      const arr3 = [] //判断是否拆票的标记
+      const arr3 = [] // 判断是否拆票的标记
       newArr.forEach(item => {
         if (item.ctnnum !== item.totalnum) {
           arr3.push(item)
         }
       })
       const fnSave = () => {
-        this.BookingSlotMerge(cabArr,newArr)
+        this.BookingSlotMerge(cabArr, newArr)
       }
       if (arr3.length > 0) {
-        let that = this
+        const that = this
         this.$confirm({
           title: '提示',
           content: h => <div style="color:red;">确定要拆票吗吗？</div>,
@@ -1963,26 +2347,26 @@ export default {
             fnSave()
           },
           onCancel() {
-          },
+          }
         });
       } else {
-        cabArr.forEach(item=>{
+        cabArr.forEach(item => {
           item.splitOrMerge = 0
         })
         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.$emit('handleSaveCtnListCover', newArr, cabArr)
+        } else {
+          const that = this
+          this.$confirm({
+            content: '已有记录是否覆盖',
+            onOk() {
+              that.$emit('handleSaveCtnListCover', newArr, cabArr)
+            },
+            onCancel() {
+              that.$emit('handleSaveCtnList', newArr, cabArr)
+            }
+          });
+        }
       }
     },
     handlePushBC() {
@@ -1994,14 +2378,14 @@ export default {
         }
       })
     },
-    BookingSlotMerge(cabArr,newArr) {
+    BookingSlotMerge(cabArr, newArr) {
       const arr = JSON.parse(JSON.stringify(cabArr))
-      arr.forEach(item=>{
+      arr.forEach(item => {
         item.splitOrMerge = 1
       })
       const data = {
         slots: arr,
-        operType: "split",
+        operType: 'split',
         bookingId: 0,
         mergeSlotId: 0,
         slotBookingNo: arr[0].sloT_BOOKING_NO
@@ -2011,16 +2395,16 @@ export default {
         this.cabLoad = false
         if (res.success) {
           if (!this.$route.query.id) {
-            this.$emit('handleSaveCtnListCover', newArr, arr,res.data)
+            this.$emit('handleSaveCtnListCover', newArr, arr, res.data)
           } else {
             const that = this
             this.$confirm({
               content: '已有记录是否覆盖',
               onOk() {
-                that.$emit('handleSaveCtnListCover', newArr, arr,res.data)
+                that.$emit('handleSaveCtnListCover', newArr, arr, res.data)
               },
               onCancel() {
-                that.$emit('handleSaveCtnList', newArr, arr,res.data)
+                that.$emit('handleSaveCtnList', newArr, arr, res.data)
               }
             });
           }
@@ -2125,6 +2509,10 @@ export default {
     cancelRefresh() {
       return false
     },
+    noOpen() {
+      this.bookingModelvisible = true
+      this.spaceLoad = false
+    },
     openModel(type) {
       this.forwarderFlag = false
       if (['initCabin', 'ladingBill', 'vgmlink'].includes(type)) {
@@ -2146,19 +2534,31 @@ export default {
       }
       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
+          // 118和47两套逻辑 47禁用按钮 118发送邮件根据客户参数来判断
+          if (process.env.VUE_APP_TYPE !== 'gangjie') {
+            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.bookingModelvisible = true
+          } else {
+            if (!this.details.forwarder) {
+              this.bookingModelvisible = true
+            } else {
+              this.spaceLoad = true
+              this.$refs.sendMail.init(this.details)
+            }
           }
+        } else {
+          this.bookingModelvisible = true
         }
         this.modelType = type
-        this.bookingModelvisible = true
       } else if (['vgm', 'paper'].includes(type)) {
         this.openDialog(type)
       } else if (type === 'trace') {
@@ -2242,7 +2642,24 @@ export default {
       CheckAndInitVOLTAEdi(data).then(res => {
         if (res.code === 200) {
           this.voltaForm = res.data.extra
-          this.voltaFlag = true
+          if (!res.data.extra.blfrt) {
+            this.$set(this.voltaForm, 'blfrt', 'PrePaid')
+          }
+          if (!res.data.extra.documentTypeCode) {
+            this.$set(this.voltaForm, 'documentTypeCode', 'silc')
+          }
+          if (!res.data.extra.hsCode) {
+            this.$set(this.voltaForm, 'hsCode', '0000.00.00')
+          }
+          if (!this.voltaForm.shpperAddr) {
+            this.$set(this.voltaForm, 'shpperAddr', '')
+          }
+          if (!this.voltaForm.consigneeAddr) {
+            this.$set(this.voltaForm, 'consigneeAddr', '')
+          }
+          if (!this.voltaForm.notifyAddr) {
+            this.$set(this.voltaForm, 'notifyAddr', '')
+          }
           if (res.data.msg) {
             this.$message.warning(res.data.msg)
           }
@@ -2253,6 +2670,12 @@ export default {
             this.voltaForm.notifySecondName = ''
           }
           this.voltaData = res.data.extra.contaList
+          if (this.voltaForm.editPageCode === 'SLS') {
+            this.voltaTitle = '海领截单详情'
+          } else {
+            this.voltaTitle = 'VOLTA截单详情'
+          }
+          this.voltaFlag = true
           this.EDISloading = false
         } else {
           // this.$message.error(res.message)
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 7f8562d..93978e9 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -188,6 +188,22 @@
                     </a-popover>
                   </div>
                 </template>
+                <template #isSISubmitted="{ row }">
+                  <div v-if="row.isSISubmitted" style="text-align: center">
+                    <a-popover placement="topLeft">
+                      <div slot="content">{{ row.isSISubmitted }}</div>
+                      <i class="iconfont icon-chenggong flag-icon"></i>
+                    </a-popover>
+                  </div>
+                </template>
+                <template #isVGMSubmitted="{ row }">
+                  <div v-if="row.isVGMSubmitted" style="text-align: center">
+                    <a-popover placement="topLeft">
+                      <div slot="content">{{ row.isVGMSubmitted }}</div>
+                      <i class="iconfont icon-chenggong flag-icon"></i>
+                    </a-popover>
+                  </div>
+                </template>
                 <template #IsZZFX="{ row }">
                   <div v-if="row.isZZFX" style="text-align: center">
                     <a-popover placement="topLeft">
diff --git a/src/views/main/BookingLedger/list/modules/initData.js b/src/views/main/BookingLedger/list/modules/initData.js
index 29f4bdc..90a384b 100644
--- a/src/views/main/BookingLedger/list/modules/initData.js
+++ b/src/views/main/BookingLedger/list/modules/initData.js
@@ -486,6 +486,22 @@ export default {
       showHeaderOverflow: true,
       slots: { default: 'IsVGM' }
     },
+    {
+      field: 'isVGMSubmitted',
+      label: 'isVGMSubmitted',
+      width: 60,
+      title: 'VGM回执',
+      showHeaderOverflow: true,
+      slots: { default: 'isVGMSubmitted' }
+    },
+    {
+      field: 'isSISubmitted',
+      label: 'isSISubmitted',
+      width: 60,
+      title: 'SI回执',
+      showHeaderOverflow: true,
+      slots: { default: 'isSISubmitted' }
+    },
     {
       field: 'isCanDan',
       label: 'IsCanDan',
diff --git a/src/views/main/CabinManagement/details.vue b/src/views/main/CabinManagement/details.vue
index 29d9dd5..7ce275f 100644
--- a/src/views/main/CabinManagement/details.vue
+++ b/src/views/main/CabinManagement/details.vue
@@ -403,29 +403,29 @@
           <a-row>
             <a-col :span="8">
               <a-form-model-item :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" label="样单截止时间">
-                <a-date-picker v-model="form.sI_CUT_DATE" format="YYYY-MM-DD HH:00" />
+                <a-date-picker v-model="form.sI_CUT_DATE" valueFormat="YYYY-MM-DD HH:00" format="YYYY-MM-DD HH:00" />
               </a-form-model-item>
             </a-col>
             <a-col :span="8">
               <a-form-model-item :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" label="截港时间">
-                <a-date-picker v-model="form.cY_CUT_DATE" format="YYYY-MM-DD HH:00" />
+                <a-date-picker v-model="form.cY_CUT_DATE" valueFormat="YYYY-MM-DD HH:00" format="YYYY-MM-DD HH:00" />
               </a-form-model-item>
             </a-col>
             <a-col :span="8">
               <a-form-model-item :label-col="{ span: 10 }" :wrapper-col="{ span: 14 }" label="舱单-入港清单截止时间">
-                <a-date-picker v-model="form.manifesT_CUT_DATE" format="YYYY-MM-DD HH:00" />
+                <a-date-picker v-model="form.manifesT_CUT_DATE" valueFormat="YYYY-MM-DD HH:00" format="YYYY-MM-DD HH:00" />
               </a-form-model-item>
             </a-col>
           </a-row>
           <a-row>
             <a-col :span="8">
               <a-form-model-item :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" label="MDGF截止时间">
-                <a-date-picker v-model="form.mdgF_CUT_DATE" format="YYYY-MM-DD HH:00" />
+                <a-date-picker v-model="form.mdgF_CUT_DATE" valueFormat="YYYY-MM-DD HH:00" format="YYYY-MM-DD HH:00" />
               </a-form-model-item>
             </a-col>
             <a-col :span="8">
               <a-form-model-item :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" label="VGM截止时间">
-                <a-date-picker v-model="form.vgM_SUBMISSION_CUT_DATE" format="YYYY-MM-DD HH:00" />
+                <a-date-picker v-model="form.vgM_SUBMISSION_CUT_DATE" valueFormat="YYYY-MM-DD HH:00" format="YYYY-MM-DD HH:00" />
               </a-form-model-item>
             </a-col>
           </a-row>
diff --git a/src/views/main/CabinManagement/index.vue b/src/views/main/CabinManagement/index.vue
index c7356e9..546e0fd 100644
--- a/src/views/main/CabinManagement/index.vue
+++ b/src/views/main/CabinManagement/index.vue
@@ -151,7 +151,12 @@
             </a-col>
             <a-col :span="4">
               <a-form-item label="Week">
-                <a-input-number @pressEnter="getList" style="width:100%" v-model="form.week_at" allow-clear placeholder="请输入Week" />
+                <a-input-number
+                  @pressEnter="getList"
+                  style="width:100%"
+                  v-model="form.week_at"
+                  allow-clear
+                  placeholder="请输入Week" />
               </a-form-item>
             </a-col>
             <a-col :span="4">
@@ -173,7 +178,7 @@
             </a-col>
             <a-col :span="4">
               <a-form-item label="舱保类型">
-                <a-select  allowClear v-model="form.LOAD_GUARANTEE_FLAG" style="width: 100%" placeholder="请选择舱保类型">
+                <a-select allowClear v-model="form.LOAD_GUARANTEE_FLAG" style="width: 100%" placeholder="请选择舱保类型">
                   <a-select-option value="">请选择</a-select-option>
                   <a-select-option value="FULL">全部舱保</a-select-option>
                   <a-select-option value="PART">部分舱保</a-select-option>
@@ -182,7 +187,7 @@
             </a-col>
             <a-col :span="3">
               <a-form-item label="拆/合票">
-                <a-select  allowClear v-model="form.spliT_OR_MERGE_FLAG" style="width: 100%" placeholder="请选择拆/合票">
+                <a-select allowClear v-model="form.spliT_OR_MERGE_FLAG" style="width: 100%" placeholder="请选择拆/合票">
                   <a-select-option value="">请选择</a-select-option>
                   <a-select-option :value="1">拆票</a-select-option>
                   <a-select-option :value="2">合票</a-select-option>
@@ -196,10 +201,11 @@
     <a-card :bordered="false">
       <div style="margin-bottom: 10px;display: flex;justify-content: space-between;">
         <div>
-          <a-button type="primary" @click="handleAdd">新增</a-button>
-          <a-button type="danger" @click="handleDeleteAll">作废</a-button>
-          <a-button type="primary" style="margin-left: 50px;" @click="handleLabel">分配标签</a-button>
-          <a-button :loading="sumload" type="primary" style="margin-left: 10px;" @click="handleSum">合票</a-button>
+          <a-button size="small" type="primary" @click="handleAdd">新增</a-button>
+          <a-button size="small" type="danger" @click="handleDeleteAll">作废</a-button>
+          <a-button size="small" type="primary" style="margin-left: 50px;" @click="handleLabel">分配标签</a-button>
+          <a-button size="small" type="primary" @click="handleOpenMore">多提单号查询</a-button>
+          <a-button size="small" :loading="sumload" type="primary" @click="handleSum">合票</a-button>
           <a-upload
             :customRequest="customRequest"
             :multiple="false"
@@ -207,14 +213,14 @@
             accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
             :showUploadList="false"
             name="file">
-            <a-button type="primary">导入</a-button>
+            <a-button size="small" type="primary">导入</a-button>
           </a-upload>
-          <a-button type="danger" @click="handleSuport" :loading="loadingExport">导出</a-button>
+          <a-button size="small" type="danger" @click="handleSuport" :loading="loadingExport">导出</a-button>
           <!-- <a-button type="primary" @click="handleSendAll">批量发送邮件</a-button> -->
         </div>
         <div>
-          <a-button type="primary" @click="getList">查询</a-button>
-          <a-button style="margin-left: 8px" @click="init">重置</a-button>
+          <a-button size="small" type="primary" @click="getList">查询</a-button>
+          <a-button size="small" style="margin-left: 8px" @click="init">重置</a-button>
           <tableSort @columnChange="handleColumnChange" :columns="columns" :columnsAll="columnsAll"></tableSort>
         </div>
       </div>
@@ -262,8 +268,8 @@
           <span>{{ row.eta ? row.eta.substring(0, 10) : '' }}</span>
         </template>
         <template #spliT_OR_MERGE_FLAG="{ row }">
-          <span v-if="row.spliT_OR_MERGE_FLAG==1" >拆票</span>
-          <span v-if="row.spliT_OR_MERGE_FLAG==2" >合票</span>
+          <span v-if="row.spliT_OR_MERGE_FLAG == 1">拆票</span>
+          <span v-if="row.spliT_OR_MERGE_FLAG == 2">合票</span>
         </template>
         <template #remark="{ row }">
           <a-spin :spinning="row.dzmarkLoading">
@@ -296,7 +302,11 @@
         </template>
         <template #labelList="{ row }">
           <div>
-            <a-tag style="color: black !important;font-weight: bold;" :color="item.color" v-for="(item, index) in row.labelList" :key="index">{{ item.name }}</a-tag>
+            <a-tag
+              style="color: black !important;font-weight: bold;"
+              :color="item.color"
+              v-for="(item, index) in row.labelList"
+              :key="index">{{ item.name }}</a-tag>
           </div>
         </template>
 
@@ -311,6 +321,12 @@
         </template>
       </vxe-grid>
     </a-card>
+
+    <a-modal title="多提单号查询" :width="400" :visible="moreMlbnoFlag" @ok="moreNumSubmit" @cancel="moreMlbnoFlag = false">
+      <div>
+        <a-textarea v-model="moreNumVal" style="height: 200px" />
+      </div>
+    </a-modal>
     <a-modal width="800px" @ok="handleSubmitLabel" v-model="visible" title="分配标签" @cancel="visible = false">
       <a-spin :spinning="labelLoad">
         <!-- <a-select mode="multiple" style="width: 80%" :filter-option="filterOption" v-model="labelIdArray">
@@ -348,9 +364,6 @@ import {
   GetMergeList
 } from '@/api/modular/main/CompanySiteaccount'
 import { mapGetters } from 'vuex'
-import {
-  GetProjectList
-} from '@/api/modular/main/TaskmanageList'
 import { DjyCustomerSuggest, GetSysUserPage, DjyCustomerContacts } from '@/api/modular/main/BookingLedger'
 import columnSetting from '@/components/tableColumnSetting'
 import tableSort from '@/components/tableSort'
@@ -379,6 +392,7 @@ export default {
       labelList: [],
       loadingExport: false,
       setVisible: false,
+      moreNumVal: '',
       labelIdArray: [],
       CreateData: {
         customerContactId: []
@@ -391,13 +405,14 @@ export default {
       userInfoList: [],
       setVisible1: false,
       fetching: false,
+      moreMlbnoFlag: false,
       queryParam: {
         PageNo: 1,
         pageSize: 10,
         totalCount: 1
       },
       bookingServiceItem: [],
-      sumload:false,
+      sumload: false,
       formItemLayout: {
         labelCol1: { span: 6 },
         wrapperCol1: { span: 18 },
@@ -1120,12 +1135,12 @@ export default {
       })
       return Rdata
     },
-    handleSum(){
+    handleSum() {
       const select = this.$refs.table.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
         return item.id
       })
-      if(select.length<=1){
+      if (select.length <= 1) {
         this.$message.warning('至少选择两条数据')
         return false
       }
@@ -1133,8 +1148,8 @@ export default {
         mergeList: pkIdArr
       }
       this.sumload = true
-      GetMergeList(data).then(res=>{
-        if(res.success){
+      GetMergeList(data).then(res => {
+        if (res.success) {
           this.$refs.generation.initSum(res.data)
         } else {
           this.$message.error(res.message)
@@ -1172,8 +1187,8 @@ export default {
         return item.id
       })
       const arr = []
-      this.labelList.forEach(item=>{
-        if(item.isActive){
+      this.labelList.forEach(item => {
+        if (item.isActive) {
           arr.push(item.id)
         }
       })
@@ -1209,7 +1224,7 @@ export default {
                   return <div>{item.slotBookingNo} 成功 </div>
                 } else {
                   return (
-                    <div style= {{ color: 'red' }} >
+                    <div style={{ color: 'red' }} >
                       {item.slotBookingNo} 失败 {item.failReason}
                     </div>
                   )
@@ -1222,8 +1237,8 @@ export default {
         this.getList()
       })
     },
-    cellClickEvent({ row,rowIndex, column }) {
-      console.log(row,rowIndex, column)
+    cellClickEvent({ row, rowIndex, column }) {
+      console.log(row, rowIndex, column)
       if (column.field === 'labelList') {
         this.$refs.table.clearCheckboxRow()
         this.$refs.table.toggleCheckboxRow(this.loadData[rowIndex])
@@ -1232,14 +1247,14 @@ export default {
         this.labelLoad = true
         BookingLabelList({ scope: 1 }).then(res => {
           this.labelList = res.data
-          this.labelList.forEach(item=>{
+          this.labelList.forEach(item => {
             item.isActive = false
-            if(row.labelList){
-              row.labelList.forEach(ite=>{
-              if(item.id===ite.id){
-                item.isActive = true
-              }
-            })
+            if (row.labelList) {
+              row.labelList.forEach(ite => {
+                if (item.id === ite.id) {
+                  item.isActive = true
+                }
+              })
             }
           })
           this.labelLoad = false
@@ -1327,6 +1342,39 @@ export default {
         row.dzmarkLoading = false
       })
     },
+    handleOpenMore() {
+      if (this.form.SLOT_BOOKING_NO) {
+        const arr = this.form.SLOT_BOOKING_NO.split(/，|,/)
+        let val = ``
+        arr.map((item, index) => {
+          val += `${item}
+` // 这里不要格式化
+        })
+        this.moreNumVal = val
+      } else {
+        this.moreNumVal = ''
+      }
+      this.moreMlbnoFlag = true
+    },
+    moreNumSubmit() {
+      let data = ''
+      this.moreNumVal
+        .replace(/\n|\r/g, ',')
+        .split(',')
+        .forEach((item) => {
+          if (item.replace(/\s*/g, '')) {
+            if (data) {
+              data = `${data},${item}`
+            } else {
+              data = item
+            }
+          }
+        })
+
+      this.form.SLOT_BOOKING_NO = data
+      this.moreMlbnoFlag = false
+      this.$forceUpdate()
+    },
     handleOpenSlot(row) {
       this.$refs.generation.init(row)
     },
@@ -1343,7 +1391,7 @@ export default {
         this.CustomerList = res.data.rows
       })
     },
-    handleClickLable(index){
+    handleClickLable(index) {
       this.$set(this.labelList[index], 'isActive', !this.labelList[index].isActive)
       this.$forceUpdate()
     },
@@ -1360,7 +1408,7 @@ export default {
       this.labelIdArray = []
       this.labelLoad = true
       BookingLabelList({ scope: 1 }).then(res => {
-        res.data.forEach(item=>{
+        res.data.forEach(item => {
           item.isActive = false
         })
         this.labelList = res.data
@@ -1673,62 +1721,70 @@ button {
 /deep/ .ant-form-item {
   margin-bottom: 0px !important;
 }
+
 .content {
-    max-height: 300px;
-    overflow-y: auto;
-    overflow-x: hidden;
-    width: 100%;
-    &::-webkit-scrollbar {
-      width: 0 !important;
+  max-height: 300px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  width: 100%;
+
+  &::-webkit-scrollbar {
+    width: 0 !important;
+  }
+
+  .items {
+    display: inline-block;
+    height: 28px;
+    line-height: 26px;
+    border: 1px dashed #ccc;
+    border-radius: 4px;
+    padding: 0 10px;
+    margin-top: 10px;
+    margin-right: 10px;
+    font-size: 13px;
+    cursor: pointer;
+    position: relative;
+
+    .edit {
+      width: 17px;
+      height: 17px;
+      border-radius: 0 3px 0 0;
+      background: #c9c9c9;
+      display: none;
+      position: absolute;
+      right: -1px;
+      top: -1px;
+      text-align: center;
+      line-height: 17px;
     }
-    .items {
-      display: inline-block;
-      height: 28px;
-      line-height: 26px;
-      border: 1px dashed #ccc;
-      border-radius: 4px;
-      padding: 0 10px;
-      margin-top: 10px;
-      margin-right: 10px;
-      font-size: 13px;
-      cursor: pointer;
+
+    &:hover {
+
+      border: 1px dashed @primary-color;
       position: relative;
-      .edit{
-        width: 17px;
-        height: 17px;
-        border-radius: 0 3px 0 0;
-        background: #c9c9c9;
-        display: none;
+
+      &::before {
+        width: 100%;
+        height: 100%;
+        content: '';
+        background: @primary-color;
+        opacity: 0.08;
         position: absolute;
-        right: -1px;
-        top: -1px;
-        text-align: center;
-        line-height: 17px;
+        top: 0;
+        left: 0;
+        border-radius: 4px;
       }
-      &:hover {
 
-        border: 1px dashed @primary-color;
-        position: relative;
-        &::before {
-          width: 100%;
-          height: 100%;
-          content: '';
-          background: @primary-color;
-          opacity: 0.08;
-          position: absolute;
-          top: 0;
-          left: 0;
-          border-radius: 4px;
-        }
-        .edit{
-          display: block;
-        }
-      }
-      &.active {
-        background: @primary-color;
-        border: 1px dashed @primary-color;
-        color: #fff;
+      .edit {
+        display: block;
       }
     }
+
+    &.active {
+      background: @primary-color;
+      border: 1px dashed @primary-color;
+      color: #fff;
+    }
   }
+}
 </style>
diff --git a/src/views/main/Customer/addForm.vue b/src/views/main/Customer/addForm.vue
index d18e0e4..cb1f4c3 100644
--- a/src/views/main/Customer/addForm.vue
+++ b/src/views/main/Customer/addForm.vue
@@ -238,6 +238,17 @@
           <vxe-input v-model="row.remark" type="text" transfer></vxe-input>
         </template>
       </vxe-column>
+      <vxe-column field="carrierProp" title="船公司" :edit-render="{}">
+        <template #default="{ row }">
+          <span>{{ formatCarrier(row.carrierProp) }}</span>
+        </template>
+        <template #edit="{ row }">
+          <vxe-select :filter-method="handleFilter" filterable v-model="row.carrierProp" transfer>
+            <vxe-option v-for="item in carrierList" :key="item.code" :value="`${item.enName}`" :label="`${item.enName}/${item.cnName}`" >
+            </vxe-option>
+          </vxe-select>
+        </template>
+      </vxe-column>
     </vxe-table>
     <p style="margin-top: 20px;" class="CsFormTitle">
       <span><i class="iconfont icon-tuandui"></i>地址信息</span>
@@ -407,7 +418,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'projectDict'
+      'projectDict', 'carrierList'
     ])
   },
   mounted() {
@@ -424,6 +435,23 @@ export default {
         addrType: ''
       })
     },
+    handleFilter({ searchValue, option, group }) {
+      const small = searchValue.toLowerCase()
+      const big = searchValue.toUpperCase()
+      const str = option.label + option.value
+      if (str.includes(small) || str.includes(big)) {
+        return true
+      }
+    },
+    formatCarrier(val) {
+      let RData = ''
+      this.carrierList.forEach(item => {
+        if (item.enName === val) {
+          RData = item.cnName + '/' + item.enName
+        }
+      })
+      return RData
+    },
     getUserList(name = '', type) {
       GetSysUserPage({
         name: name
diff --git a/src/views/main/Customer/editForm.vue b/src/views/main/Customer/editForm.vue
index 9b5ed3b..26813ae 100644
--- a/src/views/main/Customer/editForm.vue
+++ b/src/views/main/Customer/editForm.vue
@@ -236,6 +236,17 @@
           <vxe-input v-model="row.remark" type="text" transfer></vxe-input>
         </template>
       </vxe-column>
+      <vxe-column field="carrierProp" title="船公司" :edit-render="{}">
+        <template #default="{ row }">
+          <span>{{ formatCarrier(row.carrierProp) }}</span>
+        </template>
+        <template #edit="{ row }">
+          <vxe-select :filter-method="handleFilter" filterable v-model="row.carrierProp" transfer>
+            <vxe-option v-for="item in carrierList" :key="item.code" :value="`${item.enName}`" :label="`${item.enName}/${item.cnName}`" >
+            </vxe-option>
+          </vxe-select>
+        </template>
+      </vxe-column>
     </vxe-table>
     <p style="margin-top: 20px;" class="CsFormTitle">
       <span><i class="iconfont icon-tuandui"></i>地址信息</span>
@@ -392,7 +403,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'projectDict'
+      'projectDict', 'carrierList'
     ])
   },
   mounted() {
@@ -466,6 +477,14 @@ export default {
       console.log(this.propStringData)
       this.getUserList()
     },
+    handleFilter({ searchValue, option, group }) {
+      const small = searchValue.toLowerCase()
+      const big = searchValue.toUpperCase()
+      const str = option.label + option.value
+      if (str.includes(small) || str.includes(big)) {
+        return true
+      }
+    },
     getUserList(name = '', type) {
       GetSysUserPage({
         name: name
@@ -513,6 +532,15 @@ export default {
       }
       return RData
     },
+    formatCarrier(val) {
+      let RData = ''
+      this.carrierList.forEach(item => {
+        if (item.enName === val) {
+          RData = item.cnName + '/' + item.enName
+        }
+      })
+      return RData
+    },
     formatSex(value) {
       if (value === '1') {
         return '男'
diff --git a/src/views/main/Taskmanage/TaskmanageList/index.vue b/src/views/main/Taskmanage/TaskmanageList/index.vue
index 76263b3..f82c544 100644
--- a/src/views/main/Taskmanage/TaskmanageList/index.vue
+++ b/src/views/main/Taskmanage/TaskmanageList/index.vue
@@ -40,7 +40,7 @@
                       :style="{color: threeLevel.key==='CAUTION_NOTICE' ? 'red' : '' }"
                       :show-icon="false"
                     >
-                      <div  slot="title" :style="{color: threeLevel.key==='CAUTION_NOTICE' ? 'red' : '' }">
+                      <div slot="title" :style="{color: threeLevel.key==='CAUTION_NOTICE' ? 'red' : '' }">
                         {{ `${threeLevel.name}  (${threeLevel.total})` }}</div>
                     </a-tree-node>
                   </a-tree-node>
@@ -228,9 +228,9 @@
                   >
                     <span class="tab-btn"> <a-icon type="redo" :style="{ fontSize: '16px' }" /> 刷新 </span>
                   </a-popconfirm>
-                  <span class="tab-btn" @click="tableHeaderEdit">
+                  <!-- <span class="tab-btn" @click="tableHeaderEdit">
                     <a-icon type="setting" :style="{ fontSize: '14px' }" />
-                  </span>
+                  </span> -->
                 </div>
               </template>
             </vxe-toolbar>
@@ -245,18 +245,104 @@
               <template #status="{ row }">
                 <span>{{ selectStatus(row.status) }}</span>
               </template>
+              <template #iS_EXCEPT="{ row }">
+                <span v-if="row.iS_EXCEPT==1">异常</span>
+                <span v-if="row.iS_EXCEPT==0">未异常</span>
+              </template>
+              <template #iS_COMPLETE="{ row }">
+                <span v-if="row.iS_COMPLETE==1">已完成</span>
+                <span v-if="row.iS_COMPLETE==0">未完成</span>
+              </template>
+              <template #iS_PUBLIC="{ row }">
+                <span v-if="row.iS_PUBLIC==1">公共</span>
+                <span v-if="row.iS_PUBLIC==0">非公共</span>
+              </template>
+              <template #iS_SET_AUTO_EMAIL="{ row }">
+                <span v-if="row.iS_SET_AUTO_EMAIL==1">是</span>
+                <span v-if="row.iS_SET_AUTO_EMAIL==0">否</span>
+              </template>
+              <template #iS_DONGSH_RECV="{ row }">
+                <span v-if="row.iS_DONGSH_RECV==1">是</span>
+                <span v-if="row.iS_DONGSH_RECV==0">否</span>
+              </template>
+              <template #iS_DONGSH_RESULT="{ row }">
+                <span v-if="row.iS_DONGSH_RESULT==1">是</span>
+                <span v-if="row.iS_DONGSH_RESULT==0">否</span>
+              </template>
+              <template #iS_WEEK_DIFF="{ row }">
+                <span v-if="row.iS_WEEK_DIFF==1">是</span>
+                <span v-if="row.iS_WEEK_DIFF==0">否</span>
+              </template>
+              <template #iS_PRICE_DATE_DIFF="{ row }">
+                <span v-if="row.iS_PRICE_DATE_DIFF==1">是</span>
+                <span v-if="row.iS_PRICE_DATE_DIFF==0">否</span>
+              </template>
+              <template #iS_TRANSFER="{ row }">
+                <span v-if="row.iS_TRANSFER==1">是</span>
+                <span v-if="row.iS_TRANSFER==0">否</span>
+              </template>
+              <template #iS_CUT_DATE_ADVANCED="{ row }">
+                <span v-if="row.iS_CUT_DATE_ADVANCED==1">是</span>
+                <span v-if="row.iS_CUT_DATE_ADVANCED==0">否</span>
+              </template>
+              <template #iS_UPDATE_BOOKING="{ row }">
+                <span v-if="row.iS_UPDATE_BOOKING==1">是</span>
+                <span v-if="row.iS_UPDATE_BOOKING==0">否</span>
+              </template>
+              <template #iS_SEND_EMAIL="{ row }">
+                <span v-if="row.iS_SEND_EMAIL==1">已发送</span>
+                <span v-if="row.iS_SEND_EMAIL==0">未发送</span>
+              </template>
+              <template #iS_CHANGE="{ row }">
+                <span v-if="row.iS_CHANGE==1">已发送</span>
+                <span v-if="row.iS_CHANGE==0">未发送</span>
+              </template>
+              <template #iS_EMAIL_SEND="{ row }">
+                <span v-if="row.iS_EMAIL_SEND==1">已推送</span>
+                <span v-if="row.iS_EMAIL_SEND==0">未推送</span>
+              </template>
+              <template #procesS_STATUS="{ row }">
+                <span v-if="row.procesS_STATUS=='TEMP'">待处理</span>
+                <span v-if="row.procesS_STATUS=='SUCC'">处理成功</span>
+                <span v-if="row.procesS_STATUS=='FAILURE'">失败</span>
+              </template>
+              <template #cautioN_NOTICE_TYPE="{ row }">
+                <span v-if="row.cautioN_NOTICE_TYPE=='WeekAt'">计费周差异</span>
+                <span v-if="row.cautioN_NOTICE_TYPE=='PriceCalcDate'">计费日期差异</span>
+                <span v-if="row.cautioN_NOTICE_TYPE=='ChangeTransfer'">直达转为中转</span>
+                <span v-if="row.cautioN_NOTICE_TYPE=='ChangeVesselVoyno'">船名航次变化</span>
+                <span v-if="row.cautioN_NOTICE_TYPE=='VGMCutDateAdvanced'">VGM截止时间提前</span>
+                <span v-if="row.cautioN_NOTICE_TYPE=='SICutDateAdvanced'">SI截止时间提前</span>
+              </template>
+              <template #ouT_BUSI_TYPE="{ row }">
+                <span v-if="row.ouT_BUSI_TYPE==' SPLIT'">已拆单</span>
+                <span v-else>未拆单</span>
+              </template>
+              <template #sI_SUBTYPE="{ row }">
+                <span v-if="row.sI_SUBTYPE=='BOOK_ORDER'">订舱</span>
+                <span v-if="row.sI_SUBTYPE=='MAIL_RECV'">邮件接受</span>
+              </template>
+              <template #plaN_TYPE="{ row }">
+                <span v-if="row.plaN_TYPE=='Rolling'">预甩货</span>
+                <span v-if="row.plaN_TYPE=='Transfer'">中专预甩</span>
+              </template>
+              <template #busI_TYPE="{ row }">
+                <span v-if="row.busI_TYPE=='BookingConfirmation'">订舱</span>
+                <span v-if="row.busI_TYPE=='BookingAmendment'">订舱变更</span>
+                <span v-if="row.busI_TYPE=='BookingCancellation'">订舱取消</span>
+              </template>
               <template #truckName="{ row }">
                 <a-icon @click="handleOpen(row)" style="cursor: pointer;" type="edit" />
-                {{ row.truckName }}
+                {{ row.trucK_NAME }}
               </template>
               <template #taskType="{ row }">
-                <span>{{ filterType(row.taskType) }}</span>
+                <span>{{ filterType(row.tasK_TYPE) }}</span>
               </template>
               <template #taskScource="{ row }">
-                <span>{{ filterScource(row.taskSource) }}</span>
+                <span>{{ filterScource(row.tasK_SOURCE) }}</span>
               </template>
               <template #taskTitle="{ row }">
-                <span class="task-tit" @click="changePage(row)">{{ row.taskTitle }}</span>
+                <span class="task-tit" @click="changePage(row)">{{ row.tasK_TITLE }}</span>
               </template>
               <template #operate="{ row }">
                 <vxe-button class="operate-btn" type="text" icon="vxe-icon-edit" @click="changePage(row)"></vxe-button>
@@ -481,11 +567,11 @@ export default {
           if (this.saveNeedCar !== null && this.saveNeedCar !== '') {
             let index = 0
             this.gridOptions.data.forEach((ite, inde) => {
-              if (ite.pkId === this.saveNeedCar) {
+              if (ite.pK_ID === this.saveNeedCar) {
                 index = inde
               }
             })
-            GetTaskManagePage({ pkId: this.saveNeedCar })
+            GetTaskManagePage({ pK_ID: this.saveNeedCar })
               .then(res => {
                 if (res.success) {
                   this.$set(this.gridOptions.data, index, res.data.items[0])
@@ -588,6 +674,7 @@ export default {
       },
       // 页数计算
       paperCalcVisible: false,
+      taskTypeColumeList: [],
       paperCalcRes: [],
       paperCalcColumns: [
         {
@@ -653,7 +740,7 @@ export default {
     },
     handleSaveSend() {
       const data = {
-        taskPKId: this.editRow.pkId,
+        taskPKId: this.editRow.pK_ID,
         truckId: this.selectCar,
         truckCode: this.selectCarCode,
         truckName: this.selectCarName,
@@ -677,7 +764,7 @@ export default {
     },
     handleChangeCar() {
       const data = {
-        taskPKId: this.editRow.pkId,
+        taskPKId: this.editRow.pK_ID,
         truckId: this.selectCar,
         truckCode: this.selectCarCode,
         truckName: this.selectCarName,
@@ -833,7 +920,7 @@ export default {
     },
     getConfigUser(isInit = false) {
       const query = {
-        typeArr: ['task_list_cond', 'task_list_column', 'task_list_page']
+        typeArr: ['task_list_cond', 'task_list_page']
       }
       DjyUserConfigMulti(this.$qs.stringify(query, { arrayFormat: 'repeat' })).then(res => {
         const $data = {}
@@ -842,9 +929,6 @@ export default {
             case 'task_list_cond':
               this.$set($data, 'task_list_cond', item)
               break
-            case 'task_list_column':
-              this.$set($data, 'task_list_column', item)
-              break
             case 'task_list_page':
               this.setPageSize(item)
               break
@@ -856,11 +940,26 @@ export default {
         } else {
           this.setFormData({}, false, true)
         }
-        if (Object.keys($data).includes('task_list_column')) {
-          this.setTableList($data.task_list_column)
-        } else {
-          this.setTableList({})
-        }
+        // if (Object.keys($data).includes('task_list_column')) {
+        //   this.setTableList($data.task_list_column)
+        // } else {
+        //   this.setTableList({})
+        // }
+      })
+      const query1 = {
+        typeArr: ['basic', 'SI_FEEDBACK', 'BC', 'PER_BILL', 'TRUCK_DISPATCH', 'CUT_MODIFY', 'ROLLING_NOMINATION', 'DRAFT', 'POD_DISCHARGE_FULL', 'CAUTION_NOTICE', 'ROUTE_CUT_CHANGE']
+      }
+      DjyUserConfigMulti(this.$qs.stringify(query1, { arrayFormat: 'repeat' })).then(res => {
+         if (res.data.length > 0) {
+            const arr = []
+            res.data.forEach(item => {
+              arr.push({
+                list: JSON.parse(item.configJson),
+                type: item.type
+              })
+            })
+            this.taskTypeColumeList = arr
+         }
       })
     },
     setFormData(data, isReset = false, isInit = false) {
@@ -1024,7 +1123,7 @@ export default {
     FnPrint() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pkId
+        return item.pK_ID
       })
       if (pkIdArr.length != 1) {
         this.$message.error('请仅选择一条数据')
@@ -1043,7 +1142,7 @@ export default {
     FnSendCar() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pkId
+        return item.pK_ID
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1084,7 +1183,7 @@ export default {
     CancelSendCar() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pkId
+        return item.pK_ID
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1125,16 +1224,14 @@ export default {
       this.activeTreeKey = selectedKeys
       if (selectedKeys.length === 0) {
         this.gridOptions.loading = true
+        this.formRes.taskType = ''
         this.init()
         return false
       }
       const indexArr = selectedKeys[0].split('-')
-      console.log(indexArr)
       if (indexArr.length > 2) {
         const key = this.levelTree[indexArr[2]].actionKey
         const action = key.split('#')
-        console.log('=== activeTreeKey ===', this.activeTreeKey)
-        console.log('选择', indexArr[2], key)
         this.taskType = action[2]
         this.form.setFieldsValue({
           taskCategory: action[0],
@@ -1143,6 +1240,24 @@ export default {
         })
         this.formRes.taskCategory = action[0]
         this.formRes.taskType = action[2]
+        let columnsArr1 = []
+        let columnsArr2 = []
+        this.taskTypeColumeList.forEach(item => {
+          if (item.type === action[2]) {
+            columnsArr1 = item.list
+          }
+          if (item.type === 'basic') {
+            columnsArr2 = item.list
+          }
+        })
+        if (columnsArr1.length === 0 && columnsArr2.length === 0) {
+          this.gridOptions.columns = JSON.parse(JSON.stringify(initData.columns))
+        } else {
+          const arr = columnsArr2.concat(columnsArr1)
+          arr.push({ field: 'operate', title: '操作', width: 100, noDraggable: true, slots: { default: 'operate' }, fixed: 'right', resizable: false })
+          arr.unshift({ type: 'checkbox', width: 60, noDraggable: true })
+          this.gridOptions.columns = arr
+        }
         this.init({
           taskCategory: action[0],
           status: action[1],
@@ -1167,6 +1282,7 @@ export default {
       this.activeTreeKey = []
     },
     init(queryParam = {}) {
+      console.log(queryParam)
       this.gridOptions.pagerConfig = {
         total: 0,
         currentPage: 1,
@@ -1443,107 +1559,114 @@ export default {
     },
     changePage(data) {
       console.log(data)
-      if (data.taskType === 'VGM_COMPARE') {
+      if (data.tasK_TYPE === 'VGM_COMPARE') {
         // VGM比对查看页面
         this.$router.push({
           path: '/commontaskmanage/TaskVgmContrast',
-          query: { taskPKId: data.pkId, type: data.status }
+          query: { taskPKId: data.pK_ID, type: data.status }
         })
-      } else if (data.taskType === 'INVOICE_BILL_MAIL') {
+      } else if (data.tasK_TYPE === 'INVOICE_BILL_MAIL') {
         // 航次账单查看
-        this.$router.push({ path: '/commontaskmanage/VoyageBill', query: { taskPKId: data.pkId } })
-      } else if (data.taskType === 'PER_BILL') {
+        this.$router.push({ path: '/commontaskmanage/VoyageBill', query: { taskPKId: data.pK_ID } })
+      } else if (data.tasK_TYPE === 'PER_BILL') {
         // 单票账单查看
-        this.$router.push({ path: '/commontaskmanage/singleTicket', query: { taskPKId: data.pkId } })
-      } else if (data.taskType === 'CHANGE_SHIP') {
+        this.$router.push({ path: '/commontaskmanage/singleTicket', query: { taskPKId: data.pK_ID } })
+      } else if (data.tasK_TYPE === 'CHANGE_SHIP') {
         // 换船通知查看
-        this.$router.push({ path: '/commontaskmanage/TaskChangeShip', query: { taskPKId: data.pkId, type: 'change' } })
-      } else if (data.taskType === 'ABORT_CHANGE_SHIP') {
+        this.$router.push({ path: '/commontaskmanage/TaskChangeShip', query: { taskPKId: data.pK_ID, type: 'change' } })
+      } else if (data.tasK_TYPE === 'ABORT_CHANGE_SHIP') {
         // 取消换船通知查看
         this.$router.push({
           path: '/commontaskmanage/TaskChangeShip',
-          query: { taskPKId: data.pkId, type: 'abortChange' }
+          query: { taskPKId: data.pK_ID, type: 'abortChange' }
         })
-      } else if (data.taskType === 'ORIGINAL_LOST') {
+      } else if (data.tasK_TYPE === 'ORIGINAL_LOST') {
         // 正本缺失查看
-        this.$router.push({ path: '/commontaskmanage/TaskOriginalLost', query: { taskPKId: data.pkId } })
-      } else if (data.taskType === 'SHIPPING_ORDER') {
+        this.$router.push({ path: '/commontaskmanage/TaskOriginalLost', query: { taskPKId: data.pK_ID } })
+      } else if (data.tasK_TYPE === 'SHIPPING_ORDER') {
         // 订舱详情查看
-        this.$router.push({ path: '/commontaskmanage/BookingDetails', query: { taskPKId: data.pkId } })
-      } else if (data.taskType === 'SI_FEEDBACK') {
+        this.$router.push({ path: '/commontaskmanage/BookingDetails', query: { taskPKId: data.pK_ID } })
+      } else if (data.tasK_TYPE === 'SI_FEEDBACK') {
         // 订舱详情编辑
-        this.$router.push({ path: '/commontaskmanage/TaskmanageDetail', query: { taskPKId: data.pkId } })
-      } else if (data.taskType === 'TRUCK_DISPATCH') {
+        this.$router.push({ path: '/commontaskmanage/TaskmanageDetail', query: { taskPKId: data.pK_ID } })
+      } else if (data.tasK_TYPE === 'TRUCK_DISPATCH') {
         // 派车编辑
-        // this.$router.push({ path: '/commontaskmanage/TaskmanageDetail', query: { taskPKId: data.pkId } })
+        // this.$router.push({ path: '/commontaskmanage/TaskmanageDetail', query: { taskPKId: data.pK_ID } })
         this.$router.push({
           name: 'SendCarAdd',
           query: {
             type: 'Edit',
-            taskPKId: data.pkId
+            taskPKId: data.pK_ID
           }
         })
-      } else if (data.taskType === 'BC') {
+      } else if (data.tasK_TYPE === 'BC') {
         // BC详情
-        // this.$router.push({ path: '/commontaskmanage/BcFileDetail', query: { taskPKId: data.pkId } })
+        // this.$router.push({ path: '/commontaskmanage/BcFileDetail', query: { taskPKId: data.pK_ID } })
         // BC编辑
-        this.$router.push({ path: '/commontaskmanage/BcEditing', query: { taskPKId: data.pkId } })
-      } else if (data.taskType === 'BC_MODIFY') {
+        this.$router.push({ path: '/commontaskmanage/BcEditing', query: { taskPKId: data.pK_ID } })
+      } else if (data.tasK_TYPE === 'BC_MODIFY') {
         // BC变更
-        this.$router.push({ path: '/commontaskmanage/BCModify', query: { taskPKId: data.pkId } })
-      } else if (data.taskType === 'CANCELLATION') {
+        this.$router.push({ path: '/commontaskmanage/BCModify', query: { taskPKId: data.pK_ID } })
+      } else if (data.tasK_TYPE === 'CANCELLATION') {
         // Cancellation
-        this.$router.push({ path: '/commontaskmanage/Cancellation', query: { taskPKId: data.pkId } })
-      } else if (data.taskType === 'ROLLING_NOMINATION') {
+        this.$router.push({ path: '/commontaskmanage/Cancellation', query: { taskPKId: data.pK_ID } })
+      } else if (data.tasK_TYPE === 'ROLLING_NOMINATION') {
+        // ROLLING_NOMINATION
+        this.$router.push({ path: '/commontaskmanage/rollingNomination', query: { taskPKId: data.pK_ID } })
+      } else if (data.tasK_TYPE === 'VGM_FEEDBACK') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/rollingNomination', query: { taskPKId: data.pkId } })
-      } else if (data.taskType === 'VGM_FEEDBACK') {
+        this.$router.push({ path: '/commontaskmanage/vgmDetail', query: { taskPKId: data.pK_ID, type: 'VGM_FEEDBACK' } })
+      } else if (data.tasK_TYPE === 'CAUTION_NOTICE') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/vgmDetail', query: { taskPKId: data.pkId, type: 'VGM_FEEDBACK' } })
-      } else if (data.taskType === 'CAUTION_NOTICE') {
+        this.$router.push({ path: '/commontaskmanage/cautionNotice', query: { taskPKId: data.pK_ID } })
+      } else if (data.tasK_TYPE === 'VGM_MISSING') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/cautionNotice', query: { taskPKId: data.pkId } })
-      } else if (data.taskType === 'VGM_MISSING') {
+        this.$router.push({ path: '/commontaskmanage/vgmDetail', query: { taskPKId: data.pK_ID, type: 'VGM_MISSING' } })
+      } else if (data.tasK_TYPE === 'CUT_MODIFY') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/vgmDetail', query: { taskPKId: data.pkId, type: 'VGM_MISSING' } })
-      } else if (data.taskType === 'CUT_MODIFY') {
+        this.$router.push({ path: '/commontaskmanage/cutTime', query: { taskPKId: data.pK_ID } })
+      } else if (data.tasK_TYPE === 'POD_DISCHARGE_FULL') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/cutTime', query: { taskPKId: data.pkId } })
-      } else if (data.taskType === 'POD_DISCHARGE_FULL') {
+        this.$router.push({ path: '/commontaskmanage/POD_DISCHARGE_FULL', query: { taskPKId: data.pK_ID } })
+      } else if (data.tasK_TYPE === 'TRNAS_PLAN_HAS_CHANGE') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/POD_DISCHARGE_FULL', query: { taskPKId: data.pkId } })
-      } else if (data.taskType === 'DRAFT') {
+        this.$router.push({ path: '/commontaskmanage/trnasPlan', query: { taskPKId: data.pK_ID } })
+      } else if (data.tasK_TYPE === 'DRAFT') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/draft', query: { taskPKId: data.pkId } })
-      } else if (data.taskType === 'ROUTE_CUT_CHANGE') {
+        this.$router.push({ path: '/commontaskmanage/draft', query: { taskPKId: data.pK_ID } })
+      } else if (data.tasK_TYPE === 'ROUTE_CUT_CHANGE') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/cutChange', query: { taskPKId: data.pkId } })
-      } else if (data.taskType === 'POD_GATEOUT_FULL') {
+        this.$router.push({ path: '/commontaskmanage/cutChange', query: { taskPKId: data.pK_ID } })
+      } else if (data.tasK_TYPE === 'POD_GATEOUT_FULL') {
         // ROLLING_NOMINATION
-        this.$router.push({ path: '/commontaskmanage/POD_GATEOUT_FULL', query: { taskPKId: data.pkId } })
+        this.$router.push({ path: '/commontaskmanage/POD_GATEOUT_FULL', query: { taskPKId: data.pK_ID } })
       } else {
         // 订舱详情查看
-        this.$router.push({ path: '/commontaskmanage/BookingDetails', query: { taskPKId: data.pkId } })
+        this.$router.push({ path: '/commontaskmanage/BookingDetails', query: { taskPKId: data.pK_ID } })
       }
     },
     filterType(val) {
       const res = this.taskTypeList.filter((item, index) => {
         return item.code === val
       })
-      return res[0].name
+      if (res.length > 0) {
+        return res[0].name
+      }
     },
     filterScource(val) {
       const res = this.sourceList.filter((item, index) => {
         return item.code === val
       })
-      return res[0].name
+      if (res.length > 0) {
+        return res[0].name
+      }
     },
     cancelFun() {},
     // 取消
     removeFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pkId
+        return item.pK_ID
       })
       console.log('当前选中', pkIdArr)
       if (pkIdArr.length === 0) {
@@ -1569,7 +1692,7 @@ export default {
     submitFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pkId
+        return item.pK_ID
       })
       console.log('当前选中', pkIdArr)
       if (pkIdArr.length === 0) {
@@ -1595,7 +1718,7 @@ export default {
     downloadFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pkId
+        return item.pK_ID
       })
       console.log('当前选中', pkIdArr)
       if (pkIdArr.length === 0) {
@@ -1638,7 +1761,7 @@ export default {
       // 未找到接口
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pkId
+        return item.pK_ID
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1661,7 +1784,7 @@ export default {
     SendEmailFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pkId
+        return item.pK_ID
       })
       console.log('当前选中', pkIdArr)
       if (pkIdArr.length === 0) {
@@ -1704,7 +1827,7 @@ export default {
     laraPaperCalc() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pkId
+        return item.pK_ID
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1732,7 +1855,7 @@ export default {
     copyPrintFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pkId
+        return item.pK_ID
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1772,7 +1895,7 @@ export default {
     copyDownloadFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pkId
+        return item.pK_ID
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1812,7 +1935,7 @@ export default {
     printBatchFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pkId
+        return item.pK_ID
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1846,7 +1969,7 @@ export default {
     laraPaperRegistFun() {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
-        return item.pkId
+        return item.pK_ID
       })
       if (pkIdArr.length === 0) {
         this.$message.error('请选择数据')
@@ -1862,7 +1985,7 @@ export default {
     },
     taskDownloadFun(data) {
       // 非DRAFT 任务类型下，接口报错。
-      this.DownloadTaskAttach(data.pkId, data.taskTitle)
+      this.DownloadTaskAttach(data.pK_ID, data.taskTitle)
     }
     // onDownloadErrClose() {
     //   console.log('关闭')
diff --git a/src/views/main/Taskmanage/TaskmanageList/modules/initData.js b/src/views/main/Taskmanage/TaskmanageList/modules/initData.js
index add878c..7442397 100644
--- a/src/views/main/Taskmanage/TaskmanageList/modules/initData.js
+++ b/src/views/main/Taskmanage/TaskmanageList/modules/initData.js
@@ -1,23 +1,23 @@
 export default {
   columns: [
     { type: 'checkbox', width: 60, noDraggable: true },
-    { field: 'taskType', width: 100, title: '任务类型', showHeaderOverflow: true, sortable: true, slots: { default: 'taskType' } },
-    { field: 'taskTitle', width: 200, title: '任务标题', showHeaderOverflow: true, sortable: true, slots: { default: 'taskTitle' } },
+    { field: 'tasK_TYPE', width: 100, title: '任务类型', showHeaderOverflow: true, sortable: true, slots: { default: 'taskType' } },
+    { field: 'tasK_TITLE', width: 200, title: '任务标题', showHeaderOverflow: true, sortable: true, slots: { default: 'taskTitle' } },
     { field: 'etd', width: 180, title: '开船日期', showHeaderOverflow: true, sortable: true },
-    { field: 'vesselVoyno', width: 180, title: '船名/航次', showHeaderOverflow: true, sortable: true },
-    { field: 'mblNo', width: 120, title: '提单号', showHeaderOverflow: true, sortable: true },
-    { field: 'yardName', width: 100, title: '场站', showHeaderOverflow: true, sortable: true },
-    { field: 'contaInfo', width: 100, title: '箱型箱量', showHeaderOverflow: true, sortable: true },
-    { field: 'taskReqUserName', width: 100, title: '操作名称', showHeaderOverflow: true, sortable: true },
-    { field: 'carrierId', width: 100, title: '船公司', showHeaderOverflow: true, sortable: true },
-    { field: 'truckName', width: 100, title: '车队', showHeaderOverflow: true, sortable: true },
-    { field: 'customerName', width: 100, title: '委托单位', showHeaderOverflow: true, sortable: true },
+    { field: 'vesseL_VOYNO', width: 180, title: '船名/航次', showHeaderOverflow: true, sortable: true },
+    { field: 'mbL_NO', width: 120, title: '提单号', showHeaderOverflow: true, sortable: true },
+    { field: 'yarD_NAME', width: 100, title: '场站', showHeaderOverflow: true, sortable: true },
+    { field: 'contA_INFO', width: 100, title: '箱型箱量', showHeaderOverflow: true, sortable: true },
+    { field: 'tasK_REQ_USERNAME', width: 100, title: '操作名称', showHeaderOverflow: true, sortable: true },
+    { field: 'carrieR_ID', width: 100, title: '船公司', showHeaderOverflow: true, sortable: true },
+    { field: 'trucK_NAME', width: 100, title: '车队', showHeaderOverflow: true, sortable: true },
+    { field: 'customeR_NAME', width: 100, title: '委托单位', showHeaderOverflow: true, sortable: true },
     { field: 'createdTime', width: 180, title: '接收时间', showHeaderOverflow: true, sortable: true },
     { field: 'status', width: 100, title: '任务状态', showHeaderOverflow: true, sortable: true, slots: { default: 'status' } },
-    { field: 'taskNo', width: 150, title: '任务流水号', showHeaderOverflow: true, sortable: true },
-    { field: 'taskSource', width: 100, title: '任务来源', showHeaderOverflow: true, sortable: true, slots: { default: 'taskScource' } },
+    { field: 'tasK_NO', width: 150, title: '任务流水号', showHeaderOverflow: true, sortable: true },
+    { field: 'tasK_SOURCE', width: 100, title: '任务来源', showHeaderOverflow: true, sortable: true, slots: { default: 'taskScource' } },
     { field: 'createdUserName', width: 100, title: '接收人', showHeaderOverflow: true, sortable: true },
-    { field: 'complateDealName', width: 100, title: '完成方式', showHeaderOverflow: true, sortable: true },
+    { field: 'completE_DEAL_NAME', width: 100, title: '完成方式', showHeaderOverflow: true, sortable: true },
     { field: 'operate', title: '操作', width: 100, noDraggable: true, slots: { default: 'operate' }, fixed: 'right', resizable: false }
   ],
   columnsAllData: [
diff --git a/src/views/main/customerParam/addItemForm.vue b/src/views/main/customerParam/addItemForm.vue
index 65fb979..9fb06fb 100644
--- a/src/views/main/customerParam/addItemForm.vue
+++ b/src/views/main/customerParam/addItemForm.vue
@@ -48,28 +48,13 @@
                 v-if="ItemData.length == 0" />
               <a-select
                 placeholder="请选择客户参数名称"
-                show-search
-                :filter-option="filterOption"
                 v-decorator="['itemCode', { rules: [{ required: true, message: '请选择客户参数名称！' }] }]"
                 :disabled="ItemCodeDisabled"
-                v-if="ItemData.length > 0 && !multiSelect && showSelect">
+                v-if="ItemData.length > 0 && !multiSelect">
                 <a-select-option v-for="item in ItemData" :key="item.id" :value="item.itemCode">
                   {{ item.itemName }}
                 </a-select-option>
               </a-select>
-
-              <a-select
-                placeholder="请选择客户参数名称"
-                show-search
-                :filter-option="filterOption"
-                v-decorator="['itemCode', { rules: [{ required: true, message: '请选择客户参数名称！' }] }]"
-                :disabled="ItemCodeDisabled"
-                v-if="ItemData.length > 0 && !multiSelect && !showSelect">
-                <a-select-option v-for="item in ItemData" :key="item.id" :value="item.itemCode">
-                  {{ item.itemName }} / {{ item.itemCode }}
-                </a-select-option>
-              </a-select>
-
               <a-select
                 placeholder="请选择客户参数名称"
                 mode="multiple"
@@ -108,7 +93,6 @@ import {
   ParamItemList,
   saveParamValue
 } from '@/api/modular/main/DJYTenantParam'
-import { mapGetters } from 'vuex'
 import { DjyCustomerSuggest } from '@/api/modular/main/BookingLedger'
 export default {
   data() {
@@ -133,7 +117,6 @@ export default {
       },
       typeData: [],
       visible: false,
-      showSelect: true,
       confirmLoading: false,
       form: this.$form.createForm(this),
       TenantData: [],
@@ -146,12 +129,8 @@ export default {
   mounted() {
 
   },
-  computed: {
-        ...mapGetters([
-            'carrierList','lineList'
-        ])
-    },
   methods: {
+
     FnTypeD(data) {
       let Rdata = ''
       this.YWData.forEach(item => {
@@ -162,9 +141,8 @@ export default {
       return Rdata
     },
     FnChangeTypeCode(e) {
-      if (e !== 'CarrierProp' && e !== 'LaneProp') {
+      if (e) {
         this.ItemCodeDisabled = false
-        this.showSelect = true
         this.WTypeData.forEach(item => {
           if (item.paraCode === e) {
             this.multiSelect = item.multiSelect
@@ -179,26 +157,6 @@ export default {
           this.ItemData = res.data
         })
       }
-      if (e === 'CarrierProp') {
-        const arr = JSON.parse(JSON.stringify(this.carrierList))
-        this.showSelect = false
-        this.multiSelect = true
-        arr.forEach(item => {
-          item.itemName = item.cnName
-          item.itemCode = item.enName
-        })
-        this.ItemData = arr
-      }
-      if (e === 'LaneProp') {
-        const arr = JSON.parse(JSON.stringify(this.lineList))
-        this.showSelect = true
-        this.multiSelect = true
-        arr.forEach(item => {
-          item.itemName = item.name
-          item.itemCode = item.name
-        })
-        this.ItemData = arr
-      }
     },
     tenantIdSearch(value) {
       if (value) {
@@ -207,11 +165,6 @@ export default {
         })
       }
     },
-    filterOption(input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      );
-    },
     handleChange(val) {
       console.log(val)
     },
@@ -257,26 +210,15 @@ export default {
               values.paramType = item.type
             }
           })
-          if (!this.multiSelect) {
-            const arr = []
-            this.ItemData.forEach(item => {
-              if (item.itemCode == values.itemCode) {
-                values.itemName = item.itemName
-                arr.push(1)
-              }
-            })
-            if (arr.length === 0) {
-              values.itemName = values.itemCode
+          const arr = []
+          this.ItemData.forEach(item => {
+            if (item.itemCode == values.itemCode) {
+              values.itemName = item.itemName
+              arr.push(1)
             }
-          } else {
-            values.itemName = []
-            this.ItemData.forEach(item => {
-              values.itemCode.forEach(ite => {
-                if (ite === item.itemCode) {
-                  values.itemName.push(item.itemName)
-                }
-              })
-            })
+          })
+          if (arr.length === 0) {
+            values.itemName = values.itemCode
           }
           if (Array.isArray(values.itemCode)) {
             values.itemCode = values.itemCode.join(',')
diff --git a/src/views/main/customerParam/editItemForm.vue b/src/views/main/customerParam/editItemForm.vue
index 0cdc467..1b4d476 100644
--- a/src/views/main/customerParam/editItemForm.vue
+++ b/src/views/main/customerParam/editItemForm.vue
@@ -29,11 +29,7 @@
               </a-form-item>
             </a-col>
             <a-col :span="8">
-              <a-form-item
-                label="客户参数类别"
-                :labelCol="{ sm: { span: 8 } }"
-                :wrapperCol="{ sm: { span: 15 } }"
-                has-feedback>
+              <a-form-item label="客户参数类别" :labelCol="{ sm: { span: 8 } }" :wrapperCol="{ sm: { span: 15 } }" has-feedback>
                 <a-select
                   placeholder="请选择客户参数类别"
                   v-decorator="['paraCode', { rules: [{ required: true, message: '请选择客户参数类别！' }] }]"
@@ -54,28 +50,13 @@
                     v-if="ItemData.length == 0" />
                   <a-select
                     placeholder="请选择客户参数名称"
-                    show-search
-                    :filter-option="filterOption"
                     v-decorator="['itemCode', { rules: [{ required: true, message: '请选择客户参数名称！' }] }]"
                     :disabled="ItemCodeDisabled"
-                    v-if="ItemData.length > 0 && !multiSelect && showSelect">
+                    v-if="ItemData.length > 0 && !multiSelect">
                     <a-select-option v-for="item in ItemData" :key="item.id" :value="item.itemCode">
                       {{ item.itemName }}
                     </a-select-option>
                   </a-select>
-
-                  <a-select
-                    placeholder="请选择客户参数名称"
-                    show-search
-                    :filter-option="filterOption"
-                    v-decorator="['itemCode', { rules: [{ required: true, message: '请选择客户参数名称！' }] }]"
-                    :disabled="ItemCodeDisabled"
-                    v-if="ItemData.length > 0 && !multiSelect && !showSelect">
-                    <a-select-option v-for="item in ItemData" :key="item.id" :value="item.itemCode">
-                      {{ item.itemName }} / {{ item.itemCode }}
-                    </a-select-option>
-                  </a-select>
-
                   <a-select
                     placeholder="请选择客户参数名称"
                     mode="multiple"
@@ -117,7 +98,6 @@ import {
   ParamItemList,
   saveParamValue
 } from '@/api/modular/main/DJYTenantParam'
-import { mapGetters } from 'vuex'
 import { DjyCustomerSuggest } from '@/api/modular/main/BookingLedger'
 export default {
   data() {
@@ -140,9 +120,8 @@ export default {
         xs: { span: 24 },
         sm: { span: 21 }
       },
-      loading: false,
+      loading:false,
       typeData: [],
-      showSelect: true,
       visible: false,
       ItemCodeLoad: false,
       confirmLoading: false,
@@ -157,11 +136,6 @@ export default {
   },
   mounted() {
 
-  },
-  computed: {
-    ...mapGetters([
-      'carrierList', 'lineList'
-    ])
   },
   methods: {
     FnTypeD(data) {
@@ -174,7 +148,7 @@ export default {
       return Rdata
     },
     FnChangeTypeCode(e) {
-      if (e !== 'CarrierProp' && e !== 'LaneProp') {
+      if (e) {
         this.ItemCodeDisabled = false
         this.WTypeData.forEach(item => {
           if (item.paraCode === e) {
@@ -190,28 +164,6 @@ export default {
           this.ItemData = res.data
         })
       }
-      if (e === 'CarrierProp') {
-        const arr = JSON.parse(JSON.stringify(this.carrierList))
-        this.showSelect = false
-        this.ItemCodeDisabled = false
-        this.multiSelect = false
-        arr.forEach(item => {
-          item.itemName = item.cnName
-          item.itemCode = item.enName
-        })
-        this.ItemData = arr
-      }
-      if (e === 'LaneProp') {
-        const arr = JSON.parse(JSON.stringify(this.lineList))
-        this.showSelect = true
-        this.ItemCodeDisabled = false
-        this.multiSelect = false
-        arr.forEach(item => {
-          item.itemName = item.name
-          item.itemCode = item.name
-        })
-        this.ItemData = arr
-      }
     },
     tenantIdSearch(value) {
       if (value) {
@@ -237,14 +189,14 @@ export default {
         if (res2) {
           this.WTypeData = res2.data
           res2.data.forEach(item => {
-            if (item.paraCode === editRow.paraCode) {
-              this.multiSelect = item.multiSelect
-              if (this.multiSelect) {
-                editRow.itemCode = editRow.itemCode.split(',')
-                editRow.itemName = editRow.itemName.split(',')
-              }
+          if (item.paraCode === editRow.paraCode) {
+            this.multiSelect = item.multiSelect
+            if (this.multiSelect) {
+              editRow.itemCode = editRow.itemCode.split(',')
+              editRow.itemName = editRow.itemName.split(',')
             }
-          })
+          }
+        })
         }
         this.loading = false
         this.form.setFieldsValue({
@@ -257,11 +209,6 @@ export default {
         })
       })
     },
-    filterOption(input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      );
-    },
     handleSubmit() {
       const {
         form: { validateFields }
@@ -286,26 +233,15 @@ export default {
               values.paramType = item.type
             }
           })
-          if (!this.multiSelect) {
-            const arr = []
-            this.ItemData.forEach(item => {
-              if (item.itemCode == values.itemCode) {
-                values.itemName = item.itemName
-                arr.push(1)
-              }
-            })
-            if (arr.length === 0) {
-              values.itemName = values.itemCode
+          const arr = []
+          this.ItemData.forEach(item => {
+            if (item.itemCode == values.itemCode) {
+              values.itemName = item.itemName
+              arr.push(1)
             }
-          } else {
-            values.itemName = []
-            this.ItemData.forEach(item => {
-              values.itemCode.forEach(ite => {
-                if (ite === item.itemCode) {
-                  values.itemName.push(item.itemName)
-                }
-              })
-            })
+          })
+          if (arr.length === 0) {
+            values.itemName = values.itemCode
           }
           if (Array.isArray(values.itemCode)) {
             values.itemCode = values.itemCode.join(',')
diff --git a/src/views/main/mskOrderList/index.vue b/src/views/main/mskOrderList/index.vue
index 5916e7b..6554a59 100644
--- a/src/views/main/mskOrderList/index.vue
+++ b/src/views/main/mskOrderList/index.vue
@@ -210,14 +210,15 @@
             :current-page="queryParam.pageNo"
             :page-size="queryParam.pageSize"
             :total="queryParam.totalResult"
-            :page-sizes="[10, 50,100,200,500]"
+            :page-sizes="[10, 50, 100, 200, 500]"
             :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
             @page-change="handlePageChange">
           </vxe-pager>
         </template>
       </vxe-grid>
     </a-card>
-    <mskBookingOrder @handleSuccess="handleSuccess" @handleSuccessCopy="handleSuccessCopy" ref="mskBookingOrder"></mskBookingOrder>
+    <mskBookingOrder @handleSuccess="handleSuccess" @handleSuccessCopy="handleSuccessCopy" ref="mskBookingOrder">
+    </mskBookingOrder>
     <a-modal title="输入复制数量" :visible="copyflag" :footer="null" @cancel="copyflag = false">
       <a-form :form="copyMoreForm" :label-col="{ span: 5 }" :wrapper-col="{ span: 12 }" @submit="handleSubmitCopyMore">
         <a-form-item label="数量">
@@ -234,6 +235,13 @@
         </a-form-item>
       </a-form>
     </a-modal>
+    <a-modal title="选择" :visible="addFlag" :footer="null" @cancel="addFlag = false">
+      <div class="change">
+        <div>马士基api订舱</div>
+        <div>马士基sport订舱</div>
+        <div>马士基edi订舱</div>
+      </div>
+    </a-modal>
   </div>
 </template>
 <script>
@@ -275,10 +283,11 @@ export default {
         totalResult: 1
       },
       sendLoading: false,
+      addFlag: false,
       form: {},
       ColumnsQuery: [],
       columns: [
-      { type: 'checkbox', width: 60, noDraggable: true },
+        { type: 'checkbox', width: 60, noDraggable: true },
         {
           title: '订舱号',
           align: 'center',
@@ -378,7 +387,7 @@ export default {
         }
       ],
       columnsAll: [
-      { type: 'checkbox', width: 60, noDraggable: true },
+        { type: 'checkbox', width: 60, noDraggable: true },
         {
           title: '订舱号',
           align: 'center',
@@ -591,7 +600,7 @@ export default {
       this.copyflag = true
     },
     getConfigStart() {
-    this.loading = true
+      this.loading = true
       const arr = localStorage.getItem('mskOrderSetting') ? JSON.parse(localStorage.getItem('mskOrderSetting')) : []
       if (arr.length === 0) {
         this.getDict()
@@ -898,7 +907,8 @@ export default {
       })
     },
     handleAdd() {
-      this.$refs.mskBookingOrder.init()
+      this.addFlag = true
+      // this.$refs.mskBookingOrder.init()
     }
   }
 }
@@ -938,4 +948,25 @@ export default {
   top: 6px;
   right: 25px;
 }
+
+.change {
+  display: flex;
+
+  div {
+    width: 120px;
+    height: 50px;
+    border: 1px solid #d1cfcf;
+    background-color: #fff;
+    color: rgb(105, 102, 102);
+    line-height: 50px;
+    text-align: center;
+    cursor: pointer;
+    transition: box-shadow 0.3s, background-color 0.3s;
+    margin-right: 20px;
+  }
+  div:hover {
+        box-shadow: 0px 0px 10px rgba(141, 140, 140, 0.5);
+        background-color: rgb(198, 238, 241);
+    }
+}
 </style>
diff --git a/src/views/system/menu/addForm.vue b/src/views/system/menu/addForm.vue
index 6844d90..3a2b147 100644
--- a/src/views/system/menu/addForm.vue
+++ b/src/views/system/menu/addForm.vue
@@ -226,7 +226,17 @@
             </a-form-item>
           </a-col>
         </a-row>
-
+        <a-row :gutter="24" >
+          <a-col :md="12" :sm="24">
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="是否开启数据授权"
+            >
+              <a-switch checkedChildren="是" unCheckedChildren="否" v-decorator="['isEnableDataScope', { valuePropName: 'checked' }]"/><!-- defaultChecked -->
+            </a-form-item>
+          </a-col>
+        </a-row>
         <a-row :gutter="24">
           <a-col :md="12" :sm="24">
             <a-form-item
@@ -495,7 +505,7 @@
           this.form.getFieldDecorator('component', { initialValue: '' })
         } else {
           this.componentRequired = true
-           this.componentDisabled=false
+           this.componentDisabled = false
           // eslint-disable-next-line eqeqeq
           if (this.type == '1' || this.type == '2') {
             this.form.getFieldDecorator('component', { initialValue: '' })
diff --git a/src/views/system/menu/editForm.vue b/src/views/system/menu/editForm.vue
index 788f5f6..22d1c97 100644
--- a/src/views/system/menu/editForm.vue
+++ b/src/views/system/menu/editForm.vue
@@ -232,6 +232,17 @@
             </a-form-item>
           </a-col>
         </a-row>
+        <a-row :gutter="24" >
+          <a-col :md="12" :sm="24">
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="是否开启数据授权"
+            >
+              <a-switch checkedChildren="是" unCheckedChildren="否" v-decorator="['isEnableDataScope', { valuePropName: 'checked' }]"/><!-- defaultChecked -->
+            </a-form-item>
+          </a-col>
+        </a-row>
 
         <a-row :gutter="24">
           <a-col :md="12" :sm="24">
@@ -377,7 +388,8 @@
             link: record.link,
             router: record.router,
             sort: record.sort,
-            remark: record.remark
+            remark: record.remark,
+            isEnableDataScope: record.isEnableDataScope
           }
         )
         this.form.getFieldDecorator('pid', { initialValue: record.pid })
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 1f6a9ff..a0d1b58 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -63,6 +63,7 @@
               <a-button icon="up-circle">导入</a-button>
             </a-upload>
             <a-button v-if="hasPerm('sysUser:export')" icon="down-circle" @click="sysUserExport()">导出 </a-button>
+            <a-button icon="ordered-list" @click="handleAll" >批量授权 </a-button>
           </template>
 
           <span slot="sysEmpInfo" slot-scope="text">
@@ -106,7 +107,7 @@
                   <a @click="$refs.userRoleForm.userRole(record)">授权角色</a>
                 </a-menu-item>
                 <a-menu-item v-if="hasPerm('sysUser:grantData')">
-                  <a @click="$refs.userOrgForm.userOrg(record)">授权数据</a>
+                  <a @click="$refs.userOrgForm.userOrg(record,'once')">授权数据</a>
                 </a-menu-item>
                 <a-menu-item v-if="hasPerm('sysUser:delete')">
                   <a-popconfirm placement="topRight" title="确认删除？" @confirm="() => sysUserDelete(record)">
@@ -332,6 +333,13 @@ export default {
         }
       })
     },
+    handleAll() {
+      if (this.selectedRowKeys.length == 0) {
+        this.$message.warning('请选择要操作的数据')
+        return false
+      }
+      this.$refs.userOrgForm.userOrg({}, 'all', this.selectedRowKeys)
+    },
     handleSubmitReset() {
       this.$refs.resetForm.validate(valid => {
         if (valid) {
diff --git a/src/views/system/user/userOrgForm.vue b/src/views/system/user/userOrgForm.vue
index 24cc536..def4eda 100644
--- a/src/views/system/user/userOrgForm.vue
+++ b/src/views/system/user/userOrgForm.vue
@@ -5,8 +5,7 @@
     :visible="visible"
     :confirmLoading="confirmLoading"
     @ok="handleSubmit"
-    @cancel="handleCancel"
-  >
+    @cancel="handleCancel">
     <a-spin :spinning="formLoading">
       <a-form :form="form">
         <a-row>
@@ -26,31 +25,26 @@
                 :auto-expand-parent="autoExpandParentMenu"
                 :tree-data="menuTreeData"
                 :selected-keys="selectedKeys"
+                :autoExpandParent="true"
+                :defaultExpandParent="true"
+                :defaultExpandAll="true"
+                :expandedKeys="expandedKeys"
                 :replaceFields="replaceMenuFields"
                 @select="onSelectMenu"
-                @check="onCheckMenu"
-              />
+                @check="onCheckMenu" />
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item
-              v-show="SelectMenu"
-              label="授权范围"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              has-feedback
-            >
+            <a-form-item v-show="SelectMenu" label="授权范围" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-select
                 style="width: 100%"
                 placeholder="请选择授权范围"
-                v-decorator="['dataScopeType', { rules: [{ required: true, message: '请选择授权范围！' }] }]"
-              >
+                v-decorator="['dataScopeType', { rules: [{ required: true, message: '请选择授权范围！' }] }]">
                 <a-select-option
                   v-for="(item, index) in dataScopeTypeData"
                   :key="index"
                   :value="item.code"
-                  @click="handleChange(item.code)"
-                >
+                  @click="handleChange(item.code)">
                   {{ item.value }}
                 </a-select-option>
               </a-select>
@@ -70,8 +64,7 @@
                   :selected-keys="selectedKeys"
                   :replaceFields="replaceFields"
                   @expand="onExpand"
-                  @check="onCheck"
-                />
+                  @check="onCheck" />
               </a-form-item>
             </div>
           </a-col>
@@ -104,7 +97,9 @@ export default {
         sm: { span: 15 }
       },
       orgTreeData: [],
-      menuTreeData: [],
+      menuTreeData: [
+
+      ],
       expandedKeys: [],
       expandedMenuKeys: [],
       checkedKeys: [],
@@ -132,36 +127,46 @@ export default {
       SelectMenu: false,
       SelectMenuId: '',
       MeuncheckedKeys: [],
+      openType: '',
       appList: [],
+      expandedKeys: [],
       selectValue: null,
+      userIdList: [],
       menuList: []
     }
   },
 
   methods: {
     // 初始化方法
-    userOrg(record) {
+    userOrg(record, type, arr) {
       this.userEntity = record
       this.visible = true
+      this.openType = type
       // 获取授权范围
       this.sysDictTypeDropDown()
       // 获取菜单树
       this.getMenuList()
       // 获取权限
-      this.SysDataUserMenuGetGrantData(record)
+      if (type === 'once') {
+        this.SysDataUserMenuGetGrantData(record)
+      } else {
+        this.userIdList = arr
+        this.MeuncheckedKeys = []
+        this.GrantData = []
+      }
       // // 获取自定义权限
       // this.SysDataUserMenuGetGrantRightData(record)
     },
     // 获取权限
     SysDataUserMenuGetGrantData(record) {
-      SysDataUserMenuGetGrantData({ userid: record.id }).then(res => {
+      SysDataUserMenuGetGrantData({ userId: record.id }).then(res => {
         this.GrantData = res.data
         res.data.forEach(item => {
           this.checkedMenuKeys.push(item.sysMenuId)
         })
         this.MeuncheckedKeys = this.checkedMenuKeys
         // 获取用户自定义权限
-        SysDataUserMenuGetGrantRightData({ userid: record.id }).then(res => {
+        SysDataUserMenuGetGrantRightData({ userId: record.id }).then(res => {
           this.GrantData.forEach(item => {
             item.RightData = []
             res.data.forEach(item2 => {
@@ -196,12 +201,23 @@ export default {
         this.orgTreeShow = false
         // 清理已选中机构
         this.checkedKeys = []
+        this.GrantData.forEach(item => {
+          if (item.sysMenuId == this.SelectMenuId) {
+            item.RightData = []
+          }
+        })
       }
     },
+    getRoleName(val) {
+      this.dataScopeTypeData.forEach(item => {
+        if (item.code == val) {
+          return item.value
+        }
+      })
+    },
     handleChangeEdit() {
       let Type = false
       this.GrantData.forEach(item => {
-        console.log(item,this.SelectMenuId)
         if (item.sysMenuId == this.SelectMenuId) {
           item.isEdit = this.isEdit
           Type = true
@@ -254,7 +270,16 @@ export default {
       this.SelectMenu = false
       this.selectValue = value
       const menuList = this.menuList.filter(f => f.appCode == value)
+      const arr = []
+      menuList.forEach(item => {
+        arr.push(item.id)
+        item.children.forEach(ite => {
+          arr.push(ite.id)
+        })
+      })
       this.menuTreeData = menuList
+      this.expandedKeys = arr
+      console.log(menuList,arr)
     },
     onExpand(expandedKeys) {
       this.expandedKeys = expandedKeys
@@ -333,20 +358,36 @@ export default {
         this.GrantData.forEach(item2 => {
           if (item == item2.sysMenuId) {
             if (!item2.dataScopeType) {
-              item2.dataScopeType = this.dataScopeTypeData[0].code
+              item2.dataScopeType = 4
             }
             childrens.push({ ...item2, menuId: item2.sysMenuId })
           }
         })
       })
-      SysDataUserMenuGrantData({ userId: this.userEntity.id, childrens })
+      const data = {
+        childrens: childrens
+      }
+      if (this.openType === 'once') {
+        data.userIdList = [this.userEntity.id]
+      } else {
+        data.userIdList = this.userIdList
+      }
+      SysDataUserMenuGrantData(data)
         .then(res => {
           if (res.success) {
             let childrens2 = []
             childrens.forEach(item => {
               childrens2 = [...childrens2, ...item.RightData]
             })
-            SysDataUserMenuGrantRightData({ userId: this.userEntity.id, childrens: childrens2 })
+            const data1 = {
+              childrens: childrens2
+            }
+            if (this.openType === 'once') {
+              data1.userIdList = [this.userEntity.id]
+            } else {
+              data1.userIdList = this.userIdList
+            }
+            SysDataUserMenuGrantRightData(data1)
               .then(res => {
                 if (res.success) {
                   this.$message.success('授权成功')