From dd4995dcd4ddbbab0c9536d6805cd53ca0747e1d Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 9 Aug 2024 09:45:57 +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?=E5=B7=A5=E7=A8=8B=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=E5=B7=A5=E7=A8=8B=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?=E5=B7=A5=E7=A8=8B=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-=E5=B7=A5=E7=A8=8B=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?=E5=B7=A5=E7=A8=8B=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 | 28 ++ .../sales/estimate/engineeringAddDetail.html | 426 ++++++++++++++++++ .../templates/sales/estimate/estimate.html | 15 +- .../templates/sales/estimate/purchaseAdd.html | 2 +- 4 files changed, 469 insertions(+), 2 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAddDetail.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 1dbb8f6d..7ea4eee4 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 @@ -165,6 +165,34 @@ public class SalesEstimateController extends BaseController } + /** + * 新增BOM 销售估价-工程详情 + */ + @GetMapping("/engineeringAddDetail/{salesEstimateId}") + public String engineeringAddDetail(@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 + "/engineeringAddDetail"; + } + + + + /** + * 修改保存BOM 销售估价-工程详情 + */ + @RequiresPermissions("sales:estimate:engineeringAddDetail") + @Log(title = "销售估价", businessType = BusinessType.UPDATE) + @PostMapping("/engineeringAddDetail") + @ResponseBody + public AjaxResult engineeringAddDetailSave(@RequestBody SalesEstimate salesEstimate) + { + return toAjax(salesEstimateService.updateSalesEstimateSave(salesEstimate)); + } + + /** * 新增销售估价 销售估价详情数据集合展示 diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAddDetail.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAddDetail.html new file mode 100644 index 00000000..7ac6d26f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAddDetail.html @@ -0,0 +1,426 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+
+ + % +
+
+
+ +
+ +
+ +
+
+ +
+

计算

+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ +
+
+
+
+
+
+
+
+ + + + + + \ 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 900bb687..afe1f3f7 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html +++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html @@ -69,6 +69,9 @@ var purchaseAddFlag = [[${@permission.hasPermi('sales:estimate:purchaseAdd')}]]; var ceoAddFlag = [[${@permission.hasPermi('sales:estimate:ceoAdd')}]]; var addDetailFlag = [[${@permission.hasPermi('sales:estimate:addDetail')}]]; + var engineeringAddDetailFlag = [[${@permission.hasPermi('sales:estimate:engineeringAddDetail')}]]; + + var estimateStatusDatas = [[${@dict.getType('estimate_status')}]]; var commonCurrencyDatas = [[${@dict.getType('sys_common_currency')}]]; @@ -170,6 +173,9 @@ if (row.estimateStatus != '1' && row.estimateStatus != '2' && row.estimateStatus != '3') { actions.push('详情 '); } + if (row.estimateStatus != '0' && row.estimateStatus != '2' && row.estimateStatus != '3') { + actions.push('详情 '); + } if(row.estimateStatus == '0'){ actions.push('添加BOM '); } @@ -196,7 +202,7 @@ //业务添加 详情 function addDetail(salesEstimateId){ var url = prefix + "/addDetail/" + salesEstimateId; - $.modal.open("添加详情", url); + $.modal.open("详情", url); } @@ -206,6 +212,13 @@ $.modal.open("添加BOM", url); } + //工程 添加BOM详情 + function engineeringAddDetail(salesEstimateId){ + var url = prefix + "/engineeringAddDetail/" + salesEstimateId; + $.modal.open("详情", url); + } + + //采购 添加采购成本 function purchaseAdd(salesEstimateId){ var url = prefix + "/purchaseAdd/" + salesEstimateId; diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAdd.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAdd.html index c30a1668..8f574887 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAdd.html +++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAdd.html @@ -1,7 +1,7 @@ - +