[fix] 销售管理

修改销售估价-业务详情页面：新增定义salesEstimate全局变量；去掉物料数量编辑
修改销售估价-工程详情页面：去掉不含税单价个含税单价
修改销售估价-工程详情页面：运输、服务、开发成本都加上只读关键字
修改新增销售估价-业务详情加载页面后端接口，新增查询销售估价实体类

ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesEstimateController.java

@@ -118,14 +118,15 @@ public class SalesEstimateController extends BaseController
     /**
      * 新增销售估价-业务详情
      */
-    @GetMapping("/addDetail")
-    public String addDetail(ModelMap map)
+    @GetMapping("/addDetail/{salesEstimateId}")
+    public String addDetail(@PathVariable("salesEstimateId") Long salesEstimateId,ModelMap map)
     {
-        SalesEstimateDetailVo salesEstimateDetailVo = salesEstimateService.getSalesEstimateDetailVo();
-        map.put("salesEstimateDetailVo",salesEstimateDetailVo);
+        SalesEstimate salesEstimate = salesEstimateService.selectSalesEstimateById(salesEstimateId);
+        map.put("salesEstimate", salesEstimate);
         return prefix + "/addDetail";
     }
 
+
     /**
      * 新增保存销售估价-业务详情
      */
@@ -133,7 +134,7 @@ public class SalesEstimateController extends BaseController
     @Log(title = "销售估价", businessType = BusinessType.INSERT)
     @PostMapping("/addDetail")
     @ResponseBody
-    public AjaxResult addDetailSave(@RequestBody SalesEstimate salesEstimate)
+    public AjaxResult addDetailSave(SalesEstimate salesEstimate)
     {
         return toAjax(salesEstimateService.updateSalesEstimateSave(salesEstimate));
     }
@@ -187,7 +188,7 @@ public class SalesEstimateController extends BaseController
     @Log(title = "销售估价", businessType = BusinessType.UPDATE)
     @PostMapping("/engineeringAddDetail")
     @ResponseBody
-    public AjaxResult engineeringAddDetailSave(@RequestBody SalesEstimate salesEstimate)
+    public AjaxResult engineeringAddDetailSave(SalesEstimate salesEstimate)
     {
         return toAjax(salesEstimateService.updateSalesEstimateSave(salesEstimate));
     }
@@ -297,9 +298,9 @@ public class SalesEstimateController extends BaseController
     @Log(title = "销售估价", businessType = BusinessType.UPDATE)
     @PostMapping("/purchaseAddDetail")
     @ResponseBody
-    public AjaxResult purchaseAddDetailSave(@RequestBody SalesEstimate salesEstimate)
+    public AjaxResult purchaseAddDetailSave(SalesEstimate salesEstimate)
     {
-        return toAjax(salesEstimateService.purchaseAddSalesEstimate(salesEstimate));
+        return toAjax(salesEstimateService.updateSalesEstimateSave(salesEstimate));
     }
 
 

ruoyi-admin/src/main/resources/templates/sales/estimate/addDetail.html

@@ -103,7 +103,7 @@
   var materialGearPositionDatas = [[${@dict.getType('material_gear_position')}]];
   var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
   var processMethodDatas = [[${@dict.getType('processMethod')}]];
-
+  var salesEstimate = [[${salesEstimate}]];
   var loginName = [[${@permission.getPrincipalProperty('loginName')}]];
 
 
@@ -191,8 +191,7 @@
         },
         {
           title: '物料数量',
-          field: 'materialNum',
-          editable: true,
+          field: 'materialNum'
         },
         {
           title: '不含税单价',

ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAddDetail.html

@@ -303,14 +303,6 @@
         {
           title: '用量',
           field: 'useNum',
-        },
-        {
-          title: '不含税采购单价(RMB)',
-          field: 'noTaxPurchaseRmb',
-        },
-        {
-          title: '含税采购单价(RMB)',
-          field: 'taxPurchaseRmb',
         }
       ],
 
