工会用车审批

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-11 09:39:48
+ * @LastEditTime: 2024-03-11 10:43:10
 -->
 <!--
  * @Author: wrh
@@ -38,7 +38,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="项目编号：" prop="projectNumber">
+        <el-form-item label="项目编号：" prop="projectNumber" v-if="taskForm.procDefName == '用车审批'">
           <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>
@@ -88,17 +88,23 @@
         <el-divider></el-divider>
         <!-- 部门审核意见 -->
         <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px"
-          v-if="taskName == '部门审核' || taskName == '分管审核' || taskName == '安排用车' || taskName == '申请确认'">
+          v-if="taskForm.procDefName == '用车审批' && (taskName == '部门审核' || 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 == '分管审核' || taskName == '安排用车' || taskName == '申请确认'">
+          v-if="taskForm.procDefName == '用车审批' && (taskName == '分管审核' || taskName == '安排用车' || taskName == '申请确认')">
           <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment">
           </el-input>
         </el-form-item>
-        <!-- 分管审核意见 -->
+        <!-- 工会审核意见 -->
+        <el-form-item label="工会审核意见：" prop="unionComment" label-width="120px"
+          v-if="taskForm.procDefName == '用车审批（工会）' && (taskName == '工会审核' || taskName == '安排用车' || taskName == '申请确认')">
+          <el-input type="textarea" :rows="2" placeholder="请输入工会审核意见" v-model="form.unionComment">
+          </el-input>
+        </el-form-item>
+        <!-- 安排用车意见 -->
         <el-form-item label="安排用车意见：" prop="dispatchComment" label-width="120px"
           v-if="taskName == '安排用车' || taskName == '申请确认'">
           <el-input type="textarea" :rows="2" placeholder="请输入安排用车意见" v-model="form.dispatchComment">
@@ -230,8 +236,6 @@ export default {
             data.cars = arr;
           }
           this.form = data;
-          console.log(this.form);
-          console.log(this.driverList);
         }
       })
     },
@@ -276,8 +280,10 @@ export default {
     getNextFlowNodeApproval() {
       if (this.taskName == '用车申请') {
         getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
-          let userId = res.data.userId;
-          this.$set(this.taskForm.variables, "approval", userId);
+          let userId = res.data.userId;          
+          if (this.taskForm.procDefName == '用车审批') {
+            this.$set(this.taskForm.variables, "approval", userId);
+          }
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
             this.$emit('goBack')
@@ -292,24 +298,18 @@ export default {
             this.$emit('goBack')
           });
         })
-      } else if (this.taskName == '分管审核') {
+      } else if (this.taskName == '分管审核' || this.taskName == '工会审核') {
         this.$set(this.taskForm.variables, "approval", 16);
         complete(this.taskForm).then(response => {
           this.$modal.msgSuccess(response.msg);
           this.$emit('goBack')
         });
-      } else if (this.taskName == '安排用车') {
-        complete(this.taskForm).then(response => {
-          this.$modal.msgSuccess(response.msg);
-          this.$emit('goBack')
-        });
-      } else if (this.taskName == '申请确认') {
+      } else if (this.taskName == '安排用车' || this.taskName == '申请确认') {
         complete(this.taskForm).then(response => {
           this.$modal.msgSuccess(response.msg);
           this.$emit('goBack')
         });
       }
-
     },
     // 查询项目列表
     getProjectList() {

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

@@ -23,6 +23,7 @@
           <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 == '用车审批'" @goBack="goBack"></car-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()">
@@ -542,7 +543,7 @@ export default {
     },
     // 是否显示审批通过
     isShowApprove() {
-      if (this.taskName == '员工填报' || this.taskForm.procDefName == '用车审批' || this.taskForm.procDefName == '设备审批') {
+      if (this.taskName == '员工填报' || this.taskForm.procDefName == '用车审批' || this.taskForm.procDefName == '用车审批（工会）' || this.taskForm.procDefName == '设备审批') {
         return false
       } else {
         return true