机具申请

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -51,21 +51,22 @@ namespace MySystem.Areas.Admin.Controllers
         /// 分仓机具申请记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(StoreMachineApply data, string BrandIdSelect, string UserIdRealName, string UserIdMakerCode, int page = 1, int limit = 30)
+        public JsonResult IndexData(StoreMachineApply data, string UserIdRealName, string UserIdMakerCode, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
             Fields.Add("ApplyNo", "1"); //申请单号
             Fields.Add("SendMode", "1"); //发货方式
 
 
             string condition = " and Status>-1";
-            //品牌
-            if (!string.IsNullOrEmpty(BrandIdSelect))
+            if (!string.IsNullOrEmpty(CreateDateData))
             {
-                condition += " and BrandId=" + BrandIdSelect;
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
@@ -85,7 +86,10 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 //品牌
                 dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["BrandId"].ToString()));
-                dic["StatusName"] = dic["Status"].ToString() == "1" ? "正常" : "关闭";
+                int Status = int.Parse(dic["Status"].ToString());
+                if (Status == 0) dic["StatusName"] = "待配货";
+                if (Status == 1) dic["StatusName"] = "已发货";
+                if (Status == 2) dic["StatusName"] = "已驳回";
                 //创客
                 int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
@@ -160,9 +164,30 @@ namespace MySystem.Areas.Admin.Controllers
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
 
-
             StoreMachineApply editData = db.StoreMachineApply.FirstOrDefault(m => m.Id == Id) ?? new StoreMachineApply();
             ViewBag.data = editData;
+
+            Users users = db.Users.FirstOrDefault(m => m.Id == editData.UserId) ?? new Users();
+            ViewBag.RealName = users.RealName;
+            JsonData SendSnList = new JsonData();
+            SendSnList = JsonMapper.ToObject(editData.SendSn);//申请数据
+            List<Dictionary<string, object>> KsProductList = new List<Dictionary<string, object>>();
+            for (int i = 0; i < SendSnList.Count; i++)
+            {
+                int BrandId = Convert.ToInt32(SendSnList[i]["BrandId"].ToString());
+                int Num = Convert.ToInt32(SendSnList[i]["ApplyNum"].ToString());
+                List<KqProducts> products = db.KqProducts.Where(m => m.Id == BrandId).ToList();
+                foreach (KqProducts product in products)
+                {
+                    Dictionary<string, object> item = new Dictionary<string, object>();
+                    item.Add("BrandId", BrandId);  //商品Id
+                    item.Add("Name", product.Name);  //商品名称
+                    item.Add("Num", Num);  //商品数量
+                    KsProductList.Add(item);
+                }
+            }
+            ViewBag.KsProductList = KsProductList;
+
             return View();
         }
 
