From 3ddf1de6a636cf0ee2ca2dbeb51b893ab27d93fc Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 27 Jun 2025 15:00:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/codelnotifyConfirm.vue |  6 +++++
 src/views/modules/ecss/del_upload_excel.vue   | 22 +++++++++----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue
index d94f902..6fdddf9 100644
--- a/src/views/modules/ecss/codelnotifyConfirm.vue
+++ b/src/views/modules/ecss/codelnotifyConfirm.vue
@@ -2544,6 +2544,12 @@
           })
           return false
         }
+        if(this.oneClickPackingModelData.height===''||this.oneClickPackingModelData.height==null){
+          this.$alert('请输入栈板高度(M)！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
         saveOneClickPacking(this.oneClickPackingModelData).then(({data}) => {
           if (data && data.code === 0) {
             this.refreshCurrentTabTable()
diff --git a/src/views/modules/ecss/del_upload_excel.vue b/src/views/modules/ecss/del_upload_excel.vue
index 7a4fe6e..d4d406d 100644
--- a/src/views/modules/ecss/del_upload_excel.vue
+++ b/src/views/modules/ecss/del_upload_excel.vue
@@ -71,11 +71,7 @@
                         :rows="3" v-model="pageData.overseasAddress" ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24" style="margin-top: 30px">
-          <el-form-item label=" ">
-
-          </el-form-item> </el-col>
-          <el-col :span="24">
+          <el-col :span="24" style="margin-top: 60px">
             <el-upload class="customer-upload" drag action="javascript:void(0);" ref="uploadFile" :limit="1" accept=".xlsx,.xls"
                        :before-upload="beforeUploadHandle" :on-change="onChange" :auto-upload="false" style="text-align: left;">
               <i class="el-icon-upload"></i>
@@ -111,8 +107,15 @@
           prop="ccusname"
           header-align="center"
           align="left"
+          width="350"
           label="客户名称">
         </el-table-column>
+        <el-table-column
+          prop="country"
+          header-align="center"
+          align="left"
+          label="贸易国">
+        </el-table-column>
       </el-table>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
         <el-button @click="customFlag = false">关闭</el-button>
@@ -174,18 +177,13 @@
           prop="cDeliverUnit"
           header-align="left"
           align="left"
+          width="350"
           label="收货单位">
         </el-table-column>
         <el-table-column
           prop="deliverycountry"
           header-align="center"
           align="left"
-          label="贸易国">
-        </el-table-column>
-        <el-table-column
-          prop="country"
-          header-align="center"
-          align="left"
           label="运抵国">
         </el-table-column>
       </el-table>
@@ -303,6 +301,7 @@
         this.pageData.localShipAddress='',
         this.pageData.overseasShipper='',
         this.pageData.overseasAddress='',
+        this.pageData.salesArea = row.country
         this.getCusPersons()
         this.customFlag = false
       },
@@ -317,7 +316,6 @@
       rowDblclick4 (row) {
         this.pageData.overseasShipper=row.cDeliverUnit
         this.pageData.cnative=row.deliverycountry
-        this.pageData.salesArea = row.country
         this.overseasShipperFlag = false
       },