diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue
index 0d33c96..9a69e9d 100644
--- a/src/views/modules/ecss/declaration.vue
+++ b/src/views/modules/ecss/declaration.vue
@@ -528,8 +528,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-<!--        <el-row :gutter="20" style="margin-top: 30px">
-          &lt;!&ndash;         出口货物委托书&ndash;&gt;
+        <el-row :gutter="20" style="margin-top: 30px">
+          <!--         出口货物委托书-->
           <div class="custom-divider"><span class="text" style="left: 25%">出口货物委托书</span></div>
           <el-col :span="8">
             <el-form-item :label="'贸易方式'" >
@@ -551,21 +551,23 @@
               <el-checkbox v-model="exportGoods.mexicoShippingMarkFlag"></el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col :span="16" v-show="hasPickupAddressBu()">
-            <el-form-item :label="'提货地址'" >
-              <el-select v-model="exportGoods.pickupAddressValue"
-                         clearable
-                         filterable
-                         placeholder="请选择提货地址"
-                         style="width: 100%">
+          <el-col :span="16">
+            <el-form-item :label="'提货人'" >
+              <el-select
+                v-model="exportGoods.pickupAddressValue"
+                clearable
+                filterable
+                placeholder="请选择提货人"
+                style="width: 100%"
+                @change="handlePickupAddressChange">
                 <el-option
                   v-for="(item, index) in pickupAddressList"
-                  :key="item.buNo + '-' + index"
+                  :key="item.valueKey + '_goods_' + index"
                   :label="buildPickupAddressText(item)"
-                  :value="buildPickupAddressText(item)">
+                  :value="item.valueKey">
                   <div style="white-space: normal; line-height: 16px; padding: 4px 0;">
                     <div>{{ item.company }}</div>
-                    <div v-if="item.description" style="color: #909399;">{{ item.description }}</div>
+                    <div v-if="item.address" style="color: #909399;">{{ item.address }}</div>
                   </div>
                 </el-option>
               </el-select>
@@ -582,9 +584,9 @@
                         :rows="4" v-model="exportGoods.shipper"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>-->
+        </el-row>
       </el-form>
-      <el-footer style="height:40px;margin-top: 40px;text-align:center">
+      <el-footer style="height:40px;margin-top: 80px;text-align:center">
         <el-button type="primary" @click="exportAll()">导出Excel</el-button>
         <el-button type="success" @click="exportAllPdf()">导出PDF</el-button>
         <el-button type="info" @click="exportAllYBFlag=false">关闭</el-button>
@@ -948,17 +950,22 @@
               <el-input v-model="exportGoods.sendPort"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-show="hasPickupAddressBu()">
             <el-form-item :label="'唛头'" >
-              <el-input v-model="exportGoods.voyage"></el-input>
+              <el-input type="textarea" :rows="3" v-model="exportGoods.voyage"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item :label="'提/送货日期'" >
+          <el-col :span="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 v-show="!hasPickupAddressBu()" :span="12">
+            <el-form-item  :label="'提/送货日期'" >
               <el-input v-model="exportGoods.deliveryGoodsDate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col v-show="!hasPickupAddressBu()" :span="12">
             <el-form-item :label="'船期'" >
               <el-input v-model="exportGoods.shippingDate"></el-input>
             </el-form-item>
@@ -1104,6 +1111,7 @@
           voyage :'',
           shippingDate:'',
           hsCodeDescType:'N',
+          mexicoShippingMarkFlag: 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' +
@@ -2381,11 +2389,38 @@
         this.exportGoods.madeArea = 'Nantong, China'
         this.exportGoods.sendPort = 'Shanghai, China'
         this.exportGoods.deliveryGoodsDate = ''
-        this.exportGoods.voyage = this.currentRow.buNo==='01-Label' || this.currentRow.buNo==='03-RFID'?this.currentRow.cmcInvoice:''
+        this.exportGoods.voyage = this.buildDefaultVoyage()
         this.exportGoods.shippingDate = ''
         this.loadPickupAddressList(this.currentRow.buNo)
         this.exportGoodsFlag = true
       },
