From 36e9f67915b6e74eae31ddef541d49faad6d1c1b Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Wed, 19 Mar 2025 09:34:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=BD=91=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/finpaymentapply/FinPaymentapply.java | 2 + .../FinPaymentapplyDetailsVo.java | 5 +- .../finpaymentapply/FinPaymentapplyDto.java | 2 + .../FinPaymentapplyService.java | 117 +++++++++++------- .../anrui/flowable/api/utils/ProcDefEnum.java | 2 +- 5 files changed, 78 insertions(+), 50 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java index 1b1dac8546..b4243f5aee 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java @@ -69,6 +69,8 @@ public class FinPaymentapply extends BaseEntity { private String costRangeValue; @ApiModelProperty("是否事业部领导审批，1是0否") private String isLeaderSp; + @ApiModelProperty("是否事业部总经理审批，1是0否") + private String isManageSp; @ApiModelProperty("是否已销售，1是0否") private String isSales; @ApiModelProperty("款项是否已交清，1是0否") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java index 44ea819d59..4b3a93f339 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java @@ -28,11 +28,8 @@ package com.yxt.anrui.fin.api.finpaymentapply; import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo; import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo; -import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto; import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo; -import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto; import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo; -import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -112,6 +109,8 @@ public class FinPaymentapplyDetailsVo implements Vo { private String costRangeValue; @ApiModelProperty("是否事业部领导审批，1是0否") private String isLeaderSp; + @ApiModelProperty("是否事业部总经理审批，1是0否") + private String isManageSp; @ApiModelProperty("是否已销售，1是0否") private String isSales; @ApiModelProperty("款项是否已交清，1是0否") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java index e483ccb569..ac0a454125 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java @@ -113,6 +113,8 @@ public class FinPaymentapplyDto implements Dto { private String costRangeValue; @ApiModelProperty("是否事业部领导审批，1是0否") private String isLeaderSp; + @ApiModelProperty("是否事业部总经理审批，1是0否") + private String isManageSp; @ApiModelProperty("是否已销售，1是0否") private String isSales; @ApiModelProperty("款项是否已交清，1是0否") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 15f25fdf1c..2edb8bd9bc 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -458,18 +458,23 @@ public class FinPaymentapplyService extends MybatisBaseService vaributes = new HashMap<>(); + Map variables = new HashMap<>(); //网关 - if ("1".equals(finPaymentapply.getIsVeh())) { - if ("1".equals(finPaymentapply.getIsSettle())) { - vaributes.put("isAdj", false); + if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) { + if (finPaymentapply.getIsLeaderSp().equals("1")) { + variables.put("isAdj", true); } else { - vaributes.put("isAdj", true); + variables.put("isAdj", false); } - } else if ("0".equals(finPaymentapply.getIsVeh())) { - if ("1".equals(finPaymentapply.getIsLeaderSp())) { - vaributes.put("isAdj", true); + } else { + variables.put("isAdj", false); + } + if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) { + if (finPaymentapply.getIsManageSp().equals("1")) { + variables.put("isManageSp", true); } else { - vaributes.put("isAdj", false); + variables.put("isManageSp", false); } + } else { + variables.put("isManageSp", false); } Map appMap = new HashMap<>(); appMap.put("sid", bv.getBusinessSid()); - vaributes.put("app", appMap); - bv.setFormVariables(vaributes); + variables.put("app", appMap); + bv.setFormVariables(variables); bv.setOrgSidPath(finPaymentapply.getOrgSidPath()); ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -775,18 +785,23 @@ public class FinPaymentapplyService extends MybatisBaseService vaributes = new HashMap<>(); + Map variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", query.getBusinessSid()); - vaributes.put("app", appMap); + variables.put("app", appMap); //网关 - if ("1".equals(finPaymentapply.getIsVeh())) { - if ("1".equals(finPaymentapply.getIsSettle())) { - vaributes.put("isAdj", false); + if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) { + if (finPaymentapply.getIsLeaderSp().equals("1")) { + variables.put("isAdj", true); } else { - vaributes.put("isAdj", true); + variables.put("isAdj", false); } - } else if ("0".equals(finPaymentapply.getIsVeh())) { - if ("1".equals(finPaymentapply.getIsLeaderSp())) { - vaributes.put("isAdj", true); + } else { + variables.put("isAdj", false); + } + if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) { + if (finPaymentapply.getIsManageSp().equals("1")) { + variables.put("isManageSp", true); } else { - vaributes.put("isAdj", false); + variables.put("isManageSp", false); } + } else { + variables.put("isManageSp", false); } - flowTaskVo.setValues(vaributes); + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index c5de7f4850..ff69e01a78 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -23,7 +23,7 @@ public enum ProcDefEnum { // BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"), BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:4087504"), FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"), - FINPAYAPPLY("付款申请", "process_gin2tntb:6:16692504"), + FINPAYAPPLY("付款申请", "process_gin2tntb:7:18505004"), RECORDAPPLICATION("入库申请", "process_xbwq2c7p:5:1742504"), SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"), SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"), From 9889fad7e7fcd7d4f28ac8dbf538087194ff44ff Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 19 Mar 2025 10:36:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fukuanshenqing/paymentAdd.vue | 65 ++++++++++++++----- .../fukuanshenqing/paymentInfo.vue | 24 ++++--- .../fukuanguanli/fukuanDaiBanInfo.vue | 21 ++++-- .../fukuanguanli/fukuanEdit.vue | 61 ++++++++++++----- .../fukuanguanli/fukuanYiBanInfo.vue | 21 ++++-- 5 files changed, 139 insertions(+), 53 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue index 666b099ddb..13f4daea28 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue @@ -54,7 +54,7 @@
*是否涉及车辆
- + 是 否 @@ -62,7 +62,7 @@ - +
*付款单位
@@ -70,15 +70,15 @@ - +
付款申请备注
 - +
-
*是否事业部领导审批
+
*是否事业部运营经理审批
是 @@ -87,6 +87,17 @@
+ +
+
*是否事业部总经理审批
+ + + 是 + 否 + + +
+
@@ -179,14 +190,14 @@
*是否已销售： - + 是 否
*款项是否已交清： - + 是 否 @@ -397,7 +408,8 @@ export default { createTime: '', // 申请日期 costRangeKey: '', // 款项范围Key costRangeValue: '', // 款项范围value - isLeaderSp: '', // 是否事业部领导审批，1是0否 + isLeaderSp: '', // 是否事业部运营经理审批，1是0否 + isManageSp: '', // 是否事业部总经理审批， 1是0否 isSales: '', // 是否已销售 isSettle: '', // 款项是否已交清 costTypeKey: '', // 款项类别key @@ -426,7 +438,8 @@ export default { carBrandName: [{ required: true, message: '品牌不能为空', trigger: 'change' }], isVeh: [{ required: true, message: '是否涉及车辆不能为空', trigger: 'change' }], payCompany: [{ required: true, message: '付款单位不能为空', trigger: 'change' }], - isLeaderSp: [{ required: true, message: '是否事业部领导审批不能为空', trigger: 'change' }] + isLeaderSp: [{ required: true, message: '是否事业部运营经理审批不能为空', trigger: 'change' }], + isManageSp: [{ required: true, message: '是否事业部总经理审批不能为空', trigger: 'change' }] }, paymentVisible: false, // 付款明细表 -- 新增付款信息弹框 paymentBtn: false, // 付款明细表 -- 新增付款信息弹框 -- 页面按钮是否显示隐藏 @@ -567,6 +580,18 @@ export default { this.formobj.isVeh = '' } }, + isVehChange(val) { + if (val === '1') { + this.formobj.isLeaderSp = '' + this.formobj.isManageSp = '' + } else if (val === '0') { + this.formobj.isSales = '' + this.formobj.isSettle = '' + this.formobj.vehicleList = [] + this.formobj.isLeaderSp = '1' + this.formobj.isManageSp = '' + } + }, changePayCompany(value) { const choose = this.payCompany_list.filter((item) => item.companyInvoicingName === value) if (choose.length > 0 && choose !== null) { @@ -744,7 +769,14 @@ export default { list: [] } }, - clearByCar() { + clearByCar(val, event) { + if (val === 'isSettle' && event === '1') { + this.formobj.isLeaderSp = '0' + this.formobj.isManageSp = '0' + } else if (val === 'isSettle' && event === '0') { + this.formobj.isLeaderSp = '1' + this.formobj.isManageSp = '1' + } this.formobj.vehicleList = [] }, toSelect() { @@ -979,7 +1011,8 @@ export default { createTime: '', // 申请日期 costRangeKey: '', // 款项范围Key costRangeValue: '', // 款项范围value - isLeaderSp: '', // 是否事业部领导审批，1是0否 + isLeaderSp: '', // 是否事业部运营经理审批，1是0否 + isManageSp: '', // 是否事业部总经理审批， 1是0否 isSales: '', // 是否已销售 isSettle: '', // 款项是否已交清 costTypeKey: '', // 款项类别key @@ -1014,17 +1047,17 @@ export default {