Merge branch 'feature-后台新增功能' into develop

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -201,18 +201,18 @@ namespace MySystem.Areas.Admin.Controllers
                 if (IsFirst == 1) dic["IsFirst"] = "是";
 
                 //循环开始时间
-                if (!string.IsNullOrEmpty(dic["RecycEndDate"].ToString()))
-                {
-                    // var RecycStartDate = Convert.ToDateTime(dic["RecycEndDate"].ToString()).AddDays(-360).ToString("yyyy-MM-dd HH:mm:ss");
-                    // dic["RecycStartDate"] = RecycStartDate;
-                    string PosSn = dic["PosSn"].ToString();
-                    bool op = db.StoreChangeHistory.Any(m => m.SnNo == PosSn && m.TransType == 2);
-                    if(op)
-                    {
-                        StoreChangeHistory item = db.StoreChangeHistory.FirstOrDefault(m => m.SnNo == PosSn && m.TransType == 2) ?? new StoreChangeHistory();
-                        dic["RecycStartDate"] = item.ToDate == null ? "" : item.ToDate.Value.ToString("yyyy-MM-dd");
-                    }
-                }
+                // if (!string.IsNullOrEmpty(dic["RecycEndDate"].ToString()))
+                // {
+                //     // var RecycStartDate = Convert.ToDateTime(dic["RecycEndDate"].ToString()).AddDays(-360).ToString("yyyy-MM-dd HH:mm:ss");
+                //     // dic["RecycStartDate"] = RecycStartDate;
+                //     string PosSn = dic["PosSn"].ToString();
+                //     bool op = db.StoreChangeHistory.Any(m => m.SnNo == PosSn && m.TransType == 2);
+                //     if(op)
+                //     {
+                //         StoreChangeHistory item = db.StoreChangeHistory.FirstOrDefault(m => m.SnNo == PosSn && m.TransType == 2) ?? new StoreChangeHistory();
+                //         dic["RecycStartDate"] = item.ToDate == null ? "" : item.ToDate.Value.ToString("yyyy-MM-dd");
+                //     }
+                // }
 
                 //实际押金
                 string SeoKeyword = dic["SeoKeyword"].ToString();

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1191,6 +1191,8 @@ namespace MySystem.Areas.Admin.Controllers
             result += "机器持有人顶级：创客编号：" + posTopUser.MakerCode + "，姓名：" + posTopUser.RealName + "\n";
             result += "\n";
             result += "机具SN：" + pos.PosSn + "\n";
+            string PosSnType = pos.PosSnType == 0 ? "购买机" : "循环机";
+            result += "机具类型：" + PosSnType + "\n";
             result += "商户编号：" + merInfo + "，商户姓名：" + merName + "\n";
             result += "商户型机器/直拓机器：创客编号：" + posSubUser.MakerCode + "，姓名：" + posSubUser.RealName + "\n";
             // result += "商户型机器/直拓机器：创客编号：" + posSubUser.MakerCode + "，姓名：" + posSubUser.RealName + "，手机号：" + posSubUser.Mobile + "\n";
@@ -3875,7 +3877,6 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
-
         #region 查询创客循环资格
 
         public IActionResult SeeUserLoop(string right)
@@ -3910,6 +3911,35 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
+        #region 提交到代付排除的创客名单
+
+        public IActionResult CashWithoutUser(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        public string CashWithoutUserDo(string Content)
+        {
+            CustomTagSet set = db.CustomTagSet.FirstOrDefault(m => m.Tags == "CashWithoutUser");
+            if (set == null)
+            {
+                set = db.CustomTagSet.Add(new CustomTagSet()
+                {
+                    Tags = "CashWithoutUser",
+                    Title = "提交到代付排除的创客名单"
+                }).Entity;
+                db.SaveChanges();
+            }
+            set.Contents = Content;
+            db.SaveChanges();
+            db.Dispose();
+            return "success";
+        }
+        #endregion
+
 
         #region 坏机回仓
 
@@ -3984,6 +4014,80 @@ namespace MySystem.Areas.Admin.Controllers
             return "success";
         }
         #endregion
