Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

src/App.vue

@@ -17,19 +17,18 @@ export default {
       reload: this.reload
     }
   },
-  data () {
+  data() {
     return {
       locale: zhCN,
       routerAlive: true
     }
   },
-  mounted () {
+  mounted() {},
-  },
   methods: {
-    reload () {
+    reload() {
       this.routerAlive = false
-      this.$nextTick(function () {
+      this.$nextTick(function() {
-          this.routerAlive = true
+        this.routerAlive = true
       })
     }
   }

src/views/main/BookingLedger/detail/modules/operationArea.vue

@@ -247,7 +247,7 @@
               </div>
             </template>
             <template v-if="modelType === 'vgmlink'">
-              <div class="item-box">
+              <div class="item-box" style="padding-top:0px;padding-bottom:0px;">
                 <a-col :span="24">
                   <a-form-item
                     label="VGM提交地址"
@@ -256,8 +256,8 @@
                     has-feedback
                   >
                     <div class="box-flex">
-                      <a-input :allowClear="true" v-model="initCabinFrom.orderUrl.urlVgm" />
+                      <a-input style="width:1000px !important;" :allowClear="true" v-model="initCabinFrom.orderUrl.urlVgm" />
-                      <span>复制</span>
+                      <span style="margin-left:7px;"><i class="iconfont icon-fuzhi2"><!--复制--></i></span>
                     </div>
                   </a-form-item>
                 </a-col>
@@ -374,7 +374,7 @@
                   </a-form-item>
                 </a-col>
               </div>
-              <div class="item-box vgm-remarks">
+              <div class="item-box vgm-remarks" style="padding-top:0px;padding-bottom:0px;">
                 <a-col :span="24">
                   <a-form-item
                     label="备注"
@@ -383,7 +383,7 @@
                     has-feedback
                   >
                     <div class="box-flex">
-                      <a-input :allowClear="true" v-model="initCabinFrom.remark" />
+                      <a-input style="width:1000px !important;" :allowClear="true" v-model="initCabinFrom.remark" />
                     </div>
                   </a-form-item>
                 </a-col>
@@ -1124,6 +1124,12 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+.vgm-info{
+  padding-top: 0px;
+  .ant-form-item{
+    margin-bottom: 0px;
+  }
+} 
 .OCRBox {
   /deep/.ant-drawer-body {
     padding: 0 !important;

src/views/main/BookingLedger/list/index.vue

@@ -34,12 +34,12 @@
                   >
                     <a-button type="primary" @click="tableRefresh">查询</a-button>
                     <a-button class="reset" @click="tableReset">重置</a-button>
-                    <a-button class="more-search" @click="tableMoreRefresh"
+                    <a-button class="more-search" @click="tableMoreRefresh">
-                      >多提单号查询<a-icon type="search"
+                      多提单号查询<a-icon type="search" />
-                    /></a-button>
+                    </a-button>
-                    <span class="tab-btn" @click="formSetting"
+                    <span class="tab-btn" @click="formSetting">
-                      ><a-icon type="setting" :style="{ marginLeft: '0px' }"
+                      <a-icon type="setting" :style="{ marginLeft: '0px' }" />
-                    /></span>
+                    </span>
                     <a class="senior-search" @click="toggleAdvanced">
                       {{ advanced ? '收起查询' : '更多查询' }}
                       <!-- <a-icon :type="advanced ? 'up' : 'down'" /> -->
@@ -444,7 +444,7 @@ export default {
       this.editColumnsSave(this.gridOptions.columns)
     },
 
-    resizableChange (e) {
+    resizableChange(e) {
       this.gridOptions.columns[e.columnIndex].width = e.resizeWidth
       console.log('==== 列宽拖动 =====', e.resizeWidth, this.gridOptions.columns[e.columnIndex])
       this.editColumnsSave(this.gridOptions.columns)
@@ -563,7 +563,21 @@ export default {
 
     // 多表单
     moreNumSubmit() {
-      this.formRes.MBLNO = this.moreNumVal.replace(/\n|\r/g, ',')
+      let data = ''
+      this.moreNumVal
+        .replace(/\n|\r/g, ',')
+        .split(',')
+        .forEach(item => {
+          if (item.replace(/\s*/g, '')) {
+            if (data) {
+              data = `${data},${item}`
+            } else {
+              data = item
+            }
+          }
+        })
+
+      this.formRes.MBLNO = data
       this.$refs['fromlabel-MBLNO'][0].$data.value = this.formRes.MBLNO
       this.$forceUpdate()
       this.moreNumCancel()
@@ -571,7 +585,6 @@ export default {
     moreNumCancel() {
       this.moreNumVisible = false
     }
-
   }
 }
 </script>
@@ -594,6 +607,11 @@ export default {
   // background-color: #f5f9fe !important;
   position: relative;
   background: #fff !important;
+  .vxe-cell--sort {
+    position: absolute;
+    z-index: 3;
+    right: 0;
+  }
   &::after {
     content: '';
     position: absolute;

src/views/main/BookingLedger/list/modules/initData.js

@@ -3,11 +3,26 @@ export default {
     { type: 'checkbox', width: 60, noDraggable: true },
     { field: 'carrier', width: 120, title: '船公司', showHeaderOverflow: true, sortable: true },
     { field: 'yard', width: 120, title: '场站', showHeaderOverflow: true, sortable: true },
-    { field: 'mblno', width: 160, title: '提单号', showHeaderOverflow: true, showOverflow: false, sortable: true, slots: { default: 'mblno' } },
+    {
-    { field: 'vessel', width: 120, title: '船名航次', showHeaderOverflow: true, sortable: true, slots: { default: 'vessel' } },
+      field: 'mblno',
+      width: 160,
+      title: '主提单号',
+      showHeaderOverflow: true,
+      showOverflow: false,
+      sortable: true,
+      slots: { default: 'mblno' }
+    },
+    {
+      field: 'vessel',
+      width: 120,
+      title: '船名航次',
+      showHeaderOverflow: true,
+      sortable: true,
+      slots: { default: 'vessel' }
+    },
     { field: 'etd', width: 160, title: '开船日期', showHeaderOverflow: true, sortable: true },
     { field: 'voyno', width: 120, title: '海关航次', showHeaderOverflow: true },
-    { field: 'bookingStatus', width: 120, title: '定舱状态', showHeaderOverflow: true },
+    { field: 'bookingStatus', width: 120, title: '订舱状态', showHeaderOverflow: true },
     { field: 'vgm', width: 120, title: 'VGM', showHeaderOverflow: true },
     { field: 'billStatus', width: 120, title: '提单状态', showHeaderOverflow: true },
     { field: 'portdischarge', width: 120, title: '卸货港', showHeaderOverflow: true, sortable: true },
@@ -19,11 +34,26 @@ export default {
   columnsAllData: [
     { field: 'carrier', width: 120, title: '船公司', showHeaderOverflow: true, sortable: true },
     { field: 'yard', width: 120, title: '场站', showHeaderOverflow: true, sortable: true },
-    { field: 'mblno', width: 160, title: '提单号', showHeaderOverflow: true, showOverflow: false, sortable: true, slots: { default: 'mblno' } },
+    {
-    { field: 'vessel', width: 120, title: '船名航次', showHeaderOverflow: true, sortable: true, slots: { default: 'vessel' } },
+      field: 'mblno',
+      width: 160,
+      title: '主提单号',
+      showHeaderOverflow: true,
+      showOverflow: false,
+      sortable: true,
+      slots: { default: 'mblno' }
+    },
+    {
+      field: 'vessel',
+      width: 120,
+      title: '船名航次',
+      showHeaderOverflow: true,
+      sortable: true,
+      slots: { default: 'vessel' }
+    },
     { field: 'etd', width: 160, title: '开船日期', showHeaderOverflow: true, sortable: true },
     { field: 'voyno', width: 120, title: '海关航次', showHeaderOverflow: true },
-    { field: 'bookingStatus', width: 120, title: '定舱状态', showHeaderOverflow: true },
+    { field: 'bookingStatus', width: 120, title: '订舱状态', showHeaderOverflow: true },
     { field: 'vgm', width: 120, title: 'VGM', showHeaderOverflow: true },
     { field: 'billStatus', width: 120, title: '提单状态', showHeaderOverflow: true },
     { field: 'portdischarge', width: 120, title: '卸货港', showHeaderOverflow: true, sortable: true },
@@ -56,7 +86,7 @@ export default {
     { field: 'notifyparty', width: 120, title: '通知人', showHeaderOverflow: true, sortable: true },
     { field: 'op', width: 120, title: '操作人', showHeaderOverflow: true, sortable: true },
     { field: 'payableat', width: 120, title: '到付地点', showHeaderOverflow: true, sortable: true },
-    { field: 'placedelivery', width: 120, title: '交货地', showHeaderOverflow: true, sortable: true },
+    { field: 'placedelivery', width: 120, title: '交货地', showHeaderOverflow: true, sortable: true }
   ],
   condAllData: [
     { title: '业务编号', align: 'center', width: 120, label: 'BSNO', type: 'input' },
@@ -97,7 +127,7 @@ export default {
     { title: '交货地代码', align: 'center', width: 120, label: 'PLACEDELIVERYID', type: 'input' },
     { title: '交货地', align: 'center', width: 120, label: 'PLACEDELIVERY', type: 'input' },
     { title: '目的地代码', align: 'center', width: 120, label: 'DESTINATIONID', type: 'input' },
-    { title: '目的地', align: 'center', width: 120, label: 'DESTINATION', type: 'input' },
+    { title: '目的地', align: 'center', width: 120, label: 'DESTINATION', type: 'input' }
     // 此处省略部分数据
   ]
 }