Merge branch 'master' of http://git.dever.cc/dever-product/churen

app/factory/assets/pc/html/order_view.html

@@ -98,23 +98,51 @@ function audit(id, process, url)
 
 function tui(goods_id, order_id, source_id, status, url)
 {
+    var i = 0;
+    var flag = false;
     var index = layer.confirm('确定进行此项操作吗？', function()
     {
-        $.getJSON(url, {order_goods_id:goods_id,order_id:order_id,type_id:source_id,type:13,status:status,desc:'厂家上报'}, function(t)
-        {
-            msg(t);
-        })
+        if (!flag) {
+            i++;
+            flag = true;
+            $.getJSON(url, {order_goods_id:goods_id,order_id:order_id,type_id:source_id,type:13,status:status,desc:'厂家上报'}, function(t)
+            {
+                if (t.status == 2) {
+                    flag = false;
+                    showAlert(t.msg, false, '错误提示');
+                    return; 
+                } else {
+                    msg(t);
+                    layer.close(index);
+                    //location.reload();
+                }
+            })
+        }
     })
 }
 
 function cancel(url)
 {
+    var i = 0;
+    var flag = false;
     var index = layer.confirm('确定要取消该订单吗？', function()
     {
-        $.getJSON(url, {type:13,desc:'厂家上报'}, function(t)
-        {
-            msg(t);
-        })
+        if (!flag) {
+            i++;
+            flag = true;
+            $.getJSON(url, {type:13,desc:'厂家上报'}, function(t)
+            {
+                if (t.status == 2) {
+                    flag = false;
+                    showAlert(t.msg, false, '错误提示');
+                    return; 
+                } else {
+                    msg(t);
+                    layer.close(index);
+                    //location.reload();
+                }
+            })
+        }
     })
 }
 

app/store/assets/pc/html/order_view.html

@@ -73,34 +73,76 @@
 <script>
 function audit(id, process, url)
 {
+    var i = 0;
+    var flag = false;
     var index = layer.confirm('确定进行此项操作吗？', function()
     {
-        $.getJSON(url, {id:id,process:process}, function(t)
-        {
-            msg(t);
-        })
+        if (!flag) {
+            i++;
+            flag = true;
+            $.getJSON(url, {id:id,process:process}, function(t)
+            {
+                if (t.status == 2) {
+                    flag = false;
+                    showAlert(t.msg, false, '错误提示');
+                    return; 
+                } else {
+                    msg(t);
+                    layer.close(index);
+                    //location.reload();
+                }
+            })
+        }
     })
 }
 
 function tui(goods_id, order_id, source_id, status, url)
 {
+    var i = 0;
+    var flag = false;
     var index = layer.confirm('确定进行此项操作吗？', function()
     {
-        $.getJSON(url, {order_goods_id:goods_id,order_id:order_id,type_id:source_id,type:12,status:status,desc:'仓库上报'}, function(t)
-        {
-            msg(t);
-        })
+        if (!flag) {
+            i++;
+            flag = true;
+            $.getJSON(url, {order_goods_id:goods_id,order_id:order_id,type_id:source_id,type:12,status:status,desc:'仓库上报'}, function(t)
+            {
+                if (t.status == 2) {
+                    flag = false;
+                    showAlert(t.msg, false, '错误提示');
+                    return; 
+                } else {
+                    msg(t);
+                    layer.close(index);
+                    //location.reload();
+                }
+            })
+        }
     })
 }
 
 function cancel(url)
 {
+    var i = 0;
+    var flag = false;
     var index = layer.confirm('确定要取消该订单吗？', function()
     {
-        $.getJSON(url, {type:12,desc:'仓库上报'}, function(t)
-        {
-            msg(t);
-        })
+        if (!flag) {
+            i++;
+            flag = true;
+            $.getJSON(url, {type:12,desc:'仓库上报'}, function(t)
+            {
+                if (t.status == 2) {
+                    flag = false;
+                    showAlert(t.msg, false, '错误提示');
+                    return; 
+                } else {
+                    msg(t);
+                    layer.close(index);
+                    //location.reload();
+                }
+            })
+        }
     })
 }