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