diff --git a/.env b/.env
index 214e7c0..33e92d4 100644
--- a/.env
+++ b/.env
@@ -2,8 +2,8 @@ NODE_ENV=production
 VUE_APP_PREVIEW=true
 # VUE_APP_TYPE = 'customer'
 # VUE_APP_TYPE = 'hechuan'
-VUE_APP_TYPE = 'yunyingduan'
-# VUE_APP_TYPE = 'gangjie'
+# VUE_APP_TYPE = 'yunyingduan'
+VUE_APP_TYPE = 'gangjie'
 # 打包部署的三个端 客户端customer 和川端hechuan 运营端djy
 
 # 和川大简云正式
@@ -19,12 +19,12 @@ VUE_APP_TYPE = 'yunyingduan'
 # VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30813
 
 # 运营端测试
-VUE_APP_API_BASE_URL=http://60.209.125.238:30814
-VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814
+# VUE_APP_API_BASE_URL=http://60.209.125.238:30814
+# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814
 
 # 港捷
-# VUE_APP_API_BASE_URL=http://118.190.144.189:5001
-# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
+VUE_APP_API_BASE_URL=http://118.190.144.189:5001
+VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
 
 # 客户端正式
 # VUE_APP_API_BASE_URL=http://118.190.144.189:6001
diff --git a/.env.development b/.env.development
index 7caaa7b..78c2215 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
 NODE_ENV=development
 VUE_APP_PREVIEW=true
-# VUE_APP_TYPE = 'customer'
-VUE_APP_TYPE = 'hechuan'
+VUE_APP_TYPE = 'customer'
+# VUE_APP_TYPE = 'hechuan'
 # VUE_APP_TYPE = 'yunyingduan'
 # VUE_APP_TYPE = 'gangjie'
 # 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan
@@ -11,8 +11,8 @@ VUE_APP_TYPE = 'hechuan'
 # VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
 
 # 和川大简云测试
-VUE_APP_API_BASE_URL=http://60.209.125.238:35100
-VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
+# VUE_APP_API_BASE_URL=http://60.209.125.238:35100
+# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
 
 # 客户端测试
 # VUE_APP_API_BASE_URL=http://60.209.125.238:30813
@@ -34,5 +34,5 @@ VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
 # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002
 
 # 客户端正式
-# VUE_APP_API_BASE_URL=http://118.190.144.189:6001
-# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001
\ No newline at end of file
+VUE_APP_API_BASE_URL=http://118.190.144.189:6001
+VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001
\ No newline at end of file
diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js
index e3fe9ec..0ec4c5b 100644
--- a/src/api/modular/main/BookingLedger.js
+++ b/src/api/modular/main/BookingLedger.js
@@ -1639,4 +1639,12 @@ export function GetTenantUserByRole(parameter) {
     method: 'get',
     params: parameter
   })
+}
+
+export function QueryShipInfoEMC(parameter) {
+  return axios({
+    url: '/BookingCustomerOrder/QueryShipInfoEMC',
+    method: 'get',
+    params: parameter
+  })
 }
\ No newline at end of file
diff --git a/src/components/tableSort/index.vue b/src/components/tableSort/index.vue
index bc13a22..ecb915b 100644
--- a/src/components/tableSort/index.vue
+++ b/src/components/tableSort/index.vue
@@ -20,7 +20,7 @@
               <div
                 class="s-tool-column-item"
                 v-for="item in columnsSetting"
-                :key="`${item.title}tableColumnSetting`"
+                :key="`${item.field}tableColumnSetting`"
                 v-show="item.show && item.type!=='checkbox' && item.field!=='caozuo'">
                 <div class="s-tool-column-handle">
                   <a-icon type="more" />
diff --git a/src/views/main/BookingCustomerLedger/detail/index.vue b/src/views/main/BookingCustomerLedger/detail/index.vue
index f23a001..7a96f87 100644
--- a/src/views/main/BookingCustomerLedger/detail/index.vue
+++ b/src/views/main/BookingCustomerLedger/detail/index.vue
@@ -16,196 +16,443 @@
       <a-button type="danger" @click="handleCancle" v-if="details.bsstatus == '已提交'">撤销</a-button>
       <span v-if="details.bookingno" style="margin: 0 10px;">订单编号:</span>
       <span v-if="details.bookingno">{{ details.bookingno }}</span>
+      <span style="margin-left: 10px">订舱状态:{{ details.bsstatus }}</span>
     </div>
     <a-spin :spinning="loading">
       <div class="box">
         <a-form-model size="small" ref="basicFrom" :selfUpdate="true" :model="details" :rules="rules">
-          <a-row>
-            <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.bsstatus" disabled />
-              </a-form-model-item>
-            </a-col>
-            <a-col :span="'4-8'">
-              <a-form-model-item
-                class="from-label"
-                label="船公司"
-                prop="carrierid"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                has-feedback>
-                <selectView
-                  ref="carrierid"
-                  type="carrierid"
-                  :defaultVal="details.carrierid"
-                  searchApi="GetCarrierlist"
-                  :searchQuery="{ keyword: '', type: 'consignor' }"
-                  :showLabel="['cnName', 'code']"
-                  :openSearch="false"
-                  @change="getSelectViewRes"></selectView>
-              </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
-                prop="portloadid">
-                <selectView
-                  type="portloadid"
-                  :defaultVal="details.portloadid"
-                  searchApi="GetPortloadlist"
-                  :searchQuery="{ KeyWord: '' }"
-                  :showLabel="['ediCode', 'enName']"
-                  :openSearch="true"
-                  :isCopy="true"
-                  @change="getSelectViewRes"></selectView>
-              </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
-                prop="portdischargeid">
-                <selectView
-                  type="portdischargeid"
-                  :defaultVal="details.portdischargeid"
-                  searchApi="GetPortlist"
-                  :searchQuery="{ KeyWord: '' }"
-                  :showLabel="['ediCode', 'enName']"
-                  :openSearch="true"
-                  @change="getSelectViewRes"></selectView>
-              </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
-                prop="etd">
-                <div class="date-box">
-                  <datePickerView
-                    class="date-picker"
-                    :parentVal="details.etd"
-                    type="etd"
-                    format="YYYY-MM-DD"
-                    @dateChange="dateChangeFun"></datePickerView>
-                </div>
-              </a-form-model-item>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col :span="'4-8'">
-              <a-form-model-item
-                class="from-label"
-                label="船名"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                has-feedback
-                prop="vessel">
-                <div class="copy-box">
+          <div v-if="details.carrierid != 'EMC'">
+            <a-row>
+              <a-col :span="'4-8'">
+                <a-form-model-item
+                  class="from-label"
+                  label="船公司"
+                  prop="carrierid"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback>
                   <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']"
+                    ref="carrierid"
+                    type="carrierid"
+                    :defaultVal="details.carrierid"
+                    searchApi="GetCarrierlist"
+                    :searchQuery="{ keyword: '', type: 'consignor' }"
+                    :showLabel="['cnName', 'code']"
+                    :openSearch="false"
+                    @change="getSelectViewRes"></selectView>
+                </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
+                  prop="portloadid">
+                  <selectView
+                    type="portloadid"
+                    :defaultVal="details.portloadid"
+                    searchApi="GetPortloadlist"
+                    :searchQuery="{ KeyWord: '' }"
+                    :showLabel="['ediCode', 'enName']"
                     :openSearch="true"
+                    :isCopy="true"
                     @change="getSelectViewRes"></selectView>
-                </div>
-              </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
-                prop="voyno">
-                <inputView type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
-              </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
-                prop="contractno">
-                <inputView type="contractno" :parentVal="details.contractno" @getInputChange="inputChange" />
-              </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
-                prop="service">
-                <selectView
-                  type="service"
-                  :defaultVal="details.service"
-                  searchApi="GetService"
-                  :searchQuery="{ KeyWord: '' }"
-                  :showLabel="['name']"
-                  :openSearch="true"
-                  @change="getSelectViewRes">
-                </selectView>
-              </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
-                prop="blfrt">
-                <selectView
-                  type="blfrt"
-                  :defaultVal="details.blfrt"
-                  searchApi="GetFrt"
-                  :searchQuery="{ KeyWord: '' }"
-                  :showLabel="['enName']"
-                  :openSearch="false"
-                  @change="getSelectViewRes"></selectView>
-              </a-form-model-item>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col :span="'4-8'">
-              <a-form-model-item
-                class="from-label"
-                label="销售代码"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                has-feedback
-                prop="saleCode">
-                <inputView type="saleCode" :parentVal="details.saleCode" @getInputChange="inputChange" />
-              </a-form-model-item>
-            </a-col>
-          </a-row>
+                </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
+                  prop="portdischargeid">
+                  <selectView
+                    type="portdischargeid"
+                    :defaultVal="details.portdischargeid"
+                    searchApi="GetPortlist"
+                    :searchQuery="{ KeyWord: '' }"
+                    :showLabel="['ediCode', 'enName']"
+                    :openSearch="true"
+                    @change="getSelectViewRes"></selectView>
+                </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
+                  prop="etd">
+                  <div class="date-box">
+                    <datePickerView
+                      class="date-picker"
+                      :parentVal="details.etd"
+                      type="etd"
+                      format="YYYY-MM-DD"
+                      @dateChange="dateChangeFun"></datePickerView>
+                  </div>
+                </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
+                  prop="saleCode">
+                  <inputView type="saleCode" :parentVal="details.saleCode" @getInputChange="inputChange" />
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+            <a-row>
+              <a-col :span="'4-8'">
+                <a-form-model-item
+                  class="from-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>
+                </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
+                  prop="voyno">
+                  <inputView type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
+                </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
+                  prop="contractno">
+                  <inputView type="contractno" :parentVal="details.contractno" @getInputChange="inputChange" />
+                </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
+                  prop="service">
+                  <selectView
+                    type="service"
+                    :defaultVal="details.service"
+                    searchApi="GetService"
+                    :searchQuery="{ KeyWord: '' }"
+                    :showLabel="['name']"
+                    :openSearch="true"
+                    @change="getSelectViewRes">
+                  </selectView>
+                </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
+                  prop="blfrt">
+                  <selectView
+                    type="blfrt"
+                    :defaultVal="details.blfrt"
+                    searchApi="GetFrt"
+                    :searchQuery="{ KeyWord: '' }"
+                    :showLabel="['enName']"
+                    :openSearch="false"
+                    @change="getSelectViewRes"></selectView>
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+          </div>
+          <div v-if="details.carrierid == 'EMC'">
+            <a-row>
+              <a-col :span="'4-8'">
+                <a-form-model-item
+                  class="from-label"
+                  label="收货地"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="placereceiptid">
+                  <selectView
+                    type="placereceiptid"
+                    :defaultVal="details.placereceipt"
+                    searchApi="GetPortloadlist"
+                    :searchQuery="{ KeyWord: '' }"
+                    :showLabel="['ediCode', 'enName']"
+                    :openSearch="true"
+                    :isCopy="true"
+                    @change="getSelectViewRes"></selectView>
+                </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
+                  prop="portloadid">
+                  <selectView
+                    type="portloadid"
+                    :defaultVal="details.portload"
+                    searchApi="GetPortloadlist"
+                    :searchQuery="{ KeyWord: '' }"
+                    :showLabel="['ediCode', 'enName']"
+                    :openSearch="true"
+                    :isCopy="true"
+                    @change="getSelectViewRes"></selectView>
+                </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
+                  prop="portdischargeid">
+                  <selectView
+                    type="portdischargeid"
+                    :defaultVal="details.portdischarge"
+                    searchApi="GetPortlist"
+                    :searchQuery="{ KeyWord: '' }"
+                    :showLabel="['ediCode', 'enName']"
+                    :openSearch="true"
+                    @change="getSelectViewRes"></selectView>
+                </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
+                  prop="destinationid">
+                  <selectView
+                    type="destinationid"
+                    :defaultVal="details.destination"
+                    searchApi="GetPortlist"
+                    :searchQuery="{ KeyWord: '' }"
+                    :showLabel="['ediCode', 'enName']"
+                    :openSearch="true"
+                    @change="getSelectViewRes"></selectView>
+                </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-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>
+            <a-row>
+              <a-col :span="'4-8'">
+                <a-form-model-item
+                  class="from-label"
+                  label="订舱账号"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  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'">
+                <a-form-model-item
+                  class="from-label"
+                  label="航次"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  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="开船日期"
+                  :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="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"
+                  label="运送方式"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="serviceType">
+                  <a-select size="small" v-model="details.serviceType" style="width: 100%">
+                    <a-select-option v-for="(item, index) in serviceTypeList" :key="index" :value="item.code">{{
+                      item.code }}</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
+                  prop="serviceMode">
+                  <a-select size="small" v-model="details.serviceMode" style="width: 100%">
+                    <a-select-option v-for="(item, index) in serivceModeList" :key="index" :value="item.code">{{
+                      item.code }}</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
+                  prop="bookingAddr">
+                  <a-select size="small" @change="handleChangeBook" v-model="details.bookingAddr" style="width: 100%">
+                    <a-select-option v-for="(item, index) in bookingAddrList" :key="index" :value="item.code">{{
+                      item.code }}</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
+                  prop="billSignLoc">
+                  <a-select size="small" v-model="details.billSignLoc" style="width: 100%">
+                    <a-select-option v-for="(item, index) in billSignLocList" :key="index" :value="item.code">{{
+                      item.code }}</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
+                  prop="billCount">
+                  <a-input size="small" v-model="details.billCount" />
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+            <a-row>
+              <a-col :span="'4-8'">
+                <a-form-model-item
+                  class="from-label"
+                  label="销售代码"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="saleCode">
+                  <a-input size="small" v-model="details.saleCode" />
+                </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
+                  prop="acceptNotify">
+                  <a-checkbox v-model="details.acceptNotify"></a-checkbox>
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+          </div>
           <a-row>
             <a-col :span="24">
               <a-form-model-item
@@ -228,7 +475,7 @@
               </a-form-model-item>
             </a-col>
           </a-row>
-          <a-row :gutter="30">
+          <a-row :gutter="30" v-if="details.carrierid != 'EMC'">
             <a-col :span="8">
               <a-form-model-item has-feedback prop="shipper" class="sender-label" style="overflow: hidden">
                 <div class="sender">
@@ -360,7 +607,7 @@
               </a-form-model-item>
             </a-col>
           </a-row>
