Головна сторінка Огляд Довідка
Реєстрація Увійти
lichunlei
/
kxs-admin
1
0
Відгалуження 0
Файли Проблеми 0 Запити на злиття 0 Wiki
Переглянути джерело

Merge branch 'feature-dgy-后台新功能批量处理' into DuGuYang

# Conflicts:
#	Areas/Admin/Views/MainServer/SysTools/CancelMerAgent.cshtml
#	Areas/Admin/Views/MainServer/SysTools/SetMerAgent.cshtml
DuGuYang 3 роки тому
батько
954a668cfc 7976d95556
коміт
79f5e70ced
4 змінених файлів з 49 додано та 32 видалено
Об'єднаний вигляд Показати статистику Diff
  1. 2 2
      Areas/Admin/Controllers/MainServer/SysToolsController.cs
  2. 11 5
      Areas/Admin/Views/MainServer/SysTools/CancelMerAgent.cshtml
  3. 34 23
      Areas/Admin/Views/MainServer/SysTools/SetMerAgent.cshtml
  4. 2 2
      wwwroot/layuiadmin/modules_main/StoreHouseStat_Admin.js

+ 2 - 2
Areas/Admin/Controllers/MainServer/SysToolsController.cs
Переглянути файл 

@@ -1084,11 +1084,11 @@ namespace MySystem.Areas.Admin.Controllers
 
                 return "请输入商户编号";

                 return "请输入商户编号";

             }

             }

             PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);

             PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);

-            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);

             if (pos == null)

             if (pos == null)

             {

             {

                 return "机具SN不存在";

                 return "机具SN不存在";

             }

             }

+            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);

             Users user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode);

             Users user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode);

             if (user == null)

             if (user == null)

             {

             {

@@ -1166,11 +1166,11 @@ namespace MySystem.Areas.Admin.Controllers
 
                 return "请输入机具SN";

                 return "请输入机具SN";

             }

             }

             PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);

             PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);

-            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);

             if (pos == null)

             if (pos == null)

             {

             {

                 return "机具SN不存在";

                 return "机具SN不存在";

             }

             }

+            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);

             Users user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode);

             Users user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode);

             if (user == null)

             if (user == null)

             {

             {

+ 11 - 5
Areas/Admin/Views/MainServer/SysTools/CancelMerAgent.cshtml
Переглянути файл 

@@ -34,7 +34,7 @@
 
                                     <label class="layui-form-label">创客编号</label>
 
                                     <label class="layui-form-label">创客编号</label>
 
                                     <div class="layui-input-inline">
 
                                     <div class="layui-input-inline">
 
                                         <input class="layui-input" type="text" id="MakerCode" name="MakerCode"
 
                                         <input class="layui-input" type="text" id="MakerCode" name="MakerCode"
 
-                                            maxlength="10" lay-verify="required|" autocomplete="off"
 
+                                            maxlength="15" lay-verify="required|" autocomplete="off"
 
                                             placeholder="请输入创客编号">
 
                                             placeholder="请输入创客编号">
 
                                     </div>
 
                                     </div>
 
                                 </div>
 
                                 </div>
 
@@ -85,12 +85,18 @@
 
                     dataType: "text",
 
                     dataType: "text",
 
                     success: function (data) {
 
                     success: function (data) {
 
                         layer.close(index); //关闭弹层
 
                         layer.close(index); //关闭弹层
 
-                        layer.close(indexs); //关闭弹层
 
                         if (data == "success") {
 
                         if (data == "success") {
 
-                            layer.msg("取消成功");
 
-                            window.location.reload();
 
+                            layer.msg('取消成功', {
 
+                                time: 2000
 
+                            }, function () {
 
+                                window.location.reload();
 
+                            });
 
                         } else {
 
                         } else {
 
-                            layer.msg(data);
 
+                            layer.msg(data, {
 
+                                time: 2000
 
+                            }, function () {
 
+                                table.reload('LAY-list-manage'); //数据刷新
 
+                            });
 
                         }
 
                         }
 
                     }
 
                     }
 
                 });
 
                 });

+ 34 - 23
Areas/Admin/Views/MainServer/SysTools/SetMerAgent.cshtml
Переглянути файл 

@@ -1,20 +1,23 @@
 
 @{

 @{

     string RightInfo = ViewBag.RightInfo as string;

     string RightInfo = ViewBag.RightInfo as string;

     string right = ViewBag.right as string;

     string right = ViewBag.right as string;

-    

+

 }

 }

 <!DOCTYPE html>

 <!DOCTYPE html>

 <html>

 <html>

+

 <head>

 <head>

     <meta charset="utf-8">

     <meta charset="utf-8">

     <title>设置商户型创客</title>

     <title>设置商户型创客</title>

     <meta name="renderer" content="webkit">

     <meta name="renderer" content="webkit">

     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">

+    <meta name="viewport"

+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">

     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">

     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">

     <script src="/admin/js/jquery-1.10.1.min.js"></script>

     <script src="/admin/js/jquery-1.10.1.min.js"></script>

     <script src="/admin/js/LAreaData2.js"></script>

     <script src="/admin/js/LAreaData2.js"></script>

 </head>

 </head>

+

 <body>

 <body>

 

 

     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">

     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">

