From 3368e81d21fcfb859d00abfc87fa6dbf158ec795 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 9 Aug 2024 10:15:16 +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?=E6=80=BB=E7=BB=8F=E7=90=86=E6=B7=BB=E5=8A=A0=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=80=BB=E7=BB=8F=E7=90=86=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8C=89=E9=92=AE=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=89=93=E5=BC=80=E6=80=BB=E7=BB=8F=E7=90=86=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AF=A6=E6=83=85js=E6=96=B9=E6=B3=95=20=E9=94=80=E5=94=AE?= =?UTF-8?q?=E4=BC=B0=E4=BB=B7Controller=E5=B1=82=EF=BC=9A=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7-=E6=80=BB?= =?UTF-8?q?=E7=BB=8F=E7=90=86=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=E4=BF=9D=E5=AD=98=E9=94=80?= =?UTF-8?q?=E5=94=AE=E4=BC=B0=E4=BB=B7-=E6=80=BB=E7=BB=8F=E7=90=86?= =?UTF-8?q?=E8=AF=A6=E6=83=85=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 | 28 + .../sales/estimate/ceoAddDetail.html | 647 ++++++++++++++++++ .../templates/sales/estimate/estimate.html | 11 +- 3 files changed, 685 insertions(+), 1 deletion(-) create mode 100644 ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAddDetail.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 9b0e3083..9f647641 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 @@ -330,6 +330,34 @@ public class SalesEstimateController extends BaseController return toAjax(salesEstimateService.ceoAddSalesEstimate(salesEstimate)); } + /** + * 新增经营成本 销售估价-总经理详情 + */ + @GetMapping("/ceoAddDetail/{salesEstimateId}") + public String ceoAddDetail(@PathVariable("salesEstimateId") Long salesEstimateId, ModelMap map) + { + SalesEstimate salesEstimate = salesEstimateService.selectSalesEstimateById(salesEstimateId); + map.put("salesEstimate", salesEstimate); + SalesEstimateDetailVo salesEstimateDetailVo = salesEstimateService.getSalesEstimateDetailVo(); + map.put("salesEstimateDetailVo",salesEstimateDetailVo); + return prefix + "/ceoAddDetail"; + } + + + + /** + * 修改保存销售估价-总经理详情 + */ + @RequiresPermissions("sales:estimate:ceoAddDetail") + @Log(title = "销售估价", businessType = BusinessType.UPDATE) + @PostMapping("/ceoAddDetail") + @ResponseBody + public AjaxResult ceoAddDetailSave(SalesEstimate salesEstimate) + { + return toAjax(salesEstimateService.updateSalesEstimateSave(salesEstimate)); + } + + /** * 加载新增销售估价 物料选择弹窗 diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAddDetail.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAddDetail.html new file mode 100644 index 00000000..7f5b5c61 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAddDetail.html @@ -0,0 +1,647 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+
+ + % +
+
+
+ +
+ +
+ +
+
+ +
+

计算

+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ +
+
+
+
+
+
+
+
+ + + + + + \ 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 42c9f74d..2f638a32 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html +++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html @@ -71,7 +71,7 @@ var addDetailFlag = [[${@permission.hasPermi('sales:estimate:addDetail')}]]; var engineeringAddDetailFlag = [[${@permission.hasPermi('sales:estimate:engineeringAddDetail')}]]; var purchaseAddDetailFlag = [[${@permission.hasPermi('sales:estimate:purchaseAddDetail')}]]; - + var ceoAddDetailFlag = [[${@permission.hasPermi('sales:estimate:ceoAddDetail')}]]; var estimateStatusDatas = [[${@dict.getType('estimate_status')}]]; var commonCurrencyDatas = [[${@dict.getType('sys_common_currency')}]]; @@ -180,6 +180,9 @@ actions.push('详情 '); } + if (row.estimateStatus != '0' && row.estimateStatus != '1' && row.estimateStatus != '2') { + actions.push('详情 '); + } if(row.estimateStatus == '0'){ actions.push('添加BOM '); } @@ -241,6 +244,12 @@ $.modal.open("经营成本", url); } + //总经理 添加成本 + function ceoAddDetail(salesEstimateId){ + var url = prefix + "/ceoAddDetail/" + salesEstimateId; + $.modal.open("详情", url); + } + \ No newline at end of file