diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue index 9df5062..1198a4c 100644 --- a/src/views/modules/ecss/declaration.vue +++ b/src/views/modules/ecss/declaration.vue @@ -2427,6 +2427,39 @@ } return ['02-Hardtag', '05-Alpha'].includes(this.currentRow.buNo) }, + isAlphaBu() { + if (!this.currentRow || !this.currentRow.buNo) { + return false + } + return ['05-Alpha'].includes(this.currentRow.buNo) + }, + isHardtagOrAntennaBu() { + if (!this.currentRow || !this.currentRow.buNo) { + return false + } + return ['02-Hardtag', '04-MHM'].includes(this.currentRow.buNo) + }, + isSpainDestination() { + if (!this.currentRow) { + return false + } + const destinationFields = [ + this.currentRow.destination + ] + return destinationFields.some(field => { + const text = field ? String(field).trim().toUpperCase() : '' + const normalizedText = text.normalize ? text.normalize('NFD').replace(/[\u0300-\u036f]/g, '') : text + return normalizedText.indexOf('SPAIN') > -1 + || normalizedText.indexOf('ESPANA') > -1 + || normalizedText.indexOf('西班牙') > -1 + }) + }, + shouldEnableSpainDefaultChecks() { + return this.isHardtagOrAntennaBu() && this.isSpainDestination() + }, + shouldEnableAlphaSpainDefaultChecks() { + return this.isAlphaBu() && this.isSpainDestination() + }, getPickupKeywordBySourceArea() { const detailList = Array.isArray(this.dataList2) ? this.dataList2 : [] const sourceArea = detailList @@ -2975,6 +3008,7 @@ this.exportGoods.hsCodeDescTypeBooking = 'N' this.exportGoods.showOrderNoFlag = false this.exportGoods.showInvoiceFlag = false + this.exportGoods.mexicoShippingMarkFlag = false await this.loadPickupAddressList(this.currentRow.buNo) //this.templateData.type='出口货物委托书' //await this.searchTemplateOne(); @@ -2986,12 +3020,19 @@ if (this.packageUnit==='箱') { this.exportPaking.kgs=0.1 } - if (this.currentRow.buNo==='05-Alpha' || this.currentRow.buNo==='04-MHM') { + if (this.currentRow.buNo==='05-Alpha') { this.exportPaking.kgs=3 } else if (this.currentRow.buNo==='02-Hardtag'){ this.exportPaking.kgs=5.4 + } else if (this.currentRow.buNo==='04-MHM'){ + this.exportPaking.kgs=3.2 } this.exportPaking.shippingMark=this.buildDefaultShippingMark() + const shouldCheckSpainDefaults = this.shouldEnableSpainDefaultChecks() + this.exportInvoice.hsCodeFlag = shouldCheckSpainDefaults || this.shouldEnableAlphaSpainDefaultChecks() + this.exportPaking.packaging = shouldCheckSpainDefaults || this.shouldEnableAlphaSpainDefaultChecks() + this.exportGoods.showInvoiceFlag = shouldCheckSpainDefaults + this.exportGoods.mexicoShippingMarkFlag = shouldCheckSpainDefaults if (this.currentRow.buNo==='03-RFID' || this.currentRow.buNo==='01-Label') { this.exportAllFlag = true } else {