diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java index 725ce1c..a7c4b42 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java @@ -293,6 +293,7 @@ public class QuotController extends BaseController String quotHjId = UUID.fastUUID().toString(); quotHj.setQuotHjId(quotHjId); quotHj.setQuotHjCode(IdUtils.createNo("BJD_HJ_",2)); + quotHj.setQuotHjPricingType("10");//核价类型 设置为 报价核价 quotHj.setCreateBy(getUsername()); quotHj.setUpdateBy(getUsername()); @@ -317,11 +318,15 @@ public class QuotController extends BaseController Quot info = quotService.selectQuotByQuotId(quot_id); String quot_jsxz_approval_status = quot.getQuotJsxzApprovalStatus(); + String quot_hj_approval_status = quot.getQuotHjApprovalStatus(); if("1".equals(quot_jsxz_approval_status)){ return error("技术协助还未完成"); - }else{ - info.setQuotApprovalStatus("2"); } + if("1".equals(quot_hj_approval_status)){ + return error("核价还未完成"); + } + + info.setQuotApprovalStatus("2"); quotService.updateQuot(info); return success(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java b/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java index 005fb3f..abdfd7b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java +++ b/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java @@ -38,6 +38,16 @@ public class QuotHj extends BaseEntity @Excel(name = "核价协助状态") private String quotHjApprovalStatus; + /** 创建人 */ + private String createName; + + + /** 报价单信息 */ + private String quotCode;//报价单号 + private String quotSalesmanName;//业务员 + private String quotCustomerName;//客户 + private String quotProject;//项目 + public void setQuotHjId(String quotHjId) { this.quotHjId = quotHjId; @@ -86,4 +96,20 @@ public class QuotHj extends BaseEntity public String getQuotHjApprovalStatus() { return quotHjApprovalStatus; } public void setQuotHjApprovalStatus(String quotHjApprovalStatus) { this.quotHjApprovalStatus = quotHjApprovalStatus; } + public String getCreateName() { return createName; } + + public void setCreateName(String createName) { this.createName = createName; } + + /** 报价单信息 */ + public String getQuotCode() { return quotCode; } + public void setQuotCode(String quotCode) { this.quotCode = quotCode; } + + public String getQuotSalesmanName() { return quotSalesmanName; } + public void setQuotSalesmanName(String quotSalesmanName) { this.quotSalesmanName = quotSalesmanName; } + + public String getQuotCustomerName() { return quotCustomerName; } + public void setQuotCustomerName(String quotCustomerName) { this.quotCustomerName = quotCustomerName; } + + public String getQuotProject() { return quotProject; } + public void setQuotProject(String quotProject) { this.quotProject = quotProject; } } diff --git a/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml b/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml index d0d6261..62b8e82 100644 --- a/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -12,27 +12,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + left join sys_user u on u.user_name=a.create_by + left join sys_dept d on u.dept_id = d.dept_id + left join quot q on q.quot_ht_id = a.quot_hj_id + + - select quot_hj_id, quot_hj_code, quot_hj_pricing_type, quot_hj_pricing_date, quot_hj_remark, create_by, create_time, update_by, update_time from quot_hj + select a.quot_hj_id, a.quot_hj_code, a.quot_hj_pricing_type, a.quot_hj_pricing_date, a.quot_hj_remark, + a.create_by, a.create_time, a.update_by, a.update_time, + u.nick_name create_name, + q.quot_hj_approval_status,q.quot_code,q.quot_salesman_name, + q.quot_customer_name,q.quot_project + from quot_hj a + - + - + insert into quot_hj @@ -79,9 +98,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from quot_hj where quot_hj_id in + delete from quot_hj where quot_hj_id in #{quotHjId} - \ No newline at end of file + diff --git a/ruoyi-ui/src/views/priceVerification/priceVerification/index.vue b/ruoyi-ui/src/views/priceVerification/priceVerification/index.vue index 6d2a04d..4deaa91 100644 --- a/ruoyi-ui/src/views/priceVerification/priceVerification/index.vue +++ b/ruoyi-ui/src/views/priceVerification/priceVerification/index.vue @@ -29,18 +29,36 @@ - + - + + + + + + + + + + - + + + + { this.form = response.data;