From cf4621c7ac2d62dc89f8ff545ead4ed5e1d5fb61 Mon Sep 17 00:00:00 2001
From: lilu <lilu@myshipping.net>
Date: Mon, 19 Dec 2022 10:47:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MultiTab/MultiTab.vue          |   3 +
 src/views/main/BookingLedger/detail/index.vue | 169 +++++++++++++++++-
 .../detail/modules/basicInfo.vue              |  45 ++++-
 .../BookingLedger/detail/modules/billInfo.vue |  11 +-
 .../detail/modules/cargoInfo.vue              |   3 +-
 .../detail/modules/goodsTable.vue             |  50 +++++-
 .../detail/modules/mailingInfo.vue            |  21 +--
 .../detail/modules/rightContent.vue           |  56 ++++--
 src/views/main/BookingLedger/list/index.vue   | 127 ++++++++++---
 .../BookingLedger/list/modules/initData.js    |   6 +-
 10 files changed, 420 insertions(+), 71 deletions(-)

diff --git a/src/components/MultiTab/MultiTab.vue b/src/components/MultiTab/MultiTab.vue
index e0af107..4e7b4ff 100644
--- a/src/components/MultiTab/MultiTab.vue
+++ b/src/components/MultiTab/MultiTab.vue
@@ -198,6 +198,9 @@ export default {
         })
         this.activeKey = newVal.fullPath
       }
