From 61479ea0f31957bdbe226c8bbba66c6c0b1288c6 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 20 Jul 2026 15:15:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=8B=BF=E5=A4=A7=E7=9A=84=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=97=B6=E9=BB=98=E8=AE=A4=E9=80=89=E6=8B=A9hs=20code?=
 =?UTF-8?q?=E8=B7=9F=E8=AE=A2=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/declaration.vue | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

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') {