调整押金设置查询

Areas/Admin/Controllers/MainServer/MerchantDepositSetController.cs

@@ -51,13 +51,13 @@ namespace MySystem.Areas.Admin.Controllers
         /// 商户押金设置记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(MerchantDepositSet data, string UserIdMakerCode, string UserIdRealName, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(MerchantDepositSet data, string UserIdMakerCode, string UserIdRealName, string CreateDateData, string Sort, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             // Fields.Add("CreateDate", "3"); //时间
-            Fields.Add("MerNo", "1"); //商户编号
+            // Fields.Add("MerNo", "1"); //商户编号
             Fields.Add("SnNo", "1"); //机具SN
 
 
@@ -80,6 +80,11 @@ namespace MySystem.Areas.Admin.Controllers
                 string end = datelist[1];
                 condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
+            //品牌
+            if (!string.IsNullOrEmpty(Sort))
+            {
+                condition += " and Sort =" + Sort;
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MerchantDepositSet", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -91,6 +96,8 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["UserIdMakerCode"] = userid_Users.MakerCode;
                 dic["UserIdRealName"] = userid_Users.RealName;
                 dic.Remove("UserId");
+                //产品类型
+                dic["Sort"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["Sort"].ToString()));
 
             }
             return Json(obj);

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

@@ -64,18 +64,24 @@
                         </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="MerNo" placeholder="" autocomplete="off">
+                            <input class="layui-input" type="text" name="SnNo" placeholder="" autocomplete="off">
                         </div>
                     </div>
+                    @{Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
                     <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" placeholder="" autocomplete="off">
+                            <select id="Sort" name="Sort" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
                         </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>查询

wwwroot/layuiadmin/modules_main/MerchantDepositSet_Admin.js

@@ -92,15 +92,14 @@ layui.config({
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'Sort', width: 200, title: '品牌', sort: true }
             , { field: 'UserIdMakerCode', width: 200, title: '设置人创客编号', sort: true }
             , { field: 'UserIdRealName', width: 200, title: '设置人真实姓名', sort: true }
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
-            , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
             , { field: 'SnNo', width: 200, title: '机具SN', sort: true }
             , { field: 'DepositAmount', width: 200, title: '押金金额', sort: true }
-
-            , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
-            , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
+            // , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {