DuGuYang 3 ani în urmă
părinte
comite
01ee439eb1

+ 9 - 2
Areas/Admin/Controllers/BsServer/ColController.cs

@@ -98,7 +98,14 @@ namespace MySystem.Areas.Admin.Controllers
                 item.Add("pid", int.Parse(dic["ParentId"].ToString()));
                 item.Add("title", dic["ColName"].ToString());
                 item.Add("url", UrlString);
-                item.Add("ColId", ColId);
+                if (ColId.Length > 6)
+                {
+                    item.Add("ColId", ColId);
+                }
+                else
+                {
+                    item.Add("ColId", "");
+                }
                 item.Add("Status", dic["Status"].ToString() == "1" ? "正常" : "关闭");
                 result.Add(item);
             }
@@ -306,7 +313,7 @@ namespace MySystem.Areas.Admin.Controllers
                 editData.SeoTitle = col.SeoTitle;
                 editData.SeoKeyword = col.SeoKeyword;
                 editData.SeoDescription = col.SeoDescription;
-                                
+
                 bsdb.SaveChanges();
             }
             else

+ 5 - 0
Areas/Admin/Views/MainServer/SchoolMakerStudy/Index.cshtml

@@ -100,6 +100,11 @@
                         <button class="layui-btn" data-type="batchdel"><i
                             class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
+                    @if (RightInfo.Contains("," + right + "_import,"))
+                    {
+                        <button class="layui-btn" data-type="ImportData"><i
+                            class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>创客权限导入</button>
+                    }
                     @* @if (RightInfo.Contains("," + right + "_edit,"))
                     {
                         <button class="layui-btn" data-type="Open">开启</button>

+ 7 - 1
wwwroot/layuiadmin/modules/Col_Admin.js

@@ -110,12 +110,18 @@ layui.config({
             //     width: '100px',
             //     align: 'center',
             // },
+            {
+                key: 'ColId',
+                title: '分类编码',
+                width: '100px',
+                align: 'center',
+            },
             {
                 key: 'Status',
                 title: '状态',
                 width: '100px',
                 align: 'center',
-            },            
+            },             
             {
                 title: '操作',
                 width: '350px',

BIN
wwwroot/users/退押结果模版.xlsx