修改用车审批

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

@@ -1,7 +1,6 @@
 package com.ruoyi.web.controller.oa;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -164,13 +163,15 @@ public class CmcCarApprovalController extends BaseController
         if (formDataJson.getString("dispatchComment") != null) {
             cmcCarApproval.setDispatcher(getLoginUser().getUserId());
             cmcCarApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
-            cmcCarApproval.setCars(formDataJson.getString("cars"));
-            cmcCarApproval.setDrivers(formDataJson.getString("drivers"));
-            String[] cars = formDataJson.getString("cars").split(",");
+            String carString = formDataJson.getString("cars").substring(1, formDataJson.getString("cars").length() - 1);
+            cmcCarApproval.setCars(carString);
+            cmcCarApproval.setDrivers(formDataJson.getString("drivers").substring(1, formDataJson.getString("drivers").length() - 1));
+            String[] cars = carString.split(",");
             BigDecimal estimateCost = new BigDecimal(0);
             for (String car : cars) {
                 CmcCar cmcCar = cmcCarService.selectCmcCarByCarId(Integer.parseInt(car));
-                estimateCost = estimateCost.add(cmcCar.getDayCost().multiply(new BigDecimal(cmcCarApproval.getDays())));
+                if (cmcCar.getDayCost() != null)
+                    estimateCost = estimateCost.add(cmcCar.getDayCost().multiply(new BigDecimal(cmcCarApproval.getDays())));
             }
             cmcCarApproval.setEstimateCost(estimateCost);
         }

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

@@ -159,11 +159,14 @@ public class CmcDeviceApprovalController extends BaseController
         if (formDataJson.getString("dispatchComment") != null) {
             cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());
             cmcDeviceApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
-            String[] devices = formDataJson.getString("devices").split(",");
+            String deviceString = formDataJson.getString("devices").substring(1, formDataJson.getString("devices").length() - 1);
+            cmcDeviceApproval.setDevices(deviceString);
+            String[] devices = deviceString.split(",");
             BigDecimal estimateCost = new BigDecimal(0);
             for (String device : devices) {
                 CmcDevice cmcDevice = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(device));
-                estimateCost = estimateCost.add(cmcDevice.getDayCost().multiply(new BigDecimal(cmcDeviceApproval.getDays())));
+                if (cmcDevice.getDayCost() != null)
+                    estimateCost = estimateCost.add(cmcDevice.getDayCost().multiply(new BigDecimal(cmcDeviceApproval.getDays())));
             }
             cmcDeviceApproval.setEstimateCost(estimateCost);
         }

oa-ui/src/views/flowable/form/carForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-08 16:14:41
+ * @LastEditTime: 2024-03-08 17:45:54
 -->
 <!--
  * @Author: wrh
@@ -40,22 +40,21 @@
         </el-row>
         <el-form-item label="项目编号：" prop="projectNumber">
           <el-select v-model="form.projectNumber" filterable placeholder="请选择" @change="handleSelectProject" clearable>
-            <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber"
-              :value="item.projectId">
+            <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber" :value="item.projectId">
             </el-option>
           </el-select>
           <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
             <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-              }}</el-descriptions-item>
+            }}</el-descriptions-item>
             <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-              }}</el-descriptions-item>
+            }}</el-descriptions-item>
             <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeader
-              }}</el-descriptions-item>
+            }}</el-descriptions-item>
             <el-descriptions-item label="承担部门" label-class-name="my-label">
               <el-tag size="small">{{ chooseProject.undertakingDept }}</el-tag>
             </el-descriptions-item>
             <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-              }}</el-descriptions-item>
+            }}</el-descriptions-item>
           </el-descriptions>
         </el-form-item>
         <el-form-item label="乘车人数：" prop="passengers">
@@ -88,23 +87,30 @@
         </el-row>
         <el-divider></el-divider>
         <!-- 部门审核意见 -->
-        <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="taskName == '部门审核' || taskName == '分管审核' || taskName == '安排用车'">
+        <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px"
+          v-if="taskName == '部门审核' || taskName == '分管审核' || taskName == '安排用车' || taskName == '申请确认'">
           <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment">
           </el-input>
         </el-form-item>
         <!-- 分管审核意见 -->
-        <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px" v-if="taskName == '分管审核' || taskName == '安排用车'">
+        <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px"
+          v-if="taskName == '分管审核' || taskName == '安排用车' || taskName == '申请确认'">
           <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment">
           </el-input>
         </el-form-item>
+        <!-- 分管审核意见 -->
+        <el-form-item label="安排用车意见：" prop="dispatchComment" label-width="120px"
+          v-if="taskName == '安排用车' || taskName == '申请确认'">
+          <el-input type="textarea" :rows="2" placeholder="请输入安排用车意见" v-model="form.dispatchComment">
+          </el-input>
+        </el-form-item>
         <!-- 综合事务部管理人员填写 -->
-        <el-form-item label="车牌号：" v-if="taskName == '安排用车'">
-          <el-select v-model="form.licensePlate" filterable multiple placeholder="请选择" clearable>
-            <el-option v-for="item in carList" :key="item.id" :label="item.licensePlate" :value="item.id">
-            </el-option>
-          </el-select>
+        <el-form-item label="车牌号：" v-if="taskName == '安排用车' || taskName == '申请确认'">
+          <el-checkbox-group v-model="form.cars">
+            <el-checkbox :label="item.carId" v-for="item in carList">{{ item.licensePlate }}</el-checkbox>
+          </el-checkbox-group>
         </el-form-item>
-        <el-form-item label="驾驶员：" v-if="taskName == '安排用车'">
+        <el-form-item label="驾驶员：" v-if="taskName == '安排用车' || taskName == '申请确认'">
           <!-- <el-select v-model="form.drivers" filterable multiple placeholder="请选择" clearable>
             <el-option v-for="item in driverList" :key="item.userId" :label="item.nickName" :value="item.userId">
             </el-option>
@@ -118,7 +124,7 @@
         <el-button type="primary" @click="submit">提交申请</el-button>
       </el-row>
       <el-row style="text-align: center;" v-else>
-        <el-button type="primary" @click="completeApply">完成审批</el-button>
+        <el-button type="primary" @click="completeApply">{{ taskName == '申请确认' ? "确认" : "完成审批" }}</el-button>
       </el-row>
     </div>
   </div>
@@ -201,13 +207,17 @@ export default {
         }
         else {
           this.formTotal = 1;
-          console.log(res);
           let data = res.data;
-          if (res.data.drivers == null || res.rows.drivers == undefined || res.rows.drivers == "") {
+          if (res.data.drivers == null || res.data.drivers == undefined || res.data.drivers == "") {
             data.drivers = []
           } else {
             data.drivers = data.drivers.split(',');
           }
+          if (res.data.cars == null || res.data.cars == undefined || res.data.cars == "") {
+            data.cars = []
+          } else {
+            data.cars = data.cars.split(',');
+          }
           this.form = data;
         }
       })
@@ -270,12 +280,22 @@ export default {
             this.$emit('goBack')
           });
         })
-      }else if(this.taskName == '分管审核') {
+      } else if (this.taskName == '分管审核') {
         this.$set(this.taskForm.variables, "approval", 16);
-          complete(this.taskForm).then(response => {
-            this.$modal.msgSuccess(response.msg);
-            this.$emit('goBack')
-          });
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.$emit('goBack')
+        });
+      } else if (this.taskName == '安排用车') {
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.$emit('goBack')
+        });
+      } else if (this.taskName == '申请确认') {
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.$emit('goBack')
+        });
       }
 
     },