From af8e5a6dea79a4723e41993d1dde64ac10559db0 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 15 Jan 2025 11:06:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?= =?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 --- .../bicyclerebatetobechecked.vue | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue index 010d1a30c3..3fc2644b4b 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue @@ -30,9 +30,7 @@ - - - + @@ -254,7 +252,7 @@ import ButtonBar from '@/components/ButtonBar' import bicyclerebatecheck from './bicyclerebatecheck' import bicyclerebatecheckAdd from './bicyclerebatecheckAdd' import bicyclerebatetobecheckedByUpdate from './bicyclerebatetobecheckedByUpdate' -import { brandDown, getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons' +import { getOrgSidByPath } from '@/api/cheliang/dictcommons' export default { name: 'BicycleRebateToBeChecked', @@ -293,7 +291,6 @@ export default { list: [], sids: [], FormLoading: false, - rebateType_list: [], state_list: [ { dictKey: '0', @@ -312,7 +309,7 @@ export default { brandName: '', createOrgSid: '', vinNo: '', - rebateTypeKey: '', + rebateTypeValue: '', rebateName: '', state: '', createEndTime: '', @@ -371,11 +368,6 @@ export default { }, methods: { init() { - typeValues({ type: 'rebateType' }).then((res) => { - if (res.success) { - this.rebateType_list = res.data - } - }) getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => { if (resp.success) { this.listQuery.params.createOrgSid = resp.data @@ -450,7 +442,7 @@ export default { brandName: '', createOrgSid: '', vinNo: '', - rebateTypeKey: '', + rebateTypeValue: '', rebateName: '', state: '', createEndTime: '', From b86a7935128fa3f1fc7a0689a91ae7392c912d86 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Wed, 15 Jan 2025 11:44:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E8=BD=A6?= =?UTF-8?q?=E9=A2=84=E6=8F=90=E6=8E=A8=E5=87=AD=E8=AF=812?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehrebateCheckapplyService.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java index e4b64902a5..99b0d051dd 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java @@ -68,7 +68,6 @@ import com.yxt.anrui.scm.api.scmvehrebatecheckapply.flow.SubmitScmVehRebateCheck import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo; import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto; import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo; -import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApply; import com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateService; import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService; import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService; @@ -534,8 +533,8 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService { - List rebates = v; + for (Map.Entry> entry : map.entrySet()) { + List v = entry.getValue(); GeneralVoucher generalVoucher = new GeneralVoucher(); generalVoucher.setBussDate(format); List voucherDetails = new ArrayList<>(); @@ -712,7 +711,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService Date: Wed, 15 Jan 2025 12:02:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E8=BD=A6?= =?UTF-8?q?=E9=A2=84=E6=8F=90=E6=8E=A8=E5=87=AD=E8=AF=813?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index bf9ccc8d03..e17fe25da0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -404,7 +404,9 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { if (!voucherDetails.isEmpty()) { for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) { timeFlag = voucherDetail.getTimeFlag(); - deptNo = voucherDetail.getDeptCode(); + if (!voucherDetail.getRemarks().equals("金融贴息")) { + deptNo = voucherDetail.getDeptCode(); + } manufacturer = voucherDetail.getManufacturer(); if (voucherDetail.getRemarks().equals("金融贴息")) { if (voucherDetail.getSceneCode().equals("1161.01.16")) { From 6acc1998265c73304425e34a7d5784e21bc5f140 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 15 Jan 2025 13:45:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?= =?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 --- .../src/api/bikerebate/bicyclerebatecheck.js | 4 ++-- .../bicyclerebatecheck/bicyclerebatecheckAdd.vue | 2 +- .../bicyclerebatecheck/bicyclerebatecheckInfo.vue | 12 ++++++------ .../relation/bicyclerebatetobecheckedInfo.vue | 4 ++-- .../danchefanliheduiDaiBanInfo.vue | 12 ++++++------ .../danchefanliheduiFlow/danchefanliheduiEdit.vue | 2 +- .../danchefanliheduiYiBanInfo.vue | 12 ++++++------ .../relation/bicyclerebatetobecheckedInfo.vue | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js index 85c0330a2b..65872d0d07 100644 --- a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js +++ b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js @@ -100,9 +100,9 @@ export default { }) }, // 查看明细 - vehRebateCheckDetails: function(data) { + vehRebateGroupDetails: function(data) { return request({ - url: '/scm/v1/scmvehrebatecheckapplydetail/vehRebateCheckDetails/' + data, + url: '/scm/v1/scmvehrebatecheckapplydetail/vehRebateGroupDetails/' + data, method: 'get' }) }, diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue index aedbd2e11d..61b993af10 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue @@ -366,9 +366,9 @@ export default { }) } }) - let k = 0 // 按照预提年月统计 this.formobj.scmVehrebateCheckapplydetailList.forEach((s) => { + let k = 0 for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) { if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) { this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1) diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue index 5416460e3e..a5a448cf8c 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue @@ -56,8 +56,8 @@ -