ソースを参照

商学院调整

DuGuYang 3 年 前
コミット
33c8e713f7

+ 2 - 1
Areas/Admin/Controllers/MainServer/SchoolMakerStudyController.cs

@@ -153,11 +153,12 @@ namespace MySystem.Areas.Admin.Controllers
 
             Fields.Add("Title", data.Title); //标题
             Fields.Add("Detail", data.Detail); //介绍
+            Fields.Add("SeoTitle", data.SeoTitle); //主讲人
+            Fields.Add("QueryCount", data.QueryCount); //观看人数
             Fields.Add("ListPic", data.ListPic); //列表图片
             Fields.Add("Contents", data.Contents); //内容
             Fields.Add("Url", data.Url); //外链
 
-            Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("SchoolMakerStudy", Fields, data.Id);

+ 2 - 2
Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1813,7 +1813,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 根据条件查询机具循环列表
         /// </summary>
         /// <returns></returns>
-        public IActionResult Index(string right, string SwapSnExpand, string SnNos)
+        public IActionResult Loop(string right, string SwapSnExpand, string SnNos)
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
@@ -1872,7 +1872,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// <returns></returns>
 
         [HttpPost]
-        public JsonResult IndexData(string SwapSnExpand, string SnNos, int page = 1, int limit = 30)
+        public JsonResult LoopData(string SwapSnExpand, string SnNos, int page = 1, int limit = 30)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("SwapSnExpand", "1"); //申请机具SN

+ 92 - 68
Areas/Admin/Views/MainServer/SchoolMakerStudy/Add.cshtml

@@ -1,77 +1,100 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>商学院创客学堂(增加)</title>
     <meta name="renderer" content="webkit">
     <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">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <script src="/admin/js/LAreaData2.js"></script>
 </head>
+
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        
+
         <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本资料</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">标题</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Title" name="Title" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入标题">
-</div>
-</div>
-<div class="layui-form-item layui-form-text">
-<label class="layui-form-label">介绍</label>
-<div class="layui-input-block">
-<textarea class="layui-textarea" id="Detail" name="Detail" maxlength="200" lay-verify="required|" placeholder="请输入介绍"></textarea>
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">列表图片</label>
-<div class="layui-input-block">
-<div class="layui-upload">
-<input type="hidden" id="ListPic" name="ListPic" value="">
-<button class="layui-btn" type="button" id="ListPicBtn">选择图片</button>
-<div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("SchoolMakerStudyListPic"))</div>
-</div>
-<div style="margin-top:10px;" id="ListPicImage">
-</div>
-</div>
-</div>
-<div class="layui-form-item layui-form-text">
-<label class="layui-form-label">内容</label>
-<div class="layui-input-block">
-<textarea class="layui-textarea" id="Contents" name="Contents" placeholder="请输入内容" style="width:100%;height:500px;"></textarea>
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">外链</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Url" name="Url" maxlength="500" lay-verify="" autocomplete="off" placeholder="请输入外链">
-</div>
-</div>
-
-</div>
+            <div class="layui-card-body">
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <ul class="layui-tab-title">
+                        <li class="layui-this" lay-id="1">基本资料</li>
+                    </ul>
+                    <div class="layui-tab-content mt20">
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">标题</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="Title" name="Title" maxlength="50"
+                                        lay-verify="required|" autocomplete="off" placeholder="请输入标题">
+                                </div>
+                            </div>
+                            <div class="layui-form-item layui-form-text">
+                                <label class="layui-form-label">介绍</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="Detail" name="Detail" maxlength="200"
+                                        lay-verify="required|" placeholder="请输入介绍"></textarea>
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">主讲人</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="SeoTitle" name="SeoTitle" maxlength="30"
+                                        lay-verify="required|" autocomplete="off" placeholder="请输入主讲人">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">学习人数</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="QueryCount" name="QueryCount"
+                                        maxlength="20" lay-verify="required|int|" autocomplete="off"
+                                        placeholder="请输入学习人数">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">列表图片</label>
+                                <div class="layui-input-block">
+                                    <div class="layui-upload">
+                                        <input type="hidden" id="ListPic" name="ListPic" value="">
+                                        <button class="layui-btn" type="button" id="ListPicBtn">选择图片</button>
+                                        <div class="layui-inline layui-word-aux">@(new
+                                            MySystem.PublicFunction().GetUploadHint("SchoolMakerStudyListPic"))</div>
+                                    </div>
+                                    <div style="margin-top:10px;" id="ListPicImage">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-form-item layui-form-text">
+                                <label class="layui-form-label">内容</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="Contents" name="Contents" placeholder="请输入内容"
+                                        style="width:100%;height:500px;"></textarea>
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">APP外链</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="Url" name="Url" maxlength="500"
+                                        lay-verify="" autocomplete="off" placeholder="请输入APP外链">
+                                </div>
+                            </div>
+                        </div>
 
+                    </div>
+                </div>
+                <div class="layui-form-item layui-hide">
+                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
+                        value="确认">
                 </div>
             </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
         </div>
     </div>
 
@@ -81,13 +104,13 @@
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         //内容
- @(Html.Raw(Library.Control.kindeditorVar("Contents")))
+        @(Html.Raw(Library.Control.kindeditorVar("Contents")))
 
