From d77fe122a6622437fd54349c898bc9f1ba03f427 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 9 Aug 2024 09:28:22 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=B7=BB=E5=8A=A0=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=20=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=B8=9A=E5=8A=A1=E6=B7=BB=E5=8A=A0=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=89=93=E5=BC=80?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=B7=BB=E5=8A=A0=E8=AF=A6=E6=83=85js?= =?UTF-8?q?=E6=96=B9=E6=B3=95=20=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7Contro?= =?UTF-8?q?ller=E5=B1=82=EF=BC=9A=E6=96=B0=E5=A2=9E=E9=94=80=E5=94=AE?= =?UTF-8?q?=E4=BC=B0=E4=BB=B7-=E4=B8=9A=E5=8A=A1=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=EF=BC=9B=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7-?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=AF=A6=E6=83=85=E5=90=8E=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=9B=E6=96=B0=E5=A2=9E=E9=80=9A=E7=94=A8=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SalesEstimateController.java | 22 + .../sales/service/ISalesEstimateService.java | 7 + .../impl/SalesEstimateServiceImpl.java | 12 + .../templates/sales/estimate/addDetail.html | 405 ++++++++++++++++++ .../templates/sales/estimate/estimate.html | 17 +- 5 files changed, 458 insertions(+), 5 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/sales/estimate/addDetail.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesEstimateController.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesEstimateController.java index 1146e450..1dbb8f6d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesEstimateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesEstimateController.java @@ -115,6 +115,28 @@ public class SalesEstimateController extends BaseController } + /** + * 新增销售估价-业务详情 + */ + @GetMapping("/addDetail") + public String addDetail(ModelMap map) + { + SalesEstimateDetailVo salesEstimateDetailVo = salesEstimateService.getSalesEstimateDetailVo(); + map.put("salesEstimateDetailVo",salesEstimateDetailVo); + return prefix + "/addDetail"; + } + + /** + * 新增保存销售估价-业务详情 + */ + @RequiresPermissions("sales:estimate:addDetail") + @Log(title = "销售估价", businessType = BusinessType.INSERT) + @PostMapping("/addDetail") + @ResponseBody + public AjaxResult addDetailSave(@RequestBody SalesEstimate salesEstimate) + { + return toAjax(salesEstimateService.updateSalesEstimateSave(salesEstimate)); + } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesEstimateService.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesEstimateService.java index ff6ae112..74f840d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesEstimateService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesEstimateService.java @@ -100,4 +100,11 @@ public interface ISalesEstimateService * @return */ int ceoAddSalesEstimate(SalesEstimate salesEstimate); + + /** + * 通用保存销售估价方法 + * @param salesEstimate + * @return + */ + int updateSalesEstimateSave(SalesEstimate salesEstimate); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java index 4f988688..aca5a815 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java @@ -569,4 +569,16 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService salesEstimateDetail.setUpdateBy(ShiroUtils.getLoginName()); salesEstimateDetail.setUpdateTime(new Date()); } + + + + /** + * 通用保存销售估价方法 + * @param salesEstimate + * @return + */ + @Override + public int updateSalesEstimateSave(SalesEstimate salesEstimate) { + return 1; + } } diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/addDetail.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/addDetail.html new file mode 100644 index 00000000..fe7f2495 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/addDetail.html @@ -0,0 +1,405 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+
+ + % +
+
+
+ +
+ +
+ +
+
+ +
+

计算

+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ +
+
+
+
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html index 15eed8d3..900bb687 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html +++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html @@ -64,13 +64,11 @@