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

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

@@ -178,7 +178,7 @@ const initDetail = {
   pono: '',
   mblno: '',
   hblno: '',
-  EPCode: '', // esl下的EP号
+  epCode: '',
   custno: '',
   contractno: '',
   vessel: '',
@@ -790,11 +790,8 @@ export default {
               })
             }
           } else if (field[0] === 'edi') {
-            // type 1  首字母大写转小写
             const typeArr1 = ['WeiTuoFang', 'SendCode', 'ReceiveCode', 'NotifyCdoe', 'SalerCode', 'MasterBolIndicator', 'EmanifestHbl', 'ConsigneeEdiCode', 'ShipperEdiCode', 'OpEName', 'OpTel', 'OpEmail', 'GoodsName', 'MasterBolIndicatorName', 'SalerCodeName', 'OrderRemark', 'ExRemark1', 'ExRemark2', 'ExRemark3', 'ExRemark4', 'KingTareweight']
-            // type2 第一个单词大写 + 驼峰
             const typeArr2 = ['EDIAttn', 'EDIAttnTel', 'EDIAttnMail', 'AMSConsignee', 'AMSNotifyParty']
-            // type 3 全大写转全小写
             const typeArr3 = ['ACIHBL', 'CKHI', 'CNCM', 'WNCM']
             const typeArr4 = ['S0CC0C']
             if (typeArr1.includes(field[1])) {
@@ -818,7 +815,7 @@ export default {
     emnuDefaultLabel (field) {
       switch (field) {
         case 'EPCODE':
-          return 'EPCode'
+          return 'epCode'
         case 'DZREMARK':
           return 'dzRemark'
         case 'CZREMARK':
@@ -946,8 +943,8 @@ export default {
         })
     },
 
-    setDeatilsFun(res) {
+    setDeatilsFun(res, overSet = false) {
-      if (this.$route.query.isCopy) {
+      if (this.$route.query.isCopy && !overSet) {
         res.data.mblno = ''
         delete res.data.id
         this.isAdd = true
@@ -958,7 +955,6 @@ export default {
       if (!res.data.bookingEDIExt) {
         res.data.bookingEDIExt = bookingEDIExt
       }
-      // 初始化箱型 累加  称重总重
       if (res.data.ctnInputs.length > 0) {
         res.data.ctnInputs.map((item, index) => {
           if (item.weightype === '累加') {
@@ -1011,6 +1007,9 @@ export default {
         } else {
           this.$refs.sedOrder.init([])
         }
+        if (this.bookingDetails.ctnInputs.length > 0) {
+          this.$refs.goodsTable.init()
+        }
       }, 1200)
       this.$forceUpdate()
     },
@@ -1169,14 +1168,14 @@ export default {
                     mblno: res.data.mblno
                   }
                 })
-                this.setDeatilsFun(res)
+                this.setDeatilsFun(res, true)
                 setTimeout(() => {
                   this.inAddSave = false
                 }, 2000)
               } else if (that.$route.query.mblno === that.bookingDetails.mblno) {
                 that.isCopy = false
                 that.isAdd = false
-                this.setDeatilsFun(res)
+                this.setDeatilsFun(res, true)
                 that.checkSaveFun({ type: 'hbList', hasChange: false })
                 that.checkSaveFun({ type: 'details', hasChange: false })
                 const newBookingList = JSON.parse(JSON.stringify(this.bookingList))
@@ -1194,7 +1193,7 @@ export default {
                 that.isAdd = false
                 this.inAddSave = true
                 this.id = res.data.id
-                this.setDeatilsFun(res)
+                this.setDeatilsFun(res, true)
                 const newBookingList = JSON.parse(JSON.stringify(this.bookingList))
                 const newBookingGridOptions = JSON.parse(JSON.stringify(this.bookingGridOptions))
                 this.$set(newBookingList, res.data.id, res.data)

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

@@ -138,9 +138,9 @@
                   :labelCol="labelCol2"
                   :wrapperCol="wrapperCol2"
                   has-feedback
-                  prop="EPCode"
+                  prop="epCode"
                 >
-                  <inputView type="EPCode" :parentVal="details.EPCode" @getInputChange="inputChange" />
+                  <inputView type="epCode" :parentVal="details.epCode" @getInputChange="inputChange" />
                 </a-form-model-item>
               </a-col>
             </template>
@@ -1142,6 +1142,9 @@ export default {
       if (type === 'voyno' && this.details.carrierid === 'ESL') {
         this.details.voynoinner = this.details[type]
       }
+      if (type === 'epCode' && this.details.carrierid === 'ESL') {
+        this.details.tmblno = this.details[type]
+      }
       this.$forceUpdate()
     },
     getSelectViewRes({ type, res }) {

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

@@ -990,7 +990,7 @@ export default {
   watch: {
     details: {
       handler(nval, oval) {
-        // console.log('=== 修改table内容 ===', nval.ctnInputs, this.pType, this.inTableLoad)
+        console.log('=== 修改table内容 ===', nval.ctnInputs, this.pType, this.inTableLoad)
         if (!this.inSave && !this.inTableLoad) {
           this.$emit('changeDetail', {
             detail: nval,
@@ -1135,6 +1135,7 @@ export default {
       this.$refs['tableRef'].setCellSelection({ rowKey, colKey });
     },
     init() {
+      console.log('== 箱信息 - init ==')
       this.inTableLoad = true
       if (Object.keys(this.details).length > 0) {
         const arr = []

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

@@ -1313,7 +1313,18 @@ export default {
       }
     },
     getTextareaChange({ type, value }) {
-      this.details[type] = value
+      let val = ''
+      for (var i in value) {
+        let k = ''
+        if (value[i] === String.fromCharCode(160)) {
+          k = ' '
+        } else {
+           k = value[i]
+        }
+        val += k
+      }
+      this.details[type] = val
+      document.getElementById('notifyparty-scroll').value = val
       this.$forceUpdate()
     },
     inputChange({ type, value }) {

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

@@ -169,7 +169,7 @@ const sedDetail = {
   pono: '',
   mblno: '',
   hblno: '',
-  EPCode: '', // esl下的EP号
+  epCode: '',
   custno: '',
   contractno: '',
   vessel: '',

src/views/main/BookingLedger/detail/rules.js

@@ -9,7 +9,7 @@ export default {
 		custno: [{ required: false, message: '请输入订舱编号', trigger: 'change' }],
 		contractno: [{ required: false, message: '请输入运费协议号', trigger: 'change' }],
 		tmblno: [{ required: false, message: '请输入真提单号', trigger: 'change' }], // VOLTA WHL CSL
-		EPCode: [{ required: false, message: '请输入EP号', trigger: 'change' }], // esl
+		epCode: [{ required: false, message: '请输入EP号', trigger: 'change' }], // esl
 		vessel: [{ required: false, message: '请输入船名', trigger: 'change' }],
 		lanecode: [{ required: false, message: '请输入航线代码', trigger: 'change' }], // esl
 		voynoinner: [{ required: false, message: '请输入内部航次', trigger: 'change' }],

src/views/main/BookingLedger/list/components/selectView.vue

@@ -74,7 +74,6 @@ let timer
 Vue.directive('clickDown', {
 	inserted(el, binding, vnode) {
 		let clickTimer = null
-		// 单击
 		el.addEventListener('click', () => {
 			if (clickTimer) {
 				window.clearTimeout(clickTimer);
@@ -84,7 +83,6 @@ Vue.directive('clickDown', {
         binding.value.clickFun()
 			}, 300);
 		})
-		// 双击
 		el.addEventListener('dblclick', () => {
 			if (clickTimer) {
 				window.clearTimeout(clickTimer);
@@ -365,7 +363,7 @@ export default {
       }
     },
     filterOption(input, option) {
-      if (this.openSearch) { // 实时搜索 去掉过滤
+      if (this.openSearch) {
         return true
        } else {
         return option.componentOptions.children[1].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -409,7 +407,6 @@ export default {
       }
     },
     getSelectFirst (e, canClick = true) {
-      // console.log('获取焦点', e, this.value)
       if (canClick) {
         this.$refs.selectView.$refs.vcSelect.$refs.arrow.click()
       } else {
@@ -429,13 +426,11 @@ export default {
         return false
       }
       if (!e) {
-        console.log('首次搜索内容', e, this.type, this.bookingInitData)
         if (!['vessel', 'lineName'].includes(this.type) && this.bookingInitData[`${this.type}InitList`].length > 0) {
           console.log(this.bookingInitData[`${this.type}InitList`])
           this.selectList = this.bookingInitData[`${this.type}InitList`]
           return false
         }
-        // 模糊搜索 - 已有数据不进行搜索
         if (this.openSearch && this.value && this.selectList.length > 0) {
           return false
         } else if (this.openSearch && this.value && this.selectList.length === 0) {
@@ -495,7 +490,6 @@ export default {
     },
 
     openSelect(open) {
-      console.log('== 测试鼠标滑过 ==')
       if (!this.open) {
         this.getSelectFirst('', false)
       } else {

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

@@ -97,17 +97,13 @@
                 <div class="right BookTopButton">
                   <span class="tab-btn" @click="tableRefresh">
                     <a-icon type="redo" :style="{ fontSize: '14px', transform: 'rotate(278deg)' }" />
-                    <!--刷新-->
                   </span>
                   <span class="tab-btn" @click="tableHeaderEdit">
                     <a-icon type="setting" :style="{ fontSize: '14px' }" />
-                    <!--设置-->
                   </span>
                 </div>
               </template>
             </vxe-toolbar>
-            <!-- :scroll-x="{gt: 40}"
-              :scroll-y="{gt: 40}" -->
             <vxe-grid
               ref="xGrid"
               v-bind="gridOptions"
@@ -334,7 +330,6 @@
         </template>
       </template>
     </div>
-    <!-- 运踪弹窗 start -->
     <a-modal width="50vw" :maskClosable="false" v-model="traceModalVisible" title="运踪订阅">
       <div class="trace-box">
         <a-form>
@@ -362,8 +357,6 @@
         <a-button type="primary" @click="traceSend">订阅</a-button>
       </template>
     </a-modal>
-    <!-- 运踪弹窗 end -->
-    <!-- 批量编辑 start -->
     <a-modal
       width="820px"
       :maskClosable="false"
@@ -544,7 +537,6 @@
         </a-form>
       </div>
     </a-modal>
-    <!-- 批量编辑 end -->
   </div>
 </template>
 <script>
@@ -597,9 +589,7 @@ export default {
     return {
       ResetType: true,
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
-      // 高级搜索 展开/关闭
       advanced: false,
-      // 查询参数
       formData: formInitData,
       formRes: {},
       searchData: {},
@@ -607,7 +597,6 @@ export default {
       formMoreData: null,
       formBtnCol: 8,
       formBtnLoading: false,
-      // 表格
       setVisible: false,
       showColumns: null,
       gridOptions: {
@@ -637,11 +626,9 @@ export default {
         //   parentField: 'parentId',
         // },
       },
-      // 表格编辑
       formTableData: JSON.parse(JSON.stringify(initData.columns)),
       fromTableAllData: null,
       formMoreTableData: null,
-      // 新增弹窗
       addVisible: false,
       carrierRadio: 'CMA',
       radioStyle: {
@@ -649,14 +636,11 @@ export default {
         height: '50px',
         lineHeight: '50px'
       },
-      // 多单号弹窗
       moreNumVisible: false,
       moreNumVal: '',
-      // 表头排序参数
       tableOrderLabel: '',
       tableOrderType: '',
       screenWidth: document.body.clientWidth,
-      // 备注位置
       remarkShow: false,
       remarkScreenX: 0,
       remarkScreenY: 0,
@@ -670,12 +654,10 @@ export default {
       traceValue: [],
       addNum: 0,
       tableHeight: 0,
-      // 货运动态位置
       goodStatusShow: false,
       goodStatusScreenX: 0,
       goodStatusScreenY: 0,
       goodStatusData: null,
-      // 批量编辑
       editingForm: this.$form.createForm(this),
       vesselData: [],
       WebVessel: '',
@@ -733,7 +715,7 @@ export default {
       this.formAllData = JSON.parse(JSON.stringify(initData.condAllData))
       this.fromTableAllData = JSON.parse(JSON.stringify(initData.columnsAllData))
       this.tableHeight = document.body.clientHeight - 230
-      // this.getList({}, true)
+      this.getList({}, true)
       this.getConfigUser(true)
       this.getCarrier()
     },
@@ -759,7 +741,6 @@ export default {
           return false
         }
         const newData = JSON.parse(JSON.stringify(this.bookingGridOptions))
-        // 默认取前十条或者前N条，暂时屏蔽
         if (this.bookingGridOptions.data && this.bookingGridOptions.data.length > 0) {
           setTimeout(() => {
             const copyArr = JSON.parse(JSON.stringify(this.bookingGridOptions.data))
@@ -773,7 +754,6 @@ export default {
             }, 600)
           }, 10)
         }
-        // 默认获取全部数据
         // if (this.bookingGridOptions.data && this.bookingGridOptions.data.length > 0) {
         //   console.log(this.gridOptions.loading)
         //   const copyArr = JSON.parse(JSON.stringify(this.bookingGridOptions.data))
@@ -892,9 +872,7 @@ export default {
       this.gridOptions.data = []
       this.getList(queryParam)
     },
-    // 批量获取自定义数据
     getConfigUser(isInit = false) {
-      // 请求自定义： 查询表单 表头 页码
       const query = {
         typeArr: ['booking_list_cond', 'booking_list_column', 'booking_list_page']
       }
@@ -915,7 +893,6 @@ export default {
               break
           }
         })
-        console.log('==获取数据，表单 ==', $data.booking_list_cond)
         if (Object.keys($data).includes('booking_list_cond')) {
           this.setFormData($data.booking_list_cond, false, true)
         } else {
@@ -1091,7 +1068,6 @@ export default {
       }
     },
 
-    // 获取表单设置内容
     getFormData(isReset = false) {
       DjyUserConfigGet({ type: 'booking_list_cond' }).then(res => {
         this.setFormData(res.data)
@@ -1111,7 +1087,6 @@ export default {
           return Codeissuetypelist
       }
     },
-    // 添加获取表单下拉列表数据
     getFromSelectData(func, ...args) {
       return new Promise((resolve, reject) => {
         func(...args).then(res => {
@@ -1129,7 +1104,6 @@ export default {
       }
       this.gridOptions.pagerConfig.currentPage = currentPage
       this.gridOptions.pagerConfig.pageSize = pageSize
-      console.log('== 当前搜索内容 ==', this.searchData)
       this.getList(this.searchData)
     },
 
@@ -1145,7 +1119,6 @@ export default {
       })
     },
 
-    // form
     toggleAdvanced() {
       this.advanced = !this.advanced
       if (!this.advanced) {
@@ -1164,7 +1137,6 @@ export default {
     tableRefresh() {
       const data = { ...this.formRes }
       this.searchData = JSON.parse(JSON.stringify(data))
-      console.log('查询 - 设置当前搜索', data)
       this.init(this.searchData)
       this.formRes = data
     },
@@ -1207,7 +1179,6 @@ export default {
         this.formRes[item] = ''
       })
       this.searchData = JSON.parse(JSON.stringify(this.formRes))
-      console.log('== 重置表单内容 ==', this.searchData)
       Object.keys(this.$refs).map((label, index) => {
         if (label.includes('fromlabel-') && this.$refs[label].length > 0) {
           this.$refs[label][0].$data.value = ''
@@ -1229,7 +1200,6 @@ export default {
 
       this.formRes = {}
       this.searchData = {}
-      console.log('== 设置表头 ==', this.searchData)
       DjyUserConfigAdd({
         type: 'booking_list_cond',
         configJson: JSON.stringify(arr)
@@ -1260,7 +1230,6 @@ export default {
       } else if (form.type === 'complete') {
         this.formRes[form.label] = value
       }
-      console.log('修改了表单内容', this.formRes)
       this.$forceUpdate()
     },
 
@@ -1333,12 +1302,10 @@ export default {
         query.MBLNO = arr.toString()
       }
       if (isInit) {
-        // 这里新增初始化字段 - 等后台接口修改
         query.firstFlag = true
       }
       BookingOrderPage(query)
         .then(res => {
-          // if (isInit) { this.getList(this.formRes) }
           if (res.success) {
             let newBookingList = {}
             if (query.PageNo !== 1) {
@@ -1378,13 +1345,11 @@ export default {
             this.$set(this.gridOptions.pagerConfig, 'columns', JSON.parse(JSON.stringify(initData.columns)))
             // debugger
             // this.$set(this.gridOptions, 'data', [..._data])
-            console.log('== 即将渲染列表 ==', isAdd)
             this.$refs.xGrid.reloadData(_data).then(() => {
               this.$set(this.gridOptions, 'loading', false)
             })
             this.$set(this.gridOptions.pagerConfig, 'total', res.data.totalCount)
             this.setBookingList(newBookingList)
-            // console.log(this.gridOptions.data.length, Object.keys(newBookingList).length, this.gridOptions.data, newBookingList)
             this.$forceUpdate()
           } else {
             this.$set(this.gridOptions, 'data', [...[]])
@@ -1398,7 +1363,6 @@ export default {
         })
     },
 
-    // 新增
     addBooking() {
       this.addVisible = !this.addVisible
     },
@@ -1425,10 +1389,6 @@ export default {
         this.$message.error('请至少选择一条数据')
         return false
       }
-      // 有问题
-      // pkIdArr.map((item, index) => {
-      //   this.$router.push({ name: 'BookingDetail', query: { id: item, isCopy: true } })
-      // })
     },
     addSubmit() {
       let data = []
@@ -1635,7 +1595,6 @@ export default {
           console.log(err)
         })
     },
-    // 模糊搜索
     getCompleteListFun({ form, value }) {
       let query = {}
       if (

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

@@ -1,7 +1,6 @@
 <template>
   <div class="from-label">
     <template v-if="labelData.type == 'input'">
-      <!-- <a-input style="height:23px;margin-top:8px;" v-model="value" @change="changeInput" @pressEnter="$emit('pressEnter')"/> -->
       <inputView ref="inputView" :type="labelData.label" :parentVal="value" @getInputChange="inputChange" />
     </template>
     <template v-else-if="labelData.type == 'date'">
@@ -13,10 +12,8 @@
         format="YYYY-MM-DD"
         @dateChange="dateChangeFun"
       ></datePickerView>
-      <!-- <a-date-picker format="YYYY-MM-DD" @change="changeDate" v-model="value"/> -->
     </template>
     <template v-else-if="labelData.type == 'dateRange'">
-      <!-- <a-range-picker style="overflow: hidden;margin-top:3px;" format="YYYY-MM-DD" @change="changeRangeDate" @calendarChange="openChangeRangeDate" v-model="dateVal"/> -->
       <div class="picker-box" style="display:flex;padding-right: 2px;">
         <a-date-picker
           style="min-width:30px; flex: 1;"
@@ -131,7 +128,6 @@ export default {
   },
   watch: {
     resetType (nval, oval) {
-      console.log('== 重置 ==', nval)
       if (!nval) {
         this.value = ''
         this.dateVal = []
@@ -157,14 +153,11 @@ export default {
   },
   data() {
     return {
-      // input输入框
       value: '',
-      // 日期区间
       dateVal: [],
       startValue: null,
       endValue: null,
       endOpen: false,
-      // select
       dataList: this.labelData.dataList || [],
       dataSourceList: []
     }
@@ -189,15 +182,6 @@ export default {
         value: data.value
       })
     },
-    // 时间区间 start
-
-    // changeRangeDate(e, mode) {
-    //   this.$emit('change', {
-    //     form: this.labelData,
-    //     value: mode
-    //   })
-    // },
-
     disabledStartDate(startValue) {
       const endValue = this.endValue;
       if (!startValue || !endValue) {
@@ -216,21 +200,14 @@ export default {
       if (!open) {
         this.endOpen = true;
       }
-      // if (this.startValue) {
-      //   this.getDateRangeRes()
-      // }
     },
     handleEndOpenChange(open) {
       this.endOpen = open;
-      // if (this.endValue) {
-      //   this.getDateRangeRes()
-      // }
     },
     getDateRangeRes () {
       const start = this.startValue ? this.formatDate(this.startValue._d).substr(0, 10) : ''
       const end = this.endValue ? this.formatDate(this.endValue._d).substr(0, 10) : ''
       const date = [start, end]
-      console.log('== 更新时间 ==', date)
       this.$emit('change', {
         form: this.labelData,
         value: date
@@ -238,44 +215,39 @@ export default {
     },
     formatDate (now) {
       var date = new Date(now)
-      var y = date.getFullYear() // 年份
+      var y = date.getFullYear()
-      var m = date.getMonth() + 1 // 月份，注意：js里的月要加1
+      var m = date.getMonth() + 1
       if (m < 10) {
         m = '0' + m;
       }
-      var d = date.getDate() // 日
+      var d = date.getDate()
       if (d < 10) {
         d = '0' + d;
       }
-      var h = date.getHours() // 小时
+      var h = date.getHours()
       if (h < 10) {
         h = '0' + h;
       }
-      var min = date.getMinutes() // 分钟
+      var min = date.getMinutes()
       if (min < 10) {
         min = '0' + min;
       }
-      var s = date.getSeconds() // 秒
+      var s = date.getSeconds()
       if (s < 10) {
         s = '0' + s;
       }
-      // 返回值，根据自己需求调整，现在已经拿到了年月日时分秒了
       return y + '-' + m + '-' + d + ' ' + h + ':' + min + ':' + s
 		},
-    // 时间区间 end
-    // == 下拉选择 ==
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
     handleSelectChange (e) {
-      console.log('== 修改select ==', e, this.value)
       this.$emit('change', {
         form: this.labelData,
         value: this.dataList[e][this.labelData.showLabel]
       })
     },
     getSelectFirst (e) {
-      console.log('下拉选择 - 首次点击内容：', e)
       if (!e) {
         this.$emit('selectFirst', {
           form: this.labelData,
@@ -284,8 +256,6 @@ export default {
         })
       }
     },
-
-    // == 模糊搜索 ==
     completeSelect (value) {
       this.$emit('change', {
         form: this.labelData,
@@ -311,11 +281,9 @@ export default {
       })
     },
     inputChange (data) {
-      console.log('== 表单输入 ==', data)
       this.changeInput(data)
     },
     dateChangeFun (data) {
-      console.log('== 表单时间 ==', data)
       this.changeDate(data)
     }
   }

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

@@ -70,7 +70,6 @@ export default {
     { field: 'reeferf', label: 'REEFERF', width: 160, title: '通风度', showHeaderOverflow: true, sortable: true },
     { field: 'shipagency', label: 'SHIPAGENCY', width: 160, title: '船代', showHeaderOverflow: true, sortable: true },
     { field: 'custno', label: 'CUSTNO', width: 160, title: '订舱编号', showHeaderOverflow: true, sortable: true },
-    // 以下为东胜没有，大简云有，目前保留的
     // { field: 'vgm', label: 'VGM', width: 120, title: 'VGM', showHeaderOverflow: true },
     { field: 'forwarder', label: 'FORWARDER', width: 120, title: '订舱代理', showHeaderOverflow: true, sortable: true },
     // { field: 'bookingStatus', label: 'BOOKINGSTATUS', width: 120, title: '订舱状态', showHeaderOverflow: true },
@@ -82,7 +81,6 @@ 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: 'shipperid', label: 'SHIPPERID', width: 120, title: '发货人代码', showHeaderOverflow: true, sortable: true }, // 台账无字段
     { field: 'notifypartyid', label: 'NOTIFYPARTYID', width: 120, title: '通知人代码', showHeaderOverflow: true, sortable: true }, // 台账无字段
@@ -102,7 +100,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: 'goodsStatusList', label: 'GOODSSTATUSLIST', minWidth: 160, title: '货物状态', showHeaderOverflow: true, slots: { default: 'goodsStatusList' } },
+    { field: 'tmblno', label: 'TMBLNO', width: 120, title: '真提单号', showHeaderOverflow: true, sortable: true }
   ],
   // ==== 表单部分 ====
   condAllData: [
@@ -131,7 +130,6 @@ export default {
     { 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' },
     { title: '发货人代码', align: 'center', width: 120, label: 'SHIPPERID', type: 'input' },
     { title: '通知人', align: 'center', width: 120, label: 'NOTIFYPARTY', type: 'input' },
@@ -155,8 +153,6 @@ export default {
     { title: '卸货港代码', align: 'center', width: 120, label: 'PORTDISCHARGEID', type: 'input' },
     { title: '航线操作', align: 'center', width: 120, label: 'ROUTE', type: 'complete', showLabel: 'name' },
     { title: 'PO NO', align: 'center', width: 120, label: 'PONO', type: 'input' },
-
-    // 新增字段
     { title: '件数', align: 'center', width: 160, label: 'PKGS', type: 'input' },
     { title: '重量', align: 'center', width: 160, label: 'KGS', type: 'input' },
     { title: '尺码', align: 'center', width: 160, label: 'CBM', type: 'input' },
@@ -167,14 +163,11 @@ export default {
     { title: '付款方', align: 'center', width: 160, label: 'FREIGHTPAYER', type: 'input' },
     { title: '唛头', align: 'center', width: 160, label: 'MARKS', type: 'input' },
     { title: '危险品编号', align: 'center', width: 160, label: 'DUNNO', type: 'input' },
-    // 东胜添加
     { title: '箱号', align: 'center', width: 160, label: 'CNTRNO', type: 'input' },
     { title: '封号', align: 'center', width: 160, label: 'SEALNO', type: 'input' },
     { title: '创建人', align: 'center', width: 160, label: 'CreatedUserName', type: 'input' },
     { title: '单证备注', align: 'center', width: 160, label: 'DZREMARK', type: 'input' },
     { title: '操作备注', align: 'center', width: 160, label: 'CZREMARK', type: 'input' },
-
-    // 以下需要加模糊搜索
     { title: '到付地点', align: 'center', width: 160, label: 'PAYABLEAT', type: 'complete', showLabel: 'enName' },
     { title: '付费方式', align: 'center', width: 160, label: 'BLFRT', type: 'complete', showLabel: 'enName' },
     { title: '签单地点', align: 'center', width: 160, label: 'ISSUEPLACE', type: 'complete', showLabel: 'enName' },
@@ -183,8 +176,6 @@ export default {
     { title: '国外代理', align: 'center', width: 160, label: 'AGENTID', type: 'complete', showLabel: 'shortName' },
     { title: '车队', align: 'center', width: 160, label: 'TRUCKER', type: 'complete', showLabel: 'shortName' },
     { title: '船代', align: 'center', width: 160, label: 'SHIPAGENCY', type: 'complete', showLabel: 'name' },
-
-    // 以下为下拉加载
     { 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' },
@@ -223,10 +214,7 @@ export default {
         { code: 'O', name: '超限箱' }
       ]
     },
-
     { title: '签单日期', align: 'center', width: 160, label: 'ISSUEDATE', type: 'dateRange', resLabel: ['BISSUEDATE', 'EISSUEDATE'] },
-    // 以下为新增字段 - 台账文档中, 参数暂无
+    { title: '真提单号', align: 'center', width: 160, label: 'TMBLNO', type: 'input' }
-    // { title: '单证备注', align: 'center', width: 160, label: 'DZREMARK', type: 'input' },
-    // { title: '操作备注', align: 'center', width: 160, label: 'CZREMARK', type: 'input' }
   ]
 }