-                    
-        //编辑器
-        KindEditor.ready(function (K) {
-            //内容
- @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
+
+            //编辑器
+            KindEditor.ready(function (K) {
+                //内容
+                @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
 
         });
 
@@ -194,7 +217,7 @@
             });
         }
 
-        
+
         var tree;
         var element;
         var upload;
@@ -214,34 +237,35 @@
             tree = layui.tree;
             element = layui.element;
             upload = layui.upload;
-        
+
             //Hash地址的定位
             var layid = location.hash.replace(/^#test=/, '');
             element.tabChange('test', layid);
             element.on('tab(test)', function (elem) {
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
-    
+
             //日期
-            
+
 
             //上传文件
             WebUploadJs('ListPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("SchoolMakerStudyListPic"))), function (filename) {
-$('#ListPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
-$('#ListPic').val(filename);
-});
+                $('#ListPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+                $('#ListPic').val(filename);
+            });
 
 
             //穿梭框
-            
+
 
             //TreeView,比如权限管理
-            
+
 
             //省市区
-            
+
         })
 
     </script>
 </body>
+
 </html>

+ 103 - 72
Areas/Admin/Views/MainServer/SchoolMakerStudy/Edit.cshtml

@@ -1,84 +1,114 @@
 @using MySystem.Models;
-@{SchoolMakerStudy editData = ViewBag.data as SchoolMakerStudy;}
+@{
+    SchoolMakerStudy editData = ViewBag.data as SchoolMakerStudy;
+}
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>商学院创客学堂(修改)</title>
     <meta name="renderer" content="webkit">
     <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">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <script src="/admin/js/LAreaData2.js"></script>
 </head>
+
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
         <input type="hidden" name="Id" value="@editData.Id" />
-        
+
         <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本资料</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">标题</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Title" name="Title" value="@editData.Title" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入标题">
-</div>
-</div>
-<div class="layui-form-item layui-form-text">
-<label class="layui-form-label">介绍</label>
-<div class="layui-input-block">
-<textarea class="layui-textarea" id="Detail" name="Detail" maxlength="200" lay-verify="required|" placeholder="请输入介绍">@editData.Detail</textarea>
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">列表图片</label>
-<div class="layui-input-block">
-<div class="layui-upload">
-<input type="hidden" id="ListPic" name="ListPic" value="@editData.ListPic">
-<button class="layui-btn" type="button" id="ListPicBtn">选择图片</button>
-<div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("SchoolMakerStudyListPic"))</div>
-</div>
-<div style="margin-top:10px;" id="ListPicImage">
-@if (!string.IsNullOrEmpty(editData.ListPic))
-{
-<img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.ListPic" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.ListPic')">
-}
-</div>
-</div>
-</div>
-<div class="layui-form-item layui-form-text">
-<label class="layui-form-label">内容</label>
-<div class="layui-input-block">
-<textarea class="layui-textarea" id="Contents" name="Contents" placeholder="请输入内容" style="width:100%;height:500px;">@(MySystem.OssHelper.Instance.CheckOSSPic(editData.Contents))</textarea>
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">外链</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Url" name="Url" value="@editData.Url" maxlength="500" lay-verify="" autocomplete="off" placeholder="请输入外链">
-</div>
-</div>
-
-</div>
+            <div class="layui-card-body">
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <ul class="layui-tab-title">
+                        <li class="layui-this" lay-id="1">基本资料</li>
+                    </ul>
+                    <div class="layui-tab-content mt20">
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">标题</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="Title" name="Title"
+                                        value="@editData.Title" maxlength="50" lay-verify="required|" autocomplete="off"
+                                        placeholder="请输入标题">
+                                </div>
+                            </div>
+                            <div class="layui-form-item layui-form-text">
+                                <label class="layui-form-label">介绍</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="Detail" name="Detail" maxlength="200"
+                                        lay-verify="required|" placeholder="请输入介绍">@editData.Detail</textarea>
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">主讲人</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="SeoTitle" name="SeoTitle"
+                                        value="@editData.SeoTitle" maxlength="50" lay-verify="required|" autocomplete="off"
+                                        placeholder="请输入标题">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">学习人数</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="QueryCount" name="QueryCount"
+                                        value="@editData.QueryCount" maxlength="50" lay-verify="required|int|" autocomplete="off"
+                                        placeholder="请输入学习人数">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">列表图片</label>
+                                <div class="layui-input-block">
+                                    <div class="layui-upload">
+                                        <input type="hidden" id="ListPic" name="ListPic" value="@editData.ListPic">
+                                        <button class="layui-btn" type="button" id="ListPicBtn">选择图片</button>
+                                        <div class="layui-inline layui-word-aux">@(new
+                                            MySystem.PublicFunction().GetUploadHint("SchoolMakerStudyListPic"))</div>
+                                    </div>
+                                    <div style="margin-top:10px;" id="ListPicImage">
+                                        @if (!string.IsNullOrEmpty(editData.ListPic))
+                                        {
+                                            <img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.ListPic"
+                                            class="layui-upload-img" style="max-width:85px; max-height:85px;"
+                                            onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.ListPic')">
+                                        }
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-form-item layui-form-text">
+                                <label class="layui-form-label">内容</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="Contents" name="Contents" placeholder="请输入内容"
+                                        style="width:100%;height:500px;">@(MySystem.OssHelper.Instance.CheckOSSPic(editData.Contents))</textarea>
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">外链</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="Url" name="Url" value="@editData.Url"
+                                        maxlength="500" lay-verify="" autocomplete="off" placeholder="请输入外链">
+                                </div>
+                            </div>
+
+                        </div>
 