+      hasPickupAddressBu() {
+        if (!this.currentRow || !this.currentRow.buNo) {
+          return false
+        }
+        return ['05-Alpha', '04-MHM', '02-Hardtag'].includes(this.currentRow.buNo)
+      },
+      hasMexicoShippingMarkBu() {
+        if (!this.currentRow || !this.currentRow.buNo) {
+          return false
+        }
+        return ['05-Alpha', '04-MHM', '02-Hardtag'].includes(this.currentRow.buNo)
+      },
+      buildDefaultVoyage() {
+        if (!this.currentRow || !this.currentRow.buNo) {
+          return ''
+        }
+        const cmcInvoice = this.currentRow.cmcInvoice ? String(this.currentRow.cmcInvoice).trim() : ''
+        if (this.hasMexicoShippingMarkBu()) {
+          const destination = this.currentRow.destination ? String(this.currentRow.destination).trim() : ''
+          return ['Checkpoint', destination, cmcInvoice].filter(Boolean).join('\n')
+        }
+        if (this.currentRow.buNo === '01-Label' || this.currentRow.buNo === '03-RFID') {
+          return cmcInvoice
+        }
+        return ''
+      },
+
       // 导出
       downloadDeclarationElements() {
        if (!this.currentRow || !this.currentRow.buNo) {
@@ -2538,6 +2573,7 @@
         exportParam.pickupCompany=this.exportGoods.pickupCompany
         exportParam.pickupAddress=this.exportGoods.pickupAddress
         exportParam.pickupAddressValue=this.exportGoods.pickupAddressValue
+        exportParam.mexicoShippingMarkFlag=this.exportGoods.mexicoShippingMarkFlag
 
         exportParam.brandType = this.brandType
         exportParam.hsCodeDescType=this.hsCodeDescType
@@ -2724,7 +2760,7 @@
         this.exportGoods.madeArea = 'Nantong, China'
         this.exportGoods.sendPort = 'Shanghai, China'
         this.exportGoods.deliveryGoodsDate = ''
-        this.exportGoods.voyage = this.currentRow.buNo==='01-Label' || this.currentRow.buNo==='03-RFID'?this.currentRow.cmcInvoice:''
+        this.exportGoods.voyage = this.buildDefaultVoyage()
         this.exportGoods.shippingDate = '';
         await this.loadPickupAddressList(this.currentRow.buNo)
         //this.templateData.type='出口货物委托书'
@@ -2776,6 +2812,7 @@
         exportParam.pickupCompany=this.exportGoods.pickupCompany
         exportParam.pickupAddress=this.exportGoods.pickupAddress
         exportParam.pickupAddressValue=this.exportGoods.pickupAddressValue
+        exportParam.mexicoShippingMarkFlag=this.exportGoods.mexicoShippingMarkFlag
 
         exportParam.brandType = this.brandType
         exportParam.hsCodeDescType=this.hsCodeDescType
@@ -2942,7 +2979,11 @@
           this.exportGoods.madeArea = row.madeArea
           this.exportGoods.sendPort = row.sendPort
           this.exportGoods.deliveryGoodsDate = row.deliveryGoodsDate
-          this.exportGoods.voyage = this.currentRow.buNo==='01-Label' || this.currentRow.buNo==='03-RFID'?this.currentRow.cmcInvoice:row.voyage
+          if (this.currentRow.buNo==='01-Label' || this.currentRow.buNo==='03-RFID' || this.hasMexicoShippingMarkBu()) {
+            this.exportGoods.voyage = this.buildDefaultVoyage()
+          } else {
+            this.exportGoods.voyage = row.voyage || this.buildDefaultVoyage()
+          }
           this.exportGoods.shippingDate = row.shippingDate;
           this.exportGoods.shipper=row.shipper
         }