调整审批界面按钮顺序

bpm-core/src/main/java/com/srm/bpm/logic/service/impl/BillBtnLogicImpl.java

@@ -206,7 +206,7 @@ public class BillBtnLogicImpl implements BillBtnLogic {
                                 case approvl:
                                     btns = Lists.newArrayList(BillBtnConst.BTN_AGREE, BillBtnConst.BTN_TRANSFER, BillBtnConst.BTN_BACK);
                                     if(isTransferButtonEnabled(processId)){
-                                        btns.add(0,BillBtnConst.BTN_TRANSFER_NEW);
+                                        btns.add(2,BillBtnConst.BTN_TRANSFER_NEW);
                                     }
                                     boolean isRefuseNode = nextNodeHasRefuse(processId, nodeExtend);
                                     if (isRefuseNode) {
@@ -375,7 +375,7 @@ public class BillBtnLogicImpl implements BillBtnLogic {
                         // 如果单子还在审批中，根据流程ID决定是否显示撤销按钮
                         btns = Lists.newArrayList(BillBtnConst.BTN_TRACK);
                         if (isRecallButtonEnabled(processId)) {
-                            btns.add(BillBtnConst.BTN_CANCEL);
+                            btns.add(0,BillBtnConst.BTN_CANCEL);
                         }
                         break;
                     case DRAFTS:
@@ -403,7 +403,7 @@ public class BillBtnLogicImpl implements BillBtnLogic {
                     case APPROVAL:
                         btns = Lists.newArrayList(BillBtnConst.BTN_TRACK);
                         if (isRecallButtonEnabled(processId)) {
-                            btns.add(BillBtnConst.BTN_CANCEL);
+                            btns.add(0,BillBtnConst.BTN_CANCEL);
                         }
                         break;
                     case REFUSE:
@@ -443,7 +443,7 @@ public class BillBtnLogicImpl implements BillBtnLogic {
                         // 如果单子还在审批中，根据流程ID决定是否显示撤销按钮
                         btns = Lists.newArrayList(BillBtnConst.BTN_TRACK);
                         if (isRecallButtonEnabled(processId)) {
-                            btns.add(BillBtnConst.BTN_CANCEL);
+                            btns.add(0,BillBtnConst.BTN_CANCEL);
                         }
                         break;
                     default:
@@ -511,15 +511,16 @@ public class BillBtnLogicImpl implements BillBtnLogic {
                     final boolean hasRefuse = nextNodeHasRefuse(processId, nodeExtend);
                     final List<String> btns = Lists.newArrayList(BillBtnConst.BTN_AGREE, BillBtnConst.BTN_BACK);
                     
-                    // 根据流程ID决定是否添加撤销按钮
-                    if (isRecallButtonEnabled(processId)) {
-                        btns.add(0, BillBtnConst.BTN_CANCEL);  // 在同意按钮前添加撤销按钮
-                    }
-                    
                     if (hasRefuse) {
                         // 正式自己的待我审批，则显示，审批同意等按钮
-                        btns.add(2, BillBtnConst.BTN_REFUSE);
+                        btns.add(1, BillBtnConst.BTN_REFUSE);
                     }
+
+                    // 根据流程ID决定是否添加撤销按钮
+                    if (isRecallButtonEnabled(processId)) {
+                        btns.add(BillBtnConst.BTN_CANCEL);  // 在同意按钮前添加撤销按钮
+                    }
+
                     if (!Objects.isNull(nodeExtend.getCountersignFlag()) && nodeExtend.getCountersignFlag().compareTo(1) == 0) {
                         btns.add(BillBtnConst.BTN_ENDORSE);
                     }