From 87d16b4f1f86d51323c43bb37775a0fa616d3462 Mon Sep 17 00:00:00 2001 From: jiangkuan Date: Sun, 23 Apr 2023 16:59:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/index.vue | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index dd96cb2..0c5a7f9 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -68,6 +68,12 @@ 导出 + + + {{ departmentFilter(text) }} + + + {{ sexFilter(text) }} @@ -169,6 +175,13 @@ export default { title: '姓名', dataIndex: 'name' }, + { + title: '部门', + dataIndex: 'sysEmpInfo', + scopedSlots: { + customRender: 'sysEmpInfo' + } + }, { title: '性别', dataIndex: 'sex', @@ -243,6 +256,10 @@ export default { } }, methods: { + departmentFilter(sysEmpInfo) { + // console.log('sysEmpInfo===>>',sysEmpInfo) + return sysEmpInfo.orgName + }, sexFilter(sex) { // eslint-disable-next-line eqeqeq const values = this.sexDictTypeDropDown.filter(item => item.code == sex) From fa8d173430c05c67c1618763093046ccc4c56261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com> Date: Mon, 24 Apr 2023 14:53:20 +0800 Subject: [PATCH 2/4] 4/24 --- src/api/modular/main/SendCar.js | 24 ++++++++++++++++++++ src/views/main/SendCar/index.vue | 39 +++++++++++++++++++++++++++++--- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/src/api/modular/main/SendCar.js b/src/api/modular/main/SendCar.js index ba347bc..23f7b69 100644 --- a/src/api/modular/main/SendCar.js +++ b/src/api/modular/main/SendCar.js @@ -72,6 +72,18 @@ export function BookingTruckCancel(parameter) { params: parameter }) } +/** + * 批量撤销派车 + * + * @author Myshipping + */ +export function BookingTruckCancelBatch(parameter) { + return axios({ + url: '/BookingTruck/CancelBatch', + method: 'post', + data: parameter + }) +} /** * 提交派车 * @@ -84,6 +96,18 @@ export function BookingTruckSubmit(parameter) { data: parameter }) } +/** + * 批量提交派车 + * + * @author Myshipping + */ +export function BookingTruckSubmitBatch(parameter) { + return axios({ + url: '/BookingTruck/SubmitBatch', + method: 'post', + data: parameter + }) +} /** * 删除派车 * diff --git a/src/views/main/SendCar/index.vue b/src/views/main/SendCar/index.vue index caacc6c..98c71ff 100644 --- a/src/views/main/SendCar/index.vue +++ b/src/views/main/SendCar/index.vue @@ -105,8 +105,9 @@ + { + ApiArr.push(item.id) + }) + BookingTruckCancelBatch(ApiArr).then(res => { + if (res.data.succ) { + this.$message.success('撤销成功') + } else { + this.$message.error(`撤销失败,${res.data.msg}`) + } + }) + }, + FnSubmit() { + let ApiArr = [] + let select = this.$refs.XTable.getCheckboxRecords() + select.forEach(item => { + ApiArr.push(item.id) + }) + BookingTruckSubmitBatch(ApiArr).then(res => { + if (res.data.succ) { + this.$message.success('提交成功') + } else { + this.$message.error(`提交失败,${res.data.msg}`) + } + }) + }, TabsAdd() { this.$router.push({ name: 'SendCarAdd', From e6e3725f3aea2d1e0a49d7e93e7fe6a9dfddd05d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com> Date: Mon, 24 Apr 2023 15:46:00 +0800 Subject: [PATCH 3/4] 4/24 --- src/views/main/SendCar/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/main/SendCar/index.vue b/src/views/main/SendCar/index.vue index 98c71ff..4ede639 100644 --- a/src/views/main/SendCar/index.vue +++ b/src/views/main/SendCar/index.vue @@ -217,7 +217,7 @@ const columns = [ title: '任务流水号', align: 'center', width: '120', - dataIndex: 'TaskNo' + dataIndex: 'taskNo' }, { title: '状态', From 0b54827ef305061ed3699e63ab5fdaec0c0a4c68 Mon Sep 17 00:00:00 2001 From: jiangkuan Date: Mon, 24 Apr 2023 16:41:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=9E=E6=94=B6?= =?UTF-8?q?=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modular/main/BookingLedger.js | 9 + .../main/ViewDeletedList/ViewDeletedList.vue | 2497 +++++++++++++++++ .../ViewDeletedList/components/autoView.vue | 200 ++ .../components/datePickerView.vue | 86 + .../ViewDeletedList/components/inputView.vue | 114 + .../ViewDeletedList/components/selectView.vue | 592 ++++ .../components/textareaView.vue | 113 + .../ViewDeletedList/modules/formLabel.vue | 376 +++ .../main/ViewDeletedList/modules/initData.js | 597 ++++ 9 files changed, 4584 insertions(+) create mode 100644 src/views/main/ViewDeletedList/ViewDeletedList.vue create mode 100644 src/views/main/ViewDeletedList/components/autoView.vue create mode 100644 src/views/main/ViewDeletedList/components/datePickerView.vue create mode 100644 src/views/main/ViewDeletedList/components/inputView.vue create mode 100644 src/views/main/ViewDeletedList/components/selectView.vue create mode 100644 src/views/main/ViewDeletedList/components/textareaView.vue create mode 100644 src/views/main/ViewDeletedList/modules/formLabel.vue create mode 100644 src/views/main/ViewDeletedList/modules/initData.js diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js index 6684fde..fe4893e 100644 --- a/src/api/modular/main/BookingLedger.js +++ b/src/api/modular/main/BookingLedger.js @@ -772,6 +772,15 @@ export function DeleteBookingOrder(parameter) { method: 'post' }) } + +//恢复删除 +export function RecoverDeleteOrder(parameter) { + return axios({ + url: '/BookingOrder/RecoverDelete?Ids=' + parameter, + method: 'post' + }) +} + // 获取货物状态 export function BookingOrderGetGoodsStatusList(parameter) { return axios({ diff --git a/src/views/main/ViewDeletedList/ViewDeletedList.vue b/src/views/main/ViewDeletedList/ViewDeletedList.vue new file mode 100644 index 0000000..4c32ade --- /dev/null +++ b/src/views/main/ViewDeletedList/ViewDeletedList.vue @@ -0,0 +1,2497 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/main/ViewDeletedList/components/autoView.vue b/src/views/main/ViewDeletedList/components/autoView.vue new file mode 100644 index 0000000..c787b83 --- /dev/null +++ b/src/views/main/ViewDeletedList/components/autoView.vue @@ -0,0 +1,200 @@ + + + diff --git a/src/views/main/ViewDeletedList/components/datePickerView.vue b/src/views/main/ViewDeletedList/components/datePickerView.vue new file mode 100644 index 0000000..1e1b4c1 --- /dev/null +++ b/src/views/main/ViewDeletedList/components/datePickerView.vue @@ -0,0 +1,86 @@ + + + diff --git a/src/views/main/ViewDeletedList/components/inputView.vue b/src/views/main/ViewDeletedList/components/inputView.vue new file mode 100644 index 0000000..4369cbe --- /dev/null +++ b/src/views/main/ViewDeletedList/components/inputView.vue @@ -0,0 +1,114 @@ + + + diff --git a/src/views/main/ViewDeletedList/components/selectView.vue b/src/views/main/ViewDeletedList/components/selectView.vue new file mode 100644 index 0000000..805eab1 --- /dev/null +++ b/src/views/main/ViewDeletedList/components/selectView.vue @@ -0,0 +1,592 @@ + + + diff --git a/src/views/main/ViewDeletedList/components/textareaView.vue b/src/views/main/ViewDeletedList/components/textareaView.vue new file mode 100644 index 0000000..8868ddd --- /dev/null +++ b/src/views/main/ViewDeletedList/components/textareaView.vue @@ -0,0 +1,113 @@ + + diff --git a/src/views/main/ViewDeletedList/modules/formLabel.vue b/src/views/main/ViewDeletedList/modules/formLabel.vue new file mode 100644 index 0000000..fe78cb0 --- /dev/null +++ b/src/views/main/ViewDeletedList/modules/formLabel.vue @@ -0,0 +1,376 @@ + + + diff --git a/src/views/main/ViewDeletedList/modules/initData.js b/src/views/main/ViewDeletedList/modules/initData.js new file mode 100644 index 0000000..8442172 --- /dev/null +++ b/src/views/main/ViewDeletedList/modules/initData.js @@ -0,0 +1,597 @@ +export default { + // ==== 表格部分 ==== + columns: [ + { type: 'checkbox', width: 60, noDraggable: true }, + { field: 'carrier', width: 120, title: '船公司', showHeaderOverflow: true, sortable: true }, + { field: 'yard', label: 'YARD', width: 120, title: '场站', showHeaderOverflow: true, sortable: true }, + { + field: 'mblno', + label: 'MBLNO', + width: 160, + title: '主提单号', + showHeaderOverflow: true, + showOverflow: false, + sortable: true, + slots: { default: 'mblno' } + }, + { field: 'vessel', label: 'VESSEL', width: 120, title: '船名', showHeaderOverflow: true, sortable: true }, + { + field: 'etd', + label: 'ETD', + width: 110, + title: '开船日期', + showHeaderOverflow: true, + sortable: true, + slots: { default: 'etd' } + }, + { field: 'voyno', label: 'VOYNO', width: 120, title: '海关航次', showHeaderOverflow: true }, + // { field: 'bookingStatus', label: 'BOOKINGSTATUS', width: 120, title: '订舱状态', showHeaderOverflow: true }, + // { field: 'vgm', label: 'VGM', width: 120, title: 'VGM', showHeaderOverflow: true }, + // { field: 'billStatus', label: 'BILLSTATUS', width: 120, title: '提单状态', showHeaderOverflow: true }, + { + field: 'portdischarge', + label: 'PORTDISCHARGE', + width: 120, + title: '卸货港', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'createdUserName', + label: 'CREATEDUSERNAME', + width: 120, + title: '创建人', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'createdTime', + label: 'CREATEDTIME', + width: 160, + title: '创建日期', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'cntrtotal', + label: 'CNTRTOTAL', + width: 120, + title: '箱型*箱量', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'operate', + title: '操作', + width: 110, + noDraggable: true, + slots: { default: 'operate' }, + fixed: 'right', + resizable: false + } + ], + columnsAllData: [ + { + field: 'mblno', + label: 'MBLNO', + width: 160, + title: '主提单号', + showHeaderOverflow: true, + showOverflow: false, + sortable: true, + slots: { default: 'mblno' } + }, + { field: 'hblno', label: 'HBLNO', width: 120, title: '分提单号', showHeaderOverflow: true, sortable: true }, + { + field: 'customername', + label: 'CUSTOMERNAME', + width: 120, + title: '委托单位', + showHeaderOverflow: true, + sortable: true + }, // 客户 + { field: 'consignee', label: 'CONSIGNEE', width: 120, title: '收货人', showHeaderOverflow: true, sortable: true }, + { + field: 'notifyparty', + label: 'NOTIFYPARTY', + width: 120, + title: '通知人', + showHeaderOverflow: true, + sortable: true + }, + { field: 'yard', label: 'YARD', width: 120, title: '场站', showHeaderOverflow: true, sortable: true }, + { field: 'vessel', label: 'VESSEL', width: 120, title: '船名', showHeaderOverflow: true, sortable: true }, + { + field: 'voynoinner', + label: 'VOYNOINNER', + width: 120, + title: '内部航次', + showHeaderOverflow: true, + sortable: true + }, // 内部航次 / 海关航次 ? 暂时放内部航次 + { + field: 'etd', + label: 'ETD', + width: 110, + title: '开船日期', + showHeaderOverflow: true, + sortable: true, + slots: { default: 'etd' } + }, + { + field: 'atd', + label: 'ATD', + width: 160, + title: '实际开船日期', + showHeaderOverflow: true, + sortable: true, + slots: { default: 'atd' } + }, + { field: 'blfrt', label: 'BLFRT', width: 120, title: '付费方式', showHeaderOverflow: true, sortable: true }, + { field: 'payableat', label: 'PAYABLEAT', width: 120, title: '到付地点', showHeaderOverflow: true, sortable: true }, + { field: 'pkgs', label: 'PKGS', width: 120, title: '件数', showHeaderOverflow: true, sortable: true }, + { field: 'kindpkgs', label: 'KINDPKGS', width: 120, title: '包装', showHeaderOverflow: true, sortable: true }, + { field: 'kgs', label: 'KGS', width: 120, title: '重量', showHeaderOverflow: true, sortable: true }, + { field: 'cbm', label: 'CBM', width: 90, title: '尺码', showHeaderOverflow: true, sortable: true }, + { + field: 'cntrtotal', + label: 'CNTRTOTAL', + width: 120, + title: '箱型*箱量', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'custservice', + label: 'CUSTSERVICE', + width: 120, + title: '客服员', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'createdUserName', + label: 'CREATEDUSERNAME', + width: 120, + title: '创建人', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'createdTime', + label: 'CREATEDTIME', + width: 160, + title: '创建日期', + showHeaderOverflow: true, + sortable: true + }, + { field: 'op', label: 'OP', width: 120, title: '操作员', showHeaderOverflow: true, sortable: true }, + { field: 'doc', label: 'DOC', width: 120, title: '单证员', showHeaderOverflow: true, sortable: true }, + { field: 'carrier', width: 120, title: '船公司', showHeaderOverflow: true, sortable: true }, + { field: 'customser', label: 'CUSTOMSER', width: 120, title: '报关行', showHeaderOverflow: true, sortable: true }, + { field: 'hscode', label: 'HSCODE', width: 120, title: 'HS编码', showHeaderOverflow: true, sortable: true }, + { field: 'issuetype', label: 'ISSUETYPE', width: 120, title: '签单方式', showHeaderOverflow: true, sortable: true }, + { + field: 'issueplace', + label: 'ISSUEPLACE', + width: 120, + title: '签单地点', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'placedelivery', + label: 'PLACEDELIVERY', + width: 120, + title: '交货地点', + showHeaderOverflow: true, + sortable: true + }, + { field: 'nobill', label: 'NOBILL', width: 120, title: '提单份数', showHeaderOverflow: true, sortable: true }, + { + field: 'portdischarge', + label: 'PORTDISCHARGE', + width: 120, + title: '卸货港', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'bookremark', + label: 'BOOKREMARK', + width: 120, + title: '备注', + className: 'book-remark-box', + showOverflow: false, + slots: { default: 'bookremark' } + }, // 标题 合同号备注 改为 备注 + // { field: 'remarks', label: 'REMARKS', width: 120, title: '其他备注', showHeaderOverflow: true, showOverflow: false, sortable: true, slots: { default: 'remarks' } }, // 暂时写为so备注 + si备注 数据量太大,不要了 + { + field: 'bookstatus', + label: 'BOOKSTATUS', + minWidth: 140, + title: '运踪', + showHeaderOverflow: true, + slots: { default: 'bookstatus' } + }, + { + field: 'closingdate', + label: 'CLOSINGDATE', + width: 160, + title: '截港日期', + showHeaderOverflow: true, + sortable: true, + slots: { default: 'closingdate' } + }, + { field: 'eta', label: 'ETA', width: 160, title: '预计到港日期', showHeaderOverflow: true, sortable: true }, + { field: 'portload', label: 'PORTLOAD', width: 160, title: '装货港', showHeaderOverflow: true, sortable: true }, + { field: 'shipper', label: 'SHIPPER', width: 160, title: '发货人', showHeaderOverflow: true, sortable: true }, + { + field: 'destination', + label: 'DESTINATION', + width: 160, + title: '目的地', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'issuedate', + label: 'ISSUEDATE', + width: 160, + title: '签单日期', + showHeaderOverflow: true, + sortable: true, + slots: { default: 'issuedate' } + }, + { 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: '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 }, + { field: 'agentid', label: 'AGENTID', width: 160, title: '国外代理', showHeaderOverflow: true, sortable: true }, + { field: 'trucker', label: 'TRUCKER', width: 160, title: '车队', showHeaderOverflow: true, sortable: true }, + { field: 'tempset', label: 'TEMPSET', width: 160, title: '设置温度', showHeaderOverflow: true, sortable: true }, + { 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 }, + { + field: 'freightpayer', + label: 'FREIGHTPAYER', + width: 120, + title: '付款方', + showHeaderOverflow: true, + sortable: true + }, + { field: 'voyno', label: 'VOYNO', width: 120, title: '海关航次', showHeaderOverflow: true }, + { field: 'cargoid', label: 'CARGOID', width: 120, title: '货物标识', showHeaderOverflow: true, sortable: true }, + { field: 'marks', label: 'MARKS', width: 120, title: '唛头', showHeaderOverflow: true, sortable: true }, + // { field: 'billStatus', label: 'BILLSTATUS', width: 120, title: '提单状态', showHeaderOverflow: true }, + { 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 + }, // 台账无字段 + { + field: 'notifypartY2', + label: 'NOTIFYPARTY2', + width: 120, + title: '第二通知人', + showHeaderOverflow: true, + sortable: true + }, // 台账无,详情有 + { + field: 'consigneeid', + label: 'CONSIGNEEID', + width: 120, + title: '收货人代码', + showHeaderOverflow: true, + sortable: true + }, // 台账无字段 + { + field: 'closedocdate', + label: 'CLOSEDOCDATE', + width: 120, + title: '截单日期', + showHeaderOverflow: true, + sortable: true + }, + { field: 'bsdate', label: 'BSDATE', width: 120, title: '业务日期', showHeaderOverflow: true, sortable: true }, // 台账无字段 + { field: 'vesselid', label: 'VESSELID', width: 120, title: '船舶呼号', showHeaderOverflow: true, sortable: true }, // 台账无字段 + { + field: 'closevgmdate', + label: 'CLOSEVGMDATE', + width: 120, + title: '截VGM时间', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'placereceipt', + label: 'PLACERECEIPT', + width: 120, + title: '收货地', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'placereceiptid', + label: 'PLACERECEIPTID', + width: 120, + title: '收货地代码', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'destinationid', + label: 'DESTINATIONID', + width: 120, + title: '目的地代码', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'placedeliveryid', + label: 'PLACEDELIVERYID', + width: 120, + title: '交货地代码', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'portloadid', + label: 'PORTLOADID', + width: 120, + title: '装货港代码', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'portdischargeid', + label: 'PORTDISCHARGEID', + width: 120, + title: '卸货港代码', + showHeaderOverflow: true, + sortable: true + }, + { + field: 'pono', + label: 'PONO', + width: 120, + title: 'PO NO', + showHeaderOverflow: true, + sortable: true, + slots: { default: 'pono' } + }, + // 以下为新增字段 + { + 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: 'linename', label: 'LINENAME', width: 120, title: '航线', showHeaderOverflow: true, sortable: true }, + { + field: 'lstShipOrderCompareRlt', + label: 'LSTSHIPORDERCOMPARERLT', + minWidth: 92, + title: '下货纸比对', + showHeaderOverflow: true, + slots: { default: 'lstShipOrderCompareRlt' } + } + ], + // ==== 表单部分 ==== + condAllData: [ + { title: '委托单位', align: 'center', width: 160, label: 'CUSTOMERNAME', type: 'complete', showLabel: 'shortName' }, // 客户 + { title: '主提单号', align: 'center', width: 160, label: 'MBLNO', type: 'input' }, + { title: '分提单号', align: 'center', width: 160, label: 'HBLNO', type: 'input' }, + { + title: '船公司', + align: 'center', + width: 120, + label: 'CARRIER', + type: 'select', + showLabel: 'enName', + showLabel2: 'cnName' + }, + { title: '订舱代理', align: 'center', width: 120, label: 'FORWARDER', type: 'complete', showLabel: 'shortName' }, + { + title: '场站', + align: 'center', + width: 120, + label: 'YARDID', + type: 'select', + showLabel: 'code', + showLabel2: 'name' + }, // 场站显示 name , yardid 取字段 code + // { title: '船名/航次', align: 'center', width: 120, label: 'VESSEL', type: 'complete', showLabel: 'vessel', showLabel2: 'voyno' }, // 船名航次换接口 船名 vessel 航次 voyno + { title: '船名', align: 'center', width: 120, label: 'VESSEL', type: 'complete', showLabel: 'name' }, // 船名航次换接口 船名 vessel 航次 voyno + { title: '开船日期', align: 'center', width: 160, label: 'ETD', type: 'dateRange', resLabel: ['BETD', 'EETD'] }, + { title: '实际开船日期', align: 'center', width: 160, label: 'ATD', type: 'dateRange', resLabel: ['BATD', 'EATD'] }, + { title: '预计到港日期', align: 'center', width: 160, label: 'ETA', type: 'dateRange', resLabel: ['BETA', 'EETA'] }, + { title: '卸货港', align: 'center', width: 120, label: 'PORTDISCHARGE', type: 'complete', showLabel: 'enName' }, + { 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: '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' }, + { 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: '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' }, + { title: '通知人代码', align: 'center', width: 120, label: 'NOTIFYPARTYID', type: 'input' }, + { title: '第二通知人', align: 'center', width: 120, label: 'NOTIFYPARTY2', type: 'input' }, + { title: '收货人', align: 'center', width: 120, label: 'CONSIGNEE', type: 'input' }, + { title: '收货人代码', align: 'center', width: 120, label: 'CONSIGNEEID', type: 'input' }, + { + title: '截单日期', + align: 'center', + width: 160, + label: 'CLOSEDOCDATE', + type: 'dateRange', + resLabel: ['BCLOSEDOCDATE', 'ECLOSEDOCDATE'] + }, + { title: '业务日期', align: 'center', width: 120, label: 'BSDATE', type: 'date' }, + { title: '合约号', align: 'center', width: 120, label: 'CONTRACTNO', type: 'input' }, + { title: '船舶呼号', align: 'center', width: 120, label: 'VESSELID', type: 'input' }, + { + title: '截港日期', + align: 'center', + width: 160, + label: 'CLOSINGDATE', + type: 'dateRange', + resLabel: ['BCLOSINGDATE', 'ECLOSINGDATE'] + }, + { + title: '截VGM时间', + align: 'center', + width: 160, + label: 'CLOSEVGMDATE', + type: 'dateRange', + resLabel: ['BCLOSEVGMDATE', 'ECLOSEVGMDATE'] + }, + { title: '收货地', align: 'center', width: 120, label: 'PLACERECEIPT', type: 'complete', showLabel: 'enName' }, + { title: '目的地', align: 'center', width: 120, label: 'DESTINATION', type: 'complete', showLabel: 'enName' }, + { title: '交货地', align: 'center', width: 120, label: 'PLACEDELIVERY', type: 'complete', showLabel: 'enName' }, + { title: '收货地代码', align: 'center', width: 120, label: 'PLACERECEIPTID', type: 'input' }, + { title: '目的地代码', align: 'center', width: 120, label: 'DESTINATIONID', type: 'input' }, + { title: '交货地代码', align: 'center', width: 120, label: 'PLACEDELIVERYID', type: 'input' }, + { title: '装货港代码', align: 'center', width: 120, label: 'PORTLOADID', type: 'input' }, + { 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' }, + { 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: 'TEMPSET', type: 'input' }, + { title: '通风度', align: 'center', width: 160, label: 'REEFERF', type: 'input' }, + { 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' }, + { title: '预付地点', align: 'center', width: 160, label: 'PREPARDAT', type: 'complete', showLabel: 'enName' }, + { title: '运输条款', align: 'center', width: 160, label: 'SERVICE', type: 'complete', showLabel: 'name' }, + { 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' + }, + { title: '航线', align: 'center', width: 160, label: 'LINENAME', type: 'select', showLabel: 'name' }, + { + title: '提单份数', + align: 'center', + width: 160, + label: 'NOBILL', + type: 'select', + showLabel: 'name', + data: [ + { name: 'ONE' }, + { name: 'TWO' }, + { name: 'THREE' }, + { name: 'FOUR' }, + { name: 'FIVE' }, + { name: 'SIX' }, + { name: 'SEVEN' }, + { name: 'EIGHT' }, + { name: 'NINE' }, + { name: 'TEN' } + ] + }, + { + title: '货物标识', + align: 'center', + width: 160, + label: 'CARGOID', + type: 'select', + showLabel: 'code', + showLabel2: 'name', + data: [ + { code: 'S', name: '普通货' }, + { code: 'R', name: '冻柜' }, + { code: 'D', name: '危险品' }, + { code: 'O', name: '超限箱' } + ] + }, + { + title: '签单日期', + align: 'center', + width: 160, + label: 'ISSUEDATE', + type: 'dateRange', + resLabel: ['BISSUEDATE', 'EISSUEDATE'] + }, + { title: '真提单号', align: 'center', width: 160, label: 'TMBLNO', type: 'input' } + ] +}