Merge branch 'DuGuYang' into test

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -157,6 +157,19 @@ namespace MySystem.Areas.Admin.Controllers
                 if (DeviceType == "KssSignPos") dic["DeviceType"] = "快闪刷电签POS";
                 if (DeviceType == "") dic["DeviceType"] = "";
 
+                //盟主信息
+                int LeaderUserId = int.Parse(function.CheckInt(dic["LeaderUserId"].ToString()));
+                if (LeaderUserId != 0)
+                {
+                    Users users = db.Users.FirstOrDefault(m => m.Id == LeaderUserId) ?? new Users();
+                    dic["UserInfo"] = users.MakerCode + "<br />" + users.RealName;
+                }
+
+                //是否为第一台机具
+                int IsFirst = int.Parse(dic["IsFirst"].ToString());
+                if (IsFirst == 0) dic["IsFirst"] = "否";
+                if (IsFirst == 1) dic["IsFirst"] = "是";
+
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
             int TotalCount = 0;//总机具数

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -232,7 +232,6 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         mer.ActiveStatus = 1;
                         mer.MerStandardDate = DateTime.Now;
-                        RedisDbconn.Instance.Clear("PosMerchantInfo:" + mer.Id);
                     }
                 }
                 else if (pos.CreditTrade >= CheckMoney && pos.ActivationState == 1)
@@ -243,7 +242,7 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
                             {
-                                UserId = user.Id, //接收创客
+                                UserId = pos.Id, //接收创客
                                 MsgType = 2,
                                 Title = "补录成功通知", //标题
                                 Summary = "您的 " + kqProducts.Name + " SN:" + pos.PosSn + "已经成功补录，请查收。",
@@ -259,7 +258,6 @@ namespace MySystem.Areas.Admin.Controllers
                     }
                 }
                 db.SaveChanges();
-                RedisDbconn.Instance.Clear("PosMachinesTwo:" + pos.Id);
                 return "success";
             }
             pos.UserId = user.Id;
@@ -1225,6 +1223,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return "原机具SN数量和新机具SN数量不一致";
             }
             WebCMSEntities db = new WebCMSEntities();
+            PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == OldSn);
             StoreForCode storeForBack = db.StoreForCode.FirstOrDefault(m => m.Code == BackStoreNo) ?? new StoreForCode();
             StoreForCode storeForOut = db.StoreForCode.FirstOrDefault(m => m.Code == OutStoreNo) ?? new StoreForCode();
             StoreHouse BackStore = db.StoreHouse.FirstOrDefault(m => m.Id == storeForBack.StoreId) ?? new StoreHouse();
