From 33d71e20c7a94cbcb7c13b3dd60ca87cb167c944 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 24 Oct 2024 15:31:49 +0800 Subject: [PATCH 1/3] =?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=E3=80=81=E4=B8=93=E9=A1=B9?= =?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 --- .../bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue | 3 +++ .../specialrebatecheck/specialrebatetobecheckedByUpdate.vue | 3 +++ 2 files changed, 6 insertions(+) diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue index 7396a49738..35976df2da 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue @@ -360,5 +360,8 @@ export default { .addinputInfo { margin-left: 120px !important; } +/deep/ .el-form-item__error { + margin-left: 120px !important; +} diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue index 8256053f77..f94b014136 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue @@ -358,5 +358,8 @@ export default { .addinputInfo { margin-left: 120px !important; } +/deep/ .el-form-item__error { + margin-left: 120px !important; +} From 03e2e1ab34f15301668d6b7b022da7f9882a9388 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 24 Oct 2024 15:33:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BA=94=E6=94=B6=E6=9C=AA=E6=94=B6=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...inUncollectedReceivablesDetailedMapper.xml | 104 ++++++++++-------- 1 file changed, 61 insertions(+), 43 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 019e1d2643..f465e5d4d5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -51,8 +51,8 @@ furd.customerName AS `customerName`, furd.customerSid, furd.useOrgSid, - COALESCE(SUM(df.dbalance), 0) AS realMoney, - cast((furd.`reveivableMoney` - COALESCE(SUM(df.dbalance), 0)) AS DECIMAL(10, 2)) AS currentReceivableMoney, + COALESCE (df.dbalance, 0 ) AS realMoney, + CAST((furd.`reveivableMoney` - COALESCE ( df.dbalance, 0 )) AS DECIMAL ( 10, 2 )) AS currentReceivableMoney, furd.reveivableMoney, furd.contractSid, if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) < 1, @@ -66,21 +66,27 @@ FROM fin_uncollected_receivables_detailed furd left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid LEFT JOIN ( - SELECT d.sid, - d.`receivablesSid`, - ( - d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS dbalance - FROM fin_selected_receivables_detailed d - LEFT JOIN ( - SELECT f.busSid, - f.thisUseMoney - FROM fin_funds_carried_forward_veh f - JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid - WHERE fa.`nodeState` != '终止' - ) f ON f.`busSid` = d.`sid` - WHERE d.`auditState` = 3 - or d.auditState = 1 - GROUP BY d.`sid` + SELECT + d.`receivablesSid`, + SUM(d.`subscriptionMoney` - COALESCE (f.`thisUseMoney`, 0 )) AS dbalance + FROM + fin_selected_receivables_detailed d + LEFT JOIN ( + SELECT + f.busSid, + SUM(f.thisUseMoney) AS thisUseMoney + FROM + fin_funds_carried_forward_veh f + JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid + WHERE + fa.`nodeState` != '终止' + GROUP BY f.`busSid` + ) f ON f.`busSid` = d.`sid` + WHERE + (d.`auditState` = 3 + OR d.auditState = 1) + GROUP BY + d.`receivablesSid` ) df ON df.receivablesSid = furd.`sid` ${ew.sqlSegment} @@ -97,8 +103,8 @@ furd.customerName AS `customerName`, furd.customerSid, furd.useOrgSid, - COALESCE(SUM(df.dbalance), 0) AS realMoney, - cast((furd.`reveivableMoney` - COALESCE(SUM(df.dbalance), 0)) AS DECIMAL(10, 2)) AS currentReceivableMoney, + COALESCE (df.dbalance, 0 ) AS realMoney, + CAST((furd.`reveivableMoney` - COALESCE ( df.dbalance, 0 )) AS DECIMAL ( 10, 2 )) AS currentReceivableMoney, furd.reveivableMoney, furd.contractSid, if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) < 1, @@ -115,21 +121,27 @@ LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bv.salesOrderSid LEFT JOIN anrui_riskcenter.loan_solutions lls ON lls.salesOrderSid = bo.sid LEFT JOIN ( - SELECT d.sid, + SELECT d.`receivablesSid`, - ( - d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS dbalance - FROM fin_selected_receivables_detailed d + SUM(d.`subscriptionMoney` - COALESCE (f.`thisUseMoney`, 0 )) AS dbalance + FROM + fin_selected_receivables_detailed d LEFT JOIN ( - SELECT f.busSid, - f.thisUseMoney - FROM fin_funds_carried_forward_veh f + SELECT + f.busSid, + SUM(f.thisUseMoney) AS thisUseMoney + FROM + fin_funds_carried_forward_veh f JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid - WHERE fa.`nodeState` != '终止' + WHERE + fa.`nodeState` != '终止' + GROUP BY f.`busSid` ) f ON f.`busSid` = d.`sid` - WHERE d.`auditState` = 3 - or d.auditState = 1 - GROUP BY d.`sid` + WHERE + (d.`auditState` = 3 + OR d.auditState = 1) + GROUP BY + d.`receivablesSid` ) df ON df.receivablesSid = furd.`sid` ${ew.sqlSegment} @@ -148,8 +160,8 @@ furd.customerName AS `customerName`, furd.customerSid, furd.useOrgSid, - COALESCE(SUM(df.dbalance), 0) AS realMoney, - cast((furd.`reveivableMoney` - COALESCE(SUM(df.dbalance), 0)) AS DECIMAL(10, 2)) AS currentReceivableMoney, + COALESCE (df.dbalance, 0 ) AS realMoney, + CAST((furd.`reveivableMoney` - COALESCE ( df.dbalance, 0 )) AS DECIMAL ( 10, 2 )) AS currentReceivableMoney, furd.reveivableMoney, furd.contractSid, if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) < 1, @@ -165,21 +177,27 @@ LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bv.salesOrderSid LEFT JOIN anrui_riskcenter.loan_solutions lls ON lls.salesOrderSid = bo.sid LEFT JOIN ( - SELECT d.sid, + SELECT d.`receivablesSid`, - ( - d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS dbalance - FROM fin_selected_receivables_detailed d + SUM(d.`subscriptionMoney` - COALESCE (f.`thisUseMoney`, 0 )) AS dbalance + FROM + fin_selected_receivables_detailed d LEFT JOIN ( - SELECT f.busSid, - f.thisUseMoney - FROM fin_funds_carried_forward_veh f + SELECT + f.busSid, + SUM(f.thisUseMoney) AS thisUseMoney + FROM + fin_funds_carried_forward_veh f JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid - WHERE fa.`nodeState` != '终止' + WHERE + fa.`nodeState` != '终止' + GROUP BY f.`busSid` ) f ON f.`busSid` = d.`sid` - WHERE d.`auditState` = 3 - or d.auditState = 1 - GROUP BY d.`sid` + WHERE + (d.`auditState` = 3 + OR d.auditState = 1) + GROUP BY + d.`receivablesSid` ) df ON df.receivablesSid = furd.`sid` ${ew.sqlSegment} From 0b0c862fc8e95ab29d8eb2d11108e308f706afa0 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 24 Oct 2024 17:03:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=86=E6=91=8A?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maintenanceAllocation.js | 19 ++ .../src/router/modules/codemenu.js | 11 +- .../maintenanceAllocation.vue | 217 ++++++++++++++++++ 3 files changed, 246 insertions(+), 1 deletion(-) create mode 100644 anrui-scm/anrui-scm-ui/src/api/manufacturerrebates/maintenanceAllocation.js create mode 100644 anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/maintenanceAllocation/maintenanceAllocation.vue diff --git a/anrui-scm/anrui-scm-ui/src/api/manufacturerrebates/maintenanceAllocation.js b/anrui-scm/anrui-scm-ui/src/api/manufacturerrebates/maintenanceAllocation.js new file mode 100644 index 0000000000..900d980ca6 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/api/manufacturerrebates/maintenanceAllocation.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' +// 根据条件分页查询数据的列表 已改 +export function pagerList(data) { + return request({ + url: '/base/v1/basepurchasesystem/listPage', + data: data, + method: 'post', + headers: { 'Content-Type': 'application/json' } + }) +} + +// 新增保存 已改 +export function maintenance(data) { + return request({ + url: '/base/v1/basepurchasesystem/maintenance', + method: 'post', + params: data + }) +} diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js index 7721b72e49..89c15d70c0 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -710,7 +710,16 @@ const codemenu = [{ component: () => import('@/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue'), name: 'HuiKuanFanliFenPei', meta: { - title: '厂家回款返利分配', + title: '厂家回款返利分摊', + noCache: true + } + }, + { + path: '/maintenanceAllocation/maintenanceAllocation', + component: () => import('@/views/manufacturerrebates/maintenanceAllocation/maintenanceAllocation.vue'), + name: 'MaintenanceAllocation', + meta: { + title: '分摊比例设置', noCache: true } } diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/maintenanceAllocation/maintenanceAllocation.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/maintenanceAllocation/maintenanceAllocation.vue new file mode 100644 index 0000000000..f018997140 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/maintenanceAllocation/maintenanceAllocation.vue @@ -0,0 +1,217 @@ + + + +