diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java index efe360a8..f1f82aba 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java @@ -91,6 +91,7 @@ public class PaymentdocController { List list= paymentdocService.getList(paymentdocPagination); //处理id字段转名称,若无需转或者为空可删除 for(PaymentdocEntity entity:list){ + } List listVO=JsonUtil.getJsonToList(list,PaymentdocListVO.class); for(PaymentdocListVO paymentdocVO:listVO){ @@ -321,7 +322,9 @@ public class PaymentdocController { List jg_paymentdoc_item0List = paymentdocService.GetPaymentdoc_item0List(id); List jg_paymentdoc_item0ModelList = JsonUtil.getJsonToList(jg_paymentdoc_item0List,Paymentdoc_item0Model.class); for(Paymentdoc_item0Model jg_paymentdoc_item0Model : jg_paymentdoc_item0ModelList){ - } + Map orderIdMap = new HashMap<>(); + jg_paymentdoc_item0Model.setOrderId(generaterSwapUtil.getPopupSelectValue("383149471917185157","id","document_no",jg_paymentdoc_item0Model.getOrderId(),orderIdMap)); + } vo.setPaymentdoc_item0List(jg_paymentdoc_item0ModelList); //附表数据转换 @@ -347,6 +350,8 @@ public class PaymentdocController { PaymentdocEntity entity= paymentdocService.getInfo(id); if(entity!=null){ PaymentdocEntity subentity=JsonUtil.getJsonToBean(paymentdocUpForm, PaymentdocEntity.class); + subentity.setCreatorTime(entity.getCreatorTime()); + subentity.setCreatorUserName(entity.getCreatorUserName()); paymentdocService.update(id, subentity); QueryWrapper Paymentdoc_item0queryWrapper = new QueryWrapper<>(); diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue index 3a43ffe0..0dad270b 100644 --- a/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue +++ b/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue @@ -159,9 +159,17 @@ @@ -277,7 +285,7 @@ settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}], currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}], statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"},{"fullName":"已付款","id":"3"}], - + jg_paymentdoc_item0orderIdcolumnOptions:[{"label":"单据编号","value":"document_no"},{"label":"金额","value":"amount"},], taxRateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}], } }, @@ -287,6 +295,14 @@ }, mounted() {}, methods: { + popupSelectChangeOrderId(a, b){ + for (let i = 0; i < this.dataForm.paymentdoc_item0List.length; i++) { + if(a == this.dataForm.paymentdoc_item0List[i].orderId){ + this.dataForm.paymentdoc_item0List[i].amount = b.amount; + + } + } + }, paymentdoc_item0Exist() { let isOk = true; for(let i=0;i