Merge branch 'feat-修改bug' of kxs-end/admin-server into test-adminserver

AppStart/ExcelHelper.cs

@@ -460,8 +460,11 @@ namespace MySystem
                                         store.LaveNum -= OpStoreNum;
                                         store.OutNum += OpStoreNum;
                                         db.SaveChanges();
-                                        string SendData = "{\"Kind\":\"5\",\"Data\":{\"StoreId\":\"" + StoreId + "\",\"BrandId\":\"" + BrandId + "\",\"OpStoreNum\":\"" + OpStoreNum + "\"}}";
-                                        RedisDbconn.Instance.AddList("StoreApplyQueue", SendData);
+                                        if(BrandId != 14)
+                                        {
+                                            string SendData = "{\"Kind\":\"5\",\"Data\":{\"StoreId\":\"" + StoreId + "\",\"BrandId\":\"" + BrandId + "\",\"OpStoreNum\":\"" + OpStoreNum + "\"}}";
+                                            RedisDbconn.Instance.AddList("StoreApplyQueue", SendData);
+                                        }
                                     }
                                     foreach (string key in toStoreData.Keys)
                                     {
@@ -499,8 +502,11 @@ namespace MySystem
                                         store.TotalNum += OpStoreNum;
                                         store.LaveNum += OpStoreNum;
                                         db.SaveChanges();
-                                        string SendData = "{\"Kind\":\"5\",\"Data\":{\"StoreId\":\"" + StoreId + "\",\"BrandId\":\"" + BrandId + "\",\"OpStoreNum\":\"-" + OpStoreNum + "\"}}";
-                                        RedisDbconn.Instance.AddList("StoreApplyQueue", SendData);
+                                        if(BrandId != 14)
+                                        {
+                                            string SendData = "{\"Kind\":\"5\",\"Data\":{\"StoreId\":\"" + StoreId + "\",\"BrandId\":\"" + BrandId + "\",\"OpStoreNum\":\"-" + OpStoreNum + "\"}}";
+                                            RedisDbconn.Instance.AddList("StoreApplyQueue", SendData);
+                                        }
                                     }
                                     db.SaveChanges();
                                     tran.Commit();

wwwroot/layuiadmin/modules_operate/SysAdminOperate_Admin.js

@@ -251,9 +251,6 @@ layui.config({
                 area: ['550px', '550px'],
                 btn: ['确定', '取消'],
                 yes: function (index, layero) {
-                    loadindex = layer.load(1, {
-                        shade: [0.5, '#000']
-                    });
                     var iframeWindow = window['layui-layer-iframe' + index],
                         submitID = 'LAY-list-front-submit',
                         submit = layero.find('iframe').contents().find('#' + submitID);
@@ -270,6 +267,10 @@ layui.config({
                             //提交 Ajax 成功后，静态更新表格中的数据
                             //$.ajax({});
 
+                            var loadindex = layer.load(1, {
+                                shade: [0.5, '#000']
+                            });
+
                             $.ajax({
                                 type: "POST",
                                 url: "/Admin/SysAdminOperate/EditAmt?r=" + Math.random(1),
@@ -278,6 +279,7 @@ layui.config({
                                 success: function (data) {
                                     clickflag = 0;
                                     layer.close(index); //关闭弹层
+                                    layer.close(loadindex); //关闭弹层
                                     if (data == "success") {
                                         layer.msg("保存成功", {
                                             time: 1500
@@ -285,7 +287,6 @@ layui.config({
                                             table.reload('LAY-list-manage'); //数据刷新
                                         });
                                     } else {
-                                        layer.close(loadindex); //关闭弹层
                                         layer.msg(data);
                                     }
                                 }
@@ -309,9 +310,6 @@ layui.config({
                 area: ['550px', '550px'],
                 btn: ['确定', '取消'],
                 yes: function (index, layero) {
-                    loadindex = layer.load(1, {
-                        shade: [0.5, '#000']
-                    });
                     var iframeWindow = window['layui-layer-iframe' + index],
                         submitID = 'LAY-list-front-submit',
                         submit = layero.find('iframe').contents().find('#' + submitID);
@@ -327,6 +325,9 @@ layui.config({
                             }
                             //提交 Ajax 成功后，静态更新表格中的数据
                             //$.ajax({});
+                            var loadindex = layer.load(1, {
+                                shade: [0.5, '#000']
+                            });
 
                             $.ajax({
                                 type: "POST",
@@ -336,6 +337,7 @@ layui.config({
                                 success: function (data) {
                                     clickflag = 0;
                                     layer.close(index); //关闭弹层
+                                    layer.close(loadindex); //关闭弹层
                                     if (data == "success") {
                                         layer.msg("保存成功", {
                                             time: 1500
@@ -343,7 +345,6 @@ layui.config({
                                             table.reload('LAY-list-manage'); //数据刷新
                                         });
                                     } else {
-                                        layer.close(loadindex); //关闭弹层
                                         layer.msg(data);
                                     }
                                 }