项目流转分管审核或签，生产确认会签

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

@@ -105,6 +105,10 @@ public class CmcCarApprovalController extends BaseController
             cmcCarApproval.setManagerUserId(getLoginUser().getUserId());
             cmcCarApproval.setManagerComment(formDataJson.getString("managerComment"));
         }
+        if (formDataJson.getString("gmComment") != null) {
+            cmcCarApproval.setGmUserId(getLoginUser().getUserId());
+            cmcCarApproval.setGmComment(formDataJson.getString("gmComment"));
+        }
         if (formDataJson.getString("unionComment") != null) {
             cmcCarApproval.setUnionUserId(getLoginUser().getUserId());
             cmcCarApproval.setUnionComment(formDataJson.getString("unionComment"));

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: wrh
- * @LastEditTime: 2024-04-10 10:16:05
+ * @LastEditTime: 2024-04-10 17:14:03
 -->
 
 <template>
@@ -36,7 +36,8 @@
                 </el-col>
                 <el-col :span="6" :xs="24">
                   <el-form-item label="申请用途：" prop="carUsage">
-                    <el-radio-group v-model="form.carUsage" @change="useChange" size="small">
+                    <el-radio-group v-model="form.carUsage" @change="useChange" size="small"
+                      :disabled="taskName != '用车申请'">
                       <el-radio-button label="1">工会用车</el-radio-button>
                       <el-radio-button label="0">非工会用车</el-radio-button>
                     </el-radio-group>
@@ -98,25 +99,25 @@
               </el-row>
               <el-divider></el-divider>
               <!-- 部门审核意见 -->
-              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="dept > 102">
+              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="showFormItem('部门审核')">
                 <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment"
                   :disabled="taskName != '部门审核'">
                 </el-input>
               </el-form-item>
               <!-- 分管审核意见 -->
-              <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px" v-if="dept > 102">
+              <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px" v-if="showFormItem('分管审核')">
                 <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment"
                   :disabled="taskName != '分管审核'">
                 </el-input>
               </el-form-item>
               <!-- 工会审核意见 -->
-              <el-form-item label="工会审核意见：" prop="unionComment" label-width="120px" v-if="dept == 101">
+              <el-form-item label="工会审核意见：" prop="unionComment" label-width="120px" v-if="showFormItem('工会审核')">
                 <el-input type="textarea" :rows="2" placeholder="请输入工会审核意见" v-model="form.unionComment"
                   :disabled="taskName != '工会审核'">
                 </el-input>
               </el-form-item>
               <!-- 总经理审核意见 -->
-              <el-form-item label="总经理审核意见" prop="gmComment" label-width="120px" v-if="dept == 102">
+              <el-form-item label="总经理审核意见" prop="gmComment" label-width="120px" v-if="showFormItem('总经理审核')">
                 <el-input type="textarea" :rows="2" placeholder="请输入总经理审核意见" v-model="form.gmComment"
                   :disabled="taskName != '总经理审核'">
                 </el-input>
@@ -192,10 +193,7 @@ export default {
     }
   },
   created() {
-    this.form.user.nickName = this.$store.getters.name;
     this.dept = this.$store.getters.deptId;
-    console.log(this.dept)
-    this.form.dept.deptName = this.$store.getters.deptName;
     this.getProjectList();
     this.getCarList();
     this.getDriverList();
@@ -286,10 +284,12 @@ export default {
             data.cars = arr;
           }
           this.form = data;
-          getProject(data.projectId).then(response => {
-            this.chooseProject = response.data;
-            this.isSelect = true
-          })
+          if (data.projectId) {
+            getProject(data.projectId).then(response => {
+              this.chooseProject = response.data;
+              this.isSelect = true
+            })
+          }
         }
       })
     },
@@ -336,12 +336,9 @@ export default {
     getNextFlowNodeApproval() {
       if (this.taskName == '用车申请') {
         getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
-          let userId = res.data.userId;
-          if (this.form.carUsage == '0')
-            this.$set(this.taskForm.variables, "dept", this.form.dept.deptId);
-          else
-            this.$set(this.taskForm.variables, "dept", 0);
-          this.$set(this.taskForm.variables, "approval", userId);
+          this.$set(this.taskForm.variables, "dept", this.dept);
+          if (res.data)
+            this.$set(this.taskForm.variables, "approval", res.data.userId);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
             this.$emit('goBack')
@@ -356,7 +353,7 @@ export default {
             this.$emit('goBack')
           });
         })
-      } else if (this.taskName == '分管审核' || this.taskName == '工会审核') {
+      } else if (this.taskName == '分管审核' || this.taskName == '工会审核' || this.taskName == '总经理审核') {
         this.$set(this.taskForm.variables, "approvalList", [8, 16]);
         complete(this.taskForm).then(response => {
           this.$modal.msgSuccess(response.msg);
@@ -437,10 +434,22 @@ export default {
     },
     useChange(val) {
       if (val == '1')
-        this.dept = 101;
+        this.dept = 0;
       else
         this.dept = this.$store.getters.deptId;
-    }
+    },
+    showFormItem(taskName) {
+      let isShow = false;
+      if (taskName == '部门审核')
+        isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.deptUserId != null);
+      else if (taskName == '分管审核')
+        isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.managerUserId != null);
+      else if (taskName == '工会审核')
+        isShow = (this.dept == 0 && this.taskName == '用车申请') || this.taskName == '工会审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.unionUserId != null);
+      else if (taskName == '总经理审核')
+        isShow = (this.dept == 102 && this.taskName == '用车申请') || this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null);
+      return isShow;
+    },
   },
 }
 </script>