From 2371b7f07b30f9b5ff051fc79648feb572fc6db5 Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Thu, 15 Jun 2023 16:49:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/modules/basicInfo.vue              | 686 +++++++++-------
 .../BookingLedger/detail/modules/billInfo.vue | 292 +++++++
 .../detail/modules/cargoInfo.vue              | 536 +-----------
 .../detail/modules/mailingInfo.vue            | 774 ++++++------------
 4 files changed, 932 insertions(+), 1356 deletions(-)

diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
index 4a34300..e62437d 100644
--- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="basic-info">
-    <x-card style="padding-top: 15px;">
-      <div slot="content" style="margin-top: -24px;">
+    <x-card style="padding-top: 15px">
+      <div slot="content" style="margin-top: -24px">
         <a-form-model
           style="margin-bottom: 10px"
           size="small"
@@ -10,14 +10,14 @@
           :model="details"
           :rules="rules"
         >
-          <a-row class="from-box" >
-            <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+          <a-row class="from-box" :gutter="10">
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="8">
               <a-form-model-item
                 class="from-label"
                 prop="customername"
                 label="委托单位"
-                :labelCol="labelCol4"
-                :wrapperCol="wrapperCol4"
+                :labelCol="labelCol2"
+                :wrapperCol="wrapperCol2"
                 has-feedback
               >
                 <div class="customer-box" style="padding-right: 24px">
@@ -41,43 +41,19 @@
                 </div>
               </a-form-model-item>
             </a-col>
-            <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
-              <a-form-model-item
-                class="from-label"
-                prop="thirdPay"
-                label="第三方"
-                :labelCol="labelCol2"
-                :wrapperCol="wrapperCol2"
-                has-feedback
-              >
-                <div class="customer-box" style="padding-right: 24px">
-                  <selectView
-                    type="thirdPay"
-                    :defaultVal="details.thirdPay"
-                    searchApi="DjyCustomerSuggest"
-                    :searchQuery="{ keyword: '', type: 'consignor' }"
-                    :showLabel="['shortName']"
-                    :openSearch="true"
-                    :isCopy="true"
-                    @change="getSelectViewRes"
-                    style="flex: 1; margin-top: -4px"
-                  ></selectView>
-                </div>
-              </a-form-model-item>
-            </a-col>
-            <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="8">
               <a-form-model-item
                 class="from-label"
-                label="PO NO"
+                label="提单号"
+                prop="mblno"
                 :labelCol="labelCol2"
                 :wrapperCol="wrapperCol2"
                 has-feedback
-                prop="pono"
               >
-                <inputView type="pono" :parentVal="details.pono" @getInputChange="inputChange" />
+                <inputView type="mblno" :parentVal="details.mblno" :ishd="ishd" @getInputChange="inputChange" />
               </a-form-model-item>
             </a-col>
-            <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="8">
               <a-form-model-item
                 class="from-label"
                 label="船公司"
@@ -99,52 +75,40 @@
                 ></selectView>
               </a-form-model-item>
             </a-col>
-            <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
-              <a-form-model-item
-                class="from-label"
-                label="是否占舱"
-                :labelCol="{ xs: { span: 24 },
-                             sm: { span: 9 },
-                             md: { span: 9 }}"
-                :wrapperCol="{ xs: { span: 24 },
-                               sm: { span: 12 },
-                               md: { span: 12 }}"
-                has-feedback
-                prop="zhanCangFlag"
-              >
-                <div class="date-box">
-                  <a-radio-group size="small" v-model="details.zhanCangFlag">
-                    <a-radio size="small" value="是"> 是 </a-radio>
-                    <a-radio size="small" value="否"> 否 </a-radio>
-                  </a-radio-group>
-                </div>
-              </a-form-model-item>
-            </a-col>
-            <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="8">
               <a-form-model-item
                 class="from-label"
-                label="订舱编号"
-                :labelCol="labelCol4"
-                :wrapperCol="wrapperCol4"
+                label="订舱代理"
+                :labelCol="labelCol2"
+                :wrapperCol="wrapperCol2"
                 has-feedback
-                prop="custno"
+                prop="forwarder"
               >
-                <inputView type="custno" :parentVal="details.custno" @getInputChange="inputChange" />
+                <selectView
+                  type="forwarder"
+                  :defaultVal="details.forwarder"
+                  searchApi="DjyCustomerSuggest"
+                  :searchQuery="{ keyword: '', type: 'booking_agent' }"
+                  :showLabel="['shortName']"
+                  :openSearch="true"
+                  @change="getSelectViewRes"
+                  style="flex: 1; margin-top: -4px"
+                ></selectView>
               </a-form-model-item>
             </a-col>
-            <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="8">
               <a-form-model-item
                 class="from-label"
-                label="提单号"
-                prop="mblno"
+                label="PO NO"
                 :labelCol="labelCol2"
                 :wrapperCol="wrapperCol2"
                 has-feedback
+                prop="pono"
               >
-                <inputView type="mblno" :parentVal="details.mblno" :ishd="ishd" @getInputChange="inputChange" />
+                <inputView type="pono" :parentVal="details.pono" @getInputChange="inputChange" />
               </a-form-model-item>
             </a-col>
-            <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="8">
               <a-form-model-item
                 class="from-label"
                 label="分提单号"
@@ -156,42 +120,39 @@
                 <inputView type="hblno" :parentVal="details.hblno" @getInputChange="inputChange" />
               </a-form-model-item>
             </a-col>
-            <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="8">
               <a-form-model-item
                 class="from-label"
-                label="订舱代理"
+                label="订舱编号"
                 :labelCol="labelCol2"
                 :wrapperCol="wrapperCol2"
                 has-feedback
-                prop="forwarder"
+                prop="custno"
               >
-                <selectView
-                  type="forwarder"
-                  :defaultVal="details.forwarder"
-                  searchApi="DjyCustomerSuggest"
-                  :searchQuery="{ keyword: '', type: 'booking_agent' }"
-                  :showLabel="['shortName']"
-                  :openSearch="true"
-                  @change="getSelectViewRes"
-                  style="flex: 1; margin-top: -4px"
-                ></selectView>
+                <inputView type="custno" :parentVal="details.custno" @getInputChange="inputChange" />
               </a-form-model-item>
             </a-col>
-            <template v-if="details.carrierid != 'ESL'">
-              <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+            <template v-if="details.carrierid === 'ESL'">
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="8">
+                <a-form-model-item
+                  class="from-label"
+                  label="EP号"
+                  :labelCol="labelCol2"
+                  :wrapperCol="wrapperCol2"
+                  has-feedback
+                  prop="epCode"
+                >
+                  <inputView type="epCode" :parentVal="details.epCode" @getInputChange="inputChange" />
+                </a-form-model-item>
+              </a-col>
+            </template>
+            <template v-else>
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="8">
                 <a-form-model-item
                   class="from-label"
                   label="运费协议号"
-                  :labelCol="{
-                    xs: { span: 24 },
-                    sm: { span: 10 },
-                    md: { span: 10 }
-                  }"
-                  :wrapperCol="{
-                    xs: { span: 24 },
-                    sm: { span: 14 },
-                    md: { span: 14 }
-                  }"
+                  :labelCol="labelCol2"
+                  :wrapperCol="wrapperCol2"
                   has-feedback
                   prop="contractno"
                 >
@@ -212,21 +173,37 @@
                 </a-form-model-item>
               </a-col>
             </template>
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="8">
+              <a-form-model-item
+                class="from-label"
+                prop="thirdPay"
+                label="第三方"
+                :labelCol="labelCol2"
+                :wrapperCol="wrapperCol2"
+                has-feedback
+              >
+                <div class="customer-box" style="padding-right: 24px">
+                  <selectView
+                    type="thirdPay"
+                    :defaultVal="details.thirdPay"
+                    searchApi="DjyCustomerSuggest"
+                    :searchQuery="{ keyword: '', type: 'consignor' }"
+                    :showLabel="['shortName']"
+                    :openSearch="true"
+                    :isCopy="true"
+                    @change="getSelectViewRes"
+                    style="flex: 1; margin-top: -4px"
+                  ></selectView>
+                </div>
+              </a-form-model-item>
+            </a-col>
             <template v-if="details.carrierid === 'ESL'">
-              <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="7">
                 <a-form-model-item
                   class="from-label"
                   label="运费协议号"
-                  :labelCol="{
-                    xs: { span: 24 },
-                    sm: { span: 12 },
-                    md: { span: 12 }
-                  }"
-                  :wrapperCol="{
-                    xs: { span: 24 },
-                    sm: { span: 12 },
-                    md: { span: 12 }
-                  }"
+                  :labelCol="labelCol2"
+                  :wrapperCol="wrapperCol2"
                   has-feedback
                   prop="contractno"
                 >
@@ -247,27 +224,13 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <template v-if="details.carrierid === 'ESL'">
-              <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
-                <a-form-model-item
-                  class="from-label"
-                  label="EP号"
-                  :labelCol="labelCol4"
-                  :wrapperCol="wrapperCol4"
-                  has-feedback
-                  prop="epCode"
-                >
-                  <inputView type="epCode" :parentVal="details.epCode" @getInputChange="inputChange" />
-                </a-form-model-item>
-              </a-col>
-            </template>
             <template v-if="['VOLTA', 'WHL', 'CSL', 'MSC'].includes(details.carrierid)">
-              <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="7">
                 <a-form-model-item
                   class="from-label"
                   label="真提单号"
-                  :labelCol="labelCol4"
-                  :wrapperCol="wrapperCol4"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
                   has-feedback
                   prop="tmblno"
                 >
@@ -277,34 +240,8 @@
             </template>
           </a-row>
           <div class="from-box2">
