辅助工具调整

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -3396,30 +3396,24 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "请输入机具号";
             }
+            var pos = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == PosSn) ?? new MachineForSnNo();
+            var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == pos.SnId) ?? new PosMachinesTwo();
+            var posMerchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == posInfo.BindMerchantId) ?? new PosMerchantInfo();
+            if (posInfo.Id == 0)
+            {
+                return "机具" + PosSn + "不存在";
+            }
+            if (posMerchant.Id == 0)
+            {
+                return "机具绑定商户不存在";
+            }
             else
             {
-                var pos = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == PosSn) ?? new MachineForSnNo();
-                var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == pos.SnId) ?? new PosMachinesTwo();
-                if (posInfo.Id > 0)
-                {
-                    var posMerchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == posInfo.BindMerchantId) ?? new PosMerchantInfo();
-                    if (posMerchant.Id > 0)
-                    {
-                        posMerchant.ActiveStatus = 1;
-                        posMerchant.UpdateDate = DateTime.Now;
-                        posMerchant.MerStandardDate = posInfo.ActivationTime;
-                        function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + PosSn + ":" + SysUserName + "-" + SysRealName, "根据机具号同步商户激活状态");
-                        db.SaveChanges();
-                    }
-                    else
-                    {
-                        return "机具绑定商户不存在";
-                    }
-                }
-                else
-                {
-                    return "机具" + PosSn + "不存在";
-                }
+                posMerchant.ActiveStatus = 1;
+                posMerchant.UpdateDate = DateTime.Now;
+                posMerchant.MerStandardDate = posInfo.ActivationTime;
+                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + PosSn + ":" + SysUserName + "-" + SysRealName, "根据机具号同步商户激活状态");
+                db.SaveChanges();
             }
 
             return "success";
@@ -3582,24 +3576,21 @@ namespace MySystem.Areas.Admin.Controllers
             }
             var query = PosSn + "," + MerchantNo + "," + MerchantName;
             var posMerchant = db.PosMerchantInfo.FirstOrDefault(m => m.MerchantNo == MerchantNo && m.MerchantName == MerchantName) ?? new PosMerchantInfo();
-            if (posMerchant.Id > 0)
+            var machineForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == posMerchant.KqSnNo) ?? new MachineForSnNo();
+            var pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId) ?? new PosMachinesTwo();
+            if (posMerchant.Id == 0)
             {
-                var machineForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == posMerchant.KqSnNo) ?? new MachineForSnNo();
-                var pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId) ?? new PosMachinesTwo();
-                if (pos.Id > 0)
-                {
-                    pos.BindMerchantId = posMerchant.Id;
-                    db.SaveChanges();
-                    function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + query + ":" + SysUserName + "-" + SysRealName, "根据机具号、商户号、商户姓名关联");
-                }
-                else
-                {
-                    return "机具" + PosSn + "不存在";
-                }
+                return "商户" + MerchantNo + "不存在";
+            }
+            if (pos.Id == 0)
+            {
+                return "机具" + PosSn + "不存在";
             }
             else
             {
-                return "商户" + MerchantNo + "不存在";
+                pos.BindMerchantId = posMerchant.Id;
+                db.SaveChanges();
+                function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + query + ":" + SysUserName + "-" + SysRealName, "根据机具号、商户号、商户姓名关联");
             }
 
             return "success";
@@ -3698,12 +3689,12 @@ namespace MySystem.Areas.Admin.Controllers
             }
             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(machineForSnNo => machineForSnNo.Id == user.UserId) ?? new Users();
+            var fUserId = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
             if (fUserId.Id == 0)
             {
                 return "来源创客" + FromMakerCode + "不存在";
             }
-            var tUserId = db.Users.FirstOrDefault(machineForSnNo => machineForSnNo.Id == tuser.UserId) ?? new Users();
+            var tUserId = db.Users.FirstOrDefault(m => m.Id == tuser.UserId) ?? new Users();
             if (tUserId.Id == 0)
             {
                 return "划拨创客" + ToMakerCode + "不存在";
@@ -3725,5 +3716,47 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
+        #region 还原提现订单状态
+
+        public IActionResult RestoreStatus(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        [HttpPost]
+        public string RestoreStatusDo(string OrderNo)
+        {
+            if (string.IsNullOrEmpty(OrderNo))
+            {
+                return "请输入提现订单编号";
+            }
+            string[] OrderNoList = OrderNo.Replace("\r","").Split('\n');
+            var error = "";
+            foreach (var item in OrderNoList)
+            {
+                var cash = db.UserCashRecord.FirstOrDefault(m => m.CashOrderNo == item) ?? new UserCashRecord();
+                if (cash.Id > 0)
+                {
+                    cash.QueryCount = 0;
+                    cash.Status = 0;
+                    db.SaveChanges();
+                }
+                else
+                {
+                    error += "订单" + item + "不存在" + '\n';
+                }
+            }
+            if (!string.IsNullOrEmpty(error))
+            {
+                return "Warning|" + error;
+            }
+            return "success";
+        }
+        #endregion
+
+
     }
 }

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

