From 9e76c146e782728642681b147fa9015c77a1290a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Mon, 13 Mar 2023 17:53:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jnpf/saleorder/controller/SaleorderitemController.java | 2 +- SC-web/src/views/scm/basicInformation/collection/Form.vue | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java index 36ceb46f..c224a4dd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java @@ -293,7 +293,7 @@ public class SaleorderitemController { } } }else{ - return ActionResult.fail("发票金额、金额、已付款金额不一致"); + return ActionResult.fail("发票金额、金额、已付款金额不一致或当前状态无法归档"); } }else { return ActionResult.fail("未找到该数据"); diff --git a/SC-web/src/views/scm/basicInformation/collection/Form.vue b/SC-web/src/views/scm/basicInformation/collection/Form.vue index f4065b85..97349bd8 100644 --- a/SC-web/src/views/scm/basicInformation/collection/Form.vue +++ b/SC-web/src/views/scm/basicInformation/collection/Form.vue @@ -454,11 +454,13 @@ this.dataForm.amountCollected = sum; }, popupSelect(e, d) { - debugger this.dataForm.code = d.id; this.dataForm.collectionCount = d.bank_account; this.dataForm.collectionBank = d.bank; - debugger + this.dataForm.collection_item0List = []; + }, + contractSelect(){ + this.dataForm.collection_item0List = []; }, popupSelect2(a, b) { for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {