From f41b80c41f0d0b42e9db69a96d696c87a8830a2a Mon Sep 17 00:00:00 2001
From: lilu <lilu@myshipping.net>
Date: Wed, 4 Jan 2023 18:42:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/components/ediMore.vue             |  44 +--
 .../detail/components/sedOrder.vue            | 288 +++++++++++++-
 src/views/main/BookingLedger/detail/index.vue | 358 ++++++++++++------
 .../detail/modules/basicInfo.vue              |  64 ++--
 .../BookingLedger/detail/modules/billInfo.vue |  56 +--
 .../detail/modules/cargoInfo.vue              |  29 +-
 .../detail/modules/goodsTable.vue             |   6 +-
 .../detail/modules/mailingInfo.vue            |  47 +--
 .../detail/modules/remarksInfo.vue            |  22 +-
 .../detail/modules/rightContent.vue           |  30 +-
 10 files changed, 667 insertions(+), 277 deletions(-)

diff --git a/src/views/main/BookingLedger/detail/components/ediMore.vue b/src/views/main/BookingLedger/detail/components/ediMore.vue
index f379693..dafe701 100644
--- a/src/views/main/BookingLedger/detail/components/ediMore.vue
+++ b/src/views/main/BookingLedger/detail/components/ediMore.vue
@@ -282,37 +282,17 @@ export default {
       default: () => {
         return {}
       }
+    },
+    rules: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   data() {
     return {
-      iscontainersoc: '',
-      rules: {
-        // 'bookingEDIExt.sendCode': [ { required: true, message: '请输入发送方EDI代码', trigger: 'blur' } ],
-        // 'bookingEDIExt.receiveCode': [ { required: true, message: '请输入接收方EDI代码', trigger: 'blur' } ],
-        // 'bookingEDIExt.notifyCdoe': [ { required: true, message: '请输入通知方EDI代码', trigger: 'blur' } ],
-        // 'bookingEDIExt.salerCode': [ { required: true, message: '请输入销售EDI代码', trigger: 'blur' } ],
-        // 'bookingEDIExt.masterBolIndicator': [ { required: true, message: '请输入Master Bol Indicator', trigger: 'blur' } ],
-        // 'bookingEDIExt.emanifestHbl': [ { required: true, message: '请输入EMANIFEST HBL', trigger: 'blur' } ],
-        // 'bookingEDIExt.consigneeEdiCode': [ { required: true, message: '请输入收货人EDI代码', trigger: 'blur' } ],
-        // 'bookingEDIExt.shipperEdiCode': [ { required: true, message: '请输入发货人EDI代码', trigger: 'blur' } ],
-        // 'bookingEDIExt.ediAttn': [ { required: true, message: '请输入EDI联系人名称', trigger: 'blur' } ],
-        // 'bookingEDIExt.ediAttnTel': [ { required: true, message: '请输入EDI联系人电话', trigger: 'blur' } ],
-        // 'bookingEDIExt.ediAttnMail': [ { required: true, message: '请输入EDI联系人邮箱', trigger: 'blur' } ],
-        // 'bookingEDIExt.amsConsignee': [ { required: true, message: '请输入AMS收货人', trigger: 'blur' } ],
-        // 'bookingEDIExt.amsNotifyParty': [ { required: true, message: '请输入AMS通知人', trigger: 'blur' } ],
-        // 'bookingEDIExt.opEName': [ { required: true, message: '请输入操作英文名称', trigger: 'blur' } ],
-        // 'bookingEDIExt.opTel': [ { required: true, message: '请输入操作电话', trigger: 'blur' } ],
-        // 'bookingEDIExt.opEmail': [ { required: true, message: '请输入操作邮箱', trigger: 'blur' } ],
-        // 'bookingEDIExt.acihbl': [ { required: true, message: '请输入ACI HBL', trigger: 'blur' } ],
-        // 'bookingEDIExt.s0CC0C': [ { required: true, message: '请输入S0C C0C', trigger: 'blur' } ],
-        // 'bookingEDIExt.goodsName': [ { required: true, message: '请输入商品名称', trigger: 'blur' } ],
-        // 'iscontainersoc': [ { required: true, message: '请输入SOC箱', trigger: 'blur' } ],
-        // 'scaccode': [ { required: true, message: '请输入SCAC代码', trigger: 'blur' } ],
-        // 'itncode': [ { required: true, message: '请输入ITN编号', trigger: 'blur' } ],
-        // 'freightpayer': [ { required: true, message: '请输入付款方', trigger: 'blur' } ],
-        // 'bookingEDIExt.weiTuoFang': [ { required: true, message: '请输入委托方', trigger: 'blur' } ],
-      }
+      iscontainersoc: ''
     }
   },
   watch: {
@@ -355,6 +335,16 @@ export default {
   }
 }
 </script>