-            <a-row >
-              <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
-                <a-form-model-item
-                  class="from-label"
-                  label="开船日期"
-                  :labelCol="{ xs: { span: 24 },
-                               sm: { span: 8 },
-                               md: { span: 8 }}"
-                  :wrapperCol="{ xs: { span: 24 },
-                                 sm: { span: 12 },
-                                 md: { span: 12 }}"
-                  has-feedback
-                  prop="etd"
-                >
-                  <div class="date-box">
-                    <datePickerView
-                      class="date-picker"
-                      :parentVal="details.etd"
-                      type="etd"
-                      format="YYYY-MM-DD"
-                      @dateChange="dateChangeFun"
-                      style="margin-top: -5px"
-                    ></datePickerView>
-                    <span class="week" v-if="etdWeek && etdWeek !== 'NaN'">W{{ etdWeek || '--' }}</span>
-                  </div>
-                </a-form-model-item>
-              </a-col>
-              <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+            <a-row :gutter="6">
+              <a-col :xs="12" :sm="12" :md="12" :lg="6" :xl="6">
                 <a-form-model-item
                   class="from-label"
                   label="船名"
@@ -337,7 +274,7 @@
                 </a-form-model-item>
               </a-col>
               <template v-if="details.carrierid === 'ESL'">
-                <a-col :xs="12" :sm="12" :md="8" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+                <a-col :xs="12" :sm="12" :md="8" :lg="5" :xl="4">
                   <a-form-model-item
                     class="from-label"
                     label="内部航次"
@@ -356,7 +293,7 @@
                 </a-col>
               </template>
               <template v-else>
-                <a-col :xs="12" :sm="12" :md="8" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+                <a-col :xs="12" :sm="12" :md="8" :lg="5" :xl="4">
                   <a-form-model-item
                     class="from-label"
                     label="内部航次"
@@ -375,7 +312,7 @@
                 </a-col>
               </template>
               <template v-if="details.carrierid === 'ESL'">
-                <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+                <a-col :xs="12" :sm="12" :md="12" :lg="5" :xl="4">
                   <a-form-model-item
                     class="from-label"
                     label="航次"
@@ -393,7 +330,7 @@
                 </a-col>
               </template>
               <template v-else>
-                <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+                <a-col :xs="12" :sm="12" :md="12" :lg="5" :xl="4">
                   <a-form-model-item
                     class="from-label"
                     label="海关航次"
@@ -410,185 +347,349 @@
                   </a-form-model-item>
                 </a-col>
               </template>
-              <a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
+              <a-col :xs="12" :sm="12" :md="12" :lg="5" :xl="5">
                 <a-form-model-item
                   class="from-label"
-                  label="船司航线"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  has-feedback
-                  prop="lanename"
-                >
-                  <!-- 航线暂无接口， 暂时改为输入框-->
-                  <inputView type="lanename" :parentVal="details.lanename" @getInputChange="inputChange" />
-                </a-form-model-item>
-              </a-col>
-            </a-row>
-            <a-row :gutter="10">
-              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
-                <a-form-model-item
-                  class="from-label"
-                  label="揽货人"
-                  :labelCol="userLabelCol"
-                  :wrapperCol="userWrapperCol"
-                  has-feedback
-                  prop="sale"
-                >
-                  <selectView
-                    type="sale"
-                    :defaultVal="details.sale"
-                    searchApi="GetSysUserPage"
-                    :searchQuery="{ name: '' }"
-                    :showLabel="['name']"
-                    :openSearch="true"
-                    @change="getSelectViewRes"
-                  ></selectView>
-                </a-form-model-item>
-              </a-col>
-              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
-                <a-form-model-item
-                  class="from-label"
-                  label="客服"
-                  :labelCol="userLabelCol1"
-                  :wrapperCol="userWrapperCol1"
+                  label="开船日期"
+                  :labelCol="{ xs: { span: 24 },
+                               sm: { span: 8 },
+                               md: { span: 8 }}"
+                  :wrapperCol="{ xs: { span: 24 },
+                                 sm: { span: 12 },
+                                 md: { span: 12 }}"
                   has-feedback
-                  prop="custservice"
+                  prop="etd"
                 >
-                  <selectView
-                    type="custservice"
-                    :defaultVal="details.custservice"
-                    searchApi="GetSysUserPage"
-                    :searchQuery="{ name: '' }"
-                    :showLabel="['name']"
-                    :openSearch="true"
-                    @change="getSelectViewRes"
-                  ></selectView>
+                  <div class="date-box">
+                    <datePickerView
+                      class="date-picker"
+                      :parentVal="details.etd"
+                      type="etd"
+                      format="YYYY-MM-DD"
+                      @dateChange="dateChangeFun"
+                      style="margin-top: -5px"
+                    ></datePickerView>
+                    <span class="week" v-if="etdWeek && etdWeek !== 'NaN'">W{{ etdWeek || '--' }}</span>
+                  </div>
                 </a-form-model-item>
               </a-col>
-              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
+              <a-col :xs="12" :sm="12" :md="12" :lg="5" :xl="5">
                 <a-form-model-item
                   class="from-label"
-                  label="操作"
-                  :labelCol="userLabelCol1"
-                  :wrapperCol="userWrapperCol1"
+                  label="是否占舱"
+                  :labelCol="{ xs: { span: 24 },
+                               sm: { span: 9 },
+                               md: { span: 9 }}"
+                  :wrapperCol="{ xs: { span: 24 },
+                                 sm: { span: 12 },
+                                 md: { span: 12 }}"
                   has-feedback
-                  prop="op"
+                  prop="zhanCangFlag"
                 >
-                  <selectView
-                    type="op"
-                    :defaultVal="details.op"
-                    searchApi="GetSysUserPage"
-                    :searchQuery="{ name: '' }"
-                    :showLabel="['name']"
-                    :openSearch="true"
-                    @change="getSelectViewRes"
-                  ></selectView>
+                  <!-- style="margin-left:10px;margin-top:-6px;" -->
+                  <div class="date-box">
+                    <!-- <a-checkbox size="small" v-model="details.zhanCangFlag">
+                      <template v-if="details.zhanCangFlag">是</template>
+                      <template v-else>否</template>
+                    </a-checkbox> -->
+                    <a-radio-group size="small" v-model="details.zhanCangFlag">
+                      <a-radio size="small" value="是"> 是 </a-radio>
+                      <a-radio size="small" value="否"> 否 </a-radio>
+                    </a-radio-group>
+                  </div>
                 </a-form-model-item>
               </a-col>
-              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
+              <!-- <template v-if="details.carrierid === 'ESL'">
+                <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
+                  <a-form-model-item
+                    class="from-label"
+                    label="实际开船"
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    has-feedback
+                    prop="atd"
+                  >
+                    <div class="date-box">
+                      <datePickerView
+                        class="date-picker"
+                        :parentVal="details.atd"
+                        type="atd"
+                        format="YYYY-MM-DD"
+                        @dateChange="dateChangeFun"
+                        style="margin-top: -5px;"
+                      ></datePickerView>
+                    </div>
+                  </a-form-model-item>
+                </a-col>
+              </template> -->
+            </a-row>
+            <a-row :gutter="10">
+              <!-- <template>
+                <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
+                  <a-form-model-item
+                    class="from-label"
+                    label="实际开船"
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    has-feedback
+                    prop="atd"
+                  >
+                    <div class="date-box">
+                      <datePickerView
+                        class="date-picker"
+                        :parentVal="details.atd"
+                        type="atd"
+                        format="YYYY-MM-DD"
+                        @dateChange="dateChangeFun"
+                        style="margin-top: -5px;"
+                      ></datePickerView>
+                    </div>
+                  </a-form-model-item>
+                </a-col>
+              </template> -->
+              <template>
+                <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+                  <a-form-model-item
+                    class="from-label"
+                    label="船司航线"
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
+                    has-feedback
+                    prop="lanename"
+                  >
+                    <!-- 航线暂无接口， 暂时改为输入框-->
+                    <inputView type="lanename" :parentVal="details.lanename" @getInputChange="inputChange" />
+                  </a-form-model-item>
+                </a-col>
+              </template>
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
                 <a-form-model-item
                   class="from-label"
-                  label="单证"
-                  :labelCol="userLabelCol1"
-                  :wrapperCol="userWrapperCol1"
+                  label="船代"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
                   has-feedback
-                  prop="doc"
+                  prop="shipagency"
                 >
                   <selectView
-                    type="doc"
-                    :defaultVal="details.doc"
-                    searchApi="GetSysUserPage"
-                    :searchQuery="{ name: '' }"
-                    :showLabel="['name']"
+                    ref="shipagency"
+                    type="shipagency"
+                    :defaultVal="details.shipagency"
+                    searchApi="GetForwarderlist"
+                    :searchQuery="{ KeyWord: '' }"
+                    :showLabel="['name', 'showCode']"
                     :openSearch="true"
                     @change="getSelectViewRes"
                   ></selectView>
                 </a-form-model-item>
               </a-col>
-              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
                 <a-form-model-item
                   class="from-label"
-                  label="航线操作"
-                  :labelCol="userLabelCol"
-                  :wrapperCol="userWrapperCol"
+                  label="航线"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
                   has-feedback
-                  prop="route"
+                  prop="lineName"
                 >
                   <selectView
-                    type="route"
-                    :defaultVal="details.route"
-                    searchApi="GetSysUserPage"
-                    :searchQuery="{ name: '' }"
+                    type="lineName"
+                    :defaultVal="details.lineName"
+                    searchApi="GetTenantLineList"
+                    :searchQuery="{ LineName: '' }"
                     :showLabel="['name']"
-                    :openSearch="true"
-                    :isCopy="true"
+                    :openSearch="false"
                     @change="getSelectViewRes"
                   ></selectView>
                 </a-form-model-item>
               </a-col>
-              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
                 <a-form-model-item
                   class="from-label"
-                  label="航线管理"
-                  :labelCol="userLabelCol"
-                  :wrapperCol="userWrapperCol"
+                  label="业务来源"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
                   has-feedback