@@ -381,5 +406,230 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
+        #region 审核发货
+
+        public IActionResult AuditSend(string right, int Id = 0)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+
+            StoreMachineApply editData = db.StoreMachineApply.FirstOrDefault(m => m.Id == Id) ?? new StoreMachineApply();
+            ViewBag.data = editData;
+
+            Users users = db.Users.FirstOrDefault(m => m.Id == editData.UserId) ?? new Users();
+            ViewBag.MakerCode = users.MakerCode;
+            ViewBag.RealName = users.RealName;
+
+            return View();
+        }
+
+        #endregion
+
+        #region 审核发货
+
+        [HttpPost]
+        public string AuditSend(StoreMachineApply data, string ExcelData)
+        {
+            Dictionary<string, object> Fields = new Dictionary<string, object>();
+            Fields.Add("ApplyNum", data.ApplyNum); //申请箱数
+            Fields.Add("SendNum", data.SendNum); //发货箱数
+            Fields.Add("SeoDescription", data.SeoDescription); //申请描述
+            Fields.Add("Status", data.Status);
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreMachineApply", Fields, data.Id);
+            AddSysLog(data.Id.ToString(), "StoreMachineApply", "AuditSend");
+            StoreMachineApply apply = db.StoreMachineApply.FirstOrDefault(m => m.Id == data.Id) ?? new StoreMachineApply();
+            StoreHouse tostore = new StoreHouse();
+            
+            var BrandId = 0;
+            var FromStoreId = 0;
+
+            ExcelData = HttpUtility.UrlDecode(ExcelData);
+            JsonData list = JsonMapper.ToObject(ExcelData);
+            Dictionary<string, int> storeData = new Dictionary<string, int>();
+            Dictionary<string, int> toStoreData = new Dictionary<string, int>();
+            for (int i = 1; i < list.Count; i++)
+            {
+                JsonData dr = list[i];
+                string itemJson = dr.ToJson();
+                string SnNo = itemJson.Contains("\"A\"") ? dr["A"].ToString() : "";
+                string Brand = itemJson.Contains("\"B\"") ? dr["B"].ToString() : "";
+                string BatchNo = itemJson.Contains("\"C\"") ? dr["C"].ToString() : "";
+                string OutNote = itemJson.Contains("\"D\"") ? dr["D"].ToString() : "";
+
+                BrandId = Convert.ToInt32(Brand);
+
+                if (BrandId == 1)
+                {
+                    FromStoreId = 7;
+                }
+                else if (BrandId == 2)
+                {
+                    FromStoreId = 721;
+                }
+                else if (BrandId == 3)
+                {
+                    FromStoreId = 697;
+                }
+                else if (BrandId == 4)
+                {
+                    FromStoreId = 774;
+                }
+                else if (BrandId == 5)
+                {
+                    FromStoreId = 775;
+                }
+                else if (BrandId == 6)
+                {
+                    FromStoreId = 871;
+                }
+                else if (BrandId == 7)
+                {
+                    FromStoreId = 1047;
+                }
+
+                tostore = db.StoreHouse.FirstOrDefault(m => m.Id == FromStoreId);
+
+                StoreMachineApply storeMachineApply = db.StoreMachineApply.FirstOrDefault(m => m.Id == data.Id);
+                if (storeMachineApply != null)
+                {
+                    storeMachineApply.SeoDescription = function.CheckString(SnNo) + ',';
+                }
+                MachineForSnNo machinefor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();
+                PosMachinesTwo machine = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machinefor.SnId && m.BuyUserId == 0 && m.UserId == 0) ?? new PosMachinesTwo();
+                if (machine.Id > 0)
+                {
+                    StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
+                    {
+                        CreateDate = DateTime.Now,
+                        StoreId = FromStoreId, //出货仓库
+                        BrandId = BrandId, //产品类型
+                        ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
+                        BizBatchNo = BatchNo, //业务批次号
+                        TransType = 1, //交易类型
+                        SnNo = SnNo, //SN编号
+                        StockOpDirect = 1, //库存操作方向
+                        SnStatus = 1, //SN状态
+                        DeviceVendor = machine.DeviceName, //设备厂商
+                        DeviceModel = machine.DeviceKind, //设备型号
+                        DeviceType = machine.DeviceType, //设备类型
+                        FromUserId = tostore.UserId, //出货人
+                        FromDate = DateTime.Now, //出库时间
+                        FromRemark = OutNote, //出库备注
+                        ToUserId = tostore.UserId, //收货人
+                        ToStoreId = tostore.Id, //退货收货仓库                        
+                        SourceStoreId = machine.SourceStoreId, //源仓库编号
+                        BrandType = machine.DeviceType, //品牌类型
+                    }).Entity;
+                    db.SaveChanges();
+                    string ChangeNo = "SC";
+                    int StoreStockChangeId = stockchange.Id;
+                    string StoreStockChangeIdString = StoreStockChangeId.ToString();
+                    for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
+                    {
+                        StoreStockChangeIdString = "0" + StoreStockChangeIdString;
+                    }
+                    ChangeNo += StoreStockChangeIdString;
+                    stockchange.ChangeNo = ChangeNo; //交易流水编号
+                    machine.StoreId = tostore.Id;
+
+                    db.StoreChangeHistory.Add(new StoreChangeHistory()
+                    {
+                        CreateDate = DateTime.Now,
+                        UserId = tostore.UserId, //创客
+                        BrandId = BrandId, //产品类型
+                        ChangeRecordNo = ChangeNo, //变更记录单号
+                        BizBatchNo = BatchNo, //业务批次号
+                        TransType = 1, //交易类型
+                        SnNo = SnNo, //SN编号
+                        SnType = machine.PosSnType, //SN机具类型
+                        StockOpDirect = 1, //库存操作方向
+                        DeviceVendor = machine.DeviceName, //设备厂商
+                        DeviceModel = machine.DeviceKind, //设备型号
+                        DeviceType = machine.DeviceType, //设备类型
+                        FromUserId = tostore.UserId, //出货创客
+                        FromDate = DateTime.Now, //出库时间
+                        FromRemark = OutNote, //出库备注
+                        SourceStoreId = machine.SourceStoreId, //源仓库
+                        StoreId = tostore.Id, //仓库
+                    });
+                    db.SaveChanges();
+                }
+            }
+            db.SaveChanges();
+
+            int StoreId = FromStoreId;
+            int OpStoreNum = list.Count - 1;
+            StoreHouse store = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId) ?? new StoreHouse();
+            StoreBalance balance = db.StoreBalance.Add(new StoreBalance()
+            {
+                CreateDate = DateTime.Now,
+                StoreId = StoreId, //仓库
+                TransType = 1, //交易类型
+                BrandId = BrandId, //产品类型
+                OpStoreNum = OpStoreNum, //操作库存数
+                OpSymbol = "-", //操作符
+                BeforeTotalNum = store.TotalNum, //操作前总库存数
+                AfterTotalNum = store.TotalNum, //操作后总库存数
+                BeforeLaveNum = store.LaveNum, //操作前剩余库存数
+                AfterLaveNum = store.LaveNum - OpStoreNum, //操作后剩余库存数
+                BeforeOutNum = store.OutNum, //操作前出库数
+                AfterOutNum = store.OutNum + OpStoreNum, //操作后出库数
+            }).Entity;
+            db.SaveChanges();
+            string ChangeNo1 = "SC";
+            int StoreStockChangeId1 = balance.Id;
+            string StoreStockChangeId1String = StoreStockChangeId1.ToString();
+            for (int i = 0; i < 18 - StoreStockChangeId1.ToString().Length; i++)
+            {
+                StoreStockChangeId1String = "0" + StoreStockChangeId1String;
+            }
+            ChangeNo1 += StoreStockChangeId1String;
+            balance.TransRecordNo = ChangeNo1; //交易流水编号
+            store.LaveNum -= OpStoreNum;
+            store.OutNum += OpStoreNum;
+            db.SaveChanges();
+
+            StoreId = tostore.Id;
+            balance = db.StoreBalance.Add(new StoreBalance()
+            {
+                CreateDate = DateTime.Now,
+                StoreId = StoreId, //仓库
+                TransType = 0, //交易类型
+                BrandId = BrandId, //产品类型
+                OpStoreNum = OpStoreNum, //操作库存数
+                OpSymbol = "+", //操作符
+                BeforeTotalNum = store.TotalNum, //操作前总库存数
+                AfterTotalNum = store.TotalNum + OpStoreNum, //操作后总库存数
+                BeforeLaveNum = store.LaveNum, //操作前剩余库存数
+                AfterLaveNum = store.LaveNum + OpStoreNum, //操作后剩余库存数
+                BeforeOutNum = store.OutNum, //操作前出库数
+                AfterOutNum = store.OutNum, //操作后出库数
+            }).Entity;
+            db.SaveChanges();
+            string ChangeNo2 = "SC";
+            int StoreStockChangeId2 = balance.Id;
+            string StoreStockChangeId2String = StoreStockChangeId2.ToString();
+            for (int i = 0; i < 18 - StoreStockChangeId2.ToString().Length; i++)
+            {
+                StoreStockChangeId2String = "0" + StoreStockChangeId2String;
+            }
+            ChangeNo2 += StoreStockChangeId2String;
+            balance.TransRecordNo = ChangeNo2; //交易流水编号
+            store.TotalNum += OpStoreNum;
+            store.LaveNum += OpStoreNum;
+            db.SaveChanges();
+            if (data.Status == 1)
+            {
+                return "success";
+            }
+            else
+            {
+                return "false";
+            }
+
+        }
+        #endregion
+
     }
 }