@@ -1357,7 +1356,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
                 {
-                    UserId = OutStore.UserId, //接收创客
+                    UserId = pos.UserId, //接收创客
                     MsgType = 2,
                     Title = "换绑成功通知", //标题
                     Summary = "您的 " + oldPosBrand.Name + " SN:" + OldSn + "已经成功为客户换绑为" + newPosBrand.Name + "SN:" + NewSn + "请告知客户进行绑定。",
@@ -1463,7 +1462,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
                 {
-                    UserId = forMakerCode.UserId, //接收创客
+                    UserId = pos.UserId, //接收创客
                     MsgType = 2,
                     Title = "解绑成功通知", //标题
                     Summary = "" + PosSn + "机具已成功解绑，当前机具如需绑定同一客户请再2个工作日后再进行绑定，直接绑定会导致数控异常，相关损失由您本人承担。",
@@ -1475,6 +1474,196 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
+
+        #region 通过券码修改盟主标记
+
+        public IActionResult ChangeSignQuan(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        [HttpPost]
+        public string ChangeSignQuanDo(string CouponNos = "", int IsSend = 0)
+        {
+            if (string.IsNullOrEmpty(CouponNos))
+            {
+                return "请输入券码";
+            }
+
+            string[] CouponNoList = CouponNos.Split('\n');
+            for (int i = 0; i < CouponNoList.Length; i++)
+            {
+
+            }
+            return "success";
+        }
+        #endregion
+
+
+        #region 通过机具SN修改盟主标记
+
+        public IActionResult ChangeSignSn(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        [HttpPost]
+        public string ChangeSignSnDo(string SnNos = "", int IsSend = 0)
+        {
+            if (string.IsNullOrEmpty(SnNos))
+            {
+                return "请输入机具SN";
+            }
+
+            string[] SnNoList = SnNos.Split('\n');
+            for (int i = 0; i < SnNoList.Length; i++)
+            {
+
+            }
+            return "success";
+        }
+        #endregion
+
+
+        #region 机具循环列表
+
+        /// <summary>
+        /// 根据条件查询机具循环列表
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult Index(string right, string SwapSnExpand, string SnNos)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+            ViewBag.SwapSnExpand = SwapSnExpand;
+            ViewBag.SnNos = SnNos;
+
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            var machineApplie = db.MachineApply.Where(m => m.Status > -1).ToList();
+
+            if (!string.IsNullOrEmpty(SwapSnExpand))
+            {
+                machineApplie = db.MachineApply.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SwapSnExpand)).ToList();
+                foreach (var item in machineApplie)
+                {
+                    var orders = db.Orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
+                    Dictionary<string, object> data = new Dictionary<string, object>();
+                    data["ApplyNo"] = item.ApplyNo.ToString();
+                    data["OrderNo"] = orders.OrderNo.ToString();
+                    data["MakerCode"] = item.ApplyNo.ToString();
+                    data["RealName"] = item.ApplyNo.ToString();
+                    data["ComeSn"] = item.ApplyNo.ToString();
+                    data["SendSn"] = item.ApplyNo.ToString();
+                    data["CreateDate"] = item.ApplyNo.ToString();
+                    data["Status"] = item.ApplyNo.ToString();
+                    dataList.Add(data);
+                }
+            }
+            if (!string.IsNullOrEmpty(SnNos))
+            {
+                machineApplie = db.MachineApply.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SnNos)).ToList();
+                foreach (var item in machineApplie)
+                {
+                    var orders = db.Orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
+                    Dictionary<string, object> data = new Dictionary<string, object>();
+                    data["ApplyNo"] = item.ApplyNo.ToString();
+                    data["OrderNo"] = orders.OrderNo.ToString();
+                    data["MakerCode"] = item.ApplyNo.ToString();
+                    data["RealName"] = item.ApplyNo.ToString();
+                    data["ComeSn"] = item.ApplyNo.ToString();
+                    data["SendSn"] = item.ApplyNo.ToString();
+                    data["CreateDate"] = item.ApplyNo.ToString();
+                    data["Status"] = item.ApplyNo.ToString();
+                    dataList.Add(data);
+                }
+            }
+            return View(dataList);
+        }
+
+        #endregion
+
+        #region 根据条件查询机具循环列表
+
+        /// <summary>
+        /// 机具循环列表
+        /// </summary>
+        /// <returns></returns>
+
+        [HttpPost]
+        public JsonResult IndexData(string SwapSnExpand, string SnNos, int page = 1, int limit = 30)
+        {
+            Dictionary<string, string> Fields = new Dictionary<string, string>();
+            Fields.Add("SwapSnExpand", "1"); //申请机具SN
+            Fields.Add("SnNos", "1"); //发货机具SN
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            var machineApplie = db.MachineApply.Where(m => m.Status > -1).ToList();
+
+            if (!string.IsNullOrEmpty(SwapSnExpand))
+            {
+                machineApplie = machineApplie.Where(m => m.SwapSnExpand.Contains(SwapSnExpand)).ToList();
+                foreach (var item in machineApplie)
+                {
+                    var orders = db.Orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
+                    Dictionary<string, object> data = new Dictionary<string, object>();
+                    data["ApplyNo"] = item.ApplyNo.ToString();
+                    data["OrderNo"] = orders.OrderNo.ToString();
+                    data["MakerCode"] = item.ApplyNo.ToString();
+                    data["RealName"] = item.ApplyNo.ToString();
+                    data["ComeSn"] = item.ApplyNo.ToString();
+                    data["SendSn"] = item.ApplyNo.ToString();
+                    data["CreateDate"] = item.ApplyNo.ToString();
+                    data["Status"] = item.ApplyNo.ToString();
+                    dataList.Add(data);
+                }
+            }
+            else if (!string.IsNullOrEmpty(SnNos))
+            {
+                machineApplie = machineApplie.Where(m => m.SwapSnExpand.Contains(SnNos)).ToList();
+                foreach (var item in machineApplie)
+                {
+                    var orders = db.Orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
+                    Dictionary<string, object> data = new Dictionary<string, object>();
+                    data["ApplyNo"] = item.ApplyNo.ToString();
+                    data["OrderNo"] = orders.OrderNo.ToString();
+                    data["MakerCode"] = item.ApplyNo.ToString();
+                    data["RealName"] = item.ApplyNo.ToString();
+                    data["ComeSn"] = item.ApplyNo.ToString();
+                    data["SendSn"] = item.ApplyNo.ToString();
+                    data["CreateDate"] = item.ApplyNo.ToString();
+                    data["Status"] = item.ApplyNo.ToString();
+                    dataList.Add(data);
+                }
+            }
+            else
+            {
+                foreach (var item in machineApplie)
+                {
+                    var orders = db.Orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
+                    Dictionary<string, object> data = new Dictionary<string, object>();
+                    data["ApplyNo"] = item.ApplyNo.ToString();
+                    data["OrderNo"] = orders.OrderNo.ToString();
+                    data["MakerCode"] = item.ApplyNo.ToString();
+                    data["RealName"] = item.ApplyNo.ToString();
+                    data["ComeSn"] = item.ApplyNo.ToString();
+                    data["SendSn"] = item.ApplyNo.ToString();
+                    data["CreateDate"] = item.ApplyNo.ToString();
+                    data["Status"] = item.ApplyNo.ToString();
+                    dataList.Add(data);
+                }
+            }
+
+            return Json(dataList);
+        }
+
+        #endregion
+
+
         #region 查询创客直推奖
 
         public IActionResult Prize100(string right)