-                  prop="lineManage"
+                  prop="sourceName"
                 >
                   <selectView
-                    type="lineManage"
-                    :defaultVal="details.lineManage"
-                    searchApi="GetSysUserPage"
-                    :searchQuery="{ name: '' }"
+                    type="sourceName"
+                    :defaultVal="details.sourceName"
+                    searchApi="BookingSourcePage"
+                    :searchQuery="{ SearchValue: '' }"
                     :showLabel="['name']"
-                    :openSearch="true"
+                    :openSearch="false"
                     @change="getSelectViewRes"
                   ></selectView>
                 </a-form-model-item>
               </a-col>
             </a-row>
-            <a-row :gutter="10">
-              <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="8">
-                <a-form-model-item
-                  class="from-label"
-                  label="操作备注"
-                  :labelCol="labelCol3"
-                  :wrapperCol="wrapperCol3"
-                  has-feedback
-                  prop="czRemark"
-                >
-                  <inputView type="czRemark" :parentVal="details.czRemark" @getInputChange="inputChange" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="8">
-                <a-form-model-item
-                  class="from-label"
-                  label="单证备注"
-                  :labelCol="labelCol3"
-                  :wrapperCol="wrapperCol3"
-                  has-feedback
-                  prop="dzRemark"
-                >
-                  <inputView type="dzRemark" :parentVal="details.dzRemark" @getInputChange="inputChange" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :xs="24" :sm="6" :md="6" :lg="6" :xl="8">
-                <a-form-model-item
-                  class="from-label"
-                  label="申请箱使"
-                  :labelCol="labelCol3"
-                  :wrapperCol="wrapperCol3"
-                  has-feedback
-                  prop="shenQingXiangShi"
-                >
-                  <inputView type="shenQingXiangShi" :parentVal="details.shenQingXiangShi" @getInputChange="inputChange" />
-                </a-form-model-item>
-              </a-col>
-            </a-row>
           </div>
+          <a-row class="from-box3" :gutter="10">
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
+              <a-form-model-item
+                class="from-label"
+                label="揽货人"
+                :labelCol="userLabelCol"
+                :wrapperCol="userWrapperCol"
+                has-feedback
+                prop="sale"
+              >
+                <selectView
+                  type="sale"
+                  :defaultVal="details.sale"
+                  searchApi="GetSysUserPage"
+                  :searchQuery="{ name: '' }"
+                  :showLabel="['name']"
+                  :openSearch="true"
+                  @change="getSelectViewRes"
+                ></selectView>
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
+              <a-form-model-item
+                class="from-label"
+                label="操作"
+                :labelCol="userLabelCol1"
+                :wrapperCol="userWrapperCol1"
+                has-feedback
+                prop="op"
+              >
+                <selectView
+                  type="op"
+                  :defaultVal="details.op"
+                  searchApi="GetSysUserPage"
+                  :searchQuery="{ name: '' }"
+                  :showLabel="['name']"
+                  :openSearch="true"
+                  @change="getSelectViewRes"
+                ></selectView>
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
+              <a-form-model-item
+                class="from-label"
+                label="单证"
+                :labelCol="userLabelCol1"
+                :wrapperCol="userWrapperCol1"
+                has-feedback
+                prop="doc"
+              >
+                <selectView
+                  type="doc"
+                  :defaultVal="details.doc"
+                  searchApi="GetSysUserPage"
+                  :searchQuery="{ name: '' }"
+                  :showLabel="['name']"
+                  :openSearch="true"
+                  @change="getSelectViewRes"
+                ></selectView>
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
+              <a-form-model-item
+                class="from-label"
+                label="客服"
+                :labelCol="userLabelCol1"
+                :wrapperCol="userWrapperCol1"
+                has-feedback
+                prop="custservice"
+              >
+                <selectView
+                  type="custservice"
+                  :defaultVal="details.custservice"
+                  searchApi="GetSysUserPage"
+                  :searchQuery="{ name: '' }"
+                  :showLabel="['name']"
+                  :openSearch="true"
+                  @change="getSelectViewRes"
+                ></selectView>
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
+              <a-form-model-item
+                class="from-label"
+                label="航线操作"
+                :labelCol="userLabelCol"
+                :wrapperCol="userWrapperCol"
+                has-feedback
+                prop="route"
+              >
+                <selectView
+                  type="route"
+                  :defaultVal="details.route"
+                  searchApi="GetSysUserPage"
+                  :searchQuery="{ name: '' }"
+                  :showLabel="['name']"
+                  :openSearch="true"
+                  :isCopy="true"
+                  @change="getSelectViewRes"
+                ></selectView>
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="4">
+              <a-form-model-item
+                class="from-label"
+                label="航线管理"
+                :labelCol="userLabelCol"
+                :wrapperCol="userWrapperCol"
+                has-feedback
+                prop="lineManage"
+              >
+                <selectView
+                  type="lineManage"
+                  :defaultVal="details.lineManage"
+                  searchApi="GetSysUserPage"
+                  :searchQuery="{ name: '' }"
+                  :showLabel="['name']"
+                  :openSearch="true"
+                  @change="getSelectViewRes"
+                ></selectView>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+          <a-row class="from-box4" :gutter="10">
+            <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="9">
+              <a-form-model-item
+                class="from-label"
+                label="单证备注"
+                :labelCol="labelCol3"
+                :wrapperCol="wrapperCol3"
+                has-feedback
+                prop="dzRemark"
+              >
+                <inputView type="dzRemark" :parentVal="details.dzRemark" @getInputChange="inputChange" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="9">
+              <a-form-model-item
+                class="from-label"
+                label="操作备注"
+                :labelCol="labelCol3"
+                :wrapperCol="wrapperCol3"
+                has-feedback
+                prop="czRemark"
+              >
+                <inputView type="czRemark" :parentVal="details.czRemark" @getInputChange="inputChange" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">
+              <a-form-model-item
+                class="from-label"
+                label="申请箱使"
+                :labelCol="labelCol3"
+                :wrapperCol="wrapperCol3"
+                has-feedback
+                prop="shenQingXiangShi"
+              >
+                <inputView type="shenQingXiangShi" :parentVal="details.shenQingXiangShi" @getInputChange="inputChange" />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
         </a-form-model>
       </div>
     </x-card>
+
     <a-modal
       :title="customerType === 'add' ? '添加委托单位' : '关系人'"
       :width="1200"
@@ -717,16 +818,6 @@ export default {
         sm: { span: 19 },
         md: { span: 19 }
       },
