Merge branch 'hotfix/bug_repair' of wmtx/platform into master

备注bug修改

Application/Admin/View/CompanyStatementPool/editPuPool.html

@@ -375,27 +375,60 @@
         });
     </if>
     $(".no_statement").on("click",function(){
+
         var id = $(this).data('id');
-        $.ajax({
+        saveForm(id);
-            type: "POST",
+
-            url: "{:U('cancelStatement')}",
+    });
-            dataType: 'json',
+    var return_data = "";
-            async: false,
+
-            data: {id:id},
+    function saveForm(id) {
-            success:function(data){
+        var options  = {
-                if(data.status==1){
+            url:"{:U('editCompanyStatementPool')}",  //同action
-                    layer.msg("<font style='color:white'>" + data.info + "</font>");
+            type:'post',
-                    setTimeout(function(){
+            beforeSend:function(xhr){
-                        window.location.reload();
+            },
-                    },1500);
+            success:function(data)
+            {
+                return_data = data;
+            },
+
+            complete:function(data){
+                if(return_data.status==1){
+
+                    $.ajax({
+                        type: "POST",
+                        url: "{:U('cancelStatement')}",
+                        dataType: 'json',
+                        async: false,
+                        data: {id:id},
+                        success:function(data){
+                            if(data.status==1){
+                                layer.msg("<font style='color:white'>" + data.info + "</font>");
+                                setTimeout(function(){
+                                    window.location.reload();
+                                },1500);
+                            }else{
+                                layer.msg("<font style='color:white'>" + data.info + "</font>");
+                                return false;
+                            }
+                        }
+                    });
+                    return;
                 }else{
-                    layer.msg("<font style='color:white'>" + data.info + "</font>");
+                    layer.msg("<font style='color:white'>" + 保存数据失败 + "</font>");
                     return false;
                 }
+            },
+            error: function(xhr,status,msg){
+                //alert("状态码"+status+"; "+msg)
+                layer.msg('玩命加载中..');
+
             }
-        });
+        };
-    });
+        $("#form").ajaxSubmit(options);
-    var return_data = "";
+    }
+
     $("#submit").click(function(){
         var options  = {
             url:"{:U('editCompanyStatementPool')}",  //同action