Areas/Admin/Views/MainServer/StoreMachineApply/AuditSend.cshtml

@@ -0,0 +1,199 @@
+@using MySystem.Models;
+@{
+    StoreMachineApply editData = ViewBag.data as StoreMachineApply;
+}
+@{
+    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">
+        <input type="hidden" name="Id" value="@editData.Id" />
+
+        <div class="layui-card">
+            <div class="layui-card-body">
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <div class="layui-tab-content mt20">
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">创客名称</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" readonly id="RealName" name="RealName"
+                                        value="@ViewBag.RealName" maxlength="32" 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" readonly id="ApplyNo" name="ApplyNo"
+                                        value="@editData.ApplyNo" maxlength="32" 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" readonly id="ApplyNum" name="ApplyNum"
+                                        value="@editData.ApplyNum" maxlength="32" 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="SendNum" name="SendNum"
+                                        value="@editData.SendNum" maxlength="32" 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="ErpCode" name="ErpCode"
+                                        value="@editData.ErpCode" maxlength="32" 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="SendMode" name="SendMode"
+                                        value="@editData.SendMode" maxlength="32" lay-verify="required|"
+                                        autocomplete="off" placeholder="">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">*审核结果</label>
+                                <div class="layui-input-inline">
+                                    <select id="Status" name="Status" lay-verify="required|" lay-search="">
+                                        <option value="">请选择</option>
+                                        <option value="0">待审核</option>
+                                        <option value="1">审核通过</option>
+                                        <option value="2">审核不通过</option>
+                                    </select>
+                                    <script>
+                                        $("#Status").val("@editData.Status");
+                                    </script>
+                                </div>
+                            </div>
+                            <div class="layui-form-item"">
+                            <div class=" layui-tab-item layui-show">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">模板下载</label>
+                                    <div class="layui-form-mid layui-word-aux">
+                                        <a href="/users/批量添加机具SN模版.xlsx">点击下载批量添加机具SN模版</a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-form-item"">
+                            <label class=" layui-form-label">导入机具SN</label>
+                                <div class=" layui-input-block">
+                                    <div class="layui-upload">
+                                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
+                                        <div class="layui-inline layui-word-aux"></div>
+                                    </div>
+                                    <div class="mt10" id="ExcelPathFile">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+                <div class="layui-form-item layui-hide">
+                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
+                        value="确认">
+                </div>
+            </div>
+        </div>
+    </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>
+
+
+        //编辑器
+        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);
+                }
+            });
+        }
+
+        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/StoreMachineApply/Edit.cshtml

