修改用车审批

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 15:12:42
+ * @LastEditTime: 2024-03-08 16:14:41
 -->
 <!--
  * @Author: wrh
@@ -88,12 +88,12 @@
         </el-row>
         <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>
@@ -132,7 +132,7 @@ import { listDriver } from "@/api/system/post";
 import {
   complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm,
 } from "@/api/flowable/todo";
-import { getUsersDeptLeader } from '@/api/system/post.js'
+import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
 export default {
   props: {
     taskName: {
@@ -214,7 +214,6 @@ export default {
     },
     submit() {
       this.$refs['carForm'].validate((valid) => {
-        debugger
         if (valid) {
           this.form.formId = this.taskForm.formId;
           let formData = new FormData();
@@ -236,6 +235,8 @@ export default {
       })
     },
     completeApply() {
+      this.form.formId = this.taskForm.formId;
+      this.form.carApplyId = this.taskForm.formId;
       let formData = new FormData();
       let jsonForm = JSON.stringify(this.form);
       formData.append("form", jsonForm);
@@ -250,14 +251,33 @@ export default {
     },
     // 获取下一个审批人
     getNextFlowNodeApproval() {
-      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')
-        });
-      })
+      debugger
+      if (this.taskName == '用车申请') {
+        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')
+          });
+        })
+      } else if (this.taskName == '部门审核') {
+        getUsersManageLeader({ 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')
+          });
+        })
+      }else if(this.taskName == '分管审核') {
+        this.$set(this.taskForm.variables, "approval", 16);
+          complete(this.taskForm).then(response => {
+            this.$modal.msgSuccess(response.msg);
+            this.$emit('goBack')
+          });
+      }
+
     },
     // 查询项目列表
     getProjectList() {

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

@@ -293,7 +293,7 @@ export default {
           const formData = {};
           formData.disabled = true;
           formData.formBtns = false;
-
+          debugger
           formData.formId = new Snowflake(1n, 1n, 0n).nextId().toString();
           if (row.id) {
             variables.variables = formData;