新分帐

src/main/java/com/caimei/modules/order/web/CmPayShopController.java

@@ -784,10 +784,12 @@ public class CmPayShopController extends BaseController {
     }
 
     @RequestMapping("new/splitEdit")
-    public String splitEdit(String shopOrderId, String splits, RedirectAttributes redirectAttributes) {
+    @ResponseBody
+    public Map<String, Object> splitEdit(String shopOrderId, String splits) {
+        Map<String, Object> res = new HashMap<>();
 //        splitAccountService.SplitByHand(shopOrderId, splits);
-        addMessage(redirectAttributes, "分账成功！");
-        return "redirect:" + Global.getAdminPath() + "/shopOrder/splitList";
+        res.put("success", true);
+        return res;
     }
 
     /**

src/main/webapp/WEB-INF/views/modules/order/cmSplitAccountList.jsp

@@ -198,7 +198,7 @@
             margin-left: 20px
         }
 
-        .popup-tips ,.sub-popup-tips{
+        .popup-tips, .sub-popup-tips {
             color: red;
             display: none
         }
@@ -566,7 +566,7 @@
             <div>
                 <div style="display: inline-block">
                     <p>
-                        <span>采美分账号：<input type="number" id="div-caimei-accounts" onchange="inputnum(this)"></span>
+                        <span>采美分账号：<input type="text" id="div-caimei-accounts"></span>
                     </p>
                 </div>
                 <div style="display: inline-block;margin-left: 30px;">
@@ -578,7 +578,7 @@
             <div>
                 <div style="display: inline-block">
                     <p>
-                        <span>供应商分账号：<input type="number" id="div-shop-accounts" onchange="inputnum(this)"></span>
+                        <span>供应商分账号：<input type="text" id="div-shop-accounts"></span>
                     </p>
                 </div>
                 <div style="display: inline-block;margin-left: 30px;">
@@ -590,7 +590,7 @@
             <div>
                 <div style="display: inline-block">
                     <p>
-                        <span>服务商分账号：<input type="number" id="div-service-accounts" onchange="inputnum(this)"></span>
+                        <span>服务商分账号：<input type="text" id="div-service-accounts"></span>
                     </p>
                 </div>
                 <div style="display: inline-block;margin-left: 30px;">
@@ -797,6 +797,7 @@
             block.text(content);
             block.show();
         }
+
         function showTips2(content) {
             var block = $('.sub-popup-tips');
             block.text(content);
@@ -807,6 +808,7 @@
             $('.popup-cfm-btn').css({'background': '#ddd', 'color': '#555'});
             $('.popup-cfm-btn').attr('disabled', true);
         }
+
         function btnToGrey1() {
             $('.sub-popup-cfm-btn').css({'background': '#ddd', 'color': '#555'});
             $('.sub-popup-cfm-btn').attr('disabled', true);
@@ -816,6 +818,7 @@
             $('.popup-cfm-btn').css({'background': '#3daae9', 'color': '#fff'});
             $('.popup-cfm-btn').attr('disabled', false);
         }
+
         function btnToNormal1() {
             $('.sub-popup-cfm-btn').css({'background': '#3daae9', 'color': '#fff'});
             $('.sub-popup-cfm-btn').attr('disabled', false);
@@ -940,11 +943,16 @@
                     $.ajax({
                         url: "${ctx}/order/cmPayShop/new/splitEdit",
                         data: {'shopOrderId': shoporderId, 'splits': splits},
-                        type: "POST"
+                        type: "POST",
+                        success: function (data) {
+                            if (data.success) {
+                                window.location.href = '${ctx}/shopOrder/splitList';
+                            }
+                        }
                     });
                 }
             });
-            <%--window.location.href = '${ctx}/order/cmPayShop/new/splitEdit?shopOrderId=' + shoporderId + "&splits =" + splits;--%>
+
         });
 
         <%--//付第三方--%>
@@ -1100,7 +1108,8 @@
         $('body').on('input propertychange', '#div-service-money', function () {
             validCheck();
         });
-        function  validCheck(){
+
+        function validCheck() {
             showTips2('');
             btnToNormal1();
             $('.sub-popup-tips').hide();
@@ -1141,6 +1150,7 @@
                 return false;
             }
         }
+
         function validAndAdd() {
             //先还原按钮
             showTips1('');