diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java index 827343d..f299916 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java @@ -208,7 +208,7 @@ public class RedBookController extends BaseController * @return */ @DataSource(DataSourceType.MASTER) - @Log(title = "保存报价单", businessType = BusinessType.INSERT) + @Log(title = "保存红本报价单", businessType = BusinessType.INSERT) @PostMapping("/saveQuot") public AjaxResult saveQuot(HttpServletResponse response, @RequestBody OAQuot quot) { @@ -223,7 +223,21 @@ public class RedBookController extends BaseController } return success(quot); } - + /** + * 报价单提交 + * @param quot + * @return + */ + @DataSource(DataSourceType.MASTER) + @Log(title = "提交红本报价单", businessType = BusinessType.UPDATE) + @PostMapping("/commitQuot") + public AjaxResult commitQuot(HttpServletResponse response, @RequestBody OAQuot quot) + { + quot.setQuotApprovalStatus("1");//提交状态更新为 待审核 + quot.setUpdateBy(getUsername()); + redBookService.updateOAQuot(quot); + return success(quot); + } /** * 报价单生成 * @param quot 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 587a72f..dacf244 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 @@ -14,6 +14,7 @@ public class OAQuot extends BaseEntity { private String totalPrice;//总金额 private String rbDateUid;//调价版本 + private String quotApprovalStatus;//提交状态 private List selectedResultData; @@ -65,6 +66,10 @@ public class OAQuot extends BaseEntity { public void setRbDateUid(String rbDateUid) { this.rbDateUid = rbDateUid; } + public String getQuotApprovalStatus() { return quotApprovalStatus; } + + public void setQuotApprovalStatus(String quotApprovalStatus) { this.quotApprovalStatus = quotApprovalStatus; } + public List getSelectedResultData() { return selectedResultData; } diff --git a/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml b/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml index 8df3e55..d1c6340 100644 --- a/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml @@ -121,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quotLxrdh = #{quotLxrdh}, totalPrice = #{totalPrice}, rbDateUid = #{rbDateUid}, + quotApprovalStatus = #{quotApprovalStatus}, update_by = #{updateBy}, update_time = getdate() @@ -163,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_dept d on u.dept_id = d.dept_id select a.quot_id, a.quotCode, a.quotCustomer, a.quotProject, a.quotLxr, - a.quotLxrdh, a.totalPrice,a.rbDateUid, + a.quotLxrdh, a.totalPrice,a.rbDateUid,a.quotApprovalStatus, b.quot_product_id, b.name_0, b.name_1, b.spec, b.voltage, b.stu, diff --git a/ruoyi-ui/src/api/redBook/redBook.js b/ruoyi-ui/src/api/redBook/redBook.js index a76bc7a..45d1727 100644 --- a/ruoyi-ui/src/api/redBook/redBook.js +++ b/ruoyi-ui/src/api/redBook/redBook.js @@ -108,6 +108,14 @@ export function saveQuot(data) { data: data }) } +//提交报价单 +export function commitQuot(data) { + return request({ + url: '/redBook/redBook/commitQuot', + method: 'post', + data: data + }) +} //生成报价单 export function madeQuot(data) { return request({ diff --git a/ruoyi-ui/src/views/redBook/productSelect.vue b/ruoyi-ui/src/views/redBook/productSelect.vue index 38d9024..3fb3e3f 100644 --- a/ruoyi-ui/src/views/redBook/productSelect.vue +++ b/ruoyi-ui/src/views/redBook/productSelect.vue @@ -13,44 +13,56 @@ 保存 + - + - - {{item.name_0}} + + + {{item.name_0}} + -
-
- 收起 -
- {{index+1}}、{{item.remark_0}} -
-
-
- 更多 -
+ +
+
+ 收起
{{index+1}}、{{item.remark_0}}
+
+ 更多 +
+
+ {{index+1}}、{{item.remark_0}} +
+
+
-
+ - - {{item.name_0}} + + + {{item.name_0}} + - - {{item.name_0}} + + + {{item.name_0}} + - - {{item.name_0}} + + + {{item.name_0}} + - - {{item.section}} + + + {{item.section}} + - @@ -111,7 +123,7 @@ - + + @@ -179,6 +192,12 @@