+        
+        #region 划拨创客机具券
+
+        public IActionResult TransferPosCoupon(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        public string TransferPosCouponDo(string PosCouponCodes, string FromMakerCode, string ToMakerCode, string LeaderMakerCode = "")
+        {
+            if (string.IsNullOrEmpty(PosCouponCodes))
+            {
+                return "请输入机具券码";
+            }
+            if (string.IsNullOrEmpty(FromMakerCode))
+            {
+                return "请输入机具来源创客编号";
+            }
+            if (string.IsNullOrEmpty(ToMakerCode))
+            {
+                return "请输入划拨对象创客编号";
+            }
+            var user = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == FromMakerCode) ?? new UserForMakerCode();
+            var tuser = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == ToMakerCode) ?? new UserForMakerCode();
+            var fUserId = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
+            if (fUserId.Id == 0)
+            {
+                return "来源创客" + FromMakerCode + "不存在";
+            }
+            var tUserId = db.Users.FirstOrDefault(m => m.Id == tuser.UserId) ?? new Users();
+            if (tUserId.Id == 0)
+            {
+                return "划拨创客" + ToMakerCode + "不存在";
+            }
+            int LeaderUserId = 0;
+            if(!string.IsNullOrEmpty(LeaderMakerCode))
+            {
+                UserForMakerCode leaderuser = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == LeaderMakerCode) ?? new UserForMakerCode();
+                Users LeaderUserItem = db.Users.FirstOrDefault(m => m.Id == leaderuser.UserId) ?? new Users();
+                if (LeaderUserItem.Id == 0)
+                {
+                    return "大盟主创客编号" + LeaderMakerCode + "不存在";
+                }
+                LeaderUserId = leaderuser.UserId;
+            }
+
+            var query = PosCouponCodes + "\n" + FromMakerCode + "," + ToMakerCode;
+            string[] PosCouponList = PosCouponCodes.Replace("\r", "").Replace("\n", ",").Split(',');
+            foreach(string PosCouponCode in PosCouponList)
+            {
+                PosCoupons item = db.PosCoupons.FirstOrDefault(m => m.ExchangeCode == PosCouponCode);
+                if (item == null)
+                {
+                    return "机具券" + PosCouponCode + "不存在";
+                }
+                if(item.IsUse == 1)
+                {
+                    return "机具券" + PosCouponCode + "已使用";
+                }
+                item.UserId = tUserId.Id;
+                if(LeaderUserId > 0 && item.LeaderUserId == 0)
+                {
+                    item.LeaderUserId = LeaderUserId;
+                }
+            }
+            db.SaveChanges();
+            db.Dispose();
+
+            return "success";
+        }
+        #endregion
 
 
     }

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -1066,16 +1066,22 @@ namespace MySystem.Areas.Admin.Controllers
             string[] idlist = Id.Split(new char[] { ',' });
             AddSysLog(Id, "UserCashRecord", "cash");
             db.SaveChanges();
+            CustomTagSet set = db.CustomTagSet.FirstOrDefault(m => m.Tags == "CashWithoutUser") ?? new CustomTagSet();
+            string MakerCodeString = "," + set.Contents + ",";
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 UserCashRecord edit = db.UserCashRecord.FirstOrDefault(m => m.Id == id && m.QueryCount == 0);
                 if (edit != null)
                 {
-                    edit.QueryCount = 1;
-                    edit.UpdateDate = DateTime.Now;
-                    db.SaveChanges();
-                    RedisDbconn.Instance.AddList("CashPayApplyQueue", Newtonsoft.Json.JsonConvert.SerializeObject(edit));
+                    Users user = db.Users.FirstOrDefault(m => m.Id == edit.UserId) ?? new Users();
+                    if(!MakerCodeString.Contains("," + user.MakerCode + ","))
+                    {
+                        edit.QueryCount = 1;
+                        edit.UpdateDate = DateTime.Now;
+                        db.SaveChanges();
+                        RedisDbconn.Instance.AddList("CashPayApplyQueue", Newtonsoft.Json.JsonConvert.SerializeObject(edit));
+                    }
                 }
             }
             return "success";

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

