username@email.com
2021-11-25 402f9568e48e6e1a9d29d37dcda46737047425d5
专家通讯录优化
15个文件已修改
2个文件已添加
980 ■■■■■ 已修改文件
zhengcaioa/DTO/ExpertDTO.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/IServices/IExpertService.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Model/Expert.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Model/zhengcaioaContext.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Services/ExpertService.cs 147 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs 99 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/AdmTongxunlu/Edit.cshtml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/Expert/Edit.cshtml 212 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/Expert/EditPromote.cshtml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/Expert/Indexziliao.cshtml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/Expert/Promote.cshtml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/ExpertsApply/ExpertsApply.cshtml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/SysCode/Editzhuanjiaquyu.cshtml 346 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/SysCode/Indexzhuanjiaquyu.cshtml 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/DTO/ExpertDTO.cs
@@ -53,7 +53,8 @@
        public string TitileCerti8 { get; set; }
        public string TitileCerti9 { get; set; }
        public string TitileCerti10 { get; set; }
        public string YearJiou { get; set; }
        public string YearJiouName { get; set; }
    }
    public partial class ExpertDTOSearch : SearchEntity
@@ -73,6 +74,7 @@
        public string ShenheStatus { get; set; }
        public string Creater { get; set; }
        public string YearJiou { get; set; }
    }
    #endregion
zhengcaioa/IServices/IExpertService.cs
@@ -28,5 +28,13 @@
        ExpertOrderDipatchDTO GetDispatch(string id);
        ResultEntity IdCardChongfu(string IdCard = "", string Id = "");
        ResultEntity CertiNumberChongfu(string CertiNumber = "", string Id = "");
        ResultEntity Phone1Chongfu(string Phone1 = "", string Id = "");
    }
}
zhengcaioa/Model/Expert.cs
@@ -46,5 +46,6 @@
        public string TitileCerti8 { get; set; }
        public string TitileCerti9 { get; set; }
        public string TitileCerti10 { get; set; }
        public string YearJiou { get; set; }
    }
}
zhengcaioa/Model/zhengcaioaContext.cs
@@ -6285,7 +6285,6 @@
                    .HasColumnName("expertType");
                entity.Property(e => e.IdCard)
                    .IsRequired()
                    .HasMaxLength(18)
                    .HasColumnName("idCard");
@@ -6337,6 +6336,10 @@
                    .HasMaxLength(1)
                    .HasColumnName("rec_status");
                entity.Property(e => e.YearJiou)
                   .HasMaxLength(1)
                   .HasColumnName("year_jiou");
                entity.Property(e => e.Remark)
                    .HasMaxLength(1000)
                    .HasColumnName("remark");
@@ -6344,7 +6347,6 @@
                entity.Property(e => e.ReviewItem).HasMaxLength(50);
                entity.Property(e => e.Sex)
                    .IsRequired()
                    .HasMaxLength(50)
                    .HasColumnName("sex");
zhengcaioa/Services/ExpertService.cs
@@ -25,13 +25,42 @@
            ResultEntity resultEntity = new ResultEntity();
            try
            {
                if (!string.IsNullOrEmpty(expertDTO.IdCard))
                {
                var list =  _context.Experts.Where(e => e.IdCard == expertDTO.IdCard && e.RecStatus == "A" && e.Id != expertDTO.Id).ToList();
                if (list.Count > 0 )
                {
                    resultEntity.Result = false;
                    resultEntity.Message = "该专家信息已经存在";
                        resultEntity.Message = "该专家身份证信息已经存在";
                    return resultEntity;
                }
                }
                if (!string.IsNullOrEmpty(expertDTO.Phone1))
                {
                    var list = _context.Experts.Where(e => e.Phone1 == expertDTO.Phone1 && e.RecStatus == "A" && e.Id != expertDTO.Id).ToList();
                    if (list.Count > 0)
                    {
                        resultEntity.Result = false;
                        resultEntity.Message = "该专家联系电话信息已经存在";
                        return resultEntity;
                    }
                }
                if (!string.IsNullOrEmpty(expertDTO.CertiNumber))
                {
                    var list = _context.Experts.Where(e => e.CertiNumber == expertDTO.CertiNumber && e.RecStatus == "A" && e.Id != expertDTO.Id).ToList();
                    if (list.Count > 0)
                    {
                        resultEntity.Result = false;
                        resultEntity.Message = "该专家专家证号信息已经存在";
                        return resultEntity;
                    }
                }
                Expert expert = _mapper.Map<Expert>(expertDTO);
                if (string.IsNullOrEmpty(expert.Id))
                {
@@ -80,6 +109,7 @@
                    updateplExpert.ShenheStatus = expert.ShenheStatus;
                    updateplExpert.Modifier = expert.Modifier;
                    updateplExpert.Modifytime = expert.Modifytime;
                    updateplExpert.YearJiou = expert.YearJiou;
                }
                _context.SaveChanges();
@@ -166,6 +196,12 @@
                         from ooo in osssss.DefaultIfEmpty()
                         join p in listCode.Where(x => x.CodeTable == "experts" && x.CodeField == "year_jiou")
                       on a.YearJiou equals p.CodeSn
                       into psss
                         from ppp in psss.DefaultIfEmpty()
                         where a.RecStatus == "A"
                          && (searchEntity.JoinCount<=0 || hhh.JoinCount >= searchEntity.JoinCount)
                         select new ExpertDTO
@@ -210,7 +246,8 @@
                             ShenheStatus = a.ShenheStatus,
                             AreaName = nnn.Name + "-" + ooo.Name,
                             YearJiou = a.YearJiou,
                             YearJiouName = ppp.Comments,
                         }).ToList(); 
