调整新建分仓

调整弹窗

Areas/Admin/Controllers/BsServer/MsgPlacardController.cs

@@ -143,6 +143,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             Fields.Add("MsgType", data.MsgType); //消息类型
             Fields.Add("Title", data.Title); //标题
+            Fields.Add("Sort", data.Sort); //是否开放
             Fields.Add("Summary", data.Summary); //简介
             Fields.Add("Content", data.Content); //内容
             Fields.Add("ShowType", data.ShowType); //展示类型
@@ -164,16 +165,6 @@ namespace MySystem.Areas.Admin.Controllers
             AddSysLog(Id.ToString(), "MsgPlacard", "add");
             db.SaveChanges();
 
-            SetRedis(Id, true);
-
-            List<int> uids = db.Users.Select(m => m.Id).ToList();
-            foreach (int uid in uids)
-            {
-                MsgNotRead msg = RedisDbconn.Instance.Get<MsgNotRead>("MsgNotRead:" + uid) ?? new MsgNotRead();
-                msg.PlacardCount += 1;
-                RedisDbconn.Instance.Set("MsgNotRead:" + uid, msg);
-            }
-
             return "success";
         }
 
@@ -211,6 +202,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             Fields.Add("MsgType", data.MsgType); //消息类型
             Fields.Add("Title", data.Title); //标题
+            Fields.Add("Sort", data.Sort); //是否开放
             Fields.Add("Summary", data.Summary); //简介
             Fields.Add("Content", data.Content); //内容
             Fields.Add("ShowType", data.ShowType); //展示类型

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -308,14 +308,7 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         return "您输入的仓库归属创客编号不存在，请重新输入正确的仓库归属创客编号";
                     }
-                    var check = db.StoreHouse.Any(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == user.UserId);
-                    var OpId = 0;
-                    if (check)
-                    {
-                        var store = db.StoreHouse.FirstOrDefault(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == user.UserId);
-                        OpId = store.OpId;
-                        Fields.Add("OpId", OpId); //关联运营中心
-                    }
+
                     Fields.Add("UserId", user.UserId); //仓库归属人
                     Fields.Add("Areas", data.Areas); //所属地区
                     Fields.Add("Address", data.Address); //仓库地址
@@ -344,6 +337,8 @@ namespace MySystem.Areas.Admin.Controllers
                     }
 
                     int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("StoreHouse", Fields, 0);
+                    int StoreId = Id;
+                    var StoreNos = "";
                     //添加分仓创建时间
                     var users = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
                     if (users.Id > 0)
@@ -364,6 +359,7 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                         No = "S" + No;
                         edit.StoreNo = No;
+                        StoreNos = No;
                         db.StoreForCode.Add(new StoreForCode()
                         {
                             Code = No,
@@ -400,9 +396,36 @@ namespace MySystem.Areas.Admin.Controllers
                         account.ValidAmount = 20000;
                     }
 
+                    var check = db.StoreHouse.Any(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == user.UserId);
+                    var OpId = 0;
+                    if (check)
+                    {
+                        var store = db.StoreHouse.FirstOrDefault(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == user.UserId);
+                        OpId = store.OpId;
+                        Fields.Add("OpId", OpId); //关联运营中心
+                        var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Sort == m.QueryCount && m.UserId == OpId) ?? new OpModels.SysAdmin();
+                        sysAdmin.StoreCount += 1;
+                        var query = opdb.StoreForOperate.FirstOrDefault(m => m.OpId == sysAdmin.UserId && m.StoreId == StoreId && m.Sort == 0 && m.QueryCount == user.UserId && m.Status == 0);
+                        if (query == null)
+                        {
+                            query = opdb.StoreForOperate.Add(new OpModels.StoreForOperate()
+                            {
+                                CreateDate = DateTime.Now, //创建时间
+                                CreateMan = SysUserName + "_" + SysRealName,
+                                QueryCount = user.UserId,//分仓所属人Id
+                                SeoTitle = user.MakerCode,
+                                SeoKeyword = StoreNos,
+                                SeoDescription = data.StoreName,
+                                OpId = sysAdmin.UserId,
+                                StoreId = StoreId,
+                            }).Entity;
+                        }
+                    }
+
                     RedisDbconn.Instance.Set("StoreForName:" + data.StoreName, Id);
                     AddSysLog(data.Id.ToString(), "StoreHouse", "add");
                     db.SaveChanges();
+                    opdb.SaveChanges();
 
                     SetRedis(Id, user.UserId);
                 }

Areas/Admin/Views/BsServer/MsgPersonal/Add.cshtml

@@ -41,8 +41,7 @@
                                 <div class="layui-upload">
                                     <input type="hidden" id="BgPic" name="BgPic" value="">
                                     <button class="layui-btn" type="button" id="BgPicBtn">选择图片</button>
-                                    <div class="layui-inline layui-word-aux">@(new
-                                        MySystem.PublicFunction().GetUploadHint("MsgPersonalBgPic"))</div>
+                                    <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("MsgPersonalBgPic"))</div>
                                 </div>
                                 <div style="margin-top:10px;" id="BgPicImage">
                                 </div>

