From 7e94698bdd1331da098e2c747d76768760d386b3 Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Thu, 18 May 2023 10:38:07 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/modules/cargoInfo.vue              |   2 +-
 .../detail/modules/goodsTable.vue             |  68 +++++-------
 src/views/main/BookingLedger/list/index.vue   | 104 ++++++++++--------
 src/views/main/SendCar/addForm.vue            |  27 +++--
 4 files changed, 108 insertions(+), 93 deletions(-)

diff --git a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue
index e50f7e2..b13754a 100644
--- a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue
@@ -52,7 +52,7 @@
                       :defaultVal="details.goodsname"
                       searchApi="getGoodsname"
                       :searchQuery="{ queryItem: '', top: 50 }"
-                      :showLabel="['goodsCode', 'goodsNameEN']"
+                      :showLabel="['goodsNameEN', 'goodsCode']"
                       :openSearch="true"
                       @change="getSelectViewRes"
                       style="width: 75%;max-width:210px;"
diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue
index 28540b2..2a0f4b2 100644
--- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue
+++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue
@@ -293,6 +293,7 @@ export default {
           edit: false,
           width: 130,
           renderBodyCell: ({ row, column, rowIndex }, h) => {
+            this.openEdit = true
             return (
               <a-select
                 size="small"
@@ -1104,47 +1105,32 @@ export default {
               '== 当前是否允许编辑 ==',
               this.cellSelectionOption.enable
             )
-            // console.log('按下:' + event.key + '键:' + event.keyCode, document.activeElement);
-            // if ([37, 38, 39, 40, 9].includes(event.keyCode)) {
-            //   event = window.event || event;
-            //   if (event.stopPropagation) {
-            //       event.stopPropagation();
-            //       event.preventDefault()
-            //   } else {
-            //       event.cancelBubble = true;
-            //   }
-            //   // this.openKeyDown = true
-            //   setTimeout(() => {
-            //     const activeDom = document.getElementsByClassName('ve-table-cell-selection')[0].firstChild
-            //     if (this.isDOM(activeDom)) {
-            //       const isCtnall = activeDom.classList.contains('ctnallView')
-            //       const isKindpkgs = activeDom.classList.contains('kindpkgsView')
-            //       if (isCtnall) {
-            //         console.log('== 点击到箱型按钮，设置当前table禁止编辑 ==')
-            //         activeDom.click()
-            //         // this.cellSelectionOption.enable = false
-            //         // setTimeout(() => {
-            //         //   this.cellAutofillOption = false
-            //         //   this.rowKeyName = false
-            //         //   this.tableData.map((item, index) => {
-            //         //     delete item.rowKey
-            //         //   })
-            //         // }, 300)
-            //       }
-            //       if (isKindpkgs) {
-            //         activeDom.click()
-            //         // this.cellSelectionOption.enable = false
-            //         // setTimeout(() => {
-            //         //   this.cellAutofillOption = false
-            //         //   this.rowKeyName = false
-            //         //   this.tableData.map((item, index) => {
-            //         //     delete item.rowKey
-            //         //   })
-            //         // }, 300)
-            //       }
-            //     }
-            //   }, 600)
-            // }
+            const arr = []
+            if (document.getElementsByClassName('ant-select-dropdown').length > 0) {
+              document.getElementsByClassName('ant-select-dropdown').forEach((item) => {
+                const style = item.style
+                if (style.display !== 'none') {
+                  arr.push(1)
+                }
+              })
+            }
+            if (arr.length === 0) {
+              this.cellSelectionOption.enable = true
+              if ([37, 38, 39, 40, 9].includes(event.keyCode)) {
+                if (arr.length === 0) {
+                  // this.openKeyDown = true
+
+                  setTimeout(() => {
+                    const activeDom = document.getElementsByClassName('ve-table-cell-selection')[0].firstChild
+                    if (this.isDOM(activeDom)) {
+                      activeDom.click()
+                    }
+                  }, 200)
+                }
+              }
+            } else {
+              this.cellSelectionOption.enable = false
+            }
           }
         })
       }
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 8f6cfa7..229ba35 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="margin-top: -16px;margin-left:-4px;margin-right:-4px;" @click="pageClick">
+  <div style="margin-top: -16px; margin-left: -4px; margin-right: -4px" @click="pageClick">
     <a-spin tip="Loading..." :spinning="spinning">
       <a-row :gutter="24">
         <a-col :md="24" :sm="24" style="padding: 0 0 0 0" class="content-box">
@@ -16,7 +16,7 @@
                       v-show="(findex < 4 && !advanced) || advanced"
                       class="from-label"
                     >
-                      <a-form-item style="padding-left:10px;padding-right:10px;" :label="formLabel.title">
+                      <a-form-item style="padding-left: 10px; padding-right: 10px" :label="formLabel.title">
                         <formLabel
                           :ref="`fromlabel-${formLabel.label}`"
                           :labelData="formLabel"
@@ -68,7 +68,7 @@
               </a-form>
             </div>
           </x-card>
-          <x-card class="content-table" style="margin-top:-6px;">
+          <x-card class="content-table" style="margin-top: -6px">
             <div slot="content" class="table-page-search-wrapper" :style="{ marginTop: '-8px' }">
               <vxe-toolbar>
                 <template #buttons>
@@ -100,6 +100,25 @@
                     <div class="nav"><i class="iconfont icon-shishijifei"></i>定时订舱</div>
                     <div class="nav"><i class="iconfont icon-xiaopiaodayin"></i>小票状态</div>
                     <div class="nav" @click="openTraceModel"><i class="iconfont icon-yunshu1"></i>运踪订阅</div>
+                    <div class="nav">
+                      <a-dropdown>
+                        <span> <i class="iconfont icon-xiaopiaodayin"></i>船公司文件 </span>
+                        <a-menu slot="overlay">
+                          <a-menu-item>
+                            <a @click="handleDownByBc" href="javascript:;">BC下载</a>
+                          </a-menu-item>
+                          <a-menu-item>
+                            <a href="javascript:;">DRAFT下载</a>
+                          </a-menu-item>
+                          <a-menu-item>
+                            <a href="javascript:;">到港时间更新</a>
+                          </a-menu-item>
+                          <a-menu-item>
+                            <a href="javascript:;">舱位分配查询</a>
+                          </a-menu-item>
+                        </a-menu>
+                      </a-dropdown>
+                    </div>
                   </div>
                 </template>
                 <template #tools>
@@ -306,9 +325,7 @@
         width="40%"
       >
         <template slot="footer">
-          <a-button key="back" @click="TaskShippingOrderCompareHandleCancel">
-            关闭
-          </a-button>
+          <a-button key="back" @click="TaskShippingOrderCompareHandleCancel"> 关闭 </a-button>
         </template>
         <p class="TaskShippingOrderCompareP">
           {{ TaskShippingOrderCompareData.compareTime }}
