提交

username@email.com

2021-06-04 10b700dad2a510b83a5066aa5002dea8f4eb0e38

提交

 zhengcaioa/DTO/DailyManagementDTO .cs

@@ -49,7 +49,8 @@
        public string RtypeName { get; set; }
        public string ToUserId { get; set; }
       // public string toUserName { get; set; }
        public DateTime Time { get; set; }
        public DateTime? Time { get; set; }
        public string TimeName { get; set; }
        public string Context { get; set; }
        public int HaveRead { get; set; }
        public string HaveReadName { get; set; }

 zhengcaioa/DTO/ExpertDTO.cs

@@ -35,6 +35,16 @@
        public DateTime Createtime { get; set; }
        public string Modifier { get; set; }
        public DateTime Modifytime { get; set; }
        public string TitileCerti1 { get; set; }
        public string TitileCerti2 { get; set; }
        public string TitileCerti3 { get; set; }
        public string TitileCerti4 { get; set; }
        public string TitileCerti5 { get; set; }
        public string TitileCerti6 { get; set; }
        public string TitileCerti7 { get; set; }
        public string TitileCerti8 { get; set; }
        public string TitileCerti9 { get; set; }
        public string TitileCerti10 { get; set; }

    }


 zhengcaioa/DTO/ProjectDTO.cs

@@ -48,6 +48,7 @@
        public string[] Names { get; set; }
        public string[] Price { get; set; }

        public string NamesZhongbiao { get; set; }

        public string Fblx { get; set; }
        public string Fbyy { get; set; }
@@ -90,7 +91,10 @@
        public string Creater { get; set; }

        public string Names { get; set; }

        public string NamesToubiao { get; set; }
        


    }
}

 zhengcaioa/IServices/IIntentionCustomerService.cs

@@ -13,6 +13,8 @@

        IntentionCustomerDTO Get(string id);

        IntentionCustomerDTO GetByName(string name);

        ResultDataEntity<IntentionCustomerDTO> SearchByPaging(IntentionCustomerDTOSearch searchEntity);

        ResultEntity ModifyStatus(string id, string userid);

 zhengcaioa/Model/AdmMemoBook.cs

@@ -10,7 +10,7 @@
        public string Id { get; set; }
        public string Rtype { get; set; }
        public string ToUserId { get; set; }
        public DateTime Time { get; set; }
        public DateTime? Time { get; set; }
        public string Context { get; set; }
        public string RecStatus { get; set; }
        public string Creater { get; set; }

 zhengcaioa/Model/Expert.cs

@@ -1,43 +1,50 @@
using System;
using System.Collections.Generic;
using System.Text;

#nullable disable

namespace zhengcaioa.Models
{
    /// <summary>
    /// 专家信息
    /// </summary>
    public partial class Expert
    {
        public string Id { get; set; }
        public string Name { get; set; }
        public string Id { get; set; }
        public string Sex { get; set; }
        public string InfoSource { get; set; }
        public string IdCard { get; set; }
        public string Province { get; set; }
        public string AreaId { get; set; }
        public string City { get; set; }
        public string Address { get; set; }
        public string Postal { get; set; }
        public string InfoSource { get; set; }
        public string ExpertType { get; set; }
        public string Level { get; set; }
        public string ReviewItem { get; set; }
        public string CertiNumber { get; set; }
        public string Province { get; set; }
        public string City { get; set; }
        public string AreaId { get; set; }
        public string Address { get; set; }
        public string Phone1 { get; set; }
        public string Phone2 { get; set; }
        public string Qq { get; set; }
        public string Wechat { get; set; }
        public string ReviewItem { get; set; }
        public string CertiNumber { get; set; }
        public string CertiFont { get; set; }
        public string CertiBack { get; set; }
        public string TitileCerti { get; set; }
        public string Remark { get; set; }
        public string Sort { get; set; }
        public string RecStatus { get; set; }
        public string Creater { get; set; }
        public DateTime Createtime { get; set; }
        public string Modifier { get; set; }
        public DateTime Modifytime { get; set; }

        public string Sort { get; set; }
        public string Postal { get; set; }
        public string ShenheStatus { get; set; }
        public string TitileCerti1 { get; set; }
        public string TitileCerti2 { get; set; }
        public string TitileCerti3 { get; set; }
        public string TitileCerti4 { get; set; }
        public string TitileCerti5 { get; set; }
        public string TitileCerti6 { get; set; }
        public string TitileCerti7 { get; set; }
        public string TitileCerti8 { get; set; }
        public string TitileCerti9 { get; set; }
        public string TitileCerti10 { get; set; }
    }
}

 zhengcaioa/Model/zhengcaioaContext.cs

@@ -4377,6 +4377,11 @@
                    .HasMaxLength(50)
                    .HasColumnName("sex");

                entity.Property(e => e.ShenheStatus)
                    .HasMaxLength(1)
                    .HasColumnName("shenhe_status")
                    .HasDefaultValueSql("('D')");

                entity.Property(e => e.Sort)
                    .HasMaxLength(50)
                    .IsUnicode(false)
@@ -4384,6 +4389,26 @@

                entity.Property(e => e.TitileCerti).HasMaxLength(200);

                entity.Property(e => e.TitileCerti1).HasMaxLength(200);

                entity.Property(e => e.TitileCerti10).HasMaxLength(200);

                entity.Property(e => e.TitileCerti2).HasMaxLength(200);

                entity.Property(e => e.TitileCerti3).HasMaxLength(200);

                entity.Property(e => e.TitileCerti4).HasMaxLength(200);

                entity.Property(e => e.TitileCerti5).HasMaxLength(200);

                entity.Property(e => e.TitileCerti6).HasMaxLength(200);

                entity.Property(e => e.TitileCerti7).HasMaxLength(200);

                entity.Property(e => e.TitileCerti8).HasMaxLength(200);

                entity.Property(e => e.TitileCerti9).HasMaxLength(200);

                entity.Property(e => e.Wechat)
                    .HasMaxLength(20)
                    .HasColumnName("wechat");

 zhengcaioa/Services/DailyManagementService.cs

@@ -236,6 +236,7 @@
                          Creater = c.UserName,
                          ToUserId = b.UserName,
                          Time = a.Time,
                          TimeName = a.Time.HasValue ? a.Time.Value.ToString("yyyy-MM-dd HH:mm") : "",
                          Context = a.Context,
                          Createtime = a.Createtime,
                          FeedBack = a.FeedBack,
@@ -251,7 +252,7 @@
                          HaveRead = a.HaveRead.HasValue? a.HaveRead.Value:0,
                          HaveReadName = hhh.Comments,

                      }).OrderByDescending(x=>x.Time).ToList();
                      }).OrderByDescending(x=>x.Createtime).ToList();

            //if (!string.IsNullOrEmpty(search.Createtime))
            //{

 zhengcaioa/Services/ExpertService.cs

@@ -62,6 +62,16 @@
                    updateplExpert.CertiBack = expert.CertiBack;
                    updateplExpert.TitileCerti = expert.TitileCerti;
                    updateplExpert.Remark = expert.Remark;
                    updateplExpert.TitileCerti1 = expert.TitileCerti1;
                    updateplExpert.TitileCerti2 = expert.TitileCerti2;
                    updateplExpert.TitileCerti3 = expert.TitileCerti3;
                    updateplExpert.TitileCerti4 = expert.TitileCerti4;
                    updateplExpert.TitileCerti5 = expert.TitileCerti5;
                    updateplExpert.TitileCerti6 = expert.TitileCerti6;
                    updateplExpert.TitileCerti7 = expert.TitileCerti7;
                    updateplExpert.TitileCerti8 = expert.TitileCerti8;
                    updateplExpert.TitileCerti9 = expert.TitileCerti9;
                    updateplExpert.TitileCerti10 = expert.TitileCerti10;
                }

                _context.SaveChanges();

 zhengcaioa/Services/IntentionCustomerService.cs

