航线

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

@@ -667,7 +667,8 @@ import {
   GetForwarderlist,
   DjyUserConfigMulti,
   DeleteBookingOrder,
-  ExcuteShippingOrderCompareBatch
+  ExcuteShippingOrderCompareBatch,
+  GetTenantLineList
 } from '@/api/modular/main/BookingLedger'
 
 import initData from './modules/initData'
@@ -1197,6 +1198,8 @@ export default {
           return GetPackage
         case 'ISSUETYPE':
           return Codeissuetypelist
+        case 'lineName':
+          return GetTenantLineList
       }
     },
     getFromSelectData(func, ...args) {

src/views/main/BookingLedger/list/modules/formLabel.vue

@@ -252,12 +252,16 @@ export default {
     },
     getSelectFirst (e) {
       if (!e) {
+        if (['LINENAME'].includes(this.labelData.label)) {
+          this.dataList = this.lineList
+        } else {
           this.$emit('selectFirst', {
             form: this.labelData,
             index: this.formIndex,
             value: ''
           })
         }
+      }
     },
     completeSelect (value) {
       const val = value.split('-')[1]

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

@@ -60,7 +60,7 @@ export default {
     { field: 'prepardat', label: 'PREPARDAT', width: 160, title: '预付地点', showHeaderOverflow: true, sortable: true },
     { field: 'service', label: 'SERVICE', width: 160, title: '运输条款', showHeaderOverflow: true, sortable: true },
     { field: 'sale', label: 'SALE', width: 160, title: '揽货人', showHeaderOverflow: true, sortable: true }, // 销售
-    { field: 'lanename', label: 'LANENAME', width: 160, title: '航线', showHeaderOverflow: true, sortable: true },
+    { field: 'lanename', label: 'LANENAME', width: 160, title: '船司航线', showHeaderOverflow: true, sortable: true },
     // { field: 'servicecontractno', label: 'SERVICECONTRACTNO', width: 160, title: '客户合同号', showHeaderOverflow: true, sortable: true }, // 没有设置该字段的地方 - 暂时去掉
     { field: 'bsstatusname', label: 'BSSTATUSNAME', width: 160, title: '业务状态', showHeaderOverflow: true, sortable: true },
     { field: 'bookingno', label: 'BOOKINGNO', width: 160, title: '业务编号', showHeaderOverflow: true, sortable: true },
@@ -81,7 +81,7 @@ export default {
     { field: 'dunno', label: 'DUNNO', width: 120, title: '危险品编号', showHeaderOverflow: true, sortable: true },
     { field: 'contractno', label: 'CONTRACTNO', width: 120, title: '合约号', showHeaderOverflow: true, sortable: true },
     { field: 'route', label: 'ROUTE', width: 120, title: '航线操作', showHeaderOverflow: true, sortable: true },
-    { field: 'lanecode', label: 'LANECODE', width: 120, title: '航线代码', showHeaderOverflow: true, sortable: true },
+    // { field: 'lanecode', label: 'LANECODE', width: 120, title: '航线代码', showHeaderOverflow: true, sortable: true },
     { field: 'shipperid', label: 'SHIPPERID', width: 120, title: '发货人代码', showHeaderOverflow: true, sortable: true }, // 台账无字段
     { field: 'notifypartyid', label: 'NOTIFYPARTYID', width: 120, title: '通知人代码', showHeaderOverflow: true, sortable: true }, // 台账无字段
     { field: 'notifypartY2', label: 'NOTIFYPARTY2', width: 120, title: '第二通知人', showHeaderOverflow: true, sortable: true }, // 台账无，详情有
@@ -101,7 +101,8 @@ export default {
     { field: 'dzRemark', label: 'DZREMARK', width: 160, title: '单证备注', showHeaderOverflow: true, sortable: true, slots: { default: 'dzRemark' } },
     { field: 'czRemark', label: 'CZREMARK', width: 160, title: '操作备注', showHeaderOverflow: true, sortable: true, slots: { default: 'czRemark' } },
     { field: 'goodsStatusList', label: 'GOODSSTATUSLIST', minWidth: 160, title: '货物状态', showHeaderOverflow: true, slots: { default: 'goodsStatusList' } },
-    { field: 'tmblno', label: 'TMBLNO', width: 120, title: '真提单号', showHeaderOverflow: true, sortable: true }
+    { field: 'tmblno', label: 'TMBLNO', width: 120, title: '真提单号', showHeaderOverflow: true, sortable: true },
+    { field: 'linename', label: 'LINENAME', width: 120, title: '航线', showHeaderOverflow: true, sortable: true }
   ],
   // ==== 表单部分 ====
   condAllData: [
@@ -127,7 +128,7 @@ export default {
     { title: '业务编号', align: 'center', width: 120, label: 'BOOKINGNO', type: 'input' },
     { title: '业务状态', align: 'center', width: 120, label: 'BSSTATUS', type: 'input' },
     // { title: '客户合同号', align: 'center', width: 120, label: 'SERVICECONTRACTNO', type: 'input' }, // 暂时去掉
-    { title: '航线代码', align: 'center', width: 120, label: 'LANECODE', type: 'input' },
+    // { title: '航线代码', align: 'center', width: 120, label: 'LANECODE', type: 'input' },
     { title: '内部航次', align: 'center', width: 120, label: 'VOYNOINNER', type: 'input' },
     { title: '海关航次', align: 'center', width: 120, label: 'VOYNO', type: 'input' },
     { title: '发货人', align: 'center', width: 120, label: 'SHIPPER', type: 'input' },
@@ -157,7 +158,7 @@ export default {
     { title: '重量', align: 'center', width: 160, label: 'KGS', type: 'input' },
     { title: '尺码', align: 'center', width: 160, label: 'CBM', type: 'input' },
     { title: 'HS编码', align: 'center', width: 160, label: 'HSCODE', type: 'input' },
-    { title: '航线', align: 'center', width: 160, label: 'LANENAME', type: 'input' },
+    { title: '船司航线', align: 'center', width: 160, label: 'LANENAME', type: 'input' },
     { title: '设置温度', align: 'center', width: 160, label: 'TEMPSET', type: 'input' },
     { title: '通风度', align: 'center', width: 160, label: 'REEFERF', type: 'input' },
     { title: '付款方', align: 'center', width: 160, label: 'FREIGHTPAYER', type: 'input' },
@@ -179,6 +180,7 @@ export default {
     { title: '箱型', align: 'center', width: 120, label: 'CNTRTOTAL', type: 'select', showLabel: 'name' },
     { title: '包装', align: 'center', width: 120, label: 'KINDPKGS', type: 'select', showLabel: 'name' },
     { title: '签单方式', align: 'center', width: 160, label: 'ISSUETYPE', type: 'select', showLabel: 'enName', showLabel2: 'cnName' },
+    { title: '航线', align: 'center', width: 160, label: 'LINENAME', type: 'select', showLabel: 'name' },
     {
       title: '提单份数',
       align: 'center',