@@ -1587,7 +1776,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 // List<int> proids = new List<int>();
                                 // proids.Add(10);
                                 // proids.Add(11);
-                                while(ParentUserId > 0)
+                                while (ParentUserId > 0)
                                 {
                                     Users puser = db.Users.FirstOrDefault(m => m.Id == ParentUserId) ?? new Users();
                                     int machineCount = db.PosMachinesTwo.Count(m => m.UserId == ParentUserId && m.PosSnType == 0); //判断是否拥有3台购买机

Areas/Admin/Views/MainServer/SysTools/ChangeSignQuan.cshtml

@@ -0,0 +1,243 @@
+@{
+    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">
+    <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">
+        <form class="layui-form" id="confirmFrm">
+            <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-block">
+                                        <textarea class="layui-textarea" lay-verify="required|" name="OldSn" id="OldSn"
+                                            placeholder="请输入原机具SN,多个SN用回车隔开"></textarea>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">是否推送消息</label>
+                                    <div class="layui-input-block">
+                                        <input type="checkbox" id="IsSend" name="IsSend" value="1" lay-skin="switch"
+                                            lay-filter="switchTest" title="开关">
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+                    <div class="layui-form-item ml10">
+                        <div class="layui-input-block">
+                            <button type="button" class="layui-btn" onclick="save()">提交</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
+    <script src="/other/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+        function save() {
+            var index = layer.load(1, {
+                shade: [0.5, '#000']
+            });
+            var userdata = $("#confirmFrm").serialize();
+            $.ajax({
+                type: "POST",
+                url: "/Admin/SysTools/ChangeQuanDo?r=" + Math.random(1),
+                data: userdata,
+                dataType: "text",
+                success: function (data) {
+                    layer.close(index); //关闭弹层
+                    if (data == "success") {
+                        layer.msg("修改成功");
+                    } else {
+                        layer.msg(data);
+                    }
+                }
+            });
+        }
+
+
+        //编辑器
+        KindEditor.ready(function (K) {
+
+        });
+
+        var ids = "";
+        function getChildren(obj) {
+            $.each(obj, function (index, value) {
+                var id = obj[index].id;
+                ids += id + ",";
+                var children = obj[index].children;
+                if (children) {
+                    getChildren(children);
+                }
+            });
+        }
+
+        function AreasProvinceInit(tagId, areasVal, form) {
+            for (var i = 0; i < provs_data.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(provs_data[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
+            }
+            form.render();
+        }
+
+        function AreasProvinceSelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "City").html('<option value="">市</option>');
+            var list = citys_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasCitySelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            var list = dists_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasAreaSelected(tagId, form) {
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+        function movePrev(obj, tagId) {
+            $(obj).parent().prev().insertAfter($(obj).parent());
+            checkPics(tagId);
+        }
+        function moveNext(obj, tagId) {
+            $(obj).parent().next().insertBefore($(obj).parent());
+            checkPics(tagId);
+        }
+        function deletePic(obj, tagId) {
+            $(obj).parent().remove();
+            checkPics(tagId);
+        }
+        function checkPics(tagId) {
+            var pics = "";
+            var texts = "";
+            $("#" + tagId + "Image div img").each(function (i) {
+                pics += $(this).attr("src").replace(osshost, '') + "|";
+            });
+            $("#" + tagId + "Image div input").each(function (i) {
+                texts += $(this).val() + "|";
+            });
+            if (pics == "") {
+                $("#" + tagId).val("");
+            } else {
+                pics = pics.substring(0, pics.length - 1);
+                texts = texts.substring(0, pics.length - 1);
+                $("#" + tagId).val(pics + "#cut#" + texts);
+            }
+        }
+        function checkBox(tagId) {
+            var text = "";
+            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
+                text += $(this).val() + ",";
+            });
+            $("#" + tagId).val(text);
+        }
+        function showBigPic(picpath) {
+            parent.layer.open({
+                type: 1,
+                title: false,
+                closeBtn: 0,
+                shadeClose: true,
+                area: ['auto', 'auto'],
+                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
+            });
+        }
+
+
+        var tree;
+        var element;
+        var upload;
+        layui.config({
+            base: '/layuiadmin/' //静态资源所在路径
+        }).extend({
+            index: 'lib/index' //主入口模块
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+            var $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , layedit = layui.layedit
+                , laydate = layui.laydate
+                , croppers = layui.croppers
+                , transfer = layui.transfer
+                , util = layui.util;
+            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');
+            });
+
+            //日期
+
+
+            //上传文件
+
+
+            //穿梭框
+
+
+            //TreeView，比如权限管理
+
+
+            //省市区
+
+        })
+
+    </script>
+</body>
+
+</html>