@@ -266,7 +303,10 @@
            {
                query = query.Where(m => m.Creater == searchEntity.Creater).ToList();
            }
            if (!string.IsNullOrEmpty(searchEntity.YearJiou))
            {
                query = query.Where(m => m.YearJiou == searchEntity.YearJiou).ToList();
            }
           query = query.OrderByDescending(x => x.Modifytime).ToList();
            //if (searchEntity.totalrows == 0)
@@ -677,5 +717,106 @@
            var exDTO = _mapper.Map<ExpertOrderDipatchDTO>(entity);
            return exDTO;
        }
        public ResultEntity IdCardChongfu(string IdCard = "", string Id = "")
        {
            ResultEntity resultEntity = new ResultEntity();
            resultEntity.Result = true;
            try
            {
                if (!string.IsNullOrEmpty(IdCard))
                {
                    var list = _context.Experts.Where(e => e.IdCard == IdCard && e.RecStatus == "A" && e.Id != Id).ToList();
                    if (list.Count > 0)
                    {
                        resultEntity.Result = false;
                        resultEntity.Message = "该专家身份证信息已经存在";
                        return resultEntity;
                    }
                }
            }
            catch (Exception ex)
            {
                resultEntity.Result = false;
                resultEntity.Message = "查询失败,请联系管理员";
                ex.Message.ToString();
            }
            return resultEntity;
        }
        public ResultEntity CertiNumberChongfu(string CertiNumber = "", string Id = "")
        {
            ResultEntity resultEntity = new ResultEntity();
            resultEntity.Result = true;
            try
            {
                if (!string.IsNullOrEmpty(CertiNumber))
                {
                    var list = _context.Experts.Where(e => e.CertiNumber == CertiNumber && e.RecStatus == "A" && e.Id != Id).ToList();
                    if (list.Count > 0)
                    {
                        resultEntity.Result = false;
                        resultEntity.Message = "该专家专家证号信息已经存在";
                        return resultEntity;
                    }
                }
            }
            catch (Exception ex)
            {
                resultEntity.Result = false;
                resultEntity.Message = "查询失败,请联系管理员";
                ex.Message.ToString();
            }
            return resultEntity;
        }
        public ResultEntity Phone1Chongfu(string Phone1 = "", string Id = "")
        {
            ResultEntity resultEntity = new ResultEntity();
            resultEntity.Result = true;
            try
            {
                if (!string.IsNullOrEmpty(Phone1))
                {
                    var list = _context.Experts.Where(e => e.Phone1 == Phone1 && e.RecStatus == "A" && e.Id != Id).ToList();
                    if (list.Count > 0)
                    {
                        resultEntity.Result = false;
                        resultEntity.Message = "该专家联系电话信息已经存在";
                        return resultEntity;
                    }
                }
            }
            catch (Exception ex)
            {
                resultEntity.Result = false;
                resultEntity.Message = "查询失败,请联系管理员";
                ex.Message.ToString();
            }
            return resultEntity;
        }
    }
}
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
@@ -160,7 +160,7 @@
                resultEntity.Message = "无联系人";
            }
            string sss = SMSHelper.PushWToUserMES(number.ToString(), neirong);
            string sss = SMSHelper.PushWToUserMES(number.ToString(), "您好,客户. 详情见:" + neirong);
            if (int.Parse(sss) <= 0)
            {
                resultEntity.Result = false;
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
@@ -247,7 +247,7 @@
                    IntentionCustomerDTO intentionCustomerDTO = _intentionCustomerService.Get(data.Viscustomer);
                    if(intentionCustomerDTO!=null && ( !string.IsNullOrEmpty(intentionCustomerDTO.Phone) ||  !string.IsNullOrEmpty(intentionCustomerDTO.Tel)))
                    {
                        string sss = SMSHelper.PushWToUserMES(string.IsNullOrEmpty(intentionCustomerDTO.Phone)? intentionCustomerDTO.Tel: intentionCustomerDTO.Phone, data.DuanxinNeirong);
                        string sss = SMSHelper.PushWToUserMES(string.IsNullOrEmpty(intentionCustomerDTO.Phone)? intentionCustomerDTO.Tel: intentionCustomerDTO.Phone, "您好,客户. 详情见:"+data.DuanxinNeirong);
                        if (int.Parse(sss) <= 0)
                        {
                            resultEntity.Result = false;
zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs
@@ -29,8 +29,10 @@
        private readonly ICooperOrderService _cooperOrderService;
        private readonly IFiAccountService _fiAccountService;
        private readonly IFiAccountRecordService _iFiAccountRecordService;
        private readonly IAreaService _iAreaService;
        public ExpertController(ILogger<ExpertController> logger, IExpertService expertService, IProjectService projectService, ILiaotianService liaotianService, IUserService userService
            , IFiSubjectService ifiSubjectService, ICooperOrderService cooperOrderService, IFiAccountService fiAccountService, IFiAccountRecordService iFiAccountRecordService)
            , IFiSubjectService ifiSubjectService, ICooperOrderService cooperOrderService, IFiAccountService fiAccountService, IFiAccountRecordService iFiAccountRecordService
            , IAreaService iAreaService)
        {
            _logger = logger;
            _expertService = expertService;
@@ -41,6 +43,7 @@
            _cooperOrderService = cooperOrderService;
            _fiAccountService = fiAccountService;
            _iFiAccountRecordService = iFiAccountRecordService;
            _iAreaService = iAreaService;
        }
        [CheckLogin]
        public IActionResult Index()
@@ -115,13 +118,14 @@
            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();
            return View();
        }
        #region 编辑
        [CheckLogin]
        public ActionResult Edit(string id = null)
        public ActionResult Edit(string id = null, string Province = null, string City = null)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -144,8 +148,28 @@
            }
            else
            {
                if (string.IsNullOrEmpty(Province))
                {
                expertDTO.Province = "510000";
                }
                else
                {
                    expertDTO.Province = Province;
                }
                if (string.IsNullOrEmpty(City))
                {
                expertDTO.City = "510100";
                }
                else
                {
                    expertDTO.City = City;
                }
                expertDTO.ExpertType = "4";
                expertDTO.Level = "1";
                expertDTO.CertiNumber = "SC";
                expertDTO.InfoSource = "01";
                expertDTO.Sex = "1";
                expertDTO.YearJiou = "1";
            }
            // var sheng = _projectService.Getsheng();
