From 93c79473fd2eccfdd659e6741a5eca09b4dd9d31 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 15 Jun 2026 10:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AC=E6=A0=87/Alpha=E5=A4=8D=E9=80=89?=
 =?UTF-8?q?=E6=A1=86=EF=BC=88=E6=98=BE=E7=A4=BA=E8=AE=A2=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=89=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=B8=8D=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=EF=BC=8C=E5=8B=BE=E9=80=89=E4=BA=86=E5=B0=B1=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?PO=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/declaration.vue | 27 +++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue
index 922718c..e6e69da 100644
--- a/src/views/modules/ecss/declaration.vue
+++ b/src/views/modules/ecss/declaration.vue
@@ -562,7 +562,12 @@
               <el-input v-model="exportGoods.sendPort"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-show="hasMexicoShippingMarkBu()">
+          <el-col :span="4" v-show="hasOrderNoCheckboxBu()">
+            <el-form-item :label="'显示订单号'" >
+              <el-checkbox v-model="exportGoods.showOrderNoFlag"></el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="hasOrderNoCheckboxBu()?4:8" v-show="hasMexicoShippingMarkBu()">
             <el-form-item :label="'墨西哥唛头'" >
               <el-checkbox v-model="exportGoods.mexicoShippingMarkFlag"></el-checkbox>
             </el-form-item>
@@ -971,11 +976,16 @@
               <el-input type="textarea" :rows="3" v-model="exportGoods.voyage"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="hasPickupAddressBu()?24:12" v-show="hasMexicoShippingMarkBu()">
+          <el-col :span="hasOrderNoCheckboxBu()?6:(hasPickupAddressBu()?24:12)" v-show="hasMexicoShippingMarkBu()">
             <el-form-item :label="'墨西哥唛头'" >
               <el-checkbox v-model="exportGoods.mexicoShippingMarkFlag"></el-checkbox>
             </el-form-item>
           </el-col>
+          <el-col :span="6" v-show="hasOrderNoCheckboxBu()">
+            <el-form-item :label="'显示订单号'" >
+              <el-checkbox v-model="exportGoods.showOrderNoFlag"></el-checkbox>
+            </el-form-item>
+          </el-col>
           <el-col v-show="!hasPickupAddressBu()" :span="12">
             <el-form-item  :label="'提/送货日期'" >
               <el-input v-model="exportGoods.deliveryGoodsDate"></el-input>
@@ -1128,6 +1138,7 @@
           shippingDate:'',
           hsCodeDescType:'N',
           mexicoShippingMarkFlag: false,
+          showOrderNoFlag: false,
           shipper:'Checkpoint Commercial (Shanghai) Co., Ltd.   保点贸易（上海）有限公司\t\t\t\t\t\t\n' +
           'Room 1411, No. 31, Lane 2419, Hunan Road, Pudong New Area, Shanghai\t\t\t\t\t\t\n' +
           '电话/Tel: (86-21)38112888   传真/Fax: (86-21)38112990\t\t\t\t\t\t\n' +
@@ -1258,7 +1269,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80
+            columnWidth: 90
           },
           {
             userId: this.$store.state.user.name,
@@ -2409,6 +2420,7 @@
         this.exportGoods.deliveryGoodsDate = ''
         this.exportGoods.voyage = this.buildDefaultVoyage()
         this.exportGoods.shippingDate = ''
+        this.exportGoods.showOrderNoFlag = false
         this.loadPickupAddressList(this.currentRow.buNo)
         this.exportGoodsFlag = true
       },
@@ -2424,6 +2436,12 @@
         }
         return ['05-Alpha', '04-MHM', '02-Hardtag'].includes(this.currentRow.buNo)
       },
+      hasOrderNoCheckboxBu() {
+        if (!this.currentRow || !this.currentRow.buNo) {
+          return false
+        }
+        return ['05-Alpha', '02-Hardtag'].includes(this.currentRow.buNo)
+      },
       buildDefaultVoyage() {
         if (!this.currentRow || !this.currentRow.buNo) {
           return ''
@@ -2606,6 +2624,7 @@
         exportParam.pickupAddress=this.exportGoods.pickupAddress
         exportParam.pickupAddressValue=this.exportGoods.pickupAddressValue
         exportParam.mexicoShippingMarkFlag=this.exportGoods.mexicoShippingMarkFlag
+        exportParam.showOrderNoFlag=this.exportGoods.showOrderNoFlag
 
         exportParam.brandType = this.brandType
         exportParam.hsCodeDescType=this.hsCodeDescType
@@ -2797,6 +2816,7 @@
         this.exportGoods.deliveryGoodsDate = ''
         this.exportGoods.voyage = this.buildDefaultVoyage()
         this.exportGoods.shippingDate = '';
+        this.exportGoods.showOrderNoFlag = false
         await this.loadPickupAddressList(this.currentRow.buNo)
         //this.templateData.type='出口货物委托书'
         //await this.searchTemplateOne();
@@ -2848,6 +2868,7 @@
         exportParam.pickupAddress=this.exportGoods.pickupAddress
         exportParam.pickupAddressValue=this.exportGoods.pickupAddressValue
         exportParam.mexicoShippingMarkFlag=this.exportGoods.mexicoShippingMarkFlag
+        exportParam.showOrderNoFlag=this.exportGoods.showOrderNoFlag
 
         exportParam.brandType = this.brandType
         exportParam.hsCodeDescType=this.hsCodeDescType