DuGuYang 3 anni fa
parent
commit
66721da3ed

+ 52 - 92
Areas/Admin/Views/MainServer/SetMerchantTypeRecord/Index.cshtml

@@ -1,16 +1,18 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!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">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
@@ -19,127 +21,65 @@
             width: 175px !important;
         }
         .layui-form-label{
-            width: 85px !important;
+            width: 115px !important;
         }
         .layui-inline{
             margin-right: 0px !important;
-        }        
+        }
         .w100{
             width: 100px !important;
         }
         .ml50{
             margin-left: 50px !important;
         }
+        tbody .layui-table-cell{
+            height: 60px !important;
+        }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-                        <label class="layui-form-label">创客编号</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="MakerCode" autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">创客姓名</label>
+                        <label class="layui-form-label">机具SN</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="RealName" autocomplete="off">
+                            <input class="layui-input" type="text" name="PosSn" placeholder="" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
-                        <label class="layui-form-label">激活SN</label>
+                        <label class="layui-form-label">商户型创客编号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="SnNo" 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="SwapApplyOrderNo" 
+                            <input class="layui-input" type="text" name="MerUserTypeMakerCode" placeholder=""
                                 autocomplete="off">
                         </div>
                     </div>
-                              
                     <div class="layui-inline">
-                        <label class="layui-form-label">兑换SN</label>
+                        <label class="layui-form-label">机具所属创客编号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="SwapSnNo" 
+                            <input class="layui-input" type="text" name="PosFromMakerCode" placeholder=""
                                 autocomplete="off">
                         </div>
                     </div>
-                    @{Dictionary<string, string> KqProductBrandDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
-                    <div class="layui-inline">
-                        <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 KqProductBrandDic.Keys)
-                                {
-                                <option value="@key">@KqProductBrandDic[key]</option>
-                                }
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">SN类型</label>
-                        <div class="layui-input-inline">
-                            <select id="SnTypeSelect" name="SnTypeSelect" lay-search="">
-                                <option value="">全部...</option>
-                                <option value="0">兑换机具</option>
-                                <option value="1">循环机具</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">兑换状态</label>
-                        <div class="layui-input-inline">
-                            <select id="SwapStatusSelect" name="SwapStatusSelect" lay-search="">
-                                <option value="">全部...</option>
-                                <option value="0">未兑换</option>
-                                <option value="1">兑换中</option>
-                                <option value="2">已兑换</option>
-                            </select>
-                        </div>
-                    </div>
-                   
-                    <div class="layui-inline">
-                        <label class="layui-form-label">业务状态</label>
-                        <div class="layui-input-inline">
-                            <select id="BizStatusSelect" name="BizStatusSelect" lay-search="">
-                                <option value="">全部...</option>
-                                <option value="0">正常</option>
-                                <option value="1">异常</option>
-                            </select>
-                        </div>
-                    </div>
                     <div class="layui-inline">
-                        <label class="layui-form-label">风控状态</label>
+                        <label class="layui-form-label">操作类别</label>
                         <div class="layui-input-inline">
-                            <select id="RiskStatusSelect" name="RiskStatusSelect" lay-search="">
+                            <select id="OperateTypeSelect" name="OperateTypeSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="1">已风控</option>
-                                <option value="0">未风控</option>
+                                <option value="1">设置</option>
+                                <option value="2">取消</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="StandardDateData" id="StandardDate"
-                             autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">兑换时间</label>
+                        <label class="layui-form-label">创建时间</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" readonly name="SwapApplyDateData" id="SwapApplyDate"
-                             autocomplete="off">
+                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
+                                placeholder="" autocomplete="off">
                         </div>
                     </div>
-                
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
@@ -147,12 +87,6 @@
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
                             <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
                         </button>
-                        @if (RightInfo.Contains("," + right + "_export,"))
-                        {
-                        <button class="layui-btn" data-type="ExportExcel">
-                            <i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出
-                        </button>
-                        }
                     </div>
                 </div>
             </div>
@@ -164,11 +98,37 @@
             </div>
         </div>
     </div>
+    <div id="excelForm" style="display:none; padding:20px;">
+        <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" id="excelTemp">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">excel文件</label>
+                <div class="layui-form-mid layui-word-aux">
+                    <div class="layui-upload">
+                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
+                    </div>
+                    <div class="mt10" id="ExcelFileList">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item ml10">
+            <div class="layui-input-block">
+                <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
+            </div>
+        </div>
+    </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/StoreSwapSn_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/layuiadmin/modules_main/SetMerchantTypeRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>