@@ -1,278 +1,253 @@
 @using MySystem.Models;
-@{StoreMachineApply editData = ViewBag.data as StoreMachineApply;}
+@{
+    StoreMachineApply editData = ViewBag.data as StoreMachineApply;
+}
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+    List<Dictionary<string, object>> KsProductList = ViewBag.KsProductList as List<Dictionary<string, object>>;
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
-    <title>分仓机具申请记录(修改)</title>
+    <title>分仓申请机具记录(修改)</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <script src="/admin/js/LAreaData2.js"></script>
+    <style>
+        .layui-form-label {
+            width: 135px !important;
+        }
+
+        .layui-form-item .layui-input-block {
+            margin-left: 165px !important;
+        }
+    </style>
 </head>
+
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
         <input type="hidden" name="Id" value="@editData.Id" />
-        
-        <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><li lay-id="8">发货SN</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-@{Dictionary<string, string> KqProductsDic = new MySystem.DictionaryClass().getKqProductsDic();}
-<div class="layui-form-item">
-<label class="layui-form-label">品牌</label>
-<div class="layui-input-inline">
-<select id="BrandId" name="BrandId" lay-search="">
-<option value="">请选择</option>
-@foreach (string key in KqProductsDic.Keys)
-{
-<option value="@key">@KqProductsDic[key]</option>
-}
-</select>
-<script>$("#BrandId").val("@editData.BrandId");</script>
-</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="ApplyNo" name="ApplyNo" value="@editData.ApplyNo" 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="ApplyNum" name="ApplyNum" value="@editData.ApplyNum" maxlength="20" lay-verify="" 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="SendNum" name="SendNum" value="@editData.SendNum" maxlength="20" lay-verify="" 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="UseAmount" name="UseAmount" value="@editData.UseAmount" maxlength="20" lay-verify="" 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="SendMode" name="SendMode" value="@editData.SendMode" maxlength="50" lay-verify="" 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="ErpCode" name="ErpCode" value="@editData.ErpCode" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入快递单号">
-</div>
-</div>
-@{Dictionary<string, string> UsersDic = new MySystem.DictionaryClass().getUsersDic();}
-<div class="layui-form-item">
-<label class="layui-form-label">创客</label>
-<div class="layui-input-inline">
-<select id="UserId" name="UserId" lay-search="">
-<option value="">请选择</option>
-@foreach (string key in UsersDic.Keys)
-{
-<option value="@key">@UsersDic[key]</option>
-}
-</select>
-<script>$("#UserId").val("@editData.UserId");</script>
-</div>
-</div>
-
-</div>
-<div class="layui-tab-item">
-<div class="layui-form-item layui-form-text">
-<label class="layui-form-label">发货SN数据</label>
-<div class="layui-input-block">
-<textarea class="layui-textarea" id="SendSn" name="SendSn" maxlength="" lay-verify="" placeholder="请输入发货SN数据">@editData.SendSn</textarea>
-</div>
-</div>
-
-</div>
 
+        <div class="layui-card">
+            <div class="layui-card-body">
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <div class="layui-tab-content mt20">
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">创客名称</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" readonly id="RealName" name="RealName"
+                                        value="@ViewBag.RealName" maxlength="32" 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" readonly id="ApplyNo" name="ApplyNo"
+                                        value="@editData.ApplyNo" maxlength="32" lay-verify="required|"
+                                        autocomplete="off" placeholder="">
+                                </div>
+                            </div>
+                            <fieldset class="layui-elem-field layui-field-title">
+                                <legend>申请信息</legend>
+                            </fieldset>
+                            @foreach (Dictionary<string, object> item in KsProductList)
+                            {
+                                <div class="layui-form-item">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">商品名称：</label>
+                                        <div class="layui-input-inline" style="padding-top: 8px;">
+                                            @item["Name"]
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">商品数量：</label>
+                                        <div class="layui-input-inline" style="padding-top: 8px;">
+                                            @item["Num"]
+                                        </div>
+                                    </div>
+                                </div>
+                            }
+                        </div>
+                    </div>
+                    <div class="layui-form-item layui-hide">
+                        <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
+                            value="确认">
+                    </div>
                 </div>
             </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
         </div>
-    </div>
 
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        
-        
-        //编辑器
-        KindEditor.ready(function (K) {
-            
-        });
+        <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>
+
+
+            //编辑器
+            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";
+            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>');
                 }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
+                form.render();
             }
-            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";
+            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 + "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());
             }
-            $("#" + 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";
+            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>');
                 }
-                $("#" + 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());
             }
-            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 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;" />'
+                });
             }
-        }
-        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');
-            });
-    
-            //日期
-            
+            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>
+                //TreeView，比如权限管理
+
+
+                //省市区
+
+
+            })
+
+        </script>
 </body>
+
 </html>

Areas/Admin/Views/MainServer/StoreMachineApply/Index.cshtml

@@ -1,83 +1,95 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>分仓机具申请记录</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <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{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 85px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
         }
-        .w100{
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .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">
-                    @{Dictionary<string, string> KqProductsDic = new MySystem.DictionaryClass().getKqProductsDic();}
-<div class="layui-inline">
-<label class="layui-form-label">品牌</label>
-<div class="layui-input-inline">
-<select id="BrandIdSelect" name="BrandIdSelect" lay-search="">
-<option value="">全部...</option>
-@foreach (string key in KqProductsDic.Keys)
-{
-<option value="@key">@KqProductsDic[key]</option>
-}
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">创建时间</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate" placeholder="" autocomplete="off">
-</div></div><div class="layui-inline">
-<label class="layui-form-label">申请单号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="ApplyNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">发货方式</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="SendMode" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">创客真实姓名</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="UserIdRealName" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">创客创客编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="UserIdMakerCode" autocomplete="off">
-</div>
-</div>
+                    @{
+                        Dictionary<string, string> KqProductsDic = new MySystem.DictionaryClass().getKqProductsDic();
+                    }
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">品牌</label>
+                        <div class="layui-input-inline">
+                            <select id="BrandIdSelect" name="BrandIdSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in KqProductsDic.Keys)
+                                {
+                                    <option value="@key">@KqProductsDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div> *@
+                    <div class="layui-inline">
+                        <label class="layui-form-label">创建时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
+                                placeholder="创建时间" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">申请单号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="ApplyNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">发货方式</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="SendMode" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">创客真实姓名</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="UserIdRealName" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">创客创客编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="UserIdMakerCode" autocomplete="off">
+                        </div>
+                    </div>
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -94,35 +106,37 @@
                 <div style="padding-bottom: 10px;">
                     @if (RightInfo.Contains("," + right + "_add,"))
                     {
-                        <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
+                        <button class="layui-btn" data-type="add"><i
+                            class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                        <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
+                        <button class="layui-btn" data-type="batchdel"><i
+                            class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <button class="layui-btn" data-type="Open">开启</button>
-<button class="layui-btn" data-type="Close">关闭</button>
-<button class="layui-btn" data-type="ExportExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                        <button class="layui-btn" data-type="Open">开启</button>
+                        <button class="layui-btn" data-type="Close">关闭</button>
+                        <button class="layui-btn" data-type="ExportExcel"><i
+                            class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
 
                     }
                 </div>
-                
+
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
-                    }
-                    @if (RightInfo.Contains("," + right + "_delete,"))
-                    {
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
                     }
-                    @if (RightInfo.Contains("," + right + "_edit,"))
+                    @if (RightInfo.Contains("," + right + "_audit,"))
                     {
-                    
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="audit"><i class="layui-icon layui-icon-edit"></i>审核发货</a>
                     }
+                    {{# if(d.Status == 0) { }}
+                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reduce"><i class="layui-icon layui-icon-edit"></i>驳回</a>
+                    {{# } }}
                 </script>
             </div>
         </div>
@@ -153,9 +167,10 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules/StoreMachineApply_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/layuiadmin/modules_main/StoreMachineApply_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

wwwroot/layuiadmin/modules_main/StoreMachineApply_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: 'datetime',
-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/StoreMachineApply/Sort?r=" + Math.random(1),
@@ -84,31 +84,27 @@ $('#CreateDate').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/StoreMachineApply/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'BrandId', width: 200, title:'品牌', sort: true}
-,{field:'CreateDate', width: 200, title:'创建时间', sort: true}
-,{field:'StatusName', width: 200, title:'状态', sort: true}
-,{field:'ApplyNo', width: 200, title:'申请单号', sort: true}
-,{field:'ApplyNum', width: 200, title:'申请台数', sort: true}
-,{field:'SendNum', width: 200, title:'发货台数', sort: true}
-,{field:'UseAmount', width: 200, title:'使用额度', sort: true}
-,{field:'SendMode', width: 200, title:'发货方式', sort: true}
-,{field:'ErpCode', width: 200, title:'快递单号', sort: true}
-,{field:'UserIdRealName', width: 200, title:'创客真实姓名', sort: true}
-,{field:'UserIdMakerCode', width: 200, title:'创客创客编号', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
-            , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
+            , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
+            , { field: 'StatusName', width: 200, title: '状态', sort: true }
+            , { field: 'ApplyNo', width: 200, title: '申请单号', sort: true }
+            , { field: 'ApplyNum', width: 200, title: '申请台数', sort: true }
+            , { field: 'SendNum', width: 200, title: '发货台数', sort: true }
+            , { field: 'UseAmount', width: 200, title: '使用额度', sort: true }
+            , { field: 'SendMode', width: 200, title: '发货方式', sort: true }
+            , { field: 'ErpCode', width: 200, title: '快递单号', sort: true }
+            , { field: 'UserIdRealName', width: 200, title: '创客真实姓名', sort: true }
+            , { field: 'UserIdMakerCode', width: 200, title: '创客创客编号', sort: true }
+            , { title: '操作', align: 'center', width: 300, fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -130,7 +126,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 {
@@ -153,21 +149,16 @@ $('#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) {
                         var field = data.field; //获取提交的字段
@@ -177,7 +168,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/StoreMachineApply/Edit?r=" + Math.random(1),
@@ -200,7 +191,72 @@ $('#CreateDate').val(value);
 
                 }
             });
-            layer.full(perContent);
+            // layer.full(perContent);
+        } else if (obj.event === 'audit') {
+            var tr = $(obj.tr);
+            var perContent = layer.open({
+                type: 2,
+                title: '审核发货',
+                content: 'AuditSend?Id=' + data.Id + '',
+                maxmin: true,
+                area: ['450px', '680px'],
+                btn: ['确定发货', '取消'],
+                yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index],
+                        submitID = 'LAY-list-front-submit',
+                        submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    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) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/StoreMachineApply/AuditSend?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                if (data == "success") {
+                                    layer.close(index); //关闭弹层
+                                    layer.msg('发货成功', {
+                                        time: 1500
+                                    }, function () {
+                                        table.reload('LAY-list-manage'); //数据刷新
+                                    });
+                                } else {
+                                    layer.close(index); //关闭弹层
+                                    layer.msg('审核完成', {
+                                        time: 1500
+                                    }, function () {
+                                        table.reload('LAY-list-manage'); //数据刷新
+                                    });
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                },
+                success: function (layero, index) {
+
+                }
+            });
         }
     });
 
@@ -270,20 +326,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) {
@@ -294,7 +350,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/StoreMachineApply/Add?r=" + Math.random(1),
@@ -351,9 +407,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 + ",";
@@ -380,9 +436,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 + ",";