Areas/Admin/Views/BsServer/MsgPlacard/Add.cshtml

@@ -1,163 +1,179 @@
 @{
     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>
     <style>
-        .layui-form-label{
+        .layui-form-label {
             width: 115px !important;
         }
-        .layui-form-item .layui-input-inline{
+
+        .layui-form-item .layui-input-inline {
             width: 250px !important;
         }
-        .layui-form-item .layui-input-block{
+
+        .layui-form-item .layui-input-block {
             margin-left: 145px !important;
         }
     </style>
 </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">
-                <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">
-                                <select id="ShowType" name="ShowType" lay-search="">
-                                    <option value="">请选择</option>
-                                    <option value="0">系统消息</option>
-                                    <option value="1">首页弹层提示</option>
-                                </select>
+            <div class="layui-card-body">
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <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">
+                                    <select id="ShowType" name="ShowType" lay-search="">
+                                        <option value="">请选择</option>
+                                        <option value="0">系统消息</option>
+                                        <option value="1">首页弹层提示</option>
+                                    </select>
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">消息类型</label>
-                            <div class="layui-input-inline">
-                                <select id="MsgType" name="MsgType" lay-search="" lay-filter="MsgType">
-                                    <option value="0">html页面</option>
-                                    <option value="1">指定url</option>
-                                    <option value="2">简单中文描述</option>
-                                </select>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">消息类型</label>
+                                <div class="layui-input-inline">
+                                    <select id="MsgType" name="MsgType" lay-search="" lay-filter="MsgType">
+                                        <option value="0">html页面</option>
+                                        <option value="1">指定url</option>
+                                        <option value="2">简单中文描述</option>
+                                    </select>
+                                </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="Title" name="Title" maxlength="50"
-                                    lay-verify="required," autocomplete="off" placeholder="请输入标题">
+                            <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>
-                        <div class="layui-form-item layui-form-text">
-                            <label class="layui-form-label">推送内容</label>
-                            <div class="layui-input-inline">
-                                <textarea class="layui-textarea" id="Summary" name="Summary" maxlength="500"
-                                    lay-verify="" placeholder="请输入推送内容"></textarea>
+                            <div class="layui-form-item layui-form-text">
+                                <label class="layui-form-label">简介</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="Summary" name="Summary" maxlength="500"
+                                        lay-verify="" placeholder="请输入简介"></textarea>
+                                </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="EffectStartDate" name="EffectStartDate"
-                                    lay-verify="" autocomplete="off" placeholder="请输入有效开始时间">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">有效开始时间</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="EffectStartDate" name="EffectStartDate"
+                                        lay-verify="" autocomplete="off" placeholder="请输入有效开始时间">
+                                </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="EffectEndDate" name="EffectEndDate"
-                                    lay-verify="" autocomplete="off" placeholder="请输入有效结束时间">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">有效结束时间</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="EffectEndDate" name="EffectEndDate"
+                                        lay-verify="" autocomplete="off" placeholder="请输入有效结束时间">
+                                </div>
                             </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="BgPic" name="BgPic" value="">
-                                    <button class="layui-btn" type="button" id="BgPicBtn">选择图片</button>
-                                    <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("MsgPlacardBgPic"))</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="BgPic" name="BgPic" value="">
+                                        <button class="layui-btn" type="button" id="BgPicBtn">选择图片</button>
+                                        <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("MsgPlacardBgPic"))</div>
+                                    </div>
+                                    <div style="margin-top:10px;" id="BgPicImage">
+                                    </div>
                                 </div>
-                                <div style="margin-top:10px;" id="BgPicImage">
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">是否开放</label>
+                                <div class="layui-input-inline">
+                                    <select id="Sort" name="Sort" lay-search="" lay-filter="Sort">
+                                        <option value="0">否</option>
+                                        <option value="1">是</option>
+                                    </select>
                                 </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">推送类型</label>
-                            <div class="layui-input-inline">
-                                <select id="PushType" name="PushType" lay-search="" lay-filter="PushType">
-                                    <option value="0">不推送</option>
-                                    <option value="1">立即推送</option>
-                                    <option value="2">定时推送</option>
-                                </select>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">推送类型</label>
+                                <div class="layui-input-inline">
+                                    <select id="PushType" name="PushType" lay-search="" lay-filter="PushType">
+                                        <option value="0">不推送</option>
+                                        <option value="1">立即推送</option>
+                                        <option value="2">定时推送</option>
+                                    </select>
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item" id="PushParamDiv" style="display: none;">
-                            <label class="layui-form-label">推送参数</label>
-                            <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="PushParam" name="PushParam" maxlength="255"
-                                    lay-verify="" autocomplete="off" placeholder="请输入推送参数">
+                            <div class="layui-form-item" id="PushParamDiv" style="display: none;">
+                                <label class="layui-form-label">推送参数</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="PushParam" name="PushParam"
+                                        maxlength="255" lay-verify="" autocomplete="off" placeholder="请输入推送参数">
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item" id="PushTimeDiv" style="display: none;">
-                            <label class="layui-form-label">推送时间</label>
-                            <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="PushTime" name="PushTime" lay-verify=""
-                                    autocomplete="off" placeholder="请输入推送时间">
+                            <div class="layui-form-item" id="PushTimeDiv" style="display: none;">
+                                <label class="layui-form-label">推送时间</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="PushTime" name="PushTime" lay-verify=""
+                                        autocomplete="off" placeholder="请输入推送时间">
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item" id="UrlDiv" style="display: none;">
-                            <label class="layui-form-label">跳转Url</label>
-                            <div class="layui-input-block">
-                                <input class="layui-input" type="text" id="Url" name="Url" maxlength="500" lay-verify=""
-                                    autocomplete="off" placeholder="请输入跳转Url">
+                            <div class="layui-form-item" id="UrlDiv" style="display: none;">
+                                <label class="layui-form-label">跳转Url</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="Url" name="Url" maxlength="500"
+                                        lay-verify="" autocomplete="off" placeholder="请输入跳转Url">
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item layui-form-text" id="ContentDiv">
-                            <label class="layui-form-label">内容</label>
-                            <div class="layui-input-block">
-                                <textarea class="layui-textarea" id="Content" name="Content" placeholder="请输入内容"
-                                    style="width:100%;height:500px;"></textarea>
+                            <div class="layui-form-item layui-form-text" id="ContentDiv">
+                                <label class="layui-form-label">内容</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="Content" name="Content" 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>
 
     <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/lang/zh_CN.js"></script>
     <script>
         //内容
- @(Html.Raw(Library.Control.kindeditorVar("Content")))
+        @(Html.Raw(Library.Control.kindeditorVar("Content")))
+
 
-                    
-        //编辑器
-        KindEditor.ready(function (K) {
-            //内容
- @(Html.Raw(Library.Control.kindeditor("Content", 1)))
+            //编辑器
+            KindEditor.ready(function (K) {
+                //内容
+                @(Html.Raw(Library.Control.kindeditor("Content", 1)))
 
         });
 
@@ -264,7 +280,7 @@
             });
         }
 
-        
+
         var tree;
         var element;
         var upload;
@@ -284,7 +300,7 @@
             tree = layui.tree;
             element = layui.element;
             upload = layui.upload;
-        
+
             //Hash地址的定位
             var layid = location.hash.replace(/^#test=/, '');
             element.tabChange('test', layid);
@@ -293,69 +309,70 @@
             });
 
             form.on('select(MsgType)', function (data) {
-                if(data.value == '0') {
+                if (data.value == '0') {
                     $('#UrlDiv').hide();
                     $('#ContentDiv').show();
-                } else if(data.value == '1') {
+                } else if (data.value == '1') {
                     $('#UrlDiv').show();
                     $('#ContentDiv').hide();
-                } else if(data.value == '2') {
+                } else if (data.value == '2') {
                     $('#UrlDiv').hide();
                     $('#ContentDiv').hide();
                 }
                 form.render();
             });
             form.on('select(PushType)', function (data) {
-                if(data.value == '0') {
+                if (data.value == '0') {
                     $('#PushParamDiv').hide();
                     $('#PushTimeDiv').hide();
-                } else if(data.value == '1') {
+                } else if (data.value == '1') {
                     $('#PushParamDiv').show();
                     $('#PushTimeDiv').hide();
-                } else if(data.value == '2') {
+                } else if (data.value == '2') {
                     $('#PushParamDiv').show();
                     $('#PushTimeDiv').show();
                 }
                 form.render();
             });
 
-            
-    
+
+
             //日期
             laydate.render({
-            elem: '#EffectStartDate',
-            type: 'datetime',
-            trigger: 'click'
+                elem: '#EffectStartDate',
+                type: 'datetime',
+                trigger: 'click'
             });
             laydate.render({
-            elem: '#EffectEndDate',
-            type: 'datetime',
-            trigger: 'click'
+                elem: '#EffectEndDate',
+                type: 'datetime',
+                trigger: 'click'
             });
             laydate.render({
-            elem: '#PushTime',
-            type: 'datetime',
-            trigger: 'click'
+                elem: '#PushTime',
+                type: 'datetime',
+                trigger: 'click'
             });
 
 
             //上传文件
             WebUploadJs('BgPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MsgPlacardBgPic"))), function (filename) {
-            $('#BgPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
-            $('#BgPic').val(filename);
+                $('#BgPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+                $('#BgPic').val(filename);
             });
 
 
             //穿梭框
-            
+
 
             //TreeView，比如权限管理
-            
+
 
             //省市区
-            
+
         })
 
     </script>
 </body>
+
 </html>

Areas/Admin/Views/BsServer/MsgPlacard/Edit.cshtml

@@ -110,6 +110,18 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">是否开放</label>
+                            <div class="layui-input-inline">
+                                <select id="Sort" name="Sort" lay-search="" lay-filter="Sort">
+                                    <option value="0">否</option>
+                                    <option value="1">是</option>
+                                </select>
+                                <script>
+                                    $("#Sort").val("@editData.Sort");
+                                </script>
+                            </div>
+                        </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label">推送类型</label>
                             <div class="layui-input-inline">