+                    </div>
+                </div>
+                <div class="layui-form-item layui-hide">
+                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
+                        value="确认">
                 </div>
             </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
         </div>
     </div>
 
@@ -88,13 +118,13 @@
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         //内容
- @(Html.Raw(Library.Control.kindeditorVar("Contents")))
+        @(Html.Raw(Library.Control.kindeditorVar("Contents")))
 
-        
-        //编辑器
-        KindEditor.ready(function (K) {
-            //内容
- @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
+
+            //编辑器
+            KindEditor.ready(function (K) {
+                //内容
+        @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
 
         });
 
@@ -220,34 +250,35 @@
             tree = layui.tree;
             element = layui.element;
             upload = layui.upload;
-        
+
             //Hash地址的定位
             var layid = location.hash.replace(/^#test=/, '');
             element.tabChange('test', layid);
             element.on('tab(test)', function (elem) {
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
-    
+
             //日期
-            
+
 
             //上传文件
             WebUploadJs('ListPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("SchoolMakerStudyListPic"))), function (filename) {
-$('#ListPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
-$('#ListPic').val(filename);
-});
+                $('#ListPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+                $('#ListPic').val(filename);
+            });
 
 
             //穿梭框
-            
+
 
             //TreeView,比如权限管理
-            
+
 
             //省市区
-            
+
         })
 
     </script>
 </body>
+
 </html>

+ 107 - 74
Areas/Admin/Views/MainServer/SchoolMorningMeet/Add.cshtml

@@ -1,83 +1,115 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>商学院每日晨会(增加)</title>
     <meta name="renderer" content="webkit">
     <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">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <script src="/admin/js/LAreaData2.js"></script>
 </head>
+
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        
+
         <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本资料</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">标题</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Title" name="Title" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入标题">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">主讲</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Lecturer" name="Lecturer" maxlength="30" lay-verify="required|" autocomplete="off" placeholder="请输入主讲">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">照片</label>
-<div class="layui-input-block">
-<div class="layui-upload">
-<input type="hidden" id="Photo" name="Photo" value="">
-<button class="layui-btn" type="button" id="PhotoBtn">选择图片</button>
-<div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("SchoolMorningMeetPhoto"))</div>
-</div>
-<div style="margin-top:10px;" id="PhotoImage">
-</div>
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">学习人数</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="StudyPerson" name="StudyPerson" maxlength="20" lay-verify="required|int|" autocomplete="off" placeholder="请输入学习人数">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">外链</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Url" name="Url" maxlength="500" lay-verify="" autocomplete="off" placeholder="请输入外链">
-</div>
-</div>
-<div class="layui-form-item layui-form-text">
-<label class="layui-form-label">内容</label>
-<div class="layui-input-block">
-<textarea class="layui-textarea" id="Contents" name="Contents" placeholder="请输入内容" style="width:100%;height:500px;"></textarea>
-</div>
-</div>
-
-</div>
+            <div class="layui-card-body">
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <ul class="layui-tab-title">
+                        <li class="layui-this" lay-id="1">基本资料</li>
+                    </ul>
+                    <div class="layui-tab-content mt20">
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">标题</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="Title" name="Title" maxlength="50"
+                                        lay-verify="required|" autocomplete="off" placeholder="请输入标题">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">主讲</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="Lecturer" name="Lecturer" maxlength="30"
+                                        lay-verify="required|" autocomplete="off" placeholder="请输入主讲">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">照片</label>
+                                <div class="layui-input-block">
+                                    <div class="layui-upload">
+                                        <input type="hidden" id="Photo" name="Photo" value="">
+                                        <button class="layui-btn" type="button" id="PhotoBtn">选择图片</button>
+                                        <div class="layui-inline layui-word-aux">@(new
+                                            MySystem.PublicFunction().GetUploadHint("SchoolMorningMeetPhoto"))</div>
+                                    </div>
+                                    <div style="margin-top:10px;" id="PhotoImage">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">学习人数</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="StudyPerson" name="StudyPerson"
+                                        maxlength="20" lay-verify="required|int|" autocomplete="off"
+                                        placeholder="请输入学习人数">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">APP外链</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="Url" name="Url" maxlength="500"
+                                        lay-verify="" autocomplete="off" placeholder="请输入APP外链">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">小程序外链Id</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="SeoTitle" name="SeoTitle" maxlength="500"
+                                        lay-verify="" autocomplete="off" placeholder="请输入小程序Id">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">小程序外链</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="SeoKeyword" name="SeoKeyword" maxlength="500"
+                                        lay-verify="" autocomplete="off" placeholder="请输入小程序外链">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">录播外链</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="SeoDescription" name="SeoDescription" maxlength="500"
+                                        lay-verify="" autocomplete="off" placeholder="请输入录播外链">
+                                </div>
+                            </div>
+                            <div class="layui-form-item layui-form-text">
+                                <label class="layui-form-label">内容</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="Contents" name="Contents" placeholder="请输入内容"
+                                        style="width:100%;height:500px;"></textarea>
+                                </div>
+                            </div>
+
+                        </div>
 
+                    </div>
+                </div>
+                <div class="layui-form-item layui-hide">
+                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
+                        value="确认">
                 </div>
             </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
         </div>
     </div>
 
@@ -87,13 +119,13 @@
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         //内容
- @(Html.Raw(Library.Control.kindeditorVar("Contents")))
+        @(Html.Raw(Library.Control.kindeditorVar("Contents")))
 
-                    
-        //编辑器
-        KindEditor.ready(function (K) {
-            //内容
- @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
+
+            //编辑器
+            KindEditor.ready(function (K) {
+                //内容
+                @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
 
         });
 
@@ -200,7 +232,7 @@
             });
         }
 
