diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue index 1198a4c..07fdc2f 100644 --- a/src/views/modules/ecss/declaration.vue +++ b/src/views/modules/ecss/declaration.vue @@ -2460,6 +2460,23 @@ shouldEnableAlphaSpainDefaultChecks() { return this.isAlphaBu() && this.isSpainDestination() }, + isCanadaDestination() { + if (!this.currentRow) { + return false + } + const destination = this.currentRow.destination ? String(this.currentRow.destination).trim().toUpperCase() : '' + return (destination === 'CANADA' || destination.indexOf('加拿大') > -1) && this.isHardtagOrAlphaBu() + }, + isAustraliaDestination() { + if (!this.currentRow) { + return false + } + const destination = this.currentRow.destination ? String(this.currentRow.destination).trim().toUpperCase() : '' + return (destination === 'AUS' + || destination.indexOf('AUSTRALIA') > -1 + || destination.indexOf('澳洲') > -1 + || destination.indexOf('澳大利亚') > -1) && this.isHardtagOrAlphaBu() + }, getPickupKeywordBySourceArea() { const detailList = Array.isArray(this.dataList2) ? this.dataList2 : [] const sourceArea = detailList @@ -2620,7 +2637,7 @@ this.exportGoods.deliveryGoodsDate = '' this.exportGoods.voyage = this.buildDefaultVoyage() this.exportGoods.shippingDate = '' - this.exportGoods.showOrderNoFlag = false + this.exportGoods.showOrderNoFlag = this.isCanadaDestination() || this.isAustraliaDestination() this.exportGoods.showInvoiceFlag = false this.loadPickupAddressList(this.currentRow.buNo) this.exportGoodsFlag = true @@ -3006,7 +3023,7 @@ this.exportGoods.shippingDate = ''; this.exportGoods.hsCodeDescType = 'N' this.exportGoods.hsCodeDescTypeBooking = 'N' - this.exportGoods.showOrderNoFlag = false + this.exportGoods.showOrderNoFlag = this.isCanadaDestination() || this.isAustraliaDestination() this.exportGoods.showInvoiceFlag = false this.exportGoods.mexicoShippingMarkFlag = false await this.loadPickupAddressList(this.currentRow.buNo) @@ -3029,8 +3046,9 @@ } this.exportPaking.shippingMark=this.buildDefaultShippingMark() const shouldCheckSpainDefaults = this.shouldEnableSpainDefaultChecks() - this.exportInvoice.hsCodeFlag = shouldCheckSpainDefaults || this.shouldEnableAlphaSpainDefaultChecks() - this.exportPaking.packaging = shouldCheckSpainDefaults || this.shouldEnableAlphaSpainDefaultChecks() + const shouldCheckAlphaSpainDefaults = this.shouldEnableAlphaSpainDefaultChecks() + this.exportInvoice.hsCodeFlag = shouldCheckSpainDefaults || shouldCheckAlphaSpainDefaults || this.isCanadaDestination() + this.exportPaking.packaging = shouldCheckSpainDefaults || shouldCheckAlphaSpainDefaults this.exportGoods.showInvoiceFlag = shouldCheckSpainDefaults this.exportGoods.mexicoShippingMarkFlag = shouldCheckSpainDefaults if (this.currentRow.buNo==='03-RFID' || this.currentRow.buNo==='01-Label') {