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 0000000..4573028
Binary files /dev/null and b/src/views/main/BookingLedger/detail/childModules/mailBg.jpg differ
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('授权成功')