修改用车审批

oa-ui/src/store/getters.js

@@ -1,8 +1,8 @@
 /*
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: 
- * @LastEditTime: 2024-02-29 14:57:41
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-03-08 09:29:30
  */
 const getters = {
   sidebar: state => state.app.sidebar,
@@ -14,13 +14,14 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
+  userId: state => state.user.id,
   deptName: state => state.user.deptName,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,
   permission_routes: state => state.permission.routes,
-  topbarRouters:state => state.permission.topbarRouters,
-  defaultRoutes:state => state.permission.defaultRoutes,
-  sidebarRouters:state => state.permission.sidebarRouters,
+  topbarRouters: state => state.permission.topbarRouters,
+  defaultRoutes: state => state.permission.defaultRoutes,
+  sidebarRouters: state => state.permission.sidebarRouters,
 }
 export default getters

oa-ui/src/store/modules/user.js

@@ -59,7 +59,6 @@ const user = {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
           const user = res.user
-          console.log(user);
           const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/user.png") : process.env.VUE_APP_BASE_API + user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.roles)

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-07 17:25:40
+ * @LastEditTime: 2024-03-08 15:12:42
 -->
 <!--
  * @Author: wrh
@@ -15,22 +15,24 @@
   <div>
     <h2 style="text-align: center;">用车申请表</h2>
     <div>
-      <el-form :model="form" label-width="100px">
+      <el-form ref="carForm" :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-date-picker style="width:140px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
                 placeholder="选择日期">
               </el-date-picker>
             </el-form-item>
@@ -65,14 +67,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>
@@ -115,13 +117,17 @@
       <el-row style="text-align: center;" v-if="taskName == '用车申请'">
         <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-row>
     </div>
   </div>
 </template>
 
 <script>
 import { listProject, getProject } from "@/api/oa/project/project";
-import { listCar } from "@/api/oa/car/car";
+import { listCar, getCar } from "@/api/oa/car/car";
+import { listCarApproval, getCarApproval, updateCarApproval, submitCarApproval, modifyCarApproval } from '@/api/oa/car/carApproval'
 import { listDriver } from "@/api/system/post";
 import {
   complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm,
@@ -139,8 +145,7 @@ export default {
     }
   },
   created() {
-    this.form.user = this.$store.getters.name;
-    this.form.deptName = this.$store.getters.deptName;
+
     this.getProjectList();
     this.getCarList();
     this.getDriverList();
@@ -148,38 +153,111 @@ export default {
   data() {
     return {
       form: {
-        date: new Date(),
         days: '',
-        drivers: []
+        drivers: [],
+        user: '',
+        applyDate: undefined,
+        deptName: '',
+        applier: '',
+      },
+      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' },
+        ],
       },
       projectList: [],
       carList: [],
       driverList: [],
       chooseProject: {},
       isSelect: false,
+      formTotal: 0
     }
   },
+  mounted() {
+    this.initForm();
+  },
   methods: {
+    // 初始化表单
+    initForm() {
+      getCarApproval(this.taskForm.formId).then(res => {
+        if (this.isEmptyObject(res.data)) {
+          this.formTotal = 0;
+          this.form.user = this.$store.getters.name;
+          this.form.applier = this.$store.getters.userId;
+          this.form.deptName = this.$store.getters.deptName;
+          this.form.applyDate = new Date();
+        }
+        else {
+          this.formTotal = 1;
+          console.log(res);
+          let data = res.data;
+          if (res.data.drivers == null || res.rows.drivers == undefined || res.rows.drivers == "") {
+            data.drivers = []
+          } else {
+            data.drivers = data.drivers.split(',');
+          }
+          this.form = data;
+        }
+      })
+    },
     submit() {
+      this.$refs['carForm'].validate((valid) => {
+        debugger
+        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) {
+            modifyCarApproval(formData);
+          } else {
+            submitCarApproval(formData);
+          }
+          // 获取下一个流程节点
+          getNextFlowNode(params).then(res => {
+            const data = res.data;
+            this.taskForm.formData = formData;
+            this.getNextFlowNodeApproval();
+          })
+        }
+      })
+    },
+    completeApply() {
       let formData = new FormData();
       let jsonForm = JSON.stringify(this.form);
       formData.append("form", jsonForm);
-      const params = { taskId: this.taskForm.taskId }
+      modifyCarApproval(formData);
+      const params = { taskId: this.taskForm.taskId };
       // 获取下一个流程节点
       getNextFlowNode(params).then(res => {
         const data = res.data;
-        debugger
         this.taskForm.formData = formData;
-        complete(this.taskForm).then(response => {
-          this.$modal.msgSuccess(response.msg);
-          this.goBack();
-        });
+        this.getNextFlowNodeApproval();
       })
     },
     // 获取下一个审批人
     getNextFlowNodeApproval() {
-      getUsersDeptLeader()
-      this.$set(this.taskForm.variables, "approval", selectVal.join(','));
+      getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+        let userId = res.data.userId;
+        this.$set(this.taskForm.variables, "approval", userId);
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.$emit('goBack')
+        });
+      })
     },
     // 查询项目列表
     getProjectList() {
@@ -228,6 +306,7 @@ export default {
         let y2 = new Date(this.form.endDate);
         if (y2 < y1) {
           this.form.days = '';
+          this.$message.error('开始时期和结束日期选择错误');
           return
         }
         let sub = Math.abs(y2 - y1);
@@ -237,6 +316,14 @@ export default {
         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

@@ -22,8 +22,9 @@
             v-else-if="taskForm.procDefName == '财务部考核'"></cw-table>
           <zh-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
             v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>
-          <car-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '用车审批'"></car-form>
-          <device-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '设备审批'"></device-form>
+          <car-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '用车审批'" @goBack="goBack"></car-form>
+          <device-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '设备审批'"
+            @goBack="goBack"></device-form>
           <el-row type="flex" justify="center" v-show="isShowApprove()">
             <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
               @click="handleComplete">审核通过
@@ -49,22 +50,27 @@
                         <el-tag type="info" size="mini">{{ item.deptName }}</el-tag>
                       </el-descriptions-item>
                       <el-descriptions-item v-if="item.candidate" label-class-name="my-label">
+
                         <template slot="label"><i class="el-icon-user"></i>候选办理</template>
                         {{ item.candidate }}
                       </el-descriptions-item>
                       <el-descriptions-item label-class-name="my-label">
+
                         <template slot="label"><i class="el-icon-date"></i>接收时间</template>
                         {{ item.createTime }}
                       </el-descriptions-item>
                       <el-descriptions-item v-if="item.finishTime" label-class-name="my-label">
+
                         <template slot="label"><i class="el-icon-date"></i>处理时间</template>
                         {{ item.finishTime }}
                       </el-descriptions-item>
                       <el-descriptions-item v-if="item.duration" label-class-name="my-label">
+
                         <template slot="label"><i class="el-icon-time"></i>耗时</template>
                         {{ item.duration }}
                       </el-descriptions-item>
                       <el-descriptions-item v-if="item.comment" label-class-name="my-label">
+
                         <template slot="label"><i class="el-icon-tickets"></i>处理意见</template>
                         {{ item.comment }}
                       </el-descriptions-item>
@@ -535,16 +541,17 @@ export default {
       })
     },
     // 是否显示审批通过
-    isShowApprove(){
-      if(this.taskName == '员工填报' || this.taskName == '用车申请' || this.taskName == '设备申请'){
+    isShowApprove() {
+      if (this.taskName == '员工填报' || this.taskForm.procDefName == '用车审批' || tthis.taskForm.procDefName == '设备审批') {
         return false
-      }else{
+      } else {
         return true
       }
     }
   },
 };
 </script>
+
 <style lang="scss" scoped>
 .test-form {
   margin: 15px auto;