Areas/Admin/Views/MainServer/SysTools/ChangeSignSn.cshtml

@@ -0,0 +1,243 @@
+@{
+    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">
+    <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">
+        <form class="layui-form" id="confirmFrm">
+            <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">机具SN</label>
+                                    <div class="layui-input-block">
+                                        <textarea class="layui-textarea" lay-verify="required|" name="OldSn" id="OldSn"
+                                            placeholder="请输入原机具SN,多个SN用回车隔开"></textarea>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">是否推送消息</label>
+                                    <div class="layui-input-block">
+                                        <input type="checkbox" id="IsSend" name="IsSend" value="1" lay-skin="switch"
+                                            lay-filter="switchTest" title="开关">
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+                    <div class="layui-form-item ml10">
+                        <div class="layui-input-block">
+                            <button type="button" class="layui-btn" onclick="save()">提交</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
+    <script src="/other/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+        function save() {
+            var index = layer.load(1, {
+                shade: [0.5, '#000']
+            });
+            var userdata = $("#confirmFrm").serialize();
+            $.ajax({
+                type: "POST",
+                url: "/Admin/SysTools/ChangeSignSnDo?r=" + Math.random(1),
+                data: userdata,
+                dataType: "text",
+                success: function (data) {
+                    layer.close(index); //关闭弹层
+                    if (data == "success") {
+                        layer.msg("修改成功");
+                    } else {
+                        layer.msg(data);
+                    }
+                }
+            });
+        }
+
+
+        //编辑器
+        KindEditor.ready(function (K) {
+
+        });
+
+        var ids = "";
+        function getChildren(obj) {
+            $.each(obj, function (index, value) {
+                var id = obj[index].id;
+                ids += id + ",";
+                var children = obj[index].children;
+                if (children) {
+                    getChildren(children);
+                }
+            });
+        }
+
+        function AreasProvinceInit(tagId, areasVal, form) {
+            for (var i = 0; i < provs_data.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(provs_data[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
+            }
+            form.render();
+        }
+
+        function AreasProvinceSelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "City").html('<option value="">市</option>');
+            var list = citys_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasCitySelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            var list = dists_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasAreaSelected(tagId, form) {
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+        function movePrev(obj, tagId) {
+            $(obj).parent().prev().insertAfter($(obj).parent());
+            checkPics(tagId);
+        }
+        function moveNext(obj, tagId) {
+            $(obj).parent().next().insertBefore($(obj).parent());
+            checkPics(tagId);
+        }
+        function deletePic(obj, tagId) {
+            $(obj).parent().remove();
+            checkPics(tagId);
+        }
+        function checkPics(tagId) {
+            var pics = "";
+            var texts = "";
+            $("#" + tagId + "Image div img").each(function (i) {
+                pics += $(this).attr("src").replace(osshost, '') + "|";
+            });
+            $("#" + tagId + "Image div input").each(function (i) {
+                texts += $(this).val() + "|";
+            });
+            if (pics == "") {
+                $("#" + tagId).val("");
+            } else {
+                pics = pics.substring(0, pics.length - 1);
+                texts = texts.substring(0, pics.length - 1);
+                $("#" + tagId).val(pics + "#cut#" + texts);
+            }
+        }
+        function checkBox(tagId) {
+            var text = "";
+            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
+                text += $(this).val() + ",";
+            });
+            $("#" + tagId).val(text);
+        }
+        function showBigPic(picpath) {
+            parent.layer.open({
+                type: 1,
+                title: false,
+                closeBtn: 0,
+                shadeClose: true,
+                area: ['auto', 'auto'],
+                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
+            });
+        }
+
+
+        var tree;
+        var element;
+        var upload;
+        layui.config({
+            base: '/layuiadmin/' //静态资源所在路径
+        }).extend({
+            index: 'lib/index' //主入口模块
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+            var $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , layedit = layui.layedit
+                , laydate = layui.laydate
+                , croppers = layui.croppers
+                , transfer = layui.transfer
+                , util = layui.util;
+            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');
+            });
+
+            //日期
+
+
+            //上传文件
+
+
+            //穿梭框
+
+
+            //TreeView，比如权限管理
+
+
+            //省市区
+
+        })
+
+    </script>
+</body>
+
+</html>

