成功后关闭加载动画

品牌Id取出

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -1565,7 +1565,8 @@ namespace MySystem.Areas.Admin.Controllers
                 var tamount = 0;
                 var storeInfo = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId);
                 var posCount = db.PosMachinesTwo.Count(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.OpId == 0);
-                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == int.Parse(storeInfo.BrandId));
+                var BrandId = int.Parse(storeInfo.BrandId);
+                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == BrandId);
                 if (brandInfo.Name.Contains("电签"))
                 {
                     amount = 100;
@@ -1666,7 +1667,8 @@ namespace MySystem.Areas.Admin.Controllers
                             {
                                 var pos = db.PosMachinesTwo.Where(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0).ToList();
                                 var posCount = pos.Count();
-                                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == int.Parse(storeInfo.BrandId));
+                                var BrandId = int.Parse(storeInfo.BrandId);
+                                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == BrandId);
                                 if (brandInfo.Name.Contains("电签"))
                                 {
                                     amount = 100;
@@ -1830,7 +1832,8 @@ namespace MySystem.Areas.Admin.Controllers
                 var tamount = 0;
                 var storeInfo = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId);
                 var posCount = db.PosMachinesTwo.Count(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.OpId == storeInfo.OpId);
-                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == int.Parse(storeInfo.BrandId));
+                var BrandId = int.Parse(storeInfo.BrandId);
+                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == BrandId);
                 if (brandInfo.Name.Contains("电签"))
                 {
                     amount = 100;
@@ -1873,7 +1876,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.UserId == userForMakerCode.UserId);
                 var userAmount = opdb.UserAccount.FirstOrDefault(m => m.Sort == sysAdmin.Id) ?? new OpModels.UserAccount();
-                decimal TotalAmount = userAmount.ValidAmount + userAmount.TotalAmt + userAmount.ValidForGetAmount;
+                decimal TotalAmount = userAmount.ValidAmount + userAmount.TotalAmt + userAmount.ValidForGetAmount;//旧的总金额
                 Fields.Add("OpId", 0);
                 if (sysAdmin.Id > 0)
                 {
@@ -1895,7 +1898,8 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             var pos = db.PosMachinesTwo.Where(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.OpId == sysAdmin.UserId).ToList();
                             var posCount = pos.Count();
-                            var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == int.Parse(store.BrandId));
+                            var BrandId = int.Parse(store.BrandId);
+                            var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == BrandId);
                             if (brandInfo.Name.Contains("电签"))
                             {
                                 amount = 100;
@@ -1932,7 +1936,8 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         return "Warning|" + error;
                     }
-                    if (TotalAmount - deposit >= 0)
+                    decimal toAmount = userAmount.ValidAmount + userAmount.TotalAmt + userAmount.ValidForGetAmount;//新的总金额
+                    if (toAmount - deposit >= 0)
                     {
                         foreach (var item in idlist)
                         {

wwwroot/layuiadmin/modules_main/StoreHouse_Admin.js

@@ -889,6 +889,7 @@ layui.config({
                                         clickflag = 0;
                                         layer.close(index);
                                         if (data == "success") {
+                                            layer.close(loadindex);
                                             layer.msg('关联成功', {
                                                 time: 1000
                                             }, function () {
@@ -970,6 +971,7 @@ layui.config({
                                         clickflag = 0;
                                         layer.close(index);
                                         if (data == "success") {
+                                            layer.close(loadindex);
                                             layer.msg('取消成功', {
                                                 time: 1000
                                             }, function () {