-        
+
         var tree;
         var element;
         var upload;
@@ -220,34 +252,35 @@
             tree = layui.tree;
             element = layui.element;
             upload = layui.upload;
-        
+
             //Hash地址的定位
             var layid = location.hash.replace(/^#test=/, '');
             element.tabChange('test', layid);
             element.on('tab(test)', function (elem) {
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
-    
+
             //日期
-            
+
 
             //上传文件
             WebUploadJs('PhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("SchoolMorningMeetPhoto"))), function (filename) {
-$('#PhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
-$('#Photo').val(filename);
-});
+                $('#PhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+                $('#Photo').val(filename);
+            });
 
 
             //穿梭框
-            
+
 
             //TreeView,比如权限管理
-            
+
 
             //省市区
-            
+
         })
 
     </script>
 </body>
+
 </html>

+ 116 - 77
Areas/Admin/Views/MainServer/SchoolMorningMeet/Edit.cshtml

@@ -1,90 +1,128 @@
 @using MySystem.Models;
-@{SchoolMorningMeet editData = ViewBag.data as SchoolMorningMeet;}
+@{
+    SchoolMorningMeet editData = ViewBag.data as SchoolMorningMeet;
+}
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>商学院每日晨会(修改)</title>
     <meta name="renderer" content="webkit">
     <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">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <script src="/admin/js/LAreaData2.js"></script>
 </head>
+
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
         <input type="hidden" name="Id" value="@editData.Id" />
-        
+
         <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本资料</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">标题</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Title" name="Title" value="@editData.Title" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入标题">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">主讲</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Lecturer" name="Lecturer" value="@editData.Lecturer" maxlength="30" lay-verify="required|" autocomplete="off" placeholder="请输入主讲">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">照片</label>
-<div class="layui-input-block">
-<div class="layui-upload">
-<input type="hidden" id="Photo" name="Photo" value="@editData.Photo">
-<button class="layui-btn" type="button" id="PhotoBtn">选择图片</button>
-<div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("SchoolMorningMeetPhoto"))</div>
-</div>
-<div style="margin-top:10px;" id="PhotoImage">
-@if (!string.IsNullOrEmpty(editData.Photo))
-{
-<img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.Photo" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.Photo')">
-}
-</div>
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">学习人数</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="StudyPerson" name="StudyPerson" value="@editData.StudyPerson" maxlength="20" lay-verify="required|int|" autocomplete="off" placeholder="请输入学习人数">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">外链</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Url" name="Url" value="@editData.Url" maxlength="500" lay-verify="" autocomplete="off" placeholder="请输入外链">
-</div>
-</div>
-<div class="layui-form-item layui-form-text">
-<label class="layui-form-label">内容</label>
-<div class="layui-input-block">
-<textarea class="layui-textarea" id="Contents" name="Contents" placeholder="请输入内容" style="width:100%;height:500px;">@(MySystem.OssHelper.Instance.CheckOSSPic(editData.Contents))</textarea>
-</div>
-</div>
+            <div class="layui-card-body">
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <ul class="layui-tab-title">
+                        <li class="layui-this" lay-id="1">基本资料</li>
+                    </ul>
+                    <div class="layui-tab-content mt20">
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">标题</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="Title" name="Title"
+                                        value="@editData.Title" maxlength="50" lay-verify="required|" autocomplete="off"
+                                        placeholder="请输入标题">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">主讲</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="Lecturer" name="Lecturer"
+                                        value="@editData.Lecturer" maxlength="30" lay-verify="required|"
+                                        autocomplete="off" placeholder="请输入主讲">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">照片</label>
+                                <div class="layui-input-block">
+                                    <div class="layui-upload">
+                                        <input type="hidden" id="Photo" name="Photo" value="@editData.Photo">
+                                        <button class="layui-btn" type="button" id="PhotoBtn">选择图片</button>
+                                        <div class="layui-inline layui-word-aux">@(new
+                                            MySystem.PublicFunction().GetUploadHint("SchoolMorningMeetPhoto"))</div>
+                                    </div>
+                                    <div style="margin-top:10px;" id="PhotoImage">
+                                        @if (!string.IsNullOrEmpty(editData.Photo))
+                                        {
+                                            <img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.Photo"
+                                            class="layui-upload-img" style="max-width:85px; max-height:85px;"
+                                            onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.Photo')">
+                                        }
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">学习人数</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="StudyPerson" name="StudyPerson"
+                                        value="@editData.StudyPerson" maxlength="20" lay-verify="required|int|"
+                                        autocomplete="off" placeholder="请输入学习人数">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">APP外链</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="Url" name="Url" value="@editData.Url"
+                                        maxlength="500" lay-verify="" autocomplete="off" placeholder="请输入APP外链">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">小程序外链Id</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="SeoTitle" name="SeoTitle" value="@editData.SeoTitle"
+                                        maxlength="500" lay-verify="" autocomplete="off" placeholder="请输入小程序外链Id">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">小程序外链</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="SeoKeyword" name="SeoKeyword" value="@editData.SeoKeyword"
+                                        maxlength="500" lay-verify="" autocomplete="off" placeholder="请输入小程序外链">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">录播外链</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="SeoDescription" name="SeoDescription" value="@editData.SeoDescription"
+                                        maxlength="500" lay-verify="" autocomplete="off" placeholder="请输入录播外链">
+                                </div>
+                            </div>
+                            <div class="layui-form-item layui-form-text">
+                                <label class="layui-form-label">内容</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="Contents" name="Contents" placeholder="请输入内容"
+                                        style="width:100%;height:500px;">@(MySystem.OssHelper.Instance.CheckOSSPic(editData.Contents))</textarea>
+                                </div>
+                            </div>
 
