| CoreCms.Net.Model/FromBody/FMPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| CoreCms.Net.Web.Admin/Controllers/apply/applyModelController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| CoreCms.Net.Web.Admin/wwwroot/views/applymodel/index.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
CoreCms.Net.Model/FromBody/FMPage.cs
@@ -30,6 +30,11 @@ /// 判断条件 /// </summary> public string where { get; set; } /// <summary> /// 排序 /// </summary> public string order { get; set; } }
@@ -430,7 +430,7 @@ } limit = limit > 0 ? limit : 10; var goods = await _goodsServices.QueryListByComponentsAsync(where, limit, " sort desc,id desc ", true, true, 60); var goods = await _goodsServices.QueryListByComponentsAsync(where, limit, " sort asc,id asc ", true, true, 60); if (goods != null && goods.Any()) { var result = JArray.FromObject(goods); CoreCms.Net.Web.Admin/Controllers/apply/applyModelController.cs
@@ -37,6 +37,8 @@ using Essensoft.Paylink.Alipay.Domain; using Microsoft.CodeAnalysis.CSharp.Syntax; using K4os.Compression.LZ4.Internal; using CoreCms.Net.Model.ViewModels.Basics; using System.Collections.Generic; namespace CoreCms.Net.Web.Admin.Controllers { @@ -116,29 +118,26 @@ where = where.And(p => p.id == id); } //审批人ID varchar var managerID = Request.Form["managerID"].FirstOrDefault(); if (!string.IsNullOrEmpty(managerID)) var managerName = Request.Form["managerName"].FirstOrDefault(); if (!string.IsNullOrEmpty(managerName)) { where = where.And(p => p.managerID.Contains(managerID)); where = where.And(p => p.managerName.Contains(managerName)); } //审批角色ID varchar var roleID = Request.Form["roleID"].FirstOrDefault(); if (!string.IsNullOrEmpty(roleID)) { where = where.And(p => p.roleID.Contains(roleID)); } //审核人数数量 int var managerApplyCount = Request.Form["managerApplyCount"].FirstOrDefault().ObjectToInt(0); if (managerApplyCount > 0) { where = where.And(p => p.managerApplyCount == managerApplyCount); } //类型 int var aType = Request.Form["aType"].FirstOrDefault().ObjectToInt(0); if (aType > 0) var aType = Request.Form["aType"].FirstOrDefault().ObjectToInt(-1); if (aType > -1) { where = where.And(p => p.aType ==(applyType)aType); } //类型 int var ayStataType = Request.Form["ayStataType"].FirstOrDefault().ObjectToInt(-1); if (ayStataType > -1) { where = where.And(p => p.ayStataType == (applyStataType)ayStataType); } //内容 varchar var dec = Request.Form["dec"].FirstOrDefault(); if (!string.IsNullOrEmpty(dec)) @@ -223,10 +222,45 @@ } //获取数据 var list = await _applyModelServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize, true); var applyModelDTOs = new List<applyModelDTO>(); foreach( var model in list) { var modelDTO = new applyModelDTO(); modelDTO.id = model.id; modelDTO.id = model.id; modelDTO.managerID = model.managerID; modelDTO.managerName = model.managerName; modelDTO.roleID = model.roleID; modelDTO.managerApplyCount = model.managerApplyCount; modelDTO.aType = (int)model.aType; modelDTO.aTypeName = model.aType.GetDescription(); modelDTO.ayStataType = (int)model.ayStataType; modelDTO.ayStataTypeName = model.ayStataType.GetDescription(); modelDTO.userID = model.userID; modelDTO.dec = model.dec; modelDTO.reMake = model.reMake; modelDTO.oldData = model.oldData; modelDTO.data = model.data; modelDTO.createById = model.createById; modelDTO.upDataById = model.upDataById; modelDTO.createTime = model.createTime; modelDTO.upDataTime = model.upDataTime; modelDTO.createBy = model.createBy; modelDTO.upDataBy = model.upDataBy; modelDTO.isdelete = model.isdelete; applyModelDTOs.Add(modelDTO); } IPageList<applyModelDTO> listpage = new PageList<applyModelDTO>(applyModelDTOs, list.PageIndex, pageSize, list.TotalCount); //返回数据 jm.data = list; jm.data = listpage; jm.code = 0; jm.count = list.TotalCount; jm.count = listpage.TotalCount; jm.msg = "数据调用成功!"; return jm; } CoreCms.Net.Web.Admin/wwwroot/views/applymodel/index.html
@@ -22,35 +22,13 @@ <div class="layui-form-item"> <div class="layui-inline"> <label class="layui-form-label" for="id">id</label> <label class="layui-form-label" for="managerID">审批人</label> <div class="layui-input-inline"> <input type="text" name="id" placeholder="请输入id" class="layui-input"> <input type="text" name="managerName" placeholder="请输入审批人" class="layui-input"> </div> </div> <div class="layui-inline"> <label class="layui-form-label" for="managerID">审批人ID</label> <div class="layui-input-inline"> <input type="text" name="managerID" placeholder="请输入审批人ID" class="layui-input"> </div> </div> <div class="layui-inline"> <label class="layui-form-label" for="roleID">审批角色ID</label> <div class="layui-input-inline"> <input type="text" name="roleID" placeholder="请输入审批角色ID" class="layui-input"> </div> </div> <div class="layui-inline"> <label class="layui-form-label" for="managerApplyCount">审核人数数量</label> <div class="layui-input-inline"> <input type="text" name="managerApplyCount" placeholder="请输入审核人数数量" class="layui-input"> </div> </div> <div class="layui-inline"> <label class="layui-form-label" for="aType">类型</label> <div class="layui-input-inline"> <input type="text" name="aType" placeholder="请输入类型" class="layui-input"> </div> </div> <div class="layui-inline"> <label class="layui-form-label" for="dec">内容</label> <div class="layui-input-inline"> @@ -100,12 +78,26 @@ </div> </div> <div class="layui-inline"> <label class="layui-form-label" for="isdelete">删除标志</label> <label class="layui-form-label" for="aType">类型</label> <div class="layui-input-inline"> <select name="isdelete"> <option value="">请选择</option> <option value="True">是</option> <option value="False">否</option> <select name="aType"> <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" for="ayStataType">审核状态</label> <div class="layui-input-inline"> <select name="ayStataType"> <option value="-1">请选择</option> <option value="0">同意</option> <option value="1">审核中</option> <option value="2">拒绝</option> </select> </div> </div> @@ -190,10 +182,10 @@ [ { type: "checkbox", fixed: "left" }, { field: 'id', title: 'id', width: 60, sort: false}, { field: 'managerID', title: '审批人ID', sort: false,width: 105 }, { field: 'roleID', title: '审批角色ID', sort: false,width: 105 }, { field: 'managerName', title: '审批人', sort: false,width: 105 }, { field: 'roleID', title: '审批角色', sort: false,width: 105 }, { field: 'managerApplyCount', title: '审核人数数量', sort: false,width: 105 }, { field: 'aType', title: '类型', sort: false,width: 105 }, { field: 'aTypeName', title: '类型', sort: false,width: 105 }, { field: 'dec', title: '内容', sort: false,width: 105 }, { field: 'reMake', title: '备注', sort: false,width: 105 }, { field: 'oldData', title: '调整前数据', sort: false,width: 105 }, @@ -202,7 +194,7 @@ { field: 'upDataTime', title: '修改时间', width: 130, sort: false}, { field: 'createBy', title: '创建人', sort: false,width: 105 }, { field: 'upDataBy', title: '修改人', sort: false,width: 105 }, { field: 'isdelete', title: '删除标志', width: 95, templet: '#switch_isdelete', sort: false , unresize: true}, { field: 'ayStataTypeName', title: '审批状态', sort: false, width: 105 }, { width: 162, align: 'center', title:'操作', fixed: 'right', toolbar: '#LAY-app-applyModel-tableBox-bar' } ] ]