-      labelCol4: {
-        xs: { span: 24 },
-        sm: { span: 8 },
-        md: { span: 8 }
-      },
-      wrapperCol4: {
-        xs: { span: 24 },
-        sm: { span: 16 },
-        md: { span: 16 }
-      },
       userLabelCol: {
         xs: { span: 24 },
         sm: { span: 8 },
@@ -747,7 +838,6 @@ export default {
         sm: { span: 16 },
         md: { span: 18 }
       },
-
       form: this.$form.createForm(this),
       customerType: '',
       customerVisible: false,
@@ -1262,10 +1352,4 @@ export default {
 <style lang="less" scoped>
 @import url('../index.less');
 @import url('../style/basicInfo.less');
-.ant-col-xl-4-8{
-  width: 20%;
-}
-/deep/ .ant-card-body{
-    padding-left: 10px !important;
-  }
 </style>
diff --git a/src/views/main/BookingLedger/detail/modules/billInfo.vue b/src/views/main/BookingLedger/detail/modules/billInfo.vue
index 09d49c6..e9e83ca 100644
--- a/src/views/main/BookingLedger/detail/modules/billInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/billInfo.vue
@@ -1,9 +1,290 @@
 <template>
   <a-collapse class="collapse-box bill-info-box" :bordered="false" v-model="showKey">
     <a-collapse-panel key="1" :showArrow="false">
+      <template slot="header">
+        <div class="base-tit"><i class="iconfont icon-electronic-signature"></i>签单信息 <span class="click-btn" @click.stop="tabStopFun"></span></div>
+      </template>
+      <template slot="extra">
+        <div class="tab-change"><i class="iconfont icon-xia" :class="{'active': !showKey.includes('1')}"></i></div>
+      </template>
       <div class="container bill-info">
         <a-form-model ref="billFrom" :model="details" :rules="rules">
           <a-row :gutter="10">
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+              <a-form-model-item
+                class="from-label"
+                label="签单方式"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                has-feedback
+                prop="issuetype"
+              >
+                <selectView
+                  type="issuetype"
+                  :defaultVal="details.issuetype"
+                  searchApi="Codeissuetypelist"
+                  :searchQuery="{ KeyWord: '' }"
+                  :showLabel="['enName', 'cnName']"
+                  :openSearch="false"
+                  @change="getSelectViewRes"
+                ></selectView>
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+              <a-form-model-item
+                class="from-label"
+                label="签单日期"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                has-feedback
+                prop="issuedate"
+              >
+                <datePickerView
+                  class="date-picker"
+                  :parentVal="details.issuedate"
+                  type="issuedate"
+                  format="YYYY-MM-DD"
+                  @dateChange="dateChangeFun"
+                ></datePickerView>
+                <!-- <a-date-picker size="small" v-model="details.issuedate" format="YYYY-MM-DD" /> -->
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+              <a-form-model-item
+                class="from-label"
+                label="签单地点"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                has-feedback
+                prop="issueplace"
+              >
+                <selectView
+                  type="issueplace"
+                  :defaultVal="details.issueplace"
+                  searchApi="GetPortloadlist"
+                  :searchQuery="{ KeyWord: '' }"
+                  :showLabel="['enName']"
+                  :openSearch="true"
+                  :isCopy="true"
+                  @change="getSelectViewRes"
+                ></selectView>
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+              <a-form-model-item
+                class="from-label"
+                label="签单地代码"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                has-feedback
+                prop="issueplaceid"
+              >
+                <inputView type="issueplaceid" size="small" :parentVal="details.issueplaceid" @getInputChange="inputChange"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+              <a-form-model-item
+                class="from-label"
+                label="提单份数"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                has-feedback
+                prop="nobill"
+              >
+                <selectView
+                  type="nobill"
+                  :defaultVal="details.nobill"
+                  searchApi="nobillData"
+                  :searchQuery="{ name: '' }"
+                  :showLabel="['name']"
+                  :openSearch="false"
+                  @change="getSelectViewRes"
+                ></selectView>
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+              <a-form-model-item
+                class="from-label"
+                label="副本份数"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                has-feedback
+                prop="copynobill"
+              >
+                <selectView
+                  type="copynobill"
+                  :defaultVal="details.copynobill"
+                  searchApi="copynobilllData"
+                  :searchQuery="{ name: '' }"
+                  :showLabel="['name']"
+                  :openSearch="false"
+                  @change="getSelectViewRes"
+                ></selectView>
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+              <a-form-model-item
+                class="from-label"
+                label="预付地点"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                has-feedback
+                prop="prepardat"
+              >
+                <selectView
+                  type="prepardat"
+                  :defaultVal="details.prepardat"
+                  searchApi="GetPortloadlist"
+                  :searchQuery="{ KeyWord: '' }"
+                  :showLabel="['enName']"
+                  :openSearch="true"
+                  :isCopy="true"
+                  @change="getSelectViewRes"
+                ></selectView>
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+              <a-form-model-item
+                class="from-label"
+                label="到付地点"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                has-feedback
+                prop="payableat"
+              >
+                <selectView
+                  type="payableat"
+                  :defaultVal="details.payableat"
+                  searchApi="GetPortlist"
+                  :searchQuery="{ KeyWord: '' }"
+                  :showLabel="['enName']"
+                  :openSearch="true"
+                  @change="getSelectViewRes"
+                ></selectView>
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+              <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-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+              <a-form-model-item
+                class="from-label"
+                label="第三付款地"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                has-feedback
+                prop="thirdpayaddr"
+              >
+                <inputView type="thirdpayaddr" size="small" :parentVal="details.thirdpayaddr" @getInputChange="inputChange"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+              <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>
+            <template v-if="details.cargoid == 'R'">
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+                <a-form-model-item
+                  class="from-label"
+                  label="冷藏通风量"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="reeferf"
+                >
+                  <inputView type="reeferf" size="small" :parentVal="details.reeferf" @getInputChange="inputChange"/>
+                </a-form-model-item>
+              </a-col>
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+                <a-form-model-item
+                  class="from-label"
+                  label="设置温度"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="tempset"
+                >
+                  <inputView type="tempset" size="small" :parentVal="details.tempset" @getInputChange="inputChange"/>
+                </a-form-model-item>
+              </a-col>
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+                <a-form-model-item
+                  class="from-label"
+                  label="温度单位"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="tempid"
+                >
+                  <a-select size="small" :default-value="details.tempid || 'C摄氏'" v-model="details.tempid">
+                    <a-select-option value="C"> C摄氏 </a-select-option>
+                    <a-select-option value="F"> F华氏 </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+                <a-form-model-item
+                  class="from-label"
+                  label="最低温度"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="tempmin"
+                >
+                  <inputView type="tempmin" size="small" :parentVal="details.tempmin" @getInputChange="inputChange"/>
+                </a-form-model-item>
+              </a-col>
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+                <a-form-model-item
+                  class="from-label"
+                  label="最高温度"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  has-feedback
+                  prop="tempmax"
+                >
+                  <inputView type="tempmax" size="small" :parentVal="details.tempmax" @getInputChange="inputChange"/>
+                </a-form-model-item>
+              </a-col>
+              <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+                <a-form-model-item class="from-label" label="湿度" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback prop="humidity">
+                  <inputView type="humidity" size="small" :parentVal="details.humidity" @getInputChange="inputChange"/>
+                </a-form-model-item>
+              </a-col>
+            </template>
             <template v-if="details.cargoid == 'D'">
               <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
                 <a-form-model-item
@@ -152,6 +433,12 @@ export default {
         }
       });
     },
+    handleCopyNoChange(value) {
+      this.details.copynobill = value
+    },
+    handleNoChange(value) {
+      this.details.nobill = value
+    },
     getSelectViewRes({ type, res }) {
       if (['issuetype', 'blfrt'].includes(type)) {
         this.details[type] = res.enName || ''
@@ -179,6 +466,11 @@ export default {
     },
     dateChangeFun ({ type, value }) {
       this.details[type] = value || ''
+    },
+    tabStopFun () {
+      return false
+    },
+    tabChangeFun () {
     }
   }
 }
diff --git a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue
index 3bc7e7e..ff8275c 100644
--- a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue
@@ -11,8 +11,8 @@
       </template>
       <div class="container cargo-info">
         <a-form-model :selfUpdate="true" ref="cargoFrom" :model="details" :rules="rules">
-          <a-row :gutter="10">
-            <a-col :span="5">
+          <a-row :gutter="20">
+            <a-col :span="8">
               <div class="cargo-info-tit" :class="{ 'required': rules['marks'] && rules['marks'][0].required }">
                 <div>Seal No.(封志号)<span
                   @click="handleOpen(1)"
@@ -39,7 +39,7 @@
                 </div>
               </a-form-model-item>
             </a-col>
-            <a-col :span="10">
+            <a-col :span="16">
               <div class="line">
                 <div
                   class="left"
@@ -118,222 +118,6 @@
                 </div>
               </a-form-model-item>
             </a-col>
-            <a-col :span="9">
-              <a-col :span="12">
-                <a-form-model-item
-                  class="from-label pkgs-line-box"
-                  label="件数"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  has-feedback
-                  prop="pkgs">
-                  <div class="line-box">
-                    <a-input
-                      :allowClear="true"
-                      size="small"
-                      v-model="details.pkgs"
-                      type="number"
-                      @change="changePkgs" />
-                    <i class="iconfont icon-bianji1 edit-icon" @click="editTextEntryModel('pkgs')"></i>
-                  </div>
-                </a-form-model-item>
-              </a-col>
-              <a-col :span="12" style="overflow: hidden">
-                <a-form-model-item
-                  class="from-label"
-                  label="包装"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  has-feedback
-                  prop="kindpkgs">
-                  <selectView
-                    type="kindpkgs"
-                    :defaultVal="details.kindpkgs"
-                    searchApi="GetPackage"
-                    :searchQuery="{ KeyWord: '' }"
-                    :showLabel="['name']"
-                    :openSearch="false"
-                    @change="getSelectViewRes">
-                  </selectView>
-                </a-form-model-item>
-              </a-col>
-              <a-col :span="12" style="overflow: hidden">
-                <a-form-model-item
-                  class="from-label kgs-line-box"
-                  label="毛重"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  has-feedback
-                  prop="kgs">
-                  <div class="line-box">
-                    <a-input size="small" :allowClear="true" v-model="details.kgs" />
-                    <i class="iconfont icon-bianji1 edit-icon" @click="editTextEntryModel('kgs')"></i>
-                    <span class="unit">KGS</span>
-                  </div>
-                </a-form-model-item>
-              </a-col>
-              <a-col :span="12" style="overflow: hidden">
-                <a-form-model-item
-                  class="from-label cbm-line-box"
-                  label="尺寸"
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  has-feedback
-                  prop="cbm">
-                  <div class="line-box">
-                    <a-input size="small" :allowClear="true" v-model="details.cbm" />
-                    <i class="iconfont icon-bianji1 edit-icon" @click="editTextEntryModel('cbm')"></i>
-                    <span class="unit">CBM</span>
-                  </div>
-                </a-form-model-item>
-              </a-col>
-              <template v-if="details.cargoid == 'R'">
-                <a-col :span="12">
-                  <a-form-model-item
-                    class="from-label"
-                    label="冷藏通风量"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
-                    prop="reeferf"
-                  >
-                    <inputView type="reeferf" size="small" :parentVal="details.reeferf" @getInputChange="inputChange"/>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-model-item
-                    class="from-label"
-                    label="设置温度"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="tempset"
-                  >
-                    <inputView type="tempset" size="small" :parentVal="details.tempset" @getInputChange="inputChange"/>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-model-item
-                    class="from-label"
-                    label="温度单位"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="tempid"
-                  >
-                    <a-select size="small" :default-value="details.tempid || 'C摄氏'" v-model="details.tempid">
-                      <a-select-option value="C"> C摄氏 </a-select-option>
-                      <a-select-option value="F"> F华氏 </a-select-option>
-                    </a-select>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-model-item
-                    class="from-label"
-                    label="最低温度"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="tempmin"
-                  >
-                    <inputView type="tempmin" size="small" :parentVal="details.tempmin" @getInputChange="inputChange"/>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-model-item
-                    class="from-label"
-                    label="最高温度"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="tempmax"
-                  >
-                    <inputView type="tempmax" size="small" :parentVal="details.tempmax" @getInputChange="inputChange"/>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-model-item
-                    class="from-label"
-                    label="湿度"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="humidity">
-                    <inputView type="humidity" size="small" :parentVal="details.humidity" @getInputChange="inputChange"/>
-                  </a-form-model-item>
-                </a-col>
-              </template>
-              <template v-if="details.cargoid == 'D'">
-                <a-col :span="12">
-                  <a-form-model-item
-                    class="from-label"
-                    label="危险品等级"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
-                    prop="dclass"
-                  >
-                    <inputView type="dclass" size="small" :parentVal="details.dclass" @getInputChange="inputChange"/>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-model-item
-                    class="from-label"
-                    label="危险品编号"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
-                    prop="dunno"
-                  >
-                    <inputView type="dunno" size="small" :parentVal="details.dunno" @getInputChange="inputChange"/>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-model-item
-                    class="from-label"
-                    label="危险品页号"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
-                    prop="dpage"
-                  >
-                    <inputView type="dpage" size="small" :parentVal="details.dpage" @getInputChange="inputChange"/>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-model-item
-                    class="from-label"
-                    label="危险品标签"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
-                    prop="dlabel"
-                  >
-                    <inputView type="dlabel" size="small" :parentVal="details.dlabel" @getInputChange="inputChange"/>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-model-item
-                    class="from-label"
-                    label="危险品联系人"
-                    :labelCol="{
-                      xs: { span: 24 },
-                      sm: { span: 10 },
-                      md: { span: 12 }
-                    }"
-                    :wrapperCol="{
-                      xs: { span: 24 },
-                      sm: { span: 14 },
-                      md: { span: 12 }
-                    }"
-                    has-feedback
-                    prop="linkman"
-                  >
-                    <inputView type="linkman" size="small" :parentVal="details.linkman" @getInputChange="inputChange"/>
-                  </a-form-model-item>
-                </a-col>
-              </template>
-            </a-col>
             <a-col class="num-box" :span="24">
               <span class="label">件数大写: </span>
               <a-input