-</div>
+                        </div>
 
+                    </div>
+                </div>
+                <div class="layui-form-item layui-hide">
+                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
+                        value="确认">
                 </div>
             </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
         </div>
     </div>
 
@@ -94,13 +132,13 @@
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         //内容
- @(Html.Raw(Library.Control.kindeditorVar("Contents")))
+        @(Html.Raw(Library.Control.kindeditorVar("Contents")))
 
-        
-        //编辑器
-        KindEditor.ready(function (K) {
-            //内容
- @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
+
+            //编辑器
+            KindEditor.ready(function (K) {
+                //内容
+        @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
 
         });
 
@@ -226,34 +264,35 @@
             tree = layui.tree;
             element = layui.element;
             upload = layui.upload;
-        
+
             //Hash地址的定位
             var layid = location.hash.replace(/^#test=/, '');
             element.tabChange('test', layid);
             element.on('tab(test)', function (elem) {
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
-    
+
             //日期
-            
+
 
             //上传文件
             WebUploadJs('PhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("SchoolMorningMeetPhoto"))), function (filename) {
-$('#PhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
-$('#Photo').val(filename);
-});
+                $('#PhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+                $('#Photo').val(filename);
+            });
 
 
             //穿梭框
-            
+
 
             //TreeView,比如权限管理
-            
+
 
             //省市区
-            
+
         })
 
     </script>
 </body>
+
 </html>

+ 9 - 1
Areas/Admin/Views/MainServer/SysTools/Loop.cshtml

@@ -63,6 +63,14 @@
                                 <input class="layui-input" type="text" name="SendSn" id="SendSn" autocomplete="off">
                             </div>
                         </div>
+                        <div class="layui-inline ml50">
+                            <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
+                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
+                            </button>
+                            <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
+                                <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
+                            </button>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -81,7 +89,7 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/SysTools_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/layuiadmin/modules_main/Loop_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
 </body>
 
 </html>

+ 741 - 0
wwwroot/layuiadmin/modules_main/Loop_Admin.js

@@ -0,0 +1,741 @@
+/*
+ * @Author: DuGuYang 2731498193@qq.com
+ * @Date: 2022-09-19 11:13:43
+ * @LastEditors: DuGuYang 2731498193@qq.com
+ * @LastEditTime: 2022-09-22 15:26:37
+ * @FilePath: /admin-server/wwwroot/layuiadmin/modules_main/SysTools_Admin.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+var ExcelData, ExcelKind;
+
+function ConfirmImport() {
+    var index = layer.load(1, {
+        shade: [0.5, '#000']
+    });
+    $.ajax({
+        type: "POST",
+        url: "/Admin/StoreHouse/Import?r=" + Math.random(1),
+        data: "Kind=" + ExcelKind + "&ExcelData=" + encodeURIComponent(JSON.stringify(ExcelData)),
+        dataType: "text",
+        success: function (data) {
+            layer.close(index);
+            if (data.indexOf("success") == 0) {
+                layer.msg("成功操作" + data.split('|')[1] + "部机具", {
+                    time: 2000
+                }, function () {
+                    window.location.reload();
+                });
+            } else {
+                layer.msg(data);
+            }
+        }
+    });
+}
+
+function CheckImport(table, key, loadindex, index) {
+    $.ajax({
+        url: "/Admin/StoreHouse/CheckImportV2?r=" + Math.random(1),
+        data: "key=" + key,
+        dataType: "json",
+        success: function (data) {
+            if (data.status == 1) {
+                layer.msg("成功操作" + data.data + "部机具", {
+                    time: 2000
+                }, function () {
+                    layer.close(index); //关闭弹层
+                    layer.close(loadindex);
+                    table.reload('LAY-list-manage'); //数据刷新
+                });
+            } else if (data.status == 2) {
+                layer.close(index); //关闭弹层
+                layer.close(loadindex);
+                var content = '';
+                for (var i = 0; i < data.errList.length; i++) {
+                    content += data.errList[i] + '<br/>'
+                }
+                layer.alert(content);
+            } else {
+                layer.msg(data.data, {
+                    time: 1000
+                }, function () {
+                    CheckImport(table, key, loadindex, index);
+                });
+            }
+        }
+    });
+}
+
+var excel;
+layui.config({
+    base: '/layuiadmin/' //静态资源所在路径
+}).extend({
+    myexcel: 'layui/lay/modules/excel',
+    index: 'lib/index' //主入口模块
+}).use(['index', 'table', 'excel', 'laydate'], function () {
+    var $ = layui.$,
+        form = layui.form,
+        table = layui.table;
+
+    //- 筛选条件-日期
+    var laydate = layui.laydate;
+    var layCreateDate = laydate.render({
+        elem: '#CreateDate',
+        type: 'datetime',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layCreateDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateDate').val(value);
+            }
+        }
+    });
+
+
+    //excel导入
+    excel = layui.excel;
+    $('#ExcelFile').change(function (e) {
+        var files = e.target.files;
+        excel.importExcel(files, {}, function (data) {
+            ExcelData = data[0].Sheet1;
+        });
+    });
+
+    //监听单元格编辑
+    table.on('edit(LAY-list-manage)', function (obj) {
+        var value = obj.value //得到修改后的值
+            ,
+            data = obj.data //得到所在行所有键值
+            ,
+            field = obj.field; //得到字段
+        if (field == "Sort") {
+            $.ajax({
+                type: "POST",
+                url: "/Admin/StoreHouse/Sort?r=" + Math.random(1),
+                data: "Id=" + data.Id + "&Sort=" + value,
+                dataType: "text",
+                success: function (data) { }
+            });
+        }
+    });
+
+    //列表数据
+    table.render({
+        elem: '#LAY-list-manage'
+        , url: '/Admin/SysTools/LoopData' //模拟接口
+        , cols: [[
+            { type: 'checkbox', fixed: 'left' }
+            , { field: 'ApplyNo', width: 200, title: '申请订单号', sort: true }
+            , { field: 'OrderNo', width: 200, title: '订单号', sort: true }
+            , { field: 'MakerCode', width: 200, title: '创客编号', sort: true }
+            , { field: 'RealName', width: 200, title: '创客姓名', sort: true }
+            , { field: 'ComeSn', width: 200, title: '来源机具SN', sort: true, templet: '#Loop' }
+            , { field: 'SendSn', width: 200, title: '发货SN', sort: true, templet: '#Loop' }
+            , { field: 'CreateDate', width: 200, title: '申请时间', sort: true }
+            , { field: 'Status', width: 200, title: '申请状态', sort: true }
+            , { title: '操作', width: 1500, align: 'left', toolbar: '#table-list-tools' }
+        ]]
+        , where: {
+        }
+        , page: true
+        , limit: 30
+        , height: 'full-' + String($('.layui-card-header').height() + 130)
+        , text: '对不起,加载出现异常!'
+        , done: function (res, curr, count) {
+            $(".layui-none").text("无数据");
+        }
+    });
+
+    $('.layui-btn').on('click', function () {
+        var type = $(this).data('type');
+        active[type] ? active[type].call(this) : '';
+    });
+
+    //监听工具条
+    table.on('tool(LAY-list-manage)', function (obj) {
+        var data = obj.data;
+        if (obj.event === 'del') {
+            var index = layer.confirm('确定要删除吗?删除后不能恢复!', function (index) {
+                $.ajax({
+                    type: "POST",
+                    url: "/Admin/StoreHouse/Delete?r=" + Math.random(1),
+                    data: "Id=" + data.Id,
+                    dataType: "text",
+                    success: function (data) {
+                        if (data == "success") {
+                            obj.del();
+                            layer.close(index);
+                        } else {
+                            parent.layer.msg(data);
+                        }
+                    }
+                });
+            });
+        } else if (obj.event === 'sycn') {
+            var index = layer.confirm('确定要同步该仓库的库存数据吗?', function (index) {
+                layer.close(index);
+                var loadindex = layer.load(1, {
+                    shade: [0.5, '#000']
+                });
+                $.ajax({
+                    type: "POST",
+                    url: "/Admin/StoreHouse/SycnData?r=" + Math.random(1),
+                    data: "Id=" + data.Id,
+                    dataType: "text",
+                    success: function (data) {
+                        layer.close(loadindex);
+                        if (data == "success") {
+                            layer.msg('同步成功');
+                            table.reload('LAY-list-manage');
+                        } else {
+                            layer.msg(data);
+                        }
+                    }
+                });
+            });
+        } else if (obj.event === 'edit') {
+            var tr = $(obj.tr);
+            var perContent = layer.open({
+                type: 2,
+                title: '仓库-编辑',
+                content: 'Edit?Id=' + data.Id + '',
+                maxmin: true,
+                area: ['800px', '650px'],
+                btn: ['确定', '取消'],
+                yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index],
+                        submitID = 'LAY-list-front-submit',
+                        submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+
+
+
+
+
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后,静态更新表格中的数据
+                        //$.ajax({});
+
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/StoreHouse/Edit?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                if (data == "success") {
+                                    layer.close(index); //关闭弹层
+                                    table.reload('LAY-list-manage'); //数据刷新
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                },
+                success: function (layero, index) {
+
+                }
+            });
+        } else if (obj.event === 'edits') {
+            var tr = $(obj.tr);
+            var perContent = layer.open({
+                type: 2,
+                title: '一键新建仓库',
+                content: 'Edits?Id=' + data.Id + '',
+                maxmin: true,
+                area: ['860px', '650px'],
+                btn: ['确定', '取消'],
+                yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index],
+                        submitID = 'LAY-list-front-submit',
+                        submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+
+
+
+
+
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后,静态更新表格中的数据
+                        //$.ajax({});
+
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/StoreHouse/Edits?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                if (data == "success") {
+                                    layer.close(index); //关闭弹层
+                                    table.reload('LAY-list-manage'); //数据刷新
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                },
+                success: function (layero, index) {
+
+                }
+            });
+        }
+    });
+
+
+    //监听搜索
+    form.on('submit(LAY-list-front-search)', function (data) {
+        var field = data.field;
+
+        //执行重载
+        table.reload('LAY-list-manage', {
+            where: field,
+            page: {
+                curr: 1
+            }
+        });
+    });
+    form.on('submit(LAY-list-front-searchall)', function (data) {
+        table.reload('LAY-list-manage', {
+            where: null,
+            page: {
+                curr: 1
+            }
+        });
+    });
+
+    //事件
+    var active = {
+        batchdel: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage'),
+                data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要删除的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要删除吗?删除后不能恢复!', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/StoreHouse/Delete?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        },
+        add: function () {
+            var perContent = layer.open({
+                type: 2,
+                title: '仓库-添加',
+                content: 'Add',
+                maxmin: true,
+                area: ['950px', '650px'],
+                btn: ['确定', '取消'],
+                yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index],
+                        submitID = 'LAY-list-front-submit',
+                        submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+
+
+
+
+
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后,静态更新表格中的数据
+                        //$.ajax({});
+
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/StoreHouse/Add?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                if (data == "success") {
+                                    layer.close(index); //关闭弹层
+                                    table.reload('LAY-list-manage'); //数据刷新
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+            });
+        },
+        ImportMachine: function () {
+            var perContent = layer.open({
+                type: 2,
+                title: '机具入库',
+                content: 'Import?ExcelKind=1',
+                maxmin: true,
+                area: ['650px', '350px'],
+                btn: ['确定', '取消'],
+                yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index],
+                        submitID = 'LAY-list-front-submit',
+                        submit = layero.find('iframe').contents().find('#' + submitID);
+
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后,静态更新表格中的数据
+                        //$.ajax({});
+                        var loadindex = layer.load(1, {
+                            shade: [0.5, '#000']
+                        });
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/StoreHouse/ImportPost?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                if (data.indexOf("success") == 0) {
+                                    var datalist = data.split('|');
+                                    var key = datalist[1];
+                                    CheckImport(table, key, loadindex, index);
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+            });
+        },
+        ImportChange: function () {
+            var perContent = layer.open({
+                type: 2,
+                title: '仓库调拨',
+                content: 'Import?ExcelKind=2',
+                maxmin: true,
+                area: ['650px', '350px'],
+                btn: ['确定', '取消'],
+                yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index],
+                        submitID = 'LAY-list-front-submit',
+                        submit = layero.find('iframe').contents().find('#' + submitID);
+
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后,静态更新表格中的数据
+                        //$.ajax({});
+                        var loadindex = layer.load(1, {
+                            shade: [0.5, '#000']
+                        });
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/StoreHouse/ImportPost?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                if (data.indexOf("success") == 0) {
+                                    var datalist = data.split('|');
+                                    var key = datalist[1];
+                                    CheckImport(table, key, loadindex, index);
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+            });
+        },
+        ImportSend: function () {
+            var perContent = layer.open({
+                type: 2,
+                title: '仓库发货至创客',
+                content: 'Import?ExcelKind=3',
+                maxmin: true,
+                area: ['650px', '350px'],
+                btn: ['确定', '取消'],
+                yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index],
+                        submitID = 'LAY-list-front-submit',
+                        submit = layero.find('iframe').contents().find('#' + submitID);
+
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后,静态更新表格中的数据
+                        //$.ajax({});
+                        var loadindex = layer.load(1, {
+                            shade: [0.5, '#000']
+                        });
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/StoreHouse/ImportPost?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                if (data.indexOf("success") == 0) {
+                                    var datalist = data.split('|');
+                                    var key = datalist[1];
+                                    CheckImport(table, key, loadindex, index);
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+            });
+        },
+        ImportBack: function () {
+            var perContent = layer.open({
+                type: 2,
+                title: '机具回仓库',
+                content: 'Import?ExcelKind=4',
+                maxmin: true,
+                area: ['650px', '350px'],
+                btn: ['确定', '取消'],
+                yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index],
+                        submitID = 'LAY-list-front-submit',
+                        submit = layero.find('iframe').contents().find('#' + submitID);
+
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后,静态更新表格中的数据
+                        //$.ajax({});
+                        var loadindex = layer.load(1, {
+                            shade: [0.5, '#000']
+                        });
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/StoreHouse/ImportPost?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                if (data.indexOf("success") == 0) {
+                                    var datalist = data.split('|');
+                                    var key = datalist[1];
+                                    CheckImport(table, key, loadindex, index);
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+            });
+        },
+        ExportExcel: function () {
+            var userdata = '';
+            $(".layuiadmin-card-header-auto input").each(function (i) {
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            $(".layuiadmin-card-header-auto select").each(function (i) {
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            $.ajax({
+                type: "GET",
+                url: "/Admin/StoreHouse/ExportExcel?r=" + Math.random(1),
+                data: userdata,
+                dataType: "json",
+                success: function (data) {
+                    data.Obj.unshift(data.Fields);
+                    excel.exportExcel(data.Obj, data.Info, 'xlsx');
+                }
+            });
+        },
+        Open: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage'),
+                data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要开启的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要开启吗?', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/StoreHouse/Open?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        },
+        Close: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage'),
+                data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要关闭的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要关闭吗?', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/StoreHouse/Close?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        },
+        SycnData: function () {
+            var index = layer.confirm('确定要同步所有仓库的库存数据吗?', function (index) {
+                layer.close(index);
+                var loadindex = layer.load(1, {
+                    shade: [0.5, '#000']
+                });
+                $.ajax({
+                    type: "POST",
+                    url: "/Admin/StoreHouse/SycnData?r=" + Math.random(1),
+                    data: "Id=0",
+                    dataType: "text",
+                    success: function (data) {
+                        layer.close(loadindex);
+                        if (data == "success") {
+                            layer.msg('同步成功');
+                            table.reload('LAY-list-manage');
+                        } else {
+                            layer.msg(data);
+                        }
+                    }
+                });
+            });
+        },
+    };
+
+    $('.layui-btn').on('click', function () {
+        var type = $(this).data('type');
+        active[type] ? active[type].call(this) : '';
+    });
+});

+ 4 - 3
wwwroot/layuiadmin/modules_main/SchoolMakerStudy_Admin.js

@@ -94,9 +94,10 @@ layui.config({
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
             , { field: 'Title', width: 200, title: '标题', sort: true }
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
-            , { field: 'StatusName', width: 200, title: '状态', sort: true }
-
-            , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
+            , { field: 'SeoTitle', width: 200, title: '主讲人', sort: true }
+            , { field: 'QueryCount', width: 200, title: '学习人数', sort: true }
+            // , { field: 'StatusName', width: 200, title: '状态', sort: true }
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {

+ 2 - 3
wwwroot/layuiadmin/modules_main/SchoolMorningMeet_Admin.js

@@ -94,11 +94,10 @@ layui.config({
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
             , { field: 'Title', width: 200, title: '标题', sort: true }
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
-            , { field: 'StatusName', width: 200, title: '状态', sort: true }
+            // , { field: 'StatusName', width: 200, title: '状态', sort: true }
             , { field: 'Lecturer', width: 200, title: '主讲', sort: true }
             , { field: 'StudyPerson', width: 200, title: '学习人数', sort: true }
-
-            , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {

+ 0 - 31
wwwroot/layuiadmin/modules_main/SysTools_Admin.js

@@ -1,31 +0,0 @@
-//列表数据
-table.render({
-    elem: '#LAY-list-manage'
-    , url: '/Admin/SysTools/IndexData' //模拟接口
-    , cols: [[
-        { type: 'checkbox', fixed: 'left' }
-        , { field: 'ApplyNo', width: 200, title: '申请订单号', sort: true }
-        , { field: 'OrderNo', width: 200, title: '订单号', sort: true }
-        , { field: 'MakerCode', width: 200, title: '创客编号', sort: true }
-        , { field: 'RealName', width: 200, title: '创客姓名', sort: true }
-        , { field: 'ComeSn', width: 200, title: '来源机具SN', sort: true, templet: '#Loop' }
-        , { field: 'SendSn', width: 200, title: '发货SN', sort: true, templet: '#Loop' }
-        , { field: 'CreateDate', width: 200, title: '申请时间', sort: true }
-        , { field: 'Status', width: 200, title: '申请状态', sort: true }
-        , { title: '操作', width: 1500, align: 'left', toolbar: '#table-list-tools' }
-    ]]
-    , where: {
-    }
-    , page: true
-    , limit: 30
-    , height: 'full-' + String($('.layui-card-header').height() + 130)
-    , text: '对不起,加载出现异常!'
-    , done: function (res, curr, count) {
-        $(".layui-none").text("无数据");
-    }
-});
-
-$('.layui-btn').on('click', function () {
-    var type = $(this).data('type');
-    active[type] ? active[type].call(this) : '';
-});