@@ -159,6 +183,7 @@
            ViewBag.Province = _projectService.Getsheng();//.Select(x => new { code = x.CodeId, label = x.Name }).ToList();             
            ViewBag.City = _projectService.Getshi(expertDTO.Province);//.Select(x => new { code = x.CodeId, label = x.Name }).ToList();
            ViewBag.YearJiou = _liaotianService.GetSYScode("experts", "year_jiou");//.Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewData.Model = expertDTO;
            return View();
        }
@@ -638,5 +663,75 @@
            return new JsonResult(resultEntity);
        }
        /// <summary>
        /// 判断身份证是否重复
        /// </summary>
        /// <param name="shengid">省id</param>
        /// <returns></returns>
        ///
        [CheckLogin]
        public string IdCardChongfu(string IdCard = "",string Id = "")
        {
            ResultEntity resultEntity = _expertService.IdCardChongfu(IdCard, Id);
            return JsonConvert.SerializeObject(resultEntity);
        }
        /// <summary>
        /// 判断专家证是否重复
        /// </summary>
        /// <param name="shengid">省id</param>
        /// <returns></returns>
        ///
        [CheckLogin]
        public string CertiNumberChongfu(string CertiNumber = "", string Id = "")
        {
            ResultEntity resultEntity = _expertService.CertiNumberChongfu(CertiNumber, Id);
            if (resultEntity.Result)
            {
                //拆解专家证号
                var CertiNumber11 = CertiNumber.Replace("SC", "");
                var sysCodeDtls = _liaotianService.GetSYScode("experts", "City");
                var chengshis = sysCodeDtls.Where(x => CertiNumber11.StartsWith(x.CodeSn)).ToList();
                if (chengshis.Count > 0)
                {
                  var areaDTOs =  _iAreaService.GetList();
                    var chengshi = areaDTOs.Where(x => x.Name == chengshis[0].Comments).FirstOrDefault();
                    if (chengshi != null)
                    {
                        resultEntity.Message = chengshi.CodeId;
                        resultEntity.Remark = chengshi.ParentId;
                    }
                }
            }
            return JsonConvert.SerializeObject(resultEntity);
        }
        /// <summary>
        /// 判断电话是否重复
        /// </summary>
        /// <param name="shengid">省id</param>
        /// <returns></returns>
        ///
        [CheckLogin]
        public string Phone1Chongfu(string Phone1 = "", string Id = "")
        {
            ResultEntity resultEntity = _expertService.Phone1Chongfu(Phone1, Id);
            return JsonConvert.SerializeObject(resultEntity);
        }
    }
}
zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
@@ -461,6 +461,62 @@
        
        [CheckLogin]
        public IActionResult Indexzhuanjiaquyu()
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            List<ActionEntity> actionlist = new List<ActionEntity>();
            ActionEntity actionEntity = new ActionEntity();
            actionEntity.OpenType = 0;
            actionEntity.ActionUrl = "";
            actionEntity.ActionFun = "Search";
            actionEntity.PageIco = "fa fa-search";
            actionEntity.ActionName = "查询";
            actionlist.Add(actionEntity);
            ActionEntity actionEntity1 = new ActionEntity();
            actionEntity1.OpenType = 0;
            actionEntity1.ActionUrl = "";
            actionEntity1.ActionFun = "Add";
            actionEntity1.PageIco = "fa fa-plus";
            actionEntity1.ActionName = "新增";
            actionlist.Add(actionEntity1);
            ViewData["ActionInfo"] = actionlist;
            return View();
        }
        [CheckLogin]
        public IActionResult GetListzhuanjiaquyu(SysCodeDtlSearchEntity searchEntity)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            //JsonResult jsonResult =   new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
            searchEntity.CodeTable = "experts";
            searchEntity.CodeField = "City";
            return new JsonResult(_sysCodeService.SearchSysCodeDtlPaging(searchEntity));
        }
        public IActionResult Editzhuanjiaquyu(string id)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            SysCodeDtlEntity sysCodeDtlEntity = new SysCodeDtlEntity();
            sysCodeDtlEntity = _sysCodeService.GetSysCodeDtlInfo(id, "experts", "City");
            ViewData.Model = sysCodeDtlEntity;
            return View();
        }