@@ -855,7 +872,7 @@ export default {
     next()
   },
   beforeRouteEnter(to, from, next) {
-    next(vm => {
+    next((vm) => {
       vm.upDate()
     })
   },
@@ -923,6 +940,7 @@ export default {
         // }
       }
     },
+    handleDownByBc() {},
     // 批量编辑
     editingHandleOk() {
       const {
@@ -932,10 +950,10 @@ export default {
         if (!errors) {
           values.id = []
           const select = this.$refs.xGrid.getCheckboxRecords()
-          select.forEach(item => {
+          select.forEach((item) => {
             values.id.push(item.id)
           })
-          BookingOrderBachUpdate(values).then(res => {
+          BookingOrderBachUpdate(values).then((res) => {
             if (res.success) {
               this.$message.success('编辑成功')
               this.editingHandleCancel()
@@ -962,7 +980,7 @@ export default {
         this.WebVessel = data
       }
 
-      GetVessellist({ KeyWord: data }).then(res => {
+      GetVessellist({ KeyWord: data }).then((res) => {
         this.vesselData = res.data
       })
     },
@@ -977,12 +995,12 @@ export default {
       }
     },
     portDischargeSearch(data) {
-      GetPortlist({ KeyWord: data }).then(res => {
+      GetPortlist({ KeyWord: data }).then((res) => {
         this.portDischargeData = res.data
       })
     },
     portDischargeChange(value) {
-      this.portDischargeData.forEach(item => {
+      this.portDischargeData.forEach((item) => {
         if (item.enName == value) {
           setTimeout(() => {
             this.editingForm.setFieldsValue({
@@ -994,12 +1012,12 @@ export default {
       })
     },
     destinationSearch(data) {
-      GetPortlist({ KeyWord: data }).then(res => {
+      GetPortlist({ KeyWord: data }).then((res) => {
         this.destinationData = res.data
       })
     },
     destinationChange(value) {
-      this.destinationData.forEach(item => {
+      this.destinationData.forEach((item) => {
         if (item.enName == value) {
           setTimeout(() => {
             this.editingForm.setFieldsValue({
@@ -1033,7 +1051,7 @@ export default {
       const query = {
         typeArr: ['booking_list_cond', 'booking_list_column', 'booking_list_page']
       }
-      DjyUserConfigMulti(this.$qs.stringify(query, { arrayFormat: 'repeat' })).then(res => {
+      DjyUserConfigMulti(this.$qs.stringify(query, { arrayFormat: 'repeat' })).then((res) => {
         const $data = {}
         res.data.map((item, index) => {
           switch (item.type) {
@@ -1065,11 +1083,11 @@ export default {
     },
     // 船公司 - start
     getCarrier() {
-      const Rdata = data => {
+      const Rdata = (data) => {
         let RData = {}
         for (var i = 0; i < 26; i++) {
           RData[String.fromCharCode(65 + i)] = []
-          data.forEach(item => {
+          data.forEach((item) => {
             if (String.fromCharCode(65 + i) == item.enName[0].toUpperCase()) {
               RData[String.fromCharCode(65 + i)].push(item)
             }
@@ -1089,8 +1107,8 @@ export default {
           'S-U': [],
           'V-Z': []
         }
-        Object.keys(Obj).forEach(e => {
-          Obj[e].forEach(item => {
+        Object.keys(Obj).forEach((e) => {
+          Obj[e].forEach((item) => {
             RData[item].forEach((Ai, AiIndex) => {
               let imgSrc = ''
               try {
@@ -1106,15 +1124,15 @@ export default {
         this.RcarrierData = Data
       }
       GetCarrierlist()
-        .then(res => {
+        .then((res) => {
           if (res.code === 200) {
             Rdata(res.data)
             DjyUserConfigGet({ type: 'booking_memory' })
-              .then(e => {
+              .then((e) => {
                 if (e.data) {
                   let data = []
-                  JSON.parse(e.data.configJson).forEach(item => {
-                    res.data.forEach(item2 => {
+                  JSON.parse(e.data.configJson).forEach((item) => {
+                    res.data.forEach((item2) => {
                       if (item == item2.code) {
                         data.push(item2)
                       }
@@ -1128,7 +1146,7 @@ export default {
               })
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
         })
     },
@@ -1232,7 +1250,7 @@ export default {
     },
 
     getFormData(isReset = false) {
-      DjyUserConfigGet({ type: 'booking_list_cond' }).then(res => {
+      DjyUserConfigGet({ type: 'booking_list_cond' }).then((res) => {
         this.setFormData(res.data)
       })
     },
@@ -1254,7 +1272,7 @@ export default {
     },
     getFromSelectData(func, ...args) {
       return new Promise((resolve, reject) => {
-        func(...args).then(res => {
+        func(...args).then((res) => {
           if (res.code === 200) {
             resolve(res.data)
           } else {
@@ -1279,7 +1297,7 @@ export default {
       DjyUserConfigAdd({
         type: 'booking_list_page',
         configJson: JSON.stringify(data)
-      }).then(res => {
+      }).then((res) => {
         console.log('页码设置成功')
       })
     },
@@ -1372,7 +1390,7 @@ export default {
       DjyUserConfigAdd({
         type: 'booking_list_cond',
         configJson: JSON.stringify(arr)
-      }).then(res => {
+      }).then((res) => {
         this.$message.success('保存成功')
         this.$refs.setForm.handleCancel()
         Object.keys(this.$refs).map((label, index) => {
@@ -1422,7 +1440,7 @@ export default {
       DjyUserConfigAdd({
         type: 'booking_list_column',
         configJson: JSON.stringify(data)
-      }).then(res => {
+      }).then((res) => {
         this.$refs.setForm.handleCancel()
       })
     },
@@ -1474,7 +1492,7 @@ export default {
         query.firstFlag = true
       }
       BookingOrderPage(query)
-        .then(res => {
+        .then((res) => {
           if (res.success) {
             let newBookingList = {}
             if (query.PageNo !== 1) {
@@ -1528,7 +1546,7 @@ export default {
           this.ResetType = true
           console.log(this.gridOptions)
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
         })
     },
@@ -1564,7 +1582,7 @@ export default {
       let data = []
       data.push(this.carrierRadio)
       if (this.RecentlyCarrierData.length) {
-        this.RecentlyCarrierData.forEach(item => {
+        this.RecentlyCarrierData.forEach((item) => {
           if (item.code != this.carrierRadio && data.length < 10) {
             data.push(item.code)
           }
@@ -1574,7 +1592,7 @@ export default {
       DjyUserConfigAdd({
         type: 'booking_memory',
         configJson: JSON.stringify(data)
-      }).then(res => {
+      }).then((res) => {
         this.getCarrier()
         this.addVisible = false
         this.addNum = Math.round(Math.random() * 1000)
@@ -1596,7 +1614,7 @@ export default {
       this.moreNumVal
         .replace(/\n|\r/g, ',')
         .split(',')
-        .forEach(item => {
+        .forEach((item) => {
           if (item.replace(/\s*/g, '')) {
             if (data) {
               data = `${data},${item}`
@@ -1756,7 +1774,7 @@ export default {
       }
 
       SendTrace(arr)
-        .then(res => {
+        .then((res) => {
           if (res.success) {
             const tip = `订阅成功`
             this.$message.success(tip)
@@ -1768,7 +1786,7 @@ export default {
             this.traceValue = []
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
         })
     },
@@ -1830,7 +1848,7 @@ export default {
       }
       const fun = this.emnuCompleteApi(form.label)
       if (fun) {
-        this.getFromSelectData(this.emnuCompleteApi(form.label), query).then(data => {
+        this.getFromSelectData(this.emnuCompleteApi(form.label), query).then((data) => {
           if (['CUSTOMERNAME', 'FORWARDER', 'CUSTOMSER', 'AGENTID', 'TRUCKER'].includes(form.label)) {
             this.$refs[`fromlabel-${form.label}`][0].$data.dataSourceList = data.rows
           } else {
@@ -1892,7 +1910,7 @@ export default {
     getSelectFirst({ form, index, value }) {
       const fun = this.emnuSelectApi(form.label)
       if (fun) {
-        this.getFromSelectData(fun).then(data => {
+        this.getFromSelectData(fun).then((data) => {
           this.formData[index].dataList = data
           this.$refs[`fromlabel-${form.label}`][0].$data.dataList = data
         })
@@ -1915,10 +1933,10 @@ export default {
     },
     deleteBookingOrder(arr) {
       DeleteBookingOrder(arr.toString())
-        .then(res => {
+        .then((res) => {
           if (res.success) {
             this.$message.success('删除成功')
-            const _data = this.gridOptions.data.filter(item => !arr.includes(item.id))
+            const _data = this.gridOptions.data.filter((item) => !arr.includes(item.id))
             this.$refs.xGrid.reloadData(_data).then(() => {
               this.gridOptions.pagerConfig.total = this.gridOptions.pagerConfig.total - arr.length
             })
@@ -1927,7 +1945,7 @@ export default {
             this.$message.error(res.message)
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
         })
     },
@@ -1957,7 +1975,7 @@ export default {
       }
       this.spinning = true
       ExcuteShippingOrderCompareBatch(arr)
-        .then(res => {
+        .then((res) => {
           if (res.success) {
             this.spinning = false
             if (!res.data.succ) {
@@ -1976,7 +1994,7 @@ export default {
             this.$message.error(res.data.msg)
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
           this.spinning = false
         })
diff --git a/src/views/main/SendCar/addForm.vue b/src/views/main/SendCar/addForm.vue
index d33fb4e..5840346 100644
--- a/src/views/main/SendCar/addForm.vue
+++ b/src/views/main/SendCar/addForm.vue
@@ -92,10 +92,15 @@
                     :showSearch="true"
                     :filterOption="filterOption"
                     v-decorator="['truckId']"
-                    @focus="gettruckIdData"
-                    @change="ChangetruckId"
+                    @change="Changeyardid"
                     allowClear
-                    :disabled="taskPKId ? false : true"
+                    :default-active-first-option="false"
+                    :show-arrow="false"
+                    :filter-option="false"
+                    :not-found-content="null"
+                    show-search
+                    @search="gettruckIdData"
+                    @focus="gettruckIdData"
                   >
                     <a-select-option v-for="item in truckIdData" :key="item.id" :value="item.id">
                       {{ item.shortName }}
@@ -318,16 +323,21 @@
             </a-col>
           </a-row>
           <a-row>
-            <a-col :span="8">
-              <a-form-item label="工厂联系人:" :labelCol="labelCol8" :wrapperCol="wrapperCol8" has-feedback>
+            <a-col :span="16">
+              <a-form-item
+                label="工厂联系人:"
+                :labelCol="labelCol4"
+                :wrapperCol="{ xs: { span: 25 }, sm: { span: 21 } }"
+                has-feedback
+              >
                 <a-input v-decorator="['factoryContact']" />
               </a-form-item>
             </a-col>
-            <a-col :span="8">
+            <!-- <a-col :span="8">
               <a-form-item label="联系电话:" :labelCol="labelCol8" :wrapperCol="wrapperCol8" has-feedback>
                 <a-input v-decorator="['factoryTel']" />
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :span="8">
               <a-form-item label="返场时间:" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
                 <a-date-picker v-decorator="['returnTime']" />
@@ -1200,7 +1210,8 @@ export default {
         }
       })
     },
-    gettruckIdData(name = '', type) {
+    gettruckIdData(name, type) {
+      console.log(name)
       DjyCustomerQuerytDjyCustomerInfo({ queryType: 'fleet', queryItem: name }).then((res) => {
         this.truckIdData = res.data
       })

From 7c0ec893e40733c6b3486b60e98cf61b69c25bc3 Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Thu, 18 May 2023 11:24:57 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BF=86?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main/BookingLedger/list/index.vue | 533 +++++++++-----------
 1 file changed, 247 insertions(+), 286 deletions(-)

diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 229ba35..a3ff544 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -8,34 +8,18 @@
               <a-form layout="inline">
                 <a-row :gutter="48" class="booking-from-box">
                   <template v-for="(formLabel, findex) in formData">
-                    <a-col
-                      :md="6"
-                      :lg="6"
-                      :xl="4"
-                      :key="findex"
-                      v-show="(findex < 4 && !advanced) || advanced"
-                      class="from-label"
-                    >
+                    <a-col :md="6" :lg="6" :xl="4" :key="findex" v-show="(findex < 4 && !advanced) || advanced"
+                      class="from-label">
                       <a-form-item style="padding-left: 10px; padding-right: 10px" :label="formLabel.title">
-                        <formLabel
-                          :ref="`fromlabel-${formLabel.label}`"
-                          :labelData="formLabel"
-                          :formRes="formRes"
-                          :resetType="ResetType"
-                          :formIndex="findex"
-                          @change="formChange"
-                          @pressEnter="pressEnterFun"
-                          @getCompleteList="getCompleteListFun"
-                          @selectFirst="getSelectFirst"
-                        ></formLabel>
+                        <formLabel :ref="`fromlabel-${formLabel.label}`" :labelData="formLabel" :formRes="formRes"
+                          :resetType="ResetType" :formIndex="findex" @change="formChange" @pressEnter="pressEnterFun"
+                          @getCompleteList="getCompleteListFun" @selectFirst="getSelectFirst"></formLabel>
                       </a-form-item>
                     </a-col>
                   </template>
                   <a-col :xl="formBtnCol || (!advanced && 8)" :lg="24" :md="24" :sm="24">
-                    <span
-                      class="table-page-search-submitButtons"
-                      :style="(advanced && { float: 'right', overflow: 'hidden' }) || {}"
-                    >
+                    <span class="table-page-search-submitButtons"
+                      :style="(advanced && { float: 'right', overflow: 'hidden' }) || {}">
                       <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">
@@ -88,13 +72,8 @@
                     >
                       <div class="nav"><i class="iconfont icon-duibi"></i>下货纸比对</div>
                     </a-popconfirm> -->
-                    <a-popconfirm
-                      title="确定删除当前选中订舱？"
-                      ok-text="是"
-                      cancel-text="否"
-                      @confirm="removeMoreFun"
-                      @cancel="cancelRemove"
-                    >
+                    <a-popconfirm title="确定删除当前选中订舱？" ok-text="是" cancel-text="否" @confirm="removeMoreFun"
+                      @cancel="cancelRemove">
                       <div class="nav"><i class="iconfont icon-shanchu2"></i>删除</div>
                     </a-popconfirm>
                     <div class="nav"><i class="iconfont icon-shishijifei"></i>定时订舱</div>
@@ -132,21 +111,12 @@
                   </div>
                 </template>
               </vxe-toolbar>
-              <vxe-grid
-                ref="xGrid"
-                v-bind="gridOptions"
-                row-class-name="line-box"
-                :height="tableHeight"
-                :checkbox_config="{ checkField: 'checked' }"
-                :scroll-x="{ gt: 10, oSize: 10, enabled: false }"
-                :scroll-y="{ gt: 20, oSize: 20, enabled: true }"
-                @page-change="handlePageChange"
-                @cell-dblclick="handledbclick"
-                @resizable-change="resizableChange"
-                @sort-change="tableSortChange"
-                @scroll="pageClick"
-                @checkbox-change="checkboxChangeEvent"
-              >
+              <vxe-grid ref="xGrid" v-bind="gridOptions" row-class-name="line-box" :height="tableHeight"
+                :checkbox_config="{ checkField: 'checked' }" :scroll-x="{ gt: 10, oSize: 10, enabled: false }"
+                :scroll-y="{ gt: 20, oSize: 20, enabled: true }" @page-change="handlePageChange"
+                @cell-dblclick="handledbclick" :sort-config="{ sortMethod: customSortMethod }"
+                @resizable-change="resizableChange" @sort-change="tableSortChange" @scroll="pageClick"
+                @checkbox-change="checkboxChangeEvent">
                 <template #mblno="{ row }">
                   <div class="mblno">
                     <span @click="editColumns(row)">{{ row.mblno }}</span>
@@ -183,19 +153,9 @@
                   <div class="closingdate" v-if="row.closingdate">{{ row.closingdate.substring(0, 13) }}</div>
                 </template>
                 <template #operate="{ row }">
-                  <vxe-button
-                    class="operate-btn"
-                    type="text"
-                    icon="vxe-icon-edit"
-                    @click="editColumns(row)"
-                  ></vxe-button>
-                  <a-popconfirm
-                    title="确定删除当前订舱？"
-                    ok-text="是"
-                    cancel-text="否"
-                    @confirm="removeFun(row)"
-                    @cancel="cancelRemove"
-                  >
+                  <vxe-button class="operate-btn" type="text" icon="vxe-icon-edit" @click="editColumns(row)"></vxe-button>
+                  <a-popconfirm title="确定删除当前订舱？" ok-text="是" cancel-text="否" @confirm="removeFun(row)"
+                    @cancel="cancelRemove">
                     <vxe-button class="operate-btn" type="text" icon="vxe-icon-delete"></vxe-button>
                   </a-popconfirm>
                 </template>
@@ -204,21 +164,13 @@
               </template> -->
                 <template #bookstatus="{ row, column }">
                   <div class="billtrace-box" :class="column.resizeWidth > 240 ? 'normal-box' : 'flex-box'">
-                    <div
-                      class="billtrace-btn"
-                      v-for="(btn, bindex) in row.bookstatus"
-                      :class="btn.staCode"
-                      :key="bindex"
-                    >
+                    <div class="billtrace-btn" v-for="(btn, bindex) in row.bookstatus" :class="btn.staCode" :key="bindex">
                       <a-popover placement="topLeft" v-if="btn.staTime">
                         <div slot="content">{{ btn.staTime }}</div>
                         <span :class="{ active: btn.isChecked }">{{ enmuBookingBtn(btn.staCode) }}</span>
                       </a-popover>
                       <span :class="{ active: btn.isChecked }" v-else>{{ enmuBookingBtn(btn.staCode) }}</span>
-                      <i
-                        class="iconfont icon-xiaoyoujiantou"
-                        :class="{ hide: bindex === row.bookstatus.length - 1 }"
-                      ></i>
+                      <i class="iconfont icon-xiaoyoujiantou" :class="{ hide: bindex === row.bookstatus.length - 1 }"></i>
                     </div>
                   </div>
                 </template>
@@ -240,10 +192,10 @@
                           比对方式:
                           <span>{{
                             row.lstShipOrderCompareMode
-                              ? row.lstShipOrderCompareMode == 'MANUAL'
-                                ? '手动'
-                                : '自动'
-                              : ''
+                            ? row.lstShipOrderCompareMode == 'MANUAL'
+                              ? '手动'
+                              : '自动'
+                            : ''
                           }}</span>
                         </p>
                         <p>
@@ -263,11 +215,8 @@
                       </div>
                     </a-popover>
 
-                    <a-icon
-                      class="TablelstShipOrderCompareRltRedo"
-                      @click="excuteShippingOrderCompareBatch(row)"
-                      type="redo"
-                    />
+                    <a-icon class="TablelstShipOrderCompareRltRedo" @click="excuteShippingOrderCompareBatch(row)"
+                      type="redo" />
                   </div>
                 </template>
                 <template #goodsStatusList="{ row }">
@@ -318,12 +267,8 @@
           </x-card>
         </a-col>
       </a-row>
-      <a-modal
-        :title="TaskShippingOrderCompareData.isExistsDiff ? '下货纸比对（有差异）' : '下货纸比对（正常）'"
-        @cancel="TaskShippingOrderCompareHandleCancel"
-        :visible="TaskShippingOrderCompareVisible"
-        width="40%"
-      >
+      <a-modal :title="TaskShippingOrderCompareData.isExistsDiff ? '下货纸比对（有差异）' : '下货纸比对（正常）'"
+        @cancel="TaskShippingOrderCompareHandleCancel" :visible="TaskShippingOrderCompareVisible" width="40%">
         <template slot="footer">
           <a-button key="back" @click="TaskShippingOrderCompareHandleCancel"> 关闭 </a-button>
         </template>
@@ -350,12 +295,9 @@
                 <p>{{ TaskShippingOrderCompareData.mBlNo }}</p>
               </div>
             </div>
-            <div
-              class="TaskShippingOrderCompareMainList"
-              v-for="(item, index) in TaskShippingOrderCompareData.showDetailList"
-              :key="index"
-              v-show="item.pCode != 'ContaList'"
-            >
+            <div class="TaskShippingOrderCompareMainList"
+              v-for="(item, index) in TaskShippingOrderCompareData.showDetailList" :key="index"
+              v-show="item.pCode != 'ContaList'">
               <p>{{ item.fieldName }}:</p>
               <p>{{ item.reqVal }}</p>
               <p v-if="item.msg">
@@ -377,14 +319,9 @@
                 <p>箱信息：（场站数据）</p>
               </div>
             </div>
-            <div
-              v-for="(item, index) in TaskShippingOrderCompareData.showDetailList"
-              :key="index"
-              v-show="item.pCode == 'ContaList'"
-              :class="
-                item.fieldName == '箱号' ? 'TaskShippingOrderCompareMainList BoxNo' : 'TaskShippingOrderCompareMainList'
-              "
-            >
+            <div v-for="(item, index) in TaskShippingOrderCompareData.showDetailList" :key="index"
+              v-show="item.pCode == 'ContaList'" :class="item.fieldName == '箱号' ? 'TaskShippingOrderCompareMainList BoxNo' : 'TaskShippingOrderCompareMainList'
+                ">
               <p>{{ item.fieldName }}:</p>
               <p>{{ item.reqVal }}</p>
               <p v-if="item.msg">
@@ -421,37 +358,18 @@
         </a-radio-group>
       </a-modal>
 
-      <a-modal
-        title="多提单号查询"
-        :maskClosable="false"
-        :width="400"
-        :visible="moreNumVisible"
-        @ok="moreNumSubmit"
-        @cancel="moreNumCancel"
-      >
+      <a-modal title="多提单号查询" :maskClosable="false" :width="400" :visible="moreNumVisible" @ok="moreNumSubmit"
+        @cancel="moreNumCancel">
         <div>
           <a-textarea v-model="moreNumVal" style="height: 200px" />
         </div>
       </a-modal>
 
-      <setFormModel
-        ref="setForm"
-        :formData="formData"
-        :formAllData="formMoreData"
-        type="from"
-        @ok="submitForm"
-        v-if="formMoreData"
-      ></setFormModel>
-
-      <setFormModel
-        ref="setTableForm"
-        :formData="formTableData"
-        :formAllData="formMoreTableData"
-        :maxNum="30"
-        type="table"
-        @ok="submitTableForm"
-        v-if="formMoreTableData"
-      ></setFormModel>
+      <setFormModel ref="setForm" :formData="formData" :formAllData="formMoreData" type="from" @ok="submitForm"
+        v-if="formMoreData"></setFormModel>
+
+      <setFormModel ref="setTableForm" :formData="formTableData" :formAllData="formMoreTableData" :maxNum="30"
+        type="table" @ok="submitTableForm" v-if="formMoreTableData"></setFormModel>
 
       <div class="hovers-list" :style="{ top: `${remarkScreenY}px`, left: `${remarkScreenX}px` }" v-if="remarkShow">
         <div class="title">备注内容：</div>
@@ -461,15 +379,11 @@
       </div>
 
       <!-- v-show="goodStatusShow" -->
-      <div
-        class="goods-hovers-list"
-        :class="[
-          { 'hide-goods-hover': !goodStatusShow },
-          { 'seat-top': goodStatusSeat === 'top' },
-          { 'seat-bottom': goodStatusSeat === 'bottom' }
-        ]"
-        :style="{ top: `${goodStatusScreenY}px`, left: `${goodStatusScreenX}px` }"
-      >
+      <div class="goods-hovers-list" :class="[
+        { 'hide-goods-hover': !goodStatusShow },
+        { 'seat-top': goodStatusSeat === 'top' },
+        { 'seat-bottom': goodStatusSeat === 'bottom' }
+      ]" :style="{ top: `${goodStatusScreenY}px`, left: `${goodStatusScreenX}px` }">
         <div class="title">货运动态</div>
         <template v-for="(goodStatusItem, gindex) in goodStatusData">
           <template v-if="goodStatusItem.finishTime || goodStatusItem.remark">
@@ -485,11 +399,7 @@
             </a-popover>
           </template>
           <template v-else>
-            <div
-              class="goods-btn"
-              :key="gindex"
-              :class="{ active: goodStatusItem.finishTime || goodStatusItem.remark }"
-            >
+            <div class="goods-btn" :key="gindex" :class="{ active: goodStatusItem.finishTime || goodStatusItem.remark }">
               {{ goodStatusItem.statusName }}
             </div>
           </template>
@@ -500,19 +410,10 @@
           <a-form>
             <a-row :gutter="16">
               <a-col :span="24" class="book-model-box">
-                <a-form-item
-                  label="请选择订阅内容"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
-                  has-feedback
-                >
-                  <a-checkbox-group
-                    class="trace-check"
-                    v-model="traceValue"
-                    name="checkboxgroup"
-                    :options="traceOptions"
-                    @change="onTraceChange"
-                  />
+                <a-form-item label="请选择订阅内容" :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }" has-feedback>
+                  <a-checkbox-group class="trace-check" v-model="traceValue" name="checkboxgroup" :options="traceOptions"
+                    @change="onTraceChange" />
                 </a-form-item>
               </a-col>
             </a-row>
@@ -522,36 +423,18 @@
           <a-button type="primary" @click="traceSend">订阅</a-button>
         </template>
       </a-modal>
-      <a-modal
-        width="820px"
-        :maskClosable="false"
-        v-model="editingModalVisible"
-        title="批量编辑"
-        @ok="editingHandleOk"
-        @cancel="editingHandleCancel"
-      >
+      <a-modal width="820px" :maskClosable="false" v-model="editingModalVisible" title="批量编辑" @ok="editingHandleOk"
+        @cancel="editingHandleCancel">
         <div class="trace-box">
           <a-form :form="editingForm">
             <a-row :gutter="26">
               <a-col :span="12" class="book-model-box">
-                <a-form-item
-                  label="船名"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback
-                >
-                  <a-select
-                    placeholder="请选择船名"
-                    v-decorator="['vessel', { rules: [{ required: true, message: '请选择船名！' }] }]"
-                    show-search
-                    @focus="vesselSearch"
-                    @search="vesselSearch"
-                    @blur="vesselBlur"
-                    :default-active-first-option="false"
-                    :show-arrow="false"
-                    :filter-option="false"
-                    :not-found-content="null"
-                  >
+                <a-form-item label="船名" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
+                  <a-select placeholder="请选择船名"
+                    v-decorator="['vessel', { rules: [{ required: true, message: '请选择船名！' }] }]" show-search
+                    @focus="vesselSearch" @search="vesselSearch" @blur="vesselBlur" :default-active-first-option="false"
+                    :show-arrow="false" :filter-option="false" :not-found-content="null">
                     <a-select-option v-for="item in vesselData" :key="item.name" :value="item.name">
                       {{ item.name }}
                     </a-select-option>
@@ -559,60 +442,31 @@
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item
-                  label="开船日期"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback
-                >
-                  <a-date-picker
-                    v-decorator="['etd', { rules: [{ required: true, message: '请选择开船日期！' }] }]"
-                    :style="{ width: '100%' }"
-                    placeholder="请选择开船日期"
-                    valueFormat="YYYY-MM-DD"
-                  />
+                <a-form-item label="开船日期" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
+                  <a-date-picker v-decorator="['etd', { rules: [{ required: true, message: '请选择开船日期！' }] }]"
+                    :style="{ width: '100%' }" placeholder="请选择开船日期" valueFormat="YYYY-MM-DD" />
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item
-                  label="内部航次"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback
-                >
+                <a-form-item label="内部航次" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
                   <a-input v-decorator="['voynoinner']" />
                 </a-form-item>
               </a-col>
 
               <a-col :span="12" class="book-model-box">
-                <a-form-item
-                  label="海关航次"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback
-                >
+                <a-form-item label="海关航次" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
                   <a-input v-decorator="['voyno']" />
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item
-                  label="卸货港"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback
-                >
-                  <a-select
-                    placeholder="请选择卸货港"
-                    v-decorator="['portDischarge']"
-                    show-search
-                    @focus="portDischargeSearch"
-                    @search="portDischargeSearch"
-                    @change="portDischargeChange"
-                    :default-active-first-option="false"
-                    :show-arrow="false"
-                    :filter-option="false"
-                    :not-found-content="null"
-                  >
+                <a-form-item label="卸货港" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
+                  <a-select placeholder="请选择卸货港" v-decorator="['portDischarge']" show-search @focus="portDischargeSearch"
+                    @search="portDischargeSearch" @change="portDischargeChange" :default-active-first-option="false"
+                    :show-arrow="false" :filter-option="false" :not-found-content="null">
                     <a-select-option v-for="item in portDischargeData" :key="item.code" :value="item.enName">
                       {{ item.enName }}
                     </a-select-option>
@@ -620,34 +474,17 @@
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item
-                  label="卸货代码"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback
-                >
+                <a-form-item label="卸货代码" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
                   <a-input v-decorator="['portDischargeId']" />
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item
-                  label="目的港"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback
-                >
-                  <a-select
-                    placeholder="请选择目的港"
-                    v-decorator="['destination']"
-                    show-search
-                    @focus="destinationSearch"
-                    @search="destinationSearch"
-                    @change="destinationChange"
-                    :default-active-first-option="false"
-                    :show-arrow="false"
-                    :filter-option="false"
-                    :not-found-content="null"
-                  >
+                <a-form-item label="目的港" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
+                  <a-select placeholder="请选择目的港" v-decorator="['destination']" show-search @focus="destinationSearch"
+                    @search="destinationSearch" @change="destinationChange" :default-active-first-option="false"
+                    :show-arrow="false" :filter-option="false" :not-found-content="null">
                     <a-select-option v-for="item in destinationData" :key="item.code" :value="item.enName">
                       {{ item.enName }}
                     </a-select-option>
@@ -655,47 +492,23 @@
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item
-                  label="目的代码"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback
-                >
+                <a-form-item label="目的代码" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
                   <a-input v-decorator="['destinationid']" />
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item
-                  label="截港时间"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback
-                >
-                  <a-date-picker
-                    show-time
-                    v-decorator="['closingdate']"
-                    :style="{ width: '100%' }"
-                    placeholder="请选择截港时间"
-                    valueFormat="YYYY-MM-DD HH:mm:ss"
-                    format="YYYY-MM-DD HH"
-                  />
+                <a-form-item label="截港时间" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
+                  <a-date-picker show-time v-decorator="['closingdate']" :style="{ width: '100%' }" placeholder="请选择截港时间"
+                    valueFormat="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH" />
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item
-                  label="截单时间"
-                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
-                  has-feedback
-                >
-                  <a-date-picker
-                    show-time
-                    v-decorator="['closedocdate']"
-                    :style="{ width: '100%' }"
-                    placeholder="请选择截单时间"
-                    valueFormat="YYYY-MM-DD HH:mm:ss"
-                    format="YYYY-MM-DD HH"
-                  />
+                <a-form-item label="截单时间" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
+                  <a-date-picker show-time v-decorator="['closedocdate']" :style="{ width: '100%' }" placeholder="请选择截单时间"
+                    valueFormat="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH" />
                 </a-form-item>
               </a-col>
             </a-row>
@@ -940,7 +753,7 @@ export default {
         // }
       }
     },
-    handleDownByBc() {},
+    handleDownByBc() { },
     // 批量编辑
     editingHandleOk() {
       const {
@@ -1049,7 +862,7 @@ export default {
     },
     getConfigUser(isInit = false) {
       const query = {
-        typeArr: ['booking_list_cond', 'booking_list_column', 'booking_list_page']
+        typeArr: ['booking_list_cond', 'booking_list_column', 'booking_list_page', 'booking_sort']
       }
       DjyUserConfigMulti(this.$qs.stringify(query, { arrayFormat: 'repeat' })).then((res) => {
         const $data = {}
@@ -1063,6 +876,9 @@ export default {
               this.$set($data, 'booking_list_column', item)
               // this.setTableList(item)
               break
+            case 'booking_sort':
+              this.setSort(item)
+              break
             case 'booking_list_page':
               this.setPageSize(item)
               break
@@ -1081,6 +897,15 @@ export default {
         }
       })
     },
+    setSort(item) {
+
+      const key = JSON.parse(item.configJson).key
+      const sort = JSON.parse(item.configJson).sort
+      this.tableOrderLabel = key || ''
+      this.tableOrderType = sort || ''
+      this.$refs.xGrid.sort(key, sort)
+      console.log(this.$refs.xGrid)
+    },
     // 船公司 - start
     getCarrier() {
       const Rdata = (data) => {
@@ -1207,6 +1032,7 @@ export default {
       }
       this.$forceUpdate()
     },
+    customSortMethod() { },
     setTableList(data) {
       if (Object.keys(data).length > 0 && JSON.parse(data.configJson).length) {
         this.formTableData = JSON.parse(data.configJson)
@@ -1242,7 +1068,7 @@ export default {
     setPageSize(data) {
       if (data && JSON.parse(data.configJson)) {
         this.gridOptions.pagerConfig.pageSize = JSON.parse(data.configJson).pageSize
-        this.getList({}, true, 'add')
+        // this.getList({}, true, 'add')
         this.$forceUpdate()
       } else {
         this.getList({}, true)
@@ -1537,6 +1363,10 @@ export default {
             })
             this.$set(this.gridOptions.pagerConfig, 'total', res.data.totalCount)
             this.setBookingList(newBookingList)
+            if (this.tableOrderType) {
+              this.$refs.xGrid.sort(this.tableOrderLabel, this.tableOrderType)
+            }
+
             this.$forceUpdate()
           } else {
             this.$set(this.gridOptions, 'data', [...[]])
@@ -1634,10 +1464,20 @@ export default {
     },
     tableSortChange(e) {
       const { property, order } = e
+      console.log(property, order)
       this.tableOrderLabel = property || ''
       this.tableOrderType = order || ''
-      console.log('== 当前搜索内容 ==', this.searchData)
-      this.getList(this.searchData)
+      const data = {
+        key: property,
+        sort: order
+      }
+      DjyUserConfigAdd({
+        type: 'booking_sort',
+        configJson: JSON.stringify(data)
+      }).then((res) => {
+        this.getList(this.searchData)
+      })
+      // this.$refs.xGrid.sort(this.tableOrderLabel, this.tableOrderType)
     },
     enmuBookingBtn(val) {
       switch (val) {
@@ -2009,22 +1849,27 @@ export default {
 /*列表排序按钮 */
 .vxe-cell--sort {
   margin-top: -6px;
+
   i {
     font-size: 10px;
   }
+
   .vxe-sort--asc-btn {
     margin-top: 6px;
   }
 }
+
 /*列表表头 */
 .vxe-header--row {
   position: relative;
   background: #fff !important;
+
   .vxe-cell--sort {
     position: absolute;
     z-index: 3;
     right: 0;
   }
+
   &::after {
     content: '';
     position: absolute;
@@ -2037,6 +1882,7 @@ export default {
     opacity: 0.04;
   }
 }
+
 /*列表分页 */
 .vxe-pager {
   margin: 8px 0;
@@ -2047,14 +1893,17 @@ export default {
 .mblno {
   text-align: left;
   color: @primary-color !important;
+
   span {
     margin-right: 0.5rem;
     cursor: pointer;
   }
+
   .CSMblnoCopy {
     cursor: pointer;
   }
 }
+
 // .vessel {
 //   color: #77c950;
 // }
@@ -2070,6 +1919,7 @@ export default {
     height: 28px;
     line-height: 26px;
     color: #000;
+
     .iconfont {
       margin-right: 6px;
     }
@@ -2083,6 +1933,7 @@ export default {
       .iconfont {
         color: #1d8aff;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -2093,6 +1944,7 @@ export default {
       .iconfont {
         color: #865ef8;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -2103,6 +1955,7 @@ export default {
       .iconfont {
         color: #ff9702;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -2113,6 +1966,7 @@ export default {
       .iconfont {
         color: #1d8aff;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -2123,6 +1977,7 @@ export default {
       .iconfont {
         color: #ff1062;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -2133,6 +1988,7 @@ export default {
       .iconfont {
         color: #1ebeca;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -2143,6 +1999,7 @@ export default {
       .iconfont {
         color: #82c93d;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -2153,15 +2010,18 @@ export default {
       .iconfont {
         color: #1d8aff;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
       }
     }
+
     &:nth-of-type(9) {
       .iconfont {
         color: #f6826b;
       }
+
       &:hover {
         background: #fff;
         box-shadow: 0 0 10px #eee;
@@ -2175,8 +2035,10 @@ export default {
   cursor: pointer;
   padding-top: 6px;
 }
+
 .BookTopButton {
   height: 33px;
+
   .tab-btn {
     padding: 6px 9px;
     border: 1px solid #c7c7c9;
@@ -2189,13 +2051,16 @@ export default {
     -webkit-user-select: 0 2px 0 rgba(0, 0, 0, 0.02);
   }
 }
+
 .table-page-search-submitButtons {
   text-align: right;
   padding-top: 6px;
+
   .reset {
     margin-left: 8px;
     margin-right: 8px;
   }
+
   .more-search {
     margin-left: 8px;
     margin-right: 20px;
@@ -2204,6 +2069,7 @@ export default {
     position: relative;
     box-shadow: none !important;
   }
+
   /*.tab-btn{
     margin-left:8px;
     margin-right: 10px;
@@ -2216,11 +2082,13 @@ export default {
   .tab-btn {
     cursor: pointer;
     position: relative;
+
     i {
       font-size: 14px;
       margin-left: 8px;
     }
   }
+
   .tab-btn::before {
     content: '';
     position: absolute;
@@ -2230,15 +2098,18 @@ export default {
     top: 2px;
     left: -20px;
   }
+
   .senior-search {
     margin-left: 36px;
     color: rgba(0, 0, 0, 0.65);
     position: relative;
+
     i {
       margin-left: 3px;
       font-size: 15px;
     }
   }
+
   .senior-search::before {
     content: '';
     position: absolute;
@@ -2248,16 +2119,20 @@ export default {
     top: 2px;
     left: -16px;
   }
+
   .senior-search:hover {
     color: @primary-color;
+
     i {
       color: @primary-color;
     }
   }
 }
+
 .ant-btn {
   margin-right: 8px;
 }
+
 .table {
   margin: 8px auto 20px;
 }
@@ -2267,23 +2142,28 @@ export default {
   // height: 40px;
   display: inline-block;
 }
+
 .group-label-box {
   width: 100%;
+
   .group-label {
     width: 100%;
     display: flex;
     flex-wrap: wrap;
+
     .ant-radio-wrapper {
       height: 45px !important;
       line-height: 45px !important;
       width: 10%;
       margin: 0;
     }
+
     // .label-flex {
     //   flex: 1;
     // }
   }
 }
+
 .Awrapper {
   width: 100% !important;
   display: flex !important;
@@ -2291,6 +2171,7 @@ export default {
   line-height: 45px !important;
   width: 10%;
   margin: 0;
+
   .line {
     margin-left: 10px;
     margin-right: 40px;
@@ -2299,6 +2180,7 @@ export default {
     border-bottom: 1px solid #c9c9c9;
   }
 }
+
 /*查询区日期默认颜色 */
 /deep/ .ant-calendar-today {
   .ant-calendar-date {
@@ -2306,12 +2188,14 @@ export default {
     border-color: @primary-color !important;
   }
 }
+
 /*方块边框按钮 */
 .tab-btn:hover {
   border-color: @primary-color;
   color: @primary-color;
   transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
 }
+
 /*列表双列背景色 */
 // /deep/ .vxe-table--render-default .vxe-body--row.row--stripe {
 //   // background: #f5f9fe;
@@ -2335,10 +2219,12 @@ export default {
 /deep/ .operate-btn {
   color: @primary-color;
 }
+
 /deep/ .operate-btn:hover {
   color: @primary-color !important;
   opacity: 0.7;
 }
+
 .book-btn {
   display: inline-block;
   padding: 0 10px;
@@ -2348,28 +2234,35 @@ export default {
   color: #999;
   font-size: 12px;
   line-height: 24px;
+
   i {
     display: none;
   }
+
   &.sta_so {
     color: #8bc34a;
     border: 1px solid #8bc34a;
   }
+
   &.sta_bc {
     color: #fbc02d;
     border: 1px solid #fbc02d;
   }
+
   &.sta_letter_yard {
     color: #00bcd4;
     border: 1px solid #00bcd4;
   }
+
   &.sta_xhz {
     color: #e64a19;
     border: 1px solid #e64a19;
   }
 }
+
 .billtrace-box {
   width: 100%;
+
   // display: flex;
   // height: 48px;
   // flex-wrap:wrap;
@@ -2379,6 +2272,7 @@ export default {
     display: inline-block;
     font-size: 12px;
     height: 16px;
+
     // width:30%;
     // display: flex;
     span {
@@ -2386,15 +2280,18 @@ export default {
       text-align: right;
       color: #999;
     }
+
     i {
       font-size: 12px;
       color: #ccc;
       // flex: 1;
       text-align: center;
+
       &.hide {
         opacity: 0;
       }
     }
+
     .active {
       cursor: pointer;
       // color: @primary-color;
@@ -2403,11 +2300,13 @@ export default {
     }
   }
 }
+
 .normal-box {
   .billtrace-btn {
     display: inline-block;
   }
 }
+
 .flex-box {
   display: flex;
   height: 48px;
@@ -2415,31 +2314,37 @@ export default {
   padding: 3px 0;
   text-align: center;
   justify-content: center;
+
   .billtrace-btn {
     font-size: 12px;
     height: 16px;
     width: 30%;
     display: flex;
+
     span {
       flex: 1;
       text-align: right;
       color: #999;
     }
+
     i {
       font-size: 12px;
       color: #ccc;
       flex: 1;
       text-align: center;
+
       &.hide {
         opacity: 0;
       }
     }
+
     .active {
       cursor: pointer;
       // color: @primary-color;
       color: #ff9702;
       font-weight: bold;
     }
+
     &:nth-of-type(3) {
       i {
         opacity: 0;
@@ -2447,23 +2352,29 @@ export default {
     }
   }
 }
+
 /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;
@@ -2471,9 +2382,11 @@ export default {
   text-align: center;
   // background: #f99;
 }
+
 .reamrk-btns {
   overflow: visible;
 }
+
 /deep/ .from-label {
   padding: 0 !important;
 }
@@ -2495,8 +2408,10 @@ export default {
       margin-right: 4px;
     }
   }
+
   .table-page-search-submitButtons .senior-search {
     margin-left: 20px;
+
     &::before {
       left: -7px;
     }
@@ -2504,9 +2419,10 @@ export default {
 }
 
 /deep/ .book-remark-box {
-  > .vxe-cell {
+  >.vxe-cell {
     overflow: visible !important;
   }
+
   /deep/ .vxe-cell {
     overflow: visible !important;
   }
@@ -2514,6 +2430,7 @@ export default {
 
 .bookremark {
   position: relative;
+
   .reamrk-label {
     width: 100%;
     white-space: nowrap;
@@ -2530,12 +2447,14 @@ export default {
   display: flex;
   height: 48px;
   align-items: center;
+
   .goods-status-left {
     flex: 1;
     overflow: hidden;
     height: 48px;
     text-overflow: ellipsis;
     white-space: nowrap;
+
     .goods-tip {
       font-size: 12px;
       margin: 0 4px;
@@ -2546,10 +2465,12 @@ export default {
       color: @primary-color;
     }
   }
+
   .goods-status-right {
     width: 30px;
     text-align: center;
     height: 48px;
+
     i {
       color: @primary-color;
       cursor: pointer;
@@ -2557,6 +2478,7 @@ export default {
       line-height: 48px;
     }
   }
+
   .TablelstShipOrderCompareRltRedo {
     cursor: pointer;
     margin-left: 0.5rem;
@@ -2588,9 +2510,11 @@ export default {
 /deep/.line-box:nth-of-type(2n) {
   position: relative;
   background: #fff;
-  > * {
+
+  >* {
     z-index: 1;
   }
+
   &::after {
     content: '';
     position: absolute;
@@ -2602,6 +2526,7 @@ export default {
     background: @primary-color;
     opacity: 0.04;
   }
+
   .book-remark-box {
     .bookremark {
       .reamrk-list {
@@ -2627,12 +2552,14 @@ export default {
   white-space: normal;
   text-align: left;
   z-index: 999 !important;
+
   .title {
     height: 30px;
     line-height: 30px;
     font-size: 12px;
     font-weight: 600;
   }
+
   .list {
     border-bottom: 1px solid #eee;
     padding: 6px 0;
@@ -2640,15 +2567,18 @@ export default {
     font-size: 12px;
     color: #666;
     word-break: break-all;
+
     &:nth-last-of-type(1) {
       border: none;
     }
+
     .icon {
       margin-right: 4px;
       color: @primary-color;
     }
   }
 }
+
 .goods-hovers-list {
   max-height: 400px;
   position: fixed;
@@ -2667,6 +2597,7 @@ export default {
   transition: 0.5s all;
   display: block;
   opacity: 1;
+
   &.seat-top {
     &::before {
       display: none;
@@ -2675,10 +2606,12 @@ export default {
       // left: 50%;
     }
   }
+
   &.hide-goods-hover {
     display: none;
     opacity: 0;
   }
+
   // overflow: auto;
   &::before {
     content: '';
@@ -2702,6 +2635,7 @@ export default {
     font-size: 12px;
     font-weight: 600;
   }
+
   .goods-btn {
     display: inline-block;
     font-size: 12px;
@@ -2716,10 +2650,12 @@ export default {
     text-align: center;
     margin: 0 2px 8px;
     cursor: pointer;
+
     &.active {
       color: @primary-color;
       border: 1px solid @primary-color;
     }
+
     .icon {
       margin-right: 4px;
       color: @primary-color;
@@ -2730,6 +2666,7 @@ export default {
 @media (min-width: 1192px) and (max-width: 1591px) {
   .booking-from-box {
     padding-right: 24px;
+
     /deep/ .ant-calendar-picker-icon {
       display: none;
     }
@@ -2741,6 +2678,7 @@ export default {
     margin-top: -4px !important;
   }
 }
+
 /deep/ .ant-form-item-control-wrapper {
   overflow: hidden !important;
 }
@@ -2749,59 +2687,73 @@ export default {
   display: block;
   color: #aaa;
   font-size: 14px;
+
   i {
     line-height: 120px;
     font-size: 100px;
   }
 }
+
 /deep/ .content-table .vxe-body--column .vxe-cell div {
   color: #000;
 }
+
 .pono {
   text-align: left;
 }
+
 /deep/ .vxe-header--row th {
   text-align: left !important;
 }
+
 /deep/ .vxe-cell--title {
   width: 100%;
   text-align: left;
 }
+
 .TaskShippingOrderCompareP {
   border-bottom: 1px solid #000;
   padding: 5px;
   background: #0000000e;
+
   .TaskShippingOrderCompareSpan {
     font-weight: bolder;
     color: red;
   }
 }
+
 .TaskShippingOrderCompareMainBox {
   height: 55vh;
   overflow-y: auto;
+
   .TaskShippingOrderCompareMain {
     p {
       margin-bottom: 0;
     }
+
     .TaskShippingOrderCompareMainHeader {
       display: flex;
-      > div {
+
+      >div {
         &:nth-child(1) {
           flex: 3;
         }
+
         &:nth-child(2) {
           width: 46px;
         }
+
         &:nth-child(3) {
           flex: 3;
         }
 
-        > p {
+        >p {
           &:first-child {
             font-weight: bolder;
           }
         }
       }
+
       &.Box {
         border-top: 1px solid #000;
         // border-bottom: 1px solid #000;
@@ -2809,22 +2761,28 @@ export default {
         margin-bottom: 0.5rem;
       }
     }
+
     .TaskShippingOrderCompareMainList {
       display: flex;
       align-items: center;
       margin-bottom: 0.5rem;
-      > p {
+
+      >p {
         flex: 2;
+
         &:nth-child(1) {
           flex: 1;
         }
+
         &:nth-child(3) {
           flex: 0;
           margin: 0 1rem;
         }
+
         &:nth-child(4) {
           flex: 1;
         }
+
         // &:nth-child(3) {
         //   flex: 2;
         //   margin: 0 1rem;
@@ -2842,9 +2800,11 @@ export default {
         //   padding-left: 0.5rem;
         // }
       }
+
       &.BoxNo {
         padding-top: 0.5rem;
         border-top: 1px solid #000;
+
         &:nth-child(1) {
           padding-top: 0;
           border: none;
@@ -2853,6 +2813,7 @@ export default {
     }
   }
 }
+
 // .form-box{
 //   .form-main{
 //     float: left;

From dedac4eb4c7aa2dfa3c231c1a154136ce2818b67 Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Thu, 18 May 2023 13:32:18 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main/BookingLedger/list/index.vue   |  4 +-
 .../BookingLedger/list/modules/formLabel.vue  | 83 ++++++-------------
 .../BookingLedger/list/modules/initData.js    |  2 +-
 3 files changed, 28 insertions(+), 61 deletions(-)

diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index a3ff544..173e57c 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -1722,8 +1722,8 @@ export default {
           return GetSysUserPage
         case 'ROUTE':
           return GetSysUserPage
-        case 'OP':
-          return GetSysUserPage
+        // case 'OP':
+        //   return GetSysUserPage
         case 'DOC':
           return GetSysUserPage
         case 'CUSTOMSER':
diff --git a/src/views/main/BookingLedger/list/modules/formLabel.vue b/src/views/main/BookingLedger/list/modules/formLabel.vue
index 00a8402..4e7dfd3 100644
--- a/src/views/main/BookingLedger/list/modules/formLabel.vue
+++ b/src/views/main/BookingLedger/list/modules/formLabel.vue
@@ -4,50 +4,21 @@
       <inputView ref="inputView" :type="labelData.label" :parentVal="value" @getInputChange="inputChange" />
     </template>
     <template v-else-if="labelData.type == 'date'">
-      <datePickerView
-        ref="datePickerView"
-        class="date-picker"
-        :parentVal="value"
-        type="etd"
-        format="YYYY-MM-DD"
-        @dateChange="dateChangeFun"
-      ></datePickerView>
+      <datePickerView ref="datePickerView" class="date-picker" :parentVal="value" type="etd" format="YYYY-MM-DD"
+        @dateChange="dateChangeFun"></datePickerView>
     </template>
     <template v-else-if="labelData.type == 'dateRange'">
       <div class="picker-box" style="display: flex; padding-right: 2px">
-        <a-date-picker
-          style="min-width: 30px; flex: 1"
-          v-model="startValue"
-          :disabled-date="disabledStartDate"
-          format="YYYY-MM-DD"
-          suffixIcon=" "
-          placeholder="开始时间"
-          @openChange="handleStartOpenChange"
-        />
+        <a-date-picker style="min-width: 30px; flex: 1" v-model="startValue" :disabled-date="disabledStartDate"
+          format="YYYY-MM-DD" suffixIcon=" " placeholder="开始时间" @openChange="handleStartOpenChange" />
         <span style="margin: 0 4px">-</span>
-        <a-date-picker
-          style="min-width: 30px; flex: 1"
-          v-model="endValue"
-          :disabled-date="disabledEndDate"
-          format="YYYY-MM-DD"
-          placeholder="结束时间"
-          suffixIcon=" "
-          :open="endOpen"
-          @openChange="handleEndOpenChange"
-        />
+        <a-date-picker style="min-width: 30px; flex: 1" v-model="endValue" :disabled-date="disabledEndDate"
+          format="YYYY-MM-DD" placeholder="结束时间" suffixIcon=" " :open="endOpen" @openChange="handleEndOpenChange" />
       </div>
     </template>
     <template v-else-if="labelData.type == 'select'">
-      <a-select
-        size="small"
-        style="margin-top: 7px"
-        v-model="value"
-        show-search
-        :dropdownMatchSelectWidth="false"
-        :filter-option="filterOption"
-        @change="debounce(handleSelectChange, 300, $event)"
-        @focus="getSelectFirst"
-      >
+      <a-select size="small" style="margin-top: 7px" v-model="value" show-search :dropdownMatchSelectWidth="false"
+        :filter-option="filterOption" @change="debounce(handleSelectChange, 300, $event)" @focus="getSelectFirst">
         <template v-if="['CARRIER', 'YARDID', 'ISSUETYPE', 'CARGOID'].includes(labelData.label)">
           <a-select-option v-for="(sitem, sindex) in dataList" :key="sindex">
             {{ sitem[labelData.showLabel2] }}/ {{ sitem[labelData.showLabel] }}
@@ -61,18 +32,9 @@
       </a-select>
     </template>
     <template v-else-if="labelData.type == 'complete'">
-      <auto-complete
-        size="small"
-        :allowClear="true"
-        class="customer-input"
-        :dropdown-match-select-width="false"
-        :dropdown-style="{ width: '200px' }"
-        v-model="value"
-        option-label-prop="label"
-        @select="completeSelect"
-        @focus="completeChangeFirst"
-        @change="debounce(completeChange, 300, $event)"
-      >
+      <auto-complete size="small" :allowClear="true" class="customer-input" :dropdown-match-select-width="false"
+        :dropdown-style="{ width: '200px' }" v-model="value" option-label-prop="label" @select="completeSelect"
+        @focus="completeChangeFirst" @change="debounce(completeChange, 300, $event)">
         <!-- <template slot="dataSource" v-if="labelData.label === 'VESSEL'">
           <a-select-option v-for="(item, index) in dataSourceList" :key="index" :value="item[labelData.showLabel]">
             <div class="vessel-label">
@@ -82,12 +44,8 @@
           </a-select-option>
         </template>-->
         <template slot="dataSource">
-          <a-select-option
-            v-for="(item, index) in dataSourceList"
-            :key="`${index}-${item[labelData.showLabel]}`"
-            :value="`${index}-${item[labelData.showLabel]}`"
-            :label="item[labelData.showLabel]"
-          >
+          <a-select-option v-for="(item, index) in dataSourceList" :key="`${index}-${item[labelData.showLabel]}`"
+            :value="`${index}-${item[labelData.showLabel]}`" :label="item[labelData.showLabel]">
             <div>
               <div class="title">{{ item[labelData.showLabel] }}</div>
             </div>
@@ -183,7 +141,7 @@ export default {
       'bookingInitData'
     ])
   },
-  mounted() {},
+  mounted() { },
   methods: {
     debounce(func, wait, ...args) {
       if (timer) clearTimeout(timer)
@@ -280,7 +238,8 @@ export default {
             'CARRIER',
             'NOBILL',
             'CARGOID',
-            'zhanCangFlag'
+            'zhanCangFlag',
+            'OP'
           ].includes(this.labelData.label)
         ) {
           this.dataList = this.emnuData(this.labelData.label)
@@ -294,6 +253,7 @@ export default {
       }
     },
     emnuData(type) {
+      console.log(this.bookingInitData.opInitList)
       switch (type) {
         case 'LINENAME':
           return this.lineList
@@ -313,6 +273,8 @@ export default {
           return this.labelData.data
         case 'zhanCangFlag':
           return this.labelData.data
+        case 'OP':
+          return this.bookingInitData.opInitList
       }
     },
     completeSelect(value) {
@@ -345,7 +307,6 @@ export default {
           'FORWARDER',
           'SALE',
           'CUSTSERVICE',
-          'OP',
           'DOC',
           'ROUTE',
           'PAYABLEAT',
@@ -396,10 +357,13 @@ export default {
 .aa {
   transform: scaleY(0.8);
 }
+
 /deep/ .ant-select-selection__clear {
   margin-top: 0;
 }
+
 .vessel-label {
+
   // border-bottom:1px solid #eee;
   .title {
     height: 28px;
@@ -410,6 +374,7 @@ export default {
     border-bottom: 1px dashed #ddd;
     margin-bottom: 4px;
   }
+
   .voyno,
   .etd {
     height: 22px;
@@ -422,10 +387,12 @@ export default {
 /deep/.ant-calendar-picker-input {
   overflow: hidden;
 }
+
 /deep/.ant-calendar-range-picker-input {
   height: 24px !important;
   line-height: 24px !important;
 }
+
 /deep/ .ant-input {
   height: 24px !important;
 }
diff --git a/src/views/main/BookingLedger/list/modules/initData.js b/src/views/main/BookingLedger/list/modules/initData.js
index 51822fe..0d98e00 100644
--- a/src/views/main/BookingLedger/list/modules/initData.js
+++ b/src/views/main/BookingLedger/list/modules/initData.js
@@ -468,7 +468,7 @@ export default {
     { title: '装货港', align: 'center', width: 120, label: 'PORTLOAD', type: 'complete', showLabel: 'enName' },
     { title: '揽货人', align: 'center', width: 120, label: 'SALE', type: 'complete', showLabel: 'name' }, // 销售
     { title: '客服员', align: 'center', width: 120, label: 'CUSTSERVICE', type: 'complete', showLabel: 'name' },
-    { title: '操作员', align: 'center', width: 120, label: 'OP', type: 'complete', showLabel: 'name' },
+    { title: '操作员', align: 'center', width: 120, label: 'OP', type: 'select', showLabel: 'name' },
     { title: '单证员', align: 'center', width: 120, label: 'DOC', type: 'complete', showLabel: 'name' },
     { title: '报关行', align: 'center', width: 120, label: 'CUSTOMSER', type: 'complete', showLabel: 'shortName' },
     { title: '订舱编号', align: 'center', width: 120, label: 'CUSTNO', type: 'input' },

From 8a2335ce2d6122fd63df87e381af6215915b785f Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Thu, 18 May 2023 16:37:18 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modular/main/BookingLedger.js         |  10 +-
 src/components/Table/index.js                 |  35 +-
 src/store/modules/booking.js                  |  12 +-
 .../detail/modules/mailingInfo.vue            |  58 ++-
 .../detail/style/mailingInfo.less             |  17 +
 src/views/main/BookingLedger/list/index.vue   | 359 ++++++++++++++----
 src/views/system/user/index.vue               |  31 +-
 7 files changed, 395 insertions(+), 127 deletions(-)

diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js
index 63919f8..0625b4b 100644
--- a/src/api/modular/main/BookingLedger.js
+++ b/src/api/modular/main/BookingLedger.js
@@ -773,7 +773,7 @@ export function DeleteBookingOrder(parameter) {
   })
 }
 
-//恢复删除
+// 恢复删除
 export function RecoverDeleteOrder(parameter) {
   return axios({
     url: '/BookingOrder/RecoverDelete?Ids=' + parameter,
@@ -864,3 +864,11 @@ export function seaeEdiCustEDI(parameter) {
     data: parameter
   })
 }
+
+export function downloadBookingConfirm(parameter) {
+  return axios({
+    url: '/BookingValueAdded/DownloadBookingConfirm',
+    method: 'post',
+    data: parameter
+  })
+}
diff --git a/src/components/Table/index.js b/src/components/Table/index.js
index 33f75c5..e42b8a4 100644
--- a/src/components/Table/index.js
+++ b/src/components/Table/index.js
@@ -46,6 +46,10 @@ export default {
       type: Boolean,
       default: true
     },
+    pageSizeOptions: {
+      type: Array,
+      default: ['10', '20', '30', '40', '50']
+    },
     size: {
       type: String,
       default: 'middle'
@@ -125,7 +129,7 @@ export default {
           current: localPageNum,
           pageSize: this.pageSize,
           showSizeChanger: this.showSizeChanger,
-          //pageSizeOptions: ['10', '20', '30', '40', '50'], //分页选项
+          pageSizeOptions: this.pageSizeOptions,
           showTotal: (total, range) => {
             return range[0] + '-' + range[1] + '共' + total + '条'
           }
@@ -134,16 +138,16 @@ export default {
     this.needTotalList = this.initTotalList(this.columns)
     this.loadData()
     // this.columnsSetting = this.columns
-    //记录选择显示的列，以当前路由为key
+    // 记录选择显示的列，以当前路由为key
 
     this.columnsSetting = []
-    let cacheColumns = this.$ls.get(this.$route.path)
+    const cacheColumns = this.$ls.get(this.$route.path)
     if (cacheColumns && cacheColumns.length > 0) {
       this.columnsSetting = cacheColumns
 
       this.columns.forEach((item, index, arr) => {
-        let temp = this.columnsSetting.find(m => m.dataIndex == item.dataIndex)
-        //如果存在
+        const temp = this.columnsSetting.find(m => m.dataIndex == item.dataIndex)
+        // 如果存在
         if (temp) {
           arr[index].checked = temp.checked
         }
@@ -178,7 +182,9 @@ export default {
      * @param {Object} sorter 排序条件
      */
     loadData(pagination, filters, sorter) {
+      console.log(pagination)
       this.localLoading = true
+
       const parameter = Object.assign(
         {
           pageNo:
@@ -188,20 +194,17 @@ export default {
             (this.showPagination && this.localPagination.pageSize) ||
             this.pageSize
         },
-        (sorter &&
-          sorter.field && {
-            sortField: sorter.field
-          }) ||
-          {},
-        (sorter &&
-          sorter.order && {
-            sortOrder: sorter.order
-          }) ||
-          {},
+        (sorter && sorter.field && { SortField: sorter.field }) || {},
+        (sorter && sorter.order && { sortOrder: sorter.order }) || {},
         {
           ...filters
         }
       )
+      if (sorter && sorter.order === 'descend') {
+        parameter.DescSort = true
+      } else {
+        parameter.DescSort = false
+      }
       const result = this.data(parameter)
       // 对接自己的通用数据接口需要修改下方代码中的 r.pageNo, r.totalCount, r.data
       // eslint-disable-next-line
@@ -379,7 +382,7 @@ export default {
           title: '列设置',
           isDropdown: true,
           menu: () => {
-            //return <columnSetting slot="overlay" columns={this.columns} onColumnChange={this.columnChange} />
+            // return <columnSetting slot="overlay" columns={this.columns} onColumnChange={this.columnChange} />
             return <columnSetting slot="overlay" columns={this.columnsSetting} onColumnChange={this.columnChange} />
           },
           onClick: () => {}
diff --git a/src/store/modules/booking.js b/src/store/modules/booking.js
index bcffd67..c06fabb 100644
--- a/src/store/modules/booking.js
+++ b/src/store/modules/booking.js
@@ -330,12 +330,12 @@ const booking = {
                   allData['payableatInitList'] = $data
                   break
                 case 'user':
-                  allData['saleInitList'] = $data.result
-                  allData['opInitList'] = $data.result
-                  allData['docInitList'] = $data.result
-                  allData['custserviceInitList'] = $data.result
-                  allData['routeInitList'] = $data.result
-                  allData['lineManageInitList'] = $data.result
+                  allData['saleInitList'] = $data
+                  allData['opInitList'] = $data
+                  allData['docInitList'] = $data
+                  allData['custserviceInitList'] = $data
+                  allData['routeInitList'] = $data
+                  allData['lineManageInitList'] = $data
                   break
                 case 'contractno':
                   allData['contractnoInitList'] = $data
diff --git a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
index b83688a..7155ffa 100644
--- a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
@@ -13,9 +13,26 @@
       <div class="mail-info">
         <a-form-model :selfUpdate="true" ref="mailingFrom" :model="details" :rules="rules">
           <a-row :gutter="10">
-            <a-col class="left-sender-box" :xs="24" :sm="24" :md="24" :lg="10" :xl="11">
+            <a-col
+              class="left-sender-box"
+              :xs="24"
+              :sm="24"
+              :md="24"
+              :lg="10"
+              :xl="11">
               <a-form-model-item has-feedback prop="shipper" class="sender-label" style="overflow: hidden">
                 <div class="sender">
+                  <a-tooltip>
+                    <template slot="title">
+                      <p>PIL要求 EDI和ESI报文只允许所有报文中的每个record中的ascii代码，必须小于0x7E，大于等于0x20, 每个Record必须250字节,必填项为数值类型的，不足位数用0补齐。</p>
+                      <p>1、发货人Rec16，收货人Rec21，通知人Rec26: 公司抬头两行，地址三行，每行35字节；</p>
+                      <p>2、第1/2行是公司抬头栏（字段23-92），总共70字节，不足70字节请留空占位；</p>
+                      <p>3、第3/4/5行是地址栏（字段93-197），总共105字节，超过105字节，通过星号*链接去rec47品名栏显示；</p>
+                      <p>4、极个别情况下，公司抬头可能超过70字节，超出部分放在第三行；</p>
+                      <p> 5、无论什么情况，报文里地址信息都不放在在第1/2两行，即不占23-92字段。</p>
+                    </template>
+                    <div class="move-btn" ><a-icon type="info-circle" /></div>
+                  </a-tooltip>
                   <div class="top" :class="{ required: rules['shipper'] && rules['shipper'][0].required }">
                     <div class="name"><span class="iconfont icon-bianji"></span>发货人</div>
                     <selectView
@@ -72,8 +89,13 @@
                       @change="getSelectViewRes"
                       style="flex: 1"
                     ></selectView>
-                    <a-button class="save-btn" type="link" size="small" icon="save" @click="saveModel('consignee')"
-                      >保存</a-button
+                    <a-button
+                      class="save-btn"
+                      type="link"
+                      size="small"
+                      icon="save"
+                      @click="saveModel('consignee')"
+                    >保存</a-button
                     >
                     <div class="right">
                       <span class="btn-circle" @click="spliceMore('consignee')" :style="{ fontSize: '14px' }">*</span>
@@ -119,8 +141,13 @@
                       @change="getSelectViewRes"
                       style="flex: 1"
                     ></selectView>
-                    <a-button class="save-btn" type="link" size="small" icon="save" @click="saveModel('notifyparty')"
-                      >保存</a-button
+                    <a-button
+                      class="save-btn"
+                      type="link"
+                      size="small"
+                      icon="save"
+                      @click="saveModel('notifyparty')"
+                    >保存</a-button
                     >
                     <div class="right">
                       <span class="btn-circle" @click="spliceMore('notifyparty')" :style="{ fontSize: '14px' }">*</span>
@@ -148,7 +175,13 @@
                 </div>
               </a-form-model-item>
             </a-col>
-            <a-col class="right-content" :xs="24" :sm="24" :md="24" :lg="14" :xl="13">
+            <a-col
+              class="right-content"
+              :xs="24"
+              :sm="24"
+              :md="24"
+              :lg="14"
+              :xl="13">
               <a-row :gutter="16">
                 <div class="right-content-top">
                   <a-col :span="12">
@@ -1144,15 +1177,15 @@ export default {
     },
     SetTOTALNO(SS) {
       SS = SS.toString()
-      let i = SS.indexOf('\n')
+      const i = SS.indexOf('\n')
       let num = 0
       let strKind = ''
       let enCapital = ''
       if (i > 0) {
-        let slist = SS.split('\n')
+        const slist = SS.split('\n')
         for (let i = 0; i < slist.length; i += 1) {
-          let member = slist[i]
-          let strNum = this.GetStringNum(member)
+          const member = slist[i]
+          const strNum = this.GetStringNum(member)
           if (i == 0) {
             strKind = member.substring(strNum.length)
           }
@@ -1266,14 +1299,15 @@ export default {
         }
         a = a.substring(1)
       }
-      if (a.length == 2)
-        if (a.substr(0, 1) == '0') a = a.substring(1)
+      if (a.length == 2) {
+ if (a.substr(0, 1) == '0') a = a.substring(1)
         else if (a.substr(0, 1) == '1') strRet += arr4[a.substr(1, 2)]
         else {
           strRet += arr2[a.substr(0, 1)]
           if (a.substr(1, 1) != '0') strRet += '-'
           a = a.substring(1)
         }
+}
       if (a.length == 1 && a.substr(0, 1) != '0') strRet += arr3[a.substr(0, 1)]
       return strRet
     },
diff --git a/src/views/main/BookingLedger/detail/style/mailingInfo.less b/src/views/main/BookingLedger/detail/style/mailingInfo.less
index 9f917ce..450428b 100644
--- a/src/views/main/BookingLedger/detail/style/mailingInfo.less
+++ b/src/views/main/BookingLedger/detail/style/mailingInfo.less
@@ -237,6 +237,23 @@
       }
     }
   }
+  .sender{
+    position: relative;
+    .move-btn{
+      position: absolute;
+      height: 20px;
+      // transform: rotateY(180deg);
+      top: 5px; 
+      right: 0;
+      // background: #f99;
+      z-index: 99;
+      i{
+        display: block;
+        font-size: 14px;
+        color: #ff9702;
+      }
+    }
+  }
   /deep/ .ant-form-item-children-icon .anticon-check-circle {
     display: none;
   }
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 173e57c..30cb138 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -8,17 +8,30 @@
               <a-form layout="inline">
                 <a-row :gutter="48" class="booking-from-box">
                   <template v-for="(formLabel, findex) in formData">
-                    <a-col :md="6" :lg="6" :xl="4" :key="findex" v-show="(findex < 4 && !advanced) || advanced"
+                    <a-col
+                      :md="6"
+                      :lg="6"
+                      :xl="4"
+                      :key="findex"
+                      v-show="(findex < 4 && !advanced) || advanced"
                       class="from-label">
                       <a-form-item style="padding-left: 10px; padding-right: 10px" :label="formLabel.title">
-                        <formLabel :ref="`fromlabel-${formLabel.label}`" :labelData="formLabel" :formRes="formRes"
-                          :resetType="ResetType" :formIndex="findex" @change="formChange" @pressEnter="pressEnterFun"
-                          @getCompleteList="getCompleteListFun" @selectFirst="getSelectFirst"></formLabel>
+                        <formLabel
+                          :ref="`fromlabel-${formLabel.label}`"
+                          :labelData="formLabel"
+                          :formRes="formRes"
+                          :resetType="ResetType"
+                          :formIndex="findex"
+                          @change="formChange"
+                          @pressEnter="pressEnterFun"
+                          @getCompleteList="getCompleteListFun"
+                          @selectFirst="getSelectFirst"></formLabel>
                       </a-form-item>
                     </a-col>
                   </template>
                   <a-col :xl="formBtnCol || (!advanced && 8)" :lg="24" :md="24" :sm="24">
-                    <span class="table-page-search-submitButtons"
+                    <span
+                      class="table-page-search-submitButtons"
                       :style="(advanced && { float: 'right', overflow: 'hidden' }) || {}">
                       <a-button size="small" type="primary" @click="tableRefresh">查询</a-button>
                       <a-button size="small" class="reset" @click="tableReset">重置</a-button>
@@ -72,7 +85,11 @@
                     >
                       <div class="nav"><i class="iconfont icon-duibi"></i>下货纸比对</div>
                     </a-popconfirm> -->
-                    <a-popconfirm title="确定删除当前选中订舱？" ok-text="是" cancel-text="否" @confirm="removeMoreFun"
+                    <a-popconfirm
+                      title="确定删除当前选中订舱？"
+                      ok-text="是"
+                      cancel-text="否"
+                      @confirm="removeMoreFun"
                       @cancel="cancelRemove">
                       <div class="nav"><i class="iconfont icon-shanchu2"></i>删除</div>
                     </a-popconfirm>
@@ -111,11 +128,20 @@
                   </div>
                 </template>
               </vxe-toolbar>
-              <vxe-grid ref="xGrid" v-bind="gridOptions" row-class-name="line-box" :height="tableHeight"
-                :checkbox_config="{ checkField: 'checked' }" :scroll-x="{ gt: 10, oSize: 10, enabled: false }"
-                :scroll-y="{ gt: 20, oSize: 20, enabled: true }" @page-change="handlePageChange"
-                @cell-dblclick="handledbclick" :sort-config="{ sortMethod: customSortMethod }"
-                @resizable-change="resizableChange" @sort-change="tableSortChange" @scroll="pageClick"
+              <vxe-grid
+                ref="xGrid"
+                v-bind="gridOptions"
+                row-class-name="line-box"
+                :height="tableHeight"
+                :checkbox_config="{ checkField: 'checked' }"
+                :scroll-x="{ gt: 10, oSize: 10, enabled: false }"
+                :scroll-y="{ gt: 20, oSize: 20, enabled: true }"
+                @page-change="handlePageChange"
+                @cell-dblclick="handledbclick"
+                :sort-config="{ sortMethod: customSortMethod }"
+                @resizable-change="resizableChange"
+                @sort-change="tableSortChange"
+                @scroll="pageClick"
                 @checkbox-change="checkboxChangeEvent">
                 <template #mblno="{ row }">
                   <div class="mblno">
@@ -154,7 +180,11 @@
                 </template>
                 <template #operate="{ row }">
                   <vxe-button class="operate-btn" type="text" icon="vxe-icon-edit" @click="editColumns(row)"></vxe-button>
-                  <a-popconfirm title="确定删除当前订舱？" ok-text="是" cancel-text="否" @confirm="removeFun(row)"
+                  <a-popconfirm
+                    title="确定删除当前订舱？"
+                    ok-text="是"
+                    cancel-text="否"
+                    @confirm="removeFun(row)"
                     @cancel="cancelRemove">
                     <vxe-button class="operate-btn" type="text" icon="vxe-icon-delete"></vxe-button>
                   </a-popconfirm>
@@ -192,10 +222,10 @@
                           比对方式:
                           <span>{{
                             row.lstShipOrderCompareMode
-                            ? row.lstShipOrderCompareMode == 'MANUAL'
-                              ? '手动'
-                              : '自动'
-                            : ''
+                              ? row.lstShipOrderCompareMode == 'MANUAL'
+                                ? '手动'
+                                : '自动'
+                              : ''
                           }}</span>
                         </p>
                         <p>
@@ -215,7 +245,9 @@
                       </div>
                     </a-popover>
 
-                    <a-icon class="TablelstShipOrderCompareRltRedo" @click="excuteShippingOrderCompareBatch(row)"
+                    <a-icon
+                      class="TablelstShipOrderCompareRltRedo"
+                      @click="excuteShippingOrderCompareBatch(row)"
                       type="redo" />
                   </div>
                 </template>
@@ -267,8 +299,11 @@
           </x-card>
         </a-col>
       </a-row>
-      <a-modal :title="TaskShippingOrderCompareData.isExistsDiff ? '下货纸比对（有差异）' : '下货纸比对（正常）'"
-        @cancel="TaskShippingOrderCompareHandleCancel" :visible="TaskShippingOrderCompareVisible" width="40%">
+      <a-modal
+        :title="TaskShippingOrderCompareData.isExistsDiff ? '下货纸比对（有差异）' : '下货纸比对（正常）'"
+        @cancel="TaskShippingOrderCompareHandleCancel"
+        :visible="TaskShippingOrderCompareVisible"
+        width="40%">
         <template slot="footer">
           <a-button key="back" @click="TaskShippingOrderCompareHandleCancel"> 关闭 </a-button>
         </template>
@@ -295,8 +330,10 @@
                 <p>{{ TaskShippingOrderCompareData.mBlNo }}</p>
               </div>
             </div>
-            <div class="TaskShippingOrderCompareMainList"
-              v-for="(item, index) in TaskShippingOrderCompareData.showDetailList" :key="index"
+            <div
+              class="TaskShippingOrderCompareMainList"
+              v-for="(item, index) in TaskShippingOrderCompareData.showDetailList"
+              :key="index"
               v-show="item.pCode != 'ContaList'">
               <p>{{ item.fieldName }}:</p>
               <p>{{ item.reqVal }}</p>
@@ -319,9 +356,12 @@
                 <p>箱信息：（场站数据）</p>
               </div>
             </div>
-            <div v-for="(item, index) in TaskShippingOrderCompareData.showDetailList" :key="index"
-              v-show="item.pCode == 'ContaList'" :class="item.fieldName == '箱号' ? 'TaskShippingOrderCompareMainList BoxNo' : 'TaskShippingOrderCompareMainList'
-                ">
+            <div
+              v-for="(item, index) in TaskShippingOrderCompareData.showDetailList"
+              :key="index"
+              v-show="item.pCode == 'ContaList'"
+              :class="item.fieldName == '箱号' ? 'TaskShippingOrderCompareMainList BoxNo' : 'TaskShippingOrderCompareMainList'
+              ">
               <p>{{ item.fieldName }}:</p>
               <p>{{ item.reqVal }}</p>
               <p v-if="item.msg">
@@ -358,18 +398,34 @@
         </a-radio-group>
       </a-modal>
 
-      <a-modal title="多提单号查询" :maskClosable="false" :width="400" :visible="moreNumVisible" @ok="moreNumSubmit"
+      <a-modal
+        title="多提单号查询"
+        :maskClosable="false"
+        :width="400"
+        :visible="moreNumVisible"
+        @ok="moreNumSubmit"
         @cancel="moreNumCancel">
         <div>
           <a-textarea v-model="moreNumVal" style="height: 200px" />
         </div>
       </a-modal>
 
-      <setFormModel ref="setForm" :formData="formData" :formAllData="formMoreData" type="from" @ok="submitForm"
+      <setFormModel
+        ref="setForm"
+        :formData="formData"
+        :formAllData="formMoreData"
+        type="from"
+        @ok="submitForm"
         v-if="formMoreData"></setFormModel>
 
-      <setFormModel ref="setTableForm" :formData="formTableData" :formAllData="formMoreTableData" :maxNum="30"
-        type="table" @ok="submitTableForm" v-if="formMoreTableData"></setFormModel>
+      <setFormModel
+        ref="setTableForm"
+        :formData="formTableData"
+        :formAllData="formMoreTableData"
+        :maxNum="30"
+        type="table"
+        @ok="submitTableForm"
+        v-if="formMoreTableData"></setFormModel>
 
       <div class="hovers-list" :style="{ top: `${remarkScreenY}px`, left: `${remarkScreenX}px` }" v-if="remarkShow">
         <div class="title">备注内容：</div>
@@ -379,11 +435,14 @@
       </div>
 
       <!-- v-show="goodStatusShow" -->
-      <div class="goods-hovers-list" :class="[
-        { 'hide-goods-hover': !goodStatusShow },
-        { 'seat-top': goodStatusSeat === 'top' },
-        { 'seat-bottom': goodStatusSeat === 'bottom' }
-      ]" :style="{ top: `${goodStatusScreenY}px`, left: `${goodStatusScreenX}px` }">
+      <div
+        class="goods-hovers-list"
+        :class="[
+          { 'hide-goods-hover': !goodStatusShow },
+          { 'seat-top': goodStatusSeat === 'top' },
+          { 'seat-bottom': goodStatusSeat === 'bottom' }
+        ]"
+        :style="{ top: `${goodStatusScreenY}px`, left: `${goodStatusScreenX}px` }">
         <div class="title">货运动态</div>
         <template v-for="(goodStatusItem, gindex) in goodStatusData">
           <template v-if="goodStatusItem.finishTime || goodStatusItem.remark">
@@ -410,9 +469,16 @@
           <a-form>
             <a-row :gutter="16">
               <a-col :span="24" class="book-model-box">
-                <a-form-item label="请选择订阅内容" :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }" has-feedback>
-                  <a-checkbox-group class="trace-check" v-model="traceValue" name="checkboxgroup" :options="traceOptions"
+                <a-form-item
+                  label="请选择订阅内容"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
+                  has-feedback>
+                  <a-checkbox-group
+                    class="trace-check"
+                    v-model="traceValue"
+                    name="checkboxgroup"
+                    :options="traceOptions"
                     @change="onTraceChange" />
                 </a-form-item>
               </a-col>
@@ -423,18 +489,33 @@
           <a-button type="primary" @click="traceSend">订阅</a-button>
         </template>
       </a-modal>
-      <a-modal width="820px" :maskClosable="false" v-model="editingModalVisible" title="批量编辑" @ok="editingHandleOk"
+      <a-modal
+        width="820px"
+        :maskClosable="false"
+        v-model="editingModalVisible"
+        title="批量编辑"
+        @ok="editingHandleOk"
         @cancel="editingHandleCancel">
         <div class="trace-box">
           <a-form :form="editingForm">
             <a-row :gutter="26">
               <a-col :span="12" class="book-model-box">
-                <a-form-item label="船名" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
-                  <a-select placeholder="请选择船名"
-                    v-decorator="['vessel', { rules: [{ required: true, message: '请选择船名！' }] }]" show-search
-                    @focus="vesselSearch" @search="vesselSearch" @blur="vesselBlur" :default-active-first-option="false"
-                    :show-arrow="false" :filter-option="false" :not-found-content="null">
+                <a-form-item
+                  label="船名"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-select
+                    placeholder="请选择船名"
+                    v-decorator="['vessel', { rules: [{ required: true, message: '请选择船名！' }] }]"
+                    show-search
+                    @focus="vesselSearch"
+                    @search="vesselSearch"
+                    @blur="vesselBlur"
+                    :default-active-first-option="false"
+                    :show-arrow="false"
+                    :filter-option="false"
+                    :not-found-content="null">
                     <a-select-option v-for="item in vesselData" :key="item.name" :value="item.name">
                       {{ item.name }}
                     </a-select-option>
@@ -442,31 +523,54 @@
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item label="开船日期" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
-                  <a-date-picker v-decorator="['etd', { rules: [{ required: true, message: '请选择开船日期！' }] }]"
-                    :style="{ width: '100%' }" placeholder="请选择开船日期" valueFormat="YYYY-MM-DD" />
+                <a-form-item
+                  label="开船日期"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-date-picker
+                    v-decorator="['etd', { rules: [{ required: true, message: '请选择开船日期！' }] }]"
+                    :style="{ width: '100%' }"
+                    placeholder="请选择开船日期"
+                    valueFormat="YYYY-MM-DD" />
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item label="内部航次" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
+                <a-form-item
+                  label="内部航次"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
                   <a-input v-decorator="['voynoinner']" />
                 </a-form-item>
               </a-col>
 
               <a-col :span="12" class="book-model-box">
-                <a-form-item label="海关航次" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
+                <a-form-item
+                  label="海关航次"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
                   <a-input v-decorator="['voyno']" />
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item label="卸货港" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
-                  <a-select placeholder="请选择卸货港" v-decorator="['portDischarge']" show-search @focus="portDischargeSearch"
-                    @search="portDischargeSearch" @change="portDischargeChange" :default-active-first-option="false"
-                    :show-arrow="false" :filter-option="false" :not-found-content="null">
+                <a-form-item
+                  label="卸货港"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-select
+                    placeholder="请选择卸货港"
+                    v-decorator="['portDischarge']"
+                    show-search
+                    @focus="portDischargeSearch"
+                    @search="portDischargeSearch"
+                    @change="portDischargeChange"
+                    :default-active-first-option="false"
+                    :show-arrow="false"
+                    :filter-option="false"
+                    :not-found-content="null">
                     <a-select-option v-for="item in portDischargeData" :key="item.code" :value="item.enName">
                       {{ item.enName }}
                     </a-select-option>
@@ -474,17 +578,31 @@
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item label="卸货代码" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
+                <a-form-item
+                  label="卸货代码"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
                   <a-input v-decorator="['portDischargeId']" />
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item label="目的港" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
-                  <a-select placeholder="请选择目的港" v-decorator="['destination']" show-search @focus="destinationSearch"
-                    @search="destinationSearch" @change="destinationChange" :default-active-first-option="false"
-                    :show-arrow="false" :filter-option="false" :not-found-content="null">
+                <a-form-item
+                  label="目的港"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-select
+                    placeholder="请选择目的港"
+                    v-decorator="['destination']"
+                    show-search
+                    @focus="destinationSearch"
+                    @search="destinationSearch"
+                    @change="destinationChange"
+                    :default-active-first-option="false"
+                    :show-arrow="false"
+                    :filter-option="false"
+                    :not-found-content="null">
                     <a-select-option v-for="item in destinationData" :key="item.code" :value="item.enName">
                       {{ item.enName }}
                     </a-select-option>
@@ -492,29 +610,65 @@
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item label="目的代码" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
+                <a-form-item
+                  label="目的代码"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
                   <a-input v-decorator="['destinationid']" />
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item label="截港时间" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
-                  <a-date-picker show-time v-decorator="['closingdate']" :style="{ width: '100%' }" placeholder="请选择截港时间"
-                    valueFormat="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH" />
+                <a-form-item
+                  label="截港时间"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-date-picker
+                    show-time
+                    v-decorator="['closingdate']"
+                    :style="{ width: '100%' }"
+                    placeholder="请选择截港时间"
+                    valueFormat="YYYY-MM-DD HH:mm:ss"
+                    format="YYYY-MM-DD HH" />
                 </a-form-item>
               </a-col>
               <a-col :span="12" class="book-model-box">
-                <a-form-item label="截单时间" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" has-feedback>
-                  <a-date-picker show-time v-decorator="['closedocdate']" :style="{ width: '100%' }" placeholder="请选择截单时间"
-                    valueFormat="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH" />
+                <a-form-item
+                  label="截单时间"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
+                  has-feedback>
+                  <a-date-picker
+                    show-time
+                    v-decorator="['closedocdate']"
+                    :style="{ width: '100%' }"
+                    placeholder="请选择截单时间"
+                    valueFormat="YYYY-MM-DD HH:mm:ss"
+                    format="YYYY-MM-DD HH" />
                 </a-form-item>
               </a-col>
             </a-row>
           </a-form>
         </div>
       </a-modal>
+      <a-modal
+        title="提示信息"
+        :visible="bcFileFlag"
+        :footer="null"
+        @cancel="bcFileFlag=false"
+      >
+        <div class="bcfile-title">
+          <a-icon style="margin-right: 10px;" type="copy" />时间{{ bcFile.executeTime }}
+          <span> {{ bcFile.batchTotal }}</span>
+        </div>
+        <div class="bc-box">
+          <div class="bc-item" v-for="(item,index) in bcFile.ext" :key="index">
+            <span>{{ item.bno }}</span>
+            <span> {{ item.msg }}</span>
+          </div>
+        </div>
+      </a-modal>
     </a-spin>
   </div>
 </template>
@@ -543,7 +697,8 @@ import {
   DjyUserConfigMulti,
   DeleteBookingOrder,
   ExcuteShippingOrderCompareBatch,
-  GetTenantLineList
+  GetTenantLineList,
+  downloadBookingConfirm
 } from '@/api/modular/main/BookingLedger'
 
 import initData from './modules/initData'
@@ -651,7 +806,9 @@ export default {
       portDischargeData: [],
       destinationData: [],
       RcarrierData: [],
-      RecentlyCarrierData: []
+      RecentlyCarrierData: [],
+      bcFile: {},
+      bcFileFlag: false
     }
   },
   computed: {
@@ -753,7 +910,29 @@ export default {
         // }
       }
     },
-    handleDownByBc() { },
+    handleDownByBc() {
+      const select = this.$refs.xGrid.getCheckboxRecords()
+      const pkIdArr = select.map((item, index) => {
+        return item.id
+      })
+      if (pkIdArr.length === 0) {
+        this.$message.error('请至少选择一条数据')
+        return false
+      } else {
+        downloadBookingConfirm(pkIdArr)
+          .then((res) => {
+            if (res.success) {
+              this.bcFileFlag = true
+              this.bcFile = res.data
+            } else {
+              this.$message.error(res.message)
+            }
+          })
+          .catch((err) => {
+            console.log(err)
+          })
+      }
+    },
     // 批量编辑
     editingHandleOk() {
       const {
@@ -898,7 +1077,6 @@ export default {
       })
     },
     setSort(item) {
-
       const key = JSON.parse(item.configJson).key
       const sort = JSON.parse(item.configJson).sort
       this.tableOrderLabel = key || ''
@@ -909,7 +1087,7 @@ export default {
     // 船公司 - start
     getCarrier() {
       const Rdata = (data) => {
-        let RData = {}
+        const RData = {}
         for (var i = 0; i < 26; i++) {
           RData[String.fromCharCode(65 + i)] = []
           data.forEach((item) => {
@@ -918,14 +1096,14 @@ export default {
             }
           })
         }
-        let Obj = {
+        const Obj = {
           'A-D': ['A', 'B', 'C', 'D'],
           'E-L': ['E', 'F', 'G', 'H', 'I', 'J', 'K', 'L'],
           'M-R': ['M', 'N', 'O', 'P', 'Q', 'R'],
           'S-U': ['S', 'T', 'U'],
           'V-Z': ['V', 'W', 'X', 'Y', 'Z']
         }
-        let Data = {
+        const Data = {
           'A-D': [],
           'E-L': [],
           'M-R': [],
@@ -955,7 +1133,7 @@ export default {
             DjyUserConfigGet({ type: 'booking_memory' })
               .then((e) => {
                 if (e.data) {
-                  let data = []
+                  const data = []
                   JSON.parse(e.data.configJson).forEach((item) => {
                     res.data.forEach((item2) => {
                       if (item == item2.code) {
@@ -1131,7 +1309,7 @@ export default {
     toggleAdvanced() {
       this.advanced = !this.advanced
       this.$forceUpdate()
-      let start = new Date().getTime()
+      const start = new Date().getTime()
       console.log('== 点击展开 ==', start)
       if (!this.advanced) {
         const len = this.formData.length % 4
@@ -1409,7 +1587,7 @@ export default {
       }
     },
     addSubmit() {
-      let data = []
+      const data = []
       data.push(this.carrierRadio)
       if (this.RecentlyCarrierData.length) {
         this.RecentlyCarrierData.forEach((item) => {
@@ -2832,4 +3010,19 @@ export default {
 //   .more-btn{
 //   }
 // }
+.bcfile-title{
+  border-bottom:1px dashed black;
+  padding-bottom: 5px;
+  margin-bottom: 10px;
+}
+.bc-box{
+  max-height: 200px;
+  overflow-y: auto;
+  padding-right: 14px;
+  .bc-item{
+    margin: 7px 0px;
+    display: flex;
+    justify-content: space-between;
+  }
+}
 </style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 0c5a7f9..d81abd9 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -50,12 +50,17 @@
           :columns="columns"
           :data="loadData"
           :alert="true"
+          :pageSizeOptions="['10', '20', '50', '100']"
           :rowKey="record => record.id"
           :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         >
           <template slot="operator">
-            <a-button type="primary" v-if="hasPerm('sysUser:add')" icon="plus" @click="$refs.addForm.add()"
-              >新增用户
+            <a-button
+              type="primary"
+              v-if="hasPerm('sysUser:add')"
+              icon="plus"
+              @click="$refs.addForm.add()"
+            >新增用户
             </a-button>
             <a-upload
               :customRequest="customRequest"
@@ -73,7 +78,6 @@
             {{ departmentFilter(text) }}
           </span>
 
-
           <span slot="sex" slot-scope="text">
             {{ sexFilter(text) }}
           </span>
@@ -169,15 +173,18 @@ export default {
       columns: [
         {
           title: '账号',
-          dataIndex: 'account'
+          dataIndex: 'account',
+          sorter: true
         },
         {
           title: '姓名',
-          dataIndex: 'name'
+          dataIndex: 'name',
+          sorter: true
         },
         {
           title: '部门',
           dataIndex: 'sysEmpInfo',
+          sorter: true,
           scopedSlots: {
             customRender: 'sysEmpInfo'
           }
@@ -185,17 +192,20 @@ export default {
         {
           title: '性别',
           dataIndex: 'sex',
+          sorter: true,
           scopedSlots: {
             customRender: 'sex'
           }
         },
         {
           title: '手机',
-          dataIndex: 'phone'
+          dataIndex: 'phone',
+          sorter: true
         },
         {
           title: '状态',
           dataIndex: 'status',
+          sorter: true,
           scopedSlots: {
             customRender: 'status'
           }
@@ -256,6 +266,9 @@ export default {
     }
   },
   methods: {
+    handleTableChange(pagination, filters, sorter) {
+      console.log(pagination, filters, sorter);
+    },
     departmentFilter(sysEmpInfo) {
     //  console.log('sysEmpInfo===>>',sysEmpInfo)
      return sysEmpInfo.orgName
@@ -361,13 +374,13 @@ export default {
         })
     },
     downloadfile(res) {
-      let fileReader = new FileReader()
-      let _this = this
+      const fileReader = new FileReader()
+      const _this = this
       fileReader.onload = function() {
         try {
           // 如果JSON.parse(this.result)不报错，说明this.result是json对象，则弹框提示
           // 如果JSON.parse(this.result)报错，说明返回的是文件流，进入catch，下载文件
-          let r = JSON.parse(this.result)
+          const r = JSON.parse(this.result)
           if (!r.success) {
             _this.$message.error(r.message)
           } else {

From ffca658cb6a955487db433cc2bd08af9c1585df9 Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Thu, 18 May 2023 17:58:11 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modular/main/BookingLedger.js       | 24 ++++++
 src/components/Table/index.js               | 28 +++++--
 src/views/main/BookingLedger/list/index.vue | 82 ++++++++++++++++++---
 3 files changed, 116 insertions(+), 18 deletions(-)

diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js
index 0625b4b..83f937d 100644
--- a/src/api/modular/main/BookingLedger.js
+++ b/src/api/modular/main/BookingLedger.js
@@ -872,3 +872,27 @@ export function downloadBookingConfirm(parameter) {
     data: parameter
   })
 }
+
+export function downloadDraft(parameter) {
+  return axios({
+    url: '/BookingValueAdded/DownloadDraft',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function checkUpdateETA(parameter) {
+  return axios({
+    url: '/BookingValueAdded/CheckUpdateETA',
+    method: 'post',
+    data: parameter
+  })
+}
+
+export function checkUpdateManifestNo(parameter) {
+  return axios({
+    url: '/BookingValueAdded/CheckUpdateManifestNo',
+    method: 'post',
+    data: parameter
+  })
+}
diff --git a/src/components/Table/index.js b/src/components/Table/index.js
index e42b8a4..f321855 100644
--- a/src/components/Table/index.js
+++ b/src/components/Table/index.js
@@ -16,7 +16,7 @@ export default {
 
       selectedRows: [],
       selectedRowKeys: [],
-
+      sortObj: { DescSort: '' },
       localLoading: false,
       localDataSource: [],
       localPagination: Object.assign({}, this.pagination),
@@ -136,6 +136,10 @@ export default {
         })) ||
       false
     this.needTotalList = this.initTotalList(this.columns)
+    this.sortObj = {
+      DescSort: '',
+      field: ''
+    }
     this.loadData()
     // this.columnsSetting = this.columns
     // 记录选择显示的列，以当前路由为key
@@ -165,6 +169,7 @@ export default {
      * @param Boolean bool
      */
     refresh(bool = false) {
+      console.log(this.sortObj)
       bool &&
         (this.localPagination = Object.assign(
           {},
@@ -182,9 +187,10 @@ export default {
      * @param {Object} sorter 排序条件
      */
     loadData(pagination, filters, sorter) {
-      console.log(pagination)
       this.localLoading = true
-
+      if (sorter) {
+        this.sortObj = sorter
+      }
       const parameter = Object.assign(
         {
           pageNo:
@@ -194,16 +200,24 @@ export default {
             (this.showPagination && this.localPagination.pageSize) ||
             this.pageSize
         },
-        (sorter && sorter.field && { SortField: sorter.field }) || {},
-        (sorter && sorter.order && { sortOrder: sorter.order }) || {},
+        (this.sortObj && this.sortObj.field && { SortField: this.sortObj.field }) || {},
         {
           ...filters
         }
       )
-      if (sorter && sorter.order === 'descend') {
+      if (this.sortObj && this.sortObj.order === 'descend' && this.sortObj.field) {
         parameter.DescSort = true
+        this.sortObj.DescSort = true
       } else {
-        parameter.DescSort = false
+        if (this.sortObj && this.sortObj.field) {
+          parameter.DescSort = false
+          this.sortObj.DescSort = false
+        } else {
+          delete parameter.DescSort
+          if (this.sortObj) {
+            this.sortObj.DescSort = ''
+          }
+        }
       }
       const result = this.data(parameter)
       // 对接自己的通用数据接口需要修改下方代码中的 r.pageNo, r.totalCount, r.data
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 30cb138..f12ab04 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -101,16 +101,16 @@
                         <span> <i class="iconfont icon-xiaopiaodayin"></i>船公司文件 </span>
                         <a-menu slot="overlay">
                           <a-menu-item>
-                            <a @click="handleDownByBc" href="javascript:;">BC下载</a>
+                            <a @click="handleDownByBc(1)" href="javascript:;">BC下载</a>
                           </a-menu-item>
                           <a-menu-item>
-                            <a href="javascript:;">DRAFT下载</a>
+                            <a @click="handleDownByBc(2)" href="javascript:;">DRAFT下载</a>
                           </a-menu-item>
                           <a-menu-item>
-                            <a href="javascript:;">到港时间更新</a>
+                            <a @click="handleDownByBc(3)" href="javascript:;">到港时间更新</a>
                           </a-menu-item>
                           <a-menu-item>
-                            <a href="javascript:;">舱位分配查询</a>
+                            <a @click="handleDownByBc(4)" href="javascript:;">舱位分配查询</a>
                           </a-menu-item>
                         </a-menu>
                       </a-dropdown>
@@ -659,15 +659,16 @@
         @cancel="bcFileFlag=false"
       >
         <div class="bcfile-title">
-          <a-icon style="margin-right: 10px;" type="copy" />时间{{ bcFile.executeTime }}
-          <span> {{ bcFile.batchTotal }}</span>
+          <div><a-icon style="margin-right: 10px;" @click="handleCopy" type="copy" />时间{{ bcFile.executeTime }}</div>
+          <span > {{ bcFile.batchTotal }}</span>
         </div>
-        <div class="bc-box">
+        <div ref="bcBox" class="bc-box" v-if="bcFile.ext && bcFile.ext.length>0">
           <div class="bc-item" v-for="(item,index) in bcFile.ext" :key="index">
             <span>{{ item.bno }}</span>
             <span> {{ item.msg }}</span>
           </div>
         </div>
+        <div v-else>{{ bcFile.msg }}</div>
       </a-modal>
     </a-spin>
   </div>
@@ -698,7 +699,10 @@ import {
   DeleteBookingOrder,
   ExcuteShippingOrderCompareBatch,
   GetTenantLineList,
-  downloadBookingConfirm
+  downloadBookingConfirm,
+  downloadDraft,
+  checkUpdateETA,
+  checkUpdateManifestNo
 } from '@/api/modular/main/BookingLedger'
 
 import initData from './modules/initData'
@@ -807,7 +811,7 @@ export default {
       destinationData: [],
       RcarrierData: [],
       RecentlyCarrierData: [],
-      bcFile: {},
+      bcFile: { ext: [] },
       bcFileFlag: false
     }
   },
@@ -910,7 +914,7 @@ export default {
         // }
       }
     },
-    handleDownByBc() {
+    handleDownByBc(type) {
       const select = this.$refs.xGrid.getCheckboxRecords()
       const pkIdArr = select.map((item, index) => {
         return item.id
@@ -919,7 +923,8 @@ export default {
         this.$message.error('请至少选择一条数据')
         return false
       } else {
-        downloadBookingConfirm(pkIdArr)
+        if (type === 1) {
+          downloadBookingConfirm(pkIdArr)
           .then((res) => {
             if (res.success) {
               this.bcFileFlag = true
@@ -931,6 +936,49 @@ export default {
           .catch((err) => {
             console.log(err)
           })
+        }
+        if (type === 2) {
+          downloadDraft(pkIdArr)
+          .then((res) => {
+            if (res.success) {
+              this.bcFileFlag = true
+              this.bcFile = res.data
+            } else {
+              this.$message.error(res.message)
+            }
+          })
+          .catch((err) => {
+            console.log(err)
+          })
+        }
+        if (type === 3) {
+          checkUpdateETA(pkIdArr)
+          .then((res) => {
+            if (res.success) {
+              this.bcFileFlag = true
+              this.bcFile = res.data
+            } else {
+              this.$message.error(res.message)
+            }
+          })
+          .catch((err) => {
+            console.log(err)
+          })
+        }
+        if (type === 4) {
+          checkUpdateManifestNo(pkIdArr)
+          .then((res) => {
+            if (res.success) {
+              this.bcFileFlag = true
+              this.bcFile = res.data
+            } else {
+              this.$message.error(res.message)
+            }
+          })
+          .catch((err) => {
+            console.log(err)
+          })
+        }
       }
     },
     // 批量编辑
@@ -1464,6 +1512,15 @@ export default {
     handledbclick({ row }) {
       this.editColumns(row)
     },
+    handleCopy() {
+      const text = this.$refs.bcBox.innerText
+      var cInput = document.createElement('input');
+        cInput.value = text;
+        document.body.appendChild(cInput);
+        cInput.select(); // 选取文本框内容
+        document.execCommand('copy');
+        document.body.removeChild(cInput);
+    },
     editColumns(row) {
       this.$router.push({ name: 'BookingDetail', query: { id: row.id, type: row.carrierid, mblno: row.mblno } })
     },
@@ -3014,6 +3071,9 @@ export default {
   border-bottom:1px dashed black;
   padding-bottom: 5px;
   margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
 .bc-box{
   max-height: 200px;

From 86c6fa1f452977db085a3180b3edded1a263aa9d Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Thu, 18 May 2023 18:06:59 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main/BookingLedger/list/index.vue | 17 -----------------
 src/views/system/user/index.vue             | 12 ++++--------
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index f12ab04..5aeb1f1 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -106,9 +106,6 @@
                           <a-menu-item>
                             <a @click="handleDownByBc(2)" href="javascript:;">DRAFT下载</a>
                           </a-menu-item>
-                          <a-menu-item>
-                            <a @click="handleDownByBc(3)" href="javascript:;">到港时间更新</a>
-                          </a-menu-item>
                           <a-menu-item>
                             <a @click="handleDownByBc(4)" href="javascript:;">舱位分配查询</a>
                           </a-menu-item>
@@ -951,20 +948,6 @@ export default {
             console.log(err)
           })
         }
-        if (type === 3) {
-          checkUpdateETA(pkIdArr)
-          .then((res) => {
-            if (res.success) {
-              this.bcFileFlag = true
-              this.bcFile = res.data
-            } else {
-              this.$message.error(res.message)
-            }
-          })
-          .catch((err) => {
-            console.log(err)
-          })
-        }
         if (type === 4) {
           checkUpdateManifestNo(pkIdArr)
           .then((res) => {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d81abd9..a6d8a8f 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -173,8 +173,7 @@ export default {
       columns: [
         {
           title: '账号',
-          dataIndex: 'account',
-          sorter: true
+          dataIndex: 'account'
         },
         {
           title: '姓名',
@@ -183,29 +182,26 @@ export default {
         },
         {
           title: '部门',
-          dataIndex: 'sysEmpInfo',
+          dataIndex: 'orgName',
           sorter: true,
           scopedSlots: {
-            customRender: 'sysEmpInfo'
+            customRender: 'orgName'
           }
         },
         {
           title: '性别',
           dataIndex: 'sex',
-          sorter: true,
           scopedSlots: {
             customRender: 'sex'
           }
         },
         {
           title: '手机',
-          dataIndex: 'phone',
-          sorter: true
+          dataIndex: 'phone'
         },
         {
           title: '状态',
           dataIndex: 'status',
-          sorter: true,
           scopedSlots: {
             customRender: 'status'
           }