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) {