PSSR bugfix

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

@@ -1081,7 +1081,7 @@ public class TPssrApproveController extends BaseController {
             approve.setCreatedate(new Date());
             tPssrApproveService.insertTPssrApprove(approve);
 
-            pssr1confirm(tPssrApprove, new ArrayList<>(), sub.getConfirm());
+            pssr1confirm(approve, new ArrayList<>(), sub.getConfirm());
         } else {
             delProcess(tPssrApprove.getProcessId(), "pssr1confirm");
 

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

@@ -1,6 +1,16 @@
 <template>
   <div class="app-container">
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-s-promotion"
+          size="mini"
+          @click="handleApprove"
+          v-if="isApprove==0"
+        >发起审批
+        </el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -106,6 +116,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listAllMain} from "@/api/patrol/patrol/main";
 import {updateMaterialBatch} from "@/api/pssr/material";
+import {doApprove} from "@/api/pssr/approve";
 
 export default {
   dicts: ['pssr_approve_status'],
@@ -312,6 +323,14 @@ export default {
         }
       });
     },
+
+    /** 确认按钮操作*/
+    handleApprove() {
+      doApprove(this.subId).then(res => {
+        this.msgSuccess("已发起确认流程");
+        this.getList();
+      })
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;