@@ -31,24 +34,22 @@
 
                                     <label class="layui-form-label">创客编号</label>

                                     <label class="layui-form-label">创客编号</label>

                                     <div class="layui-input-inline">

                                     <div class="layui-input-inline">

                                         <input class="layui-input" type="text" id="MakerCode" name="MakerCode"

                                         <input class="layui-input" type="text" id="MakerCode" name="MakerCode"

-                                            maxlength="10" lay-verify="required|" autocomplete="off"

+                                            maxlength="15" lay-verify="required|" autocomplete="off"

                                             placeholder="请输入创客编号">

                                             placeholder="请输入创客编号">

                                     </div>

                                     </div>

                                 </div>

                                 </div>

                                 <div class="layui-form-item">

                                 <div class="layui-form-item">

                                     <label class="layui-form-label">机具SN</label>

                                     <label class="layui-form-label">机具SN</label>

                                     <div class="layui-input-inline">

                                     <div class="layui-input-inline">

-                                        <input class="layui-input" type="text" id="PosSn"

-                                            name="PosSn" maxlength="50" lay-verify="required|"

-                                            autocomplete="off" placeholder="请输入机具SN">

+                                        <input class="layui-input" type="text" id="PosSn" name="PosSn" maxlength="50"

+                                            lay-verify="required|" autocomplete="off" placeholder="请输入机具SN">

                                     </div>

                                     </div>

                                 </div>

                                 </div>

                                 <div class="layui-form-item">

                                 <div class="layui-form-item">

                                     <label class="layui-form-label">商户编号</label>

                                     <label class="layui-form-label">商户编号</label>

                                     <div class="layui-input-inline">

                                     <div class="layui-input-inline">

-                                        <input class="layui-input" type="text" id="MerNo"

-                                            name="MerNo" maxlength="50" lay-verify="required|"

-                                            autocomplete="off" placeholder="请输入商户编号">

+                                        <input class="layui-input" type="text" id="MerNo" name="MerNo" maxlength="50"

+                                            lay-verify="required|" autocomplete="off" placeholder="请输入商户编号">

                                     </div>

                                     </div>

                                 </div>

                                 </div>

                                 <div class="layui-form-item">

                                 <div class="layui-form-item">

@@ -73,7 +74,8 @@
 
     </div>

     </div>

 

 

     <script src="/layuiadmin/layui/layui.js"></script>

     <script src="/layuiadmin/layui/layui.js"></script>

-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>

+    <script

+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>

     <script src="/other/mybjq/kindeditor-min.js"></script>

     <script src="/other/mybjq/kindeditor-min.js"></script>

     <script src="/other/mybjq/lang/zh_CN.js"></script>

     <script src="/other/mybjq/lang/zh_CN.js"></script>

     <script>

     <script>

@@ -90,18 +92,26 @@
 
                 success: function (data) {

                 success: function (data) {

                     layer.close(index); //关闭弹层

                     layer.close(index); //关闭弹层

                     if (data == "success") {

                     if (data == "success") {

-                        layer.msg("重置成功");

+                        layer.msg('设置成功', {

+                            time: 2000

+                        }, function () {

+                            window.location.reload();

+                        });

                     } else {

                     } else {

-                        layer.msg(data);

+                        layer.msg(data, {

+                            time: 2000

+                        }, function () {

+                            table.reload('LAY-list-manage'); //数据刷新

+                        });

                     }

                     }

                 }

                 }

             });

             });

         }

         }

-        

-                    

+

+

         //编辑器

         //编辑器

         KindEditor.ready(function (K) {

         KindEditor.ready(function (K) {

-            

+

         });

         });

 

 

         var ids = "";

         var ids = "";

@@ -207,7 +217,7 @@
 
             });

             });

         }

         }

 

 

-        

+

         var tree;

         var tree;

         var element;

         var element;

         var upload;

         var upload;

@@ -227,30 +237,31 @@
 
             tree = layui.tree;

             tree = layui.tree;

             element = layui.element;

             element = layui.element;

             upload = layui.upload;

             upload = layui.upload;

-        

+

             //Hash地址的定位

             //Hash地址的定位

             var layid = location.hash.replace(/^#test=/, '');

             var layid = location.hash.replace(/^#test=/, '');

             element.tabChange('test', layid);

             element.tabChange('test', layid);

             element.on('tab(test)', function (elem) {

             element.on('tab(test)', function (elem) {

                 location.hash = 'test=' + $(this).attr('lay-id');

                 location.hash = 'test=' + $(this).attr('lay-id');

             });

             });

-    

+

             //日期

             //日期

-            

+

 

 

             //上传文件

             //上传文件

-            

+

 

 

             //穿梭框

             //穿梭框

-            

+

 

 

             //TreeView，比如权限管理

             //TreeView，比如权限管理

-            

+

 

 

             //省市区

             //省市区

-            

+

         })

         })

 

 

     </script>

     </script>

 </body>

 </body>

+

 </html>

 </html>

+ 2 - 2
wwwroot/layuiadmin/modules_main/StoreHouseStat_Admin.js
Переглянути файл 

@@ -175,8 +175,8 @@ layui.config({
 
         where: {

         where: {

 

 

         },

         },

-        // page: true,

-        // limit: 30,

+        page: true,

+        limit: 30,

         height: 'full-' + String($('.layui-card-header').height() + 130),

         height: 'full-' + String($('.layui-card-header').height() + 130),

         text: '对不起，加载出现异常！',

         text: '对不起，加载出现异常！',

         done: function (res, curr, count) {

         done: function (res, curr, count) {