提交

username@email.com

2021-11-26 b3b54f994b5f17b850413c6398e63e25744635e9

提交

 zhengcaioa/DTO/SysCodeDTO.cs

@@ -45,6 +45,11 @@

        public string WentiId { set; get; }

        /// <summary>
        /// 排序
        /// </summary>
        public string Sort { set; get; }

    }

    public class SysCodeSearchEntity : SearchEntity

 zhengcaioa/Services/ExpertService.cs

@@ -293,11 +293,11 @@
            }
            if (!string.IsNullOrEmpty(searchEntity.CertiNumber))
            {
                query = query.Where(m => m.CertiNumber.Contains(searchEntity.CertiNumber)).ToList();
                query = query.Where(m => m.CertiNumber != null && m.CertiNumber.Contains(searchEntity.CertiNumber)).ToList();
            }
            if (!string.IsNullOrEmpty(searchEntity.Phone1))
            {
                query = query.Where(m => m.Phone1.Contains(searchEntity.Phone1)).ToList();
                query = query.Where(m => m.Phone1 != null &&  m.Phone1.Contains(searchEntity.Phone1)).ToList();
            }
            if (!string.IsNullOrEmpty(searchEntity.Creater))
            {

 zhengcaioa/Services/SysCodeService.cs

@@ -406,6 +406,11 @@
                            select a
                             ).OrderBy(x=>x.Sort).ToList();

            if (!string.IsNullOrEmpty(searchEntity.Sort))
            {
                listCode = listCode.OrderBy(x => x.CodeSn).ToList();
            }

            //if (searchEntity.totalrows == 0)
            //{
                //获取总数
@@ -504,6 +509,17 @@
            resultEntity.Result = true;
            try
            {
                if (!string.IsNullOrEmpty(Entity.CodeSn))
                {
                    var list = _context.SysCodeDtls.Where(e => e.CodeSn == Entity.CodeSn && e.RecStatus == "A" && e.Id != Entity.Id && e.CodeId == Entity.CodeId).ToList();
                    if (list.Count > 0)
                    {
                        resultEntity.Result = false;
                        resultEntity.Message = "该编码已经存在";
                        return resultEntity;
                    }
                }


                if (!string.IsNullOrEmpty(Entity.Id))
                {

 zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs

@@ -119,7 +119,8 @@

            ViewBag.users = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();
            ViewBag.YearJiou = _liaotianService.GetSYScode("experts", "year_jiou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.Createtime = DateTime.Now.ToString("yyyy-MM-dd"); ;
            ViewBag.Createtime = DateTime.Now.ToString("yyyy-MM-dd");
            ViewBag.Createtimebe = DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd"); 
            return View();
        }


 zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs

@@ -493,6 +493,7 @@
            //JsonResult jsonResult =   new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
            searchEntity.CodeTable = "experts";
            searchEntity.CodeField = "City";
            searchEntity.Sort = "CodeSn";
            return new JsonResult(_sysCodeService.SearchSysCodeDtlPaging(searchEntity));
        }


 zhengcaioa/zhengcaioa/Views/Expert/Indexziliao.cshtml

@@ -13,7 +13,8 @@
        var users = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.users))';
        var YearJiou = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.YearJiou))';
        var Createtime = '@Html.Raw(ViewBag.Createtime)';
        
         var Createtimebe = '@Html.Raw(ViewBag.Createtimebe)';

        loseherght = 60;
        gridConfig = { multiselect: true, selectcol: "Id" };
        dataCol = [
@@ -42,7 +43,7 @@
            { label: '修改时间', name: 'Modifytime', labtype: 'txt', hidden: true }

        ];
        dataUrl = "/Expert/GetList?Province=510000&City=510100";
        dataUrl = "/Expert/GetList?Province=510000&City=510100&Createtime=" + Createtimebe + "|" + Createtime;
        searchCol = [
            { label: '省', name: 'Province', labtype: 'combox', hidden: false, data: JSON.parse(Province), cwidth: '5%', cccwidth: '6.5%' },
            { label: '市', name: 'City', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '1%', cccwidth: '7%' },
@@ -213,13 +214,13 @@
                error: function () { }
            });

           

            $("#PBSCreatetimeend").val(Createtime);

             
          
            $("#PBSCreatetimestart").val(Createtimebe);

         



        });
    </script>

 zhengcaioa/zhengcaioa/Views/SysCode/Editzhuanjiaquyu.cshtml

@@ -131,7 +131,7 @@

                                        </div>
                                    </div>
                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <div class="clearfix layer-area" style="padding-bottom:15px;display:none;" >
                                        <label class="text-right col-sm-1 col-md-1 control-label">排序</label>
                                        <div class="col-sm-2 col-md-2" style="width:5%;">
                                            <input class="form-control" label="排序" id="Sort" name="Sort" labtype="txt" addvisible="true" editvisible="true" maxlength="100" reg="" ismust="flase" type="text" value="@Model.Sort" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">

 zhengcaioa/zhengcaioa/Views/SysCode/Indexzhuanjiaquyu.cshtml

@@ -17,7 +17,7 @@

            },
            {
                label: '排序', name: 'Sort', labtype: 'txt', hidden: false, width: 50,
                label: '排序', name: 'Sort', labtype: 'txt', hidden: true, width: 50,

            },
            {