新增用车申请

oa-ui/src/store/getters.js

@@ -1,3 +1,9 @@
+/*
+ * @Author: ysh
+ * @Date: 2024-01-03 09:23:11
+ * @LastEditors: 
+ * @LastEditTime: 2024-02-29 14:57:41
+ */
 const getters = {
   sidebar: state => state.app.sidebar,
   size: state => state.app.size,
@@ -8,6 +14,7 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
+  deptName: state => state.user.deptName,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,

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

@@ -7,6 +7,7 @@ const user = {
     id: '',
     name: '',
     avatar: '',
+    deptName:'',
     roles: [],
     permissions: []
   },
@@ -21,6 +22,9 @@ const user = {
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTNAME:(state, deptName) => {
+      state.deptName = deptName
+    },
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
@@ -55,6 +59,7 @@ 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)
@@ -63,7 +68,8 @@ const user = {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
           commit('SET_ID', user.userId)
-          commit('SET_NAME', user.userName)
+          commit('SET_NAME', user.nickName)
+          commit('SET_DEPTNAME',user.dept.deptName)
           commit('SET_AVATAR', avatar)
           resolve(res)
         }).catch(error => {

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

@@ -0,0 +1,167 @@
+<template>
+  <div>
+    <h2 style="text-align: center;">用车申请表</h2>
+    <div>
+      <el-form :model="form" label-width="100px">
+        <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-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-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"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </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>
+          </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 label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeader
+            }}</el-descriptions-item>
+            <el-descriptions-item label="承担部门" label-class-name="my-label">
+              <el-tag size="small">{{ chooseProject.underDept }}</el-tag>
+            </el-descriptions-item>
+            <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
+            }}</el-descriptions-item>
+          </el-descriptions>
+        </el-form-item>
+        <el-form-item label="车牌号：">
+          <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>
+          </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 label="车辆型号" label-class-name="my-label">{{ chooseProject.projectName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeader
+            }}</el-descriptions-item>
+            <el-descriptions-item label="承担部门" label-class-name="my-label">
+              <el-tag size="small">{{ chooseProject.underDept }}</el-tag>
+            </el-descriptions-item>
+            <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
+            }}</el-descriptions-item>
+          </el-descriptions>
+        </el-form-item>
+        <el-row>
+          <el-col :span="6" :xs="24">
+            <el-form-item label="开始日期：">
+              <el-date-picker style="width:140px;" v-model="form.startTime" 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-date-picker style="width:140px;" v-model="form.endTime" value-format="yyyy-MM-dd" type="date"
+                placeholder="选择日期" @change="calculateDay">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" :xs="24">
+            <el-form-item label="共计:">
+              {{ form.day + '天' }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-form-item label="驾驶员：">
+          <el-radio-group v-model="form.driver">
+            <el-radio :label="3">备选项</el-radio>
+            <el-radio :label="6">备选项</el-radio>
+            <el-radio :label="9">备选项</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listProject, getProject } from "@/api/oa/project/project";
+export default {
+  created() {
+    this.form.user = this.$store.getters.name;
+    this.form.deptName = this.$store.getters.deptName;
+    this.getProjectList();
+  },
+  data() {
+    return {
+      form: {
+        date: new Date(),
+        day: ''
+      },
+      projectList: [],
+      driverList: [],
+      chooseProject: {},
+      isSelect: false
+    }
+  },
+  methods: {
+    // 查询项目列表
+    getProjectList() {
+      this.loading = true
+      listProject({
+        pageNum: 1,
+        pageSize: 9999999999
+      }).then(response => {
+        this.projectList = response.rows;
+      })
+    },
+    // 选择项目
+    handleSelectProject(val) {
+      if (val != "" && val != undefined && val != null) {
+        getProject(val).then(res => {
+          this.chooseProject = res.data;
+          this.isSelect = true
+        })
+      } else {
+        this.isSelect = false
+      }
+
+    },
+    calculateDay() {
+      if (this.form.startTime && this.form.endTime) {
+        let y1 = new Date(this.form.startTime);
+        let y2 = new Date(this.form.endTime);
+        if (y2 < y1) {
+          this.form.day = '';
+          return
+        }
+        let sub = Math.abs(y2 - y1);
+        let day = Math.floor(sub / (1000 * 60 * 60 * 24)) + 1;
+        this.form.day = day;
+      } else {
+        this.form.day = '';
+      }
+
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>
+<style>
+.my-label {
+  width: 100px;
+  background: #E1F3D8;
+}
+</style>

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -264,7 +264,7 @@ export default {
     },
     /**  发起流程申请 */
     handleStartProcess(row) {
-      if (row.category == "assess") {
+      if (row.category == "assess" || row.category == "car") {
         getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: {} }).then(res => {
           let data = res.data;
           if (data.dataType === 'dynamic') {
@@ -289,13 +289,13 @@ export default {
             const formData = {};
             formData.disabled = true;
             formData.formBtns = false;
-            
+
             formData.formId = new Snowflake(1n, 1n, 0n).nextId().toString();
             if (row.id) {
               variables.variables = formData;
               // 启动流程并将表单数据加入流程变量
               definitionStart(row.id, JSON.stringify(variables)).then(res => {
-                
+
                 this.$modal.msgSuccess(res.msg);
                 let procInstanceId = res.data;
                 todoList({
@@ -303,7 +303,7 @@ export default {
                   pageSize: 99999999, processInsId: procInstanceId
                 }).then(toDoRes => {
                   let records = toDoRes.data.records;
-                  if(records.length == 1){
+                  if (records.length == 1) {
                     records = records[0]
                   }
                   this.$router.push({
@@ -333,8 +333,8 @@ export default {
             }
           }
         })
-      }else{
-        
+      } else {
+
       }
 
     },

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

@@ -22,7 +22,8 @@
             v-else-if="taskForm.procDefName == '财务部考核'"></cw-table>
           <zh-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
             v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>
-          <el-row type="flex" justify="center" v-if="taskName != '员工填报'">
+          <car-form v-else-if="taskForm.procDefName == '用车审批'"></car-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">审核通过
             </el-button>
@@ -161,6 +162,7 @@ import ZhTable from "../../../form/zhTable.vue";
 import JsTable from "../../../form/jsTable.vue";
 import XmTable from "../../../form/xmTable.vue";
 import CwTable from "../../../form/cwTable.vue";
+import carForm from "../../../form/carForm.vue";
 
 export default {
   name: "Record",
@@ -174,7 +176,8 @@ export default {
     JsTable,
     XmTable,
     CwTable,
-    JyTable
+    JyTable,
+    carForm
   },
   props: {},
   data() {
@@ -529,6 +532,15 @@ export default {
         this.completeTitle = "选择下一节点审核人";
       })
     },
+    // 是否显示审批通过
+    isShowApprove(){
+      debugger
+      if(this.taskName == '员工填报' || this.taskName == '用车申请'){
+        return false
+      }else{
+        return true
+      }
+    }
   },
 };
 </script>