+      this.fullPathList = this.pages.map((item, index) => {
+        return item.fullPath
+      })
       console.log('===  路由切换  === - pages: ', this.pages, ',  fullPathList: ', this.fullPathList)
     },
     activeKey: function(newPathKey) {
diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue
index 1d8cffc..d380288 100644
--- a/src/views/main/BookingLedger/detail/index.vue
+++ b/src/views/main/BookingLedger/detail/index.vue
@@ -9,10 +9,11 @@
     >
       <a-tab-pane key="1" tab="主单信息">
         <a-row :gutter="24">
-          <a-col :span="18">
+          <a-col :span="18" class="left-box">
             <template>
               <operationArea
                 :details="bookingDetails"
+                :class="scrollTop < 100 ? 'normal-nav' : 'fixed-nav'"
                 @refresh="refreshPage"
                 @save="saveFun"
                 @rules="getRules"
@@ -178,7 +179,7 @@ const initDetail = {
     payableat: '',
     blfrt: '',
     thirdpayaddr: '',
-    service: '',
+    service: 'CY-CY',
     reeferf: '',
     tempset: '',
     tempid: '',
@@ -245,7 +246,8 @@ export default {
       tabActiveKey: '1',
       historyData: {},
       Showtabs: false,
-      inChildLoading: false
+      inChildLoading: false,
+      scrollTop: 0
     }
   },
   computed: {
@@ -271,6 +273,11 @@ export default {
   created() {
     this.init()
   },
+  mounted() {
+    window.addEventListener('scroll', () => {
+      this.scrollTop = document.getElementById('app').scrollTop
+    }, true)
+  },
   beforeRouteUpdate(to, from, next) {
     // console.log('fromId：', from.query.id, '|   toId：', to.query.id)
     console.log('Router 2.2 === beforeRouteUpdate ===', this.$route.query.id, this.isCopy)
@@ -494,6 +501,14 @@ export default {
               ediAttnMail: ''
             }
           }
+          // 初始化箱型 累加  称重总重
+          if (res.data.ctnInputs.length > 0) {
+            res.data.ctnInputs.map((item, index) => {
+             if (item.weightype === '累加') {
+              item.weighkgs = this.calc(Number(item['kgs']), Number(item['tareweight']), '+')
+             }
+            })
+          }
           this.$set(this, 'bookingDetails', res.data)
           setTimeout(() => {
             // console.log(' 1. === 主单获取信息更新 ===')
@@ -618,7 +633,7 @@ export default {
     changePageFun(type) {
       const _this = this
       const key = this.$route.fullPath
-      if (this.needSavePages[key].details || this.needSavePages[key].hbList) {
+      if (Object.keys(this.needSavePages).includes(key) && (this.needSavePages[key].details || this.needSavePages[key].hbList)) {
         // console.log('== 切换上一票下一票  - biu 弹窗出现 ==')
         this.$confirm({
           title: '请确认无未保存数据！',
@@ -723,6 +738,93 @@ export default {
       this.$set(lastPages, key, $data)
       this.setNeedSavePages(lastPages)
       // console.log('== vuex 配置更新信息 ==', this.needSavePages)
+    },
+    calc(num1, num2, calcStr) {
+      var str1; // 转换为字符串的数字
+      var str2;
+      var ws1 = 0; // ws1，ws2 用来存储传入的num的小数点后的数字的位数
+      var ws2 = 0; // 赋默认值，解决当整数和小数运算时倍数计算错误导致的结果误差
+      var bigger; // bigger和smaller用于加，减，除法找出小的那个数字，给后面补0，解决位数不对从而造成的计算错误的问题；乘法需要将结果除两个数字的倍数之和
+      var smaller; // 例如：加减除法中1.001 + 2.03 ，如果不给2.03进行补0，最后会变成1001+203，数字错位导致结果错误；乘法中1.12*1.1会放大为112*11，所以结果需要除以1000才会是正确的结果，112*11/1000=1.232
+      var zeroCount; // 需要补充0的个数
+      var isExistDot1; // 传入的数字是否存在小数点
+      var isExistDot2;
+      var sum;
+      var beishu = 1
+      // 将数字转换为字符串
+      str1 = num1.toString()
+      str2 = num2.toString()
+      // 是否存在小数点（判断需要计算的数字是不是包含小数）
+      isExistDot1 = str1.indexOf('.') != -1 ? true : false
+      isExistDot2 = str2.indexOf('.') != -1 ? true : false
+      // 取小数点后面的位数
+      if (isExistDot1) {
+        ws1 = str1.split('.')[1].length
+      }
+
+      if (isExistDot2) {
+        ws2 = str2.split('.')[1].length
+      }
+      // 如ws1 和 ws2 无默认值，如果num1 或 num2 不是小数的话则 ws1 或 ws2 的值将为 undefined
+      // bigger 和 smaller 的值会和预期不符
+      bigger = ws1 > ws2 ? ws1 : ws2
+      smaller = ws1 < ws2 ? ws1 : ws2
+
+      switch (calcStr) {
+        // 加减法找出小的那个数字，给后面补0，解决位数不对从而造成的计算错误的问题
+        // 例如：1.001 + 2.03 ，如果不给2.03进行补0，最后会变成1001+203，数字错位导致结果错误
+        case '+':
+        case '-':
+        case '/':
+          zeroCount = bigger - smaller
+          for (var i = 0; i < zeroCount; i++) {
+            if (ws1 == smaller) {
+              str1 += '0'
+            } else {
+              str2 += '0'
+            }
+          }
+          break
+        case '*':
+          // 乘法需要将结果除两个数字的倍数之和
+          bigger = bigger + smaller
+          break
+        default:
+          return '暂不支持的计算类型，现已支持的有加法、减法、乘法、除法'
+          break
+      }
+
+      // 去除数字中的小数点
+      str1 = str1.replace('.', '')
+      str2 = str2.replace('.', '')
+
+      // 计算倍数，例如：1.001小数点后有三位，则需要乘 1000 变成 1001，变成整数后精度丢失问题则不会存在
+      for (var i = 0; i < bigger; i++) {
+        beishu *= 10 // 等价于beishu = beishu * 10;
+      }
+      num1 = parseInt(str1)
+      num2 = parseInt(str2)
+      // 进行最终计算并除相应倍数
+      switch (calcStr) {
+        case '+':
+          sum = (num1 + num2) / beishu
+          break
+        case '-':
+          sum = (num1 - num2) / beishu
+          break
+        case '*':
+          sum = (num1 * num2) / beishu
+          break
+        case '/':
+          sum = num1 / num2
+          /* 除数与被除数同时放大一定倍数，不影响结果，
+			所以对数字进行放大对应倍数并进行补0操作后不用另对倍数做处理 */
+          break
+        default:
+          return '暂不支持的计算类型，现已支持的有加法、减法、乘法、除法'
+      }
+
+      return sum
     }
   }
 }
@@ -785,4 +887,63 @@ export default {
     }
   }
 }
+
+// .ant-calendar-picker-input{
+//   padding: 0 4px;
+// }
+// .ant-calendar-range-picker-input{
+//   height: 28px;
+//   font-size: 12px;
+//   vertical-align: top;
+//   text-align: center;
+//   // background: #f99;
+// }
+// .ant-select-auto-complete.ant-select .ant-input{
+//   height: 28px !important;
+//   // padding-top: 4px !important;
+//   background: #f99 !important;
+// }
+.ant-input-affix-wrapper .ant-input:not(:last-child){
+  height: 28px !important;
+  // margin-top: 4px !important;
+  // background: #9f9 !important;
+}
+.ant-select-selection{
+  height: 28px !important;
+  // margin-top: 4px !important;
+  // background: #f00 !important;
+}
+.ant-input:placeholder-shown{
+  height: 28px !important;
+  // margin-top: 4px !important;
+  // background: #99f !important;
+}
+.ant-calendar-picker-input.ant-input{
+  height: 28px !important;
+  // margin-top: 4px !important;
+}
+.ant-form-item-label{
+  line-height: 30px !important;
+  // border: 1px solid #f00;
+}
+.ant-form-item-control-wrapper{
+  // border: 1px solid #f99;
+  // height: 30px;
+  // vertical-align: top;
+  // padding: 0;
+}
+.left-box{
+  // padding-top: 60px;
+}
+.normal-nav{
+  transition: .5s all;
+}
+.fixed-nav{
+  position: fixed;
+  top: 56px;
+  box-shadow:0px 15px 10px -15px #ccc;
+  z-index: 999;
+  background:#fff;
+  transition: .5s all;
+}
 </style>
diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
index 2db8d57..0479811 100644
--- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="basic-info">
     <x-card>
-      <div slot="content">
+      <div slot="content" style="margin-top: -5px;">
         <a-form style="margin-bottom:10px;">
           <a-row class="from-box" :gutter="10">
             <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
@@ -1137,7 +1137,7 @@ export default {
     },
     // 关系人弹窗 - end
     changeEtd(date, dateString) {
-      console.log(date, dateString)
+      this.details.etd = dateString
       this.etdWeek = this.getWeek(dateString)
     },
     getWeek(dateTime) {
@@ -1172,13 +1172,13 @@ export default {
 @import url('../index.less');
 
 .from-label {
-  margin-bottom: 10px;
+  margin-bottom: 0;
   overflow: hidden;
 }
 
 .from-box {
   border-bottom: 1px dashed #ccc;
-  margin-bottom: 20px;
+  margin-bottom: 8px;
   padding-bottom: 10px;
 }
 
@@ -1191,7 +1191,7 @@ export default {
 .from-box3 {
   border-top: 1px dashed #ccc;
   /*margin-top: 20px;*/
-  padding-top: 20px;
+  padding-top: 8px;
 }
 
 .date-box {
@@ -1243,4 +1243,39 @@ export default {
 .list-item2:hover {
   background-color: #f5f7fa;
 }
+
+// .ant-calendar-picker-input{
+//   padding: 0 4px;
+// }
+// .ant-calendar-range-picker-input{
+//   height: 28px;
+//   font-size: 12px;
+//   vertical-align: top;
+//   text-align: center;
+//   // background: #f99;
+// }
+// .ant-select-auto-complete.ant-select .ant-input{
+//   height: 28px !important;
+//   margin-top: 4px !important;
+//   // background: #f99 !important;
+// }
+// .ant-input-affix-wrapper .ant-input:not(:last-child){
+//   height: 28px !important;
+//   margin-top: 4px !important;
+//   // background: #9f9 !important;
+// }
+// .ant-select-selection{
+//   height: 28px !important;
+//   margin-top: 4px !important;
+//   // background: #f99 !important;
+// }
+// .ant-input:placeholder-shown{
+//   height: 28px !important;
+//   margin-top: 4px !important;
+//   // background: #99f !important;
+// }
+// .ant-calendar-picker-input.ant-input{
+//   height: 28px !important;
+//   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 d7e1a23..450a617 100644
--- a/src/views/main/BookingLedger/detail/modules/billInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/billInfo.vue
@@ -72,7 +72,7 @@
             <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
               <a-form-item
                 class="from-label"
-                label="签单代码"
+                label="签单地代码"
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
                 has-feedback
@@ -246,7 +246,11 @@
                   :wrapperCol="wrapperCol"
                   has-feedback
                 >
-                  <a-input :allowClear="true" v-model="details.tempid" />
+                  <!-- <a-input :allowClear="true" v-model="details.tempid" /> -->
+                  <a-select :default-value="details.tempid || 'C摄氏'" v-model="details.tempid">
+                    <a-select-option value="C"> C摄氏 </a-select-option>
+                    <a-select-option value="F"> F华氏 </a-select-option>
+                  </a-select>
                 </a-form-item>
               </a-col>
               <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
@@ -650,8 +654,9 @@ export default {
   font-weight: 600;
   color: #333;
   position: relative;
-  height: 40px;
+  height: 34px;
   line-height: 40px;
+  margin-top: -5px;
   &::before {
     content: '';
     position: absolute;
diff --git a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue
index e13ed33..d38f9af 100644
--- a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue
@@ -111,8 +111,9 @@ export default {
   font-weight: 600;
   color: #666;
   position: relative;
-  height: 40px;
+  height: 34px;
   line-height: 40px;
+  margin-top: -5px;
   &::before {
     content: '';
     position: absolute;
diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue
index 4b40965..1cf4e3a 100644
--- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue
+++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue
@@ -228,10 +228,15 @@ export default {
                 show-search
                 value={row['weightype']}
                 option-filter-prop="children"
-                style="width: 120px"
+                style="width: 80px"
                 on-change={val => {
                   this.tableData[rowIndex].weightype = val
                   row['weightype'] = val
+                  if (row['weightype'] === '累加') {
+                    row['weighkgs'] = this.calc(Number(row['kgs']), Number(row['tareweight']), '+')
+                  } else {
+                    row['weighkgs'] = ''
+                  }
                   this.$forceUpdate()
                 }}
               >
@@ -406,12 +411,22 @@ export default {
               maxCount: 3
             })
             this.$message.error(`输入的${this.enmuErrorLabel(column.field)}不符合规则`)
-            row['cntrno'] = ''
             setTimeout(() => {
               this.$message.destroy()
             }, 2000)
             return false
           }
+          if (column.field === 'cntrno') {
+             const res = this.checkCntrno(changeValue)
+             if (res !== '') {
+              this.$message.error(res)
+              row['cntrno'] = ''
+              setTimeout(() => {
+                this.$message.destroy()
+              }, 2000)
+              return false
+             }
+          }
         },
         afterCellValueChange: ({ row, column, changeValue }) => {
           if (column.field === 'pkgs') {
@@ -446,6 +461,7 @@ export default {
             // row['weighkgs'] = Number(row['kgs']) + Number(row['tareweight'])
             row['weighkgs'] = this.calc(Number(row['kgs']), Number(row['tareweight']), '+')
           }
+          
         },
         cellValueChange: ({ row, column }) => {
           console.log('编辑', row, column)
@@ -740,7 +756,7 @@ export default {
     addboxLine() {
       const data = {
         ctnall: '',
-        ctnnum: '',
+        ctnnum: '1',
         cntrno: '',
         sealno: '',
         pkgs: '',
@@ -870,12 +886,17 @@ export default {
           if (res.success) {
             const data = JSON.parse(res.data)
             const addTable = []
+            this.tableData.map((item, index) => {
+              if (!item.cntrno) {
+                delete this.tableData[index]
+              }
+            })
             const lastNum = this.tableData.length > 0 ? Number(this.tableData[this.tableData.length - 1].rowKey) + 1 : 0
             data.map((item, index) => {
               const _data = {
                 rowKey: lastNum + index,
                 ctnall: item.CTNALL,
-                ctnnum: '',
+                ctnnum: '1',
                 cntrno: item.CNTRNO,
                 sealno: item.SEALNO,
                 pkgs: item.PKGS,
@@ -888,6 +909,7 @@ export default {
               }
               addTable.push(_data)
             })
+
             this.tableData = [...this.tableData, ...addTable]
             this.$forceUpdate()
           } else {
@@ -920,7 +942,7 @@ export default {
               const _data = {
                 rowKey: lastNum + index,
                 ctnall: '',
-                ctnnum: '',
+                ctnnum: '1',
                 cntrno: '',
                 sealno: '',
                 pkgs: '',
@@ -1036,6 +1058,24 @@ export default {
       }
 
       return sum
+    },
+    checkCntrno (val) {
+      let str = ''
+      if (val.length !== 11) {
+        str = '箱号长度不符合规则'
+      } else if (val.split('')[3] !== 'U' && val.split('')[3] !== 'u') {
+        str = '输入的箱号不符合规则'
+      }
+      val.split('').map((item, index) => {
+        if (index < 3 && !new RegExp(/^[a-zA-Z]+$/).test(item)) {
+          console.log('箱号前3位为字母')
+          str = '输入的箱号不符合规则'
+        } else if (index > 4 && !new RegExp(/^[0-9]+$/).test(item)) {
+          console.log('箱号后7位为数字')
+          str = '输入的箱号不符合规则'
+        }
+      })
+      return str
     }
   }
 }
diff --git a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
index 98a16a3..6ba007f 100644
--- a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
@@ -35,8 +35,8 @@
                 <a-textarea
                   id="shipper-scroll"
                   v-model="details.shipper"
-                  :auto-size="{ minRows: 2, maxRows: 6 }"
-                  style="height: 130px"
+                  :auto-size="{ minRows: 2, maxRows: 5 }"
+                  style="height: 100px"
                 />
                 <div
                   class="line-count"
@@ -73,8 +73,8 @@
                 <a-textarea
                   id="consignee-scroll"
                   v-model="details.consignee"
-                  :auto-size="{ minRows: 2, maxRows: 6 }"
-                  style="height: 130px"
+                  :auto-size="{ minRows: 2, maxRows: 5 }"
+                  style="height: 100px"
                 />
                 <div
                   class="line-count"
@@ -109,8 +109,8 @@
                 <a-textarea
                   id="notifyparty-scroll"
                   v-model="details.notifyparty"
-                  :auto-size="{ minRows: 2, maxRows: 6 }"
-                  style="height: 130px"
+                  :auto-size="{ minRows: 2, maxRows: 5 }"
+                  style="height: 100px"
                 />
                 <div
                   class="line-count"
@@ -1411,8 +1411,9 @@ export default {
   font-weight: 600;
   color: #666;
   position: relative;
-  height: 40px;
+  height: 34px;
   line-height: 40px;
+  margin-top: -5px;
   &::before {
     content: '';
     position: absolute;
@@ -1564,7 +1565,7 @@ export default {
   transform: scale(0.8);
 }
 .from-label {
-  margin-bottom: 10px;
+  margin-bottom: 0;
 }
 /*多余线条去掉 */
 .ant-collapse-item {
@@ -1573,8 +1574,8 @@ export default {
 
 @media (max-width: 1700px) {
   .feeself{
-    top: 21px !important;
-    right: -26px !important;
+    top: 15px !important;
+    right: -22px !important;
   }
 }
 </style>
diff --git a/src/views/main/BookingLedger/detail/modules/rightContent.vue b/src/views/main/BookingLedger/detail/modules/rightContent.vue
index a4ab219..8bb5731 100644
--- a/src/views/main/BookingLedger/detail/modules/rightContent.vue
+++ b/src/views/main/BookingLedger/detail/modules/rightContent.vue
@@ -48,8 +48,11 @@
       </div>
       <div class="content">
         <div class="remark" v-for="(remark, rindex) in remarkList" :key="rindex">
-          <div class="top"><i class="iconfont icon-yuandian"></i>{{ remark.remark }}</div>
-          <div class="bottom">{{ remark.createdTime }}</div>
+          <div class="remark-main">
+            <div class="top"><i class="iconfont icon-yuandian"></i>{{ remark.remark }}</div>
+            <div class="bottom">{{ remark.createdTime }} </div>
+          </div>
+          <div class="remark-btn" @click="editRemark(remark)"><i class="iconfont icon-bianji1"></i></div>
         </div>
         <div class="remark no-data" v-if="remarkList.length === 0">
           <i class="iconfont icon-wushuju"></i>
@@ -380,6 +383,10 @@ export default {
           console.log(err)
         })
     },
+    editRemark (data) {
+      console.log('=== 暂无接口， 需要添加编辑备注 ===')
+      // 需要新增接口
+    },
     handleModelCancel() {
       this.remarkModelvisible = false
     },
@@ -658,25 +665,36 @@ export default {
   }
   .remark {
     padding-bottom: 8px;
-    .top {
-      font-size: 13px;
-      line-height: 24px;
-      color: #666;
-      font-weight: 600;
-      position: relative;
-      padding-left: 20px;
-      .iconfont {
-        margin-right: 4px;
-        color: @primary-color;
-        position: absolute;
-        top: 0;
-        left: 0;
+    display: flex;
+    .remark-main{
+      flex: 1;
+      .top {
+        font-size: 13px;
+        line-height: 24px;
+        color: #666;
+        font-weight: 600;
+        position: relative;
+        padding-left: 20px;
+        .iconfont {
+          margin-right: 4px;
+          color: @primary-color;
+          position: absolute;
+          top: 0;
+          left: 0;
+        }
+      }
+      .bottom {
+        color: #999;
+        padding-left: 20px;
+        font-size: 12px;
       }
     }
-    .bottom {
-      color: #999;
-      padding-left: 20px;
-      font-size: 12px;
+    .remark-btn {
+      width: 24px;
+      height: 100%;
+      line-height: 24px;
+      color: @primary-color;
+      cursor: pointer;
     }
   }
   .booking-log {
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index dd54b4a..de3c5da 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -2,7 +2,7 @@
   <div>
     <a-row :gutter="24">
       <a-col :md="24" :sm="24" style="padding: 0 0 0 0">
-        <div class="nav-box">
+        <!-- <div class="nav-box">
           <div class="nav" @click="addBooking"><i class="iconfont icon-jiahao2fill"></i>新建</div>
           <div class="nav" @click="copyBooking"><i class="iconfont icon-fuzhi"></i>复制</div>
           <div class="nav" @click="copyBookingMore"><i class="iconfont icon-fuzhi1"></i>复制多票</div>
@@ -10,13 +10,19 @@
           <div class="nav"><i class="iconfont icon-shujushangchuan-shixin"></i>批量VGM</div>
           <div class="nav"><i class="iconfont icon-shishijifei"></i>定时订舱</div>
           <div class="nav"><i class="iconfont icon-xiaopiaodayin"></i>小票状态</div>
-        </div>
+        </div> -->
         <x-card>
           <div slot="content" class="table-page-search-wrapper">
             <a-form layout="inline">
               <a-row :gutter="48">
                 <template v-for="(formLabel, findex) in formData">
-                  <a-col :md="4" :key="findex" v-if="(findex < 4 && !advanced) || advanced">
+                  <a-col
+                    :md="6"
+                    :lg="6"
+                    :xl="4"
+                    :key="findex"
+                    v-if="(findex < 4 && !advanced) || advanced"
+                    class="from-label">
                     <a-form-item :label="formLabel.title" v-if="ResetType">
                       <formLabel
                         :ref="`fromlabel-${formLabel.label}`"
@@ -28,24 +34,39 @@
                     </a-form-item>
                   </a-col>
                 </template>
-                <a-col :md="formBtnCol || (!advanced && 8)" :sm="24">
+                <a-col :xl="formBtnCol || (!advanced && 8)" :lg="24" :md="24" :sm="24">
                   <span
                     class="table-page-search-submitButtons"
                     :style="(advanced && { float: 'right', overflow: 'hidden' }) || {}"
                   >
-                    <a-button type="primary" @click="tableRefresh">查询</a-button>
-                    <a-button class="reset" @click="tableReset">重置</a-button>
-                    <a-button class="more-search" @click="tableMoreRefresh">
-                      多提单号查询<a-icon type="search" />
-                    </a-button>
-                    <span class="tab-btn" @click="formSetting">
-                      <a-icon type="setting" :style="{ marginLeft: '0px' }" />
-                    </span>
-                    <a class="senior-search" @click="toggleAdvanced" v-if="formData.length > 4">
-                      {{ advanced ? '收起查询' : '更多查询' }}
-                      <!-- <a-icon :type="advanced ? 'up' : 'down'" /> -->
-                      <i class="iconfont" :class="advanced ? 'icon-shouqi' : 'icon-zhankai'"></i>
-                    </a>
+                    <a-button size="small" type="primary" @click="tableRefresh">查询</a-button>
+                    <a-button size="small" class="reset" @click="tableReset">重置</a-button>
+                    <template v-if="screenWidth > 1600">
+                      <a-button size="small" class="more-search" @click="tableMoreRefresh">
+                        多提单号查询<a-icon type="search" />
+                      </a-button>
+                      <span class="tab-btn" @click="formSetting">
+                        <a-icon type="setting" :style="{ marginLeft: '0px' }" />
+                      </span>
+                      <a class="senior-search" @click="toggleAdvanced" v-if="formData.length > 4">
+                        {{ advanced ? '收起查询' : '更多查询' }}
+                        <!-- <a-icon :type="advanced ? 'up' : 'down'" /> -->
+                        <i class="iconfont" :class="advanced ? 'icon-shouqi' : 'icon-zhankai'"></i>
+                      </a>
+                    </template>
+                    <template v-else>
+                      <a-button size="small" class="more-search" @click="tableMoreRefresh">
+                        多提单号<a-icon type="search" />
+                      </a-button>
+                      <span class="tab-btn" @click="formSetting">
+                        <a-icon type="setting" :style="{ marginLeft: '0px' }" />
+                      </span>
+                      <a class="senior-search" @click="toggleAdvanced" v-if="formData.length > 4">
+                        {{ advanced ? '收起' : '更多' }}
+                        <!-- <a-icon :type="advanced ? 'up' : 'down'" /> -->
+                        <i class="iconfont" :class="advanced ? 'icon-shouqi' : 'icon-zhankai'"></i>
+                      </a>
+                    </template>
                   </span>
                 </a-col>
               </a-row>
@@ -54,7 +75,18 @@
         </x-card>
         <x-card class="content-table">
           <div slot="content" class="table-page-search-wrapper" :style="{ marginTop: '-8px' }">
-            <vxe-toolbar style="padding-top:0px;">
+            <vxe-toolbar>
+              <template #buttons>
+                <div class="nav-box">
+                  <div class="nav" @click="addBooking"><i class="iconfont icon-jiahao2fill"></i>新建</div>
+                  <div class="nav" @click="copyBooking"><i class="iconfont icon-fuzhi"></i>复制</div>
+                  <div class="nav" @click="copyBookingMore"><i class="iconfont icon-fuzhi1"></i>复制多票</div>
+                  <div class="nav"><i class="iconfont icon-bianjiwenjian"></i>批量编辑</div>
+                  <div class="nav"><i class="iconfont icon-shujushangchuan-shixin"></i>批量VGM</div>
+                  <div class="nav"><i class="iconfont icon-shishijifei"></i>定时订舱</div>
+                  <div class="nav"><i class="iconfont icon-xiaopiaodayin"></i>小票状态</div>
+                </div>
+              </template>
               <template #tools>
                 <div class="right BookTopButton">
                   <span class="tab-btn" @click="tableRefresh">
@@ -75,7 +107,7 @@
               @cell-dblclick="handledbclick"
               @resizable-change="resizableChange"
               @sort-change="tableSortChange"
-              style="margin-top:15px;"
+              style="margin-top:6px;"
             >
               <template #mblno="{ row }">
                 <div class="mblno">
@@ -86,6 +118,9 @@
               <template #vessel="{ row }">
                 <div class="vessel">{{ row.vessel }}</div>
               </template>
+              <template #etd="{ row }">
+                <div class="etd" v-if="row.etd">{{ row.etd.substring(0, 10) }}</div>
+              </template>
               <template #operate="{ row }">
                 <vxe-button class="operate-btn" type="text" icon="vxe-icon-edit" @click="editColumns(row)"></vxe-button>
               </template>
@@ -254,7 +289,8 @@ export default {
       moreNumVal: '',
       // 表头排序参数
       tableOrderLabel: '',
-      tableOrderType: ''
+      tableOrderType: '',
+      screenWidth: document.body.clientWidth
     }
   },
   created() {
@@ -265,6 +301,11 @@ export default {
     this.getFormData()
     this.getTableList()
   },
+  mounted () {
+    window.onresize = () => {
+      this.screenWidth = document.body.clientWidth
+    }
+  },
   methods: {
     ...mapActions(['setBookingList']),
     FnCopy(data) {
@@ -759,7 +800,6 @@ export default {
 //   color: #77c950;
 // }
 .nav-box {
-  margin-bottom: 10px;
   padding: 0 10px;
 
   .nav {
@@ -873,6 +913,7 @@ export default {
 }
 .table-page-search-submitButtons {
   text-align: right;
+  padding-top: 6px;
   .reset {
     margin-left: 8px;
     margin-right: 8px;
@@ -1094,5 +1135,49 @@ export default {
       color: @primary-color;
     }
   }
+}
+ /deep/ .ant-form-item{
+  margin-bottom: 10px !important;
+}
+/deep/ .table-page-search-submitButtons{
+  margin-bottom: 10px !important;
+}
+/deep/ .ant-input{
+  height: 28px;
+  margin-top: 4px;
+  // transform: scaleY(.8);
+}
+/deep/ .ant-card-body{
+  padding-top: 10px;
+}
+/deep/ .ant-calendar-picker-input{
+  padding: 0 4px;
+}
+/deep/ .ant-calendar-range-picker-input{
+  height: 28px;
+  font-size: 12px;
+  vertical-align: top;
+  text-align: center;
+  // background: #f99;
+}
+@media (min-width: 1200px) and (max-width:1600px){
+  .from-label {
+    padding-right: 0 !important;
+  }
+}
+
+@media (min-width: 1200px) and (max-width:1438px){
+  .table-page-search-submitButtons {
+    .ant-btn{
+      margin-left: 4px;
+      margin-right: 4px;
+    }
+  }
+  .table-page-search-submitButtons .senior-search{
+    margin-left: 20px;
+    &::before{
+      left:-7px;
+    }
+  }
 }
 </style>
diff --git a/src/views/main/BookingLedger/list/modules/initData.js b/src/views/main/BookingLedger/list/modules/initData.js
index 30b4bad..30d29c7 100644
--- a/src/views/main/BookingLedger/list/modules/initData.js
+++ b/src/views/main/BookingLedger/list/modules/initData.js
@@ -22,7 +22,7 @@ export default {
       sortable: true,
       slots: { default: 'vessel' }
     },
-    { field: 'etd', label: 'ETD', width: 160, title: '开船日期', showHeaderOverflow: true, sortable: true },
+    { field: 'etd', label: 'ETD', width: 110, title: '开船日期', showHeaderOverflow: true, sortable: true, slots: { default: 'etd' } },
     { field: 'voyno', label: 'VOYNO', width: 120, title: '海关航次', showHeaderOverflow: true },
     { field: 'bookingStatus', label: 'BOOKINGSTATUS', width: 120, title: '订舱状态', showHeaderOverflow: true },
     { field: 'vgm', label: 'VGM', width: 120, title: 'VGM', showHeaderOverflow: true },
@@ -55,7 +55,7 @@ export default {
       sortable: true,
       slots: { default: 'vessel' }
     },
-    { field: 'etd', label: 'ETD', width: 160, title: '开船日期', showHeaderOverflow: true, sortable: true },
+    { field: 'etd', label: 'ETD', width: 110, title: '开船日期', showHeaderOverflow: true, sortable: true, slots: { default: 'etd' } },
     { field: 'voyno', label: 'VOYNO', width: 120, title: '海关航次', showHeaderOverflow: true },
     { field: 'bookingStatus', label: 'BOOKINGSTATUS', width: 120, title: '订舱状态', showHeaderOverflow: true },
     { field: 'vgm', label: 'VGM', width: 120, title: 'VGM', showHeaderOverflow: true },
@@ -90,7 +90,7 @@ export default {
     { field: 'op', label: 'OP', width: 120, title: '操作人', showHeaderOverflow: true, sortable: true },
     { field: 'payableat', label: 'PAYABLEAT', width: 120, title: '到付地点', showHeaderOverflow: true, sortable: true },
     { field: 'placedelivery', label: 'PLACEDELIVERY', width: 120, title: '交货地', showHeaderOverflow: true, sortable: true },
-    { field: 'bookstatus', label: 'BOOKSTATUS', minWidth: 140, title: '海关码头', showHeaderOverflow: true, slots: { default: 'bookstatus' } }
+    { field: 'bookstatus', label: 'BOOKSTATUS', minWidth: 140, title: '运踪', showHeaderOverflow: true, slots: { default: 'bookstatus' } }
     // { field: 'book_sta_cate_billtrace', label: 'book_sta_cate_billtrace', width: 120, title: '运踪状态', showHeaderOverflow: true, sortable: true },
     // { field: 'book_sta_cate_vgm', label: 'book_sta_cate_vgm', width: 120, title: 'VGM状态', showHeaderOverflow: true, sortable: true },
     // { field: 'book_sta_cate_si', label: 'book_sta_cate_si', width: 120, title: '提单状态', showHeaderOverflow: true, sortable: true },