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 @@