@@ -0,0 +1,241 @@
+@{
+    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>
+</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="Content" id="Content"
+                                            placeholder="请输入创客编号,多个创客编号用逗号隔开"></textarea>
+                                    </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/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+        function save() {
+            var Content = $('#Content').val();            
+            var indexs = layer.load(1, {
+                shade: [0.5, '#000']
+            });
+            var userdata = $("#confirmFrm").serialize();
+            $.ajax({
+                type: "POST",
+                url: "/Admin/SysTools/CashWithoutUserDo?r=" + Math.random(1),
+                data: userdata,
+                dataType: "text",
+                success: function (data) {
+                    layer.close(index); //关闭弹层
+                    if (data == "success") {
+                        layer.close(indexs); //关闭弹层
+                        layer.msg('设置成功', {
+                            time: 2000
+                        }, function () {
+                            window.location.reload();
+                        });
+                    } else {
+                        layer.close(indexs); //关闭弹层
+                        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/TransferPosCoupon.cshtml

@@ -0,0 +1,280 @@
+@{
+    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="PosCouponCodes" id="PosCouponCodes" 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="FromMakerCode" name="FromMakerCode"
+                                            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="ToMakerCode" name="ToMakerCode"
+                                            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="LeaderMakerCode" name="LeaderMakerCode"
+                                            maxlength="50" autocomplete="off"
+                                            placeholder="请输入大盟主创客编号，不填不设置">
+                                    </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/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+        function save() {
+            var PosCouponCodes = $('#PosCouponCodes').val();
+            var FromMakerCode = $('#FromMakerCode').val();
+            var ToMakerCode = $('#ToMakerCode').val();
+            var LeaderMakerCode = $('#LeaderMakerCode').val();
+            if (PosCouponCodes == '') {
+                layer.msg('请输入机具券码');
+            }
+            else if (FromMakerCode == '') {
+                layer.msg('请输入来源创客编号');
+            }
+            else if (ToMakerCode == '') {
+                layer.msg('请输入划拨创客编号');
+            }
+            else {
+                var index = layer.confirm('确定要划拨吗？', function (index) {
+                    var indexs = layer.load(1, {
+                        shade: [0.5, '#000']
+                    });
+                    var userdata = $("#confirmFrm").serialize();
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/SysTools/TransferPosCouponDo?r=" + Math.random(1),
+                        data: userdata,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index); //关闭弹层
+                            if (data == "success") {
+                                layer.close(indexs); //关闭弹层
+                                layer.msg('划拨成功', {
+                                    time: 1000
+                                }, function () {
+                                    window.location.reload();
+                                });
+                            } else {
+                                layer.close(indexs); //关闭弹层
+                                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>

wwwroot/layuiadmin/modules_main/PosMachinesTwo_Admin.js

@@ -143,6 +143,7 @@ layui.config({
             , { field: 'TransferTime', width: 200, title: '划拨时间', sort: true }
             , { field: 'CreateDate', width: 200, title: '入库时间', sort: true }
             , { field: 'RecycStartDate', width: 200, title: '循环开始时间', sort: true }
+            , { field: 'SourcePosSn', width: 200, title: '来源机具', sort: true }
             , { field: 'RecycEndDate', width: 200, title: '循环截止时间', sort: true }
             , { field: 'UserInfo', width: 200, title: '大盟主券标记', sort: true }
             , { field: 'OpCode', width: 200, title: '所属运营中心', sort: true }