From 81fb82db9b61abec2b81057e9589eaac711be255 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 23 May 2025 14:09:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=97=A5=E6=9C=9F=E4=B8=8D?=
 =?UTF-8?q?=E7=A1=AE=E5=AE=9A,=E4=B8=8D=E5=8F=AF=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=8A=A5=E5=85=B3=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/codelnotifyConfirm.vue | 9 ++++++++-
 src/views/modules/ecss/createDeclaration.vue  | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue
index f10c011..537926d 100644
--- a/src/views/modules/ecss/codelnotifyConfirm.vue
+++ b/src/views/modules/ecss/codelnotifyConfirm.vue
@@ -2119,8 +2119,12 @@
           })
       },
       cancerConfirm(row){
+        let indata=JSON.parse(JSON.stringify(row));
+        if (row.notifyDate==='发货日期不确定') {
+          indata.notifyDate=''
+        }
         this.$confirm('取消确认这条发货通知单？', '提示').then(() => {
-          cancerConfirmEcssDel(row).then(({data}) => {
+          cancerConfirmEcssDel(indata).then(({data}) => {
             if (data && data.code === 0) {
               this.searchTable()
               this.$message({
@@ -2156,6 +2160,9 @@
       },
       updateModelOpen(row){
         this.confirmModel=JSON.parse(JSON.stringify(row));
+        if (this.confirmModel.notifyDate==='发货日期不确定') {
+          this.confirmModel.notifyDate=''
+        }
         this.updateModelFlag=true
       },
       updateDo(){
diff --git a/src/views/modules/ecss/createDeclaration.vue b/src/views/modules/ecss/createDeclaration.vue
index 7e69132..431dab8 100644
--- a/src/views/modules/ecss/createDeclaration.vue
+++ b/src/views/modules/ecss/createDeclaration.vue
@@ -1627,6 +1627,12 @@
         row.totalPrice=row.unitPrice*row.qty
       },
       declarationModel(row){
+        if(!row.notifyDate || row.notifyDate==='发货日期不确定'){
+          this.$alert('发货日期不确定,不可创建报关单！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
         getDeclarationDefaultData(row).then(({data}) => {
           //区分请求成功和失败的状况
           if (data && data.code === 0) {