From 44290b87679474c59841a43f454db5093a723464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Wed, 27 Sep 2023 15:34:40 +0800
Subject: [PATCH] 9/27

---
 src/Views/Booking/AddBooking.vue |   82 ++-
 src/Views/Booking/index.vue      |    4 +-
 src/Views/BookingOrder/index.vue | 1003 ++++++++++++++++--------------
 src/Views/WebC/index.vue         |   10 +-
 src/store/index.js               |   11 +-
 5 files changed, 614 insertions(+), 496 deletions(-)

diff --git a/src/Views/Booking/AddBooking.vue b/src/Views/Booking/AddBooking.vue
index 9edcf82..606bda9 100644
--- a/src/Views/Booking/AddBooking.vue
+++ b/src/Views/Booking/AddBooking.vue
@@ -1,6 +1,16 @@
 <template>
   <div class="BookingAddMain">
     <div class="BookingAddButtonBox">
+      <el-button
+        type="primary"
+        @click="
+          () => {
+            router.push('/Booking');
+          }
+        "
+      >
+        返回
+      </el-button>
       <el-button type="primary" @click="ClickSave"> 保存 </el-button>
       <el-button
         type="primary"
@@ -80,7 +90,7 @@
                   @change="
                     (e) => {
                       store.state.Data.portlist.forEach((i) => {
-                        if (e == i.code) {
+                        if (e == i.ediCode) {
                           form.portDischarge = i.name;
                         }
                       });
@@ -89,9 +99,9 @@
                 >
                   <el-option
                     v-for="item in store.state.Data.portlist"
-                    :key="item.code"
+                    :key="item.ediCode"
                     :label="item.name"
-                    :value="item.code"
+                    :value="item.ediCode"
                   />
                 </el-select>
               </el-form-item>
@@ -325,6 +335,11 @@
                 <el-input v-model="form.pkgs" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="品名">
+                <el-input v-model="form.goodsDescription" />
+              </el-form-item>
+            </el-col>
             <template v-if="form.cargoId == 'R'">
               <el-col :span="24">
                 <span class="cargoS">冻柜信息</span>
@@ -522,7 +537,7 @@
   </div>
 </template>
 <script>
-import { onMounted, ref } from "vue";
+import { onMounted, ref, watch } from "vue";
 import {
   bookingCustomSave,
   bookingCustomInfo,
@@ -556,10 +571,10 @@ export default {
       resource: "",
       desc: "",
       ctnList: [],
+      cargoData: {},
     });
     const serviceItemList = ref([]);
     store.state.Data.cobServiceItemTenantList.forEach((item) => {
-      console.log(item);
       if (item.defaultSelected == 1) {
         serviceItemList.value.push(item.serviceCode);
         form.value.serviceItemList.push({
@@ -570,12 +585,40 @@ export default {
     });
 
     const viweType = ref("");
+    watch(
+      () => router.currentRoute.value,
+      (newValue) => {
+        // console.log(newValue);
+        viweType.value = newValue.query.type;
+      },
+      { immediate: true }
+    );
     onMounted(() => {
       let query = router.currentRoute.value.query;
       viweType.value = query.type;
       if (query.type == "Edit" || query.type == "Copy") {
         bookingCustomInfo({ id: query.id }).then((res) => {
           form.value = { ...res.data };
+          form.value.cargoData = {
+            temperature: res.data.temperature,
+            minTemperature: res.data.minTemperature,
+            maxTemperature: res.data.maxTemperature,
+            ventilationRate: res.data.ventilationRate,
+            temperatureUnit: res.data.temperatureUnit,
+            dangerClass: res.data.dangerClass,
+            dangerLable: res.data.dangerLable,
+            dangerLineTel: res.data.dangerLineTel,
+            dangerLinkMan: res.data.dangerLinkMan,
+            dangerPage: res.data.dangerPage,
+            dangerUnNo: res.data.dangerUnNo,
+            limitedContainerHeight: res.data.limitedContainerHeight,
+            limitedContainerLength: res.data.limitedContainerLength,
+            limitedContainerWidth: res.data.limitedContainerWidth,
+          };
+          serviceItemList.value = [];
+          form.value.serviceItemList.forEach((item) => {
+            serviceItemList.value.push(item.code);
+          });
           fileList.value = [];
           res.data.bookingFileList.forEach((item) => {
             fileList.value.push({ ...item, name: item.fileName });
@@ -587,21 +630,18 @@ export default {
         });
       }
     });
-
     const handleClick = (data) => {
       setTimeout(() => {
         form.value.ctnList.splice(data.$index, 1);
       }, 100);
     };
     const TableAdd = () => {
-      console.log("TableAdd");
       setTimeout(() => {
         form.value.ctnList.push({});
       }, 100);
     };
 
     const ClickSave = () => {
-      console.log(form.value);
       let ApiData = form.value;
       // fileList
       ApiData = {
@@ -611,12 +651,29 @@ export default {
       };
       bookingCustomSave(ApiData).then((res) => {
         if (res.code == 200) {
-          console.log(res);
           ElMessage({
             message: "保存成功",
             type: "success",
           });
-          router.push("/Booking");
+          form.value = res.data;
+          form.value.cargoData = {
+            dangerClass: res.data.dangerClass,
+            dangerLable: res.data.dangerLable,
+            dangerLineTel: res.data.dangerLineTel,
+            dangerLinkMan: res.data.dangerLinkMan,
+            dangerPage: res.data.dangerPage,
+            dangerUnNo: res.data.dangerUnNo,
+            limitedContainerHeight: res.data.limitedContainerHeight,
+            limitedContainerLength: res.data.limitedContainerLength,
+            limitedContainerWidth: res.data.limitedContainerWidth,
+          };
+          router.push({
+            path: "/AddBooking",
+            query: {
+              type: "Edit",
+              id: res.data.id,
+            },
+          });
         }
       });
     };
@@ -692,7 +749,9 @@ export default {
         }
       });
     };
-    const ChangeCargoId = () => {
+    const ChangeCargoId = (e) => {
+      console.log(e);
+      console.log("ChangeCargoId");
       form.value.cargoData = {};
     };
     const ChangecarrierCode = (e) => {
@@ -727,6 +786,7 @@ export default {
       store,
       form,
       serviceItemList,
+      router,
       handleClick,
       TableAdd,
       ClickSave,
diff --git a/src/Views/Booking/index.vue b/src/Views/Booking/index.vue
index 42bdda3..66bd5d3 100644
--- a/src/Views/Booking/index.vue
+++ b/src/Views/Booking/index.vue
@@ -187,7 +187,7 @@ export default {
     const ClickDelete = (e) => {
       if (e) {
         bookingCustomDelete({ id: e.id }).then((res) => {
-          if (res.data == 200) {
+          if (res.code == 200) {
             SearchBoxRef.value.Search();
           }
         });
@@ -196,7 +196,7 @@ export default {
         if (table.length) {
           table.forEach((item) => {
             bookingCustomDelete({ id: item.id }).then((res) => {
-              if (res.data == 200) {
+              if (res.code == 200) {
                 SearchBoxRef.value.Search();
               }
             });
diff --git a/src/Views/BookingOrder/index.vue b/src/Views/BookingOrder/index.vue
index 9e8ebe7..a2fd446 100644
--- a/src/Views/BookingOrder/index.vue
+++ b/src/Views/BookingOrder/index.vue
@@ -22,301 +22,420 @@
       :before-close="dialogF"
       :fullscreen="true"
     >
-      <el-form :model="DialogForm" :label-width="100" disabled>
+      <el-form :model="DialogForm" :label-width="100" disabled size="default">
         <el-row>
-          <el-col :span="10">
+          <el-col :span="18">
             <el-row class="UnitBox">
               <el-col :span="24">
                 <p><span> </span>基本信息</p>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="委托方">
                   <el-input v-model="DialogForm.weituo" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="三方付费">
                   <el-input v-model="DialogForm.thirdPay" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="PO号">
                   <el-input v-model="DialogForm.poNo" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="船公司">
                   <el-input v-model="DialogForm.carrier" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="是否占舱">
-                  <el-input v-model="DialogForm.zhanCangFlag" />
+                  <!-- <el-input v-model="DialogForm.zhanCangFlag" /> -->
+                  <el-radio-group v-model="DialogForm.zhanCangFlag">
+                    <el-radio label="1" size="large">是</el-radio>
+                    <el-radio label="2" size="large">否</el-radio>
+                  </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="订舱编号">
                   <el-input v-model="DialogForm.custno" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="主提单号">
                   <el-input v-model="DialogForm.mblNo" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="分提单号">
                   <el-input v-model="DialogForm.hblNo" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="订舱代理">
                   <el-input v-model="DialogForm.forwarder" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="合约号">
                   <el-input v-model="DialogForm.contractNo" />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row class="UnitBox">
-              <el-col :span="24">
-                <p><span> </span>EDI补充信息</p>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="是否SOC箱">
-                  <el-input v-model="DialogForm.isContainerSoc" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="SCAC代码">
-                  <el-input v-model="DialogForm.scacCode" />
+              <el-col :span="6">
+                <el-form-item label="开船日期">
+                  <el-input v-model="DialogForm.etd" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="ITN编号">
-                  <el-input v-model="DialogForm.itnCode" />
+              <el-col :span="6">
+                <el-form-item label="船名">
+                  <el-input v-model="DialogForm.vessel" />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row class="UnitBox">
-              <el-col :span="24">
-                <p><span> </span>收货人信息</p>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="收货人">
-                  <el-input v-model="DialogForm.consignee" />
+              <el-col :span="6">
+                <el-form-item label="内部航次">
+                  <el-input v-model="DialogForm.voyNoInner" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="收货人地址1">
-                  <el-input v-model="DialogForm.consigneeAddrOne" />
+              <el-col :span="6">
+                <el-form-item label="海关航次">
+                  <el-input v-model="DialogForm.voyageNo" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="收货人地址2">
-                  <el-input v-model="DialogForm.consigneeAddrSecond" />
+              <el-col :span="6">
+                <el-form-item label="航线">
+                  <el-input v-model="DialogForm.laneName" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="收货人地址3">
-                  <el-input v-model="DialogForm.consigneeAddrThird" />
+              <el-col :span="6">
+                <el-form-item label="销售">
+                  <el-input v-model="DialogForm.sale" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="收货人联系人">
-                  <el-input v-model="DialogForm.consigneeAttn" />
+              <el-col :span="6">
+                <el-form-item label="客服">
+                  <el-input v-model="DialogForm.custService" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="收货人城市">
-                  <el-input v-model="DialogForm.consigneeCity" />
+              <el-col :span="6">
+                <el-form-item label="操作">
+                  <el-input v-model="DialogForm.op" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="收货人代码">
-                  <el-input v-model="DialogForm.consigneeCode" />
+              <el-col :span="6">
+                <el-form-item label="单证">
+                  <el-input v-model="DialogForm.doc" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="收货人国家">
-                  <el-input v-model="DialogForm.consigneeCountry" />
+              <el-col :span="6">
+                <el-form-item label="航线操作人">
+                  <el-input v-model="DialogForm.route" />
                 </el-form-item>
               </el-col>
-              <!-- <el-col :span="8">
-                <el-form-item label="收货人DOOR地址">
-                  <el-input v-model="DialogForm.consigneeDoorAddr" />
-                </el-form-item>
-              </el-col> -->
-              <el-col :span="8">
-                <el-form-item label="收货人名称">
-                  <el-input v-model="DialogForm.consigneeName" />
+              <el-col :span="6">
+                <el-form-item label="航线管理">
+                  <el-input v-model="DialogForm.lineManage" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="收货人邮编">
-                  <el-input v-model="DialogForm.consigneePostcode" />
+              <el-col :span="6">
+                <el-form-item label="操作备注">
+                  <el-input v-model="DialogForm.czRemark" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="收货人省份">
-                  <el-input v-model="DialogForm.consigneeProvince" />
+              <el-col :span="6">
+                <el-form-item label="单证备注">
+                  <el-input v-model="DialogForm.dzRemark" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="收货人电话">
-                  <el-input v-model="DialogForm.consigneeTel" />
+              <el-col :span="6">
+                <el-form-item label="申请箱使">
+                  <el-input v-model="DialogForm.applyContainerUse" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row class="UnitBox">
+            <!-- <el-row class="UnitBox">
               <el-col :span="24">
-                <p><span> </span>场站信息</p>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="场站代码">
-                  <el-input v-model="DialogForm.yardCode" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="场站联系人">
-                  <el-input v-model="DialogForm.yardContract" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="场站联系邮箱">
-                  <el-input v-model="DialogForm.yardContractEmail" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="场站联系电话">
-                  <el-input v-model="DialogForm.yardContractTel" />
-                </el-form-item>
+                <p><span> </span>EDI补充信息</p>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="场站">
-                  <el-input v-model="DialogForm.yardName" />
+              <el-col :span="6">
+                <el-form-item label="是否SOC箱">
+                  <el-input v-model="DialogForm.isContainerSoc" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="场站备注">
-                  <el-input v-model="DialogForm.yardRemark" />
+              <el-col :span="6">
+                <el-form-item label="SCAC代码">
+                  <el-input v-model="DialogForm.scacCode" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="费用自结">
-                  <el-input v-model="DialogForm.feeSelf" />
+              <el-col :span="6">
+                <el-form-item label="ITN编号">
+                  <el-input v-model="DialogForm.itnCode" />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
+
             <el-row class="UnitBox">
               <el-col :span="24">
-                <p><span> </span>其他信息</p>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="报关行">
-                  <el-input v-model="DialogForm.customser" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="车队">
-                  <el-input v-model="DialogForm.trucker" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="国外代理">
-                  <el-input v-model="DialogForm.agentName" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="仓库">
-                  <el-input v-model="DialogForm.warehouse" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="装运方式">
-                  <el-input v-model="DialogForm.shippingMethod" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="截港日期">
-                  <el-input v-model="DialogForm.closingDate" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="截单日期">
-                  <el-input v-model="DialogForm.closingDocDate" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="VGM时间">
-                  <el-input v-model="DialogForm.closingVgmDate" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="收货地">
-                  <el-input v-model="DialogForm.placeReceipt" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="起运港">
-                  <el-input v-model="DialogForm.portLoading" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="中转港">
-                  <el-input v-model="DialogForm.transport" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="卸货港">
-                  <el-input v-model="DialogForm.portDischarge" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="目的地">
-                  <el-input v-model="DialogForm.destination" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="交货地">
-                  <el-input v-model="DialogForm.placeDelivery" />
-                </el-form-item>
+                <p><span> </span>收发通信息</p>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="件数">
-                  <el-input v-model="DialogForm.pkgs" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="包装">
-                  <el-input v-model="DialogForm.kindPkgs" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="毛重">
-                  <el-input v-model="DialogForm.kgs" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="尺码">
-                  <el-input v-model="DialogForm.cbm" />
+                <el-form-item label="发货人">
+                  <el-input
+                    :rows="6"
+                    type="textarea"
+                    v-model="DialogForm.shipper"
+                  />
                 </el-form-item>
+                <el-form-item label="收货人">
+                  <el-input
+                    :rows="6"
+                    type="textarea"
+                    v-model="DialogForm.consignee"
+                  />
+                </el-form-item>
+                <el-col :span="24">
+                  <el-form-item label="通知人">
+                    <el-input
+                      :rows="6"
+                      type="textarea"
+                      v-model="DialogForm.notifyParty"
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="16">
+                <el-row>
+                  <el-col :span="6">
+                    <el-form-item label="收货地">
+                      <el-input v-model="DialogForm.placeReceipt" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="场站">
+                      <el-input v-model="DialogForm.yardName" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="费用自结">
+                      <el-input v-model="DialogForm.feeSelf" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="起运港">
+                      <el-input v-model="DialogForm.portLoading" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="截港日期">
+                      <el-input v-model="DialogForm.closingDate" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="船代">
+                      <el-input v-model="DialogForm.shipAgency" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="中转港">
+                      <el-input v-model="DialogForm.transport" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="截单日期">
+                      <el-input v-model="DialogForm.closingDocDate" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="报关行">
+                      <el-input v-model="DialogForm.customser" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="卸货港">
+                      <el-input v-model="DialogForm.portDischarge" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="VGM时间">
+                      <el-input v-model="DialogForm.closingVgmDate" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="车队">
+                      <el-input v-model="DialogForm.trucker" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="目的地">
+                      <el-input v-model="DialogForm.destination" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="航线">
+                      <el-input v-model="DialogForm.lineName" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="国外代理">
+                      <el-input v-model="DialogForm.agentName" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="交货地">
+                      <el-input v-model="DialogForm.placeDelivery" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="装运方式">
+                      <el-input v-model="DialogForm.shippingMethod" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="仓库">
+                      <el-input v-model="DialogForm.warehouse" />
+                    </el-form-item>
+                  </el-col>
+                  <p>
+                    ————————————————————————————————————————————————————————————————
+                  </p>
+                  <el-col :span="6">
+                    <el-form-item label="签单方式">
+                      <el-input v-model="DialogForm.issueType" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="签单日期">
+                      <el-input v-model="DialogForm.issueDate" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="签单地点">
+                      <el-input v-model="DialogForm.issuePlace" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="付费方式">
+                      <el-input v-model="DialogForm.blFrt" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="预付地点">
+                      <el-input v-model="DialogForm.prepardat" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="到付地点">
+                      <el-input v-model="DialogForm.payableat" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="第三付款地">
+                      <el-input v-model="DialogForm.thirdpayAddr" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="运输条款">
+                      <el-input v-model="DialogForm.transportClause" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="提单份数">
+                      <el-input v-model="DialogForm.billNumber" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="副本提单份数">
+                      <el-input v-model="DialogForm.copyBillNumber" />
+                    </el-form-item>
+                  </el-col>
+                  <p>
+                    ————————————————————————————————————————————————————————————————
+                  </p>
+                  <el-col :span="12">
+                    <el-form-item label="SO备注">
+                      <el-input
+                        :rows="2"
+                        type="textarea"
+                        v-model="DialogForm.soRemark"
+                      />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="SI备注">
+                      <el-input
+                        :rows="2"
+                        type="textarea"
+                        v-model="DialogForm.siRemark"
+                      />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
               </el-col>
             </el-row>
             <el-row class="UnitBox">
               <el-col :span="24">
-                <p><span> </span>备注</p>
+                <p><span> </span>货物信息</p>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="SO备注">
-                  <el-input v-model="DialogForm.soRemark" />
-                </el-form-item>
+              <el-col :span="5">
+                <el-form-item label="唛头">
+                  <el-input
+                    :rows="6"
+                    type="textarea"
+                    v-model="DialogForm.marks"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-row>
+                  <el-col :span="10">
+                    <el-form-item label="货物标识">
+                      <el-input v-model="DialogForm.cargoId" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="10">
+                    <el-form-item label="HS代码">
+                      <el-input v-model="DialogForm.hcCode" />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-col :span="24">
+                  <el-form-item label="货描">
+                    <el-input
+                      :rows="4"
+                      type="textarea"
+                      v-model="DialogForm.goodsDescription"
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="9">
+                <el-row>
+                  <el-col :span="12">
+                    <el-form-item label="件数">
+                      <el-input v-model="DialogForm.pkgs" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="包装">
+                      <el-input v-model="DialogForm.kindPkgs" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="毛重">
+                      <el-input v-model="DialogForm.kgs" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="尺码">
+                      <el-input v-model="DialogForm.cbm" />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="SI备注">
-                  <el-input v-model="DialogForm.siRemark" />
+              <el-col :span="24">
+                <el-form-item label="件数大写">
+                  <el-input v-model="DialogForm.totalNo" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -339,143 +458,102 @@
                 <el-table-column prop="weightDate" label="称重日期" />
               </el-table>
             </el-row>
-          </el-col>
-          <el-col :span="10">
-            <el-row class="UnitBox">
+            <!-- <el-row class="UnitBox">
               <el-col :span="24">
-                <p><span> </span>基本信息</p>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="开船日期">
-                  <el-input v-model="DialogForm.etd" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="船名">
-                  <el-input v-model="DialogForm.vessel" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="内部航次">
-                  <el-input v-model="DialogForm.voyNoInner" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="海关航次">
-                  <el-input v-model="DialogForm.voyageNo" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="航线">
-                  <el-input v-model="DialogForm.laneName" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="销售">
-                  <el-input v-model="DialogForm.sale" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="客服">
-                  <el-input v-model="DialogForm.custService" />
-                </el-form-item>
+                <p><span> </span>货物信息</p>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="操作">
-                  <el-input v-model="DialogForm.op" />
+              <el-col :span="6">
+                <el-form-item label="品名">
+                  <el-input v-model="DialogForm.goodsName" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="单证">
-                  <el-input v-model="DialogForm.doc" />
+              <el-col :span="6">
+                <el-form-item label="场站代码">
+                  <el-input v-model="DialogForm.yardCode" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="航线操作人">
-                  <el-input v-model="DialogForm.route" />
+              <el-col :span="6">
+                <el-form-item label="场站联系人">
+                  <el-input v-model="DialogForm.yardContract" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="航线管理">
-                  <el-input v-model="DialogForm.lineManage" />
+              <el-col :span="6">
+                <el-form-item label="场站联系邮箱">
+                  <el-input v-model="DialogForm.yardContractEmail" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="操作备注">
-                  <el-input v-model="DialogForm.czRemark" />
+              <el-col :span="6">
+                <el-form-item label="场站联系电话">
+                  <el-input v-model="DialogForm.yardContractTel" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="单证备注">
-                  <el-input v-model="DialogForm.dzRemark" />
+              <el-col :span="6">
+                <el-form-item label="场站备注">
+                  <el-input v-model="DialogForm.yardRemark" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="申请箱使">
-                  <el-input v-model="DialogForm.applyContainerUse" />
-                </el-form-item>
+            </el-row>
+            <el-row class="UnitBox">
+              <el-col :span="24">
+                <p><span> </span>备注</p>
               </el-col>
             </el-row>
+
             <el-row class="UnitBox">
               <el-col :span="24">
                 <p><span> </span>发货人信息</p>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="发货人">
-                  <el-input v-model="DialogForm.shipper" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="发货人地址1">
                   <el-input v-model="DialogForm.shipperAddrOne" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="发货人地址2">
                   <el-input v-model="DialogForm.shipperAddrSecond" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="发货人地址3">
                   <el-input v-model="DialogForm.shipperAddrThird" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="发货人联系人">
                   <el-input v-model="DialogForm.shipperAttn" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="发货人城市">
                   <el-input v-model="DialogForm.shipperCity" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="发货人国家">
                   <el-input v-model="DialogForm.shipperCountry" />
                 </el-form-item>
               </el-col>
-              <!-- <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="发货人DOOR地址">
                   <el-input v-model="DialogForm.shipperDoorAddr" />
                 </el-form-item>
-              </el-col> -->
-              <el-col :span="8">
+              </el-col>
+              <el-col :span="6">
                 <el-form-item label="发货人名称">
                   <el-input v-model="DialogForm.shipperName" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="发货人邮编">
                   <el-input v-model="DialogForm.shipperPostcode" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="发货人省份">
                   <el-input v-model="DialogForm.shipperProvince" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="发货人电话">
                   <el-input v-model="DialogForm.shipperTel" />
                 </el-form-item>
@@ -483,234 +561,229 @@
             </el-row>
             <el-row class="UnitBox">
               <el-col :span="24">
-                <p><span> </span>通知人信息</p>
+                <p><span> </span>收货人信息</p>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="通知人">
-                  <el-input v-model="DialogForm.notifyParty" />
+
+              <el-col :span="6">
+                <el-form-item label="收货人地址1">
+                  <el-input v-model="DialogForm.consigneeAddrOne" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
+                <el-form-item label="收货人地址2">
+                  <el-input v-model="DialogForm.consigneeAddrSecond" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收货人地址3">
+                  <el-input v-model="DialogForm.consigneeAddrThird" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收货人联系人">
+                  <el-input v-model="DialogForm.consigneeAttn" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收货人城市">
+                  <el-input v-model="DialogForm.consigneeCity" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收货人代码">
+                  <el-input v-model="DialogForm.consigneeCode" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收货人国家">
+                  <el-input v-model="DialogForm.consigneeCountry" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收货人DOOR地址">
+                  <el-input v-model="DialogForm.consigneeDoorAddr" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收货人名称">
+                  <el-input v-model="DialogForm.consigneeName" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收货人邮编">
+                  <el-input v-model="DialogForm.consigneePostcode" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收货人省份">
+                  <el-input v-model="DialogForm.consigneeProvince" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收货人电话">
+                  <el-input v-model="DialogForm.consigneeTel" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row class="UnitBox">
+              <el-col :span="24">
+                <p><span> </span>通知人信息</p>
+              </el-col>
+
+              <el-col :span="6">
                 <el-form-item label="通知人地址1">
                   <el-input v-model="DialogForm.notifyPartyAddrOne" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="通知人地址2">
                   <el-input v-model="DialogForm.notifyPartyAddrSecond" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="通知人地址3">
                   <el-input v-model="DialogForm.notifyPartyAddrThird" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="通知人联系人">
                   <el-input v-model="DialogForm.notifyPartyAttn" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="通知人城市">
                   <el-input v-model="DialogForm.notifyPartyCity" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="通知人代码">
                   <el-input v-model="DialogForm.notifyPartyCode" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="通知人国家">
                   <el-input v-model="DialogForm.notifyPartyCountry" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="通知人名称">
                   <el-input v-model="DialogForm.notifyPartyName" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="通知人邮编">
                   <el-input v-model="DialogForm.notifyPartyPostcode" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="通知人省份">
                   <el-input v-model="DialogForm.notifyPartyProvince" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="第二通知人">
                   <el-input v-model="DialogForm.notifyPartySecond" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="通知人电话">
                   <el-input v-model="DialogForm.notifyPartyTel" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row class="UnitBox">
-              <el-col :span="24">
-                <p><span> </span>货物信息</p>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="唛头">
-                  <el-input v-model="DialogForm.marks" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="货描">
-                  <el-input v-model="DialogForm.goodsDescription" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="品名">
-                  <el-input v-model="DialogForm.goodsName" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="货物标识">
-                  <el-input v-model="DialogForm.cargoId" />
-                </el-form-item>
-              </el-col>
-            </el-row>
+
             <el-row class="UnitBox">
               <el-col :span="24">
                 <p><span> </span>签单信息</p>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="签单方式">
-                  <el-input v-model="DialogForm.issueType" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="签单地点">
-                  <el-input v-model="DialogForm.issuePlace" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="提单份数">
-                  <el-input v-model="DialogForm.billNumber" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="副本提单份数">
-                  <el-input v-model="DialogForm.copyBillNumber" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="预付地点">
-                  <el-input v-model="DialogForm.prepardat" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="到付地点">
-                  <el-input v-model="DialogForm.payableat" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="付费方式">
-                  <el-input v-model="DialogForm.blFrt" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="第三付款地">
-                  <el-input v-model="DialogForm.thirdpayAddr" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="运输条款">
-                  <el-input v-model="DialogForm.transportClause" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
+
+              <el-col :span="6">
                 <el-form-item label="湿度">
                   <el-input v-model="DialogForm.humidity" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="危险品类别">
                   <el-input v-model="DialogForm.dangerClass" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="危险品标签">
                   <el-input v-model="DialogForm.dangerLable" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="危险品联系人">
                   <el-input v-model="DialogForm.dangerLinkMan" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="危险品页号">
                   <el-input v-model="DialogForm.dangerPage" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="危险品电话">
                   <el-input v-model="DialogForm.dangerTel" />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="危险品编号">
                   <el-input v-model="DialogForm.dangerUnNo" />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-row class="UnitBox">
               <el-col :span="24">
                 <p><span> </span>船舶动态</p>
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="预计到港日期">
-                  <el-input v-model="DialogForm.eta" />
-                </el-form-item>
+              <el-col
+                :span="4"
+                class="TypeTitle"
+                :style="{ marginTop: '10px' }"
+              >
+                POL
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="实际到港">
-                  <el-input v-model="DialogForm.ata" />
-                </el-form-item>
+              <el-col :span="10" :style="{ marginTop: '10px' }">
+                ETA:{{ DialogForm.startEta }}
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="中转预计离港">
-                  <el-input v-model="DialogForm.middleEtd" />
-                </el-form-item>
+              <el-col :span="10" :style="{ marginTop: '10px' }">
+                ATA:{{ DialogForm.startAta }}
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="实际开船日期">
-                  <el-input v-model="DialogForm.atd" />
-                </el-form-item>
+              <el-col :span="4" :style="{ marginTop: '10px' }"></el-col>
+              <el-col :span="10" :style="{ marginTop: '10px' }">
+                ETD:{{ DialogForm.ygtEtd }}
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="起始港抵港">
-                  <el-input v-model="DialogForm.startAta" />
-                </el-form-item>
+              <el-col :span="10" :style="{ marginTop: '10px' }">
+                ATD:{{ DialogForm.atd }}
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="起始港预抵">
-                  <el-input v-model="DialogForm.startEta" />
-                </el-form-item>
+              <el-col
+                :span="4"
+                class="TypeTitle"
+                :style="{ marginTop: '10px' }"
+              >
+                POT
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="中转实际到港">
-                  <el-input v-model="DialogForm.middleAta" />
-                </el-form-item>
+              <el-col :span="10" :style="{ marginTop: '10px' }">
+                ATA:{{ DialogForm.middleAta }}
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="中转实际离港">
-                  <el-input v-model="DialogForm.middleAtd" />
-                </el-form-item>
+              <el-col :span="10" :style="{ marginTop: '10px' }">
+                ATD:{{ DialogForm.middleAtd }}
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="中转预抵">
-                  <el-input v-model="DialogForm.middleEta" />
-                </el-form-item>
+              <el-col
+                :span="4"
+                class="TypeTitle"
+                :style="{ marginTop: '10px' }"
+              >
+                POD
+              </el-col>
+              <el-col :span="10" :style="{ marginTop: '10px' }">
+                ETA:{{ DialogForm.eta }}
+              </el-col>
+              <el-col :span="10" :style="{ marginTop: '10px' }">
+                ATA:{{ DialogForm.ata }}
               </el-col>
             </el-row>
             <el-row class="UnitBox">
@@ -736,194 +809,180 @@
             </el-row>
           </el-col>
           <!-- ------------------------------------ -->
-          <!-- <el-col :span="8">
+          <!-- <el-col :span="6">
             <el-form-item label="集装箱">
               <el-input v-model="DialogForm.containerTotalInfo" />
             </el-form-item>
           </el-col>
+              <el-col :span="24">
+                <el-form-item label="中转预计离港">
+                  <el-input v-model="DialogForm.middleEtd" />
+                </el-form-item>
+              </el-col>
 
-          <el-col :span="8">
+              <el-col :span="24">
+                <el-form-item label="中转预抵">
+                  <el-input v-model="DialogForm.middleEta" />
+                </el-form-item>
+              </el-col>
+          <el-col :span="6">
             <el-form-item label="客户合同号">
               <el-input v-model="DialogForm.customContractNo" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="客户">
               <el-input v-model="DialogForm.customerName" />
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="EP号">
               <el-input v-model="DialogForm.epCode" />
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="境外代理">
               <el-input v-model="DialogForm.foreignAgent" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="HS代码">
-              <el-input v-model="DialogForm.hcCode" />
-            </el-form-item>
-          </el-col>
 
-          <el-col :span="8">
+
+          <el-col :span="6">
             <el-form-item label="是否订阅运踪">
               <el-input v-model="DialogForm.isBookingYz" />
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="删除标志">
               <el-input v-model="DialogForm.isDeleted" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="签单日期">
-              <el-input v-model="DialogForm.issueDate" />
-            </el-form-item>
-          </el-col>
 
-          <el-col :span="8">
+
+          <el-col :span="6">
             <el-form-item label="毛重合计">
               <el-input v-model="DialogForm.kgsTotal" />
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="箱高">
               <el-input v-model="DialogForm.limitedContainerHeight" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="箱长">
               <el-input v-model="DialogForm.limitedContainerLength" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="箱宽">
               <el-input v-model="DialogForm.limitedContainerWidth" />
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
-            <el-form-item label="航线">
-              <el-input v-model="DialogForm.lineName" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
+
+          <el-col :span="6">
             <el-form-item label="最后下货纸比对时间">
               <el-input v-model="DialogForm.lstShipOrderCompareDate" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="最后下货纸比对批次号">
               <el-input v-model="DialogForm.lstShipOrderCompareId" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="最后下货纸比对方式">
               <el-input v-model="DialogForm.lstShipOrderCompareMode" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="最后下货纸比对状态">
               <el-input v-model="DialogForm.lstShipOrderCompareRlt" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="最后下货纸比对状态名称">
               <el-input v-model="DialogForm.lstShipOrderCompareRltName" />
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="最高温度">
               <el-input v-model="DialogForm.maxTemperature" />
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="最低温度">
               <el-input v-model="DialogForm.minTemperature" />
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="件数合计">
               <el-input v-model="DialogForm.pkgsTotal" />
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
-            <el-form-item label="船代">
-              <el-input v-model="DialogForm.shipAgency" />
-            </el-form-item>
-          </el-col>
 
-          <el-col :span="8">
+
+          <el-col :span="6">
             <el-form-item label="业务来源名称">
               <el-input v-model="DialogForm.sourceName" />
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="设置温度">
               <el-input v-model="DialogForm.temperature" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="温度单位">
               <el-input v-model="DialogForm.temperatureUnit" />
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
-            <el-form-item label="件数大写">
-              <el-input v-model="DialogForm.totalNo" />
-            </el-form-item>
-          </el-col>
 
-          <el-col :span="8">
+
+          <el-col :span="6">
             <el-form-item label="真提单号">
               <el-input v-model="DialogForm.trueMblNo" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="修改人名称">
               <el-input v-model="DialogForm.updateByName" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="修改时间">
               <el-input v-model="DialogForm.updateTime" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="通风度">
               <el-input v-model="DialogForm.ventilationRate" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="版本号">
               <el-input v-model="DialogForm.version" />
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="船舶呼号">
               <el-input v-model="DialogForm.vesselNo" />
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
-            <el-form-item label="ETD">
-              <el-input v-model="DialogForm.ygtEtd" />
-            </el-form-item>
-          </el-col> -->
+          -->
         </el-row>
       </el-form>
       <!-- <template #footer>
@@ -1137,6 +1196,10 @@ export default {
         margin-right: 5px;
       }
     }
+    .TypeTitle {
+      color: #13c2c2;
+      font-weight: bolder;
+    }
   }
 }
 .BookingMain {
diff --git a/src/Views/WebC/index.vue b/src/Views/WebC/index.vue
index 4bf8c7f..6b1432a 100644
--- a/src/Views/WebC/index.vue
+++ b/src/Views/WebC/index.vue
@@ -61,12 +61,12 @@
           </el-menu>
         </el-aside>
         <el-main class="IndexMain">
-          <el-breadcrumb separator="/" class="IndexMainBreadcrumb">
+          <!-- <el-breadcrumb separator="/" class="IndexMainBreadcrumb">
             <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-            <!-- <el-breadcrumb-item :to="{ path: '/About' }">
+            <el-breadcrumb-item :to="{ path: '/About' }">
               ？？？
-            </el-breadcrumb-item> -->
-          </el-breadcrumb>
+            </el-breadcrumb-item>
+          </el-breadcrumb> -->
           <div class="IndexMainView">
             <router-view />
           </div>
@@ -152,7 +152,7 @@ export default {
     }
     .IndexMain {
       background: #e9ecf5;
-      padding: 0 20px 0 30px;
+      padding: 10px 20px 0 30px;
       box-sizing: border-box;
       .IndexMainBreadcrumb {
         padding: 12px;
diff --git a/src/store/index.js b/src/store/index.js
index 8e0b0d5..8f0b490 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -38,17 +38,12 @@ export default createStore({
         store.commit("XGetData", { Carrierlist: RData });
       });
       GetCtnlist().then((res) => {
-        let RData = [];
-        res.data.forEach((item) => {
-          item.name = item.code;
-          RData.push(item);
-        });
-        store.commit("XGetData", { Ctnlist: RData });
+        store.commit("XGetData", { Ctnlist: res.data });
       });
       Getportloadlist().then((res) => {
         let RData = [];
         res.data.forEach((item) => {
-          item.name = item.cnName;
+          item.name = item.enName;
           RData.push(item);
         });
         store.commit("XGetData", { portloadlist: RData });
@@ -72,7 +67,7 @@ export default createStore({
       Getfrtlist().then((res) => {
         let RData = [];
         res.data.forEach((item) => {
-          item.name = item.cnName;
+          item.name = item.enName;
           RData.push(item);
         });
         store.commit("XGetData", { frtlist: RData });