From 4cc2f228513cbf6882a2355fc470875a756e6f96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Mon, 12 Jun 2023 10:38:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jnpf/collection/controller/CollectionController.java | 4 +++- SC-web/src/views/scm/basicInformation/collection/Form.vue | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java index 52e84f44..d2a5fb7d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java @@ -152,7 +152,9 @@ public class CollectionController { public ActionResult collectionShow(@Param("param") String param) { ContractFileEntity entity = contractFileService.getInfo(param); List list = collectionService.querySaleOrderInfo(param); - entity.setSaleorderitemList(list); + if(ObjectUtils.isNotEmpty(entity)) { + entity.setSaleorderitemList(list); + } return ActionResult.success(entity); } diff --git a/SC-web/src/views/scm/basicInformation/collection/Form.vue b/SC-web/src/views/scm/basicInformation/collection/Form.vue index d15f930a..c8f6be86 100644 --- a/SC-web/src/views/scm/basicInformation/collection/Form.vue +++ b/SC-web/src/views/scm/basicInformation/collection/Form.vue @@ -478,7 +478,7 @@ // this.dataForm.code = d.id; // this.dataForm.collectionCount = d.bank_account; // this.dataForm.collectionBank = d.bank; - // this.dataForm.collection_item0List = []; + this.dataForm.collection_item0List = []; let params = { "param" : this.dataForm.customerId } @@ -509,7 +509,7 @@ }); }, contractSelect(){ - // this.dataForm.collection_item0List = []; + this.dataForm.collection_item0List = []; let params = { "param" : this.dataForm.contractId }