diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue index 78d5752..b0afb82 100644 --- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue @@ -898,10 +898,13 @@ export default { console.log(value) // this.getCarrier(value) }, - handleCarrierChange(index) { - this.details.carrier = this.carrierSelectData[index].cnName - this.details.carrierid = this.carrierSelectData[index].code - console.log(this.details.carrier, this.details.carrierid) + handleCarrierChange(data) { + this.carrierSelectData.forEach(item => { + if (item.code == data) { + console.log(item) + this.details.carrier = item.cnName + } + }) }, filterOption(input, option) { return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue index b9fc923..69e862a 100644 --- a/src/views/main/BookingLedger/detail/modules/operationArea.vue +++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue @@ -414,6 +414,19 @@
+
+ + + pdf + + + xlsx + + + docx + + +
{{ item.name }} @@ -578,7 +591,8 @@ export default { ], BCvData: [], Rdata: '', - scale: '1.5' + scale: '1.5', + PrintType: '1' } }, mounted() { @@ -689,7 +703,7 @@ export default { }, FnCilckTemplateType(typeCode) { this.$message.success(`搜索文件中...`) - BookingOrderPrint({ typeCode, bookingId: this.id }) + BookingOrderPrint({ typeCode, bookingId: this.id, type: this.PrintType }) .then(res => { console.log(res) if (!res.success) { @@ -1316,4 +1330,9 @@ export default { /deep/ .ant-modal-body .ant-input { background: #f5f9fe; } +.PrintRadio { + width: 100%; + padding-left: 1rem; + margin-bottom: 0.8rem; +} diff --git a/src/views/main/BookingLedger/detail/modules/rightContent.vue b/src/views/main/BookingLedger/detail/modules/rightContent.vue index 9118363..e18b3ef 100644 --- a/src/views/main/BookingLedger/detail/modules/rightContent.vue +++ b/src/views/main/BookingLedger/detail/modules/rightContent.vue @@ -121,7 +121,7 @@ --> -
+
暂无动态
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index 6e0f9d6..0a202b0 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -810,6 +810,7 @@ export default { // background: #f5f9fe; position: relative; background: #fff; + z-index: 1; &::after{ content: ''; position: absolute; @@ -819,6 +820,7 @@ export default { z-index: 0; background: @primary-color; opacity: .04; + z-index: -1; } } /*列表操作按钮颜色 */ diff --git a/src/views/main/BookingLedger/list/modules/initData.js b/src/views/main/BookingLedger/list/modules/initData.js index 025cb5d..121cc41 100644 --- a/src/views/main/BookingLedger/list/modules/initData.js +++ b/src/views/main/BookingLedger/list/modules/initData.js @@ -3,7 +3,7 @@ export default { { type: 'checkbox', width: 60, noDraggable: true }, { field: 'carrier', title: '船公司', showHeaderOverflow: true, sortable: true }, { field: 'yard', title: '场站', showHeaderOverflow: true, sortable: true }, - { title: '提单号', showHeaderOverflow: true, sortable: true, slots: { default: 'mblno' } }, + { title: '提单号', showHeaderOverflow: true, showOverflow: false, sortable: true, slots: { default: 'mblno' } }, { title: '船名航次', showHeaderOverflow: true, sortable: true, slots: { default: 'vessel' } }, { field: 'etd', title: '开船日期', showHeaderOverflow: true, sortable: true }, { field: 'voyno', title: '海关航次', showHeaderOverflow: true },