-          <a-row :gutter="30">
+          <a-row :gutter="30" v-if="details.carrierid != 'EMC'">
             <a-col :span="8">
               <a-form-model-item has-feedback prop="shipper" class="sender-label" style="overflow: hidden">
                 <div>订舱要求</div>
@@ -388,7 +635,8 @@
                     :showLabel="['title']"
                     :openSearch="true"
                     style="flex: 1;margin-left: 10px;"
-                    @change="getSelectViewRes"></selectView>
+                    @change="getSelectViewRes">
+                  </selectView>
                   <a-button
                     class="save-btn"
                     type="link"
@@ -402,6 +650,156 @@
             </a-col>
 
           </a-row>
+          <div v-if="details.carrierid == 'EMC'">
+            <a-row :gutter="100" style="padding-left:60px">
+              <a-col :span="12">
+                <div class="row-title">发货人</div>
+                <div>
+                  <auto-complete
+                    size="small"
+                    style="width: 100%"
+                    v-model="details.shipperName"
+                    @search="handleSearchAuto"
+                    @select="onSelectAuto"
+                    option-label-prop="value">
+                    <template slot="dataSource">
+                      <a-select-option v-for="(item, index) in shipperList" :key="index" :value="item">{{ item
+                      }}</a-select-option>
+                    </template>
+                  </auto-complete>
+                </div>
+                <div style="margin-top:10px">
+                  <a-select size="small" v-model="details.shipperSex" style="width: 13%">
+                    <a-select-option value="Mr.">MS</a-select-option>
+                    <a-select-option value="Ms.">MR</a-select-option>
+                  </a-select>
+                  <a-input
+                    size="small"
+                    placeholder="姓"
+                    style="width:13%;margin:0 1%"
+                    v-model="details.shipperLastName" />
+                  <a-input size="small" placeholder="名" style="width:13%;" v-model="details.shipperFirstName" />
+                  <a-input
+                    size="small"
+                    placeholder="国家区号"
+                    style="width:14%;margin:0 1%"
+                    v-model="details.shipperPhoneCountryCode" />
+                  <a-input size="small" placeholder="省市区号" style="width:14%;" v-model="details.shipperPhoneCode" />
+                  <a-input size="small" placeholder="电话" style="width:14%;margin:0 1%" v-model="details.shipperPhone" />
+                  <a-input size="small" placeholder="分机号" style="width:13%;" v-model="details.shipperPhoneExtension" />
+                </div>
+                <div style="margin:10px 0">
+                  <a-input size="small" placeholder="内参号码" v-model="details.shipperInnerCode" />
+                </div>
+                <div>
+                  <a-input size="small" placeholder="邮箱" v-model="details.shipperEmail" />
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class="row-title">货物代理人</div>
+                <div>
+                  <auto-complete
+                    size="small"
+                    style="width: 100%"
+                    v-model="details.bookingName"
+                    @search="handleSearchAuto1"
+                    @select="onSelectAuto1"
+                    option-label-prop="value">
+                    <template slot="dataSource">
+                      <a-select-option v-for="(item, index) in bookingList" :key="index" :value="item">{{ item
+                      }}</a-select-option>
+                    </template>
+                  </auto-complete>
+                </div>
+                <div style="margin-top:10px">
+                  <a-select size="small" v-model="details.bookingSex" style="width: 13%">
+                    <a-select-option value="Mr.">MS</a-select-option>
+                    <a-select-option value="Ms.">MR</a-select-option>
+                  </a-select>
+                  <a-input
+                    size="small"
+                    placeholder="姓"
+                    style="width:13%;margin:0 1%"
+                    v-model="details.bookingLastName" />
+                  <a-input size="small" placeholder="名" style="width:13%;" v-model="details.bookingFirstName" />
+                  <a-input
+                    size="small"
+                    placeholder="国家区号"
+                    style="width:14%;margin:0 1%"
+                    v-model="details.bookingPhoneCountryCode" />
+                  <a-input size="small" placeholder="省市区号" style="width:14%;" v-model="details.bookingPhoneCode" />
+                  <a-input size="small" placeholder="电话" style="width:14%;margin:0 1%" v-model="details.bookingPhone" />
+                  <a-input size="small" placeholder="分机号" style="width:13%;" v-model="details.bookingPhoneExtension" />
+                </div>
+                <div style="margin:10px 0">
+                  <a-input size="small" placeholder="内参号码" v-model="details.bookingInnerCode" />
+                </div>
+                <div>
+                  <a-input size="small" placeholder="邮箱" v-model="details.bookingEmail" />
+                </div>
+              </a-col>
+            </a-row>
+            <a-row :gutter="100" style="padding-left:60px;margin-top:20px">
+              <a-col :span="12">
+                <div class="row-title">收货人</div>
+                <div>
+                  <auto-complete
+                    size="small"
+                    style="width: 100%"
+                    v-model="details.consigneeName"
+                    @search="handleSearchAuto3"
+                    option-label-prop="value">
+                    <template slot="dataSource">
+                      <a-select-option v-for="(item, index) in consigneeList" :key="index" :value="item">{{ item
+                      }}</a-select-option>
+                    </template>
+                  </auto-complete>
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class="row-title">通知人</div>
+                <div>
+                  <auto-complete
+                    size="small"
+                    style="width: 100%"
+                    v-model="details.notifypartName"
+                    @search="handleSearchAuto2"
+                    option-label-prop="value">
+                    <template slot="dataSource">
+                      <a-select-option v-for="(item, index) in notifypartList" :key="index" :value="item">{{ item
+                      }}</a-select-option>
+                    </template>
+                  </auto-complete>
+                </div>
+              </a-col>
+            </a-row>
+            <a-row style="margin-top:10px">
+              <a-col :span="18">
+                <a-form-model-item
+                  class="from-label"
+                  label="订舱品名"
+                  :labelCol="{ span: 2 }"
+                  :wrapperCol="{ span: 22 }"
+                  has-feedback
+                  prop="description">
+                  <a-input size="small" v-model="details.description" />
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+            <a-row>
+              <a-col :span="18">
+                <a-form-model-item
+                  class="from-label"
+                  label="订舱备注"
+                  :labelCol="{ span: 2 }"
+                  :wrapperCol="{ span: 22 }"
+                  has-feedback
+                  prop="czRemark">
+                  <a-input size="small" v-model="details.czRemark" />
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+          </div>
           <a-row>
             <a-col style="display: flex;margin-top: 20px;" :span="10">
               <a-button type="primary" style="margin-right: 20px;" @click="handlePushCtn">添加</a-button>
@@ -414,7 +812,8 @@
                 <vxe-column field="ctnall" title="箱型">
                   <template #default="{ row }">
                     <a-select size="small" showSearch allow-clear v-model="row.ctncode" :filter-option="filterOption1">
