From 9abc4593e965f70066faef5e8bb042cd36d7184e Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 3 Oct 2025 21:09:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=AF=BC=E5=87=BA=E6=8A=AC?=
 =?UTF-8?q?=E5=A4=B4=E6=98=BE=E7=A4=BA=E5=90=88=E5=90=8C=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=B7=E3=80=81=E8=BF=90=E8=BE=93=E6=96=B9=E5=BC=8F=E3=80=81?=
 =?UTF-8?q?=E8=BF=90=E6=8A=B5=E5=9B=BD=E3=80=81=E8=B4=B8=E6=98=93=E5=9B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/createDeclaration.vue |  5 ---
 src/views/modules/ecss/declaration.vue       | 38 ++++++++++++++++++--
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/ecss/createDeclaration.vue b/src/views/modules/ecss/createDeclaration.vue
index 4ee074e..4c50108 100644
--- a/src/views/modules/ecss/createDeclaration.vue
+++ b/src/views/modules/ecss/createDeclaration.vue
@@ -163,11 +163,6 @@
               <el-input v-model="declarationData.localShipper"  ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'境内发货地址'" >
-              <el-input v-model="declarationData.localShipAddress"  ></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="4">
             <el-form-item :label="'出关类别'" >
               <el-input v-model="declarationData.shipType"  ></el-input>
diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue
index 19158a9..aa73c7f 100644
--- a/src/views/modules/ecss/declaration.vue
+++ b/src/views/modules/ecss/declaration.vue
@@ -131,8 +131,30 @@
     </el-tabs>
 
     <el-dialog title="一键导出" :close-on-click-modal="false" v-drag :visible.sync="exportAllFlag" :width="'740px'">
-      <el-form label-position="top"  style="margin-left: 7px;margin-top: 10px;margin-bottom: 20px">
+      <el-form label-position="top"  style="margin-left: 7px;margin-top: 5px;margin-bottom: 5px">
         <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'合同协议号'" >
+              <el-input v-model="exportHeader.contractNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'运输方式'" >
+              <el-input v-model="exportHeader.transportMode" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'运抵国'" >
+              <el-input v-model="exportHeader.arrivalCountry" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'贸易国'" >
+              <el-input v-model="exportHeader.tradeCountry" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" style="margin-top: 5px">
           <div class="custom-divider"><span class="text" style="left: 22%">报关要素</span></div>
           <!--          报关要素-->
           <el-col :span="12">
@@ -823,6 +845,12 @@
         notifyPartDetailList:[],
         propertiesList:[],
         currentRow:{},
+        exportHeader:{
+          contractNo:'',
+          transportMode:'',
+          arrivalCountry:'',
+          tradeCountry:''
+        },
         exportGoodsFlag:false,
         exportGoods:{
           salesMethod:'EXW',
@@ -1433,7 +1461,7 @@
             columnProp: "netWeight",
             headerAlign: "center",
             align: "right",
-            columnLabel: "毛重（KG）",
+            columnLabel: "净重（KG）",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -2205,6 +2233,12 @@
           this.$message.warning('请选择报关单！')
           return
         }
+        // 抬头信息
+        this.exportHeader.contractNo = this.currentRow.cmcInvoice || ''
+        this.exportHeader.transportMode = this.currentRow.shippingMode || ''
+        this.exportHeader.arrivalCountry = this.currentRow.receiveArea || ''
+        this.exportHeader.tradeCountry = this.currentRow.salesArea || ''
+
         // 报关要素
         this.brandType='境外品牌（其他）'
         this.exportAllFlag = true