From 3e08d44418c85373b471237af99370f02fd2a408 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 14 Oct 2025 12:02:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=81=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/codelnotifyConfirm.vue | 18 +++++++++++++++
 src/views/modules/ecss/declaration.vue        | 22 ++++++++++++-------
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue
index 0943add..59eff95 100644
--- a/src/views/modules/ecss/codelnotifyConfirm.vue
+++ b/src/views/modules/ecss/codelnotifyConfirm.vue
@@ -2333,7 +2333,25 @@
           });
           return false;
         }
+        if (this.palletModelData.grossWeight<=0||this.palletModelData.grossWeight==null) {
+          this.$alert('请输入毛重！', '错误', {
+            confirmButtonText: '确定'
+          });
+          return false;
 
+        }
+        if (this.palletModelData.netWeight<=0||this.palletModelData.netWeight==null) {
+          this.$alert('请输入净重！', '错误', {
+            confirmButtonText: '确定'
+          });
+          return false;
+        }
+        if (this.palletModelData.boxQty<=0||this.palletModelData.boxQty==null) {
+          this.$alert('请输入箱数！', '错误', {
+            confirmButtonText: '确定'
+          });
+          return false;
+        }
         // 校验：装箱数量不能大于可装箱数量 (item.qty)
         const invalidRow = selectedRows.find(item => item.useQty > item.surplusQty);
         if (invalidRow) {
diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue
index 8575f23..18e6a7d 100644
--- a/src/views/modules/ecss/declaration.vue
+++ b/src/views/modules/ecss/declaration.vue
@@ -55,7 +55,7 @@
         <el-button @click="exportContract()" type="primary" style="margin-left: 2px">{{'导出合同'}}</el-button>
       </el-form-item>-->
       <el-form-item label=" ">
-        <el-button @click="exportAllOpen()" type="primary" style="margin-left: 2px">{{'一键导出'}}</el-button>
+        <el-button @click="exportAllOpen()" type="primary" style="margin-left: 2px" :loading="exportAllLoading">{{'一键导出'}}</el-button>
       </el-form-item>
     </el-form>
 
@@ -849,6 +849,7 @@
     },
     data() {
       return {
+        bizhi:'',
         exportAllFlag:false,
         templateFlag:false,
         templateData:{},
@@ -928,6 +929,7 @@
         dataList:[],
         dataList2:[],
         dataListLoading: false,
+        exportAllLoading: false,
         searchData: {
           page: 1,
           limit: 100,
@@ -1885,7 +1887,7 @@
             //区分请求成功和失败的状况
             if (data && data.code == 0) {
               this.dataList2 = data.rows
-
+              this.bizhi = data.rows[0].currency
             } else {
               this.dataList2 = [];
             }
@@ -2059,7 +2061,7 @@
         }
         this.exportGoods.hsCodeDescType = 'N'
         this.exportGoods.salesMethod = 'EXW'
-        this.exportGoods.currency = this.currentRow.currency?this.currentRow.currency:this.dataList2.length>0?this.dataList2[0].currency:'USD'
+        this.exportGoods.currency = this.dataList2.length>0?this.dataList2[0].currency:'USD'
         this.exportGoods.madeArea = 'Nantong, China'
         this.exportGoods.sendPort = 'Shanghai, China'
         this.exportGoods.deliveryGoodsDate = ''
@@ -2246,12 +2248,13 @@
           this.$message.warning('请选择报关单！')
           return
         }
+        this.exportAllLoading = true
+        try {
         // 抬头信息
         this.exportHeader.contractNo = this.currentRow.cmcInvoice || ''
         this.exportHeader.transportMode = this.currentRow.shippingMode || ''
         this.exportHeader.arrivalCountry = this.currentRow.receiveArea || ''
         this.exportHeader.tradeCountry = this.currentRow.salesArea || ''
-
         // 获取装箱数据，根据托数设置托/箱默认值
         try {
           // 只传递必要的字段，避免日期格式问题
@@ -2281,7 +2284,6 @@
 
         // 报关要素
         this.brandType='境外品牌（其他）'
-        this.exportAllFlag = true
         if (this.currentRow.buNo==='02-Hardtag' || this.currentRow.buNo==='04-MHM') {
           this.currentRow.brand='品牌'
           getPropertiesListByDeclaration(this.currentRow).then(({data}) => {
@@ -2393,14 +2395,18 @@
           }
         })
         this.exportGoods.salesMethod = 'EXW'
-        this.exportGoods.currency = this.currentRow.currency?this.currentRow.currency:this.dataList2.length>0?this.dataList2[0].currency:'USD'
+        this.exportGoods.currency = this.bizhi
         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.shippingDate = '';
-        this.templateData.type='出口货物委托书'
-        await this.searchTemplateOne();
+        //this.templateData.type='出口货物委托书'
+        //await this.searchTemplateOne();
+        this.exportAllFlag = true
+        } finally {
+          this.exportAllLoading = false
+        }
       },