zhengcaioa/zhengcaioa/Views/AdmTongxunlu/Edit.cshtml
@@ -122,7 +122,7 @@
                                        </select>
                                        <input type="hidden" id="Id" name="Id" value="@Model.Id" />
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">单位名称<i class="red">*</i></label>
                                    <label class="text-right col-sm-1 col-md-1 control-label">单位名称</label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="DanweiName" class="form-control" label="单位名称" name="DanweiName" labtype="txt" addvisible="true" editvisible="true" maxlength="100" reg="" ismust="true" type="text" value="@Model.DanweiName">
@@ -234,10 +234,10 @@
                toastr.warning("类别不能为空");
                return;
            }
            if ($.trim($("#DanweiName").val()) == '') {
                toastr.warning("单位名称不能为空");
                return;
            }
            //if ($.trim($("#DanweiName").val()) == '') {
            //    toastr.warning("单位名称不能为空");
            //    return;
            //}
            if ($.trim($("#Lianxiren").val()) == '') {
                toastr.warning("联系人不能为空");
zhengcaioa/zhengcaioa/Views/Expert/Edit.cshtml
@@ -9,7 +9,7 @@
    List<SysCodeDtl> expertType = ViewData["expertType"] as List<SysCodeDtl>; //专家类型
    List<SysCodeDtl> level = ViewData["level"] as List<SysCodeDtl>; //专家等级
    List<SysCodeDtl> ReviewItem = ViewData["ReviewItem"] as List<SysCodeDtl>; //评审品目
    List<SysCodeDtl> YearJiou = ViewData["YearJiou"] as List<SysCodeDtl>; //考试时间
}
@{
            Layout = null;
@@ -184,21 +184,21 @@
                                    <div class="col-sm-2 col-md-2">
                                        <input class="form-control" label="详细地址" name="Name" id="Name" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Name" autocomplete="off">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">性别<i class="red">*</i></label>
                                    <label class="text-right col-sm-1 col-md-1 control-label">性别</label>
                                    <div class="col-sm-2 col-sm-2" grouptype="Vdata">
                                        <select id="Sex" class="form-control" name="Sex" data-placeholder="选择 序列 ..." style="font-weight:normal;">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in Sex)
                                            {
                                                @if (!item.CodeId.Equals(Model.Sex))
                                                @if (!item.CodeSn.Equals(Model.Sex))
                                                {
                                                    <option value="@item.CodeId" hassubinfo="true">
                                                    <option value="@item.CodeSn" hassubinfo="true">
                                                        @item.Comments
                                                    </option>
                                                }
                                                else
                                                {
                                                    <option value="@item.CodeId" hassubinfo="true" selected="selected">
                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                        @item.Comments
                                                    </option>
                                                }
@@ -213,7 +213,7 @@
                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">评审品目<i class="red">*</i></label>
                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">评审品目</label>
                                    <div class="col-sm-11 col-md-11" grouptype="Vdata">
                                        <select id="ReviewItem" class="form-control" name="ReviewItem" multiple data-placeholder="选择 序列 ...">
                                            <option value="" hassubinfo="true">请选择</option>
@@ -272,12 +272,38 @@
                                    <label class="text-right col-sm-1 col-md-1 control-label">身份证号</label>
                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
                                        <input class="form-control" label="身份证号" name="IdCard" id="IdCard" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.IdCard" autocomplete="off">
                                        <input class="form-control" label="身份证号" name="IdCard" id="IdCard" labtype="txt" addvisible="true" editvisible="true" maxlength="18" reg="" ismust="true" type="text" value="@Model.IdCard" autocomplete="off">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">专家证号</label>
                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
                                        <input class="form-control" label="专家证号" name="CertiNumber" id="CertiNumber" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.CertiNumber">
                                    </div>
                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">考试时间</label>
                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
                                        <select id="YearJiou" class="form-control" name="YearJiou" data-placeholder="选择 序列 ...">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in YearJiou)
                                            {
                                                @if (!item.CodeSn.Equals(Model.YearJiou))
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true">
                                                        @item.Comments
                                                    </option>
                                                }
                                                else
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                        @item.Comments
                                                    </option>
                                                }
                                            }
                                            }
                                        </select>
                                    </div>
                                </div>