@@ -385,46 +169,6 @@
 
         </div>
       </a-modal>
-      <a-modal width="500px" :maskClosable="false" v-model="textEntryModalVisible" :title="textEntryModalTitle">
-        <div class="text-entry-box">
-          <!-- 件数包装 -->
-          <a-form v-if="textEntryType === 'pkgs'">
-            <div class="text-input">
-              <a-textarea
-                v-model="details.pkgstotal"
-                placeholder="请输入内容"
-                :auto-size="{ minRows: 6, maxRows: 9 }"
-                @change="pkgsTextChange" />
-            </div>
-            <div class="total" v-if="pkgstotalRes">总计：{{ pkgstotalRes }}</div>
-          </a-form>
-          <!-- 毛重 -->
-          <a-form v-if="textEntryType === 'kgs'">
-            <div class="text-input">
-              <a-textarea
-                v-model="details.kgstotal"
-                placeholder="请输入内容"
-                :auto-size="{ minRows: 6, maxRows: 9 }"
-                @change="kgsTextChange" />
-            </div>
-            <div class="total" v-if="kgstotalRes">总计：{{ kgstotalRes }} / KGS</div>
-          </a-form>
-          <!-- 尺码 -->
-          <a-form v-if="textEntryType === 'cbm'">
-            <div class="text-input">
-              <a-textarea
-                v-model="details.cbmtotal"
-                placeholder="请输入内容"
-                :auto-size="{ minRows: 6, maxRows: 9 }"
-                @change="cbmTextChange" />
-            </div>
-            <div class="total" v-if="cbmtotalRes">总计：{{ cbmtotalRes }} / CBM</div>
-          </a-form>
-        </div>
-        <template slot="footer">
-          <a-button type="primary" @click="textEntryClose">确定</a-button>
-        </template>
-      </a-modal>
     </a-collapse-panel>
   </a-collapse>
 </template>
@@ -473,48 +217,7 @@ export default {
       showKey: ['1'],
       modelTitle: '',
       modelType: 0,
-      visible: false,
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 8 },
-        md: { span: 8 }
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 },
-        md: { span: 16 }
-      },
-      labelColCode: {
-        xs: { span: 24 },
-        sm: { span: 8 },
-        md: { span: 10 }
-      },
-      wrapperColCode: {
-        xs: { span: 24 },
-        sm: { span: 16 },
-        md: { span: 14 }
-      },
-      shippername: '',
-      consigneename: '',
-      notifypartyname: '',
-      foreignAgentname: '',
-      notifypartY2name: '',
-      modelVisible: false,
-      modelconfirm: false,
-      modelName: '',
-      yardType: '',
-      yardVisible: false,
-      customerModelconfirm: false,
-      textEntryModalVisible: false,
-      textEntryType: '',
-      textEntryModalTitle: '',
-      pkgstotalRes: 0,
-      kgstotalRes: 0,
-      cbmtotalRes: 0,
-      portdischargeHasline: false,
-      destinationidHasline: false,
-      userHasLine: false
-
+      visible: false
       // goodsnameData: []
     }
   },
@@ -560,224 +263,8 @@ export default {
         document.getElementById('description-scroll-right').scrollTop = descriptionScroll.scrollTop
       })
     }