@@ -112,6 +112,23 @@
        return intentionCustomerDTO;
    }

        public IntentionCustomerDTO GetByName(string name)
        {
            
            var entity = _context.IntentionCustomers.Where(x=>x.Name == name).FirstOrDefault();

            if (entity==null || entity.RecStatus != "A")
            {
                entity = new IntentionCustomer();
            }

            var intentionCustomerDTO = _mapper.Map<IntentionCustomerDTO>(entity);


            return intentionCustomerDTO;
        }

        
    public ResultDataEntity<IntentionCustomerDTO> SearchByPaging(IntentionCustomerDTOSearch searchEntity)
    {


 zhengcaioa/Services/ProjectService.cs

@@ -262,7 +262,7 @@
            List<ProjectDTO> list = new List<ProjectDTO>();
            //筛选
            StringBuilder sql = new StringBuilder();
            sql.Append("SELECT distinct a.[Id],a.[start_time] ,b.[name] +'-'+c.[name]+'-'+d.[name]  Sheng ,a.city  ,a.[area_id],a.cgfs, a.[name] ,a.[number],a.creater,a.createtime,a.modifier,a.modifytime       ,a.[drhx],a.[drhx_price],a.[dshx],a.[dshx_price],a.[remark],a.[rec_status],a.[toubiaocishu] ,a.[question] ,a.[zhongbiaocishu],a.[feibiaocishu],a.[zhongbiaojine],a.[Fblx],a.[Fbyy] , a.[zhuanjia]  , a.[caigourenname], a.[caigourenaddress], a.[caigourencontact], a.[dailiname], a.[dailiaddress], a.[dailicontact]    "); //zhuanjia = stuff((select ','+name from [Zhuanjia] f where  CHARINDEX(f.id,a.[zhuanjia]) >0 for xml path('')), 1,1, '') 
            sql.Append("SELECT distinct a.[Id],a.[start_time] ,b.[name] +'-'+c.[name]+'-'+d.[name]  Sheng ,a.city  ,a.[area_id],a.cgfs, a.[name] ,a.[number],a.creater,a.createtime,a.modifier,a.modifytime       ,a.[drhx],a.[drhx_price],a.[dshx],a.[dshx_price],a.[remark],a.[rec_status] ,a.[question] ,a.[zhongbiaocishu],a.[feibiaocishu],a.[zhongbiaojine],a.[Fblx],a.[Fbyy] , a.[zhuanjia]  , a.[caigourenname], a.[caigourenaddress], a.[caigourencontact], a.[dailiname], a.[dailiaddress], a.[dailicontact] ,toubiaocishu = stuff((select '、'+ f.[names] from  [Projectzhongbiao] f where  f.[ProjectId] = a.[Id]  for xml path('')), 1,1, '')   "); //zhuanjia = stuff((select ','+name from [Zhuanjia] f where  CHARINDEX(f.id,a.[zhuanjia]) >0 for xml path('')), 1,1, '') 
            sql.Append("FROM [Project] a ");
            sql.Append("left join  [Area] b  on a.[sheng]  = b.[codeID] ");
            sql.Append("left join  [Area] c  on a.[city]  = c.[codeID] ");
@@ -276,6 +276,22 @@

            }

            if (!string.IsNullOrWhiteSpace(searchEntity.NamesToubiao))
            {
                sql.Append(" and ( exists (select b.[ProjectId] from [Projectzhongbiao] b  where  a.[Id]=b.[ProjectId] and   b.[names] like '%" + searchEntity.NamesToubiao + "%') ");

                sql.Append("  or exists (select c.[ProjectId] from [Projectreason] c  where  a.[Id]=c.[ProjectId] and   c.[reasonname] like '%" + searchEntity.NamesToubiao + "%') ");

                sql.Append("  or exists (select d.[ProjectId] from [Projectyouxiao] d  where  a.[Id]=d.[ProjectId] and   d.[namesyouxiao] like '%" + searchEntity.NamesToubiao + "%') ");

                sql.Append("  or   a.[drhx] like '%" + searchEntity.NamesToubiao + "%' ");

                sql.Append("   or   a.[dshx] like '%" + searchEntity.NamesToubiao + "%'  ");

                sql.Append(" )");

            }

            if (!string.IsNullOrWhiteSpace(searchEntity.StartTimestar))
            {
                sql.Append(" and a.start_time >='"+ searchEntity.StartTimestar.Trim().Replace("'","''") + "'");

 zhengcaioa/zhengcaioa/Controllers/AdmManagement/DailyManagementController.cs

@@ -185,12 +185,17 @@
        public IActionResult EditMemoBook(string Rtype="1" , string id = "0") 
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["users"] = _userService.GetList();
            ViewData["users"] = _userService.GetList().Where(x=>x.Id != curentuser.Id).ToList();
            AdmMemoBookDTO admMemoBookDTO = _DailyManageService.GetMemoBook(id);
            if (admMemoBookDTO.Time.Equals(DateTime.MinValue))
            if (!admMemoBookDTO.Time.HasValue)
            {
                admMemoBookDTO.Time = DateTime.Now;
                admMemoBookDTO.TimeName = "";
                Rtype = string.IsNullOrEmpty(admMemoBookDTO.Rtype)? Rtype : admMemoBookDTO.Rtype;
            }
            else
            {
                admMemoBookDTO.TimeName = admMemoBookDTO.Time.Value.ToString("yyyy-MM-dd HH:mm");
                Rtype = string.IsNullOrEmpty(admMemoBookDTO.Rtype) ? Rtype : admMemoBookDTO.Rtype;
            }
            ViewData.Model = admMemoBookDTO;
            ViewBag.Rtype = Rtype;
@@ -221,7 +226,7 @@
        [HttpPost]
        public string SaveMemoBook(AdmMemoBookDTO memoBook)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));            
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            memoBook.RecStatus = "A";
            if (String.IsNullOrEmpty(memoBook.Id))
            {
@@ -317,7 +322,8 @@
        public IActionResult EditWorkAnPai( string id = "")
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["users"] = _userService.GetList();
            ViewData["curentuser"] = curentuser;
            ViewData["users"] = _userService.GetList().Where(x => x.Id != curentuser.Id).ToList();
            AdmMemoBookDTO admMemoBookDTO = new AdmMemoBookDTO();
            if (!string.IsNullOrEmpty(id))
            {
@@ -325,9 +331,14 @@
                admMemoBookDTO.WorkDept = _userService.GetPltUserEntity(admMemoBookDTO.ToUserId).DeptId;
            }
            
            if (admMemoBookDTO.Time.Equals(DateTime.MinValue))
            if (!admMemoBookDTO.Time.HasValue)
            {
                admMemoBookDTO.Time = DateTime.Now;
                //admMemoBookDTO.Time = DateTime.Now;
                admMemoBookDTO.TimeName = "";
            }
            else
            {
                admMemoBookDTO.TimeName = admMemoBookDTO.Time.Value.ToString("yyyy-MM-dd HH:mm");
            }
            ViewData.Model = admMemoBookDTO;
            ViewData["Dept"] = _hrDeptService.GetList();
@@ -389,9 +400,14 @@
                admMemoBookDTO.WorkDept = _userService.GetPltUserEntity(admMemoBookDTO.ToUserId).DeptId;
            }

            if (admMemoBookDTO.Time.Equals(DateTime.MinValue))
            if (!admMemoBookDTO.Time.HasValue)
            {
                admMemoBookDTO.Time = DateTime.Now;
                //admMemoBookDTO.Time = DateTime.Now;
                admMemoBookDTO.TimeName = "";
            }
            else
            {
                admMemoBookDTO.TimeName = admMemoBookDTO.Time.Value.ToString("yyyy-MM-dd HH:mm");
            }
            ViewData.Model = admMemoBookDTO;
            ViewBag.KaoHe = _liaotianService.GetSYScode("ADM_MemoBook", "KaoHe");