@@ -875,7 +901,7 @@
        // 保存岗位信息
        var saveExpert = function () {
            if ($("#InfoSource").val() == '') {
                toastr.warning("客户来源不能为空");
                toastr.warning("信息来源不能为空");
                return;
            }
            if ($("#ExpertType").val() == '') {
@@ -886,21 +912,21 @@
                toastr.warning("专家姓名不能为空");
                return;
            };
            if (Verify.isNull($("#Province").val()) || Verify.isNull($("#City").val()) ) {
                toastr.warning("区域不能为空");
                return;
            }
            if ($("#IdCard").val() == '') {
                toastr.warning("身份证号不能为空");
                return;
            }
            //if (Verify.isNull($("#Province").val()) || Verify.isNull($("#City").val()) ) {
            //    toastr.warning("区域不能为空");
            //    return;
            //}
            //if ($("#IdCard").val() == '') {
            //    toastr.warning("身份证号不能为空");
            //    return;
            //}
            if ($.trim($("#ReviewItem").val()) == '') {
                toastr.warning("评审项目不能为空");
                return;
            }
            //if ($.trim($("#ReviewItem").val()) == '') {
            //    toastr.warning("评审项目不能为空");
            //    return;
            //}
           
            //var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
@@ -924,7 +950,9 @@
                                _pageAutoClose();//自动关闭页面方法
                            }
                            catch (err) {
                                parent._CloseTab1("/Expert/Edit/");
                                window.location = "/Expert/Edit?Province=" + $("#Province").val() + "&City=" + $("#City").val();
                                //parent._CloseTab1("/Expert/Edit/");
                            }
                        }
@@ -983,7 +1011,7 @@
            var city = $.trim($("#City").find("option:selected").text());
            var Address = $("#Address");
            Address.val(sheng + city + AreaId.replace("请选择", ""));
            Address.val(sheng + city );
        }
        if ($("#Id").val() == '') {
@@ -1000,6 +1028,146 @@
            parent.layer.close(index);
            return false;
        }
        $("#IdCard").change(function () {
            var IdCard = $.trim($("#IdCard").val());
            if (IdCard == "") {
                return;
            }
            var Id = $("#Id").val();
            $.ajax({
                type: "GET",
                url: "/Expert/IdCardChongfu?IdCard=" + IdCard + "&Id=" + Id,
                dataType: "json",
                global: false,
                data: "",
                success: function (data) {
                    if (data.Result) {
                    }
                    else {
                        // toastr.error("失败");
                        parent.layer.msg(data.Message, { icon: 5 });
                    }
                },
                error: function () {
                    parent.layer.msg('失败', { icon: 5 });
                }
            });
        });
        $("#Phone1").change(function () {
            var Phone1 = $.trim($("#Phone1").val());
            if (Phone1 == "") {
                return;
            }
            var Id = $("#Id").val();
            $.ajax({
                type: "GET",
                url: "/Expert/Phone1Chongfu?Phone1=" + Phone1 + "&Id=" + Id,
                dataType: "json",
                global: false,
                data: "",
                success: function (data) {
                    if (data.Result) {
                    }
                    else {
                        // toastr.error("失败");
                        parent.layer.msg(data.Message, { icon: 5 });
                    }
                },
                error: function () {
                    parent.layer.msg('失败', { icon: 5 });
                }
            });
        });
        $("#CertiNumber").change(function () {
            var CertiNumber = $.trim($("#CertiNumber").val());
            if (CertiNumber == "") {
                return;
            }
            var Id = $("#Id").val();
            $.ajax({
                type: "GET",
                url: "/Expert/CertiNumberChongfu?CertiNumber=" + CertiNumber + "&Id=" + Id,
                dataType: "json",
                global: false,
                data: "",
                success: function (data) {
                    if (data.Result) {
                        if ($("#Province").val() != data.Remark) {
                            $("#Province").val(data.Remark);
                            var sheng = $("#Province").val();
                            var shi = data.Message;
                            $.ajax({
                                type: "GET",
                                url: "/Project/getCity?shengid=" + sheng,
                                dataType: "json",
                                global: false,
                                async: false,
                                data: "",
                                success: function (data) {
                                    var city = $("#City");
                                    city.find('option').remove();
                                    var aaa = '<option value="" hassubinfo="true">请选择</option>';
                                    city.append(aaa);
                                    if (data.length > 0) {
                                        for (var i = 0; i < data.length; i++) {
                                            var o = '<option value="' + data[i].CodeId + '" hassubinfo="true">' + data[i].Name + '</option>';
                                            if (data[i].CodeId == shi) {
                                                o = '<option value="' + data[i].CodeId + '" hassubinfo="true" selected="selected" >' + data[i].Name + '</option>';
                                            }
                                            city.append(o);
                                        }
                                    }
                                },
                                error: function () {
                                    parent.layer.msg('失败', { icon: 5 });
                                }
                            });
                        } else {
                            $("#City").val(data.Message);
                        }
                    }
                    else {
                        // toastr.error("失败");
                        parent.layer.msg(data.Message, { icon: 5 });
                    }
                },
                error: function () {
                    parent.layer.msg('失败', { icon: 5 });
                }
            });
        });
    </script>
