车辆预算新增油耗、保险、维修

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:51
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-23 14:02:18
+ * @LastEditTime: 2025-04-03 16:58:09
 -->
 <template>
   <div class="app-container">
@@ -61,7 +61,7 @@
       <el-button type="primary" @click="submitNextFlow" v-if="taskName != '预算批准'">提交下一个流程</el-button>
       <el-button type="primary" @click="submitNextFlow" v-else>结算批准</el-button>
     </div>
-    <el-dialog title="表单预览" :visible.sync="viewOpen" width="60%" append-to-body>
+    <el-dialog title="表单预览" :visible.sync="viewOpen" width="70%" append-to-body>
       <budget-info :taskName="taskName" :taskForm="taskForm" @goBack="$emit('goBack')"></budget-info>
     </el-dialog>
   </div>
@@ -166,6 +166,7 @@ export default {
       } else {
         this.updateBudgetForm(this.budgetForm)
       }
+      this.$message.success('保存成功');
     },
     viewForm() {
       this.viewOpen = true;

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-30 15:15:58
+ * @LastEditTime: 2025-04-03 16:48:33
 -->
 <template>
   <div class="main">
@@ -72,7 +72,7 @@
               <td style="min-width:50px">单价</td>
               <td style="min-width:50px">单位</td>
               <td style="min-width:50px">系数</td>
-              <td style="min-width:50px">金额</td>
+              <td style="min-width:80px">金额</td>
               <td style="min-width: 150px;">备注</td>
             </tr>
             <tr v-for="work in workList">
@@ -98,12 +98,12 @@
               <td v-else>
                 {{ work.coefficient }}
               </td>
-              <td>{{ work.settle }}</td>
+              <td style="text-align:right;">{{ (work.settle).toFixed(2) }}</td>
               <td>{{ work.remark ? work.remark : '' }}</td>
             </tr>
             <tr>
               <td :colspan="7" class="head">预结算额合计</td>
-              <td :colspan="1" class="head">{{ budgetForm.settleExpense }}</td>
+              <td :colspan="1" class="head" style="text-align:right;">{{ (budgetForm.settleExpense).toFixed(2) }}</td>
               <td></td>
             </tr>
           </table>
@@ -116,10 +116,11 @@
               <td>基本工资</td>
               <td>岗位工资</td>
               <td>人员成本（天）</td>
-              <td>预算天数</td>
               <td></td>
-              <td>金额</td>
-              <td>备注</td>
+              <td></td>
+              <td style="min-width:80px">预算天数</td>
+              <td></td>
+              <td style="min-width:80px">金额</td>
             </tr>
             <tr v-for="user in chooseUser" :key="'user' + user.userId">
               <td>{{ user.user ? user.user.nickName : '' }}</td>
@@ -136,6 +137,8 @@
                 </span>
                 <span v-else>/</span>
               </td>
+              <td></td>
+              <td></td>
               <td v-if="taskName == '分管审核' || taskName == '总经理审核' || taskName == '预算批准'">
                 <el-input-number :controls="false" style="width:100px;" v-model="user.days"
                   @blur="computedFixCostSettle(user, 'user')"></el-input-number>
@@ -144,31 +147,34 @@
                 {{ user.days }}
               </td>
               <td></td>
-              <td>{{ user.staffCost }}</td>
-              <td></td>
+              <td style="text-align:right;">{{ (user.staffCost).toFixed(2) }}</td>
             </tr>
             <tr v-if="carLen != 1" style="background-color:#f8f8f9">
               <td :rowspan="carLen">车辆</td>
               <td>车牌号</td>
               <td>油耗（元/km）</td>
-              <td>总里程</td>
+              <td>保险（元/天）</td>
+              <td>维修（元/天）</td>
               <td>折旧成本（天）</td>
+              <td>总里程</td>
               <td>预算天数</td>
               <td>过路费</td>
               <td>金额</td>
-              <td>备注</td>
             </tr>
             <tr v-for="car in chooseCar" :key="'car' + car.carId">
               <td>{{ car.car ? car.car.licensePlate : '' }}</td>
-              <td>{{ car.mileage }}</td>
+              <td>{{ car.car ? car.car.fuel : '' }}</td>
+              <td>{{ car.car ? car.car.insurance : '' }}</td>
+              <td>{{ car.car ? car.car.maintenance : '' }}</td>
+              <td>{{ car.car ? car.car.dayCost : '' }}</td>
+              <td v-if="taskName != '分管审核' && taskName != '总经理审核'">{{ car.distance }}</td>
               <td v-if="taskName == '分管审核' || taskName == '总经理审核'">
                 <el-input-number :controls="false" style="width:100px;" v-model="car.distance"
                   @blur="computedFixCostSettle(car, 'car')"></el-input-number>
               </td>
-              <td v-else>
+              <!-- <td v-else>
                 {{ car.distance }}
-              </td>
-              <td>{{ car.car ? car.car.dayCost : '' }}</td>
+              </td> -->
               <td v-if="taskName == '分管审核' || taskName == '总经理审核'">
                 <el-input-number :controls="false" style="width:100px;" v-model="car.days"
                   @blur="computedFixCostSettle(car, 'car')"></el-input-number>
@@ -177,7 +183,7 @@
                 {{ car.days }}
               </td>
               <td> {{ car.toll }} </td>
-              <td>{{ car.expense }}</td>
+              <td style="text-align:right;">{{ (car.expense).toFixed(2) }}</td>
             </tr>
             <tr v-if="deviceLen != 1" style="background-color:#f8f8f9">
               <td :rowspan="deviceLen">设备</td>
@@ -185,6 +191,8 @@
               <td>规格型号</td>
               <td>品牌</td>
               <td>折旧成本（天）</td>
+              <td></td>
+              <td></td>
               <td>预算天数</td>
               <td></td>
               <td>金额</td>
@@ -194,6 +202,8 @@
               <td>{{ device.device ? device.device.series : '' }}</td>
               <td>{{ device.device ? device.device.brand : '' }}</td>
               <td>{{ device.device ? device.device.dayCost : '' }}</td>
+              <td></td>
+              <td></td>
               <td v-if="taskName == '分管审核' || taskName == '总经理审核'">
                 <el-input-number :controls="false" style="width:100px;" v-model="device.days"
                   @blur="computedFixCostSettle(device, 'device')"></el-input-number>
@@ -202,13 +212,11 @@
                 {{ device.days }}
               </td>
               <td></td>
-              <td>{{ device.depreciation }}</td>
-              <td></td>
+              <td style="text-align:right;">{{ (device.depreciation).toFixed(2) }}</td>
             </tr>
             <tr>
-              <td :colspan="7" class="head">间接成本合计</td>
-              <td :colspan="1" class="head">{{ budgetForm.fixCost }}</td>
-              <td></td>
+              <td :colspan="9" class="head">间接成本合计</td>
+              <td :colspan="1" class="head" style="text-align:right;">{{ budgetForm.fixCost }}</td>
             </tr>
           </table>
         </el-descriptions-item>
@@ -277,7 +285,7 @@
             {{ budgetForm.totalBudget }}
           </div>
           <div class="text-center">
-            （简写：{{ (budgetForm.totalBudget / 10000).toFixed(4) + '万' }}）
+            <!-- （简写：{{ (budgetForm.totalBudget / 10000).toFixed(4) + '万' }}） -->
           </div>
         </el-descriptions-item>
         <el-descriptions-item label="合同总价约" :span="3" v-if="$store.getters.roles.includes('leader')">
@@ -285,7 +293,7 @@
             {{ contract.contractId ? contract.amount : '' }}
           </div>
           <div class="text-center">
-            （简写：{{ contract.contractId ? (contract.amount / 10000).toFixed(4) + '万' : '' }}）
+            <!-- （简写：{{ contract.contractId ? (contract.amount / 10000).toFixed(4) + '万' : '' }}） -->
           </div>
         </el-descriptions-item>
         <el-descriptions-item label="利润" :span="3" v-if="$store.getters.roles.includes('leader')">
@@ -293,7 +301,7 @@
             {{ profit.toFixed(2) }}
           </div>
           <div class="text-center">
-            （简写：{{ (profit / 10000).toFixed(4) + '万' }}）
+            <!-- （简写：{{ (profit / 10000).toFixed(4) + '万' }}） -->
           </div>
         </el-descriptions-item>
         <el-descriptions-item label="分管审核意见" :span="3">
@@ -594,7 +602,7 @@ export default {
         this.$set(item, 'staffCost', total);
         this.getCost("staffCost", "staffCost", this.chooseUser);
       } else if (type == 'car') {
-        let total1 = (Number(item.mileage) || 0) * (Number(item.distance) || 0);
+        let total1 = (Number(item.fuel) || 0) * (Number(item.distance) || 0);
         let total2 = (Number(item.car.dayCost) || 0) * (Number(item.days) || 0);
         this.$set(item, "depreciation", total2);
         let sum = (total1 + total2).toFixed(2); // sum 是一个字符串  

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

@@ -13,13 +13,15 @@
       <el-form-item  v-if="chooseCar.length != 0">
         <table border="1">
           <tr>
-            <td :colspan="7" class="head">车辆成本预算</td>
+            <td :colspan="9" class="head">车辆成本预算</td>
           </tr>
           <tr>
             <td style="width: 120px">车牌号</td>
             <td style="width: 100px">油耗（元/km）</td>
-            <td style="width: 100px">总里程</td>
+            <td style="width: 100px">保险（元/天）</td>
+            <td style="width: 100px">维修（元/天）</td>
             <td style="width: 110px">折旧成本（天）</td>
+            <td style="width: 100px">总里程</td>
             <td style="width: 110px">预算天数</td>
             <td style="width: 110px">过路费</td>
             <td style="width: 100px">总额</td>
@@ -27,14 +29,20 @@
           <tr v-for="car in chooseCar" :key="car.carId">
             <td>{{ car.licensePlate + car.brand }}</td>
             <td>
-              {{ car.mileage }}
+              {{ car.fuel }}
             </td>
             <td>
-              <el-input v-model="car.distance" placeholder="请输入总里程" @blur="calculateCarTotal(car)"></el-input>
+              {{ car.insurance }}
+            </td>
+            <td>
+              {{ car.maintenance }}
             </td>
             <td>
               {{ car.dayCost }}
             </td>
+            <td>
+              <el-input v-model="car.distance" placeholder="请输入总里程" @blur="calculateCarTotal(car)"></el-input>
+            </td>
             <td>
               <el-input v-model="car.days" placeholder="请输入天数" @blur="calculateCarTotal(car)"></el-input>
             </td>
@@ -44,7 +52,7 @@
             <td class="carCost">{{ car.expense }}</td>
           </tr>
           <tr>
-            <td colspan="6">车辆成本合计</td>
+            <td colspan="8">车辆成本合计</td>
             <td>{{ form.carCost }}</td>
           </tr>
         </table>
@@ -105,6 +113,9 @@ export default {
         listBudgetCar({ pageSize: 100, budgetId:this.budgetId }).then((res) => {
           this.chooseCar = res.rows
           for (let car of this.chooseCar) {
+            car.fuel = car.car.fuel
+            car.insurance = car.car.insurance
+            car.maintenance = car.car.maintenance
             car.licensePlate = car.car.licensePlate
             car.dayCost = car.car.dayCost
             car.brand = car.car.brand
@@ -122,15 +133,12 @@ export default {
     },
     getChooseCar(val) {
       this.chooseCar = val;
-      for (let car of this.chooseCar) {
-        car.mileage = 1.0
-      }
       this.openCar = false;
       this.recalculateCost(val, 'expense', 'carCost');
     },
     calculateCarTotal(car) {
-      let total1 = Number(car.mileage) * Number(car.distance);
-      let total2 = Number(car.dayCost) * Number(car.days);
+      let total1 = Number(car.fuel) * Number(car.distance);
+      let total2 = (Number(car.insurance) + Number(car.maintenance) + Number(car.dayCost) )* Number(car.days);
       let sum = (total1 + total2 + Number(car.toll)).toFixed(2);
       this.$set(car, "depreciation", total2.toFixed(2));
       this.$set(car, "expense", sum);