@@ -506,9 +522,14 @@
                admMemoBookDTO = _DailyManageService.GetMemoBook(id);
            }

            if (admMemoBookDTO.Time.Equals(DateTime.MinValue))
            if (!admMemoBookDTO.Time.HasValue)
            {
                admMemoBookDTO.Time = DateTime.Now;
                //admMemoBookDTO.Time = DateTime.Now;
                admMemoBookDTO.TimeName = "";
            }
            else
            {
                admMemoBookDTO.TimeName = admMemoBookDTO.Time.Value.ToString("yyyy-MM-dd HH:mm");
            }
            ViewData.Model = admMemoBookDTO;
            ViewBag.Rtype = _liaotianService.GetSYScode("ADM_MemoBook", "Rtype").Where(x=>x.CodeSn=="2" || x.CodeSn == "4").ToList();
@@ -571,9 +592,14 @@
                admMemoBookDTO.WorkDept = _userService.GetPltUserEntity(admMemoBookDTO.ToUserId).DeptId;
            }

            if (admMemoBookDTO.Time.Equals(DateTime.MinValue))
            if (!admMemoBookDTO.Time.HasValue)
            {
                admMemoBookDTO.Time = DateTime.Now;
                //admMemoBookDTO.Time = DateTime.Now;
                admMemoBookDTO.TimeName = "";
            }
            else
            {
                admMemoBookDTO.TimeName = admMemoBookDTO.Time.Value.ToString("yyyy-MM-dd HH:mm");
            }
            ViewData.Model = admMemoBookDTO;
           
@@ -623,9 +649,14 @@
                admMemoBookDTO.WorkDept = _userService.GetPltUserEntity(admMemoBookDTO.ToUserId).DeptId;
            }

            if (admMemoBookDTO.Time.Equals(DateTime.MinValue))
            if (!admMemoBookDTO.Time.HasValue)
            {
                admMemoBookDTO.Time = DateTime.Now;
                //admMemoBookDTO.Time = DateTime.Now;
                admMemoBookDTO.TimeName = "";
            }
            else
            {
                admMemoBookDTO.TimeName = admMemoBookDTO.Time.Value.ToString("yyyy-MM-dd HH:mm");
            }
            ViewData.Model = admMemoBookDTO;


 zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs

@@ -176,6 +176,40 @@
        }




        public IActionResult EditByName( string name)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;

            IntentionCustomerDTO intentionCustomerDTO = new IntentionCustomerDTO();
             
                intentionCustomerDTO = _intentionCustomerService.GetByName(name);

            

            var sheng = _projectService.Getsheng();
            var shi = _projectService.Getshi(intentionCustomerDTO.Sheng);
            var quxian = _projectService.Getquxian(intentionCustomerDTO.City);
            var users = _userService.GetList().Where(x => x.IsYwjl == "A").ToList(); ;

            ViewData["khlx"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx");
            ViewData["khly"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "khly");
            ViewData["hyfl"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl");

            ViewData["users"] = users;

            ViewData["sheng"] = sheng;
            ViewData["shi"] = shi;
            ViewData["quxian"] = quxian;
            ViewData["DeptId"] = _hrDeptService.GetList();
            ViewData.Model = intentionCustomerDTO;
            return View();
        }



        /// <summary>
        /// 保存
        /// </summary>

 zhengcaioa/zhengcaioa/Views/DailyManagement/EditMemoBook.cshtml

@@ -112,7 +112,7 @@
            <tr>
                <td class="title"><label>提醒时间</label> </td>
                <td>
                    <input type="text" class="layui-input  layer-date  ldate data" label="来电时间" value="@Model.Time.ToString("yyyy-MM-dd HH:mm")" name="Time" id="Time" style="width:150px;margin-right: 4px;" validate="RequiredField" autocomplete="off"  readonly="readonly">
                    <input type="text" class="layui-input  layer-date  ldate data" label="来电时间" value="@Model.TimeName" name="Time" id="Time" style="width:150px;margin-right: 4px;" validate="RequiredField" autocomplete="off"  readonly="readonly">
                </td>
            </tr>
            <tr>
@@ -194,10 +194,7 @@


        function Save() {
            if ($("#Time").val() == '') {
                toastr.warning("提醒时间不能为空");
                return;
            }
            

            if ($("#Context").val() == '') {
                toastr.warning("提醒内容不能为空");

 zhengcaioa/zhengcaioa/Views/DailyManagement/EditWorkAnPai.cshtml

@@ -4,9 +4,10 @@
@{
    List<PltUserDTO> users = ViewData["users"] as List<PltUserDTO>;
    List<HrDeptDTO> Dept = ViewData["Dept"] as List<HrDeptDTO>;
    PltUser curentuser = ViewData["curentuser"] as PltUser;
}
@{
    Layout = null;
            Layout = null;
}
<!DOCTYPE html>
<html>
@@ -173,9 +174,9 @@
                </td>
            </tr>
            <tr>
                <td class="title"><label>完成时间<i class="red">*</i></label> </td>
                <td class="title"><label>完成时间 </label> </td>
                <td>
                    <input type="text" class="layui-input  layer-date  ldate data" label="来电时间" value="@Model.Time.ToString("yyyy-MM-dd HH:mm")" name="Time" id="Time" style="width:150px;margin-right: 4px;" validate="RequiredField" autocomplete="off"  readonly="readonly">
                    <input type="text" class="layui-input  layer-date  ldate data" label="来电时间" value="@Model.TimeName" name="Time" id="Time" style="width:150px;margin-right: 4px;" validate="RequiredField" autocomplete="off"  readonly="readonly">
                </td>
            </tr>
            <tr>
@@ -248,10 +249,7 @@


        function Save() {
            if ($("#Time").val() == '') {
                toastr.warning("完成时间不能为空");
                return;
            }

            if ($("#ToUserId").val() == '') {
                toastr.warning("职工不能为空");
                return;
@@ -309,7 +307,7 @@
            return false;
        }


        var curentuser = '@curentuser.Id';

        $("#WorkDept").change(function () {

@@ -329,14 +327,15 @@
                    quxian.append(aaa);
                    if (data.length > 0) {
                        for (var i = 0; i < data.length; i++) {
                            if (curentuser != data[i].Id) {
                                var o = '<option value="' + data[i].Id + '" hassubinfo="true">' + data[i].UserName + '</option>';

                            var o = '<option value="' + data[i].Id + '" hassubinfo="true">' + data[i].UserName + '</option>';

                            if (data[i].Id == userid) {
                                o = '<option value="' + data[i].Id + '" hassubinfo="true"  selected="selected">' + data[i].UserName + '</option>';
                                if (data[i].Id == userid) {
                                    o = '<option value="' + data[i].Id + '" hassubinfo="true"  selected="selected">' + data[i].UserName + '</option>';
                                }
                                quxian.append(o);
                            }
                            quxian.append(o);
                            console.log(quxian);
                          
                        }
                    }
                    quxian.trigger('chosen:updated');//更新选项

 zhengcaioa/zhengcaioa/Views/DailyManagement/EditWorkmy.cshtml

@@ -143,9 +143,9 @@
                </td>
            </tr>
            <tr>
                <td class="title"><label>完成时间<i class="red">*</i></label> </td>
                <td class="title"><label>完成时间 </label> </td>
                <td>
                    <input type="text" class="layui-input  layer-date  ldate data" label="来电时间" value="@Model.Time.ToString("yyyy-MM-dd HH:mm")" name="Time" id="Time" style="width:150px;margin-right: 4px;" validate="RequiredField" autocomplete="off" readonly="readonly">
                    <input type="text" class="layui-input  layer-date  ldate data" label="来电时间" value="@Model.TimeName" name="Time" id="Time" style="width:150px;margin-right: 4px;" validate="RequiredField" autocomplete="off" readonly="readonly">
                </td>
            </tr>

@@ -215,10 +215,7 @@
                toastr.warning("请选择工作类型");
                return;
            }
            if ($("#Time").val() == '') {
                toastr.warning("完成时间不能为空");
                return;
            }
            
            
            if ($.trim($("#Context").val()) == '') {
                toastr.warning("工作内容不能为空");

 zhengcaioa/zhengcaioa/Views/DailyManagement/MemoBook.cshtml

@@ -15,9 +15,9 @@
                }
            },
            {
                label: '提醒时间', name: 'Time', labtype: 'txt', width: 100, hidden: false,
                label: '提醒时间', name: 'TimeName', labtype: 'txt', width: 100, hidden: false,
                formatter: function (cellvalue, options, rowObject) {
                    return '<a href="javascript: void (0)" onclick="edit(\'' + rowObject.Rtype + '\',\'' + rowObject.Id + '\');">' + new Date(cellvalue).Format("yyyy-MM-dd hh:mm") + '</a>';
                    return '<a href="javascript: void (0)" onclick="edit(\'' + rowObject.Rtype + '\',\'' + rowObject.Id + '\');">' + cellvalue + '</a>';
                }
            },
            //{

 zhengcaioa/zhengcaioa/Views/DailyManagement/MemoWorkAnPai.cshtml

@@ -19,10 +19,7 @@
            },
            { label: '工作内容', name: 'Context', labtype: 'txt', width: 300, hidden: false },
            {
                label: '要求完成时间', name: 'Time', labtype: 'txt', width: 100, hidden: false,
                formatter: function (cellvalue, options, rowObject) {
                    return new Date(cellvalue).Format("yyyy-MM-dd hh:mm");
                }
                label: '要求完成时间', name: 'TimeName', labtype: 'txt', width: 100, hidden: false 
            },
            { label: '办理情况', name: 'BanLi', labtype: 'txt', width: 300, hidden: false },
            { label: '完成时间', name: 'WanchengTimeName', labtype: 'txt', width: 100, hidden: false },

 zhengcaioa/zhengcaioa/Views/DailyManagement/MemoWorkmy.cshtml

@@ -22,10 +22,7 @@
            { label: '工作类型', name: 'RtypeName', labtype: 'txt', width: 100, hidden: false },
            { label: '工作内容', name: 'Context', labtype: 'txt', width: 300, hidden: false },
            {
                label: '要求完成时间', name: 'Time', labtype: 'txt', width: 100, hidden: false,
                formatter: function (cellvalue, options, rowObject) {
                    return new Date(cellvalue).Format("yyyy-MM-dd hh:mm");
                }
                label: '要求完成时间', name: 'TimeName', labtype: 'txt', width: 100, hidden: false 
            },
            {
                label: '办理情况', name: 'HaveRead', labtype: 'txt', width: 300, hidden: false, 

 zhengcaioa/zhengcaioa/Views/DailyManagement/ShowRemind.cshtml

@@ -15,10 +15,7 @@
                }
            },
            {
                label: '要求完成时间', width: 30, name: 'Time', labtype: 'txt', hidden: false,
                formatter: function (cellvalue, options, rowObject) {
                    return new Date(cellvalue).Format("yyyy-MM-dd hh:mm");
                }
                label: '要求完成时间', width: 30, name: 'TimeName', labtype: 'txt', hidden: false 
            },
            { label: '工作类型', name: 'RtypeName', labtype: 'txt', width: 100, hidden: false },
            { label: '工作内容',   name: 'Context', labtype: 'txt', hidden: false },

 zhengcaioa/zhengcaioa/Views/Expert/Edit.cshtml

@@ -347,8 +347,8 @@


                                @*<div class="ibox-title">
                                        <h5>  <i class="fa fa-list"></i>&nbsp;客户资料</h5>
                                    </div>*@
            <h5>  <i class="fa fa-list"></i>&nbsp;客户资料</h5>
        </div>*@
                                <style>
                                    .divImg {
                                        height: 80px;
@@ -379,12 +379,68 @@
                                    <div class="col-sm-1 col-md-1 img-row">
                                        <label class="text-right   control-label">职称证书</label>
                                    </div>
                                    <div class="col-sm-6 col-md-6">
                                        <div class="col-sm-2 col-md-2 img-box">
                                            <div id="TitileImg" class="TitileImg"></div>
                                            <input type="hidden" id="TitileCerti" name="TitileCerti" value="@Model.TitileCerti" />
                                            <p>上传职称证书</p>
                                        </div>

                                    <div class="col-sm-2 col-md-2 img-box">
                                        <div id="TitileImg" class="TitileImg"></div>
                                        <input type="hidden" id="TitileCerti" name="TitileCerti" value="@Model.TitileCerti" />
                                        <p>上传职称证书</p>
                                    </div>
                                    <div class="col-sm-2 col-md-2 img-box">
                                        <div id="TitileImg1" class="TitileImg1"></div>
                                        <input type="hidden" id="TitileCerti1" name="TitileCerti1" value="@Model.TitileCerti1" />
                                        <p>上传职称证书</p>
                                    </div>
                                    <div class="col-sm-2 col-md-2 img-box">
                                        <div id="TitileImg2" class="TitileImg2"></div>
                                        <input type="hidden" id="TitileCerti2" name="TitileCerti2" value="@Model.TitileCerti2" />
                                        <p>上传职称证书</p>
                                    </div>
                                    <div class="col-sm-2 col-md-2 img-box">
                                        <div id="TitileImg3" class="TitileImg3"></div>
                                        <input type="hidden" id="TitileCerti3" name="TitileCerti3" value="@Model.TitileCerti3" />
                                        <p>上传职称证书</p>
                                    </div>
                                    <div class="col-sm-2 col-md-2 img-box">
                                        <div id="TitileImg4" class="TitileImg4"></div>
                                        <input type="hidden" id="TitileCerti4" name="TitileCerti4" value="@Model.TitileCerti4" />
                                        <p>上传职称证书</p>
                                    </div>
                                    @*</div>
        <div class="clearfix layer-area" style="padding-bottom:15px;">
            <div class="col-sm-1 col-md-1 img-row">

            </div>*@
                                    <div class="col-sm-2 col-md-2 img-box">
                                        <div id="TitileImg5" class="TitileImg5"></div>
                                        <input type="hidden" id="TitileCerti5" name="TitileCerti5" value="@Model.TitileCerti5" />
                                        <p>上传职称证书</p>
                                    </div>


                                    <div class="col-sm-2 col-md-2 img-box">
                                        <div id="TitileImg6" class="TitileImg6"></div>
                                        <input type="hidden" id="TitileCerti6" name="TitileCerti6" value="@Model.TitileCerti6" />
                                        <p>上传职称证书</p>
                                    </div>
                                    <div class="col-sm-2 col-md-2 img-box">
                                        <div id="TitileImg7" class="TitileImg7"></div>
                                        <input type="hidden" id="TitileCerti7" name="TitileCerti7" value="@Model.TitileCerti7" />
                                        <p>上传职称证书</p>
                                    </div>
                                    <div class="col-sm-2 col-md-2 img-box">
                                        <div id="TitileImg8" class="TitileImg8"></div>
                                        <input type="hidden" id="TitileCerti8" name="TitileCerti8" value="@Model.TitileCerti8" />
                                        <p>上传职称证书</p>
                                    </div>
                                    <div class="col-sm-2 col-md-2 img-box">
                                        <div id="TitileImg9" class="TitileImg9"></div>
                                        <input type="hidden" id="TitileCerti9" name="TitileCerti9" value="@Model.TitileCerti9" />
                                        <p>上传职称证书</p>
                                    </div>
                                    <div class="col-sm-2 col-md-2 img-box">
                                        <div id="TitileImg10" class="TitileImg10"></div>
                                        <input type="hidden" id="TitileCerti10" name="TitileCerti10" value="@Model.TitileCerti10" />
                                        <p>上传职称证书</p>
                                    </div>

                                </div>
@@ -441,7 +497,17 @@
        var imgs = {
            BackImg: '',
            BackImg: '',
            TitileImg:''
            TitileImg: '',
            TitileImg1: '',
            TitileImg2: '',
            TitileImg3: '',
            TitileImg4: '',
            TitileImg5: '',
            TitileImg6: '',
            TitileImg7: '',
            TitileImg8: '',
            TitileImg9: '',
            TitileImg10: '',

        }

@@ -475,12 +541,113 @@

            }
        });
        new DragImgUpload("#TitileImg1", {
            callback: function (files) {
                imgs.TitileImg1 = imgUploadCallback(files);
                if (imgs.TitileImg1!== "") {
                    $("#TitileCerti1").val(imgPath + imgs.TitileImg1);
                }

            }
        });
        new DragImgUpload("#TitileImg2", {
            callback: function (files) {
                imgs.TitileImg2 = imgUploadCallback(files);
                if (imgs.TitileImg2 !== "") {
                    $("#TitileCerti2").val(imgPath + imgs.TitileImg2);
                }

            }
        });
        new DragImgUpload("#TitileImg3", {
            callback: function (files) {
                imgs.TitileImg3 = imgUploadCallback(files);
                if (imgs.TitileImg3 !== "") {
                    $("#TitileCerti3").val(imgPath + imgs.TitileImg3);
                }

            }
        });
        new DragImgUpload("#TitileImg4", {
            callback: function (files) {
                imgs.TitileImg4 = imgUploadCallback(files);
                if (imgs.TitileImg4 !== "") {
                    $("#TitileCerti4").val(imgPath + imgs.TitileImg4);
                }

            }
        });
        new DragImgUpload("#TitileImg5", {
            callback: function (files) {
                imgs.TitileImg5 = imgUploadCallback(files);
                if (imgs.TitileImg5 !== "") {
                    $("#TitileCerti5").val(imgPath + imgs.TitileImg5);
                }

            }
        });
        new DragImgUpload("#TitileImg6", {
            callback: function (files) {
                imgs.TitileImg6 = imgUploadCallback(files);
                if (imgs.TitileImg6 !== "") {
                    $("#TitileCerti6").val(imgPath + imgs.TitileImg6);
                }

            }
        });
        new DragImgUpload("#TitileImg7", {
            callback: function (files) {
                imgs.TitileImg7 = imgUploadCallback(files);
                if (imgs.TitileImg7 !== "") {
                    $("#TitileCerti7").val(imgPath + imgs.TitileImg7);
                }

            }
        });
        new DragImgUpload("#TitileImg8", {
            callback: function (files) {
                imgs.TitileImg8 = imgUploadCallback(files);
                if (imgs.TitileImg8 !== "") {
                    $("#TitileCerti8").val(imgPath + imgs.TitileImg8);
                }

            }
        });
        new DragImgUpload("#TitileImg9", {
            callback: function (files) {
                imgs.TitileImg9 = imgUploadCallback(files);
                if (imgs.TitileImg9 !== "") {
                    $("#TitileCerti9").val(imgPath + imgs.TitileImg9);
                }

            }
        });
        new DragImgUpload("#TitileImg10", {
            callback: function (files) {
                imgs.TitileImg10 = imgUploadCallback(files);
                if (imgs.TitileImg10 !== "") {
                    $("#TitileCerti10").val(imgPath + imgs.TitileImg10);
                }

            }
        });

        $(function () {
         

            imgs.frontImg = $.trim( $("#CertiFont").val() );
            imgs.BackImg = $.trim( $("#CertiBack").val());
            imgs.TitileImg = $.trim( $("#TitileCerti").val());
            imgs.TitileImg = $.trim($("#TitileCerti").val());
            imgs.TitileImg1 = $.trim($("#TitileCerti1").val());
            imgs.TitileImg2 = $.trim($("#TitileCerti2").val());
            imgs.TitileImg3 = $.trim($("#TitileCerti3").val());
            imgs.TitileImg4 = $.trim($("#TitileCerti4").val());
            imgs.TitileImg5 = $.trim($("#TitileCerti5").val());
            imgs.TitileImg6 = $.trim($("#TitileCerti6").val());
            imgs.TitileImg7 = $.trim($("#TitileCerti7").val());
            imgs.TitileImg8 = $.trim($("#TitileCerti8").val());
            imgs.TitileImg9 = $.trim($("#TitileCerti9").val());
            imgs.TitileImg10 = $.trim($("#TitileCerti10").val());

            if (imgs.frontImg !== "") {
                $("#frontImg img").each(function (i) {
@@ -501,6 +668,66 @@
                });
            }

            if (imgs.TitileImg1 !== "") {
                $("#TitileImg1 img").each(function (i) {
                    $(this).attr("src", imgs.TitileImg1);
                });
            }

            if (imgs.TitileImg2 !== "") {
                $("#TitileImg2 img").each(function (i) {
                    $(this).attr("src", imgs.TitileImg2);
                });
            }

            if (imgs.TitileImg3 !== "") {
                $("#TitileImg3 img").each(function (i) {
                    $(this).attr("src", imgs.TitileImg3);
                });
            }

            if (imgs.TitileImg4 !== "") {
                $("#TitileImg4 img").each(function (i) {
                    $(this).attr("src", imgs.TitileImg4);
                });
            }

            if (imgs.TitileImg5 !== "") {
                $("#TitileImg5 img").each(function (i) {
                    $(this).attr("src", imgs.TitileImg5);
                });
            }

            if (imgs.TitileImg6 !== "") {
                $("#TitileImg6 img").each(function (i) {
                    $(this).attr("src", imgs.TitileImg6);
                });
            }

            if (imgs.TitileImg7 !== "") {
                $("#TitileImg7 img").each(function (i) {
                    $(this).attr("src", imgs.TitileImg7);
                });
            }

            if (imgs.TitileImg8 !== "") {
                $("#TitileImg8 img").each(function (i) {
                    $(this).attr("src", imgs.TitileImg8);
                });
            }

            if (imgs.TitileImg9 !== "") {
                $("#TitileImg9 img").each(function (i) {
                    $(this).attr("src", imgs.TitileImg9);
                });
            }

            if (imgs.TitileImg10 !== "") {
                $("#TitileImg10 img").each(function (i) {
                    $(this).attr("src", imgs.TitileImg10);
                });
            }


        });


 zhengcaioa/zhengcaioa/Views/IntentionCustomer/EditByName.cshtml

New file
@@ -0,0 +1,734 @@
@model DTO.IntentionCustomerDTO
@using DTO;
@using zhengcaioa.Models;
@{
    // List<Zhuanjium> zhuanjia = ViewData["zhuanjia"] as List<Zhuanjium>; //专家
    List<PltUserDTO> users = ViewData["users"] as List<PltUserDTO>; //采购方式
    List<Area> sheng = ViewData["sheng"] as List<Area>; //省
    List<Area> shi = ViewData["shi"] as List<Area>; //市
    List<Area> quxian = ViewData["quxian"] as List<Area>; //区县
    List<SysCodeDtl> khlx = ViewData["khlx"] as List<SysCodeDtl>; //客户类型
    List<SysCodeDtl> khly = ViewData["khly"] as List<SysCodeDtl>; //客户来源
    List<SysCodeDtl> hyfl = ViewData["hyfl"] as List<SysCodeDtl>; //行业分类
    List<HrDeptDTO> DeptId = ViewData["DeptId"] as List<HrDeptDTO>; //部门




    //string[] arrJobLevel = (Model.Zhuanjia ?? "").Split(',');

}
@{
    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;">
                                    <label class="text-right col-sm-1 col-md-1 control-label">客户来源<i class="red">*</i></label>
                                    <div class="col-sm-2 col-md-2">
                                        <select id="Khly" class="form-control" name="Khly" data-placeholder="选择 序列 ..." style="font-weight:normal;">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in khly)
                                            {
                                                @if (!item.CodeSn.Equals(Model.Khly))
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true">
                                                        @item.Comments
                                                    </option>
                                                }
                                                else
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                        @item.Comments
                                                    </option>
                                                }

                                            }
                                            }

                                        </select>
                                        <input type="hidden" id="Id" name="Id" value="@Model.Id" />
                                    </div>



                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">行业分类<i class="red">*</i></label>
                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
                                        <select id="Hyfl" class="form-control" name="Hyfl" data-placeholder="选择 序列 ...">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in hyfl)
                                            {
                                                @if (!item.CodeSn.Equals(Model.Hyfl))
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true">
                                                        @item.Comments
                                                    </option>
                                                }
                                                else
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                        @item.Comments
                                                    </option>
                                                }

                                            }
                                            }

                                        </select>

                                    </div>

                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">客户类型<i class="red">*</i></label>
                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
                                        <select id="Khlx" class="form-control" name="Khlx" data-placeholder="选择 序列 ...">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in khlx)
                                            {
                                                @if (!item.CodeSn.Equals(Model.Khlx))
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true">
                                                        @item.Comments
                                                    </option>
                                                }
                                                else
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                        @item.Comments
                                                    </option>
                                                }

                                            }
                                            }

                                        </select>

                                    </div>

                                </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>

                                    <div class="col-sm-1 col-md-1" grouptype="Vdata">
                                        <select id="Sheng" class="form-control" name="Sheng" data-placeholder="选择 序列 ..." style="font-weight:normal;">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in sheng)
                                            {
                                                @if (!item.CodeId.Equals(Model.Sheng))
                                                {
                                                    <option value="@item.CodeId" hassubinfo="true">
                                                        @item.Name
                                                    </option>
                                                }
                                                else
                                                {
                                                    <option value="@item.CodeId" hassubinfo="true" selected="selected">
                                                        @item.Name
                                                    </option>
                                                }

                                            }
                                            }

                                        </select>

                                    </div>
                                    <div class="col-sm-1 col-md-1" grouptype="Vdata">
                                        <select id="City" class="form-control" name="City" data-placeholder="选择 序列 ..." style="font-weight:normal;">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in shi)
                                            {
                                                @if (!item.CodeId.Equals(Model.City))
                                                {
                                                    <option value="@item.CodeId" hassubinfo="true">
                                                        @item.Name
                                                    </option>
                                                }
                                                else
                                                {
                                                    <option value="@item.CodeId" hassubinfo="true" selected="selected">
                                                        @item.Name
                                                    </option>
                                                }

                                            }
                                            }

                                        </select>

                                    </div>
                                    <div class="col-sm-1 col-md-1" grouptype="Vdata">
                                        <select id="AreaId" class="form-control" name="AreaId" data-placeholder="选择 序列 ..." style="font-weight:normal;">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in quxian)
                                            {
                                                @if (!item.CodeId.Equals(Model.AreaId))
                                                {
                                                    <option value="@item.CodeId" hassubinfo="true">
                                                        @item.Name
                                                    </option>
                                                }
                                                else
                                                {
                                                    <option value="@item.CodeId" hassubinfo="true" selected="selected">
                                                        @item.Name
                                                    </option>
                                                }

                                            }
                                            }

                                        </select>

                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">查询部门</label>
                                    <div class="col-sm-2 col-md-2">
                                        <select id="checkDeptId" class="form-control" name="checkDeptId" data-placeholder="选择 序列 ..." style="font-weight:normal;">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in DeptId)
                                            {

                                                <option value="@item.Id" hassubinfo="true">
                                                    @item.DeptName
                                                </option>

                                            }
                                            }

                                        </select>

                                    </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="Ywjl" class="form-control" name="Ywjl" data-placeholder="选择 序列 ...">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in users)
                                            {
                                                @if (!item.Id.Equals(Model.Ywjl))
                                                {
                                                    <option value="@item.Id" hassubinfo="true">
                                                        @item.UserName
                                                    </option>
                                                }
                                                else
                                                {
                                                    <option value="@item.Id" hassubinfo="true" selected="selected">
                                                        @item.UserName
                                                    </option>
                                                }

                                            }
                                            }

                                        </select>

                                    </div>
                                </div>

                                <div class="ibox-title">
                                    <h5>                            <i class="fa fa-list"></i>&nbsp;客户资料</h5>
                                </div>

                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <label class="text-right col-sm-1 col-md-1 control-label">客户单位<i class="red">*</i></label>
                                    <div class="col-sm-6 col-md-6">
                                        <input class="form-control" label="客户单位" name="Name" id="Name" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Name">
                                    </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="邮政编码" name="Postal" id="Postal" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Postal">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">详细地址</label>
                                    <div class="col-sm-5 col-md-5">
                                        <input class="form-control" label="详细地址" name="Address" id="Address" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Address">
                                    </div>

                                    <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="网址" name="Url" id="Url" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Url">
                                    </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="联系电话" name="Tel" id="Tel" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Tel">
                                    </div>
                                    <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="短信手机" name="Phone" id="Phone" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Phone">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">QQ</label>
                                    <div class="col-sm-2 col-md-2">
                                        <input class="form-control" label="QQ" name="Qq" id="Qq" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Qq">
                                    </div>

                                    <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="电子邮箱" name="Email" id="Email" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Email">
                                    </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="法定代表人" name="FName" id="FName" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.FName">
                                    </div>
                                    <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="联系电话" name="FTel" id="FTel" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.FTel">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">QQ</label>
                                    <div class="col-sm-2 col-md-2">
                                        <input class="form-control" label="QQ" name="FQq" id="FQq" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.FQq">
                                    </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="业务经办人" name="YwName" id="YwName" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.YwName">
                                    </div>
                                    <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="联系电话" name="YwTel" id="YwTel" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.YwTel">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">QQ</label>
                                    <div class="col-sm-2 col-md-2">
                                        <input class="form-control" label="QQ" name="YwQq" id="YwQq" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.YwQq">
                                    </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="机构代码" name="JgCode" id="JgCode" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.JgCode">
                                    </div>
                                    <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="开户行" name="Khh" id="Khh" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Khh">
                                    </div>
                                    <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="账号" name="Count" id="Count" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Count">
                                    </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="收货人" name="ShrName" id="ShrName" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.ShrName">
                                    </div>
                                    <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="联系电话" name="ShrTel" id="ShrTel" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.ShrTel">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">收货地址</label>
                                    <div class="col-sm-5 col-md-5">
                                        <input class="form-control" label="收货地址" name="ShrAddress" id="ShrAddress" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.ShrAddress">
                                    </div>
                                </div>



                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">备注：</label>
                                    <div class="col-sm-11 col-md-11">
                                        <textarea class="form-control bt" id="Remark" name="Remark" title="备注" isempty="" maxlength="4000" length="long">@Model.Remark</textarea>
                                    </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>
            </div>
        </div>

    </form>
    <script type="text/javascript">
        var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2 - 95;
        $("#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"
        };


        $("#Ywjl").chosen();
        var id = '@Model.Id';
        var bUpload = false;
        var bAdd = false; // 新增操作
        var fileId = ""; // 上传文件生成的Id
        var bEditFile = false; // 编辑时，是否关联了附件
        var bDeleteFile = false; // 删除操作
        var attachment_id = 0; // 附件id
        var imgLoad = new Object();



        var delPosition = function () {


            if (id == null || id == '') {
                toastr.warning("请先保存");
                return;
            }
            $.ajax({
                type: "GET",
                url: "/IntentionCustomer/Nullify?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 savePosition = function () {
            if ($("#Khly").val() == '') {
                toastr.warning("客户来源不能为空");
                return;
            }
            if ($("#Hyfl").val() == '') {
                toastr.warning("行业分类不能为空");
                return;
            }
            if ($("#Khlx").val() == '') {
                toastr.warning("客户类型不能为空");
                return;
            };
            if (Verify.isNull($("#Sheng").val()) || Verify.isNull($("#City").val()) || Verify.isNull($("#AreaId").val())) {
                toastr.warning("区域不能为空");
                return;
            }




            if ($.trim($("#Name").val()) == '') {
                toastr.warning("客户单位不能为空");
                return;
            }


            //var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
            $.ajax({
                type: "POST",
                url: "/IntentionCustomer/Save",
                dataType: "json",
                global: false,
                data: $('form').serializeArray(),
                success: function (data) {



                        if (data.Result) {
                            //  parent._afterSave(true);
                            parent.layer.msg('成功保存', { icon: 6 });
                            //window.location = "/Project/add?id=" + data.ReturnID;


                            try {
                                _pageAutoClose();//自动关闭页面方法
                            }
                            catch (err) {
                                parent._CloseTab1("/IntentionCustomer/Edit/");
                            }

                        }
                        else {
                            // toastr.error("失败");
                            parent.layer.msg(data.Message, { icon: 5 });
                        }

                },
                error: function () {


                    parent.layer.msg('失败', { icon: 5 });
                }
            });
        }


        $("#Sheng").change(function () {

            var sheng = $("#Sheng").val();
            $.ajax({
                type: "GET",
                url: "/Project/getCity?shengid=" + sheng,
                dataType: "json",
                global: 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>';
                            city.append(o);
                        }
                    }
                },
                error: function () {


                    parent.layer.msg('失败', { icon: 5 });
                }
            });
        });


        $("#City").change(function () {

            var city = $("#City").val();
            $.ajax({
                type: "GET",
                url: "/Project/getAreaId?cityid=" + city,
                dataType: "json",
                global: false,
                data: "",
                success: function (data) {

                    var quxian = $("#AreaId");
                    quxian.find('option').remove();
                    var aaa = '<option value="" hassubinfo="true">请选择</option>';
                    quxian.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>';
                            quxian.append(o);
                        }
                    }
                },
                error: function () {


                    parent.layer.msg('失败', { icon: 5 });
                }
            });
        });


        $("#AreaId").change(function () {
            addresschushi();
        });

        function addresschushi() {
            var sheng = $.trim($("#Sheng").find("option:selected").text());
            var city = $.trim($("#City").find("option:selected").text());
            var AreaId = $.trim($("#AreaId").find("option:selected").text());
            var Address = $("#Address");

            Address.val(sheng + city + AreaId.replace("请选择", ""));
        }

        if ($("#Id").val() == '') {

            addresschushi();
        }


          $("#checkDeptId").change(function () {

            var checkDeptId = $("#checkDeptId").val();
            $.ajax({
                type: "GET",
                url: "/User/GetList?IsYwjl=A&DeptId=" + checkDeptId,
                dataType: "json",
                global: false,
                data: "",
                success: function (data) {

                    var quxian = $("#Ywjl");
                    var userid = '@Model.Ywjl';
                    quxian.find('option').remove();
                    var aaa = '<option value="" hassubinfo="true">请选择</option>';
                    quxian.append(aaa);
                    if (data.length > 0) {
                        for (var i = 0; i < data.length; i++) {

                            var o = '<option value="' + data[i].Id + '" hassubinfo="true">' + data[i].UserName + '</option>';

                            if (data[i].Id == userid) {
                                o = '<option value="' + data[i].Id + '" hassubinfo="true"  selected="selected">' + data[i].UserName + '</option>';
                            }
                            quxian.append(o);
                        }
                    }
                    quxian.trigger('chosen:updated');//更新选项


                },
                error: function () {


                    parent.layer.msg('失败', { icon: 5 });
                }
            });
        });


        function _pageAutoClose() {
            try {
                parent.window._reloadPageData();
            }
            catch (err) {

            }


            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/Project/Select.cshtml

@@ -21,9 +21,58 @@
            {
                label: '项目名称', name: 'Name', labtype: 'txt', hidden: false, width: 400 ,
                formatter: function (cellvalue, options, rowObject) {
                    return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/Project/Add?id=" + rowObject.Id + "')\"  >" + cellvalue + "</a>";
                    return "<a onclick=\"OpenWindow('" + cellvalue + "','98%','100%', '/Project/Add?id=" + rowObject.Id + "')\"  >" + cellvalue + "</a>";
                }
            }, { label: '项目编号', name: 'Number', labtype: 'txt', hidden: false, width: 100  },
            }, { label: '项目编号', name: 'Number', labtype: 'txt', hidden: false, width: 100 },
            {
                label: '中标供应商', name: 'Toubiaocishu', labtype: 'txt', hidden: false, width: 400,
                formatter: function (cellvalue, options, rowObject) {
                    if (cellvalue != null && cellvalue != "null" && cellvalue != "") {
                        var ss = cellvalue.split('、');
                        var result = "";
                        for (var i = 0;i < ss.length; i++){
                            result += "<a onclick=\"OpenWindow('" + ss[i] + "','98%','100%', '/IntentionCustomer/EditByName?name=" + ss[i] + "')\"  >" + ss[i] + "</a>&nbsp;";
                        }

                        return result;
                    } else {
                        return "";
                    }
                }
            },
            {
                label: '第二候选', name: 'Drhx', labtype: 'txt', hidden: false, width: 400,
                formatter: function (cellvalue, options, rowObject) {
                    if (cellvalue != null && cellvalue != "null" && cellvalue != "") {
                        var ss = cellvalue.split('、');
                        var result = "";
                        for (var i = 0; i < ss.length; i++) {
                            result += "<a onclick=\"OpenWindow('" + ss[i] + "','98%','100%', '/IntentionCustomer/EditByName?name=" + ss[i] + "')\"  >" + ss[i] + "</a>&nbsp;";
                        }

                        return result;
                    } else {
                        return "";
                    }
                   
                }
            },
            {
                label: '第三候选', name: 'Dshx', labtype: 'txt', hidden: false, width: 400,
                formatter: function (cellvalue, options, rowObject) {
                    if (cellvalue != null && cellvalue != "null" && cellvalue != "") {
                        var ss = cellvalue.split('、');
                        var result = "";
                        for (var i = 0; i < ss.length; i++) {
                            result += "<a onclick=\"OpenWindow('" + ss[i] + "','98%','100%', '/IntentionCustomer/EditByName?name=" + ss[i] + "')\"  >" + ss[i] + "</a>&nbsp;";
                        }

                        return result;
                    } else {
                        return "";
                    }
                }
            },
            { label: '评审专家', name: 'Zhuanjia', labtype: 'txt', hidden: false, width: 400 },
            { label: '投标次数', name: 'Toubiaocishu', labtype: 'txt', hidden: true },
            { label: '中标次数', name: 'Zhongbiaocishu', labtype: 'txt', hidden: true },
