From 40720f4c9b36cb2726b81107583d54cfde24d1d2 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 6 Jan 2025 09:50:45 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E7=AE=A1=E7=90=86--=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=BD=A6=E8=BE=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bicyclerebatemanagementAdd.vue | 2 +- .../bicyclerebatemanagementByVehicle.vue | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue index 56029a8292..f89120a9cc 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue @@ -205,7 +205,7 @@ export default { addjacket() { if (this.formobj.calculationModeValue !== '' && this.formobj.calculationStandard !== '') { this.viewState = 2 - this.$refs['divSelect'].showData(this.formobj.scmVehRebateVehs) + this.$refs['divSelect'].showData(this.formobj.scmVehRebateVehs, this.formobj.orgPath) } else { this.$message({ showClose: true, type: 'error', message: '请先选择计算方式及填写计算标准' }) } diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementByVehicle.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementByVehicle.vue index 937555935b..9593127bd5 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementByVehicle.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementByVehicle.vue @@ -132,7 +132,7 @@ export default { data() { return { useOrg: '', - buyerOrgSid: '', + orgPath: '', carBrand_list: [], vehicleType_list: [], productLine_list: [], @@ -166,7 +166,7 @@ export default { vehicleType: '', vehicleVersion: '', userSid: '', - buyerOrgSid: '', + orgPath: '', vinNo: '', salesDateStart: '', salesDateEnd: '', @@ -262,7 +262,7 @@ export default { getList() { this.listLoading = true this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') - this.listQuery.params.buyerOrgSid = this.buyerOrgSid + this.listQuery.params.orgPath = this.orgPath req.pageList(this.listQuery).then((response) => { this.listLoading = false if (response.success) { @@ -294,6 +294,7 @@ export default { vehicleType: '', vehicleVersion: '', userSid: '', + orgPath: '', vinNo: '', salesDateStart: '', salesDateEnd: '', @@ -325,7 +326,7 @@ export default { }) this.sids = aa }, - showData(value, buyerOrgSid) { + showData(value, orgPath) { const aa = [] if (value.length > 0) { for (var i = 0; i < value.length; i++) { @@ -335,7 +336,7 @@ export default { } else { this.listQuery.params.vinNoList = [] } - this.buyerOrgSid = buyerOrgSid + this.orgPath = orgPath this.init() }, // 添加修改返回 From 2be45fb5dfd3f0cd6e680b8e7e9050c8cc854bb0 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 6 Jan 2025 09:57:13 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E7=AE=A1=E7=90=86--=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=BD=A6=E8=BE=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bicyclerebatemanagementAdd.vue | 2 +- .../bicyclerebatemanagementByVehicle.vue | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue index f89120a9cc..56029a8292 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue @@ -205,7 +205,7 @@ export default { addjacket() { if (this.formobj.calculationModeValue !== '' && this.formobj.calculationStandard !== '') { this.viewState = 2 - this.$refs['divSelect'].showData(this.formobj.scmVehRebateVehs, this.formobj.orgPath) + this.$refs['divSelect'].showData(this.formobj.scmVehRebateVehs) } else { this.$message({ showClose: true, type: 'error', message: '请先选择计算方式及填写计算标准' }) } diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementByVehicle.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementByVehicle.vue index 9593127bd5..b8cdd0ba9d 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementByVehicle.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementByVehicle.vue @@ -132,7 +132,6 @@ export default { data() { return { useOrg: '', - orgPath: '', carBrand_list: [], vehicleType_list: [], productLine_list: [], @@ -166,7 +165,7 @@ export default { vehicleType: '', vehicleVersion: '', userSid: '', - orgPath: '', + orgSid: '', vinNo: '', salesDateStart: '', salesDateEnd: '', @@ -262,7 +261,7 @@ export default { getList() { this.listLoading = true this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') - this.listQuery.params.orgPath = this.orgPath + this.listQuery.params.orgSid = window.sessionStorage.getItem('defaultOrgPath') req.pageList(this.listQuery).then((response) => { this.listLoading = false if (response.success) { @@ -294,7 +293,7 @@ export default { vehicleType: '', vehicleVersion: '', userSid: '', - orgPath: '', + orgSid: '', vinNo: '', salesDateStart: '', salesDateEnd: '', @@ -326,7 +325,7 @@ export default { }) this.sids = aa }, - showData(value, orgPath) { + showData(value) { const aa = [] if (value.length > 0) { for (var i = 0; i < value.length; i++) { @@ -336,7 +335,6 @@ export default { } else { this.listQuery.params.vinNoList = [] } - this.orgPath = orgPath this.init() }, // 添加修改返回 From ff4d321dd4ab950221c8d4c0a4f454fe636a3b62 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Mon, 6 Jan 2025 10:23:09 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=9C=88=E8=BF=98=E8=AE=A1=E6=8F=90?= =?UTF-8?q?=E5=87=AD=E8=AF=81=E5=A2=9E=E5=8A=A0=E9=87=8D=E6=8E=A8=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanMonthlyAccrualApplyFallback.java | 7 +++++-- .../LoanMonthlyAccrualApplyFeign.java | 5 ++++- .../LoanMonthlyAccrualApplyRest.java | 8 +++++++- .../LoanMonthlyAccrualApplyService.java | 15 ++++++++------- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java index 0d51dc6bf0..1e0c2a4438 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java @@ -1,9 +1,7 @@ package com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply; -import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo; import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*; -import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.flow.TransferDelegateQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -51,6 +49,11 @@ public class LoanMonthlyAccrualApplyFallback implements LoanMonthlyAccrualApplyF return null; } + @Override + public ResultBean rePushVoucher(String sid) { + return null; + } + @Override public ResultBean submitRecordApplication(SubmitAccrualDto dto) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java index a430cce400..02bdce85e5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java @@ -1,7 +1,6 @@ package com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply; import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*; -import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.flow.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -63,6 +62,10 @@ public interface LoanMonthlyAccrualApplyFeign { @PostMapping("/accrualCreatePdf") public ResultBean accrualCreatePdf(@RequestParam("sid") String sid); + @ApiOperation("重推凭证") + @PostMapping("/rePushVoucher") + public ResultBean rePushVoucher(@RequestParam("sid") String sid); + //---------------------------流程--------------------------------------- @ApiOperation("提交") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyRest.java index 84eff1d77e..47957d74ce 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyRest.java @@ -3,7 +3,6 @@ package com.yxt.anrui.riskcenter.biz.loanmonthlyaccrualapply; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; -import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDayExportVo; import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.*; import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*; import com.yxt.common.base.utils.ExportExcelUtils; @@ -78,6 +77,13 @@ public class LoanMonthlyAccrualApplyRest implements LoanMonthlyAccrualApplyFeign return loanMonthlyAccrualApplyService.accrualCreatePdf(sid); } + @Override + public ResultBean rePushVoucher(String sid) { + ResultBean rb = ResultBean.fireFail(); + loanMonthlyAccrualApplyService.rePushVoucher(sid); + return rb.success(); + } + @Override public ResultBean submitRecordApplication(SubmitAccrualDto dto) { return loanMonthlyAccrualApplyService.submitRecordApplication(dto); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java index 92311b1504..5dd680f3a4 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java @@ -7,19 +7,15 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; -import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; -import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; @@ -54,13 +50,15 @@ import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.ConstantUtils; -import com.yxt.common.base.utils.DateUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.WordConvertUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.messagecenter.api.message.*; +import com.yxt.messagecenter.api.message.Message; +import com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.message.MessageFlowVo; +import com.yxt.messagecenter.api.message.MessageFlowableQuery; import com.yxt.messagecenter.api.messagelist.MessageList; import com.yxt.messagecenter.api.messagelist.MessageListFeign; import org.apache.commons.lang3.StringUtils; @@ -70,7 +68,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.File; import java.io.InputStream; -import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; @@ -1202,4 +1199,8 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService Date: Mon, 6 Jan 2025 11:04:21 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9oa=E4=B8=AD=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E5=AE=A1=E6=89=B9=E5=8D=95=E7=BB=A7=E6=89=BF=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E7=9A=84=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java | 6 +++++- .../com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApply.java | 3 ++- .../java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java index 39893d9ace..f8751bdae4 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java @@ -1,9 +1,12 @@ package com.yxt.anrui.oa.biz.oaform; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @description: * @author: dimengzhe @@ -23,8 +26,9 @@ public class OaForm extends BaseEntity { private String deptSid; @ApiModelProperty("部门名称") private String deptName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("办结日期") - private String finishTime; + private Date finishTime; @ApiModelProperty("实例id") private String procInstId; @ApiModelProperty("流程定义id") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApply.java index 932b06a866..eb409dfc45 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApply.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApply.java @@ -26,6 +26,7 @@ package com.yxt.anrui.oa.biz.oaleaveapply; import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.anrui.oa.biz.oaform.OaForm; import com.yxt.common.core.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; @@ -49,7 +50,7 @@ import lombok.Data; @Data @ApiModel(value = "请假申请", description = "请假申请") @TableName("oa_leave_apply") -public class OaLeaveApply extends BaseEntity { +public class OaLeaveApply extends OaForm { private static final long serialVersionUID = 1L; @ApiModelProperty("单据编号") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java index cae8ea5480..142c84928b 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java @@ -26,6 +26,7 @@ package com.yxt.anrui.oa.biz.oamendapply; import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.anrui.oa.biz.oaform.OaForm; import com.yxt.common.core.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; @@ -49,7 +50,7 @@ import lombok.Data; @Data @ApiModel(value = "补卡申请", description = "补卡申请") @TableName("oa_mend_apply") -public class OaMendApply extends BaseEntity { +public class OaMendApply extends OaForm { private static final long serialVersionUID = 1L; @ApiModelProperty("单据编号") From d53bbe0738c1be039d60cd0a77c819ac41e0a73b Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 6 Jan 2025 14:19:59 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=87=BA=E7=BA=B3?= =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paymentConfirmation/cashierConfirmation.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue index e802206b71..a130040148 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue @@ -373,7 +373,7 @@ export default { handleConfirm() { this.visibleDisabled = true if (this.printSource === '02') { - createPdf({ skdSid: this.printSid, printerType: this.print }).then((resp) => { + createPdfRsk({ skdSid: this.printSid, printerType: this.print }).then((resp) => { if (resp.success && resp.data.pdfPath !== '') { var xhr = new XMLHttpRequest() xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.pdfPath + '&outFileName=' + '收款单', true) @@ -441,7 +441,7 @@ export default { this.visibleDisabled = false }) } else if (this.printSource === '' || this.printSource === null) { - createPdfRsk({ skdSid: this.printSid, printerType: this.print }).then((resp) => { + createPdf({ skdSid: this.printSid, printerType: this.print }).then((resp) => { if (resp.success && resp.data.pdfPath !== '') { var xhr = new XMLHttpRequest() xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.pdfPath + '&outFileName=' + '收款单', true) From f826d1865a2de3abebf1f2b26887c7facc2694cf Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 6 Jan 2025 15:54:07 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E3=80=81=E6=AC=A0=E6=AC=BE=E5=87=BA=E5=BA=93=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=9A=E8=8B=A5=E5=87=BA=E5=BA=93=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E7=9A=84=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E4=B8=AD?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BA=86=E4=B8=8A=E8=A3=85=E3=80=81=E6=8C=82?= =?UTF-8?q?=E8=BD=A6=EF=BC=8C=E5=88=99=E9=9C=80=E8=A6=81=E5=85=88=E4=B8=8A?= =?UTF-8?q?=E8=A3=85=E3=80=81=E6=8C=82=E8=BD=A6=E5=85=A5=E5=BA=93=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E8=BD=A6=E8=BE=86=E5=90=8E=E6=96=B9=E5=8F=AF=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyMapper.java | 9 ++ .../BusDeliveredApplyMapper.xml | 15 +++ .../BusDeliveredApplyService.java | 108 +++++++++++++++++- .../BusSalesOrderMakeupMapper.java | 2 + .../BusSalesOrderMakeupMapper.xml | 7 ++ .../BusSalesOrderMakeupService.java | 4 + .../BusSalesOrderTrailerMapper.java | 2 + .../BusSalesOrderTrailerMapper.xml | 12 +- .../BusSalesOrderTrailerService.java | 4 + 9 files changed, 157 insertions(+), 6 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java index 9b4f3e2cfb..95a529ed29 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java @@ -30,11 +30,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.base.api.basetrailer.BaseTrailer; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState; +import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall; import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageQuery; import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageVo; import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply; import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -126,4 +129,10 @@ public interface BusDeliveredApplyMapper extends BaseMapper { int selByVinSidAndYBJ(String vinSid); String selCustomerByBusVinSid(@Param("busVinSid") String busVinSid); + + List selectTralier(String vinSid); + + BusSalesOrderVehicle selectVinNoByVehicleSid(@Param("vinSid") String vinSid, @Param("contractNo") String contractId); + + List selectInstall(String linkNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml index e27964d574..e416be9274 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml @@ -218,4 +218,19 @@ ORDER BY a.createTime DESC LIMIT 1 + + + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 1d7e9cef66..e6cabb832d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -33,10 +33,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo; import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanFeign; -import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; -import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; -import com.yxt.anrui.base.api.basetrailer.TrailerVo; -import com.yxt.anrui.base.api.basetrailer.TraliveredVo; +import com.yxt.anrui.base.api.basetrailer.*; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; @@ -51,6 +48,7 @@ import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; +import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.common.enums.CertificState; import com.yxt.anrui.base.common.utils.Rule; @@ -83,8 +81,10 @@ import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepa import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount; +import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo; import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingDto; @@ -102,6 +102,8 @@ import com.yxt.anrui.buscenter.biz.bushandoverprepare.BusHandoverPrepareService; import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService; import com.yxt.anrui.buscenter.biz.bussalesorderloancontract.BusSalesOrderLoancontractService; +import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService; +import com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerService; import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; import com.yxt.anrui.buscenter.biz.busvalcustfiling.BusValcustFilingService; import com.yxt.anrui.buscenter.biz.busvehicleinformationhandover.BusVehicleInformationHandoverService; @@ -297,6 +299,11 @@ public class BusDeliveredApplyService extends MybatisBaseService trailersLists = busSalesOrderTrailerService.selectTrailerByContractNo(dto.getContractId()); + trailersLists = trailersLists.stream().filter(Objects::nonNull).collect(Collectors.toList()); // 去除null元素 + // 如果列表不为空，使用流式操作计算总挂车数量 + if(!trailersLists.isEmpty()){ + int totalTrailerCount = trailersLists.stream() + .mapToInt(BusSalesOrderTrailer::getTrailerCount) // 提取数量 + .sum(); // 累加所有数量 + if(!carList.isEmpty()){ + for (AppCarListVo car : carList) { + //根据车辆sid 查询挂车的数量 + List trList = baseMapper.selectTralier(car.getVinSid()); + trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList()); // 去除null元素 + if(totalTrailerCount != trList.size()){ + isHave = true; + break; + } + } + } + } + if(isHave){ + return rb.setMsg("挂车入库绑定车辆后才可以提交出库申请"); + } + boolean issHave = false; + List makeUpsList = busSalesOrderMakeupService.selectMakeUpByContractNo(dto.getContractId()); + makeUpsList = makeUpsList.stream().filter(Objects::nonNull).collect(Collectors.toList()); // 去除null元素 + if(!makeUpsList.isEmpty()){ + //查询上装入库中是否有该主车关联的上装 + if(!carList.isEmpty()){ + for (AppCarListVo car : carList) { + //根据车辆sid和合同号查询主车车架号 + BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectVinNoByVehicleSid(car.getVinSid(),dto.getContractId()); + List trList = baseMapper.selectInstall(busSalesOrderVehicle.getLinkNo()); + trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList()); // 去除null元素 + if(trList.isEmpty()){ + issHave = true; + break; + } + } + } + } + if(issHave){ + return rb.setMsg("上装入库绑定车辆后才可以提交出库申请"); + } + //================= BusDeliveredApply busDeliveredApply = fetchBySid(dto.getSid()); int r = submitAppBusinessData(dto, busDeliveredApply); if (r == 3) { @@ -4281,7 +4334,54 @@ public class BusDeliveredApplyService extends MybatisBaseService trailersLists = busSalesOrderTrailerService.selectTrailerByContractNo(dto.getContractId()); + trailersLists = trailersLists.stream().filter(Objects::nonNull).collect(Collectors.toList()); // 去除null元素 + // 如果列表不为空，使用流式操作计算总挂车数量 + if(!trailersLists.isEmpty()){ + int totalTrailerCount = trailersLists.stream() + .mapToInt(BusSalesOrderTrailer::getTrailerCount) // 提取数量 + .sum(); // 累加所有数量 + if(!carList.isEmpty()){ + for (AppCarListVo car : carList) { + //根据车辆sid 查询挂车的数量 + List trList = baseMapper.selectTralier(car.getVinSid()); + trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList()); // 去除null元素 + if(totalTrailerCount != trList.size()){ + isHave = true; + break; + } + } + } + } + if(isHave){ + return rb.setMsg("挂车入库绑定车辆后才可以提交出库申请"); + } + boolean issHave = false; + List makeUpsList = busSalesOrderMakeupService.selectMakeUpByContractNo(dto.getContractId()); + makeUpsList = makeUpsList.stream().filter(Objects::nonNull).collect(Collectors.toList()); // 去除null元素 + if(!makeUpsList.isEmpty()){ + //查询上装入库中是否有该主车关联的上装 + if(!carList.isEmpty()){ + for (AppCarListVo car : carList) { + //根据车辆sid和合同号查询主车车架号 + BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectVinNoByVehicleSid(car.getVinSid(),dto.getContractId()); + List trList = baseMapper.selectInstall(busSalesOrderVehicle.getLinkNo()); + trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList()); // 去除null元素 + if(trList.isEmpty()){ + issHave = true; + break; + } + } + } + } + if(issHave){ + return rb.setMsg("上装入库绑定车辆后才可以提交出库申请"); + } + //================= BusDeliveredApply busDeliveredApply = fetchBySid(dto.getSid()); int r = submitAppBusinessData2(dto, busDeliveredApply); if (r == 3) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java index 2e6b2010a0..0cdd179136 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java @@ -97,4 +97,6 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper selectTopByOrderSid(@Param("orderSid") String orderSid); + + List selectMakeUpByContractNo(String contractId); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml index 8056c14603..18ba581c05 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml @@ -109,4 +109,11 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java index b61c28c1bb..eff8c1e308 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java @@ -281,4 +281,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService busSalesOrderMakeupDetailsVoList = baseMapper.selectTopByOrderSid(orderSid); return rb.success().setData(busSalesOrderMakeupDetailsVoList); } + + public List selectMakeUpByContractNo(String contractId) { + return baseMapper.selectMakeUpByContractNo(contractId); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.java index dc169b504b..dbd1bc40c5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.java @@ -68,4 +68,6 @@ public interface BusSalesOrderTrailerMapper extends BaseMapper selectTrailerByContractNo(String contractId); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.xml index 0705daf056..68f936f2f2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.xml @@ -1,6 +1,14 @@ - - + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java index c845a0b2ae..9738b81ff8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java @@ -183,4 +183,8 @@ public class BusSalesOrderTrailerService extends MybatisBaseService selectTrailerByContractNo(String contractId) { + return baseMapper.selectTrailerByContractNo(contractId); + } } \ No newline at end of file From c79118632d6fa559b0f596e3323d4f5729d97cee Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 6 Jan 2025 16:09:14 +0800 Subject: [PATCH 7/8] =?UTF-8?q?oa=E5=85=B6=E4=BD=99=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=9F=BA=E7=A1=80=E5=8D=95=E5=85=B3?= =?UTF-8?q?=E8=81=94=E7=9A=84sid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApply.java | 2 +- .../java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApply.java | 2 +- .../main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApply.java index 74e965888f..cf8766ea9f 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApply.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApply.java @@ -52,7 +52,7 @@ import lombok.Data; @TableName("oa_hire_apply") public class OaHireApply extends OaForm { private static final long serialVersionUID = 1L; - + private String formSid; @ApiModelProperty("单据编号") private String billNo; // 单据编号 @ApiModelProperty("申请人") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApply.java index eb409dfc45..fde199316f 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApply.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApply.java @@ -52,7 +52,7 @@ import lombok.Data; @TableName("oa_leave_apply") public class OaLeaveApply extends OaForm { private static final long serialVersionUID = 1L; - + private String formSid; @ApiModelProperty("单据编号") private String billNo; // 单据编号 @ApiModelProperty("申请人") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java index 142c84928b..2e840cf9a1 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java @@ -52,7 +52,7 @@ import lombok.Data; @TableName("oa_mend_apply") public class OaMendApply extends OaForm { private static final long serialVersionUID = 1L; - + private String formSid; @ApiModelProperty("单据编号") private String billNo; // 单据编号 @ApiModelProperty("申请人") From fbcb6faaa906574c63f097b479efd438d452ea79 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 7 Jan 2025 11:25:28 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7--=E9=80=89=E6=8B=A9=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E8=BD=A6?= =?UTF-8?q?=E6=9E=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anruifinmanagement/fukuanshenqing/relation/vehcile.vue | 5 +++++ .../fukuanguanliFlow/fukuanguanli/relation/vehcile.vue | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/vehcile.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/vehcile.vue index ac25584a93..5668b03614 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/vehcile.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/vehcile.vue @@ -64,6 +64,9 @@ + + + @@ -171,6 +174,7 @@ export default { userSid: '', orgSid: '', orderingNo: '', + vinNo: '', isSales: '', isSettle: '', vinSidList: [] @@ -293,6 +297,7 @@ export default { this.listQuery.params.vehicleVersion = '' this.listQuery.params.userSid = '' this.listQuery.params.orderingNo = '' + this.listQuery.params.vinNo = '' this.getList() }, handleSelectionChange(row) { diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/vehcile.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/vehcile.vue index 35020a1974..3d1d964b9f 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/vehcile.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/vehcile.vue @@ -64,6 +64,9 @@ + + + @@ -171,6 +174,7 @@ export default { userSid: '', orgSid: '', orderingNo: '', + vinNo: '', isSales: '', isSettle: '', vinSidList: [] @@ -293,6 +297,7 @@ export default { this.listQuery.params.vehicleVersion = '' this.listQuery.params.userSid = '' this.listQuery.params.orderingNo = '' + this.listQuery.params.vinNo = '' this.getList() }, handleSelectionChange(row) {