按采购申请id删除采购计划

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProcurePlanController.java

@@ -89,9 +89,9 @@ public class CmcProcurePlanController extends BaseController
      * 删除采购计划
      */
     @Log(title = "采购计划", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{procurePlanIds}")
-    public AjaxResult remove(@PathVariable Integer[] procurePlanIds)
+	@DeleteMapping("/{procureApplyId}")
+    public AjaxResult remove(@PathVariable String[] procureApplyId)
     {
-        return toAjax(cmcProcurePlanService.deleteCmcProcurePlanByProcurePlanIds(procurePlanIds));
+        return toAjax(cmcProcurePlanService.deleteCmcProcurePlanByProcureApplyIds(procureApplyId));
     }
 }

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -1656,7 +1656,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
         if (flowTaskDto.getProcDefName().equals("采购审批")) {
             CmcProcureApproval cmcProcureApproval = cmcProcureApprovalService.selectCmcProcureApprovalByProcureApplyId(formId);
-            flowTaskDto.setTitle(cmcProcureApproval.getApplyReason());
+            if (cmcProcureApproval != null)
+                flowTaskDto.setTitle(cmcProcureApproval.getApplyReason());
         }
         if (flowTaskDto.getProcDefName().equals("项目委外")) {
             CmcOutsource cmcOutsource = cmcOutsourceService.selectCmcOutsourceByOutsoureId(formId);

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProcureApproval.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 采购审批对象 cmc_buy_approval
+ * 采购审批对象 cmc_procure_approval
  * 
  * @author cmc
  * @date 2024-09-18
@@ -18,7 +18,7 @@ public class CmcProcureApproval extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 采购申请id */
-    private String buyApplyId;
+    private String procureApplyId;
 
     /** 购置说明 */
     @Excel(name = "购置说明")
@@ -78,12 +78,12 @@ public class CmcProcureApproval extends BaseEntity
 
     public void setProcureApplyId(String procureApplyId) 
     {
-        this.buyApplyId = buyApplyId;
+        this.procureApplyId = procureApplyId;
     }
 
     public String getProcureApplyId() 
     {
-        return buyApplyId;
+        return procureApplyId;
     }
     public void setApplyReason(String applyReason) 
     {
@@ -206,7 +206,7 @@ public class CmcProcureApproval extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("buyApplyId", getProcureApplyId())
+            .append("procureApplyId", getProcureApplyId())
             .append("applyReason", getApplyReason())
             .append("applier", getApplier())
             .append("applyDept", getApplyDept())

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProcurePlanMapper.java

@@ -54,8 +54,8 @@ public interface CmcProcurePlanMapper
     /**
      * 批量删除采购计划
      * 
-     * @param procurePlanIds 需要删除的数据主键集合
+     * @param procureApplyId 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcProcurePlanByProcurePlanIds(Integer[] procurePlanIds);
+    public int deleteCmcProcurePlanByProcureApplyIds(String[] procureApplyId);
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProcurePlanService.java

@@ -46,10 +46,10 @@ public interface ICmcProcurePlanService
     /**
      * 批量删除采购计划
      * 
-     * @param procurePlanIds 需要删除的采购计划主键集合
+     * @param procureApplyId 需要删除的采购计划主键集合
      * @return 结果
      */
-    public int deleteCmcProcurePlanByProcurePlanIds(Integer[] procurePlanIds);
+    public int deleteCmcProcurePlanByProcureApplyIds(String[] procureApplyId);
 
     /**
      * 删除采购计划信息

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProcurePlanServiceImpl.java

@@ -70,13 +70,13 @@ public class CmcProcurePlanServiceImpl implements ICmcProcurePlanService
     /**
      * 批量删除采购计划
      * 
-     * @param procurePlanIds 需要删除的采购计划主键
+     * @param procureApplyId 需要删除的采购计划主键
      * @return 结果
      */
     @Override
-    public int deleteCmcProcurePlanByProcurePlanIds(Integer[] procurePlanIds)
+    public int deleteCmcProcurePlanByProcureApplyIds(String[] procureApplyId)
     {
-        return cmcProcurePlanMapper.deleteCmcProcurePlanByProcurePlanIds(procurePlanIds);
+        return cmcProcurePlanMapper.deleteCmcProcurePlanByProcureApplyIds(procureApplyId);
     }
 
     /**

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetCarMapper.xml

@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBudgetCarVo">
-        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, c.driver, c.brand, u.nick_name, c.day_cost, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.toll,, bc.expense, bc.remark from cmc_budget_car as bc
+        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, c.driver, c.brand, u.nick_name, c.day_cost, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.toll, bc.expense, bc.remark from cmc_budget_car as bc
         left join cmc_car as c on c.car_id = bc.car_id
         left join sys_user as u on c.driver = u.user_id
     </sql>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProcurePlanMapper.xml

@@ -91,10 +91,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from cmc_procure_plan where procure_plan_id = #{procurePlanId}
     </delete>
 
-    <delete id="deleteCmcProcurePlanByProcurePlanIds" parameterType="String">
-        delete from cmc_procure_plan where procure_plan_id in 
-        <foreach item="procurePlanId" collection="array" open="(" separator="," close=")">
-            #{procurePlanId}
+    <delete id="deleteCmcProcurePlanByProcureApplyIds" parameterType="String">
+        delete from cmc_procure_plan where procure_apply_id in
+        <foreach item="procureApplyId" collection="array" open="(" separator="," close=")">
+            #{procureApplyId}
         </foreach>
     </delete>
 </mapper>

oa-ui/src/assets/icons/svg/pay.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1726735850919" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1920" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M841.984 768V182.016a96.128 96.128 0 0 0-96.768-96.64H153.6a92.736 92.736 0 0 0-96.704 96.64V256h153.6v585.984a93.888 93.888 0 0 0 85.312 96.64H870.4a96.128 96.128 0 0 0 96.704-96.64V768h-125.12zM210.496 199.104H113.792v-17.088a38.656 38.656 0 0 1 39.808-39.808h22.784c20.096 2.112 35.136 19.584 34.112 39.808v17.088z m170.688 642.88c0 11.328-5.76 28.416-5.76 39.808H307.2a38.656 38.656 0 0 1-39.808-39.808V136.512h483.52a38.656 38.656 0 0 1 39.872 39.872v585.92h-409.6v79.68z m529.024 0a38.656 38.656 0 0 1-39.808 39.808H432.384c5.056-12.608 7.04-26.24 5.632-39.808V819.2h472.192v22.784z m-250.24-523.392l-28.48-28.48-102.4 102.4-102.4-102.4-34.176 28.48 108.16 108.096h-108.16v45.44h113.792v68.288H392.512v45.568h113.792v91.008h45.504V585.984H665.6v-45.568H551.808V472.192H665.6v-45.504H557.504l102.4-108.16z" p-id="1921"></path></svg>

oa-ui/src/views/flowable/form/budget/addBudget.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-01 14:13:16
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-09-19 17:06:19
 -->
 <template>
   <div>
@@ -169,6 +169,7 @@
                   <td style="width: 100px">总里程</td>
                   <td style="width: 110px">折旧成本（天）</td>
                   <td style="width: 110px">预算天数</td>
+                  <td style="width: 110px">过路费</td>
                   <td style="width: 100px">总额</td>
                 </tr>
                 <tr v-for="car in chooseCar" :key="car.carId">
@@ -184,8 +185,11 @@
                   </td>
                   <td>
                     <el-input v-model="car.days" placeholder="请输入天数" @blur="calculateCarTotal(car)"></el-input>
+                  </td>                 
+                  <td>
+                    <el-input v-model="car.toll" placeholder="请输入过路费" @blur="calculateCarTotal(car)"></el-input>
                   </td>
-                  <td class="carCost">{{ car.expense }}</td>
+                  <td class="carCost">{{ car.expense }}</td> 
                 </tr>
                 <tr>
                   <td colspan="5">合计</td>
@@ -720,7 +724,7 @@ export default {
     calculateCarTotal(car) {
       let total1 = Number(car.mileage) * Number(car.distance);
       let total2 = Number(car.dayCost) * Number(car.days);
-      let sum = (total1 + total2).toFixed(2);
+      let sum = (total1 + total2 + Number(car.toll)).toFixed(2);
       this.$set(car, "depreciation", total2.toFixed(2));
       this.$set(car, "expense", sum);
       this.getCost("expense", "carCost", this.chooseCar);