From 7f073048b54888cd859bc56eefa24f05b429435e Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 28 Oct 2024 17:03:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=9E=E6=AC=BE?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collectionrebatemanagement.vue | 73 ++++++++++++++++--- 1 file changed, 64 insertions(+), 9 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue index 8bef9e03e5..489aa083e2 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue @@ -22,15 +22,36 @@ + + + 至 - - + + + + + + + + + + + + + + + 至 - + + + + + 至 +
@@ -189,6 +210,25 @@ export default { tableKey: 0, list: [], sids: [], + rebateType_list: [], + state_list: [ + { + dictKey: '0', + dictValue: '未计提' + }, + { + dictKey: '1', + dictValue: '计提中' + }, + { + dictKey: '2', + dictValue: '待核对' + }, + { + dictKey: '3', + dictValue: '已核对' + } + ], FormLoading: false, listLoading: false, collectionType_list: [], @@ -197,12 +237,17 @@ export default { createOrgName: '', purchaseSystemName: '', brandName: '', - collectionTypeKey: '', createOrgSid: '', - createStartTime: '', - createEndTime: '', + collectionTypeKey: '', + manufaSaleChannelValue: '', collectionStartDate: '', collectionEndDate: '', + rebateTypeKey: '', + rebateName: '', + withholdingStartDate: '', + withholdingEndDate: '', + uploadStartDate: '', + uploadEndDate: '', state: '', orgPath: '', userSid: '', @@ -242,6 +287,11 @@ export default { }, methods: { init() { + typeValues({ type: 'rebateType' }).then((res) => { + if (res.success) { + this.rebateType_list = res.data + } + }) typeValues({ type: 'paymentType' }).then((res) => { if (res.success) { this.collectionType_list = res.data @@ -322,12 +372,17 @@ export default { createOrgName: '', purchaseSystemName: '', brandName: '', - collectionTypeKey: '', createOrgSid: '', - createStartTime: '', - createEndTime: '', + collectionTypeKey: '', + manufaSaleChannelValue: '', collectionStartDate: '', collectionEndDate: '', + rebateTypeKey: '', + rebateName: '', + withholdingStartDate: '', + withholdingEndDate: '', + uploadStartDate: '', + uploadEndDate: '', state: '', orgPath: '', userSid: '', From 4fa5220ef45e56030d61d469d92edaac1bfcdc6a Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 28 Oct 2024 17:06:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=9E=E6=AC=BE?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collectionrebatetobechecked.vue | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue index 45ae226046..840613f5d2 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue @@ -40,9 +40,14 @@ - + 至 - + + + + + 至 +
@@ -181,8 +186,10 @@ export default { rebateName: '', collectionEndDate: '', collectionStartDate: '', - createStartTime: '', - createEndTime: '', + uploadStartDate: '', + uploadEndDate: '', + withholdingStartDate: '', + withholdingEndDate: '', collectionTypeKey: '', createOrgSid: '', state: '', @@ -211,6 +218,11 @@ export default { }, methods: { init() { + typeValues({ type: 'rebateType' }).then((res) => { + if (res.success) { + this.rebateType_list = res.data + } + }) typeValues({ type: 'paymentType' }).then((res) => { if (res.success) { this.collectionType_list = res.data @@ -296,8 +308,10 @@ export default { rebateName: '', collectionEndDate: '', collectionStartDate: '', - createStartTime: '', - createEndTime: '', + uploadStartDate: '', + uploadEndDate: '', + withholdingStartDate: '', + withholdingEndDate: '', collectionTypeKey: '', createOrgSid: '', state: '', From 7f9829a11ab9ca80ed587ba716710f009aae1c18 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 28 Oct 2024 17:33:14 +0800 Subject: [PATCH 3/4] 1 --- .../biz/finpaymentrecord/FinPaymentrecordService.java | 10 +++++----- .../ScmCollectionRebateService.java | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index c8f6069570..4132d6a53e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -385,7 +385,7 @@ public class FinPaymentrecordService extends MybatisBaseService scmCollectionRebateVehDtos = new ArrayList<>(); FinPaymentapply finPaymentapply = finPaymentapplyService.fetchBySid(finPaymentrecord.getApplySid()); @@ -393,12 +393,12 @@ public class FinPaymentrecordService extends MybatisBaseService vehicleList = finPaymentapplyVehicleService.getVehicleList(finPaymentapply.getSid()); scmCollectionRebateDto.setBrandSid(finPaymentapply.getCarBrandSid()); scmCollectionRebateDto.setBrandName(finPaymentapply.getCarBrandName()); - scmCollectionRebateDto.setCollectionTypeKey(finPaymentrecord.getPayWayKey()); - scmCollectionRebateDto.setCollectionTypeValue(finPaymentrecord.getPayWayValue()); + scmCollectionRebateDto.setCollectionTypeKey(dto.getPayWayKey()); + scmCollectionRebateDto.setCollectionTypeValue(dto.getPayWayValue()); scmCollectionRebateDto.setManufaSaleChannel(""); scmCollectionRebateDto.setManufaSaleChannelValue(finPaymentapplyDetails.getActualPay()); - scmCollectionRebateDto.setCollectionMoney(finPaymentrecord.getCost()); - scmCollectionRebateDto.setCollectionDate(DateUtil.formatDate(finPaymentrecord.getPayDate())); + scmCollectionRebateDto.setCollectionMoney(new BigDecimal(dto.getCost())); + scmCollectionRebateDto.setCollectionDate(DateUtil.formatDate(dto.getPayDate())); SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getCreateOrgSid()).getData(); scmCollectionRebateDto.setCreateOrgSid(finPaymentrecord.getCreateOrgSid()); scmCollectionRebateDto.setCreateOrgName(sysOrganizationVo.getName()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java index c111c0bb54..30120aaf84 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java @@ -176,6 +176,7 @@ public class ScmCollectionRebateService extends MybatisBaseService scmCollectionRebateVehs = dto.getScmCollectionRebateVehs(); if (StringUtils.isBlank(dtoSid)) { String s = this.insertByDto(dto); @@ -371,7 +372,7 @@ public class ScmCollectionRebateService extends MybatisBaseService Date: Tue, 29 Oct 2024 10:01:53 +0800 Subject: [PATCH 4/4] 1 --- .../biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java index 8b60f286b0..5e2f49447f 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java @@ -56,7 +56,7 @@ public class PmsPurchaseBillDetailDto implements Dto { @ApiModelProperty("单据sid") private String billSid; // 单据sid @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; // 商品基础信息Sid + private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") private String goodsSpuName; // 商品名称 @ApiModelProperty("商品Skusid")