车辆外采流程办理

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -503,6 +503,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 
 	public ResultBean getPreviousNodesForReject(Map<String, Object> variables) {
 		BusinessVariables bv= BusinessVariables.builder().build();
+		bv.setTaskDefKey(variables.get("taskDefKey").toString());
 		bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
 		bv.setFormVariables(variables);
 		ResultBean  processCirculationNodesByMap =flowTaskFeign.getPreviousNodesForReject(bv);

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -311,7 +311,9 @@ public class FlowableRest implements FlowableFeign {
         if (incomingSourceRef.contains("start")) {
             vo.setNodeState( SysFormLinkFlowStateEnum.REJECT.getCode());
         }
-        return rb.setData(vo).setSuccess(true);
+        ResultBean resultBean1 = ResultBean.fireSuccess();
+        resultBean1.setData(vo).setSuccess(true);
+        return resultBean1;
     }
 
     @Override

anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplication.js

@@ -155,7 +155,7 @@ export default {
     return request({
       url: '/base/baseoutsourcingapplication/getPreviousNodesForReject',
       method: 'post',
-      data: data,
+      data: formobj,
       headers: {
         'Content-Type': 'application/json'
       }

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue

@@ -115,7 +115,7 @@
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
-          <el-button type="primary" size="mini"  @click="agree">确 定</el-button>
+          <el-button type="primary" size="mini"  @click="reject">确 定</el-button>
           <el-button type="info " size="mini"  @click="closeNodeDialog">取 消</el-button>
         </div>
       </el-form>
@@ -305,8 +305,9 @@ export default {
               var startTask=arr[0].startTask;
               if(startTask){
                 alert('当前环节不能驳回!');
+                return;
               }
-              this.nextNode=startTask
+              this.nextNode=arr[0]
               this.nodeDialogVisibleForReject = true
             }
           });