-    setTimeout(() => {
-      this.changePkgs()
-    }, 2000)
   },
   methods: {
-    SetTOTALNO(SS) {
-      SS = SS.toString()
-      const i = SS.indexOf('\n')
-      let num = 0
-      let strKind = ''
-      let enCapital = ''
-      if (i > 0) {
-        const slist = SS.split('\n')
-        for (let i = 0; i < slist.length; i += 1) {
-          const member = slist[i]
-          const strNum = this.GetStringNum(member)
-          if (i == 0) {
-            strKind = member.substring(strNum.length)
-          }
-          num = parseFloat(num).add(parseFloat(strNum))
-        }
-        if (strKind !== '') {
-          enCapital = strKind
-        } else {
-          strKind = this.details.kindpkgs
-          enCapital = this.ToEn(num).toUpperCase() + ' ' + strKind + ' ONLY.'
-        }
-      } else {
-        const strNum = this.GetStringNum(SS)
-        strKind = SS.substring(strNum.length)
-        if (strKind !== '') {
-          console.log(strKind)
-          enCapital = strKind
-        } else {
-          strKind = this.details.kindpkgs
-          enCapital = 'SAY:' + this.ToEn(strNum).toUpperCase() + ' ' + strKind + ' ONLY.'
-        }
-      }
-      return enCapital
-    },
-    ToEn(a) {
-      // eslint-disable-next-line no-array-constructor
-      const arr1 = new Array('', ' thousand', ' million', ' billion')
-      const b = a.length
-      let f = null
-      let h = 0
-      let g = ''
-      const e = Math.ceil(b / 3)
-      const k = b - e * 3
-      g = ''
-      for (f = k; f < b; f += 3) {
-        ++h
-        // eslint-disable-next-line no-undef
-        const num3 = f >= 0 ? a.substring(f, f + 3) : a.substring(0, k + 3)
-        // eslint-disable-next-line no-undef
-        const strEng = this.English(num3)
-        // eslint-disable-next-line eqeqeq
-        if (strEng != '') {
-          // eslint-disable-next-line eqeqeq
-          if (g != '') g += ' '
-          g += this.English(num3) + arr1[e - h]
-        }
-      }
-      return g
-    },
-    English(a) {
-      // eslint-disable-next-line no-array-constructor
-      var arr1 = new Array('', ' thousand', ' million', ' billion')
-      // eslint-disable-next-line no-array-constructor
-      var arr2 = new Array('zero', 'ten', 'twenty', 'thirty', 'forty', 'fifty', 'sixty', 'seventy', 'eighty', 'ninety')
-      // eslint-disable-next-line no-array-constructor
-      var arr3 = new Array('zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine')
-      // eslint-disable-next-line no-array-constructor
-      var arr4 = new Array(
-        'ten',
-        'eleven',
-        'twelve',
-        'thirteen',
-        'fourteen',
-        'fifteen',
-        'sixteen',
-        'seventeen',
-        'eighteen',
-        'nineteen'
-      )
-
-      let strRet = ''
-      // eslint-disable-next-line eqeqeq
-      if (a.length == 3 && a.substr(0, 3) != '000') {
-        if (a.substr(0, 1) != '0') {
-          strRet += arr3[a.substr(0, 1)] + ' hundred'
-          if (a.substr(1, 2) != '00') strRet += ' and '
-        } else {
-          strRet += ' and '
-        }
-        a = a.substring(1)
-      }
-      if (a.length == 2) {
-        if (a.substr(0, 1) == '0') a = a.substring(1)
-        else if (a.substr(0, 1) == '1') strRet += arr4[a.substr(1, 2)]
-        else {
-          strRet += arr2[a.substr(0, 1)]
-          if (a.substr(1, 1) != '0') strRet += '-'
-          a = a.substring(1)
-        }
-      }
-      if (a.length == 1 && a.substr(0, 1) != '0') strRet += arr3[a.substr(0, 1)]
-      return strRet
-    },
-    editTextEntryModel(type) {
-      this.textEntryModalVisible = true
-      this.textEntryType = type
-      if (type === 'pkgs') {
-        this.textEntryModalTitle = '件数/包装'
-        if (this.details.pkgstotal) {
-          this.pkgsTextChange()
-        } else {
-          this.pkgstotalRes = 0
-        }
-      } else if (type === 'kgs') {
-        this.textEntryModalTitle = '毛重'
-        if (this.details.kgstotal) {
-          this.kgsTextChange()
-        } else {
-          this.kgstotalRes = 0
-        }
-      } else if (type === 'cbm') {
-        this.textEntryModalTitle = '尺码'
-        if (this.details.cbmtotal) {
-          this.cbmTextChange()
-        } else {
-          this.cbmtotalRes = 0
-        }
-      }
-    },
-    textEntryClose() {
-      this.textEntryModalVisible = false
-      this.textEntryModalTitle = ''
-      this.textEntryType = false
-    },
-    GetStringNum(str) {
-      var num = 0
-      if (str == null || str == '') return num
-      if (str.length == 0) return num
-      var if_find = false
-      var str_num = ''
-      for (var i = 0; i < str.length; i += 1) {
-        var member = str.substr(i, 1)
-        if (
-          member == '0' ||
-          member == '1' ||
-          member == '2' ||
-          member == '3' ||
-          member == '4' ||
-          member == '5' ||
-          member == '6' ||
-          member == '7' ||
-          member == '8' ||
-          member == '9' ||
-          member == '.' ||
-          member == '-'
-        ) {
-          if (!if_find) {
-            str_num = str_num + member
-          }
-        } else {
-          if_find = true
-        }
-      }
-      return str_num
-    },
-    pkgsTextChange() {
-      const pkgsTexyVal = this.details.pkgstotal
-      const arr = pkgsTexyVal.split(/\n|\r/g)
-      let pkgs = 0
-      let kindpkgs = ''
-      arr.map((item, index) => {
-        const regexStr = item.match(/[a-zA-Z]+|[0-9]+(?:\.[0-9]+|)/g)
-        if (regexStr && Number(regexStr[0])) {
-          const num1 = Number(regexStr[0])
-          pkgs = (pkgs * 100 + num1 * 100) / 100
-        }
-        if (!kindpkgs && regexStr && /^[a-zA-Z]+$/.test(regexStr[1])) {
-          kindpkgs = regexStr[1]
-        }
-      })
-      this.details.pkgs = parseInt(pkgs)
-      this.details.kindpkgs = kindpkgs
-      this.pkgstotalRes = parseInt(pkgs)
-    },
-    kgsTextChange() {
-      const kgsTexyVal = this.details.kgstotal
-      const arr = kgsTexyVal.split(/\n|\r/g)
-      let kgs = 0
-      arr.map((item, index) => {
-        const regexStr = item.match(/[a-zA-Z]+|[0-9]+(?:\.[0-9]+|)/g)
-        if (regexStr && Number(regexStr[0])) {
-          const num1 = Number(regexStr[0])
-          kgs = (kgs * 100 + num1 * 100) / 100
-        }
-      })
-      this.details.kgs = kgs
-      this.kgstotalRes = kgs
-    },
-    cbmTextChange() {
-      const cbmTexyVal = this.details.cbmtotal
-      const arr = cbmTexyVal.split(/\n|\r/g)
-      let cbm = 0
-      arr.map((item, index) => {
-        const regexStr = item.match(/[a-zA-Z]+|[0-9]+(?:\.[0-9]+|)/g)
-        if (regexStr && Number(regexStr[0])) {
-          const num1 = Number(regexStr[0])
-          cbm = (cbm * 100 + num1 * 100) / 100
-        }
-      })
-      this.details.cbm = cbm
-      this.cbmtotalRes = cbm
-    },
     handleOpen(type) {
       this.modelType = type
       if (type === 1) {
@@ -817,21 +304,10 @@ export default {
         this.details.goodsname = res.goodsNameEN || ''
       } else if (type === 'cargoid') {
         this.details.cargoid = res.code || ''
-      } else if (['kindpkgs'].includes(type)) {
-        this.details.kindpkgs = res['name'] || ''
-        const enCapitalRes = this.SetTOTALNO(this.details.pkgs)
-        this.$emit('pkgsEnCapital', enCapitalRes)
       }
     },
-    changePkgs() {
-      const enCapitalRes = this.SetTOTALNO(this.details.pkgs)
-      this.$emit('pkgsEnCapital', enCapitalRes)
-    },
     inputChange({ type, value }) {
       this.details[type] = value
-      if (type === 'pkgs') {
-        this.changePkgs()
-      }
       this.$forceUpdate()
     },
     tabStopFun() {
@@ -861,8 +337,4 @@ export default {
 </style>
 <style lang="less" scoped>
 @import url('../style/cargoInfo.less');
-@import url('../style/mailingInfo.less');
-.cargo-info {
-    padding-bottom: 20px;
-}
 </style>
diff --git a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
index 497c891..40e1772 100644
--- a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
@@ -10,7 +10,7 @@
       <template slot="extra">
         <div class="tab-change"><i class="iconfont icon-xia" :class="{ active: !showKey.includes('1') }"></i></div>
       </template>
-      <div class="mail-info" style="padding-bottom: 18px;">
+      <div class="mail-info">
         <a-form-model :selfUpdate="true" ref="mailingFrom" :model="details" :rules="rules">
           <a-row :gutter="10">
             <a-col
@@ -19,7 +19,7 @@
               :sm="24"
               :md="24"
               :lg="10"
-              :xl="8">
+              :xl="11">
               <a-form-model-item has-feedback prop="shipper" class="sender-label" style="overflow: hidden">
                 <div class="sender">
                   <a-tooltip v-if="details.carrierid === 'PIL'">
@@ -181,14 +181,237 @@
               :sm="24"
               :md="24"
               :lg="14"
-              :xl="16">
-              <a-row :gutter="4">
-                <a-col :span="6">
+              :xl="13">
+              <a-row :gutter="16">
+                <div class="right-content-top">
+                  <a-col :span="12">
+                    <a-form-model-item
+                      class="from-label yarn-label"
+                      label="场站"
+                      :labelCol="labelCol"
+                      :wrapperCol="wrapperCol"
+                      has-feedback
+                      style="overflow: visible"
+                      prop="yard">
+                      <div class="yard-box" style="display: flex">
+                        <selectView
+                          type="yard"
+                          :defaultVal="details.yard"
+                          searchApi="GetYardlist"
+                          :searchQuery="{ keyword: '' }"
+                          :showLabel="['name', 'showCode']"
+                          :openSearch="false"
+                          @change="getSelectViewRes"
+                          style="flex: 1; margin-top: -4px"></selectView>
+                        <i class="iconfont icon-touxiang" style="margin: 0 4px" @click="changeYard('content')"></i>
+                        <i class="iconfont icon-bianji1" @click="changeYard('remark')"></i>
+                      </div>
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :span="12">
+                    <a-form-model-item
+                      class="from-label"
+                      label="场站费自结"
+                      :labelCol="labelCol"
+                      :wrapperCol="wrapperCol"
+                      has-feedback
+                      prop="feeself">
+                      <a-radio-group size="small" v-model="details.feeself">
+                        <a-radio size="small" :value="true"> 是 </a-radio>
+                        <a-radio size="small" :value="false"> 否 </a-radio>
+                      </a-radio-group>
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :span="12">
+                    <a-form-model-item
+                      class="from-label"
+                      label="报关行"
+                      :labelCol="labelCol"
+                      :wrapperCol="wrapperCol"
+                      has-feedback
+                      prop="customser">
+                      <selectView
+                        type="customser"
+                        :defaultVal="details.customser"
+                        searchApi="DjyCustomerpage"
+                        :searchQuery="{ SearchValue: '', PropString: 'customs_broker' }"
+                        :showLabel="['shortName']"
+                        :openSearch="true"
+                        @change="getSelectViewRes"></selectView>
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :span="12">
+                    <a-form-model-item
+                      class="from-label"
+                      label="车队"
+                      :labelCol="labelCol"
+                      :wrapperCol="wrapperCol"
+                      has-feedback
+                      prop="trucker">
+                      <selectView
+                        type="trucker"
+                        :defaultVal="details.trucker"
+                        searchApi="DjyCustomerpage"
+                        :searchQuery="{ SearchValue: '', PropString: 'fleet' }"
+                        :showLabel="['shortName']"
+                        :openSearch="true"
+                        @change="getSelectViewRes"></selectView>
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :span="12">
+                    <a-form-model-item
+                      class="from-label"
+                      label="国外代理"
+                      :labelCol="labelCol"
+                      :wrapperCol="wrapperCol"
+                      has-feedback
+                      prop="agentname">
+                      <div style="display: flex;align-items: center;">
+                        <selectView
+                          type="agentname"
+                          :defaultVal="details.agentname"
+                          searchApi="DjyCustomerpage"
+                          :searchQuery="{ SearchValue: '', PropString: 'out_agent' }"
+                          :showLabel="['shortName']"
+                          :openSearch="true"
+                          @change="getSelectViewRes"
+                          style="flex: 1;"></selectView>
+                        <a-icon
+                          v-if="ishd"
+                          @click="handleOpenFd"
+                          style="color: #13c2c2;cursor: pointer;"
+                          theme="filled"
+                          type="diff" />
+                      </div>
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :span="12">
+                    <a-form-model-item
+                      class="from-label"
+                      label="仓库"
+                      :labelCol="labelCol"
+                      :wrapperCol="wrapperCol"
+                      has-feedback
+                      prop="warehouse">
+                      <selectView
+                        type="warehouse"
+                        :defaultVal="details.warehouse"
+                        searchApi="DjyCustomerpage"
+                        :searchQuery="{ SearchValue: '', PropString: 'warehouse' }"
+                        :showLabel="['shortName']"
+                        :openSearch="true"
+                        @change="getSelectViewRes"></selectView>
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :span="12">
+                    <a-form-model-item
+                      class="from-label"
+                      label="装运方式"
+                      :labelCol="labelCol"
+                      :wrapperCol="wrapperCol"
+                      has-feedback
+                      prop="shippingMethod">
+                      <selectView
+                        type="shippingMethod"
+                        :defaultVal="details.shippingMethod"
+                        searchApi="ShippingMethod"
+                        :searchQuery="{ name: '' }"
+                        :showLabel="['name']"
+                        :openSearch="false"
+                        :isCopy="true"
+                        @change="getSelectViewRes"></selectView>
+                    </a-form-model-item>
+                  </a-col>
+                </div>
+                <a-row>
+                  <a-col :span="12">
+                    <a-form-model-item
+                      class="from-label"
+                      label="截港时间"
+                      :labelCol="labelCol"
+                      :wrapperCol="wrapperCol"
+                      has-feedback
+                      prop="closingdate">
+                      <datePickerView
+                        class="date-picker"
+                        style="min-width: 100px"
+                        :showTime="true"
+                        :parentVal="details.closingdate"
+                        type="closingdate"
+                        format="YYYY-MM-DD HH:00"
+                        @dateChange="dateChangeFun"></datePickerView>
+                      <!-- <a-date-picker
+                      style="min-width:100px"
+                      show-time
+                      format="YYYY-MM-DD HH:00"
+                      v-model="details.closingdate"
+                      @change="closingdateChange"
+                    >
+                      <a-icon slot="suffixIcon" type="time" style="display: none" />
+                    </a-date-picker> -->
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :span="12">
+                    <a-form-model-item
+                      class="from-label"
+                      label="截单时间"
+                      :labelCol="labelCol"
+                      :wrapperCol="wrapperCol"
+                      has-feedback
+                      prop="closedocdate">
+                      <datePickerView
+                        class="date-picker"
+                        style="min-width: 100px"
+                        :showTime="true"
+                        :parentVal="details.closedocdate"
+                        type="closedocdate"
+                        format="YYYY-MM-DD HH:00"
+                        @dateChange="dateChangeFun"></datePickerView>
+                      <!-- <a-date-picker
+                      style="min-width:100px"
+                      show-time
+                      format="YYYY-MM-DD HH:00"
+                      v-model="details.closedocdate"
+                      @change="closedocdateChange"
+                    >
+                      <a-icon slot="suffixIcon" type="time" style="display: none" />
+                    </a-date-picker> -->
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :span="12">
+                    <a-form-model-item
+                      class="from-label"
+                      label="VGM时间"
+                      :labelCol="labelCol"
+                      :wrapperCol="wrapperCol"
+                      has-feedback
+                      prop="closevgmdate">
+                      <datePickerView
+                        class="date-picker"
+                        style="min-width: 100px"
+                        :showTime="true"
+                        :parentVal="details.closevgmdate"
+                        type="closevgmdate"
+                        format="YYYY-MM-DD HH:00"
+                        @dateChange="dateChangeFun"></datePickerView>
+                      <!-- <a-date-picker
+                      style="min-width:100px"
+                      show-time
+                      format="YYYY-MM-DD HH:00"
+                      v-model="details.closevgmdate"
+                      @change="closevgmdateChange"
+                    >
+                      <a-icon slot="suffixIcon" type="time" style="display: none" />
+                    </a-date-picker> -->
+                    </a-form-model-item>
+                  </a-col>
+                </a-row>
+                <a-col :span="12">
                   <a-form-model-item
                     class="from-label"
                     label="收货地代码"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
                     has-feedback
                     prop="placereceiptid">
                     <selectView
@@ -201,7 +424,7 @@
                       @change="getSelectViewRes"></selectView>
                   </a-form-model-item>
                 </a-col>
-                <a-col :span="6">
+                <a-col :span="12">
                   <a-form-model-item
                     class="from-label"
                     label="收货地"
@@ -216,54 +439,12 @@
                       @getInputChange="inputChange" />
                   </a-form-model-item>
                 </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label yarn-label"
-                    label="场站"
-                    :labelCol="{ xs: { span: 24 },
-                                 sm: { span: 5 },
-                                 md: { span: 5 }}"
-                    :wrapperCol="{ xs: { span: 24 },
-                                   sm: { span: 19 },
-                                   md: { span: 19 }}"
-                    has-feedback
-                    style="overflow: visible"
-                    prop="yard">
-                    <div class="yard-box" style="display: flex">
-                      <selectView
-                        type="yard"
-                        :defaultVal="details.yard"
-                        searchApi="GetYardlist"
-                        :searchQuery="{ keyword: '' }"
-                        :showLabel="['name', 'showCode']"
-                        :openSearch="false"
-                        @change="getSelectViewRes"
-                        style="flex: 1; margin-top: -4px"></selectView>
-                      <i class="iconfont icon-touxiang" style="margin: 0 4px" @click="changeYard('content')"></i>
-                      <i class="iconfont icon-bianji1" @click="changeYard('remark')"></i>
-                    </div>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="场站费自结"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
-                    prop="feeself">
-                    <a-radio-group size="small" v-model="details.feeself">
-                      <a-radio size="small" :value="true"> 是 </a-radio>
-                      <a-radio size="small" :value="false"> 否 </a-radio>
-                    </a-radio-group>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
+                <a-col :span="12">
                   <a-form-model-item
                     class="from-label"
                     label="装货港代码"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
+                    :labelCol="labelCol"
+                    :wrapperCol="wrapperCol"
                     has-feedback
                     prop="portloadid">
                     <selectView
@@ -277,7 +458,7 @@
                       @change="getSelectViewRes"></selectView>
                   </a-form-model-item>
                 </a-col>
-                <a-col :span="6">
+                <a-col :span="12">
                   <a-form-model-item
                     class="from-label"
                     label="装货港"
@@ -288,52 +469,13 @@
                     <inputView type="portload" size="small" :parentVal="details.portload" @getInputChange="inputChange" />
                   </a-form-model-item>
                 </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="截港时间"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="closingdate">
-                    <datePickerView
-                      class="date-picker"
-                      style="min-width: 100px"
-                      :showTime="true"
-                      :parentVal="details.closingdate"
-                      type="closingdate"
-                      format="YYYY-MM-DD HH:00"
-                      @dateChange="dateChangeFun"></datePickerView>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6" >
+                <a-col :span="12">
                   <a-form-model-item
                     class="from-label"
-                    label="船代"
+                    label="中转港代码"
                     :labelCol="labelCol"
                     :wrapperCol="wrapperCol"
                     has-feedback
-                    prop="shipagency"
-                  >
-                    <selectView
-                      ref="shipagency"
-                      type="shipagency"
-                      :defaultVal="details.shipagency"
-                      searchApi="GetForwarderlist"
-                      :searchQuery="{ KeyWord: '' }"
-                      :showLabel="['name', 'showCode']"
-                      :openSearch="true"
-                      @change="getSelectViewRes"
-                    ></selectView>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="中转港代码"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
                     prop="transportid">
                     <selectView
                       type="transportid"
@@ -345,7 +487,7 @@
                       @change="getSelectViewRes"></selectView>
                   </a-form-model-item>
                 </a-col>
-                <a-col :span="6">
+                <a-col :span="12">
                   <a-form-model-item
                     class="from-label"
                     label="中转港"
@@ -360,49 +502,13 @@
                       @getInputChange="inputChange" />
                   </a-form-model-item>
                 </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="截单时间"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="closedocdate">
-                    <datePickerView
-                      class="date-picker"
-                      style="min-width: 100px"
-                      :showTime="true"
-                      :parentVal="details.closedocdate"
-                      type="closedocdate"
-                      format="YYYY-MM-DD HH:00"
-                      @dateChange="dateChangeFun"></datePickerView>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
+                <a-col :span="12">
                   <a-form-model-item
                     class="from-label"
-                    label="报关行"
+                    label="卸货港代码"
                     :labelCol="labelCol"
                     :wrapperCol="wrapperCol"
                     has-feedback
-                    prop="customser">
-                    <selectView
-                      type="customser"
-                      :defaultVal="details.customser"
-                      searchApi="DjyCustomerpage"
-                      :searchQuery="{ SearchValue: '', PropString: 'customs_broker' }"
-                      :showLabel="['shortName']"
-                      :openSearch="true"
-                      @change="getSelectViewRes"></selectView>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="卸货港代码"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
                     prop="portdischargeid">
                     <selectView
                       type="portdischargeid"
@@ -414,7 +520,7 @@
                       @change="getSelectViewRes"></selectView>
                   </a-form-model-item>
                 </a-col>
-                <a-col :span="6">
+                <a-col :span="12">
                   <a-form-model-item
                     class="from-label"
                     label="卸货港"
@@ -429,49 +535,13 @@
                       @getInputChange="inputChange" />
                   </a-form-model-item>
                 </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="VGM时间"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="closevgmdate">
-                    <datePickerView
-                      class="date-picker"
-                      style="min-width: 100px"
-                      :showTime="true"
-                      :parentVal="details.closevgmdate"
-                      type="closevgmdate"
-                      format="YYYY-MM-DD HH:00"
-                      @dateChange="dateChangeFun"></datePickerView>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
+                <a-col :span="12">
                   <a-form-model-item
                     class="from-label"
-                    label="车队"
+                    label="目的地代码"
                     :labelCol="labelCol"
                     :wrapperCol="wrapperCol"
                     has-feedback
-                    prop="trucker">
-                    <selectView
-                      type="trucker"
-                      :defaultVal="details.trucker"
-                      searchApi="DjyCustomerpage"
-                      :searchQuery="{ SearchValue: '', PropString: 'fleet' }"
-                      :showLabel="['shortName']"
-                      :openSearch="true"
-                      @change="getSelectViewRes"></selectView>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="目的地代码"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
                     prop="destinationid">
                     <selectView
                       type="destinationid"
@@ -483,7 +553,7 @@
                       @change="getSelectViewRes"></selectView>
                   </a-form-model-item>
                 </a-col>
-                <a-col :span="6">
+                <a-col :span="12">
                   <a-form-model-item
                     class="from-label"
                     label="目的地"
@@ -498,60 +568,13 @@
                       @getInputChange="inputChange" />
                   </a-form-model-item>
                 </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="航线"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="lineName"
-                  >
-                    <selectView
-                      type="lineName"
-                      :defaultVal="details.lineName"
-                      searchApi="GetTenantLineList"
-                      :searchQuery="{ LineName: '' }"
-                      :showLabel="['name']"
-                      :openSearch="false"
-                      @change="getSelectViewRes"
-                    ></selectView>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
+                <a-col :span="12">
                   <a-form-model-item
                     class="from-label"
-                    label="国外代理"
+                    label="交货地代码"
                     :labelCol="labelCol"
                     :wrapperCol="wrapperCol"
                     has-feedback
-                    prop="agentname">
-                    <div style="display: flex;align-items: center;">
-                      <selectView
-                        type="agentname"
-                        :defaultVal="details.agentname"
-                        searchApi="DjyCustomerpage"
-                        :searchQuery="{ SearchValue: '', PropString: 'out_agent' }"
-                        :showLabel="['shortName']"
-                        :openSearch="true"
-                        @change="getSelectViewRes"
-                        style="flex: 1;"></selectView>
-                      <a-icon
-                        v-if="ishd"
-                        @click="handleOpenFd"
-                        style="color: #13c2c2;cursor: pointer;"
-                        theme="filled"
-                        type="diff" />
-                    </div>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="交货地代码"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
                     prop="placedeliveryid">
                     <selectView
                       type="placedeliveryid"
@@ -563,7 +586,7 @@
                       @change="getSelectViewRes"></selectView>
                   </a-form-model-item>
                 </a-col>
-                <a-col :span="6">
+                <a-col :span="12">
                   <a-form-model-item
                     class="from-label"
                     label="交货地"
@@ -579,267 +602,7 @@
                     <!-- <a-input :allowClear="true" v-model="details.placedelivery" /> -->
                   </a-form-model-item>
                 </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="装运方式"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="shippingMethod">
-                    <selectView
-                      type="shippingMethod"
-                      :defaultVal="details.shippingMethod"
-                      searchApi="ShippingMethod"
-                      :searchQuery="{ name: '' }"
-                      :showLabel="['name']"
-                      :openSearch="false"
-                      :isCopy="true"
-                      @change="getSelectViewRes"></selectView>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="仓库"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="warehouse">
-                    <selectView
-                      type="warehouse"
-                      :defaultVal="details.warehouse"
-                      searchApi="DjyCustomerpage"
-                      :searchQuery="{ SearchValue: '', PropString: 'warehouse' }"
-                      :showLabel="['shortName']"
-                      :openSearch="true"
-                      @change="getSelectViewRes"></selectView>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="24">
-                  <div style="height: 1px;background: rgb(170 176 185);margin: 5px 0;"></div>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="签单方式"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="issuetype"
-                  >
-                    <selectView
-                      type="issuetype"
-                      :defaultVal="details.issuetype"
-                      searchApi="Codeissuetypelist"
-                      :searchQuery="{ KeyWord: '' }"
-                      :showLabel="['enName', 'cnName']"
-                      :openSearch="false"
-                      @change="getSelectViewRes"
-                    ></selectView>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="签单日期"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="issuedate"
-                  >
-                    <datePickerView
-                      class="date-picker"
-                      :parentVal="details.issuedate"
-                      type="issuedate"
-                      format="YYYY-MM-DD"
-                      @dateChange="dateChangeFun"
-                    ></datePickerView>
-                    <!-- <a-date-picker size="small" v-model="details.issuedate" format="YYYY-MM-DD" /> -->
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="签单地点"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="issueplace"
-                  >
-                    <selectView
-                      type="issueplace"
-                      :defaultVal="details.issueplace"
-                      searchApi="GetPortloadlist"
-                      :searchQuery="{ KeyWord: '' }"
-                      :showLabel="['enName']"
-                      :openSearch="true"
-                      :isCopy="true"
-                      @change="getSelectViewRes"
-                    ></selectView>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="签单地代码"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
-                    prop="issueplaceid"
-                  >
-                    <inputView type="issueplaceid" size="small" :parentVal="details.issueplaceid" @getInputChange="inputChange"/>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
-                  <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-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="预付地点"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="prepardat"
-                  >
-                    <selectView
-                      type="prepardat"
-                      :defaultVal="details.prepardat"
-                      searchApi="GetPortloadlist"
-                      :searchQuery="{ KeyWord: '' }"
-                      :showLabel="['enName']"
-                      :openSearch="true"
-                      :isCopy="true"
-                      @change="getSelectViewRes"
-                    ></selectView>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="到付地点"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="payableat"
-                  >
-                    <selectView
-                      type="payableat"
-                      :defaultVal="details.payableat"
-                      searchApi="GetPortlist"
-                      :searchQuery="{ KeyWord: '' }"
-                      :showLabel="['enName']"
-                      :openSearch="true"
-                      @change="getSelectViewRes"
-                    ></selectView>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="第三付款地"
-                    :labelCol="labelColCode"
-                    :wrapperCol="wrapperColCode"
-                    has-feedback
-                    prop="thirdpayaddr"
-                  >
-                    <inputView type="thirdpayaddr" size="small" :parentVal="details.thirdpayaddr" @getInputChange="inputChange"/>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
-                  <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="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="提单份数"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="nobill"
-                  >
-                    <selectView
-                      type="nobill"
-                      :defaultVal="details.nobill"
-                      searchApi="nobillData"
-                      :searchQuery="{ name: '' }"
-                      :showLabel="['name']"
-                      :openSearch="false"
-                      @change="getSelectViewRes"
-                    ></selectView>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="6">
-                  <a-form-model-item
-                    class="from-label"
-                    label="副本份数"
-                    :labelCol="labelCol"
-                    :wrapperCol="wrapperCol"
-                    has-feedback
-                    prop="copynobill"
-                  >
-                    <selectView
-                      type="copynobill"
-                      :defaultVal="details.copynobill"
-                      searchApi="copynobilllData"
-                      :searchQuery="{ name: '' }"
-                      :showLabel="['name']"
-                      :openSearch="false"
-                      @change="getSelectViewRes"
-                    ></selectView>
-                  </a-form-model-item>
-                </a-col>
-                <a-col :span="24">
-                  <div style="height: 1px;background: rgb(170 176 185);margin: 5px 0;"></div>
-                </a-col>
-                <a-col :span="12">
-                  <a-form-model-item prop="soremark">
-                    <div class="tit" :class="{'required':rules['soremark'] && rules['soremark'][0].required}"><span class="iconfont icon-bianji"></span>订舱备注</div>
-                    <a-textarea style="height: 120px !important;" class="input-box" v-model="details.soremark" />
-                  </a-form-model-item>
-                </a-col>
                 <a-col :span="12">
-                  <a-form-model-item prop="siremark">
-                    <div class="tit" :class="{'required':rules['siremark'] && rules['siremark'][0].required}"><span class="iconfont icon-bianji"></span>截单备注</div>
-                    <a-textarea style="height: 120px !important;" class="input-box" v-model="details.siremark" data-next="box-ctnall"/>
-                  </a-form-model-item>
-                </a-col>
-                <!-- <a-col :span="12">
                   <a-form-model-item
                     class="from-label pkgs-line-box"
                     label="件数"
@@ -848,6 +611,7 @@
                     has-feedback
                     prop="pkgs">
                     <div class="line-box">
+                      <!-- <inputView type="pkgs" :parentVal="details.pkgs" inputType="number" @getInputChange="inputChange"/> -->
                       <a-input
                         :allowClear="true"
                         size="small"
@@ -886,6 +650,7 @@
                     has-feedback
                     prop="kgs">
                     <div class="line-box">
+                      <!-- <inputView type="kgs" :parentVal="details.kgs" @getInputChange="inputChange"/> -->
                       <a-input size="small" :allowClear="true" v-model="details.kgs" />
                       <i class="iconfont icon-bianji1 edit-icon" @click="editTextEntryModel('kgs')"></i>
                       <span class="unit">KGS</span>
@@ -901,12 +666,13 @@
                     has-feedback
                     prop="cbm">
                     <div class="line-box">
+                      <!-- <inputView type="cbm" :parentVal="details.cbm" @getInputChange="inputChange"/> -->
                       <a-input size="small" :allowClear="true" v-model="details.cbm" />
                       <i class="iconfont icon-bianji1 edit-icon" @click="editTextEntryModel('cbm')"></i>
                       <span class="unit">CBM</span>
                     </div>
                   </a-form-model-item>
-                </a-col> -->
+                </a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -1236,16 +1002,6 @@ export default {
         sm: { span: 16 },
         md: { span: 16 }
       },
-      labelColCode: {
-        xs: { span: 24 },
-        sm: { span: 8 },
-        md: { span: 10 }
-      },
-      wrapperColCode: {
-        xs: { span: 24 },
-        sm: { span: 16 },
-        md: { span: 14 }
-      },
       YardlabelCol: {
         xs: { span: 24 },
         sm: { span: 1 },
@@ -1361,7 +1117,6 @@ export default {
         this.details.portload = 'QINGDAO,CHINA'
         this.details.placereceipt = 'QINGDAO,CHINA'
       }
-      this.$refs.shipagency.value = this.frompre[0].forwarder
     },
     debounce(func, wait, ...args) {
       if (timer) clearTimeout(timer)
@@ -1887,30 +1642,6 @@ export default {
         this.$emit('pkgsEnCapital', enCapitalRes)
       } else if (['shippingMethod'].includes(type)) {
         this.details.shippingMethod = res['name'] || ''
-      } else if (type === 'shipagency') {
-        this.details.shipagency = res.name || ''
-        this.details.shipagencyid = res.code || ''
-      } else if (type === 'lineName') {
-        this.details[type] = res.name || ''
-        this.$emit('editLineName', true)
-      } else if (['issuetype', 'blfrt'].includes(type)) {
-        this.details[type] = res.enName || ''
-        if (type === 'blfrt') {
-          if (this.details.blfrt === 'FREIGHT COLLECT') {
-            this.details.payableat = this.details.payableat ? this.details.payableat : this.details.portdischarge || ''
-            this.details.payableatid = this.details.payableatid ? this.details.payableatid : this.details.portdischargeid || ''
-          } else {
-            this.details.prepardat = this.details.prepardat ? this.details.prepardat : this.details.portload || ''
-            this.details.prepardatid = this.details.prepardatid ? this.details.prepardatid : this.details.portloadid || ''
-          }
-        }
-      } else if (['issueplace', 'prepardat', 'payableat'].includes(type)) {
-        this.details[type] = res.enName || ''
-        this.details[`${type}id`] = res.ediCode || ''
-      } else if (['service'].includes(type)) {
-        this.details[type] = res.name || ''
-      } else if (['nobill', 'copynobill'].includes(type)) {
-        this.details[type] = res.code || ''
       }
     },
     dateChangeFun({ type, value }) {
@@ -1940,7 +1671,4 @@ export default {
     color: @primary-color;
   }
 }
-.tit{
-  line-height: 26px;
-}
 </style>