@@ -89,24 +89,24 @@
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         function save() {
-            var str = document.getElementById('MakerCode').value;
-            var str1 = document.getElementById('RealName').value;
-            var str2 = document.getElementById('CertId').value;
-            var str3 = document.getElementById('BackCard').value;
-            var str4 = document.getElementById('BackName').value;
-            if (str == '') {
+            var MakerCode = $('#MakerCode').val();
+            var RealName = $('#RealName').val();
+            var CertId = $('#CertId').val();
+            var BackCard = $('#BackCard').val();
+            var BackName = $('#BackName').val();
+            if (MakerCode == '') {
                 layer.msg('请输入创客编号');
             }
-            else if (str1 == '') {
+            else if (RealName == '') {
                 layer.msg('请输入真实姓名');
             }
-            else if (str2 == '') {
+            else if (CertId == '') {
                 layer.msg('请输入身份证号');
             }
-            else if (str3 == '') {
+            else if (BackCard == '') {
                 layer.msg('请输入银行卡号');
             }
-            else if (str4 == '') {
+            else if (BackName == '') {
                 layer.msg('请输入银行名称');
             }
             else {

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

@@ -58,8 +58,8 @@
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         function save() {
-            var str = document.getElementById('PosSn').value;
-            if (str == '') {
+            var PosSn = $('#PosSn').val();
+            if (PosSn == '') {
                 layer.msg('请输入机具SN,多个SN用回车隔开');
             }
             else {

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

@@ -73,16 +73,16 @@
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         function save() {
-            var str = document.getElementById('PosSn').value;
-            var str1 = document.getElementById('MerchantNo').value;
-            var str2 = document.getElementById('MerchantName').value;
-            if (str == '') {
+            var PosSn = $('#PosSn').val();
+            var MerchantNo = $('#MerchantNo').val();
+            var MerchantName = $('#MerchantName').val();
+            if (PosSn == '') {
                 layer.msg('请输入机具SN');
             }
-            else if (str1 == '') {
+            else if (MerchantNo == '') {
                 layer.msg('请输入商户编号');
             }
-            else if (str2 == '') {
+            else if (MerchantName == '') {
                 layer.msg('请输入商户姓名');
             }
             else {

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

@@ -0,0 +1,257 @@
+@{
+    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="OrderNo" id="OrderNo"
+                                            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/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>
+        function save() {
+            var OrderNo = $('#OrderNo').val();
+            if (OrderNo == '') {
+                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/RestoreStatusDo?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 if (data.indexOf("Warning") == 0) {
+                                layer.close(indexs); //关闭弹层
+                                var datalist = data.split('|');
+                                layer.alert(datalist[1], { time: 20000 }, 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/SetPosFee.cshtml

@@ -67,8 +67,8 @@
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         function save() {
-            var str = document.getElementById('PosSn').value;
-            if (str == '') {
+            var PosSn = $('#PosSn').val();
+            if (PosSn == '') {
                 layer.msg('请输入机具SN,多个SN用回车隔开');
             }
             else {

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

@@ -58,8 +58,8 @@
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         function save() {
-            var str = document.getElementById('PosSn').value;
-            if (str == '') {
+            var PosSn = $('#PosSn').val();
+            if (PosSn == '') {
                 layer.msg('请输入机具SN');
             }
             else {

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

@@ -73,16 +73,16 @@
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         function save() {
-            var str = document.getElementById('PosSn').value;
-            var str1 = document.getElementById('FromMakerCode').value;
-            var str2 = document.getElementById('ToMakerCode').value;
-            if (str == '') {
+            var PosSn = $('#PosSn').val();
+            var FromMakerCode = $('#FromMakerCode').val();
+            var ToMakerCode = $('#ToMakerCode').val();
+            if (PosSn == '') {
                 layer.msg('请输入机具SN');
             }
-            else if (str1 == '') {
+            else if (FromMakerCode == '') {
                 layer.msg('请输入来源创客编号');
             }
-            else if (str2 == '') {
+            else if (ToMakerCode == '') {
                 layer.msg('请输入划拨创客编号');
             }
             else {

wwwroot/layuiadmin/modules_main/StoreChangeHistory_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -31,49 +31,49 @@ layui.config({
     //- 筛选条件-日期
     var laydate = layui.laydate;
     var layCreateDate = laydate.render({
-elem: '#CreateDate',
-type: 'date',
-range: true,
-trigger: 'click',
-change: function (value, date, endDate) {
-var op = true;
-if (date.year == endDate.year && endDate.month - date.month <= 1) {
-if (endDate.month - date.month == 1 && endDate.date > date.date) {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#CreateDate').val(value);
-}
-}
-});
+        elem: '#CreateDate',
+        type: 'date',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layCreateDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateDate').val(value);
+            }
+        }
+    });
 
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
+        excel.importExcel(files, {}, function (data) {
             ExcelData = data[0].sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/StoreChangeHistory/Sort?r=" + Math.random(1),
@@ -84,32 +84,32 @@ $('#CreateDate').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/StoreChangeHistory/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-            ,{field:'StoreIdStoreNo', width: 200, title:'仓库编号', sort: true}
-            ,{field:'StoreIdStoreName', width: 200, title:'仓库名称', sort: true}
-            ,{field:'UserIdMakerCode', width: 200, title:'创客编号', sort: true}
-            ,{field:'UserIdRealName', width: 200, title:'创客姓名', sort: true}
-            ,{field:'TUserIdMakerCode', width: 200, title:'收货创客编号', sort: true}
-            ,{field:'TUserIdRealName', width: 200, title:'收货创客姓名', sort: true}
-            ,{field:'BrandId', width: 200, title:'产品类型', sort: true}
-            ,{field:'TransType', width: 200, title:'交易类型', sort: true}
-            ,{field:'SnNo', width: 200, title:'SN编号', sort: true}
-            ,{field:'SnType', width: 200, title:'SN机具类型', sort: true}
-            ,{field:'StockOpDirect', width: 200, title:'库存操作方向', sort: true}
-            ,{field:'ToStoreIdStoreNo', width: 200, title:'收货仓库编号', sort: true}
-            ,{field:'ToStoreIdStoreName', width: 200, title:'收货仓库名称', sort: true}
-            ,{field:'SourceStoreIdStoreNo', width: 200, title:'源仓库编号', sort: true}
-            ,{field:'SourceStoreIdStoreName', width: 200, title:'源仓库名称', sort: true}
-            ,{field:'CreateDate', width: 200, title:'变动时间', sort: true}
+            , { field: 'StoreIdStoreNo', width: 200, title: '仓库编号', sort: true }
+            , { field: 'StoreIdStoreName', width: 200, title: '仓库名称', sort: true }
+            , { field: 'UserIdMakerCode', width: 200, title: '创客编号', sort: true }
+            , { field: 'UserIdRealName', width: 200, title: '创客姓名', sort: true }
+            , { field: 'TUserIdMakerCode', width: 200, title: '收货创客编号', sort: true }
+            , { field: 'TUserIdRealName', width: 200, title: '收货创客姓名', sort: true }
+            , { field: 'BrandId', width: 200, title: '产品类型', sort: true }
+            , { field: 'TransType', width: 200, title: '交易类型', sort: true }
+            , { field: 'SnNo', width: 200, title: 'SN编号', sort: true }
+            , { field: 'SnType', width: 200, title: 'SN机具类型', sort: true }
+            , { field: 'StockOpDirect', width: 200, title: '库存操作方向', sort: true }
+            , { field: 'ToStoreIdStoreNo', width: 200, title: '收货仓库编号', sort: true }
+            , { field: 'ToStoreIdStoreName', width: 200, title: '收货仓库名称', sort: true }
+            , { field: 'SourceStoreIdStoreNo', width: 200, title: '源仓库编号', sort: true }
+            , { field: 'SourceStoreIdStoreName', width: 200, title: '源仓库名称', sort: true }
+            , { field: 'CreateDate', width: 200, title: '变动时间', sort: true }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -131,7 +131,7 @@ $('#CreateDate').val(value);
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -154,20 +154,20 @@ $('#CreateDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -178,7 +178,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/StoreChangeHistory/Edit?r=" + Math.random(1),
@@ -271,20 +271,20 @@ $('#CreateDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -295,7 +295,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/StoreChangeHistory/Add?r=" + Math.random(1),
@@ -352,9 +352,9 @@ $('#CreateDate').val(value);
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -381,9 +381,9 @@ $('#CreateDate').val(value);
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";