Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -2010,7 +2010,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 record.setClosingDate("-");
             }
             record.setShowFinancialBtn(false);
-            LoanSolutions data = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
+            /*LoanSolutions data = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
             if (null != data) {
                 if (StringUtils.isNotBlank(record.getSaleOrderState())) {
                     if (record.getSaleOrderState().equals("已办结")) {
@@ -2029,7 +2029,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         }
                     }
                 }
-            }
+            }*/
 
 
 

anrui-riskcenter-ui/src/views/loanbalancerecognition/loanbalancerecognition.vue

@@ -232,6 +232,9 @@ export default {
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX    ' + btnKey)
       switch (btnKey) {
+        case 'toPush':
+          this.toPush()
+          break
         case 'doClose':
           this.doClose()
           break