+<style lang="less" scoped>
+
+/deep/ .ant-form-explain{
+  display: none !important;
+}
+
+/deep/ .ant-form-item-children-icon .anticon-check-circle{
+  display: none;
+}
+</style>
 <style lang="less">
 .more-edi {
   padding: 60px 20px;
diff --git a/src/views/main/BookingLedger/detail/components/sedOrder.vue b/src/views/main/BookingLedger/detail/components/sedOrder.vue
index 21ce60b..86c0cce 100644
--- a/src/views/main/BookingLedger/detail/components/sedOrder.vue
+++ b/src/views/main/BookingLedger/detail/components/sedOrder.vue
@@ -30,26 +30,28 @@
             <i class="iconfont icon-dingdan"></i> 当前分单号： <span>{{ editDetails.hblno }}</span>
           </div>
           <sedOperationArea :details="editDetails" @save="saveFun" @copy="copyFun"></sedOperationArea>
-          <a-tabs type="card">
+          <a-tabs type="card" :activeKey="mainOrderActiveKey" @change="changeMainTab">
             <a-tab-pane key="1" tab="基础信息">
               <div class="pane-box">
                 <!-- 基本信息 -->
-                <basicInfo :type="type" :details="editDetails" :ishd="true" @changeDetail="changeDetailFun"></basicInfo>
+                <basicInfo ref="basicInfo" :type="type" :details="editDetails" :rules="basicRules" :ishd="true" @changeDetail="changeDetailFun"></basicInfo>
                 <!-- 收发通信息 -->
-                <mailingInfo :details="editDetails" @changeDetail="changeDetailFun" @pkgsEnCapital="pkgsEnCapitalFun"></mailingInfo>
+                <mailingInfo ref="mailingInfo" :details="editDetails" :rules="mailingRules" @changeDetail="changeDetailFun" @pkgsEnCapital="pkgsEnCapitalFun"></mailingInfo>
                 <!-- 货物信息 -->
-                <cargoInfo :details="editDetails" @changeDetail="changeDetailFun"></cargoInfo>
+                <cargoInfo ref="cargoInfo" :details="editDetails" :rules="cargoRules" @changeDetail="changeDetailFun"></cargoInfo>
                 <!-- 签单信息 -->
-                <billInfo :details="editDetails" @changeDetail="changeDetailFun"></billInfo>
+                <billInfo ref="billInfo" :details="editDetails" :rules="billRules" @changeDetail="changeDetailFun"></billInfo>
                 <!-- 备注信息 -->
-                <remarksInfo :details="editDetails" @changeDetail="changeDetailFun"></remarksInfo>
+                <remarksInfo ref="remarksInfo" :details="editDetails" :rules="remarksRules" @changeDetail="changeDetailFun"></remarksInfo>
                 <!-- 箱型 -->
-                <goodsTable :details="editDetails" @changeDetail="changeDetailFun"></goodsTable>
+                <goodsTable ref="goodsTable" :details="editDetails" @changeDetail="changeDetailFun"></goodsTable>
               </div>
             </a-tab-pane>
             <a-tab-pane key="2" tab="EDI补充信息">
               <ediMore
                 class="pane-box"
+                ref="ediMore"
+                :rules="ediRules"
                 :details="editDetails"
                 @changeDetail="changeDetailFun"
                 v-if="!inPageLoading"
@@ -97,6 +99,12 @@ export default {
       default: () => {
         return {}
       }
+    },
+    checkFrom: {
+      type: Array,
+      default: () => {
+        return []
+      }
     }
   },
   components: {
@@ -118,7 +126,120 @@ export default {
       editDetails: null,
       editIndex: 0,
       showSecNav: true,
-      inSecLoad: false
+      inSecLoad: false,
+      mainOrderActiveKey: '1',
+      basicRules: {
+        customername: [ { required: false, message: '请选择客户名', trigger: 'change' } ],
+        mblno: [{ required: false, message: '请输入提单号', trigger: 'change' }],
+        carrierid: [{ required: false, message: '请选择船公司', trigger: 'change' }],
+        forwarder: [{ required: false, message: '请输入订舱代理', trigger: 'change' }],
+        pono: [{ required: false, message: '请输入PO NO', trigger: 'change' }],
+        hblno: [{ required: false, message: '请输入分提单号', trigger: 'change' }],
+        bookingno: [{ required: false, message: '请输入订舱编号', trigger: 'change' }],
+        contractno: [{ required: false, message: '请输入EP号/约号', trigger: 'change' }],
+        vessel: [{ required: false, message: '请输入船名', trigger: 'change' }],
+        lanecode: [{ required: false, message: '请输入航线代码', trigger: 'change' }],
+        voynoinner: [{ required: false, message: '请输入内部航次', trigger: 'change' }],
+        voyno: [{ required: false, message: '请输入海关航次', trigger: 'change' }],
+        etd: [{ required: false, message: '请选择开船日期', trigger: 'change' }],
+        atd: [{ required: false, message: '请选择实际开船日期', trigger: 'change' }],
+        lanename: [{ required: false, message: '请输入航线', trigger: 'change' }],
+        shipagency: [{ required: false, message: '请输入船代', trigger: 'change' }],
+        sale: [{ required: false, message: '请选择销售人员', trigger: 'change' }],
+        op: [{ required: false, message: '请选择操作人员', trigger: 'change' }],
+        doc: [{ required: false, message: '请选择单证人员', trigger: 'change' }],
+        custservice: [{ required: false, message: '请选择客服人员', trigger: 'change' }]
+      },
+      mailingRules: {
+        shipper: [ { required: false, message: '请输入发货人', trigger: 'change' } ],
+        consignee: [ { required: false, message: '请输入收货人', trigger: 'change' } ],
+        notifyparty: [ { required: false, message: '请输入通知人', trigger: 'change' } ],
+        yard: [ { required: false, message: '请输入场站', trigger: 'change' } ],
+        customser: [ { required: false, message: '请输入报关行', trigger: 'change' } ],
+        trucker: [ { required: false, message: '请输入车队', trigger: 'change' } ],
+        agentid: [ { required: false, message: '请输入国外代理', trigger: 'change' } ],
+        eta: [ { required: false, message: '请选择预抵日期', trigger: 'change' } ],
+        closingdate: [ { required: false, message: '请选择截港时间', trigger: 'change' } ],
+        closedocdate: [ { required: false, message: '请选择截单时间', trigger: 'change' } ],
+        closevgmdate: [ { required: false, message: '请选择VGM时间', trigger: 'change' } ],
+        placereceiptid: [ { required: false, message: '请选择收货代码', trigger: 'change' } ],
+        placereceipt: [ { required: false, message: '请选择收货地', trigger: 'change' } ],
+        portloadid: [ { required: false, message: '请选择装货港代码', trigger: 'change' } ],
+        portload: [ { required: false, message: '请选择装货港', trigger: 'change' } ],
+        transportid: [ { required: false, message: '请选择中转港代码', trigger: 'change' } ],
+        transport: [ { required: false, message: '请选择中转港', trigger: 'change' } ],
+        portdischargeid: [ { required: false, message: '请选择卸货港代码', trigger: 'change' } ],
+        portdischarge: [ { required: false, message: '请选择卸货港', trigger: 'change' } ],
+        destinationid: [ { required: false, message: '请选择目的代码', trigger: 'change' } ],
+        destination: [ { required: false, message: '请选择目的地', trigger: 'change' } ],
+        placedeliveryid: [ { required: false, message: '请选择交货代码', trigger: 'change' } ],
+        placedelivery: [ { required: false, message: '请选择交货地', trigger: 'change' } ],
+        pkgs: [ { required: false, message: '请输入件数', trigger: 'change' } ],
+        kindpkgs: [ { required: false, message: '请输入包装', trigger: 'change' } ],
+        kgs: [ { required: false, message: '请输入毛重', trigger: 'change' } ],
+        cbm: [ { required: false, message: '请输入尺寸', trigger: 'change' } ],
+      },
+      cargoRules: {
+        marks: [ { required: false, message: '请输入Seal No.  Marks & Nos', trigger: 'change' } ],
+        cargoid: [ { required: false, message: '请选择货物标志', trigger: 'change' } ],
+        hscode: [ { required: false, message: '请输入HS编码', trigger: 'change' } ],
+        description: [ { required: false, message: '请输入包装种类与货名', trigger: 'change' } ]
+      },
+      billRules: {
+        issuetype: [ { required: false, message: '请选择签单方式', trigger: 'change' } ],
+        issuedate: [ { required: false, message: '请选择签单日期', trigger: 'change' } ],
+        // issueplace: [ { required: false, message: '请选择签单地点', trigger: 'change' } ],
+        issueplaceid: [ { required: false, message: '请输入签单地代码', trigger: 'change' } ],
+        nobill: [ { required: false, message: '请选择提单份数', trigger: 'change' } ],
+        copynobilll: [ { required: false, message: '请选择副本份数', trigger: 'change' } ],
+        prepardat: [ { required: false, message: '请选择预付地点', trigger: 'change' } ],
+        payableat: [ { required: false, message: '请选择到付地点', trigger: 'change' } ],
+        blfrt: [ { required: false, message: '请选择付费方式', trigger: 'change' } ],
+        thirdpayaddr: [ { required: false, message: '请输入第三付款地', trigger: 'change' } ],
+        service: [ { required: false, message: '请选择运输条款', trigger: 'change' } ],
+        reeferf: [ { required: false, message: '请输入冷藏通风量', trigger: 'change' } ],
+        tempset: [ { required: false, message: '请输入温度', trigger: 'change' } ],
+        tempid: [ { required: false, message: '请选择温度单位', trigger: 'change' } ],
+        tempmin: [ { required: false, message: '请输入最低温度', trigger: 'change' } ],
+        tempmax: [ { required: false, message: '请输入最高温度', trigger: 'change' } ],
+        humidity: [ { required: false, message: '请输入湿度', trigger: 'change' } ],
+        dclass: [ { required: false, message: '请输入危险品等级', trigger: 'change' } ],
+        dunno: [ { required: false, message: '请输入危险品编号', trigger: 'change' } ],
+        dpage: [ { required: false, message: '请输入危险品页号', trigger: 'change' } ],
+        dlabel: [ { required: false, message: '请输入危险品标签', trigger: 'change' } ],
+        linkman: [ { required: false, message: '请输入危险品联系人', trigger: 'change' } ],
+      },
+      remarksRules: {
+        soremark: [ { required: false, message: '请输入订舱备注', trigger: 'change' } ],
+        siremark: [ { required: false, message: '请输入截单备注', trigger: 'change' } ],
+      },
+      ediRules: {
+        'bookingEDIExt.sendCode': [ { required: false, message: '请输入发送方EDI代码', trigger: 'change' } ],
+        'bookingEDIExt.receiveCode': [ { required: false, message: '请输入接收方EDI代码', trigger: 'change' } ],
+        'bookingEDIExt.notifyCdoe': [ { required: false, message: '请输入通知方EDI代码', trigger: 'change' } ],
+        'bookingEDIExt.salerCode': [ { required: false, message: '请输入销售EDI代码', trigger: 'change' } ],
+        'bookingEDIExt.masterBolIndicator': [ { required: false, message: '请输入Master Bol Indicator', trigger: 'change' } ],
+        'bookingEDIExt.emanifestHbl': [ { required: false, message: '请输入EMANIFEST HBL', trigger: 'change' } ],
+        'bookingEDIExt.consigneeEdiCode': [ { required: false, message: '请输入收货人EDI代码', trigger: 'change' } ],
+        'bookingEDIExt.shipperEdiCode': [ { required: false, message: '请输入发货人EDI代码', trigger: 'change' } ],
+        'bookingEDIExt.ediAttn': [ { required: false, message: '请输入EDI联系人名称', trigger: 'change' } ],
+        'bookingEDIExt.ediAttnTel': [ { required: false, message: '请输入EDI联系人电话', trigger: 'change' } ],
+        'bookingEDIExt.ediAttnMail': [ { required: false, message: '请输入EDI联系人邮箱', trigger: 'change' } ],
+        'bookingEDIExt.amsConsignee': [ { required: false, message: '请输入AMS收货人', trigger: 'change' } ],
+        'bookingEDIExt.amsNotifyParty': [ { required: false, message: '请输入AMS通知人', trigger: 'change' } ],
+        'bookingEDIExt.opEName': [ { required: false, message: '请输入操作英文名称', trigger: 'change' } ],
+        'bookingEDIExt.opTel': [ { required: false, message: '请输入操作电话', trigger: 'change' } ],
+        'bookingEDIExt.opEmail': [ { required: false, message: '请输入操作邮箱', trigger: 'change' } ],
+        'bookingEDIExt.acihbl': [ { required: false, message: '请输入ACI HBL', trigger: 'change' } ],
+        'bookingEDIExt.s0CC0C': [ { required: false, message: '请输入S0C C0C', trigger: 'change' } ],
+        'bookingEDIExt.goodsName': [ { required: false, message: '请输入商品名称', trigger: 'change' } ],
+        'iscontainersoc': [ { required: false, message: '请输入SOC箱', trigger: 'change' } ],
+        'scaccode': [ { required: false, message: '请输入SCAC代码', trigger: 'change' } ],
+        'itncode': [ { required: false, message: '请输入ITN编号', trigger: 'change' } ],
+        'freightpayer': [ { required: false, message: '请输入付款方', trigger: 'change' } ],
+        'bookingEDIExt.weiTuoFang': [ { required: false, message: '请输入委托方', trigger: 'change' } ],
+      },
+      hasEdiRules: false
     }
   },
   watch: {
@@ -155,7 +276,15 @@ export default {
       immediate: true,
       handler(nD, oD) {
         this.id = this.$route.query.id
+        // this.$refs.basicInfo.$refs.basicFrom.clearValidate()
+        // this.$refs.mailingInfo.$refs.mailingFrom.clearValidate()
+        // this.$refs.cargoInfo.$refs.cargoFrom.clearValidate()
+        // this.$refs.billInfo.$refs.billFrom.clearValidate()
+        // this.$refs.remarksInfo.$refs.remarkFrom.clearValidate()
       }
+    },
+    checkFrom (nval, oval) {
+      this.checkFromInit()
     }
   },
   created() {
@@ -177,11 +306,46 @@ export default {
     }
   },
   mounted() {
+    this.checkFromInit()
     // setTimeout(() => {
     //   this.$message.destroy()
     // }, 1500)
   },
   methods: {
+    checkFromInit () {
+      Object.keys(this.basicRules).map((item, index) => {
+        if (this.checkFrom.includes(item)) {
+          this.basicRules[item][0].required = true
+        }
+      })
+      Object.keys(this.mailingRules).map((item, index) => {
+        if (this.checkFrom.includes(item)) {
+          this.mailingRules[item][0].required = true
+        }
+      })
+      Object.keys(this.cargoRules).map((item, index) => {
+        if (this.checkFrom.includes(item)) {
+          this.cargoRules[item][0].required = true
+        }
+      })
+      Object.keys(this.billRules).map((item, index) => {
+        if (this.checkFrom.includes(item)) {
+          this.billRules[item][0].required = true
+        }
+      })
+      Object.keys(this.remarksRules).map((item, index) => {
+        if (this.checkFrom.includes(item)) {
+          this.remarksRules[item][0].required = true
+        }
+      })
+      Object.keys(this.ediRules).map((item, index) => {
+        if (this.checkFrom.includes(item)) {
+          this.ediRules[item][0].required = true
+          // this.hasEdiRules = true
+        }
+      })
+      this.$forceUpdate()
+    },
     addSedOrder() {
       if (this.isAdd) {
         this.$message.error('请先保存主单')
@@ -263,8 +427,59 @@ export default {
         this.$message.error('请输入分提单号')
         return false
       }
+      // 自定义必填项验证 - start
+      let basicFrom = true
+      this.$refs.basicInfo.$refs.basicFrom.validate(valid => {
+        basicFrom = valid
+      })
+      let mailingFrom = true
+      this.$refs.mailingInfo.$refs.mailingFrom.validate(valid => {
+        mailingFrom = valid
+      })
+      let cargoFrom = true
+      this.$refs.cargoInfo.$refs.cargoFrom.validate(valid => {
+        cargoFrom = valid
+      })
+      let billFrom = true
+      this.$refs.billInfo.$refs.billFrom.validate(valid => {
+        billFrom = valid
+      })
+      let remarksFrom = true
+      this.$refs.remarksInfo.$refs.remarkFrom.validate(valid => {
+        remarksFrom = valid
+      })
+      if (!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) {
+        this.$message.error('请填写完整数据')
+        return false
+      }
+      if (this.$refs.ediMore) {
+        let ediFrom = true
+        this.$refs.ediMore.$refs.ediFrom.validate(valid => {
+          ediFrom = valid
+        })
+        if (!ediFrom) {
+          this.mainOrderActiveKey = '2'
+          this.$message.error('请填写完整EDI数据')
+          return false
+        }
+      } else {
+        // edi 初始数据验证
+        Object.keys(this.ediRules).map((item, index) => {
+          console.log(this.editDetails[item.split('.')[0]][item.split('.')[1]])
+          if (this.checkFrom.includes(item) && !this.editDetails[item.split('.')[0]][item.split('.')[1]]) {
+            this.hasEdiRules = true
+          }
+        })
+        if (this.hasEdiRules) {
+          this.mainOrderActiveKey = '2'
+          this.$message.error('请填写完整EDI数据')
+          return false
+        }
+      }
+      // 自定义必填项验证 - end
       let data = JSON.parse(JSON.stringify(this.editDetails))
       delete data.isNoSave
+      data.parentId = this.$route.query.id
       BookingOrderUpdate(data)
         .then(res => {
           if (res.success) {
@@ -287,9 +502,59 @@ export default {
         this.$message.error('请输入分提单号')
         return false
       }
+      // 自定义必填项验证 - start
+      let basicFrom = true
+      this.$refs.basicInfo.$refs.basicFrom.validate(valid => {
+        basicFrom = valid
+      })
+      let mailingFrom = true
+      this.$refs.mailingInfo.$refs.mailingFrom.validate(valid => {
+        mailingFrom = valid
+      })
+      let cargoFrom = true
+      this.$refs.cargoInfo.$refs.cargoFrom.validate(valid => {
+        cargoFrom = valid
+      })
+      let billFrom = true
+      this.$refs.billInfo.$refs.billFrom.validate(valid => {
+        billFrom = valid
+      })
+      let remarksFrom = true
+      this.$refs.remarksInfo.$refs.remarkFrom.validate(valid => {
+        remarksFrom = valid
+      })
+      if (!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) {
+        this.$message.error('请填写完整数据')
+        return false
+      }
+      if (this.$refs.ediMore) {
+        let ediFrom = true
+        this.$refs.ediMore.$refs.ediFrom.validate(valid => {
+          ediFrom = valid
+        })
+        if (!ediFrom) {
+          this.mainOrderActiveKey = '2'
+          this.$message.error('请填写完整EDI数据')
+          return false
+        }
+      } else {
+        // edi 初始数据验证
+        Object.keys(this.ediRules).map((item, index) => {
+          console.log(this.editDetails[item.split('.')[0]][item.split('.')[1]])
+          if (this.checkFrom.includes(item) && !this.editDetails[item.split('.')[0]][item.split('.')[1]]) {
+            this.hasEdiRules = true
+          }
+        })
+        if (this.hasEdiRules) {
+          this.mainOrderActiveKey = '2'
+          this.$message.error('请填写完整EDI数据')
+          return false
+        }
+      }
+      // 自定义必填项验证 - end
       let data = JSON.parse(JSON.stringify(this.editDetails))
       delete data.isNoSave
-      data.parentid = this.$route.query.id
+      data.parentId = this.$route.query.id
       data.id = 0
       data.ctnInputs.map((item, index) => {
         item.id = 0
@@ -357,7 +622,10 @@ export default {
     },
     pkgsEnCapitalFun (data) {
       this.editDetails.totalno = data
-    }
+    },
+    changeMainTab (e) {
+      this.mainOrderActiveKey = e
+    },
   }
 }
 </script>
diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue
index f6f5935..e313ede 100644
--- a/src/views/main/BookingLedger/detail/index.vue
+++ b/src/views/main/BookingLedger/detail/index.vue
@@ -21,7 +21,7 @@
                 @copy="copyBookingFun"
                 @addSedList="addSedList"
               ></operationArea>
-              <a-tabs type="card">
+              <a-tabs type="card" :activeKey="mainOrderActiveKey" @change="changeMainTab">
                 <a-tab-pane key="1-1" tab="基础信息">
                   <div class="pane-box">
                     <!-- 基本信息 -->
@@ -87,6 +87,7 @@
           :details="bookingDetails"
           :sedOrderList="bookingDetails.hbList"
           :isAdd="isAdd"
+          :checkFrom="checkFrom"
           @changeHB="changeHBFun"
         ></sedOrder>
       </a-tab-pane>
@@ -256,117 +257,119 @@ export default {
       inChildLoading: false,
       scrollTop: 0,
       checkFrom: [],
+      mainOrderActiveKey: '1-1',
       basicRules: {
-        customername: [ { required: false, message: '请选择客户名', trigger: 'blur' } ],
-        mblno: [{ required: false, message: '请输入提单号', trigger: 'blur' }],
-        carrierid: [{ required: false, message: '请选择船公司', trigger: 'blur' }],
-        forwarder: [{ required: false, message: '请输入订舱代理', trigger: 'blur' }],
-        pono: [{ required: false, message: '请输入PO NO', trigger: 'blur' }],
-        hblno: [{ required: false, message: '请输入分提单号', trigger: 'blur' }],
-        bookingno: [{ required: false, message: '请输入订舱编号', trigger: 'blur' }],
-        contractno: [{ required: false, message: '请输入EP号/约号', trigger: 'blur' }],
-        vessel: [{ required: false, message: '请输入船名', trigger: 'blur' }],
-        lanecode: [{ required: false, message: '请输入航线代码', trigger: 'blur' }],
-        voynoinner: [{ required: false, message: '请输入内部航次', trigger: 'blur' }],
-        voyno: [{ required: false, message: '请输入海关航次', trigger: 'blur' }],
-        etd: [{ required: false, message: '请选择开船日期', trigger: 'blur' }],
-        atd: [{ required: false, message: '请选择实际开船日期', trigger: 'blur' }],
-        lanename: [{ required: false, message: '请输入航线', trigger: 'blur' }],
-        shipagency: [{ required: false, message: '请输入船代', trigger: 'blur' }],
-        sale: [{ required: false, message: '请选择销售人员', trigger: 'blur' }],
-        op: [{ required: false, message: '请选择操作人员', trigger: 'blur' }],
-        doc: [{ required: false, message: '请选择单证人员', trigger: 'blur' }],
-        custservice: [{ required: false, message: '请选择客服人员', trigger: 'blur' }]
+        customername: [ { required: false, message: '请选择客户名', trigger: 'change' } ],
+        mblno: [{ required: false, message: '请输入提单号', trigger: 'change' }],
+        carrierid: [{ required: false, message: '请选择船公司', trigger: 'change' }],
+        forwarder: [{ required: false, message: '请输入订舱代理', trigger: 'change' }],
+        pono: [{ required: false, message: '请输入PO NO', trigger: 'change' }],
+        hblno: [{ required: false, message: '请输入分提单号', trigger: 'change' }],
+        bookingno: [{ required: false, message: '请输入订舱编号', trigger: 'change' }],
+        contractno: [{ required: false, message: '请输入EP号/约号', trigger: 'change' }],
+        vessel: [{ required: false, message: '请输入船名', trigger: 'change' }],
+        lanecode: [{ required: false, message: '请输入航线代码', trigger: 'change' }],
+        voynoinner: [{ required: false, message: '请输入内部航次', trigger: 'change' }],
+        voyno: [{ required: false, message: '请输入海关航次', trigger: 'change' }],
+        etd: [{ required: false, message: '请选择开船日期', trigger: 'change' }],
+        atd: [{ required: false, message: '请选择实际开船日期', trigger: 'change' }],
+        lanename: [{ required: false, message: '请输入航线', trigger: 'change' }],
+        shipagency: [{ required: false, message: '请输入船代', trigger: 'change' }],
+        sale: [{ required: false, message: '请选择销售人员', trigger: 'change' }],
+        op: [{ required: false, message: '请选择操作人员', trigger: 'change' }],
+        doc: [{ required: false, message: '请选择单证人员', trigger: 'change' }],
+        custservice: [{ required: false, message: '请选择客服人员', trigger: 'change' }]
       },
       mailingRules: {
-        shipper: [ { required: false, message: '请输入发货人', trigger: 'blur' } ],
-        consignee: [ { required: false, message: '请输入收货人', trigger: 'blur' } ],
-        notifyparty: [ { required: false, message: '请输入通知人', trigger: 'blur' } ],
-        yard: [ { required: false, message: '请输入场站', trigger: 'blur' } ],
-        customser: [ { required: false, message: '请输入报关行', trigger: 'blur' } ],
-        trucker: [ { required: false, message: '请输入车队', trigger: 'blur' } ],
-        agentid: [ { required: false, message: '请输入国外代理', trigger: 'blur' } ],
-        eta: [ { required: false, message: '请选择预抵日期', trigger: 'blur' } ],
-        closingdate: [ { required: false, message: '请选择截港时间', trigger: 'blur' } ],
-        closedocdate: [ { required: false, message: '请选择截单时间', trigger: 'blur' } ],
-        closevgmdate: [ { required: false, message: '请选择VGM时间', trigger: 'blur' } ],
-        placereceiptid: [ { required: false, message: '请选择收货代码', trigger: 'blur' } ],
-        placereceipt: [ { required: false, message: '请选择收货地', trigger: 'blur' } ],
-        portloadid: [ { required: false, message: '请选择装货港代码', trigger: 'blur' } ],
-        portload: [ { required: false, message: '请选择装货港', trigger: 'blur' } ],
-        transportid: [ { required: false, message: '请选择中转港代码', trigger: 'blur' } ],
-        transport: [ { required: false, message: '请选择中转港', trigger: 'blur' } ],
-        portdischargeid: [ { required: false, message: '请选择卸货港代码', trigger: 'blur' } ],
-        portdischarge: [ { required: false, message: '请选择卸货港', trigger: 'blur' } ],
-        destinationid: [ { required: false, message: '请选择目的代码', trigger: 'blur' } ],
-        destination: [ { required: false, message: '请选择目的地', trigger: 'blur' } ],
-        placedeliveryid: [ { required: false, message: '请选择交货代码', trigger: 'blur' } ],
-        placedelivery: [ { required: false, message: '请选择交货地', trigger: 'blur' } ],
-        pkgs: [ { required: false, message: '请输入件数', trigger: 'blur' } ],
-        kindpkgs: [ { required: false, message: '请输入包装', trigger: 'blur' } ],
-        kgs: [ { required: false, message: '请输入毛重', trigger: 'blur' } ],
-        cbm: [ { required: false, message: '请输入尺寸', trigger: 'blur' } ],
+        shipper: [ { required: false, message: '请输入发货人', trigger: 'change' } ],
+        consignee: [ { required: false, message: '请输入收货人', trigger: 'change' } ],
+        notifyparty: [ { required: false, message: '请输入通知人', trigger: 'change' } ],
+        yard: [ { required: false, message: '请输入场站', trigger: 'change' } ],
+        customser: [ { required: false, message: '请输入报关行', trigger: 'change' } ],
+        trucker: [ { required: false, message: '请输入车队', trigger: 'change' } ],
+        agentid: [ { required: false, message: '请输入国外代理', trigger: 'change' } ],
+        eta: [ { required: false, message: '请选择预抵日期', trigger: 'change' } ],
+        closingdate: [ { required: false, message: '请选择截港时间', trigger: 'change' } ],
+        closedocdate: [ { required: false, message: '请选择截单时间', trigger: 'change' } ],
+        closevgmdate: [ { required: false, message: '请选择VGM时间', trigger: 'change' } ],
+        placereceiptid: [ { required: false, message: '请选择收货代码', trigger: 'change' } ],
+        placereceipt: [ { required: false, message: '请选择收货地', trigger: 'change' } ],
+        portloadid: [ { required: false, message: '请选择装货港代码', trigger: 'change' } ],
+        portload: [ { required: false, message: '请选择装货港', trigger: 'change' } ],
+        transportid: [ { required: false, message: '请选择中转港代码', trigger: 'change' } ],
+        transport: [ { required: false, message: '请选择中转港', trigger: 'change' } ],
+        portdischargeid: [ { required: false, message: '请选择卸货港代码', trigger: 'change' } ],
+        portdischarge: [ { required: false, message: '请选择卸货港', trigger: 'change' } ],
+        destinationid: [ { required: false, message: '请选择目的代码', trigger: 'change' } ],
+        destination: [ { required: false, message: '请选择目的地', trigger: 'change' } ],
+        placedeliveryid: [ { required: false, message: '请选择交货代码', trigger: 'change' } ],
+        placedelivery: [ { required: false, message: '请选择交货地', trigger: 'change' } ],
+        pkgs: [ { required: false, message: '请输入件数', trigger: 'change' } ],
+        kindpkgs: [ { required: false, message: '请输入包装', trigger: 'change' } ],
+        kgs: [ { required: false, message: '请输入毛重', trigger: 'change' } ],
+        cbm: [ { required: false, message: '请输入尺寸', trigger: 'change' } ],
       },
       cargoRules: {
-        marks: [ { required: false, message: '请输入Seal No.  Marks & Nos', trigger: 'blur' } ],
-        cargoid: [ { required: false, message: '请选择货物标志', trigger: 'blur' } ],
-        hscode: [ { required: false, message: '请输入HS编码', trigger: 'blur' } ],
-        description: [ { required: false, message: '请输入包装种类与货名', trigger: 'blur' } ]
+        marks: [ { required: false, message: '请输入Seal No.  Marks & Nos', trigger: 'change' } ],
+        cargoid: [ { required: false, message: '请选择货物标志', trigger: 'change' } ],
+        hscode: [ { required: false, message: '请输入HS编码', trigger: 'change' } ],
+        description: [ { required: false, message: '请输入包装种类与货名', trigger: 'change' } ]
       },
       billRules: {
-        issuetype: [ { required: false, message: '请选择签单方式', trigger: 'blur' } ],
-        issuedate: [ { required: false, message: '请选择签单日期', trigger: 'blur' } ],
-        issueplace: [ { required: false, message: '请选择签单地点', trigger: 'blur' } ],
-        issueplaceid: [ { required: false, message: '请输入签单地代码', trigger: 'blur' } ],
-        nobill: [ { required: false, message: '请选择提单份数', trigger: 'blur' } ],
-        copynobilll: [ { required: false, message: '请选择副本份数', trigger: 'blur' } ],
-        prepardat: [ { required: false, message: '请选择预付地点', trigger: 'blur' } ],
-        payableat: [ { required: false, message: '请选择到付地点', trigger: 'blur' } ],
-        blfrt: [ { required: false, message: '请选择付费方式', trigger: 'blur' } ],
-        thirdpayaddr: [ { required: false, message: '请输入第三付款地', trigger: 'blur' } ],
-        service: [ { required: false, message: '请选择运输条款', trigger: 'blur' } ],
-        reeferf: [ { required: false, message: '请输入冷藏通风量', trigger: 'blur' } ],
-        tempset: [ { required: false, message: '请输入温度', trigger: 'blur' } ],
-        tempid: [ { required: false, message: '请选择温度单位', trigger: 'blur' } ],
-        tempmin: [ { required: false, message: '请输入最低温度', trigger: 'blur' } ],
-        tempmax: [ { required: false, message: '请输入最高温度', trigger: 'blur' } ],
-        humidity: [ { required: false, message: '请输入湿度', trigger: 'blur' } ],
-        dclass: [ { required: false, message: '请输入危险品等级', trigger: 'blur' } ],
-        dunno: [ { required: false, message: '请输入危险品编号', trigger: 'blur' } ],
-        dpage: [ { required: false, message: '请输入危险品页号', trigger: 'blur' } ],
-        dlabel: [ { required: false, message: '请输入危险品标签', trigger: 'blur' } ],
-        linkman: [ { required: false, message: '请输入危险品联系人', trigger: 'blur' } ],
+        issuetype: [ { required: false, message: '请选择签单方式', trigger: 'change' } ],
+        issuedate: [ { required: false, message: '请选择签单日期', trigger: 'change' } ],
+        // issueplace: [ { required: false, message: '请选择签单地点', trigger: 'change' } ],
+        issueplaceid: [ { required: false, message: '请输入签单地代码', trigger: 'change' } ],
+        nobill: [ { required: false, message: '请选择提单份数', trigger: 'change' } ],
+        copynobilll: [ { required: false, message: '请选择副本份数', trigger: 'change' } ],
+        prepardat: [ { required: false, message: '请选择预付地点', trigger: 'change' } ],
+        payableat: [ { required: false, message: '请选择到付地点', trigger: 'change' } ],
+        blfrt: [ { required: false, message: '请选择付费方式', trigger: 'change' } ],
+        thirdpayaddr: [ { required: false, message: '请输入第三付款地', trigger: 'change' } ],
+        service: [ { required: false, message: '请选择运输条款', trigger: 'change' } ],
+        reeferf: [ { required: false, message: '请输入冷藏通风量', trigger: 'change' } ],
+        tempset: [ { required: false, message: '请输入温度', trigger: 'change' } ],
+        tempid: [ { required: false, message: '请选择温度单位', trigger: 'change' } ],
+        tempmin: [ { required: false, message: '请输入最低温度', trigger: 'change' } ],
+        tempmax: [ { required: false, message: '请输入最高温度', trigger: 'change' } ],
+        humidity: [ { required: false, message: '请输入湿度', trigger: 'change' } ],
+        dclass: [ { required: false, message: '请输入危险品等级', trigger: 'change' } ],
+        dunno: [ { required: false, message: '请输入危险品编号', trigger: 'change' } ],
+        dpage: [ { required: false, message: '请输入危险品页号', trigger: 'change' } ],
+        dlabel: [ { required: false, message: '请输入危险品标签', trigger: 'change' } ],
+        linkman: [ { required: false, message: '请输入危险品联系人', trigger: 'change' } ],
       },
       remarksRules: {
-        soremark: [ { required: false, message: '请输入订舱备注', trigger: 'blur' } ],
-        siremark: [ { required: false, message: '请输入截单备注', trigger: 'blur' } ],
+        soremark: [ { required: false, message: '请输入订舱备注', trigger: 'change' } ],
+        siremark: [ { required: false, message: '请输入截单备注', trigger: 'change' } ],
       },
       ediRules: {
-        'bookingEDIExt.sendCode': [ { required: false, message: '请输入发送方EDI代码', trigger: 'blur' } ],
-        'bookingEDIExt.receiveCode': [ { required: false, message: '请输入接收方EDI代码', trigger: 'blur' } ],
-        'bookingEDIExt.notifyCdoe': [ { required: false, message: '请输入通知方EDI代码', trigger: 'blur' } ],
-        'bookingEDIExt.salerCode': [ { required: false, message: '请输入销售EDI代码', trigger: 'blur' } ],
-        'bookingEDIExt.masterBolIndicator': [ { required: false, message: '请输入Master Bol Indicator', trigger: 'blur' } ],
-        'bookingEDIExt.emanifestHbl': [ { required: false, message: '请输入EMANIFEST HBL', trigger: 'blur' } ],
-        'bookingEDIExt.consigneeEdiCode': [ { required: false, message: '请输入收货人EDI代码', trigger: 'blur' } ],
-        'bookingEDIExt.shipperEdiCode': [ { required: false, message: '请输入发货人EDI代码', trigger: 'blur' } ],
-        'bookingEDIExt.ediAttn': [ { required: false, message: '请输入EDI联系人名称', trigger: 'blur' } ],
-        'bookingEDIExt.ediAttnTel': [ { required: false, message: '请输入EDI联系人电话', trigger: 'blur' } ],
-        'bookingEDIExt.ediAttnMail': [ { required: false, message: '请输入EDI联系人邮箱', trigger: 'blur' } ],
-        'bookingEDIExt.amsConsignee': [ { required: false, message: '请输入AMS收货人', trigger: 'blur' } ],
-        'bookingEDIExt.amsNotifyParty': [ { required: false, message: '请输入AMS通知人', trigger: 'blur' } ],
-        'bookingEDIExt.opEName': [ { required: false, message: '请输入操作英文名称', trigger: 'blur' } ],
-        'bookingEDIExt.opTel': [ { required: false, message: '请输入操作电话', trigger: 'blur' } ],
-        'bookingEDIExt.opEmail': [ { required: false, message: '请输入操作邮箱', trigger: 'blur' } ],
-        'bookingEDIExt.acihbl': [ { required: false, message: '请输入ACI HBL', trigger: 'blur' } ],
-        'bookingEDIExt.s0CC0C': [ { required: false, message: '请输入S0C C0C', trigger: 'blur' } ],
-        'bookingEDIExt.goodsName': [ { required: false, message: '请输入商品名称', trigger: 'blur' } ],
-        'iscontainersoc': [ { required: false, message: '请输入SOC箱', trigger: 'blur' } ],
-        'scaccode': [ { required: false, message: '请输入SCAC代码', trigger: 'blur' } ],
-        'itncode': [ { required: false, message: '请输入ITN编号', trigger: 'blur' } ],
-        'freightpayer': [ { required: false, message: '请输入付款方', trigger: 'blur' } ],
-        'bookingEDIExt.weiTuoFang': [ { required: false, message: '请输入委托方', trigger: 'blur' } ],
-      }
+        'bookingEDIExt.sendCode': [ { required: false, message: '请输入发送方EDI代码', trigger: 'change' } ],
+        'bookingEDIExt.receiveCode': [ { required: false, message: '请输入接收方EDI代码', trigger: 'change' } ],
+        'bookingEDIExt.notifyCdoe': [ { required: false, message: '请输入通知方EDI代码', trigger: 'change' } ],
+        'bookingEDIExt.salerCode': [ { required: false, message: '请输入销售EDI代码', trigger: 'change' } ],
+        'bookingEDIExt.masterBolIndicator': [ { required: false, message: '请输入Master Bol Indicator', trigger: 'change' } ],
+        'bookingEDIExt.emanifestHbl': [ { required: false, message: '请输入EMANIFEST HBL', trigger: 'change' } ],
+        'bookingEDIExt.consigneeEdiCode': [ { required: false, message: '请输入收货人EDI代码', trigger: 'change' } ],
+        'bookingEDIExt.shipperEdiCode': [ { required: false, message: '请输入发货人EDI代码', trigger: 'change' } ],
+        'bookingEDIExt.ediAttn': [ { required: false, message: '请输入EDI联系人名称', trigger: 'change' } ],
+        'bookingEDIExt.ediAttnTel': [ { required: false, message: '请输入EDI联系人电话', trigger: 'change' } ],
+        'bookingEDIExt.ediAttnMail': [ { required: false, message: '请输入EDI联系人邮箱', trigger: 'change' } ],
+        'bookingEDIExt.amsConsignee': [ { required: false, message: '请输入AMS收货人', trigger: 'change' } ],
+        'bookingEDIExt.amsNotifyParty': [ { required: false, message: '请输入AMS通知人', trigger: 'change' } ],
+        'bookingEDIExt.opEName': [ { required: false, message: '请输入操作英文名称', trigger: 'change' } ],
+        'bookingEDIExt.opTel': [ { required: false, message: '请输入操作电话', trigger: 'change' } ],
+        'bookingEDIExt.opEmail': [ { required: false, message: '请输入操作邮箱', trigger: 'change' } ],
+        'bookingEDIExt.acihbl': [ { required: false, message: '请输入ACI HBL', trigger: 'change' } ],
+        'bookingEDIExt.s0CC0C': [ { required: false, message: '请输入S0C C0C', trigger: 'change' } ],
+        'bookingEDIExt.goodsName': [ { required: false, message: '请输入商品名称', trigger: 'change' } ],
+        'iscontainersoc': [ { required: false, message: '请输入SOC箱', trigger: 'change' } ],
+        'scaccode': [ { required: false, message: '请输入SCAC代码', trigger: 'change' } ],
+        'itncode': [ { required: false, message: '请输入ITN编号', trigger: 'change' } ],
+        'freightpayer': [ { required: false, message: '请输入付款方', trigger: 'change' } ],
+        'bookingEDIExt.weiTuoFang': [ { required: false, message: '请输入委托方', trigger: 'change' } ],
+      },
+      hasEdiRules: false
     }
   },
   computed: {
@@ -425,6 +428,7 @@ export default {
         excuteRulesType: this.excuteRulesType,
         isAdd: this.isAdd,
         tabActiveKey: this.tabActiveKey,
+        mainOrderActiveKey: this.mainOrderActiveKey,
         type: this.type,
         isCopy: this.isCopy,
         id: this.id
@@ -437,6 +441,7 @@ export default {
         excuteRulesType: this.excuteRulesType,
         isAdd: this.isAdd,
         tabActiveKey: this.tabActiveKey,
+        mainOrderActiveKey: this.mainOrderActiveKey,
         type: this.type,
         isCopy: this.isCopy
         // id: this.id
@@ -449,6 +454,7 @@ export default {
         excuteRulesType: this.excuteRulesType,
         isAdd: this.isAdd,
         tabActiveKey: this.tabActiveKey,
+        mainOrderActiveKey: this.mainOrderActiveKey,
         type: this.type,
         isCopy: this.isCopy,
         id: this.id
@@ -482,6 +488,7 @@ export default {
         excuteRulesType: this.excuteRulesType,
         isAdd: this.isAdd,
         tabActiveKey: this.tabActiveKey,
+        mainOrderActiveKey: this.mainOrderActiveKey,
         type: this.type,
         isCopy: this.isCopy,
         id: this.id
@@ -494,6 +501,7 @@ export default {
         excuteRulesType: this.excuteRulesType,
         isAdd: this.isAdd,
         tabActiveKey: this.tabActiveKey,
+        mainOrderActiveKey: this.mainOrderActiveKey,
         type: this.type,
         isCopy: this.isCopy
         // id: this.id
@@ -506,6 +514,7 @@ export default {
         excuteRulesType: this.excuteRulesType,
         isAdd: this.isAdd,
         tabActiveKey: this.tabActiveKey,
+        mainOrderActiveKey: this.mainOrderActiveKey,
         type: this.type,
         isCopy: this.isCopy,
         id: this.id
@@ -532,6 +541,7 @@ export default {
       // )
       this.inChildLoading = true
       const newId = this.$route.query.id
+     
       if (Object.keys(this.historyData).includes(`copy-${newId}`) && this.$route.query.isCopy === 'true') {
         this.id = this.$route.query.id
         const $data = JSON.parse(JSON.stringify(this.historyData[`copy-${newId}`]))
@@ -540,6 +550,7 @@ export default {
         this.excuteRulesType = $data.excuteRulesType
         this.isAdd = $data.isAdd
         this.tabActiveKey = $data.tabActiveKey
+        this.mainOrderActiveKey = $data.mainOrderActiveKey
         this.isCopy = this.$route.query.isCopy
         this.inPageLoading = false
         if (this.bookingDetails.hbList && this.bookingDetails.hbList.length > 0) {
@@ -560,6 +571,7 @@ export default {
         this.excuteRulesType = $data.excuteRulesType
         this.isAdd = $data.isAdd
         this.tabActiveKey = $data.tabActiveKey
+        this.mainOrderActiveKey = $data.mainOrderActiveKey
         this.isCopy = this.$route.query.isCopy
         this.inPageLoading = false
         // console.log('== 复制参数 ==', $data.isCopy, this.$route.query.isCopy, this.isCopy)
@@ -585,6 +597,7 @@ export default {
         this.excuteRulesType = $data.excuteRulesType
         this.isAdd = $data.isAdd
         this.tabActiveKey = $data.tabActiveKey
+        this.mainOrderActiveKey = $data.mainOrderActiveKey
         this.isCopy = this.$route.query.isCopy
         this.inPageLoading = false
         if (this.bookingDetails.hbList && this.bookingDetails.hbList.length > 0) {
@@ -607,9 +620,15 @@ export default {
         this.type = this.$route.query.type
         this.isCopy = this.$route.query.isCopy || false
         this.tabActiveKey = '1'
+        this.mainOrderActiveKey = '1-1'
         this.$forceUpdate()
         this.init()
       }
+      this.$refs.basicInfo.$refs.basicFrom.clearValidate()
+      this.$refs.mailingInfo.$refs.mailingFrom.clearValidate()
+      this.$refs.cargoInfo.$refs.cargoFrom.clearValidate()
+      this.$refs.billInfo.$refs.billFrom.clearValidate()
+      this.$refs.remarksInfo.$refs.remarkFrom.clearValidate()
     },
     init() {
       this.bookingDetails = JSON.parse(JSON.stringify(initDetail))
@@ -631,10 +650,15 @@ export default {
 
     getDjyTenantConfig () {
       getDjyTenantConfig({
-        type: 'customer_config_type'
+        type: 'booking_form_col'
       })
         .then(res => {
-          this.checkFrom = ['customername', 'mblno', 'carrierid', 'forwarder', 'shipper', 'consignee', 'notifyparty', 'yard', 'customser', 'marks', 'cargoid', 'hscode', 'issuetype', 'issuedate', 'issueplace', 'soremark', 'siremark', 'bookingEDIExt.sendCode', 'bookingEDIExt.receiveCode']
+          // this.checkFrom = ['customername', 'mblno', 'carrierid', 'forwarder', 'shipper', 'consignee', 'notifyparty', 'yard', 'customser', 'marks', 'cargoid', 'hscode', 'issuetype', 'issuedate', 'soremark', 'siremark', 'bookingEDIExt.sendCode', 'bookingEDIExt.receiveCode']
+          if (res.data && JSON.parse(res.data.configJson).length) {
+            this.checkFrom = JSON.parse(res.data.configJson) || []
+          } else {
+            this.checkFrom = []
+          }
           Object.keys(this.basicRules).map((item, index) => {
             if (this.checkFrom.includes(item)) {
               this.basicRules[item][0].required = true
@@ -663,6 +687,7 @@ export default {
           Object.keys(this.ediRules).map((item, index) => {
             if (this.checkFrom.includes(item)) {
               this.ediRules[item][0].required = true
+              // this.hasEdiRules = true
             }
           })
           this.$forceUpdate()
@@ -740,6 +765,14 @@ export default {
             })
           }
           this.$set(this, 'bookingDetails', res.data)
+          // // edi 初始数据验证
+          // Object.keys(this.ediRules).map((item, index) => {
+          //   console.log(this.bookingDetails[item.split('.')[0]][item.split('.')[1]])
+          //   if (this.checkFrom.includes(item) && !this.bookingDetails[item.split('.')[0]][item.split('.')[1]]) {
+          //     this.hasEdiRules = true
+          //   }
+          // })
+
           setTimeout(() => {
             // console.log(' 1. === 主单获取信息更新 ===')
             this.inChildLoading = false
@@ -780,22 +813,54 @@ export default {
         return false
       }
       // 自定义必填项验证 - start
-      // const basicFrom = this.$refs.basicInfo.checkbasic()
-      // const mailingFrom = this.$refs.mailingInfo.checkbasic()
-      // const cargoFrom = this.$refs.cargoInfo.checkbasic()
-      // const billFrom = this.$refs.billInfo.checkbasic()
-      // const remarksFrom = this.$refs.remarksInfo.checkbasic()
-      // if (!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) {
-      //   this.$message.error('请填写完整数据')
-      //   return false
-      // }
-      // if (this.$refs.ediMore && !this.$refs.ediMore.checkbasic()) {
-      //   this.$message.error('请填写完整数据')
-      //   return false
-      // } else if (!this.$refs.ediMore) {
-      //   console.log('== 此处逻辑需要添加 ==')
-      // }
-      debugger
+      let basicFrom = true
+      this.$refs.basicInfo.$refs.basicFrom.validate(valid => {
+        basicFrom = valid
+      })
+      let mailingFrom = true
+      this.$refs.mailingInfo.$refs.mailingFrom.validate(valid => {
+        mailingFrom = valid
+      })
+      let cargoFrom = true
+      this.$refs.cargoInfo.$refs.cargoFrom.validate(valid => {
+        cargoFrom = valid
+      })
+      let billFrom = true
+      this.$refs.billInfo.$refs.billFrom.validate(valid => {
+        billFrom = valid
+      })
+      let remarksFrom = true
+      this.$refs.remarksInfo.$refs.remarkFrom.validate(valid => {
+        remarksFrom = valid
+      })
+      if (!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) {
+        this.$message.error('请填写完整数据')
+        return false
+      }
+      if (this.$refs.ediMore) {
+        let ediFrom = true
+        this.$refs.ediMore.$refs.ediFrom.validate(valid => {
+          ediFrom = valid
+        })
+        if (!ediFrom) {
+          this.mainOrderActiveKey = '2-2'
+          this.$message.error('请填写完整EDI数据')
+          return false
+        }
+      } else {
+        // edi 初始数据验证
+        Object.keys(this.ediRules).map((item, index) => {
+          console.log(this.bookingDetails[item.split('.')[0]][item.split('.')[1]])
+          if (this.checkFrom.includes(item) && !this.bookingDetails[item.split('.')[0]][item.split('.')[1]]) {
+            this.hasEdiRules = true
+          }
+        })
+        if (this.hasEdiRules) {
+          this.mainOrderActiveKey = '2-2'
+          this.$message.error('请填写完整EDI数据')
+          return false
+        }
+      }
       // 自定义必填项验证 - end
       const _data = JSON.parse(JSON.stringify(this.bookingDetails))
       delete _data.hbList
@@ -840,6 +905,56 @@ export default {
         this.$message.error('请输入提单号')
         return false
       }
+      // 自定义必填项验证 - start
+      let basicFrom = true
+      this.$refs.basicInfo.$refs.basicFrom.validate(valid => {
+        basicFrom = valid
+      })
+      let mailingFrom = true
+      this.$refs.mailingInfo.$refs.mailingFrom.validate(valid => {
+        mailingFrom = valid
+      })
+      let cargoFrom = true
+      this.$refs.cargoInfo.$refs.cargoFrom.validate(valid => {
+        cargoFrom = valid
+      })
+      let billFrom = true
+      this.$refs.billInfo.$refs.billFrom.validate(valid => {
+        billFrom = valid
+      })
+      let remarksFrom = true
+      this.$refs.remarksInfo.$refs.remarkFrom.validate(valid => {
+        remarksFrom = valid
+      })
+      if (!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) {
+        this.$message.error('请填写完整数据')
+        return false
+      }
+      if (this.$refs.ediMore) {
+        let ediFrom = true
+        this.$refs.ediMore.$refs.ediFrom.validate(valid => {
+          ediFrom = valid
+        })
+        if (!ediFrom) {
+          this.mainOrderActiveKey = '2-2'
+          this.$message.error('请填写完整EDI数据')
+          return false
+        }
+      } else {
+        // edi 初始数据验证
+        Object.keys(this.ediRules).map((item, index) => {
+          console.log(this.bookingDetails[item.split('.')[0]][item.split('.')[1]])
+          if (this.checkFrom.includes(item) && !this.bookingDetails[item.split('.')[0]][item.split('.')[1]]) {
+            this.hasEdiRules = true
+          }
+        })
+        if (this.hasEdiRules) {
+          this.mainOrderActiveKey = '2-2'
+          this.$message.error('请填写完整EDI数据')
+          return false
+        }
+      }
+      // 自定义必填项验证 - end
       const _data = JSON.parse(JSON.stringify(this.bookingDetails))
       delete _data.hbList
       BookingOrderAddOrUpdate(_data)
@@ -880,6 +995,10 @@ export default {
       this.tabActiveKey = e
     },
 
+    changeMainTab (e) {
+      this.mainOrderActiveKey = e
+    },
+
     // 操作按钮
     refreshPage() {
       this.init()
@@ -1233,4 +1352,5 @@ export default {
   background: #fff;
   transition: 0.5s all;
 }
+
 </style>
diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
index ca27fcc..84a353c 100644
--- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
@@ -557,6 +557,12 @@ export default {
     ishd: {
       type: Boolean,
       default: false
+    },
+    rules: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   data() {
@@ -711,29 +717,7 @@ export default {
       // 选择客户 / 关系人弹窗 - end
       customerContactsData: [],
       ContactType: [],
-      customerContactsDataList: [],
-      rules: {
-        // customername: [ { required: true, message: '请选择客户名', trigger: 'blur' } ],
-        // mblno: [{ required: true, message: '请输入提单号', trigger: 'blur' }],
-        // carrierid: [{ required: true, message: '请选择船公司', trigger: 'blur' }],
-        // forwarder: [{ required: true, message: '请输入订舱代理', trigger: 'blur' }],
-        // pono: [{ required: true, message: '请输入PO NO', trigger: 'blur' }],
-        // hblno: [{ required: true, message: '请输入分提单号', trigger: 'blur' }],
-        // bookingno: [{ required: true, message: '请输入订舱编号', trigger: 'blur' }],
-        // contractno: [{ required: true, message: '请输入EP号/约号', trigger: 'blur' }],
-        // vessel: [{ required: true, message: '请输入船名', trigger: 'blur' }],
-        // lanecode: [{ required: true, message: '请输入航线代码', trigger: 'blur' }],
-        // voynoinner: [{ required: true, message: '请输入内部航次', trigger: 'blur' }],
-        // voyno: [{ required: true, message: '请输入海关航次', trigger: 'blur' }],
-        // etd: [{ required: true, message: '请选择开船日期', trigger: 'blur' }],
-        // atd: [{ required: true, message: '请选择实际开船日期', trigger: 'blur' }],
-        // lanename: [{ required: true, message: '请输入航线', trigger: 'blur' }],
-        // shipagency: [{ required: true, message: '请输入船代', trigger: 'blur' }],
-        // sale: [{ required: true, message: '请选择销售人员', trigger: 'blur' }],
-        // op: [{ required: true, message: '请选择操作人员', trigger: 'blur' }],
-        // doc: [{ required: true, message: '请选择单证人员', trigger: 'blur' }],
-        // custservice: [{ required: true, message: '请选择客服人员', trigger: 'blur' }]
-      }
+      customerContactsDataList: []
     }
   },
   computed: {
@@ -907,15 +891,17 @@ export default {
   },
   methods: {
     checkbasic () {
-      this.$refs.basicFrom.validate(valid => {
-        console.log(valid)
-        if (valid) {
-          console.log('验证成功!');
-          return true;
-        } else {
-          console.log('验证失败!');
-          return false;
-        }
+      return new Promise((resolve, reject) => {
+        this.$refs.basicFrom.validate(valid => {
+          console.log(valid)
+          if (valid) {
+            console.log('验证成功!');
+            resolve(true);
+          } else {
+            console.log('验证失败!');
+            reject(false);
+          }
+        });
       });
     },
     // ========== 关系人弹窗 ==========
@@ -1380,6 +1366,18 @@ export default {
   }
 }
 </script>
+
+<style lang="less" scoped>
+
+/deep/ .ant-form-explain{
+  display: none !important;
+}
+
+/deep/ .ant-form-item-children-icon .anticon-check-circle{
+  display: none;
+}
+</style>
+
 <style lang="less">
 @import url('../index.less');
 
@@ -1466,6 +1464,7 @@ export default {
   height: 28px !important;
 }
 
+
 // .ant-calendar-picker-input{
 //   padding: 0 4px;
 // }
@@ -1501,3 +1500,4 @@ export default {
 //   margin-top: 4px !important;
 // }
 </style>
+
diff --git a/src/views/main/BookingLedger/detail/modules/billInfo.vue b/src/views/main/BookingLedger/detail/modules/billInfo.vue
index 763b9a0..151a35c 100644
--- a/src/views/main/BookingLedger/detail/modules/billInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/billInfo.vue
@@ -93,7 +93,7 @@
                 has-feedback
                 prop="nobill"
               >
-                <a-select :default-value="details.nobill || 'THREE'" @change="handleChange">
+                <a-select :default-value="details.nobill || 'THREE'" v-model="details.nobill" @change="handleNoChange">
                   <a-select-option value="ONE"> ONE </a-select-option>
                   <a-select-option value="TWO"> TWO </a-select-option>
                   <a-select-option value="THREE"> THREE </a-select-option>
@@ -116,7 +116,7 @@
                 has-feedback
                 prop="copynobilll"
               >
-                <a-select :default-value="details.copynobilll || 'THREE'" @change="handleChange">
+                <a-select :default-value="details.copynobilll || 'THREE'" v-model="details.copynobilll" @change="handleCopyNoChange">
                   <a-select-option value="ONE"> ONE </a-select-option>
                   <a-select-option value="TWO"> TWO </a-select-option>
                   <a-select-option value="THREE"> THREE </a-select-option>
@@ -380,6 +380,12 @@ export default {
       default: () => {
         return {}
       }
+    },
+    rules: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   data() {
@@ -401,31 +407,7 @@ export default {
       prepardatData: [],
       payableatData: [],
       blfrtData: [],
-      serviceData: [],
-      rules: {
-        // issuetype: [ { required: true, message: '请选择签单方式', trigger: 'blur' } ],
-        // issuedate: [ { required: true, message: '请选择签单日期', trigger: 'blur' } ],
-        // issueplace: [ { required: true, message: '请选择签单地点', trigger: 'blur' } ],
-        // issueplaceid: [ { required: true, message: '请输入签单地代码', trigger: 'blur' } ],
-        // nobill: [ { required: true, message: '请选择提单份数', trigger: 'blur' } ],
-        // copynobilll: [ { required: true, message: '请选择副本份数', trigger: 'blur' } ],
-        // prepardat: [ { required: true, message: '请选择预付地点', trigger: 'blur' } ],
-        // payableat: [ { required: true, message: '请选择到付地点', trigger: 'blur' } ],
-        // blfrt: [ { required: true, message: '请选择付费方式', trigger: 'blur' } ],
-        // thirdpayaddr: [ { required: true, message: '请输入第三付款地', trigger: 'blur' } ],
-        // service: [ { required: true, message: '请选择运输条款', trigger: 'blur' } ],
-        // reeferf: [ { required: true, message: '请输入冷藏通风量', trigger: 'blur' } ],
-        // tempset: [ { required: true, message: '请输入温度', trigger: 'blur' } ],
-        // tempid: [ { required: true, message: '请选择温度单位', trigger: 'blur' } ],
-        // tempmin: [ { required: true, message: '请输入最低温度', trigger: 'blur' } ],
-        // tempmax: [ { required: true, message: '请输入最高温度', trigger: 'blur' } ],
-        // humidity: [ { required: true, message: '请输入湿度', trigger: 'blur' } ],
-        // dclass: [ { required: true, message: '请输入危险品等级', trigger: 'blur' } ],
-        // dunno: [ { required: true, message: '请输入危险品编号', trigger: 'blur' } ],
-        // dpage: [ { required: true, message: '请输入危险品页号', trigger: 'blur' } ],
-        // dlabel: [ { required: true, message: '请输入危险品标签', trigger: 'blur' } ],
-        // linkman: [ { required: true, message: '请输入危险品联系人', trigger: 'blur' } ],
-      }
+      serviceData: []
     }
   },
   watch: {
@@ -714,11 +696,29 @@ export default {
     // 运输条款 - end
 
     // ===== 旧数据 ====
-    handleChange() {}
+    handleCopyNoChange(value) {
+      this.details.copynobilll = value
+      console.log(this.details.copynobilll)
+    },
+    handleNoChange(value) {
+      this.details.nobill = value
+      console.log(this.details.nobill)
+
+    }
   }
 }
 </script>
 <style lang="less" scoped>
+
+/deep/ .ant-form-explain{
+  display: none !important;
+}
+
+/deep/ .ant-form-item-children-icon .anticon-check-circle{
+  display: none;
+}
+</style>
+<style lang="less" scoped>
 .collapse-box {
   margin-bottom: 10px;
   background: #fff;
diff --git a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue
index 092b2c2..576b001 100644
--- a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue
@@ -86,17 +86,17 @@ export default {
     moreStr: {
       type: String,
       default: ''
+    },
+    rules: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   data() {
     return {
-      showKey: ['1'],
-      rules: {
-        // marks: [ { required: true, message: '请输入Seal No.  Marks & Nos', trigger: 'blur' } ],
-        // cargoid: [ { required: true, message: '请选择货物标志', trigger: 'blur' } ],
-        // hscode: [ { required: true, message: '请输入HS编码', trigger: 'blur' } ],
-        // description: [ { required: true, message: '请输入包装种类与货名', trigger: 'blur' } ]
-      }
+      showKey: ['1']
     }
   },
   watch: {
@@ -167,6 +167,16 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+
+/deep/ .ant-form-explain{
+  display: none !important;
+}
+
+/deep/ .ant-form-item-children-icon .anticon-check-circle{
+  display: none;
+}
+</style>
+<style lang="less" scoped>
 .collapse-box {
   margin-bottom: 10px;
   background: #fff;
@@ -233,6 +243,7 @@ export default {
   }
   .input-box {
     height: 200px;
+    font-size: 14px;
   }
   .num-box {
     display: flex;
@@ -259,8 +270,8 @@ export default {
     .input-box {
       margin-top: 10px;
       flex: 1;
-      font-size: 12px;
-      line-height: 20px;
+      font-size: 14px;
+      line-height: 22px;
     }
     .line-count {
       width: 24px;
diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue
index bcdc92c..3213720 100644
--- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue
+++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue
@@ -130,7 +130,7 @@ export default {
                 style="width: 90px"
                 on-change={val => {
                   console.log(' change - 修改内容', val)
-                  if (val) {
+                  if (val !== undefined) {
                     const data = this.ctnList[val]
                     this.tableData[rowIndex].ctnall = data.name
                     this.tableData[rowIndex].ctncode = data.code
@@ -190,7 +190,7 @@ export default {
           key: 'cntrno',
           title: '箱号',
           align: 'left',
-          width: 180,
+          width: 130,
           edit: true
         },
         {
@@ -225,7 +225,7 @@ export default {
                 class="kindpkgsView"
                 on-change={val => {
                   console.log('包装修改：', this.packageList[val])
-                  if (val) {
+                  if (val !== undefined) {
                     const data = this.packageList[val]
                     this.tableData[rowIndex].kindpkgs = data.name
                     row['kindpkgs'] = data.name
diff --git a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
index a0eff31..c4e7973 100644
--- a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
@@ -138,7 +138,7 @@
                 </div>
               </a-form-model-item>
             </a-col>
-            <a-col :xs="24" :sm="24" :md="24" :lg="14" :xl="12">
+            <a-col class="right-content" :xs="24" :sm="24" :md="24" :lg="14" :xl="12">
               <a-row :gutter="16">
                 <a-col :span="12">
                   <a-form-model-item
@@ -690,6 +690,12 @@ export default {
       default: () => {
         return {}
       }
+    },
+    rules: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
 
@@ -745,36 +751,7 @@ export default {
       customerModelconfirm: false,
       showShipper: '',
       showConsignee: '',
-      showNotifier: '',
-      rules: {
-        // shipper: [ { required: true, message: '请输入发货人', trigger: 'blur' } ],
-        // consignee: [ { required: true, message: '请输入收货人', trigger: 'blur' } ],
-        // notifyparty: [ { required: true, message: '请输入通知人', trigger: 'blur' } ],
-        // yard: [ { required: true, message: '请输入场站', trigger: 'blur' } ],
-        // customser: [ { required: true, message: '请输入报关行', trigger: 'blur' } ],
-        // trucker: [ { required: true, message: '请输入车队', trigger: 'blur' } ],
-        // agentid: [ { required: true, message: '请输入国外代理', trigger: 'blur' } ],
-        // eta: [ { required: true, message: '请选择预抵日期', trigger: 'blur' } ],
-        // closingdate: [ { required: true, message: '请选择截港时间', trigger: 'blur' } ],
-        // closedocdate: [ { required: true, message: '请选择截单时间', trigger: 'blur' } ],
-        // closevgmdate: [ { required: true, message: '请选择VGM时间', trigger: 'blur' } ],
-        // placereceiptid: [ { required: true, message: '请选择收货代码', trigger: 'blur' } ],
-        // placereceipt: [ { required: true, message: '请选择收货地', trigger: 'blur' } ],
-        // portloadid: [ { required: true, message: '请选择装货港代码', trigger: 'blur' } ],
-        // portload: [ { required: true, message: '请选择装货港', trigger: 'blur' } ],
-        // transportid: [ { required: true, message: '请选择中转港代码', trigger: 'blur' } ],
-        // transport: [ { required: true, message: '请选择中转港', trigger: 'blur' } ],
-        // portdischargeid: [ { required: true, message: '请选择卸货港代码', trigger: 'blur' } ],
-        // portdischarge: [ { required: true, message: '请选择卸货港', trigger: 'blur' } ],
-        // destinationid: [ { required: true, message: '请选择目的代码', trigger: 'blur' } ],
-        // destination: [ { required: true, message: '请选择目的地', trigger: 'blur' } ],
-        // placedeliveryid: [ { required: true, message: '请选择交货代码', trigger: 'blur' } ],
-        // placedelivery: [ { required: true, message: '请选择交货地', trigger: 'blur' } ],
-        // pkgs: [ { required: true, message: '请输入件数', trigger: 'blur' } ],
-        // kindpkgs: [ { required: true, message: '请输入包装', trigger: 'blur' } ],
-        // kgs: [ { required: true, message: '请输入毛重', trigger: 'blur' } ],
-        // cbm: [ { required: true, message: '请输入尺寸', trigger: 'blur' } ],
-      }
+      showNotifier: ''
     }
   },
   watch: {
@@ -1862,6 +1839,9 @@ export default {
     display: none;
   }
 }
+/deep/ .ant-form-item-children-icon .anticon-check-circle{
+  display: none;
+}
 .content {
   .label {
     margin-bottom: 10px;
@@ -1911,6 +1891,11 @@ export default {
     left: 0;
   }
 }
+
+/deep/ .right-content .ant-form-explain{
+  display: none !important;
+}
+
 @media (max-width: 1700px) {
   .feeself {
     top: 15px !important;
diff --git a/src/views/main/BookingLedger/detail/modules/remarksInfo.vue b/src/views/main/BookingLedger/detail/modules/remarksInfo.vue
index c4c489d..c4e0fa2 100644
--- a/src/views/main/BookingLedger/detail/modules/remarksInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/remarksInfo.vue
@@ -28,15 +28,17 @@ export default {
       default: () => {
         return {}
       }
+    },
+    rules: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   data() {
     return {
-      remarks: '',
-      rules: {
-        // soremark: [ { required: true, message: '请输入订舱备注', trigger: 'blur' } ],
-        // siremark: [ { required: true, message: '请输入截单备注', trigger: 'blur' } ],
-      }
+      remarks: ''
     }
   },
   watch: {
@@ -75,6 +77,16 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+
+/deep/ .ant-form-explain{
+  display: none !important;
+}
+
+/deep/ .ant-form-item-children-icon .anticon-check-circle{
+  display: none;
+}
+</style>
+<style lang="less" scoped>
 .tit {
   margin-bottom: 10px;
   font-size: 14px;
diff --git a/src/views/main/BookingLedger/detail/modules/rightContent.vue b/src/views/main/BookingLedger/detail/modules/rightContent.vue
index 0fbb2ed..23b84f9 100644
--- a/src/views/main/BookingLedger/detail/modules/rightContent.vue
+++ b/src/views/main/BookingLedger/detail/modules/rightContent.vue
@@ -715,10 +715,12 @@ export default {
     }
   }
   .booking-log {
-    padding-bottom: 10px;
+    // padding-bottom: 10px;
     .log {
-      min-height: 30px;
-      line-height: 30px;
+      // min-height: 30px;
+      // line-height: 30px;
+      min-height: 15px;
+      line-height: 15px;
       font-size: 14px;
       color: #666;
       display: flex;
@@ -732,7 +734,7 @@ export default {
         border-right: 1px dashed #ccc;
         top: 0;
         left: 0;
-        top: 22px;
+        // top: 22px;
         left: 76px;
       }
       i:hover {
@@ -750,7 +752,7 @@ export default {
         line-height: 15px;
         font-size: 12px;
         color: #999;
-        padding-top: 4px;
+        // padding-top: 4px;
         margin-right: 30px;
       }
       .icon {
@@ -768,8 +770,8 @@ export default {
       }
     }
     .child-log {
-      min-height: 30px;
-      line-height: 30px;
+      min-height: 15px;
+      line-height: 15px;
       font-size: 14px;
       color: #666;
       display: flex;
@@ -780,11 +782,13 @@ export default {
         width: 1px;
         height: 120%;
         // background: @primary-color;
-        background: #ccc;
+        // background: #ccc;
         top: 0;
-        left: 0;
-        top: 22px;
-        left: 77px;
+        // left: 0;
+        // top: 22px;
+        // left: 77px;
+        left: 76px;
+        border-right: 1px dashed #ccc;
       }
       // &:nth-last-child(1){
       //   &::before{
@@ -795,7 +799,7 @@ export default {
         width: 70px;
         text-align: left;
         height: 50px;
-        line-height: 22px;
+        line-height: 15px;
         font-size: 12px;
         color: #999;
         padding-top: 4px;
@@ -808,7 +812,7 @@ export default {
         text-align: left;
         position: absolute;
         top: 0;
-        left: 69.5px;
+        left: 68.5px;
       }
       .log-name {
         flex: 1;