@@ -342,15 +334,15 @@
         formHtml += '<h3>运输、服务、开发成本</h3>';
         formHtml += '<div class="form-group">';
         formHtml += '<label for="noTaxDevelopCosts' + index + '">不含税开发成本(RMB):</label>';
-        formHtml += '<input type="text" class="form-control" id="noTaxDevelopCosts' + index + '" name="noTaxDevelopCosts' + index + '" value="' + costs.noTaxDevelopCosts + '">';
+        formHtml += '<input type="text" class="form-control" id="noTaxDevelopCosts' + index + '" name="noTaxDevelopCosts' + index + '" value="' + costs.noTaxDevelopCosts + '" readonly>';
         formHtml += '</div>';
         formHtml += '<div class="form-group">';
         formHtml += '<label for="noTaxShippingCosts' + index + '">不含税运输成本(RMB):</label>';
-        formHtml += '<input type="text" class="form-control" id="noTaxShippingCosts' + index + '" name="noTaxShippingCosts' + index + '" value="' + costs.noTaxShippingCosts + '">';
+        formHtml += '<input type="text" class="form-control" id="noTaxShippingCosts' + index + '" name="noTaxShippingCosts' + index + '" value="' + costs.noTaxShippingCosts + '" readonly>';
         formHtml += '</div>';
         formHtml += '<div class="form-group">';
         formHtml += '<label for="noTaxServiceCosts' + index + '">不含税服务成本(RMB):</label>';
-        formHtml += '<input type="text" class="form-control" id="noTaxServiceCosts' + index + '" name="noTaxServiceCosts' + index + '" value="' + costs.noTaxServiceCosts + '">';
+        formHtml += '<input type="text" class="form-control" id="noTaxServiceCosts' + index + '" name="noTaxServiceCosts' + index + '" value="' + costs.noTaxServiceCosts + '" readonly>';
         formHtml += '</div>';
         formHtml += '</form>';
 

ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAddDetail.html

@@ -342,15 +342,15 @@
         formHtml += '<h3>运输、服务、开发成本</h3>';
         formHtml += '<div class="form-group">';
         formHtml += '<label for="noTaxDevelopCosts' + index + '">不含税开发成本(RMB):</label>';
-        formHtml += '<input type="text" class="form-control" id="noTaxDevelopCosts' + index + '" name="noTaxDevelopCosts' + index + '" value="' + costs.noTaxDevelopCosts + '">';
+        formHtml += '<input type="text" class="form-control" id="noTaxDevelopCosts' + index + '" name="noTaxDevelopCosts' + index + '" value="' + costs.noTaxDevelopCosts + '" readonly>';
         formHtml += '</div>';
         formHtml += '<div class="form-group">';
         formHtml += '<label for="noTaxShippingCosts' + index + '">不含税运输成本(RMB):</label>';
-        formHtml += '<input type="text" class="form-control" id="noTaxShippingCosts' + index + '" name="noTaxShippingCosts' + index + '" value="' + costs.noTaxShippingCosts + '">';
+        formHtml += '<input type="text" class="form-control" id="noTaxShippingCosts' + index + '" name="noTaxShippingCosts' + index + '" value="' + costs.noTaxShippingCosts + '" readonly>';
         formHtml += '</div>';
         formHtml += '<div class="form-group">';
         formHtml += '<label for="noTaxServiceCosts' + index + '">不含税服务成本(RMB):</label>';
-        formHtml += '<input type="text" class="form-control" id="noTaxServiceCosts' + index + '" name="noTaxServiceCosts' + index + '" value="' + costs.noTaxServiceCosts + '">';
+        formHtml += '<input type="text" class="form-control" id="noTaxServiceCosts' + index + '" name="noTaxServiceCosts' + index + '" value="' + costs.noTaxServiceCosts + '" readonly>';
         formHtml += '</div>';
         formHtml += '</form>';