From 0369036272728e4f6e6fce2cc76752cf296c1ae5 Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Thu, 4 Jul 2024 12:53:55 +0800 Subject: [PATCH] '123' --- .../java/com/ruoyi/redBook/domain/OAQuot.java | 11 +++ .../mapper/redBook/OARedBookMapper.xml | 10 ++- ruoyi-ui/src/views/redBook/productSelect.vue | 75 +++++++++---------- ruoyi-ui/src/views/redBook/quots.vue | 63 +++++++++------- 4 files changed, 89 insertions(+), 70 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/redBook/domain/OAQuot.java b/ruoyi-system/src/main/java/com/ruoyi/redBook/domain/OAQuot.java index 7e3fdf4..6563696 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/redBook/domain/OAQuot.java +++ b/ruoyi-system/src/main/java/com/ruoyi/redBook/domain/OAQuot.java @@ -2,6 +2,7 @@ package com.ruoyi.redBook.domain; import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; import java.util.List; public class OAQuot extends BaseEntity { @@ -13,6 +14,8 @@ public class OAQuot extends BaseEntity { private String quotLxrdh;//联系人电话 private String totalPrice;//总金额 + private BigDecimal perc;//一次折扣 + private BigDecimal perc2;//二次折扣 private String rbDateUid;//调价版本 private String quotApprovalStatus;//提交状态 @@ -64,6 +67,14 @@ public class OAQuot extends BaseEntity { public void setTotalPrice(String totalPrice) { this.totalPrice = totalPrice; } + public BigDecimal getPerc() {return perc; } + + public void setPerc(BigDecimal perc) {this.perc = perc; } + + public BigDecimal getPerc2() { return perc2; } + + public void setPerc2(BigDecimal perc2) { this.perc2 = perc2; } + public String getRbDateUid() { return rbDateUid; } public void setRbDateUid(String rbDateUid) { this.rbDateUid = rbDateUid; } diff --git a/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml b/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml index fd054b6..376239b 100644 --- a/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml @@ -94,6 +94,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quotLxr, quotLxrdh, totalPrice, + perc, + perc2, rbDateUid, create_by, create_time, @@ -108,6 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{quotLxr}, #{quotLxrdh}, #{totalPrice}, + #{perc}, + #{perc2}, #{rbDateUid}, #{createBy}, #{createTime}, @@ -125,6 +129,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quotLxr = #{quotLxr}, quotLxrdh = #{quotLxrdh}, totalPrice = #{totalPrice}, + perc = #{perc}, + perc2 = #{perc2}, rbDateUid = #{rbDateUid}, quotApprovalStatus = #{quotApprovalStatus}, create_by = #{createBy}, @@ -230,6 +236,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -256,7 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"