-                      <a-select-option v-for="(item, index1) in ctnallList" :key="index1" :value="item.code">{{ item.name
+                      <a-select-option v-for="(item, index1) in ctnallList" :key="index1" :value="item.code">{{
+                        item.name
                       }}</a-select-option>
                     </a-select>
                   </template>
@@ -447,7 +846,7 @@
               </vxe-table>
             </a-col>
             <a-col :span="7">
-              <a-row >
+              <a-row>
                 <a-col :span="12">
                   <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cargoid" label="货物类型">
                     <selectView
@@ -704,43 +1103,6 @@
             </a-col>
           </a-row>
         </a-form-model>
-        <a-row style="margin-top: 10px;" >
-          其他信息
-          <div>
-            <a-row>
-              <a-col :span="4" v-if="details.carrierid==='EMC'">
-                <a-form-model-item
-                  class="from-label"
-                  label="合约类型"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  has-feedback>
-                  <span>{{ details.contractType }}</span>
-                </a-form-model-item>
-              </a-col>
-              <a-col :span="4" v-if="details.carrierid==='EMC'">
-                <a-form-model-item
-                  class="from-label"
-                  label="运送方式"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  has-feedback>
-                  <span>{{ details.serviceType }}</span>
-                </a-form-model-item>
-              </a-col>
-              <a-col :span="4" v-if="details.carrierid==='EMC'">
-                <a-form-model-item
-                  class="from-label"
-                  label="运送形态"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  has-feedback>
-                  <span>{{ details.serviceMode }}</span>
-                </a-form-model-item>
-              </a-col>
-            </a-row>
-          </div>
-        </a-row>
       </div>
     </a-spin>
     <a-modal
@@ -878,16 +1240,41 @@
       <div>
         <div style="font-size: 18px;color: rgb(22,155,213);font-weight: bold;margin: 10px 0;">订舱信息</div>
         <div style="font-size: 16px;color: black;">
-          <div><span style="display: inline-block;">{{ details.portloadid }}</span> ——{{ details.portdischargeid }}</div>
-          <div style="margin: 10px 0;"><span style="display: inline-block;">{{ details.carrierid }}</span> ——ETD:{{ details.etd }}</div>
-          <div v-for="(item,index) in details.ctnList" :key="index">{{ item.ctnall }}*{{ item.ctnnum }}</div>
+          <div><span style="display: inline-block;">{{ details.portloadid }}</span> ——{{ details.portdischargeid }}
+          </div>
+          <div style="margin: 10px 0;"><span style="display: inline-block;">{{ details.carrierid }}</span> ——ETD:{{
+            details.etd }}</div>
+          <div v-for="(item, index) in details.ctnList" :key="index">{{ item.ctnall }}*{{ item.ctnnum }}</div>
         </div>
         <div style="font-size: 18px;color: rgb(22,155,213);font-weight: bold;margin: 10px 0;">所选服务</div>
         <div style="display: flex;">
-          <div style="margin-right: 5px;background: rgb(112,182,3);color: black;padding: 5px 10px;" v-for="(item,index) in details.serviceItemList" :key="index">{{ item.value }}</div>
+          <div
+            style="margin-right: 5px;background: rgb(112,182,3);color: black;padding: 5px 10px;"
+            v-for="(item, index) in details.serviceItemList"
+            :key="index">{{ item.value }}</div>
         </div>
       </div>
     </a-modal>
+    <a-modal @ok="handleSubimtVess" title="长荣船期选择" :width="1200" :visible="vesselFlag" @cancel="vesselFlag = false">
+      <a-spin :spinning="vesselLoad">
+        <a-table
+          size="small"
+          :pagination="false"
+          :row-selection="{ selectedRowKeys: selectedAppKeys, onChange: onAppSelectChange, type: 'radio' }"
+          :columns="vesscolumns"
+          :data-source="vesselList">
+          <a-table
+            slot="expandedRowRender"
+            slot-scope="record"
+            size="small"
+            :customHeaderRow="customRow"
+            :columns="innerColumns"
+            :data-source="record.oceanLegs"
+            :pagination="false">
+          </a-table>
+        </a-table>
+      </a-spin>
+    </a-modal>
   </div>
 </template>
 <script>
@@ -896,12 +1283,14 @@ import inputView from '../../BookingLedger/detail/components/inputView'
 import selectView from '../../BookingLedger/detail/components/selectView'
 import datePickerView from '../../BookingLedger/detail/components/datePickerView'
 import autoView from '../../BookingLedger/detail/components/autoView'
+import { AutoComplete } from 'ant-design-vue'
 import textareaView from '../../BookingLedger/detail/components/textareaView'
+import { DjyWebsiteAccountConfigPage } from '@/api/modular/main/WebSiteaccount'
 import { UploadTempFile, BookingCustomerOrderGetFile } from '@/api/modular/system/fileManage'
 import {
   BookingCustomerOrderSave, BookingTemplateAdd, BookingCustomerOrderGet, OrderTemplateSave,
   BookingCustomerOrderDelete, BookingCustomerOrderSubmit, BookingCustomerOrderCancelSubmit,
-  GetOrderTemplate
+  GetOrderTemplate, BookingCustomerOrderPage, QueryShipInfoEMC
 } from '@/api/modular/main/BookingLedger'
 import { mapGetters } from 'vuex'
 const startDetails = {
@@ -924,13 +1313,15 @@ export default {
     selectView,
     datePickerView,
     autoView,
-    textareaView
+    textareaView,
+    AutoComplete
   },
   computed: {
-    ...mapGetters(['packageList', 'ctnallList'])
+    ...mapGetters(['packageList', 'ctnallList', 'lineList'])
   },
   mounted() {
     this.id = this.$route.query.id
+    this.getDictList()
   },
   beforeRouteUpdate(to, from, next) {
     console.log(111)
@@ -988,7 +1379,6 @@ export default {
     }, 2000)
   },
   beforeRouteEnter(to, from, next) {
-    console.log(2222)
     next(vm => {
       vm.getRouterHisEnter()
     })
@@ -998,11 +1388,100 @@ export default {
       id: '',
       fileList: [],
       modelconfirm: false,
+      selectedAppKeys: [],
       tempName: '',
+      vesselLoad: false,
+      vesselFlag: false,
+      vesselList: [],
+      vesscolumns: [
+        {
+          dataIndex: 'originName',
+          title: '起运港',
+          key: 'originName'
+        },
+        {
+          dataIndex: 'destinationName',
+          title: '卸货港',
+          key: 'destinationName'
+        },
+        {
+          dataIndex: 'departureDate',
+          title: '开船日期',
+          key: 'departureDate'
+        },
+        {
+          dataIndex: 'vesselName',
+          title: '船名',
+          key: 'vesselName'
+        },
+        {
+          dataIndex: 'voyageNumber',
+          title: '航次',
+          key: 'voyageNumber'
+        },
+        {
+          dataIndex: 'serviceCode',
+          title: '航线',
+          key: 'serviceCode'
+        },
+        {
+          dataIndex: 'estimatedTransitTimeInDays',
+          title: '航程',
+          key: 'estimatedTransitTimeInDays'
+        }
+      ],
+      innerColumns: [
+        {
+          dataIndex: 'polPortName',
+          title: '起运港',
+          key: 'polPortName'
+        },
+        {
+          dataIndex: 'podPortName',
+          title: '卸货港',
+          key: 'podPortName'
+        },
+        {
+          dataIndex: 'polETD',
+          title: '开船日期',
+          key: 'polETD'
+        },
+        {
+          dataIndex: 'podETA',
+          title: '预抵日期',
+          key: 'podETA'
+        },
+        {
+          dataIndex: 'vesselAndVoyage',
+          title: '船名/航次',
+          key: 'vesselAndVoyage'
+        },
+        {
+          dataIndex: 'serviceCode',
+          title: '航线',
+          key: 'serviceCode'
+        },
+        {
+          dataIndex: 'days',
+          title: '航程',
+          key: 'days'
+        }
+      ],
+      contractnoList: [],
+      billSignLocList: [],
+      bookingAddrList: [],
+      serivceModeList: [],
+      serviceTypeList: [],
       tempFlag: false,
+      consigneeList: [],
+      notifypartList: [],
+      bookingList: [],
       sendFlag: false,
+      shipperList: [],
       modelVisible: false,
       statusFlag: false,
+      bookPageList: [],
+      shipPageList: [],
       saveFlag: false,
       textEntryModalVisible: false,
       textEntryModalTitle: '',
@@ -1016,6 +1495,7 @@ export default {
       options: [],
       visible: false,
       modalType: '',
+      accountList: [],
       modelName: '',
       labelCol: {
         xs: { span: 24 },
@@ -1048,7 +1528,21 @@ export default {
         ctnList: []
       },
       rules: {
-
+        destinationid: [{ required: true, message: '请选择目的地', trigger: 'blur' }],
+        portdischargeid: [{ required: true, message: '请选择卸货港', trigger: 'blur' }],
+        portloadid: [{ required: true, message: '请选择起运港', trigger: 'blur' }],
+        placereceiptid: [{ required: true, message: '请选择收货地', trigger: 'blur' }],
+        etd: [{ required: true, message: '请选择开船日期', trigger: 'blur' }],
+        lanecode: [{ required: true, message: '请选择航线', trigger: 'blur' }],
+        voyno: [{ required: true, message: '请输入航次', trigger: 'blur' }],
+        vessel: [{ required: true, message: '请输入船名', trigger: 'blur' }],
+        bookingAccount: [{ required: true, message: '请选择订舱账号', trigger: 'blur' }],
+        billCount: [{ required: true, message: '请输入提单数量', trigger: 'blur' }],
+        billSignLoc: [{ required: true, message: '请选择提单签发地', trigger: 'blur' }],
+        bookingAddr: [{ required: true, message: '请选择订舱网点', trigger: 'blur' }],
+        serviceMode: [{ required: true, message: '请选择运输形态', trigger: 'blur' }],
+        serviceType: [{ required: true, message: '请选择运送方式', trigger: 'blur' }],
+        description: [{ required: true, message: '请输入订舱品名', trigger: 'blur' }]
       },
       loading: false
     }
@@ -1069,9 +1563,12 @@ export default {
         this.isCopy = this.$route.query.isCopy
         const $data = JSON.parse(JSON.stringify(this.historyData[newId]))
         this.fileList = $data.fileList
+
         if (this.isCopy && !$data.isCopy) {
           this.fileList = []
-          const copyData = {
+          let copyData = {}
+          if ($data.bookingDetails.carrierid !== 'EMC') {
+            copyData = {
             id: 0,
             bookingno: '',
             bsstatus: '',
@@ -1111,6 +1608,93 @@ export default {
             ctnList: $data.bookingDetails.ctnList,
             serviceList: $data.bookingDetails.serviceList
           }
+          }
+          if ($data.bookingDetails.carrierid === 'EMC') {
+            copyData = {
+              id: 0,
+              bookingno: '',
+              bsstatus: '',
+              files: {},
+              tempFileNames: [],
+
+              acceptNotify: $data.bookingDetails.acceptNotify,
+              contractno: $data.bookingDetails.contractno,
+              contractType: $data.bookingDetails.contractType,
+              saleCode: $data.bookingDetails.saleCode,
+              billCount: $data.bookingDetails.billCount,
+              billSignLoc: $data.bookingDetails.billSignLoc,
+              bookingAddr: $data.bookingDetails.bookingAddr,
+              serviceMode: $data.bookingDetails.serviceMode,
+              serviceType: $data.bookingDetails.serviceType,
+              etd: $data.bookingDetails.etd,
+              lanecode: $data.bookingDetails.lanecode,
+              voyno: $data.bookingDetails.voyno,
+              vessel: $data.bookingDetails.vessel,
+              bookingAccount: $data.bookingDetails.bookingAccount,
+              bookingPassword: $data.bookingDetails.bookingPassword,
+
+              shipperEmail: $data.bookingDetails.shipperEmail,
+              shipperInnerCode: $data.bookingDetails.shipperInnerCode,
+              shipperPhoneExtension: $data.bookingDetails.shipperPhoneExtension,
+              shipperPhone: $data.bookingDetails.shipperPhone,
+              shipperPhoneCode: $data.bookingDetails.shipperPhoneCode,
+              shipperPhoneCountryCode: $data.bookingDetails.shipperPhoneCountryCode,
+              shipperFirstName: $data.bookingDetails.shipperFirstName,
+              shipperLastName: $data.bookingDetails.shipperLastName,
+              shipperName: $data.bookingDetails.shipperName,
+              shipperSex: $data.bookingDetails.shipperSex,
+
+              bookingEmail: $data.bookingDetails.bookingEmail,
+              bookingInnerCode: $data.bookingDetails.bookingInnerCode,
+              bookingPhoneExtension: $data.bookingDetails.bookingPhoneExtension,
+              bookingPhone: $data.bookingDetails.bookingPhone,
+              bookingPhoneCode: $data.bookingDetails.bookingPhoneCode,
+              bookingPhoneCountryCode: $data.bookingDetails.bookingPhoneCountryCode,
+              bookingFirstName: $data.bookingDetails.bookingFirstName,
+              bookingLastName: $data.bookingDetails.bookingLastName,
+              bookingName: $data.bookingDetails.bookingName,
+              bookingSex: $data.bookingDetails.bookingSex,
+
+
+
+              destinationid: $data.bookingDetails.destinationid,
+              destination: $data.bookingDetails.destination,
+              destinationcode: $data.bookingDetails.destinationcode,
+              portloadid: $data.bookingDetails.portloadid,
+              portload: $data.bookingDetails.portload,
+              portloadcode: $data.bookingDetails.portloadcode,
+              portdischargeid: $data.bookingDetails.portdischargeid,
+              portdischarge: $data.bookingDetails.portdischarge,
+              portdischargecode: $data.bookingDetails.portdischargecode,
+              placereceiptid: $data.bookingDetails.placereceiptid,
+              placereceipt: $data.bookingDetails.placereceipt,
+              placereceiptcode: $data.bookingDetails.placereceiptcode,
+
+              carrierid: $data.bookingDetails.carrierid,
+              reeferf: $data.bookingDetails.reeferf,
+              tempid: $data.bookingDetails.tempid,
+              tempset: $data.bookingDetails.tempset,
+              pkgs: $data.bookingDetails.pkgs,
+              kindpkgs: $data.bookingDetails.kindpkgs,
+              cbm: $data.bookingDetails.cbm,
+              kgs: $data.bookingDetails.kgs,
+              hscode: $data.bookingDetails.hscode,
+              cargoid: $data.bookingDetails.cargoid,
+              description: $data.bookingDetails.description,
+              soremark: $data.bookingDetails.soremark,
+              ctrnHeight: $data.bookingDetails.ctrnHeight,
+              ctrnWidth: $data.bookingDetails.ctrnWidth,
+              ctrnLength: $data.bookingDetails.ctrnLength,
+              dtel: $data.bookingDetails.dtel,
+              linkman: $data.bookingDetails.linkman,
+              dclass: $data.bookingDetails.dclass,
+              dunno: $data.bookingDetails.dunno,
+              ctnList: $data.bookingDetails.ctnList,
+              serviceList: $data.bookingDetails.serviceList
+
+            }
+          }
+
           if (copyData.cargoid === 'S') {
             copyData.cargoName = 'S 普通货'
           }
@@ -1135,6 +1719,9 @@ export default {
         this.init()
       }
     },
+    handleChangeBook(val) {
+      this.details.billSignLoc = val
+    },
     getRouterHisEnter() {
       this.inChildLoading = true
       const newId = this.$route.query.id ? this.$route.query.id.toString() : ''
@@ -1145,53 +1732,106 @@ export default {
         this.id = this.$route.query.id
         this.isCopy = this.$route.query.isCopy
         this.$forceUpdate()
+        this.startPage()
+        this.getAcconut()
       } else if (Object.keys(this.historyData).includes(newId)) {
         this.id = this.$route.query.id
         this.isCopy = this.$route.query.isCopy
         const $data = JSON.parse(JSON.stringify(this.historyData[newId]))
         this.fileList = $data.fileList
+        this.startPage()
+        this.getAcconut()
         if (this.isCopy && !$data.isCopy) {
           this.fileList = []
-          const copyData = {
-            id: 0,
-            bookingno: '',
-            bsstatus: '',
-            files: {},
-            tempFileNames: [],
-            notifyparty: $data.bookingDetails.notifyparty,
-            consignee: $data.bookingDetails.consignee,
-            shipper: $data.bookingDetails.shipper,
-            saleCode: $data.bookingDetails.saleCode,
-            blfrt: $data.bookingDetails.blfrt,
-            service: $data.bookingDetails.service,
-            contractno: $data.bookingDetails.contractno,
-            voyno: $data.bookingDetails.voyno,
-            vessel: $data.bookingDetails.vessel,
-            etd: $data.bookingDetails.etd,
-            portdischargeid: $data.bookingDetails.portdischargeid,
-            portloadid: $data.bookingDetails.portloadid,
-            carrierid: $data.bookingDetails.carrierid,
-            reeferf: $data.bookingDetails.reeferf,
-            tempid: $data.bookingDetails.tempid,
-            tempset: $data.bookingDetails.tempset,
-            pkgs: $data.bookingDetails.pkgs,
-            kindpkgs: $data.bookingDetails.kindpkgs,
-            cbm: $data.bookingDetails.cbm,
-            kgs: $data.bookingDetails.kgs,
-            hscode: $data.bookingDetails.hscode,
-            cargoid: $data.bookingDetails.cargoid,
-            description: $data.bookingDetails.description,
-            soremark: $data.bookingDetails.soremark,
-            ctrnHeight: $data.bookingDetails.ctrnHeight,
-            ctrnWidth: $data.bookingDetails.ctrnWidth,
-            ctrnLength: $data.bookingDetails.ctrnLength,
-            dtel: $data.bookingDetails.dtel,
-            linkman: $data.bookingDetails.linkman,
-            dclass: $data.bookingDetails.dclass,
-            dunno: $data.bookingDetails.dunno,
-            ctnList: $data.bookingDetails.ctnList,
-            serviceList: $data.bookingDetails.serviceList
+          let copyData = {}
+          if ($data.bookingDetails.carrierid !== 'EMC') {
+            copyData = {
+              id: 0,
+              bookingno: '',
+              bsstatus: '',
+              files: {},
+              tempFileNames: [],
+              notifyparty: $data.bookingDetails.notifyparty,
+              consignee: $data.bookingDetails.consignee,
+              shipper: $data.bookingDetails.shipper,
+              saleCode: $data.bookingDetails.saleCode,
+              blfrt: $data.bookingDetails.blfrt,
+              service: $data.bookingDetails.service,
+              contractno: $data.bookingDetails.contractno,
+              voyno: $data.bookingDetails.voyno,
+              vessel: $data.bookingDetails.vessel,
+              etd: $data.bookingDetails.etd,
+              portdischargeid: $data.bookingDetails.portdischargeid,
+              portloadid: $data.bookingDetails.portloadid,
+              carrierid: $data.bookingDetails.carrierid,
+              reeferf: $data.bookingDetails.reeferf,
+              tempid: $data.bookingDetails.tempid,
+              tempset: $data.bookingDetails.tempset,
+              pkgs: $data.bookingDetails.pkgs,
+              kindpkgs: $data.bookingDetails.kindpkgs,
+              cbm: $data.bookingDetails.cbm,
+              kgs: $data.bookingDetails.kgs,
+              hscode: $data.bookingDetails.hscode,
+              cargoid: $data.bookingDetails.cargoid,
+              description: $data.bookingDetails.description,
+              soremark: $data.bookingDetails.soremark,
+              ctrnHeight: $data.bookingDetails.ctrnHeight,
+              ctrnWidth: $data.bookingDetails.ctrnWidth,
+              ctrnLength: $data.bookingDetails.ctrnLength,
+              dtel: $data.bookingDetails.dtel,
+              linkman: $data.bookingDetails.linkman,
+              dclass: $data.bookingDetails.dclass,
+              dunno: $data.bookingDetails.dunno,
+              ctnList: $data.bookingDetails.ctnList,
+              serviceList: $data.bookingDetails.serviceList
+            }
+          }
+          if ($data.bookingDetails.carrierid === 'EMC') {
+            copyData = {
+              id: 0,
+              bookingno: '',
+              bsstatus: '',
+              files: {},
+              tempFileNames: [],
+
+              destinationid: $data.bookingDetails.destinationid,
+              destination: $data.bookingDetails.destination,
+              destinationcode: $data.bookingDetails.destinationcode,
+              portloadid: $data.bookingDetails.portloadid,
+              portload: $data.bookingDetails.portload,
+              portloadcode: $data.bookingDetails.portloadcode,
+              portdischargeid: $data.bookingDetails.portdischargeid,
+              portdischarge: $data.bookingDetails.portdischarge,
+              portdischargecode: $data.bookingDetails.portdischargecode,
+              placereceiptid: $data.bookingDetails.placereceiptid,
+              placereceipt: $data.bookingDetails.placereceipt,
+              placereceiptcode: $data.bookingDetails.placereceiptcode,
+
+              carrierid: $data.bookingDetails.carrierid,
+              reeferf: $data.bookingDetails.reeferf,
+              tempid: $data.bookingDetails.tempid,
+              tempset: $data.bookingDetails.tempset,
+              pkgs: $data.bookingDetails.pkgs,
+              kindpkgs: $data.bookingDetails.kindpkgs,
+              cbm: $data.bookingDetails.cbm,
+              kgs: $data.bookingDetails.kgs,
+              hscode: $data.bookingDetails.hscode,
+              cargoid: $data.bookingDetails.cargoid,
+              description: $data.bookingDetails.description,
+              soremark: $data.bookingDetails.soremark,
+              ctrnHeight: $data.bookingDetails.ctrnHeight,
+              ctrnWidth: $data.bookingDetails.ctrnWidth,
+              ctrnLength: $data.bookingDetails.ctrnLength,
+              dtel: $data.bookingDetails.dtel,
+              linkman: $data.bookingDetails.linkman,
+              dclass: $data.bookingDetails.dclass,
+              dunno: $data.bookingDetails.dunno,
+              ctnList: $data.bookingDetails.ctnList,
+              serviceList: $data.bookingDetails.serviceList
+
+            }
           }
+
           if (copyData.cargoid === 'S') {
             copyData.cargoName = 'S 普通货'
           }
@@ -1205,6 +1845,7 @@ export default {
             copyData.cargoName = 'O 超限箱'
           }
           this.details = { ...JSON.parse(JSON.stringify(copyData)) }
+          console.log(this.details)
         } else {
           this.init()
         }
@@ -1214,7 +1855,247 @@ export default {
         this.isCopy = this.$route.query.isCopy
         this.$forceUpdate()
         this.init()
+        this.startPage()
+        this.getAcconut()
+      }
+    },
+    handleSubimtVess() {
+      if (this.selectedAppKeys.length === 0) {
+        this.$message.error('请选择一条船期')
+        return false
+      }
+      const data = {
+        ...this.details
+      }
+      if (!this.details.serviceList) {
+        this.details.serviceList = []
+      }
+      if (this.details.serviceList.length > 0) {
+        const arr = []
+        this.options.forEach(item => {
+          this.details.serviceList.forEach(ite => {
+            if (item.code === ite) {
+              arr.push({
+                code: item.code,
+                value: item.name
+              })
+            }
+          })
+        })
+        data.serviceItemList = arr
+      } else {
+        data.serviceItemList = []
+      }
+      if (!this.isCopy) {
+        const filesArr = []
+        const tempFileNamesArr = []
+        if (this.fileList.length > 0) {
+          this.fileList.forEach(item => {
+            if (item.id.indexOf('\\') != -1) {
+              tempFileNamesArr.push(item.id)
+            } else {
+              filesArr.push(item.id)
+            }
+          })
+        }
+        data.files = filesArr
+        data.tempFileNames = tempFileNamesArr
+      }
+      if (data.ctnList.length > 0) {
+        data.ctnList.forEach(item => {
+          delete item._X_ROW_KEY
+          delete item.oper
+          this.ctnallList.forEach(ite => {
+            if (ite.code === item.ctncode) {
+              item.ctnall = ite.name
+            }
+          })
+          if (this.isCopy) {
+            delete item.id
+          }
+        })
+      }
+      if (data.files && Object.values(data.files).length === 0) {
+        delete data.files
+      }
+      if (!data.id && !this.isCopy) {
+        data.id = this.id
+      }
+      let obj = {}
+      this.vesselList.forEach((item, index) => {
+        if (index === this.selectedAppKeys[0]) {
+          obj = item
+        }
+      })
+      data.shipData = obj
+      data.vessel = obj.vesselName
+      data.voyno = obj.voyageNumber
+      data.lanecode = obj.serviceCode
+      this.vesselLoad = true
+      BookingCustomerOrderSave(data).then(res => {
+        if (res.success) {
+          this.handleSendInfo()
+        } else {
+          this.vesselLoad = false
+          this.$message.error(res.message)
+        }
+      })
+        .catch(res => {
+          this.vesselLoad = false
+        })
+    },
+    handleChangeAccount(val) {
+      this.accountList.forEach(item => {
+        if (item.account === val) {
+          this.details.bookingPassword = item.password
+        }
+      })
+    },
+    getAcconut() {
+      const data = {
+        currentPage: 1,
+        pageSize: 5,
+        typeCode: 'EmcWeb'
+      }
+      DjyWebsiteAccountConfigPage(data).then(res => {
+        this.accountList = res.data.rows
+      })
+    },
+    getDictList() {
+      if (localStorage.getItem('pro__DICT_TYPE_TREE_DATA')) {
+        const arr = JSON.parse(localStorage.getItem('pro__DICT_TYPE_TREE_DATA'))
+        arr.value.forEach(item => {
+          if (item.code === 'booking_contractNo') {
+            this.contractnoList = item.children
+          }
+          if (item.code === 'booking_billSignLoc') {
+            this.billSignLocList = item.children
+          }
+          if (item.code === 'booking_bookingAddr') {
+            this.bookingAddrList = item.children
+          }
+          if (item.code === 'booking_serivceMode') {
+            this.serivceModeList = item.children
+          }
+          if (item.code === 'booking_serviceType') {
+            this.serviceTypeList = item.children
+          }
+        })
+      }
+    },
+    startPage() {
+      const data = {
+        PageSize: 5,
+        PageNo: 1,
+        carrierid: 'EMC'
+      }
+      BookingCustomerOrderPage(data).then(res => {
+        this.shipPageList = JSON.parse(JSON.stringify(res.data.items))
+        this.bookPageList = JSON.parse(JSON.stringify(res.data.items))
+        const arr = []
+        const arr1 = []
+        const arr2 = []
+        const arr3 = []
+        res.data.items.forEach(item => {
+          if (item.shipperName) {
+            arr.push(item.shipperName)
+          }
+          if (item.bookingName) {
+            arr1.push(item.bookingName)
+          }
+          if (item.notifypartName) {
+            arr2.push(item.notifypartName)
+          }
+          if (item.consigneeName) {
+            arr3.push(item.consigneeName)
+          }
+        })
+        this.shipperList = arr
+        this.bookingList = arr1
+        this.notifypartList = arr2
+        this.consigneeList = arr3
+      })
+    },
+    handleSearchAuto(val) {
+      const data = {
+        PageSize: 5,
+        PageNo: 1,
+        carrierid: 'EMC',
+        shipperName: val
+      }
+      BookingCustomerOrderPage(data).then(res => {
+        this.shipPageList = res.data.items
+        const arr = []
+        res.data.items.forEach(item => {
+          if (item.shipperName) {
+            arr.push(item.shipperName)
+          }
+        })
+        this.shipperList = arr
+      })
+    },
+    handleSearchAuto1(val) {
+      const data = {
+        PageSize: 5,
+        PageNo: 1,
+        carrierid: 'EMC',
+        bookingName: val
+      }
+      BookingCustomerOrderPage(data).then(res => {
+        this.bookPageList = res.data.items
+        const arr = []
+        res.data.items.forEach(item => {
+          if (item.bookingName) {
+            arr.push(item.bookingName)
+          }
+        })
+        this.bookingList = arr
+      })
+    },
+    handleSearchAuto2(val) {
+      const data = {
+        PageSize: 5,
+        PageNo: 1,
+        carrierid: 'EMC',
+        notifypartName: val
+      }
+      BookingCustomerOrderPage(data).then(res => {
+        const arr = []
+        res.data.items.forEach(item => {
+          if (item.notifypartName) {
+            arr.push(item.notifypartName)
+          }
+        })
+        this.notifypartList = arr
+      })
+    },
+    handleSearchAuto3(val) {
+      const data = {
+        PageSize: 5,
+        PageNo: 1,
+        carrierid: 'EMC',
+        consigneeName: val
+      }
+      BookingCustomerOrderPage(data).then(res => {
+        const arr = []
+        res.data.items.forEach(item => {
+          if (item.consigneeName) {
+            arr.push(item.consigneeName)
+          }
+        })
+        this.consigneeList = arr
+      })
+    },
+    handleSearchAccount(val) {
+      const data = {
+        currentPage: 1,
+        pageSize: 5,
+        typeCode: 'EmcWeb',
+        account: val
       }
+      DjyWebsiteAccountConfigPage(data).then(res => {
+        this.accountList = res.data.rows
+      })
     },
     init() {
       this.options = this.$options.filters['dictData']('booking_service_item')
@@ -1237,16 +2118,55 @@ export default {
         if (this.$route.query.carrierid) {
           this.$set(this.details, 'carrierid', this.$route.query.carrierid)
           this.$set(this.details, 'carrier', this.$route.query.carrierid)
+          if (this.$route.query.carrierid === 'EMC') {
+            this.$set(this.details, 'shipperSex', 'Mr.')
+            this.$set(this.details, 'bookingSex', 'Mr.')
+            this.$set(this.details, 'blfrt', '')
+            this.$set(this.details, 'service', '')
+            this.$set(this.details, 'portload', '')
+            this.$set(this.details, 'portloadid', '')
+            this.$set(this.details, 'billCount', 1)
+          }
         }
       }
     },
+    onSelectAuto(val) {
+      this.shipPageList.forEach(item => {
+        if (item.shipperName === val) {
+          this.$set(this.details, 'shipperSex', item.shipperSex)
+          this.$set(this.details, 'shipperLastName', item.shipperLastName)
+          this.$set(this.details, 'shipperFirstName', item.shipperFirstName)
+          this.$set(this.details, 'shipperPhoneCountryCode', item.shipperPhoneCountryCode)
+          this.$set(this.details, 'shipperPhoneCode', item.shipperPhoneCode)
+          this.$set(this.details, 'shipperPhone', item.shipperPhone)
+          this.$set(this.details, 'shipperPhoneExtension', item.shipperPhoneExtension)
+          this.$set(this.details, 'shipperInnerCode', item.shipperInnerCode)
+          this.$set(this.details, 'shipperEmail', item.shipperEmail)
+        }
+      })
+    },
+    onSelectAuto1(val) {
+      this.bookPageList.forEach(item => {
+        if (item.bookingName === val) {
+          this.$set(this.details, 'bookingSex', item.bookingSex)
+          this.$set(this.details, 'bookingLastName', item.bookingLastName)
+          this.$set(this.details, 'bookingFirstName', item.bookingFirstName)
+          this.$set(this.details, 'bookingPhoneCountryCode', item.bookingPhoneCountryCode)
+          this.$set(this.details, 'bookingPhoneCode', item.bookingPhoneCode)
+          this.$set(this.details, 'bookingPhone', item.bookingPhone)
+          this.$set(this.details, 'bookingPhoneExtension', item.bookingPhoneExtension)
+          this.$set(this.details, 'bookingInnerCode', item.bookingInnerCode)
+          this.$set(this.details, 'bookingEmail', item.bookingEmail)
+        }
+      })
+    },
     handleSelectAll() {
       if (this.options.length == this.details.serviceList.length) {
         this.details.serviceList = []
       } else {
         this.details.serviceList = this.options.map(item => {
-        return item.code
-      })
+          return item.code
+        })
       }
     },
     handleOpenStatus() {
@@ -1268,7 +2188,113 @@ export default {
       })
     },
     handleSubimt() {
-      this.sendFlag = true
+      if (this.details.carrierid !== 'EMC') {
+        this.sendFlag = true
+      } else {
+        this.$refs.basicFrom.validate(valid => {
+          if (valid) {
+            if (!this.details.contractno || !this.details.contractType) {
+              this.$message.error('请填写合约号')
+              return false
+            }
+            if (!this.details.shipperPhone || !this.details.shipperPhoneCode ||
+              !this.details.shipperPhoneCountryCode || !this.details.shipperFirstName || !this.details.shipperLastName ||
+              !this.details.shipperSex || !this.details.shipperName) {
+              this.$message.error('请填写发货人内容')
+              return false
+            }
+            if (!this.details.bookingPhone || !this.details.bookingPhoneCode ||
+              !this.details.bookingPhoneCountryCode || !this.details.bookingFirstName || !this.details.bookingLastName ||
+              !this.details.bookingSex || !this.details.bookingName) {
+              this.$message.error('请填写货物代理人内容')
+              return false
+            }
+            const data = {
+              ...this.details
+            }
+            if (!this.details.serviceList) {
+              this.details.serviceList = []
+            }
+            if (this.details.serviceList.length > 0) {
+              const arr = []
+              this.options.forEach(item => {
+                this.details.serviceList.forEach(ite => {
+                  if (item.code === ite) {
+                    arr.push({
+                      code: item.code,
+                      value: item.name
+                    })
+                  }
+                })
+              })
+              data.serviceItemList = arr
+            } else {
+              data.serviceItemList = []
+            }
+            if (!this.isCopy) {
+              const filesArr = []
+              const tempFileNamesArr = []
+              if (this.fileList.length > 0) {
+                this.fileList.forEach(item => {
+                  if (item.id.indexOf('\\') != -1) {
+                    tempFileNamesArr.push(item.id)
+                  } else {
+                    filesArr.push(item.id)
+                  }
+                })
+              }
+              data.files = filesArr
+              data.tempFileNames = tempFileNamesArr
+            }
+            if (data.ctnList.length > 0) {
+              data.ctnList.forEach(item => {
+                delete item._X_ROW_KEY
+                delete item.oper
+                this.ctnallList.forEach(ite => {
+                  if (ite.code === item.ctncode) {
+                    item.ctnall = ite.name
+                  }
+                })
+                if (this.isCopy) {
+                  delete item.id
+                }
+              })
+            }
+            if (data.files && Object.values(data.files).length === 0) {
+              delete data.files
+            }
+            if (!data.id && !this.isCopy) {
+              data.id = this.id
+            }
+            this.vesselFlag = true
+            this.vesselLoad = true
+            this.vesselList = []
+            BookingCustomerOrderSave(data).then(res => {
+              if (res.success) {
+                const data = {
+                  custOrdId: this.$route.query.id
+                }
+                QueryShipInfoEMC(data).then(res => {
+                  if (res.success) {
+                    this.vesselList = res.data
+                  } else {
+                    this.$message.error(res.message)
+                  }
+                  this.vesselLoad = false
+                })
+              } else {
+                this.vesselLoad = false
+                this.$message.error(res.message)
+              }
+            })
+              .catch(res => {
+                this.vesselLoad = false
+              })
+          } else {
+            return false;
+          }
+        })
+      }
     },
     handleSendInfo() {
       this.loading = true
@@ -1276,11 +2302,14 @@ export default {
       BookingCustomerOrderSubmit([this.details.id]).then(res => {
         if (res.success) {
           this.loading = false
+          this.vesselLoad = false
+          this.vesselFlag = false
           this.$message.success('提交成功')
           this.getDetail()
         } else {
           this.$message.error(res.message)
           this.loading = false
+          this.vesselLoad = false
         }
       })
     },
@@ -1297,6 +2326,9 @@ export default {
         }
       })
     },
+    onAppSelectChange(selectedRowKeys) {
+      this.selectedAppKeys = selectedRowKeys;
+    },
     handleSaveTemp() {
       if (!this.tempName) {
         this.$message.warning('请输入模板名称')
@@ -1323,6 +2355,11 @@ export default {
         })
       }
     },
+    customRow(column) {
+      column.forEach((e, index) => {
+        column[index].className = 'tableClass'
+      })
+    },
     getDetail() {
       const data = {
         id: this.id
@@ -1332,109 +2369,109 @@ export default {
         if (res.success) {
           this.loading = false
           if (this.$route.query.isCopy) {
-          this.fileList = []
-          let arr = []
-          if (res.data.serviceItemList && res.data.serviceItemList.length > 0) {
-            arr = res.data.serviceItemList.map(item => {
-              return item.code
-            })
-          }
-          const copyData = {
-            id: 0,
-            bookingno: '',
-            bsstatus: '',
-            files: {},
-            tempFileNames: [],
-            notifyparty: res.data.notifyparty,
-            consignee: res.data.consignee,
-            shipper: res.data.shipper,
-            saleCode: res.data.saleCode,
-            blfrt: res.data.blfrt,
-            service: res.data.service,
-            contractno: res.data.contractno,
-            voyno: res.data.voyno,
-            vessel: res.data.vessel,
-            etd: res.data.etd,
-            portdischargeid: res.data.portdischargeid,
-            portloadid: res.data.portloadid,
-            carrierid: res.data.carrierid,
-            reeferf: res.data.reeferf,
-            tempid: res.data.tempid,
-            tempset: res.data.tempset,
-            pkgs: res.data.pkgs,
-            kindpkgs: res.data.kindpkgs,
-            cbm: res.data.cbm,
-            kgs: res.data.kgs,
-            hscode: res.data.hscode,
-            cargoid: res.data.cargoid,
-            description: res.data.description,
-            soremark: res.data.soremark,
-            ctrnHeight: res.data.ctrnHeight,
-            ctrnWidth: res.data.ctrnWidth,
-            ctrnLength: res.data.ctrnLength,
-            dtel: res.data.dtel,
-            linkman: res.data.linkman,
-            dclass: res.data.dclass,
-            dunno: res.data.dunno,
-            ctnList: res.data.ctnList,
-            serviceList: arr
-          }
-          if (copyData.cargoid === 'S') {
-            copyData.cargoName = 'S 普通货'
-          }
-          if (copyData.cargoid === 'R') {
-            copyData.cargoName = 'R 冻柜'
-          }
-          if (copyData.cargoid === 'D') {
-            copyData.cargoName = 'D 危险品'
-          }
-          if (copyData.cargoid === 'O') {
-            copyData.cargoName = 'O 超限箱'
-          }
-          this.details = { ...JSON.parse(JSON.stringify(copyData)) }
-        } else {
-          if (res.data.cargoid) {
-            if (res.data.cargoid === 'S') {
-              res.data.cargoName = 'S 普通货'
+            this.fileList = []
+            let arr = []
+            if (res.data.serviceItemList && res.data.serviceItemList.length > 0) {
+              arr = res.data.serviceItemList.map(item => {
+                return item.code
+              })
             }
-            if (res.data.cargoid === 'R') {
-              res.data.cargoName = 'R 冻柜'
+            const copyData = {
+              id: 0,
+              bookingno: '',
+              bsstatus: '',
+              files: {},
+              tempFileNames: [],
+              notifyparty: res.data.notifyparty,
+              consignee: res.data.consignee,
+              shipper: res.data.shipper,
+              saleCode: res.data.saleCode,
+              blfrt: res.data.blfrt,
+              service: res.data.service,
+              contractno: res.data.contractno,
+              voyno: res.data.voyno,
+              vessel: res.data.vessel,
+              etd: res.data.etd,
+              portdischargeid: res.data.portdischargeid,
+              portloadid: res.data.portloadid,
+              carrierid: res.data.carrierid,
+              reeferf: res.data.reeferf,
+              tempid: res.data.tempid,
+              tempset: res.data.tempset,
+              pkgs: res.data.pkgs,
+              kindpkgs: res.data.kindpkgs,
+              cbm: res.data.cbm,
+              kgs: res.data.kgs,
+              hscode: res.data.hscode,
+              cargoid: res.data.cargoid,
+              description: res.data.description,
+              soremark: res.data.soremark,
+              ctrnHeight: res.data.ctrnHeight,
+              ctrnWidth: res.data.ctrnWidth,
+              ctrnLength: res.data.ctrnLength,
+              dtel: res.data.dtel,
+              linkman: res.data.linkman,
+              dclass: res.data.dclass,
+              dunno: res.data.dunno,
+              ctnList: res.data.ctnList,
+              serviceList: arr
             }
-            if (res.data.cargoid === 'D') {
-              res.data.cargoName = 'D 危险品'
+            if (copyData.cargoid === 'S') {
+              copyData.cargoName = 'S 普通货'
             }
-            if (res.data.cargoid === 'O') {
-              res.data.cargoName = 'O 超限箱'
+            if (copyData.cargoid === 'R') {
+              copyData.cargoName = 'R 冻柜'
             }
-          }
-          this.details = res.data
-          this.$set(this.details, 'bsstatus', res.data.bsstatus)
-          let arr = []
-          if (this.details.serviceItemList && this.details.serviceItemList.length > 0) {
-            arr = this.details.serviceItemList.map(item => {
-              return item.code
-            })
-          }
-          this.$set(this.details, 'serviceList', arr)
-          if (Object.keys(this.details.files).length > 0) {
-            const arr = []
-            Object.keys(this.details.files).forEach((item, index) => {
-              arr.push({
-                id: item,
-                name: Object.values(this.details.files)[index]
+            if (copyData.cargoid === 'D') {
+              copyData.cargoName = 'D 危险品'
+            }
+            if (copyData.cargoid === 'O') {
+              copyData.cargoName = 'O 超限箱'
+            }
+            this.details = { ...JSON.parse(JSON.stringify(copyData)) }
+          } else {
+            if (res.data.cargoid) {
+              if (res.data.cargoid === 'S') {
+                res.data.cargoName = 'S 普通货'
+              }
+              if (res.data.cargoid === 'R') {
+                res.data.cargoName = 'R 冻柜'
+              }
+              if (res.data.cargoid === 'D') {
+                res.data.cargoName = 'D 危险品'
+              }
+              if (res.data.cargoid === 'O') {
+                res.data.cargoName = 'O 超限箱'
+              }
+            }
+            this.details = res.data
+            this.$set(this.details, 'bsstatus', res.data.bsstatus)
+            let arr = []
+            if (this.details.serviceItemList && this.details.serviceItemList.length > 0) {
+              arr = this.details.serviceItemList.map(item => {
+                return item.code
+              })
+            }
+            this.$set(this.details, 'serviceList', arr)
+            if (Object.keys(this.details.files).length > 0) {
+              const arr = []
+              Object.keys(this.details.files).forEach((item, index) => {
+                arr.push({
+                  id: item,
+                  name: Object.values(this.details.files)[index]
+                })
               })
+              this.fileList = arr
+            }
+            res.data.logList.forEach(item => {
+              const arr = item.status.split('，')
+              item.status = arr[0]
+              if (arr.length > 1) {
+                item.remark = arr[1].slice(5, arr[1].length)
+              }
             })
-            this.fileList = arr
+            this.statusList = res.data.logList
           }
-          res.data.logList.forEach(item => {
-            const arr = item.status.split('，')
-            item.status = arr[0]
-            if (arr.length > 1) {
-              item.remark = arr[1].slice(5, arr[1].length)
-            }
-          })
-          this.statusList = res.data.logList
-        }
         } else {
           this.$message.error(res.message)
           this.loading = false
@@ -1443,150 +2480,145 @@ export default {
     },
     handleSave() {
       if (!this.saveFlag) {
-        this.$refs.basicFrom.validate(valid => {
-          if (valid) {
-            const data = {
-              ...this.details
+        const data = {
+          ...this.details
+        }
+        if (!this.details.serviceList) {
+          this.details.serviceList = []
+        }
+        if (this.details.serviceList.length > 0) {
+          const arr = []
+          this.options.forEach(item => {
+            this.details.serviceList.forEach(ite => {
+              if (item.code === ite) {
+                arr.push({
+                  code: item.code,
+                  value: item.name
+                })
+              }
+            })
+          })
+          data.serviceItemList = arr
+        } else {
+          data.serviceItemList = []
+        }
+        if (!this.isCopy) {
+          const filesArr = []
+          const tempFileNamesArr = []
+          if (this.fileList.length > 0) {
+            this.fileList.forEach(item => {
+              if (item.id.indexOf('\\') != -1) {
+                tempFileNamesArr.push(item.id)
+              } else {
+                filesArr.push(item.id)
+              }
+            })
+          }
+          data.files = filesArr
+          data.tempFileNames = tempFileNamesArr
+        }
+        if (data.ctnList.length > 0) {
+          data.ctnList.forEach(item => {
+            delete item._X_ROW_KEY
+            delete item.oper
+            this.ctnallList.forEach(ite => {
+              if (ite.code === item.ctncode) {
+                item.ctnall = ite.name
+              }
+            })
+            if (this.isCopy) {
+              delete item.id
             }
-            if (!this.details.serviceList) {
-              this.details.serviceList = []
+          })
+        }
+        if (data.files && Object.values(data.files).length === 0) {
+          delete data.files
+        }
+        if (!data.id && !this.isCopy) {
+          data.id = this.id
+        }
+
+        this.loading = true
+        this.saveFlag = true
+        BookingCustomerOrderSave(data).then(res => {
+          if (res.success) {
+            this.$message.success('保存成功')
+            setTimeout(() => {
+              this.saveFlag = false
+            }, 5000);
+            this.loading = false
+            this.id = res.data.id
+            if (res.data.cargoid) {
+              if (res.data.cargoid === 'S') {
+                res.data.cargoName = 'S 普通货'
+              }
+              if (res.data.cargoid === 'R') {
+                res.data.cargoName = 'R 冻柜'
+              }
+              if (res.data.cargoid === 'D') {
+                res.data.cargoName = 'D 危险品'
+              }
+              if (res.data.cargoid === 'O') {
+                res.data.cargoName = 'O 超限箱'
+              }
             }
-            if (this.details.serviceList.length > 0) {
+            this.details = res.data
+            this.$set(this.details, 'bsstatus', res.data.bsstatus)
+            let arr = []
+            if (this.details.serviceItemList && this.details.serviceItemList.length > 0) {
+              arr = this.details.serviceItemList.map(item => {
+                return item.code
+              })
+            }
+            this.$set(this.details, 'serviceList', arr)
+            if (Object.keys(this.details.files).length > 0) {
               const arr = []
-              this.options.forEach(item => {
-                this.details.serviceList.forEach(ite => {
-                  if (item.code === ite) {
-                    arr.push({
-                      code: item.code,
-                      value: item.name
-                    })
-                  }
+              Object.keys(this.details.files).forEach((item, index) => {
+                arr.push({
+                  id: item,
+                  name: Object.values(this.details.files)[index]
                 })
               })
-              data.serviceItemList = arr
-            } else {
-              data.serviceItemList = []
+              this.fileList = arr
             }
-            if (!this.isCopy) {
-              const filesArr = []
-              const tempFileNamesArr = []
-              if (this.fileList.length > 0) {
-                this.fileList.forEach(item => {
-                  if (item.id.indexOf('\\') != -1) {
-                    tempFileNamesArr.push(item.id)
-                  } else {
-                    filesArr.push(item.id)
-                  }
-                })
+            res.data.logList.forEach(item => {
+              const arr = item.status.split('，')
+              item.status = arr[0]
+              if (arr.length > 1) {
+                item.remark = arr[1].slice(5, arr[1].length)
               }
-              data.files = filesArr
-              data.tempFileNames = tempFileNamesArr
-            }
-            if (data.ctnList.length > 0) {
-              data.ctnList.forEach(item => {
-                delete item._X_ROW_KEY
-                delete item.oper
-                this.ctnallList.forEach(ite => {
-                  if (ite.code === item.ctncode) {
-                    item.ctnall = ite.name
+            })
+            this.statusList = res.data.logList
+            setTimeout(() => {
+              if (this.isCopy || this.isAdd) {
+                this.$router.replace({
+                  name: 'BookingCustomerDetail',
+                  query: {
+                    id: res.data.id,
+                    noOpenTab: true,
+                    bookingno: res.data.bookingno
                   }
                 })
                 if (this.isCopy) {
-                  delete item.id
-                }
-              })
-            }
-            if (data.files && Object.values(data.files).length === 0) {
-              delete data.files
-            }
-            if (!data.id && !this.isCopy) {
-              data.id = this.id
-            }
-
-            this.loading = true
-            this.saveFlag = true
-            BookingCustomerOrderSave(data).then(res => {
-              if (res.success) {
-                this.$message.success('保存成功')
-                setTimeout(() => {
-                  this.saveFlag = false
-                }, 5000);
-                this.loading = false
-                this.id = res.data.id
-                if (res.data.cargoid) {
-                  if (res.data.cargoid === 'S') {
-                    res.data.cargoName = 'S 普通货'
-                  }
-                  if (res.data.cargoid === 'R') {
-                    res.data.cargoName = 'R 冻柜'
-                  }
-                  if (res.data.cargoid === 'D') {
-                    res.data.cargoName = 'D 危险品'
-                  }
-                  if (res.data.cargoid === 'O') {
-                    res.data.cargoName = 'O 超限箱'
-                  }
-                }
-                this.details = res.data
-                this.$set(this.details, 'bsstatus', res.data.bsstatus)
-                let arr = []
-                if (this.details.serviceItemList && this.details.serviceItemList.length > 0) {
-                  arr = this.details.serviceItemList.map(item => {
-                    return item.code
-                  })
+                  this.isCopy = false
                 }
-                this.$set(this.details, 'serviceList', arr)
-                if (Object.keys(this.details.files).length > 0) {
-                  const arr = []
-                  Object.keys(this.details.files).forEach((item, index) => {
-                    arr.push({
-                      id: item,
-                      name: Object.values(this.details.files)[index]
-                    })
-                  })
-                  this.fileList = arr
+                if (this.isAdd) {
+                  this.isAdd = false
                 }
-                res.data.logList.forEach(item => {
-                  const arr = item.status.split('，')
-                  item.status = arr[0]
-                  if (arr.length > 1) {
-                    item.remark = arr[1].slice(5, arr[1].length)
-                  }
-                })
-                this.statusList = res.data.logList
-                setTimeout(() => {
-                  if (this.isCopy || this.isAdd) {
-                    this.$router.replace({
-                      name: 'BookingCustomerDetail',
-                      query: {
-                        id: res.data.id,
-                        noOpenTab: true,
-                        bookingno: res.data.bookingno
-                      }
-                    })
-                    if (this.isCopy) {
-                      this.isCopy = false
-                    }
-                    if (this.isAdd) {
-                      this.isAdd = false
-                    }
-                  }
-                }, 500);
-              } else {
-                this.loading = false
-                this.saveFlag = false
-                this.$message.error(res.message)
               }
-            })
-            .catch(res => {
-              this.loading = false
-              this.saveFlag = false
-            })
+            }, 500);
           } else {
-            this.$message.warning('请检查必填项')
+            this.loading = false
             this.saveFlag = false
+            this.$message.error(res.message)
           }
         })
+          .catch(res => {
+            this.loading = false
+            this.saveFlag = false
+          })
+      } else {
+        this.saveFlag = false
       }
     },
     handleDelete() {
@@ -1780,6 +2812,7 @@ export default {
       ) {
         this.details[type] = res['ediCode'] || ''
         this.details[type.replace('id', '')] = res['enName'] || ''
+        this.$forceUpdate()
         if (type === 'portloadid') {
           this.details.issueplace = res['enName'] || ''
           this.details.issueplaceid = res['ediCode'] || ''
@@ -1787,34 +2820,17 @@ export default {
           this.details.placereceiptid = this.details.placereceiptid ? this.details.placereceiptid : res['ediCode'] || ''
           this.details.placereceipt = this.details.placereceipt ? this.details.placereceipt : res['enName'] || ''
         } else if (type === 'placereceiptid') {
-          this.details.portloadid = this.details.portloadid ? this.details.portloadid : res['ediCode'] || ''
-          this.details.portload = this.details.portload ? this.details.portload : res['enName'] || ''
+          this.details.portload = res['enName'] || ''
+          this.details.portloadid = res['ediCode'] || ''
+          this.details.portloadcode = res['code'] || ''
+          this.details.placereceiptcode = res['code'] || ''
         }
         if (type === 'portdischargeid') {
           this.details.portdischargecode = res['code']
-        }
-        if (['portdischargeid', 'destinationid'].includes(type)) {
-          if (
-            Object.keys(res).length === 0 ||
-            !res.lineName ||
-            res.lineName.length === 0 ||
-            !res.lineName[0]['cnName']
-          ) {
-            this[`${type}Hasline`] = false
-            return false
-          }
-          if (res.lineName[0]['carrierCode'] && this.details.carrierid !== res.lineName[0]['carrierCode']) {
-            return false
-          }
-          if (type === 'destinationid' && this.portdischargeHasline) {
-            return false
-          }
-          this.details.lineName = this.userHasLine ? this.details.lineName : res.lineName[0]['cnName']
-          if (type === 'portdischargeid') {
-            this.portdischargeHasline = true
-          } else {
-            this.destinationidHasline = true
-          }
+          this.details.destination = res['enName'] || ''
+          this.details.destinationid = res['ediCode'] || ''
+          this.details.destinationcode = res['code'] || ''
+          this.$forceUpdate()
         }
       } else if (['shippername', 'consigneename', 'notifypartyname', 'notifypartY2name', 'foreignAgentname', 'descriptionname'].includes(type)) {
         this[type] = res['title'] || ''
@@ -1887,6 +2903,9 @@ export default {
         }, 600)
       }
     },
+    dateChangeFun1({ type, value }) {
+      this.details[type] = value || ''
+    },
     getWeek(dateTime) {
       // eslint-disable-next-line camelcase
       const temp_ms = new Date(dateTime).getTime()
@@ -2018,4 +3037,15 @@ export default {
     }
   }
 }
+
+.row-title {
+  font-size: 16px;
+  color: #009DD9;
+  font-weight: 600;
+  margin-bottom: 5px;
+}
+
+/deep/.tableClass {
+  background: #cccccc !important;
+}
 </style>
diff --git a/src/views/main/BookingDjy/detail/index.vue b/src/views/main/BookingDjy/detail/index.vue
index 93de4e6..5955962 100644
--- a/src/views/main/BookingDjy/detail/index.vue
+++ b/src/views/main/BookingDjy/detail/index.vue
@@ -4,195 +4,379 @@
       <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>
+      <span>订单状态:{{ details.bsstatus }}</span>
       <span v-if="details.bookingno" style="margin: 0 10px;">订单编号:</span>
       <span v-if="details.bookingno">{{ details.bookingno }}</span>
     </div>
     <a-spin :spinning="loading">
       <div class="box">
         <a-form-model size="small" ref="basicFrom" :selfUpdate="true" :model="details" :rules="rules">
-          <a-row>
-            <a-col :span="'4-8'">
-              <a-form-model-item
-                class="from-label"
-                label="订单状态"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                has-feedback>
-                <span>{{ details.bsstatus }}</span>
-              </a-form-model-item>
-            </a-col>
-            <a-col :span="'4-8'">
-              <a-form-model-item
-                class="from-label"
-                label="船公司"
-                prop="carrierid"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                has-feedback>
-                <span>{{ details.carrierid }}</span>
-              </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
-                prop="portloadid">
-                <span>{{ details.portloadid }}</span>
-              </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>
-                <span>{{ details.portdischargeid }}</span>
-              </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
-                prop="destinationid">
-                <span>{{ details.destinationid }}</span>
-              </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
-                prop="etd">
-                <div class="date-box">
-                  <span>{{ details.etd?details.etd.slice(0,10):'' }}</span>
-                </div>
-              </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
-                prop="lanecode">
-                <span>{{ details.lanecode }}</span>
-              </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
-                prop="portload">
-                <span>{{ details.portload }}</span>
-              </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>
-                <span>{{ details.portdischarge }}</span>
-              </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
-                prop="destination">
-                <span>{{ details.destination }}</span>
-              </a-form-model-item>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col :span="'4-8'">
-              <a-form-model-item
-                class="from-label"
-                label="船名"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                has-feedback
-                prop="vessel">
-                <div class="copy-box">
-                  <span>{{ details.vessel }}</span>
-                </div>
-              </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
-                prop="voyno">
-                <span>{{ details.voyno }}</span>
-              </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
-                prop="contractno">
-                <span>{{ details.contractno }}</span>
-              </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
-                prop="service">
-                <span>{{ details.service }}</span>
-              </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
-                prop="blfrt">
-                <span>{{ details.blfrt }}</span>
-              </a-form-model-item>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col :span="'4-8'">
-              <a-form-model-item
-                class="from-label"
-                label="销售代码"
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                has-feedback
-                prop="blfrt">
-                <span>{{ details.saleCode }}</span>
-              </a-form-model-item>
-            </a-col>
-          </a-row>
+          <div v-if="details.carrierid !== 'EMC'" >
+            <a-row>
+              <a-col :span="'4-8'">
+                <a-form-model-item
+                  class="from-label"
+                  label="船公司"
+                  prop="carrierid"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback>
+                  <span>{{ details.carrierid }}</span>
+                </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
+                  prop="portloadid">
+                  <span>{{ details.portloadid }}</span>
+                </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>
+                  <span>{{ details.portdischargeid }}</span>
+                </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
+                  prop="destinationid">
+                  <span>{{ details.destinationid }}</span>
+                </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
+                  prop="etd">
+                  <div class="date-box">
+                    <span>{{ details.etd?details.etd.slice(0,10):'' }}</span>
+                  </div>
+                </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
+                  prop="lanecode">
+                  <span>{{ details.lanecode }}</span>
+                </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
+                  prop="portload">
+                  <span>{{ details.portload }}</span>
+                </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>
+                  <span>{{ details.portdischarge }}</span>
+                </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
+                  prop="destination">
+                  <span>{{ details.destination }}</span>
+                </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
+                  prop="blfrt">
+                  <span>{{ details.saleCode }}</span>
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+            <a-row>
+              <a-col :span="'4-8'">
+                <a-form-model-item
+                  class="from-label"
+                  label="船名"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="vessel">
+                  <div class="copy-box">
+                    <span>{{ details.vessel }}</span>
+                  </div>
+                </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
+                  prop="voyno">
+                  <span>{{ details.voyno }}</span>
+                </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
+                  prop="contractno">
+                  <span>{{ details.contractno }}</span>
+                </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
+                  prop="service">
+                  <span>{{ details.service }}</span>
+                </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
+                  prop="blfrt">
+                  <span>{{ details.blfrt }}</span>
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+          </div>
+          <div v-if="details.carrierid == 'EMC'" >
+            <a-row>
+              <a-col :span="'4-8'">
+                <a-form-model-item
+                  class="from-label"
+                  label="收货地"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="placereceiptid">
+                  {{ details.placereceipt }}
+                </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
+                  prop="portloadid">
+                  {{ details.portload }}
+                </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
+                  prop="portdischargeid">
+                  {{ details.portdischarge }}
+                </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
+                  prop="destinationid">
+                  {{ details.destination }}
+                </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>
+                  {{ details.contractType }}   {{ details.contractno }}
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+            <a-row>
+              <a-col :span="'4-8'">
+                <a-form-model-item
+                  class="from-label"
+                  label="订舱账号"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="bookingAccount">
+                  {{ details.bookingAccount }}
+                </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>
+                  {{ details.vessel }}
+                </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>
+                  {{ 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>
+                  {{ details.lanecode }}
+                </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
+                  prop="etd">
+                  {{ details.etd }}
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+            <a-row>
+              <a-col :span="'4-8'">
+                <a-form-model-item
+                  class="from-label"
+                  label="运送方式"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="serviceType">
+                  {{ details.serviceType }}
+                </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
+                  prop="serviceMode">
+                  {{ details.serviceMode }}
+                </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
+                  prop="bookingAddr">
+                  {{ details.bookingAddr }}
+                </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
+                  prop="billSignLoc">
+                  {{ details.billSignLoc }}
+                </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
+                  prop="billCount">
+                  {{ details.billCount }}
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+            <a-row>
+              <a-col :span="'4-8'">
+                <a-form-model-item
+                  class="from-label"
+                  label="销售代码"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="saleCode">
+                  {{ details.saleCode }}
+                </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
+                  prop="acceptNotify">
+                  <a-checkbox v-model="details.acceptNotify" disabled></a-checkbox>
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+          </div>
           <a-row>
             <a-col :span="24">
               <a-form-model-item
@@ -215,90 +399,193 @@
               </a-form-model-item>
             </a-col>
           </a-row>
-          <a-row :gutter="30">
-            <a-col :span="8">
-              <a-form-model-item has-feedback prop="shipper" class="sender-label" style="overflow: hidden">
-                <div class="sender">
-                  <div class="top" :class="{ required: rules['shipper'] && rules['shipper'][0].required }">
-                    <div class="name"><span style="cursor: pointer;" class="copy-btn iconfont icon-bianji"></span>发货人
-                    </div>
-                  </div>
-                  <div class="bottom">
-                    <textareaView
-                      id="shipper-scroll"
-                      :parentVal="details.shipper"
-                      type="shipper"
-                      disabled
-                      :openToCDB="true"
-                      @getTextareaChange="getTextareaChange" />
-                  </div>
+          <div v-if="details.carrierid == 'EMC'" >
+            <a-row :gutter="100" style="padding-left:60px">
+              <a-col :span="12">
+                <div class="row-title">发货人</div>
+                <div>
+                  <a-input disabled size="small" v-model="details.shipperName" />
                 </div>
-              </a-form-model-item>
-            </a-col>
-            <a-col :span="8">
-              <a-form-model-item has-feedback prop="consignee" class="sender-label" style="overflow: hidden">
-                <div class="consignee">
-                  <div class="top" :class="{ required: rules['consignee'] && rules['consignee'][0].required }">
-                    <div class="name"><span style="cursor: pointer;" class="copy-btn iconfont icon-bianji"></span>收货人
+                <div style="margin-top:10px">
+                  <a-select disabled size="small" v-model="details.shipperSex" style="width: 13%">
+                    <a-select-option value="Mr.">MS</a-select-option>
+                    <a-select-option value="Ms.">MR</a-select-option>
+                  </a-select>
+                  <a-input disabled size="small" style="width:13%;margin:0 1%" v-model="details.shipperLastName" />
+                  <a-input disabled size="small" style="width:13%;" v-model="details.shipperFirstName" />
+                  <a-input
+                    size="small"
+                    disabled
+                    style="width:14%;margin:0 1%"
+                    v-model="details.shipperPhoneCountryCode" />
+                  <a-input disabled size="small" style="width:14%;" v-model="details.shipperPhoneCode" />
+                  <a-input disabled size="small" style="width:14%;margin:0 1%" v-model="details.shipperPhone" />
+                  <a-input disabled size="small" style="width:13%;" v-model="details.shipperPhoneExtension" />
+                </div>
+                <div style="margin:10px 0">
+                  <a-input size="small" disabled v-model="details.shipperInnerCode" />
+                </div>
+                <div>
+                  <a-input size="small" disabled v-model="details.shipperEmail" />
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class="row-title">货物代理人</div>
+                <div>
+                  <a-input disabled size="small" v-model="details.bookingName" />
+                </div>
+                <div style="margin-top:10px">
+                  <a-select disabled size="small" v-model="details.bookingSex" style="width: 13%">
+                    <a-select-option value="Mr.">MS</a-select-option>
+                    <a-select-option value="Ms.">MR</a-select-option>
+                  </a-select>
+                  <a-input disabled size="small" style="width:13%;margin:0 1%" v-model="details.bookingLastName" />
+                  <a-input disabled size="small" style="width:13%;" v-model="details.bookingFirstName" />
+                  <a-input
+                    size="small"
+                    disabled
+                    style="width:14%;margin:0 1%"
+                    v-model="details.bookingPhoneCountryCode" />
+                  <a-input disabled size="small" style="width:14%;" v-model="details.bookingPhoneCode" />
+                  <a-input disabled size="small" style="width:14%;margin:0 1%" v-model="details.bookingPhone" />
+                  <a-input disabled size="small" style="width:13%;" v-model="details.bookingPhoneExtension" />
+                </div>
+                <div style="margin:10px 0">
+                  <a-input disabled size="small" v-model="details.bookingInnerCode" />
+                </div>
+                <div>
+                  <a-input disabled size="small" v-model="details.bookingEmail" />
+                </div>
+              </a-col>
+            </a-row>
+            <a-row :gutter="100" style="padding-left:60px;margin-top:20px">
+              <a-col :span="12">
+                <div class="row-title">收货人</div>
+                <div>
+                  <a-input disabled size="small" v-model="details.consigneeName" />
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class="row-title">通知人</div>
+                <div>
+                  <a-input disabled size="small" v-model="details.notifypartName" />
+                </div>
+              </a-col>
+            </a-row>
+            <a-row style="margin-top:10px">
+              <a-col :span="18">
+                <a-form-model-item
+                  class="from-label"
+                  label="订舱品名"
+                  :labelCol="{ span: 2 }"
+                  :wrapperCol="{ span: 22 }"
+                  has-feedback
+                  prop="description">
+                  {{ details.description }}
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+            <a-row >
+              <a-col :span="18">
+                <a-form-model-item
+                  class="from-label"
+                  label="订舱备注"
+                  :labelCol="{ span: 2 }"
+                  :wrapperCol="{ span: 22 }"
+                  has-feedback
+                  prop="czRemark">
+                  {{ details.czRemark }}
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+          </div>
+          <div v-if="details.carrierid !== 'EMC'" >
+            <a-row :gutter="30">
+              <a-col :span="8">
+                <a-form-model-item has-feedback prop="shipper" class="sender-label" style="overflow: hidden">
+                  <div class="sender">
+                    <div class="top" :class="{ required: rules['shipper'] && rules['shipper'][0].required }">
+                      <div class="name"><span style="cursor: pointer;" class="copy-btn iconfont icon-bianji"></span>发货人
+                      </div>
+                    </div>
+                    <div class="bottom">
+                      <textareaView
+                        id="shipper-scroll"
+                        :parentVal="details.shipper"
+                        type="shipper"
+                        disabled
+                        :openToCDB="true"
+                        @getTextareaChange="getTextareaChange" />
                     </div>
                   </div>
-                  <div class="bottom">
-                    <textareaView
-                      id="consignee-scroll"
-                      :parentVal="details.consignee"
-                      type="consignee"
-                      disabled
-                      :openToCDB="true"
-                      @getTextareaChange="getTextareaChange" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="8">
+                <a-form-model-item has-feedback prop="consignee" class="sender-label" style="overflow: hidden">
+                  <div class="consignee">
+                    <div class="top" :class="{ required: rules['consignee'] && rules['consignee'][0].required }">
+                      <div class="name"><span style="cursor: pointer;" class="copy-btn iconfont icon-bianji"></span>收货人
+                      </div>
+                    </div>
+                    <div class="bottom">
+                      <textareaView
+                        id="consignee-scroll"
+                        :parentVal="details.consignee"
+                        type="consignee"
+                        disabled
+                        :openToCDB="true"
+                        @getTextareaChange="getTextareaChange" />
+                    </div>
                   </div>
-                </div>
-              </a-form-model-item>
-            </a-col>
-            <a-col :span="8">
-              <a-form-model-item has-feedback prop="notifyparty" class="sender-label" style="overflow: hidden">
-                <div class="notifier">
-                  <div class="top" :class="{ required: rules['notifyparty'] && rules['notifyparty'][0].required }">
-                    <div class="name">
-                      <span style="cursor: pointer;" class="copy-btn iconfont icon-bianji"></span>通知人
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="8">
+                <a-form-model-item has-feedback prop="notifyparty" class="sender-label" style="overflow: hidden">
+                  <div class="notifier">
+                    <div class="top" :class="{ required: rules['notifyparty'] && rules['notifyparty'][0].required }">
+                      <div class="name">
+                        <span style="cursor: pointer;" class="copy-btn iconfont icon-bianji"></span>通知人
+                      </div>
+                    </div>
+                    <div class="bottom">
+                      <textareaView
+                        id="notifyparty-scroll"
+                        :parentVal="details.notifyparty"
+                        type="notifyparty"
+                        disabled
+                        :openToCDB="true"
+                        @getTextareaChange="getTextareaChange" />
                     </div>
                   </div>
-                  <div class="bottom">
-                    <textareaView
-                      id="notifyparty-scroll"
-                      :parentVal="details.notifyparty"
-                      type="notifyparty"
-                      disabled
-                      :openToCDB="true"
-                      @getTextareaChange="getTextareaChange" />
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+            <a-row :gutter="30">
+              <a-col :span="8">
+                <a-form-model-item has-feedback prop="shipper" class="sender-label" style="overflow: hidden">
+                  <div>订舱要求</div>
+                  <a-textarea disabled v-model="details.soremark" :rows="5" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="8">
+                <a-form-model-item has-feedback prop="consignee" class="sender-label" style="overflow: hidden">
+                  <div style="display: flex;align-items: center;">
+                    <span>操作备注</span>
                   </div>
-                </div>
-              </a-form-model-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="30">
-            <a-col :span="8">
-              <a-form-model-item has-feedback prop="shipper" class="sender-label" style="overflow: hidden">
-                <div>订舱要求</div>
-                <a-textarea disabled v-model="details.soremark" :rows="5" />
-              </a-form-model-item>
-            </a-col>
-            <a-col :span="8">
-              <a-form-model-item has-feedback prop="consignee" class="sender-label" style="overflow: hidden">
-                <div style="display: flex;align-items: center;">
-                  <span>操作备注</span>
-                </div>
-                <a-textarea disabled v-model="details.czRemark" :rows="5" />
-              </a-form-model-item>
-            </a-col>
-            <a-col :span="8">
-              <a-form-model-item has-feedback prop="consignee" class="sender-label" style="overflow: hidden">
-                <div style="display: flex;align-items: center;">
-                  <span>品名</span>
-                </div>
-                <a-textarea disabled v-model="details.description" :rows="5" />
-              </a-form-model-item>
-            </a-col>
-          </a-row>
+                  <a-textarea disabled v-model="details.czRemark" :rows="5" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="8">
+                <a-form-model-item has-feedback prop="consignee" class="sender-label" style="overflow: hidden">
+                  <div style="display: flex;align-items: center;">
+                    <span>品名</span>
+                  </div>
+                  <a-textarea disabled v-model="details.description" :rows="5" />
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+          </div>
+
           <a-row>
             <a-col style="display: flex;margin-top: 20px;" :span="8">
               <vxe-table border ref="xTable" style="width: 480px;" :data="details.ctnList">
diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue
index 9e034bf..2f27e5f 100644
--- a/src/views/main/BookingLedger/detail/index.vue
+++ b/src/views/main/BookingLedger/detail/index.vue
@@ -1520,6 +1520,7 @@ export default {
       })
       if (!this.bookingDetails.contractno) {
         this.$message.error('保存失败，运费协议号未填写')
+        console.log(this.bookingDetails)
         return false
       }
       if (!basicFrom && mailingFrom && cargoFrom) {
diff --git a/src/views/main/BookingLedger/detail/modules/sedOrder.vue b/src/views/main/BookingLedger/detail/modules/sedOrder.vue
index 58c0a5f..0e27bdb 100644
--- a/src/views/main/BookingLedger/detail/modules/sedOrder.vue
+++ b/src/views/main/BookingLedger/detail/modules/sedOrder.vue
@@ -683,6 +683,10 @@ export default {
       //   remarksFrom = valid
       // })
       console.log(this.editDetails)
+      if (!this.editDetails.contractno) {
+        this.$message.error('保存失败，运费协议号未填写')
+        return false
+      }
       if (!basicFrom || !mailingFrom || !cargoFrom) {
         this.$message.error('保存失败，请检查必填项')
         return false
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 99f681b..9248403 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -1165,191 +1165,165 @@
         </template>
       </a-modal>
       <a-modal
-        width="1100px"
+        width="820px"
         :maskClosable="false"
         v-model="editingModalVisible"
         title="批量编辑"
         @ok="editingHandleOk"
-        @cancel="editingHandleCancel"
-      >
+        @cancel="editingHandleCancel">
         <div class="trace-box">
-          <div style="margin-bottom:10px;font-weight:bold;padding-left:48px">
-            <a-icon type="info-circle" theme="filled" style="font-size:15px;color: orange;;margin-right:10px" />
-            批量修改默认只处理输入框已填写的内容，需要修改为空值，请选择选中”置空“</div>
           <a-form :form="editingForm">
-            <a-checkbox-group v-model="checkedList" >
-              <a-row :gutter="26">
-                <a-col :span="12" class="book-model-box">
-                  <a-form-item
-                    label="船名"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  >
-                    <a-select
-                      placeholder="请选择船名"
-                      v-decorator="['vessel']"
-                      show-search
-                      @focus="vesselSearch"
-                      @search="vesselSearch"
-                      style="width: 82%;margin-right: 10px"
-                      @blur="vesselBlur"
-                      :default-active-first-option="false"
-                      :show-arrow="false"
-                      :filter-option="false"
-                      :not-found-content="null"
-                    >
-                      <a-select-option v-for="item in vesselData" :key="item.vessel" :value="item.vessel">
-                        {{ item.vessel }}
-                      </a-select-option>
-                    </a-select>
-                    <a-checkbox value="vessel" style="margin-right: 5px" @change="handleEmpty($event,'vessel')" />置空
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12" class="book-model-box">
-                  <a-form-item
-                    label="开船日期"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                    prop="etd"
-                  >
-                    <a-date-picker
-                      v-decorator="['etd']"
-                      style="width: 82%;margin-right: 10px"
-                      placeholder="请选择开船日期"
-                      valueFormat="YYYY-MM-DD"
-                    />
-                    <!-- <a-checkbox value="etd" style="margin-right: 5px" @change="handleEmpty('etd')"/>置空 -->
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12" class="book-model-box">
-                  <a-form-item
-                    label="内部航次"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  >
-                    <a-input v-decorator="['voynoinner']" style="width: 82%;margin-right: 10px" />
-                    <a-checkbox value="voynoinner" style="margin-right: 5px" @change="handleEmpty($event,'voynoinner')"/>置空
-                  </a-form-item>
-                </a-col>
+            <a-row :gutter="26">
+              <a-col :span="12" class="book-model-box">
+                <a-form-item
+                  label="船名"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-select
+                    placeholder="请选择船名"
+                    v-decorator="['vessel']"
+                    show-search
+                    @focus="vesselSearch"
+                    @search="vesselSearch"
+                    @blur="vesselBlur"
+                    :default-active-first-option="false"
+                    :show-arrow="false"
+                    :filter-option="false"
+                    :not-found-content="null">
+                    <a-select-option v-for="item in vesselData" :key="item.vessel" :value="item.vessel">
+                      {{ item.vessel }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12" class="book-model-box">
+                <a-form-item
+                  label="开船日期"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-date-picker
+                    v-decorator="['etd', { rules: [{ required: true, message: '请选择开船日期！' }] }]"
+                    :style="{ width: '100%' }"
+                    placeholder="请选择开船日期"
+                    valueFormat="YYYY-MM-DD" />
+                </a-form-item>
+              </a-col>
+              <a-col :span="12" class="book-model-box">
+                <a-form-item
+                  label="内部航次"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-input v-decorator="['voynoinner']" />
+                </a-form-item>
+              </a-col>
 
-                <a-col :span="12" class="book-model-box">
-                  <a-form-item
-                    label="海关航次"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  >
-                    <a-input style="width: 82%;margin-right: 10px" v-decorator="['voyno']" />
-                    <a-checkbox value="voyno" style="margin-right: 5px" @change="handleEmpty($event,'voyno')"/>置空
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12" class="book-model-box">
-                  <a-form-item
-                    label="卸货港"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  >
-                    <a-select
-                      placeholder="请选择卸货港"
-                      v-decorator="['portDischarge']"
-                      show-search
-                      @focus="portDischargeSearch"
-                      @search="portDischargeSearch"
-                      @change="portDischargeChange"
-                      :default-active-first-option="false"
-                      style="width: 82%;margin-right: 10px"
-                      :show-arrow="false"
-                      :filter-option="false"
-                      :not-found-content="null"
-                    >
-                      <a-select-option v-for="item in portDischargeData" :key="item.code" :value="item.enName">
-                        {{ item.enName }}
-                      </a-select-option>
-                    </a-select>
-                    <a-checkbox value="portDischarge" style="margin-right: 5px" @change="handleEmpty($event,'portDischarge')"/>置空
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12" class="book-model-box">
-                  <a-form-item
-                    label="卸货代码"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  >
-                    <a-input style="width: 82%;margin-right: 10px" v-decorator="['portDischargeId']" />
-                    <a-checkbox value="portDischargeId" style="margin-right: 5px" @change="handleEmpty($event,'portDischargeId')"/>置空
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12" class="book-model-box">
-                  <a-form-item
-                    label="目的港"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  >
-                    <a-select
-                      placeholder="请选择目的港"
-                      v-decorator="['destination']"
-                      show-search
-                      @focus="destinationSearch"
-                      @search="destinationSearch"
-                      @change="destinationChange"
-                      :default-active-first-option="false"
-                      :show-arrow="false"
-                      :filter-option="false"
-                      style="width: 82%;margin-right: 10px"
-                      :not-found-content="null"
-                    >
-                      <a-select-option v-for="item in destinationData" :key="item.code" :value="item.enName">
-                        {{ item.enName }}
-                      </a-select-option>
-                    </a-select>
-                    <a-checkbox value="destination" style="margin-right: 5px" @change="handleEmpty($event,'destination')"/>置空
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12" class="book-model-box">
-                  <a-form-item
-                    label="目的代码"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  >
-                    <a-input style="width: 82%;margin-right: 10px" v-decorator="['destinationid']" />
-                    <a-checkbox value="destinationid" style="margin-right: 5px" @change="handleEmpty($event,'destinationid')"/>置空
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12" class="book-model-box">
-                  <a-form-item
-                    label="截港时间"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  >
-                    <a-date-picker
-                      show-time
-                      v-decorator="['closingdate']"
-                      style="width: 82%;margin-right: 10px"
-                      placeholder="请选择截港时间"
-                      valueFormat="YYYY-MM-DD HH:mm:ss"
-                      format="YYYY-MM-DD HH"
-                    />
-                    <a-checkbox value="closingdate" style="margin-right: 5px" @change="handleEmpty($event,'closingdate')"/>置空
-                  </a-form-item>
-                </a-col>
-                <a-col :span="12" class="book-model-box">
-                  <a-form-item
-                    label="截单时间"
-                    :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                    :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  >
-                    <a-date-picker
-                      show-time
-                      v-decorator="['closedocdate']"
-                      style="width: 82%;margin-right: 10px"
-                      placeholder="请选择截单时间"
-                      valueFormat="YYYY-MM-DD HH:mm:ss"
-                      format="YYYY-MM-DD HH"
-                    />
-                    <a-checkbox value="closedocdate" style="margin-right: 5px" @change="handleEmpty($event,'closedocdate')"/>置空
-                  </a-form-item>
-                </a-col>
-              </a-row>
-            </a-checkbox-group>
+              <a-col :span="12" class="book-model-box">
+                <a-form-item
+                  label="海关航次"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-input v-decorator="['voyno']" />
+                </a-form-item>
+              </a-col>
+              <a-col :span="12" class="book-model-box">
+                <a-form-item
+                  label="卸货港"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-select
+                    placeholder="请选择卸货港"
+                    v-decorator="['portDischarge']"
+                    show-search
+                    @focus="portDischargeSearch"
+                    @search="portDischargeSearch"
+                    @change="portDischargeChange"
+                    :default-active-first-option="false"
+                    :show-arrow="false"
+                    :filter-option="false"
+                    :not-found-content="null">
+                    <a-select-option v-for="item in portDischargeData" :key="item.code" :value="item.enName">
+                      {{ item.enName }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12" class="book-model-box">
+                <a-form-item
+                  label="卸货代码"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-input v-decorator="['portDischargeId']" />
+                </a-form-item>
+              </a-col>
+              <a-col :span="12" class="book-model-box">
+                <a-form-item
+                  label="目的港"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-select
+                    placeholder="请选择目的港"
+                    v-decorator="['destination']"
+                    show-search
+                    @focus="destinationSearch"
+                    @search="destinationSearch"
+                    @change="destinationChange"
+                    :default-active-first-option="false"
+                    :show-arrow="false"
+                    :filter-option="false"
+                    :not-found-content="null">
+                    <a-select-option v-for="item in destinationData" :key="item.code" :value="item.enName">
+                      {{ item.enName }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12" class="book-model-box">
+                <a-form-item
+                  label="目的代码"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-input v-decorator="['destinationid']" />
+                </a-form-item>
+              </a-col>
+              <a-col :span="12" class="book-model-box">
+                <a-form-item
+                  label="截港时间"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-date-picker
+                    show-time
+                    v-decorator="['closingdate']"
+                    :style="{ width: '100%' }"
+                    placeholder="请选择截港时间"
+                    valueFormat="YYYY-MM-DD HH:mm:ss"
+                    format="YYYY-MM-DD HH" />
+                </a-form-item>
+              </a-col>
+              <a-col :span="12" class="book-model-box">
+                <a-form-item
+                  label="截单时间"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-date-picker
+                    show-time
+                    v-decorator="['closedocdate']"
+                    :style="{ width: '100%' }"
+                    placeholder="请选择截单时间"
+                    valueFormat="YYYY-MM-DD HH:mm:ss"
+                    format="YYYY-MM-DD HH" />
+                </a-form-item>
+              </a-col>
+            </a-row>
           </a-form>
         </div>
       </a-modal>
diff --git a/src/views/main/CabinManagement/details.vue b/src/views/main/CabinManagement/details.vue
index dea05ba..03bf967 100644
--- a/src/views/main/CabinManagement/details.vue
+++ b/src/views/main/CabinManagement/details.vue
@@ -17,6 +17,7 @@
             <div
               :class="{ 'line-bootm': index != form.bookingSlotSaleInfoList.length - 1 }"
               v-for="(item, index) in form.bookingSlotSaleInfoList"
+              v-show="item.customerid!=0"
               :key="index">
               <a-row>
                 <a-col :span="6">
@@ -80,8 +81,52 @@
                     </a-select>
                   </a-form-model-item>
                 </a-col>
+                <a-col :span="6">
+                  <a-form-item label="操作">
+                    <a-select
+                      show-search
+                      v-model="item.opid"
+                      :default-active-first-option="false"
+                      :show-arrow="false"
+                      allowClear
+                      size="small"
+                      :filter-option="false"
+                      :not-found-content="null"
+                      @search="SearchUser($event, 2)"
+                      @change="e => {
+                        ChangeUser(e, 'op', 2,index)
+                      }
+                      ">
+                      <a-select-option v-for="item in UserList2" :key="item.id" :value="item.id">
+                        {{ item.name }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
               </a-row>
               <a-row>
+                <a-col :span="6">
+                  <a-form-item label="单证">
+                    <a-select
+                      show-search
+                      v-model="item.docid"
+                      size="small"
+                      allowClear
+                      :default-active-first-option="false"
+                      :show-arrow="false"
+                      :filter-option="false"
+                      :not-found-content="null"
+                      @search="SearchUser($event, 3)"
+                      @change="e => {
+                        ChangeUser(e, 'doc', 3,index)
+                      }
+                      ">
+                      <a-select-option v-for="item in UserList3" :key="item.id" :value="item.id">
+                        {{ item.name }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :span="6">
                   <a-form-model-item label="SHIPPER">
                     <a-input v-model="item.shipper" size="small" />
@@ -97,6 +142,8 @@
                     <a-input-number style="width: 90%" :precision="2" v-model="item.sellinG_PRICE" size="small" />
                   </a-form-model-item>
                 </a-col>
+              </a-row>
+              <a-row>
                 <a-col :span="6">
                   <a-form-model-item label="销售日期">
                     <a-date-picker size="small" v-model="item.salE_TIME" />
@@ -316,50 +363,7 @@
                 <a-input v-model="form.sloT_NO" />
               </a-form-model-item>
             </a-col>
-            <a-col :span="6">
-              <a-form-item label="操作">
-                <a-select
-                  show-search
-                  v-model="form.opid"
-                  :default-active-first-option="false"
-                  :show-arrow="false"
-                  allowClear
-                  :filter-option="false"
-                  :not-found-content="null"
-                  @search="SearchUser($event, 2)"
-                  @change="e => {
-                    ChangeUser(e, 'op', 2)
-                  }
-                  ">
-                  <a-select-option v-for="item in UserList2" :key="item.id" :value="item.id">
-                    {{ item.name }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row>
-            <a-col :span="6">
-              <a-form-item label="单证">
-                <a-select
-                  show-search
-                  v-model="form.docid"
-                  allowClear
-                  :default-active-first-option="false"
-                  :show-arrow="false"
-                  :filter-option="false"
-                  :not-found-content="null"
-                  @search="SearchUser($event, 3)"
-                  @change="e => {
-                    ChangeUser(e, 'doc', 3)
-                  }
-                  ">
-                  <a-select-option v-for="item in UserList3" :key="item.id" :value="item.id">
-                    {{ item.name }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
+
           </a-row>
           <div class="title">截止时间</div>
           <a-row>
@@ -592,7 +596,7 @@ export default {
       UserList1: [],
       UserList: [],
       UserList2: [],
-      UserListAll:[],
+      UserListAll: [],
       UserList3: [],
       id: 0,
       oldBook: [],
@@ -885,6 +889,12 @@ export default {
               if (item.custserviceid) {
                 item.custserviceid = Number(item.custserviceid)
               }
+              if (item.docid) {
+                item.docid = Number(item.docid)
+              }
+              if (item.opid) {
+                item.opid = Number(item.opid)
+              }
               if (item.saleid) {
                 item.saleid = Number(item.saleid)
               }
@@ -947,14 +957,14 @@ export default {
         if (type === 2) {
           this.UserList2.forEach(item => {
             if (item.id == e) {
-              this.form[Tname] = item.name
+              this.form.bookingSlotSaleInfoList[index][Tname] = item.name
             }
           })
         }
         if (type === 3) {
           this.UserList3.forEach(item => {
             if (item.id == e) {
-              this.form[Tname] = item.name
+              this.form.bookingSlotSaleInfoList[index][Tname] = item.name
             }
           })
         }
@@ -965,6 +975,12 @@ export default {
         if (type === 1) {
           this.UserList1 = JSON.parse(JSON.stringify(this.UserListAll))
         }
+        if (type === 2) {
+          this.UserList2 = JSON.parse(JSON.stringify(this.UserListAll))
+        }
+        if (type === 3) {
+          this.UserList3 = JSON.parse(JSON.stringify(this.UserListAll))
+        }
       }
       this.$forceUpdate()
     },
diff --git a/src/views/main/CabinManagement/index.vue b/src/views/main/CabinManagement/index.vue
index 4df667a..8b71847 100644
--- a/src/views/main/CabinManagement/index.vue
+++ b/src/views/main/CabinManagement/index.vue
@@ -5,8 +5,8 @@
         <a-form :model="form" :label-col="{ span: 7 }" :wrapper-col="{ span: 17 }">
           <a-row>
             <a-col :span="4">
-              <a-form-item label="订单编号">
-                <a-input v-model="form.SLOT_BOOKING_NO" allow-clear placeholder="请输入订单编号" />
+              <a-form-item label="舱位提单号">
+                <a-input v-model="form.SLOT_BOOKING_NO" allow-clear placeholder="请输入舱位提单号" />
               </a-form-item>
             </a-col>
             <a-col :span="4">
@@ -393,11 +393,17 @@ export default {
           slots: { default: 'labelList' }
         },
         {
-          title: '订舱编号',
+          title: '舱位提单号',
           align: 'center',
           width: '160',
           field: 'sloT_BOOKING_NO'
         },
+        {
+          title: '订舱编号',
+          align: 'center',
+          width: '150',
+          field: 'sloT_NO'
+        },
         {
           title: '船名/航次',
           align: 'center',
@@ -462,6 +468,18 @@ export default {
           width: '100',
           field: 'custservice'
         },
+        {
+          title: '操作',
+          align: 'center',
+          width: '80',
+          field: 'op'
+        },
+        {
+          title: '单证',
+          align: 'center',
+          width: '80',
+          field: 'doc'
+        },
         {
           title: '销售',
           align: 'center',
@@ -691,11 +709,17 @@ export default {
           slots: { default: 'labelList' }
         },
         {
-          title: '订舱编号',
+          title: '舱位提单号',
           align: 'center',
           width: '160',
           field: 'sloT_BOOKING_NO'
         },
+        {
+          title: '订舱编号',
+          align: 'center',
+          width: '150',
+          field: 'sloT_NO'
+        },
         {
           title: '船名/航次',
           align: 'center',
@@ -760,6 +784,18 @@ export default {
           width: '100',
           field: 'custservice'
         },
+        {
+          title: '操作',
+          align: 'center',
+          width: '80',
+          field: 'op'
+        },
+        {
+          title: '单证',
+          align: 'center',
+          width: '80',
+          field: 'doc'
+        },
         {
           title: '销售',
           align: 'center',
@@ -1124,7 +1160,7 @@ export default {
       })
     },
     spanMethod({ row, _rowIndex, column, visibleData }) {
-      const arr = ['salE_TIME', 'sellinG_PRICE', 'goodsname', 'shipper', 'sale', 'custservice', 'customername']
+      const arr = ['salE_TIME', 'sellinG_PRICE', 'goodsname', 'shipper', 'sale', 'op', 'doc', 'custservice', 'customername']
       if ((!arr.includes(column.property)) || column.type === 'checkbox' || column.field === 'caozuo') {
         const prevRow = visibleData[_rowIndex - 1];
         let nextRow = visibleData[_rowIndex + 1];
diff --git a/src/views/main/Customer/index.vue b/src/views/main/Customer/index.vue
index 49f55dc..a365602 100644
--- a/src/views/main/Customer/index.vue
+++ b/src/views/main/Customer/index.vue
@@ -136,8 +136,9 @@
                   :show-arrow="false"
                   :filter-option="false"
                   :not-found-content="null"
+                  :disabled="custserviceidFlag"
                   allowClear
-                  style="width: 90%;margin-right: 10px;"
+                  style="width: 70%;"
                   @search="SearchUser($event, 1)"
                   size="small"
                   @change="e => {
@@ -148,7 +149,8 @@
                     {{ item1.name }}
                   </a-select-option>
                 </a-select>
-                <a-checkbox v-model="editform.isSetCUSTSERVICE"></a-checkbox>
+                <span style="margin: 0 10px;" >修改:</span>
+                <a-checkbox @change="custserviceidFlag=!custserviceidFlag" v-model="editform.isSetCUSTSERVICE"></a-checkbox>
               </a-form-model-item>
             </a-col>
             <a-col :span="12">
@@ -159,8 +161,9 @@
                   :default-active-first-option="false"
                   :show-arrow="false"
                   :filter-option="false"
+                  :disabled="saleidFlag"
                   :not-found-content="null"
-                  style="width: 90%;margin-right: 10px;"
+                  style="width: 70%;"
                   allowClear
                   @search="SearchUser($event, 2)"
                   size="small"
@@ -172,7 +175,8 @@
                     {{ item1.name }}
                   </a-select-option>
                 </a-select>
-                <a-checkbox v-model="editform.isSetSALE"></a-checkbox>
+                <span style="margin: 0 10px;" >修改:</span>
+                <a-checkbox @change="saleidFlag=!saleidFlag" v-model="editform.isSetSALE"></a-checkbox>
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -184,7 +188,8 @@
                   v-model="editform.opid"
                   :default-active-first-option="false"
                   :show-arrow="false"
-                  style="width: 90%;margin-right: 10px;"
+                  :disabled="opidFlag"
+                  style="width: 70%;"
                   :filter-option="false"
                   :not-found-content="null"
                   allowClear
@@ -198,7 +203,8 @@
                     {{ item1.name }}
                   </a-select-option>
                 </a-select>
-                <a-checkbox v-model="editform.isSetOP"></a-checkbox>
+                <span style="margin: 0 10px;" >修改:</span>
+                <a-checkbox @change="opidFlag=!opidFlag" v-model="editform.isSetOP"></a-checkbox>
               </a-form-model-item>
             </a-col>
             <a-col :span="12">
@@ -210,9 +216,10 @@
                   :show-arrow="false"
                   :filter-option="false"
                   :not-found-content="null"
+                  :disabled="docidFlag"
                   allowClear
                   @search="SearchUser($event, 4)"
-                  style="width: 90%;margin-right: 10px;"
+                  style="width: 70%;"
                   size="small"
                   @change="e => {
                     ChangeUser(e, 'doc', 4)
@@ -222,7 +229,8 @@
                     {{ item1.name }}
                   </a-select-option>
                 </a-select>
-                <a-checkbox v-model="editform.isSetDOC"></a-checkbox>
+                <span style="margin: 0 10px;" >修改:</span>
+                <a-checkbox @change="docidFlag=!docidFlag" v-model="editform.isSetDOC"></a-checkbox>
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -403,6 +411,10 @@ export default {
       advanced: false,
       loading: false,
       settingFlag: false,
+      custserviceidFlag: true,
+      saleidFlag: true,
+      docidFlag: true,
+      opidFlag: true,
       editform: {},
       setVisible: false,
       setVisible1: false,