PSSR:

-添加锁开锁关创建流程

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -234,6 +234,7 @@ public class TPssrApproveController extends BaseController {
         String condition = devTask.getCondition();
         boolean allDone = false;
         TPssrSubcontent tPssrSubcontent = tPssrSubcontentService.selectTPssrSubcontentById(approve.getSubId());
+        String remark = "";
         if (condition.equals("0")) {
             approve.setApproveStatus(2L);
             tPssrSubcontent.setApproveStatus(2L);
@@ -252,6 +253,13 @@ public class TPssrApproveController extends BaseController {
         } else {
             // 驳回操作，修改子表状态
             handleTurnDown(tPssrSubcontent, condition);
+            if ("1".equals(condition)) {
+                remark="驳回至确认人1";
+            } else if ("2".equals(condition)) {
+                remark="驳回至确认人2";
+            } else if ("3".equals(condition)) {
+                remark="驳回至确认人3";
+            }
         }
         //处理流程节点
         Map<String, Object> param = new HashMap<>();
@@ -260,6 +268,7 @@ public class TPssrApproveController extends BaseController {
         TaskService taskService = processEngine.getTaskService();
         //认领任务
         processEngine.getTaskService().claim(taskId, userId);
+        taskService.addComment(taskId, processInstancesId, remark);
         taskService.complete(taskId, param);
 
         // 所有流程都结束时，发起经理审批

ui/src/views/pssr/aboveall/index.vue

@@ -181,7 +181,7 @@
             <el-table-column label="项目" align="center" prop="item" :show-overflow-tooltip="true" width="180"/>
             <el-table-column label="开车条件检查内容" align="center" prop="content" :show-overflow-tooltip="true"/>
             <el-table-column type="selection" width="55" align="center"/>
-            <el-table-column label="确认人" align="center" prop="confirm" :show-overflow-tooltip="true" width="180">
+            <el-table-column label="确认人" align="center" prop="confirm" width="180">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.confirm" clearable filterable style="width: 100%;"
                            placeholder="请选择确认人" @change="handleChangeConfirm(scope.row.confirm,scope.row)">

ui/src/views/pssr/lock/index.vue

@@ -117,7 +117,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="lockList" @selection-change="handleSelectionChange" :height="clientHeight"
+    <el-table v-loading="loading" :data="lockList" @selection-change="handleSelectionChange" :selectable="checkSelectable" :height="clientHeight"
               border>
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="100">
@@ -465,7 +465,7 @@ export default {
     },
     checkSelectable(row) {
       console.log(this.isApprove)
-      return (row.approveStatus == 1 && this.isApprove != 0) || this.isApprove == 0
+      return (row.approveStatus != 2 && row.approveStatus != 0 && this.isApprove != 0) || this.isApprove == 0
     },
     handleConfirmApprove() {
       let data = {