From 9045f9600121ca81e074820a67449e17bd1337d7 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 6 Jun 2025 11:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6,=E6=96=B0=E5=A2=9E=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=BB=B4=E6=8A=A4=E9=A1=B9=E7=AD=89=20=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=AF=BC=E5=85=A5=E6=94=B9=E5=8D=95=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/codelnotify.vue             | 10 +++++-----
 src/views/modules/ecss/codelnotifyConfirm.vue      |  2 +-
 src/views/modules/ecss/createDeclaration.vue       | 12 ++++++------
 src/views/modules/ecss/del_detail_upload_excel.vue |  7 ++++++-
 src/views/modules/ecss/del_upload_excel.vue        |  5 ++++-
 src/views/modules/ecss/ecssWalMartOrder.vue        |  2 +-
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/ecss/codelnotify.vue b/src/views/modules/ecss/codelnotify.vue
index a030089..3a7a749 100644
--- a/src/views/modules/ecss/codelnotify.vue
+++ b/src/views/modules/ecss/codelnotify.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="mod-config">
-    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+    <el-form :inline="true" label-position="top" label-width="60px" style="margin-top: 0px;">
       <el-form-item :label="'BU:'">
-        <el-select v-model="searchData.buNo" placeholder="请选择"  >
+        <el-select v-model="searchData.buNo" placeholder="请选择"  style="width: 80px">
           <el-option label="全部" value=""></el-option>
         <el-option
           v-for = "i in buList"
@@ -71,7 +71,7 @@
           class="el-button el-button&#45;&#45;primary el-button&#45;&#45;medium">
           {{ '导出' }}
         </download-excel>-->
-      </el-form-item>
+      </el-form-item><br>
       <el-form-item label=" ">
         <el-button @click="exportInvoiceList()" type="primary" style="margin-left: 2px">{{'导出发票'}}</el-button>
       </el-form-item>
@@ -132,7 +132,7 @@
     <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName"   type="border-card" @tab-click="tabClick" >
       <el-tab-pane label="明细" name="detail">
         <el-button v-show="currentRow.notifyStatus!=='订单取消'" @click="openCreateDetailModel()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'新增'}}</el-button>
-        <el-button v-show="currentRow.notifyStatus!=='订单取消'" @click="importDetailModel()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'导入'}}</el-button>
+        <el-button v-show="currentRow.notifyStatus!=='订单取消'" @click="importDetailModel()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'改单导入'}}</el-button>
         <el-table ref="detailTable"
           :height="height"
           :data="dataList2" :cell-style="cellStyleDetail"
@@ -1601,7 +1601,7 @@
             serialNumber: '801001Table3PN',
             tableId: "801001Table3",
             tableName: "装箱明细",
-            columnProp: "partNo",
+            columnProp: "pn",
             headerAlign: "center",
             align: "left",
             columnLabel: "PN",
diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue
index 394cd08..787190f 100644
--- a/src/views/modules/ecss/codelnotifyConfirm.vue
+++ b/src/views/modules/ecss/codelnotifyConfirm.vue
@@ -70,7 +70,7 @@
         fixed="left"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" v-if="scope.row.notifyStatus==='仓库已确认'" @click="updateModelOpen(scope.row)">修改</a>
+          <a type="text" size="small" v-if="scope.row.notifyStatus==='仓库已确认' || scope.row.notifyStatus==='已报关'" @click="updateModelOpen(scope.row)">修改</a>
           <a type="text" size="small" v-if="scope.row.notifyStatus==='已下达'" @click="confirmModelOpen(scope.row)">仓库确认</a>
           <a type="text" size="small" v-if="scope.row.notifyStatus==='仓库已确认'" @click="cancerConfirm(scope.row)">取消确认</a>
         </template>