</body>
</html>
zhengcaioa/zhengcaioa/Views/Expert/EditPromote.cshtml
@@ -101,7 +101,7 @@
                    </tr>
                    <tr style="height:150px">
                        <td>
                            <label class="text-right  control-label">推广时间</label>
                            <label class="text-right  control-label">推广内容</label>
                        </td>
                        <td class="data">                            
                                <textarea id="Content" class="form-control" name="Content" style="width:230px; " cols="20" rows="9"></textarea>                            
zhengcaioa/zhengcaioa/Views/Expert/Indexziliao.cshtml
@@ -11,6 +11,7 @@
        var level = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.level))';
        var ReviewItem = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ReviewItem))';
        var users = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.users))';
         var YearJiou= '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.YearJiou))';
        loseherght = 60;
        gridConfig = { multiselect: true, selectcol: "Id" };
        dataCol = [
@@ -22,7 +23,7 @@
            { label: '专家证号', name: 'CertiNumber', labtype: 'txt', hidden: false },
            { label: '联系电话', name: 'Phone1', labtype: 'txt', hidden: false },
            { label: '录入人', name: 'CreaterName', labtype: 'txt', hidden: false },
            { label: '考试时间', name: 'YearJiouName', labtype: 'txt', hidden: false },
            {
                label: '操作', name: 'caozuo', labtype: 'txt', hidden: false, width: 50,
                formatter: function (cellvalue, options, rowObject) {
@@ -49,7 +50,7 @@
            { label: '录入时间', name: 'Createtime', labtype: 'datearea', hidden: false },
            { label: '录入人', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(users) },
            { label: '评审品目', name: 'ReviewItem', labtype: 'combox', hidden: false, data: JSON.parse(ReviewItem) },
            { label: '考试时间', name: 'YearJiou', labtype: 'combox', hidden: false, data: JSON.parse(YearJiou) },
          
           
           
zhengcaioa/zhengcaioa/Views/Expert/Promote.cshtml
@@ -16,8 +16,8 @@
        var searchIn = { Createtime: "", ExpertId: "@experId", Creater:""};
        dataCol = [
            { label: 'id', name: 'Id', labtype: 'txt', hidden: true },
            { label: '编号', name: 'SN', labtype: 'txt', hidden: false },
            { label: '录入时间', name: 'Createtime', labtype: 'txt', hidden: false },
            //{ label: '编号', name: 'SN', labtype: 'txt', hidden: false },
            { label: '推广时间', name: 'PromoteDate', labtype: 'txt', hidden: false },
           // { label: '专家', name: 'Name', labtype: 'txt', hidden: false },
            //{ label: '专家证号', name: 'CertiNumber', labtype: 'txt', hidden: false },
            { label: '内容', name: 'Content', labtype: 'txt', hidden: false },
zhengcaioa/zhengcaioa/Views/ExpertsApply/ExpertsApply.cshtml
@@ -213,7 +213,7 @@
                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">评审品目<i class="red">*</i></label>
                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">评审品目</label>
                                    <div class="col-sm-11 col-md-11" grouptype="Vdata">
                                        <select id="ReviewItem" class="form-control" name="ReviewItem" multiple data-placeholder="选择 序列 ...">
                                            <option value="" hassubinfo="true">请选择</option>
@@ -853,10 +853,10 @@
            if ($.trim($("#ReviewItem").val()) == '') {
                toastr.warning("评审项目不能为空");
                return;
            }
            //if ($.trim($("#ReviewItem").val()) == '') {
            //    toastr.warning("评审项目不能为空");
            //    return;
            //}
            if ($("#Sex").val() == '') {
                toastr.warning("性别不能为空");
zhengcaioa/zhengcaioa/Views/SysCode/Editzhuanjiaquyu.cshtml
New file
@@ -0,0 +1,346 @@
@model DTO.SysCodeDtlEntity
@using DTO;
@using zhengcaioa.Models;
@{
}
@{
    Layout = null;
}
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
    <meta name="description" content="">
    <meta name="author" content="ThemeBucket">
    <title>@(SiteConfig.SiteName)</title>
    <link href="~/css/bootstrap.min.css" rel="stylesheet">
    <link href="~/css/font-awesome.min.css" rel="stylesheet">
    <link href="~/css/animate.min.css" rel="stylesheet">
    @*<link href="~/css/plugins/iCheck/custom.css" rel="stylesheet">*@
    <link href="~/css/style.min.css" rel="stylesheet">
    <link href="~/css/plugins/chosen/chosen.css" rel="stylesheet">
    @*<link href="~/js/plugins/layer/skin/layer.css" rel="stylesheet">*@
    @*<link href="~/css/plugins/datapicker/datepicker3.css" rel="stylesheet">*@
    <link href="~/css/style.min.css" rel="stylesheet">
    <link href="~/css/plugins/toastr/toastr.min.css" rel="stylesheet" />
    <link href="~/css/plugins/webuploader/webuploader.css" rel="stylesheet" />
    <style type="text/css">
        .webuploader-pick {
            position: relative;
            display: inline-block;
            cursor: pointer;
            background: #00b7ee;
            padding: 8px 14px 7px 14px;
            color: #fff;
            text-align: center;
            border-radius: 3px;
            overflow: hidden;
        }
        div.clearfix > label {
            padding-top: 8px;
        }
        .chosen-container {
            border-radius: 1px;
            border: 1px solid #e5e6e7;
        }
        .col-md-1.control-label {
            padding-right: 0px;
            font-weight: 400;
        }
    </style>
    <!-- jqgrid-->
    @*<link href="~/css/plugins/jqgrid/ui.jqgrid.css" rel="stylesheet">*@
    <script language="javascript" src="~/js/jquery.min.js" type="text/javascript"></script>
    <script src="~/js/bootstrap.min.js"></script>
    @*<script src="~/js/plugins/bootstro/bootstro.js"></script>*@
    <!--容器-->
    @*<script language="javascript" src="~/js/datehelper.js" type="text/javascript"></script>*@
    @*<script language="javascript" src="~/js/plugins/query/jquery.query-object.js" type="text/javascript"></script>*@
    @*<script language="javascript" src="~/js/plugins/iCheck/icheck.min.js" type="text/javascript"></script>*@
    <script language="javascript" src="~/js/plugins/chosen/chosen.jquery.js" type="text/javascript"></script>
    @*<script language="javascript" src="~/js/plugins/datapicker/bootstrap-datepicker.js" type="text/javascript"></script>*@
    <script language="javascript" src="~/js/plugins/layer/layer.js" type="text/javascript"></script>
    @*<script src="~/js/plugins/jqgrid/jquery.jqGrid.min.js" type="text/javascript"></script>*@
    @*<script src="~/js/plugins/jqgrid/i18n/grid.locale-cn.js" type="text/javascript"></script>*@
    <script src="~/js/plugins/toastr/toastr.min.js" type="text/javascript"></script>
    <script src="~/js/plugins/webuploader/webuploader.min.js"></script>
    <script language="javascript" src="~/js/common-layout.js" type="text/javascript"></script>
    <script src="~/js/plugins/layer/laydate/laydate.js" type="text/javascript"></script>
    @*<script src="~/js/plugins/iTexbox/itextbox.js" type="text/javascript"></script>*@
    @*<script src="~/js/plugins/iuploader/iuploader.js"></script>*@
    <script src="~/js/TUJS.js"></script>
</head>
<body class="gray-bg" style="overflow:auto">
    <form id="formtest">
        <div class="wrapper wrapper-content" id="ibox-content" style="padding:15px;">
            <div class="row">
                <div class="col-sm-12">
                    <div class="ibox float-e-margins">
                        <div class="ibox-title">
                            <h5>                            <i class="fa fa-list"></i>&nbsp;基本信息</h5>
                        </div>
                        <div id="div_content" class="ibox-content" style="background-color:white;">
                            <div class="row">
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
                                        <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="CodeSn" name="CodeSn" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@Model.CodeSn">
                                            <input type="hidden" name="Id" value="@Model.Id" />
                                            <input type="hidden" name="CodeId" value="@Model.CodeId" />
                                        </div>
                                    </div>
                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
                                        <label class="text-right col-sm-1 col-md-1 control-label">名称</label>
                                        <div class="col-sm-2 col-md-2">
                                            <input class="form-control" label="名称" id="Comments" name="Comments" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="100" ismust="true" type="text" value="@Model.Comments">
                                        </div>
                                    </div>
                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
                                        <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})?/)">
                                        </div>
                                    </div>
                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
                                        <label class="text-right col-sm-1 col-md-1 control-label">备注</label>
                                        <div class="col-sm-6 col-md-6">
                                            <input class="form-control" label="备注" id="Contents" name="Contents" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="300" ismust="true" type="text" value="@Model.Contents">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                </div>
            </div>
        </div>
        <div class="wrapper wrapper-content" style="margin-top:0px"></div>
        <div class="ibox-content" id="top" style="z-index:100; position:fixed; height:50px; width:100%;bottom:0; text-align: right; padding-top:8px ">
            <div class="" style="float:right;" data-bootstro-width="500px" data-bootstro-content="功能按钮:“保存”,“删除”">
                <a class="btn btn-success" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;">
                    <i class="glyphicon glyphicon-remove"></i>&nbsp;&nbsp;<span class="bold">删除</span>
                </a>
                <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
                    <i class="glyphicon glyphicon-ok"></i>&nbsp;&nbsp;<span class="bold">提交</span>
                </a>
                <a class="btn btn-success" href="javascript:void(0)" onclick="closepage();" style="margin-left:4px; border-radius:4px;">
                    <i class="glyphicon glyphicon-remove"></i>&nbsp;&nbsp;<span class="bold">关闭</span>
                </a>
            </div>
        </div>
    </form>
    <script type="text/javascript">
        var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2;
        $("#div_content").height(hh);
        toastr.options = {
            "closeButton": true,
            "debug": false,
            "progressBar": true,
            "positionClass": "toast-bottom-right",
            "onclick": null,
            "showDuration": "300",
            "hideDuration": "600",
            "timeOut": "4500",
            "extendedTimeOut": "600",
            "showEasing": "swing",
            "hideEasing": "linear",
            "showMethod": "fadeIn",
            "hideMethod": "fadeOut"
        };
        var id = '@Model.Id';
        var delPosition = function () {
            if (id == null || id == '') {
                toastr.warning("请先保存");
                return;
            }
            $.ajax({
                type: "GET",
                url: "/SysCode/NullifySysCodeDtl?id=" + id,
                dataType: "json",
                global: false,
                data: '',
                success: function (data) {
                    if (data.Result) {
                        //  parent._afterSave(true);
                        parent.layer.msg('删除成功', { icon: 6 });
                        _pageAutoClose();//自动关闭页面方法
                    }
                    else {
                        // toastr.error("");
                        parent.layer.msg('删除失败', { icon: 5 });
                    }
                },
                error: function () {
                    if ($.isNumber(imgLoad)) {
                        parent.layer.close(imgLoad);
                    }
                    //toastr.error("保存失败");
                    parent.layer.msg('保存失败', { icon: 5 });
                }
            });
        }
        var closepage = function () {
            _pageAutoClose();//自动关闭页面方法
        }
        // 保存岗位信息
        var savePosition = function () {
            if ($.trim($("#CodeSn").val()) == '') {
                toastr.warning("编码不能为空");
                return;
            }
            if ($.trim($("#Comments").val()) == '') {
                toastr.warning("名称不能为空");
                return;
            }
           // var data = { id: $("#Id").val(), DocType: $("#DocType").val(), DocDept: $("#DocDept").val(), PublishTime: $("#PublishTime").val(), DocNo: $("#DocNo").val(), DocTitle: $("#DocTitle").val(), DocContent: ueue, DocZtc: $("#DocZtc").val(), Printtimes: $("#Printtimes").val(), DocCsdw: $("#DocCsdw").val(), PrintStatus: $("#PrintStatus").val()}
            $.ajax({
                type: "POST",
                url: "/SysCode/Savequestiontype",
                dataType: "json",
                global: false,
                data: $('form').serializeArray(),
                success: function (data) {
                        if (data.Result) {
                            //  parent._afterSave(true);
                            parent.layer.msg('成功保存', { icon: 6 });
                            window.location = "/SysCode/Editzhuanjiaquyu";
                            //try {
                            //    _pageAutoClose();//自动关闭页面方法
                            //}
                            //catch (err) {
                            //    parent._CloseTab1("/HrJibengongzi/Edit/");
                            //}
                        }
                        else {
                            // toastr.error("失败");
                            parent.layer.msg(data.Message, { icon: 5 });
                        }
                },
                error: function () {
                    parent.layer.msg('失败', { icon: 5 });
                }
            });
        }
        function _pageAutoClose() {
            parent.window._reloadPageData();
            var index = parent.layer.getFrameIndex(window.name);
            parent.layer.isRefresh = true;
            parent.layer.closeAll('loading');
            parent.layer.close(index);
            return false;
        }
    </script>
</body>
</html>
zhengcaioa/zhengcaioa/Views/SysCode/Indexzhuanjiaquyu.cshtml
New file
@@ -0,0 +1,66 @@
@{
    ViewBag.Title = "Editzhuanjiaquyu";
    Layout = "~/Views/Shared/_Layout_Search.cshtml";
}
@section headerStyle{
    <script type="text/javascript">
        dataCol = [
            { label: 'id', name: 'Id', labtype: 'txt', hidden: true },
            {
                label: '编码', name: 'CodeSn', labtype: 'txt', hidden: false, width: 50,
                formatter: function (cellvalue, options, rowObject) {
                    return "<a onclick=\"OpenWindow('" + rowObject.Comments + "','98%','100%', '/SysCode/Editzhuanjiaquyu?id=" + rowObject.Id + "')\"  >" + cellvalue + "</a>";
                }
            },
            {
                label: '名称', name: 'Comments', labtype: 'txt', hidden: false, width: 200,
            },
            {
                label: '排序', name: 'Sort', labtype: 'txt', hidden: false, width: 50,
            },
            {
                label: '备注', name: 'Contents', labtype: 'txt', hidden: false, width: 300,
            },
            { label: '状态', name: 'RecStatus', labtype: 'txt', hidden: true },
            { label: '创建人', name: 'Creater', labtype: 'txt', hidden: true },
            { label: '创建时间', name: 'Createtime', labtype: 'txt', hidden: true },
            { label: '修改人', name: 'Modifier', labtype: 'txt', hidden: true },
            { label: '修改时间', name: 'Modifytime', labtype: 'txt', hidden: true },
        ];
        dataUrl = "/SysCode/GetListzhuanjiaquyu";
        searchCol = [
            { label: '编码', name: 'CodeSn', labtype: 'txt', hidden: false },
            { label: '名称', name: 'Comments', labtype: 'txt', hidden: false },
        ];
        var _pageAdd = function () {
            OpenWindow("新增区域对照", "98%", "90%", "/SysCode/Editzhuanjiaquyu/");
        }
        var _afterSave = function (result) {
            if (result) {
                toastr.success("保存成功");
            } else {
                toastr.error("保存失败");
            }
        }
        var _afterDel = function (result) {
            if (result) {
                toastr.success("删除成功");
            } else {
                /**/
                toastr.error("删除成功");
        /**/
    }
}
    </script>
}