Areas/Admin/Views/MainServer/SysTools/Loop.cshtml

@@ -0,0 +1,76 @@
+@using MySystem.Models;
+@{
+    string RightInfo = ViewBag.RightInfo as string;
+    string right = ViewBag.right as string;
+    string SelfId = ViewBag.SelfId as string;
+    string ParentId = ViewBag.ParentId as string;
+    string UserId = ViewBag.Id as string;
+    string MakerCode = ViewBag.MakerCode as string;
+    List<Users> TopUsers = ViewBag.TopUsers as List<Users>;
+    List<UserLevelSet> Levels = ViewBag.Levels as List<UserLevelSet>;
+}
+<!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">
+    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
+    <script src="/admin/js/jquery-1.10.1.min.js"></script>
+    <style>
+        .layui-input-inline{
+            width: 175px !important;
+        }
+        .layui-form-label{
+            width: 85px !important;
+        }
+        .layui-inline{
+            margin-right: 0px !important;
+        }
+        .w100{
+            width: 100px !important;
+        }
+        .ml50{
+            margin-left: 50px !important;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+                <div class="layui-form-item">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">来源机具SN</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="text" name="ComeSn" id="ComeSn" autocomplete="off">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">发货机具SN</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="text" name="SendSn" id="SendSn" autocomplete="off">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-card-body">
+                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
+                <script type="text/html" id="MakerCodeTpl">
+                    <a lay-href="/Admin/SysTools/Loop?right=@right&SwapSnExpand=@("{{d.SnNos}}")" lay-text="发货机信息" style="color: #428bca;">{{d.SwapSnExpand}}</a>
+                    <a lay-href="/Admin/SysTools/Loop?right=@right&SnNos=@("{{d.SwapSnExpand}}")" lay-text="申请机信息" style="color: #428bca;">{{d.SnNos}}</a>
+                </script>
+            </div>
+        </div>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/layuiadmin/modules_main/SysTools_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+</body>
+</html>

wwwroot/layuiadmin/modules_main/PosMachinesTwo_Admin.js

@@ -135,6 +135,9 @@ layui.config({
             ,{ field: 'ActivationState', width: 200, title: '激活状态', sort: true }
             ,{ field: 'ActivationTime', width: 200, title: '激活时间', sort: true }
             ,{ field: 'BindingTime', width: 200, title: '绑定时间', sort: true }
+            ,{ field: 'UserInfo', width: 200, title: '大盟主券标记', sort: true }
+            ,{ field: 'IsFirst', width: 200, title: '是否第一台机具', sort: true }
+            ,{ field: 'SeoKeyword', width: 200, title: '押金金额', sort: true }
             ,{ title: '操作', width: 100, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {

wwwroot/layuiadmin/modules_main/SysTools_Admin.js

@@ -0,0 +1,31 @@
+//列表数据
+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: '#MakerCodeTpl' }
+        , { field: 'SendSn', width: 200, title: '发货SN', sort: true, templet: '#MakerCodeTpl' }
+        , { 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) : '';
+});