@@ -39,10 +88,13 @@

            { label: '省', name: 'Sheng', labtype: 'combox', hidden: false, data: JSON.parse(shengDropDown), cwidth: '5%', cccwidth: '8%' },
            { label: '市', name: 'City', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '1%', cccwidth: '8%'  },
            { label: '区县', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2%', cccwidth: '8%'  },
            { label: '评审专家', name: 'Zhuanjia', labtype: 'txt', hidden: false, cwidth: '8.5%', cccwidth: '15%' },
            { label: '供应商', name: 'Names', labtype: 'txt', hidden: false },
            { label: '区县', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2%', cccwidth: '8%' },
            { label: '采购方式', name: 'Cgfs', labtype: 'combox', hidden: false, data: JSON.parse(projectDropDown) },
            { label: '中标供应商', name: 'Names', labtype: 'txt', hidden: false },
            { label: '投标供应商', name: 'NamesToubiao', labtype: 'txt', hidden: false },
            { label: '评审专家', name: 'Zhuanjia', labtype: 'txt', hidden: false, cwidth: '8.5%', cccwidth: '15%' },
           
          
            { label: '录入时间', name: 'Createtime', labtype: 'datearea', hidden: false },
            { label: '录入人', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(Creater), cwidth: '5%', cccwidth: '8%' },


 zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml

@@ -174,8 +174,8 @@
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <div class="col-sm-3 col-md-3">
                                        <div class="setSelect">                                             
                                            <input type="text" value="" class="layui-input  layer-date  ldate form-control " name="holiday_s[]" style="width:150px;"> -
                                            <input type="text" value="" class="layui-input  layer-date  ldate form-control" name="holiday_e[]" style="width:150px;">
                                            <input type="text" value="" class="layui-input  layer-date  ldate form-control " id="holiday_s1" name="holiday_s" style="width:150px;"> -
                                            <input type="text" value="" class="layui-input  layer-date  ldate form-control" id="holiday_e1" name="holiday_e" style="width:150px;">
                                            <button type="button" class="addBtn" style="padding-bottom:10px;" onclick="addBtn(this)" data-type="1">+</button>
                                        </div>
                                    </div>
@@ -185,8 +185,8 @@
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <div class="col-sm-3 col-md-3">
                                        <div class="setSelect">
                                            <input type="text" value="" class="layui-input  layer-date  ldate form-control "  name="rest_s[]" style="width:150px;"> -
                                            <input type="text" value="" class="layui-input  layer-date  ldate form-control " name="rest_e[]" style="width:150px;">
                                            <input type="text" value="" class="layui-input  layer-date  ldate form-control " id="rest_s1" name="rest_s" style="width:150px;"> -
                                            <input type="text" value="" class="layui-input  layer-date  ldate form-control " id="rest_e1"  name="rest_e" style="width:150px;">
                                            <button type="button" class="addBtn" style="padding-bottom:10px;" onclick="addRestBtn(this)" data-type="1">+</button>
                                        </div>
                                    </div>
@@ -298,26 +298,31 @@
            //        //alert("错误");
            //    }
            //})
            $(".ldate").each(function (el) {
                laydate({
                    elem: "#" + $(this).attr('id'), //对应id
                    format: 'hh:mm', //日期格式 // 分隔符可以任意定义，该例子表示只显示年月
                    min: '00:00:00', //设定最小日期为当前日期
                    max: '23:59:59', //最大日期
                    type: 'datetime',
                    isInitValue: true,
                    festival: false, //显示节日
                    istime: true,   //是否显示时分秒
                    istoday: true, //是否是今天
                    choose: function (datas) { //选择日期完毕的回调
                        // console.log(this);
                        // end.min = datas; //开始日选好后，重置结束日的最小日期
                        // end.start = datas //将结束日的初始值设定为开始日
                    }
                });
            //$(".ldate").each(function (el) {
            //    laydate({
            //        elem: "#" + $(this).attr('id'), //对应id
            //        format: 'hh:mm', //日期格式 // 分隔符可以任意定义，该例子表示只显示年月
            //        min: '00:00:00', //设定最小日期为当前日期
            //        max: '23:59:59', //最大日期
            //        type: 'datetime',
            //        isInitValue: true,
            //        festival: false, //显示节日
            //        istime: true,   //是否显示时分秒
            //        istoday: true, //是否是今天
            //        choose: function (datas) { //选择日期完毕的回调
            //            // console.log(this);
            //            // end.min = datas; //开始日选好后，重置结束日的最小日期
            //            // end.start = datas //将结束日的初始值设定为开始日
            //        }
            //    });

            });
            //});

            laydate({ elem: "#holiday_e1", format: 'YYYY/MM/DD', istime: true, event: "focus" });
            laydate({ elem: "#holiday_s1", format: 'YYYY/MM/DD', istime: true, event: "focus" });
            laydate({ elem: "#rest_s1", format: 'YYYY/MM/DD', istime: true, event: "focus" });
            laydate({ elem: "#rest_e1", format: 'YYYY/MM/DD', istime: true, event: "focus" });
            
        });

        var _SigninList = function () {
@@ -334,10 +339,10 @@
                global: false,
                data:  $('form').serializeArray(),
                success: function (data) {
                    toastr.success("打卡成功");
                    toastr.success("保存成功");
                },
                error: function () {
                    toastr.error("打卡失败");
                    toastr.error("保存失败");
                }
            });
        }