diff --git a/src/views/modules/ecss/createDeclaration.vue b/src/views/modules/ecss/createDeclaration.vue
index 010293d..0df745d 100644
--- a/src/views/modules/ecss/createDeclaration.vue
+++ b/src/views/modules/ecss/createDeclaration.vue
@@ -1632,19 +1632,19 @@
           if (data && data.code === 0) {
            this.declarationData=data.row
             this.detailList=data.rows
-            this.customerData=data.customers
+         /*    this.customerData=data.customers
             this.customerAddData = data.customerAdd
             if (data.customerAdd && data.customerAdd.length > 0 && data.customers && data.customers.length > 0) {
               this.declarationData.overseasAddress = this.declarationData.overseasAddress?this.declarationData.overseasAddress:data.customerAdd[0].cDeliverAdd
               this.declarationData.overseasShipper = this.declarationData.overseasShipper?this.declarationData.overseasShipper:data.customers[0].ccontactname
-            }
+            } */
             this.declarationFlag=true
 
-            this.customerData.forEach(o => {
+            /* this.customerData.forEach(o => {
               if (!this.customerMap.has(o.ccontactname)) {
                 this.customerMap.set(o.ccontactname, o.cnative);
               }
-            });
+            }); */
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
@@ -1652,11 +1652,11 @@
           }
         });
       },
-      setDestination(){
+      /* setDestination(){
         this.detailList.forEach(o => o.destination=this.customerMap.get(this.declarationData.overseasShipper))
         this.declarationData.receiveArea=this.customerMap.get(this.declarationData.overseasShipper)
         this.declarationData.salesArea=this.customerMap.get(this.declarationData.overseasShipper)
-      },
+      }, */
       saveDeclaration(){
         if(this.detailList==null|| this.detailList.length<1){
           this.$alert('不存在明细记录！', '错误', {
diff --git a/src/views/modules/ecss/del_detail_upload_excel.vue b/src/views/modules/ecss/del_detail_upload_excel.vue
index 6c6f950..ea79e6b 100644
--- a/src/views/modules/ecss/del_detail_upload_excel.vue
+++ b/src/views/modules/ecss/del_detail_upload_excel.vue
@@ -55,6 +55,7 @@
           username: this.$store.state.user.name,
         }
         this.pageData.buNo=inData.buNo
+        this.pageData.cmcInvoice=inData.cmcInvoice
         getBuList(tempData).then(({data}) => {
           if (data.code === 0) {
             this.buList = data.row2
@@ -105,6 +106,7 @@
         }
         const formData = new FormData()
         formData.append("buNo",this.pageData.buNo)
+        formData.append("cmcInvoice",this.pageData.cmcInvoice)
         formData.append("username",this.$store.state.user.name)
         formData.append("file", this.fileList[0].raw)
         // formData.append("createBy", this.pageData.createBy)
@@ -114,7 +116,10 @@
             // 关闭窗口并刷新页面
             this.closeDialog()
           } else {
-            this.$message.error(data.msg)
+            //this.$message.error(data.msg)
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
           }
         })
       },
diff --git a/src/views/modules/ecss/del_upload_excel.vue b/src/views/modules/ecss/del_upload_excel.vue
index f38859f..efc1c67 100644
--- a/src/views/modules/ecss/del_upload_excel.vue
+++ b/src/views/modules/ecss/del_upload_excel.vue
@@ -367,7 +367,10 @@
             // 关闭窗口并刷新页面
             this.closeDialog()
           } else {
-            this.$message.error(data.msg)
+            //this.$message.error(data.msg)
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
           }
         })
       },
diff --git a/src/views/modules/ecss/ecssWalMartOrder.vue b/src/views/modules/ecss/ecssWalMartOrder.vue
index b0e3a92..a4e158b 100644
--- a/src/views/modules/ecss/ecssWalMartOrder.vue
+++ b/src/views/modules/ecss/ecssWalMartOrder.vue
@@ -506,7 +506,7 @@ import walUploadExcel from "./walmart_upload_excel.vue";
       this.searchTable()
     },
     created() {
-      this.getBu ()
+      //this.getBu ()
     }
   }
 </script>