修改用车申请

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 17:45:54
+ * @LastEditTime: 2024-03-11 09:39:48
 -->
 <!--
  * @Author: wrh
@@ -107,7 +107,7 @@
         <!-- 综合事务部管理人员填写 -->
         <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 :label="item.carId" v-for="item in carList" :key="item.carId" :value="item.carId">{{ item.licensePlate }}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <el-form-item label="驾驶员：" v-if="taskName == '安排用车' || taskName == '申请确认'">
@@ -116,7 +116,7 @@
             </el-option>
           </el-select> -->
           <el-checkbox-group v-model="form.drivers">
-            <el-checkbox :label="item.userId" v-for="item in driverList">{{ item.nickName }}</el-checkbox>
+            <el-checkbox :label="item.userId" v-for="item in driverList" :key="item.userId" :value="item.userId">{{ item.nickName }}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
       </el-form>
@@ -165,6 +165,7 @@ export default {
         applyDate: undefined,
         deptName: '',
         applier: '',
+        cars:[]
       },
       rules: {
         projectNumber: [
@@ -211,14 +212,26 @@ export default {
           if (res.data.drivers == null || res.data.drivers == undefined || res.data.drivers == "") {
             data.drivers = []
           } else {
+            let arr = []
             data.drivers = data.drivers.split(',');
+            for(let driver of data.drivers){
+              arr.push(parseInt(driver))
+            }
+            data.drivers = arr
           }
           if (res.data.cars == null || res.data.cars == undefined || res.data.cars == "") {
             data.cars = []
           } else {
             data.cars = data.cars.split(',');
+            let arr = []
+            for(let d of data.cars){
+              arr.push(parseInt(d))
+            }
+            data.cars = arr;
           }
           this.form = data;
+          console.log(this.form);
+          console.log(this.driverList);
         }
       })
     },
@@ -261,7 +274,6 @@ export default {
     },
     // 获取下一个审批人
     getNextFlowNodeApproval() {
-      debugger
       if (this.taskName == '用车申请') {
         getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
           let userId = res.data.userId;

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

@@ -2,29 +2,31 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-07 14:26:46
+ * @LastEditTime: 2024-03-08 17:15:18
 -->
 
 <template>
   <div>
     <h2 style="text-align: center;">设备申请表</h2>
     <div>
-      <el-form :model="form" label-width="100px">
+      <el-form ref="deviceForm" :model="form" label-width="100px" :rules="rules">
         <!-- 申请人填写 -->
         <el-row :gutter="20">
           <el-col :span="6" :xs="24">
             <el-form-item label="申请人：" prop="user">
-              <el-input v-model="form.user"></el-input>
+              <!-- <el-input v-model="form.user"></el-input> -->
+              {{ form.user }}
             </el-form-item>
           </el-col>
           <el-col :span="6" :xs="24">
             <el-form-item label="所在部门：" prop="deptName">
-              <el-input v-model="form.deptName"></el-input>
+              <!-- <el-input v-model="form.deptName"></el-input> -->
+              {{ form.deptName }}
             </el-form-item>
           </el-col>
           <el-col :span="6" :xs="24">
-            <el-form-item label="申请时间：" prop="date">
-              <el-date-picker style="width:140px;" v-model="form.date" value-format="yyyy-MM-dd" type="date"
+            <el-form-item label="申请时间：" prop="applyDate">
+              <el-date-picker style="width:140px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
                 placeholder="选择日期">
               </el-date-picker>
             </el-form-item>
@@ -57,14 +59,14 @@
         </el-form-item>
         <el-row>
           <el-col :span="6" :xs="24">
-            <el-form-item label="开始日期：">
+            <el-form-item label="开始日期：" prop="beginDate">
               <el-date-picker style="width:140px;" v-model="form.beginDate" value-format="yyyy-MM-dd" type="date"
                 placeholder="选择日期" @change="calculateDay">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6" :xs="24">
-            <el-form-item label="结束日期：">
+            <el-form-item label="结束日期：" prop="endDate">
               <el-date-picker style="width:140px;" v-model="form.endDate" value-format="yyyy-MM-dd" type="date"
                 placeholder="选择日期" @change="calculateDay">
               </el-date-picker>
@@ -79,12 +81,14 @@
         <el-divider></el-divider>
 
         <!-- 部门审核意见 -->
-        <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="taskName == '部门审核'">
+        <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px"
+          v-if="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 == '分管审核'">
+        <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px"
+          v-if="taskName == '分管审核' || taskName == '安排设备'">
           <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment">
           </el-input>
         </el-form-item>
@@ -98,6 +102,11 @@
 
 <script>
 import { listProject, getProject } from "@/api/oa/project/project";
+import { listDevice, getDevice } from "@/api/oa/device/device";
+import { listDeviceApproval, getDeviceApproval, updateDeviceApproval, submitDeviceApproval, modifyDeviceApproval } from '@/api/oa/device/deviceApproval'
+import {
+  complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm,
+} from "@/api/flowable/todo";
 export default {
   props: {
     taskName: {
@@ -117,17 +126,53 @@ export default {
   data() {
     return {
       form: {
-        date: new Date(),
+        applyDate: new Date(),
         days: ""
       },
       projectList: [],
       chooseProject: {},
-      isSelect: false
+      isSelect: false,
+      rules: {
+        projectNumber: [
+          { required: true, message: '请选择项目编号', trigger: 'change' },
+        ],
+        passengers: [
+          { required: true, message: '请选择输入乘车人数', trigger: 'change' },
+        ],
+        beginDate: [
+          { required: true, message: '请选择开始日期', trigger: 'change' },
+        ],
+        endDate: [
+          { required: true, message: '请选择结束日期', trigger: 'change' },
+        ],
+        applyReason: [
+          { required: true, message: '请输入用车理由', trigger: 'blur' },
+        ],
+      },
     }
   },
   methods: {
     submit() {
-
+      this.$refs['deviceForm'].validate((valid) => {
+        if (valid) {
+          this.form.formId = this.taskForm.formId;
+          let formData = new FormData();
+          let jsonForm = JSON.stringify(this.form);
+          formData.append("form", jsonForm);
+          const params = { taskId: this.taskForm.taskId };
+          if (this.formTotal != 0) {
+            modifyDeviceApproval(formData);
+          } else {
+            submitDeviceApproval(formData);
+          }
+          // 获取下一个流程节点
+          getNextFlowNode(params).then(res => {
+            const data = res.data;
+            this.taskForm.formData = formData;
+            this.getNextFlowNodeApproval();
+          })
+        }
+      })
     },
     // 查询项目列表
     getProjectList() {
@@ -165,7 +210,14 @@ export default {
       } else {
         this.form.days = '';
       }
-
+    },
+    isEmptyObject(obj) {
+      for (var key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          return false;
+        }
+      }
+      return true;
     }
   },
 }

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -542,7 +542,7 @@ export default {
     },
     // 是否显示审批通过
     isShowApprove() {
-      if (this.taskName == '员工填报' || this.taskForm.procDefName == '用车审批' || tthis.taskForm.procDefName == '设备审批') {
+      if (this.taskName == '员工填报' || this.taskForm.procDefName == '用车审批' || this.taskForm.procDefName == '设备审批') {
         return false
       } else {
         return true