修改修改

username@email.com

2021-07-05 98cd7063d9b9a1570dcfbac92f5c2b35d904868b

修改修改

 zhengcaioa/DTO/CooperatecustomCustomerDTO.cs

@@ -54,6 +54,9 @@
        public string YwjlName { get; set; }

        public Boolean zhuanyi { get; set; }

        public string Weixin { get; set; }
        public string Shifoutianjiaweixin { get; set; }
    }

    public class CooperatecustomCustomerDTOSearch : SearchEntity
@@ -69,5 +72,8 @@

        public string Createtime { get; set; }

        public string Shifouweixin { get; set; }
        

    }
}

 zhengcaioa/DTO/IntentionCustomerDTO.cs

@@ -57,6 +57,9 @@
        public string DianxiaozhuanyuanName { get; set; }
        public DateTime? Zuijinzhuizongtime { get; set; }
        public string ZuijinzhuizongtimeName { get; set; }

        public string Weixin { get; set; }
        public string Shifoutianjiaweixin { get; set; }
    }

    public class IntentionCustomerDTOSearch : SearchEntity
@@ -81,5 +84,7 @@

        public string YwjlYx { get; set; }

        public string Shifouweixin { get; set; }

    }
}

 zhengcaioa/DTO/IntentionVisitDTO.cs

@@ -25,6 +25,7 @@
        public string JyName { get; set; }
        public string RecStatus { get; set; }
        public string Creater { get; set; }
        public string CreaterName { get; set; }
        public DateTime Createtime { get; set; }
        public string Modifier { get; set; }
        public DateTime Modifytime { get; set; }
@@ -52,5 +53,7 @@

        public string  Viscustomer { get; set; }

        public string Creater { get; set; }

    }
}

 zhengcaioa/DTO/ProjectDTO.cs

@@ -59,9 +59,12 @@
        public string Fbyy { get; set; }

        public string Caigourenname { get; set; }

        public string Caigourennamecunzai { get; set; }
        public string Caigourenaddress { get; set; }
        public string Caigourencontact { get; set; }
        public string Dailiname { get; set; }
        public string Dailinamecunzai { get; set; }
        public string Dailiaddress { get; set; }
        public string Dailicontact { get; set; }

@@ -72,6 +75,9 @@
        public List<ProjectzhongbiaoDTO> Projectzhongbiaos { get; set; }

        public string[] ZhuanjiaList { get; set; }

        public decimal? Fencha { get; set; }
        public int? Shuliang { get; set; }
    }

    public class ProjectDTOSearch : SearchEntity
@@ -108,5 +114,11 @@

        public string Fencha { get; set; }

        public string Caigourenname { get; set; }

        public string Dailiname { get; set; }

        public string Shuliang { get; set; }

    }
}

 zhengcaioa/IServices/IHrSalaryService.cs

@@ -27,7 +27,7 @@

        ResultEntity CheckAppea(HrSalaryAppeal model);

        HrSalaryAppeal GetAppeal(string id, string user);
        HrSalaryAppeal GetAppeal(string id="", string user="",string salaryId = "");

        ResultDataEntity<HrSalaryDTO> SearchByPagingFinish(HrSalaryDTOSearch searchEntity);


 zhengcaioa/IServices/IWfRunProcessService.cs

@@ -20,5 +20,7 @@
        ResultEntity WfAskLeave(string DanjuId, string step, string tongguojujue , string Userid, string Content, string title, string version);

        ResultEntity WfAskLeaveOff(string DanjuId, string step, string tongguojujue, string Userid, string Content, string title, string version);

        ResultEntity WfSalaryAppeal(string DanjuId, string step, string tongguojujue, string Userid, string Content, string title, string version);
    }
}

 zhengcaioa/Model/CooperatecustomCustomer.cs

@@ -41,5 +41,7 @@
        public DateTime Createtime { get; set; }
        public string Modifier { get; set; }
        public DateTime Modifytime { get; set; }
        public string Weixin { get; set; }
        public string Shifoutianjiaweixin { get; set; }
    }
}

 zhengcaioa/Model/HrSalary.cs

@@ -49,9 +49,13 @@
    public class HrSalaryAppeal
    {
        [Key]
        public int id { get; set; }
        public string id { get; set; }

        public string salary_id { get; set; }          

        public int Year { get; set; }

        public int Month { get; set; }

        public string reason { get; set; }

@@ -70,5 +74,22 @@
        public string chk_result { get; set; }

        public string status { get; set; }

        public string createrName { get; set; }

        public string tittle { get; set; }

        public string shenpi_status { get; set; }
    }


    public class HrSalaryAppealDTO: HrSalaryAppeal
    {
        public string Step { get; set; }

        public string Tongguojujue { get; set; }

        public string Content { get; set; }

    }
}

 zhengcaioa/Model/IntentionCustomer.cs

@@ -45,5 +45,7 @@
        public string Yixiang { get; set; }
        public string Dianxiaozhuanyuan { get; set; }
        public DateTime? Zuijinzhuizongtime { get; set; }
        public string Weixin { get; set; }
        public string Shifoutianjiaweixin { get; set; }
    }
}

 zhengcaioa/Model/Project.cs

@@ -17,10 +17,8 @@
        public string Name { get; set; }
        public string Drhx { get; set; }
        public string DrhxPrice { get; set; }
        public decimal? DrhxDefen { get; set; }
        public string Dshx { get; set; }
        public string DshxPrice { get; set; }
        public decimal? DshxDefen { get; set; }
        public string Zhuanjia { get; set; }
        public string Remark { get; set; }
        public string RecStatus { get; set; }
@@ -41,5 +39,9 @@
        public string Dailiname { get; set; }
        public string Dailiaddress { get; set; }
        public string Dailicontact { get; set; }
        public decimal? DrhxDefen { get; set; }
        public decimal? DshxDefen { get; set; }
        public decimal? Fencha { get; set; }
        public int? Shuliang { get; set; }
    }
}

 zhengcaioa/Model/zhengcaioaContext.cs

@@ -1684,6 +1684,10 @@
                    .HasColumnName("sheng")
                    .HasComment("省");

                entity.Property(e => e.Shifoutianjiaweixin)
                    .HasMaxLength(1)
                    .HasColumnName("shifoutianjiaweixin");

                entity.Property(e => e.ShrAddress)
                    .HasMaxLength(500)
                    .HasColumnName("shr_address")
@@ -1708,6 +1712,10 @@
                    .HasMaxLength(500)
                    .HasColumnName("url")
                    .HasComment("网址");

                entity.Property(e => e.Weixin)
                    .HasMaxLength(50)
                    .HasColumnName("weixin");

                entity.Property(e => e.YwName)
                    .HasMaxLength(500)
@@ -3000,6 +3008,10 @@
                    .HasColumnName("sheng")
                    .HasComment("省");

                entity.Property(e => e.Shifoutianjiaweixin)
                    .HasMaxLength(1)
                    .HasColumnName("shifoutianjiaweixin");

                entity.Property(e => e.ShrAddress)
                    .HasMaxLength(500)
                    .HasColumnName("shr_address")
@@ -3024,6 +3036,10 @@
                    .HasMaxLength(500)
                    .HasColumnName("url")
                    .HasComment("网址");

                entity.Property(e => e.Weixin)
                    .HasMaxLength(50)
                    .HasColumnName("weixin");

                entity.Property(e => e.Yixiang).HasMaxLength(50);

@@ -4006,6 +4022,7 @@
                    .HasMaxLength(50)
                    .HasColumnName("userId");
            });

            modelBuilder.Entity<Project>(entity =>
            {
                entity.ToTable("Project");
@@ -4075,21 +4092,21 @@
                    .HasMaxLength(500)
                    .HasColumnName("drhx");

                entity.Property(e => e.DrhxPrice)
                    .HasMaxLength(500)
                    .HasColumnName("drhx_price");

                entity.Property(e => e.DrhxDefen)
                    .HasColumnType("money")
                    .HasColumnName("drhx_defen");

                entity.Property(e => e.DshxDefen)
                   .HasColumnType("money")
                   .HasColumnName("dshx_defen");
                entity.Property(e => e.DrhxPrice)
                    .HasMaxLength(500)
                    .HasColumnName("drhx_price");

                entity.Property(e => e.Dshx)
                    .HasMaxLength(500)
                    .HasColumnName("dshx");

                entity.Property(e => e.DshxDefen)
                    .HasColumnType("money")
                    .HasColumnName("dshx_defen");

                entity.Property(e => e.DshxPrice)
                    .HasMaxLength(500)
@@ -4103,6 +4120,8 @@
                    .HasMaxLength(100)
                    .HasColumnName("feibiaocishu");

                entity.Property(e => e.Fencha).HasColumnType("money");

                entity.Property(e => e.Modifier)
                    .IsRequired()
                    .HasMaxLength(50)

 zhengcaioa/Services/CooperatecustomCustomerService.cs

@@ -93,7 +93,9 @@
                    updateproject.RecStatus = cooperatecustomCustomer.RecStatus;
                    updateproject.Modifier = cooperatecustomCustomer.Modifier;
                    updateproject.Modifytime = cooperatecustomCustomer.Modifytime;
                    updateproject.Weixin = cooperatecustomCustomer.Weixin;

                    updateproject.Shifoutianjiaweixin = cooperatecustomCustomer.Shifoutianjiaweixin;
                }

                _context.SaveChanges();
@@ -201,6 +203,8 @@
                              && (string.IsNullOrWhiteSpace(searchEntity.Sheng) || a.Sheng == searchEntity.Sheng.Trim())
                               && (string.IsNullOrWhiteSpace(searchEntity.City) || a.City == searchEntity.City.Trim())
                                && (string.IsNullOrWhiteSpace(searchEntity.AreaId) || a.AreaId == searchEntity.AreaId.Trim())
                                 && (string.IsNullOrWhiteSpace(searchEntity.Shifouweixin) || (searchEntity.Shifouweixin == "A" && a.Weixin != null) || (searchEntity.Shifouweixin != "A" && a.Weixin == null) ) 


                         select new CooperatecustomCustomerDTO
                         {
@@ -248,6 +252,8 @@
                             Modifier = a.Modifier,
                             Modifytime = a.Modifytime,
                             CreatetimeName = a.Createtime.ToString("yyyy-MM-dd"),
                             Weixin = a.Weixin,
                             Shifoutianjiaweixin = a.Shifoutianjiaweixin,
                         }
                        ).OrderByDescending(x => x.Modifytime).ToList();


 zhengcaioa/Services/HrSalaryService.cs

@@ -677,10 +677,13 @@
                        temp.reason = model.reason;
                        temp.amount = model.amount;
                        temp.basis = model.basis;
                        temp.sub_time = DateTime.Now;
                        temp.shenpi_status = model.shenpi_status;


                    }
                    else
                    {
                        model.id = Guid.NewGuid().ToString();
                        model.sub_time = DateTime.Now;
                        model.status = "A";
                        _context.HrSalaryAppeal.Add(model);
@@ -705,12 +708,20 @@
        /// <param name="id"></param>
        /// <param name="user"></param>
        /// <returns></returns>
        public HrSalaryAppeal GetAppeal(string id,string user)
        public HrSalaryAppeal GetAppeal(string id = "", string user = "", string salaryId = "")
        {
            HrSalaryAppeal hd = new HrSalaryAppeal();
            try
            {
                hd = _context.HrSalaryAppeal.Where(e => e.salary_id == id && e.sub_user == user).SingleOrDefault();
                if (!string.IsNullOrEmpty(salaryId))
                {
                    hd = _context.HrSalaryAppeal.Where(e => e.salary_id == salaryId && e.sub_user == user && e.status == "A").FirstOrDefault();
                }
                else
                {
                    hd = _context.HrSalaryAppeal.Where(e => e.id == id && e.status == "A").FirstOrDefault();
                }
               
            }
            catch (Exception er)
            {

 zhengcaioa/Services/IntentionCustomerService.cs

@@ -95,6 +95,9 @@
                    updateproject.Dianxiaozhuanyuan = intentionCustomer.Dianxiaozhuanyuan;
                    updateproject.Zuijinzhuizongtime = intentionCustomer.Zuijinzhuizongtime;

                    updateproject.Weixin = intentionCustomer.Weixin;
                    updateproject.Shifoutianjiaweixin = intentionCustomer.Shifoutianjiaweixin;

                }

            _context.SaveChanges();
@@ -227,6 +230,7 @@
                                
                                    && (string.IsNullOrWhiteSpace(searchEntity.Yixiangtime) || (a.Yixiangtime >= Yixiangtimestart && a.Yixiangtime <= Yixiangtimeend))
                                      && (string.IsNullOrWhiteSpace(searchEntity.Yixiang) || ( a.Yixiang == searchEntity.Yixiang.Trim() && (a.Ywjl == null || a.Ywjl == searchEntity.YwjlYx) ))
                                       && (string.IsNullOrWhiteSpace(searchEntity.Shifouweixin) || (searchEntity.Shifouweixin == "A" && a.Weixin != null) || (searchEntity.Shifouweixin != "A" && a.Weixin == null))
                         select new IntentionCustomerDTO
                     {
                         Id = a.Id,
@@ -267,7 +271,8 @@
                         ShrTel = a.ShrTel,
                         ShrAddress = a.ShrAddress,
                         Remark = a.Remark,

                         Weixin = a.Weixin,
                         Shifoutianjiaweixin = a.Shifoutianjiaweixin,
                         RecStatus = a.RecStatus,
                         Modifier = a.Modifier,
                         Modifytime = a.Modifytime,

 zhengcaioa/Services/IntentionVisitService.cs

@@ -148,6 +148,11 @@
                         join h in _context.Areas on zz.City equals h.CodeId
                         join i in _context.Areas on zz.AreaId equals i.CodeId

                         join zzz in _context.PltUsers.Where(x => x.RecStatus == "A")
                         on a.Creater equals zzz.Id
                         into zsssss
                         from zzzzz in zsssss.DefaultIfEmpty()




@@ -162,6 +167,7 @@
                               && (string.IsNullOrWhiteSpace(searchEntity.City) || zz.City == searchEntity.City.Trim())
                                && (string.IsNullOrWhiteSpace(searchEntity.AreaId) || zz.AreaId == searchEntity.AreaId.Trim())
                                && (string.IsNullOrWhiteSpace(searchEntity.Viscustomer) || a.Viscustomer == searchEntity.Viscustomer.Trim())
                                 && (string.IsNullOrWhiteSpace(searchEntity.Creater) || zz.Creater == searchEntity.Creater.Trim())
                         select new IntentionVisitDTO
                         {
                             Id = a.Id,
@@ -181,6 +187,7 @@
                             Talk = a.Talk,
                             Khfk = a.Khfk,
                             Yx = a.Yx,
                             CreaterName = zzzzz.UserName,

                             Jy = a.Jy,
                             Creater = a.Creater,

 zhengcaioa/Services/ProjectService.cs

@@ -92,6 +92,9 @@
                    updateproject.Dailiname = project.Dailiname;
                    updateproject.Dailicontact = project.Dailicontact;
                    updateproject.Dailiaddress = project.Dailiaddress;
                    updateproject.Fencha = project.Fencha;
                    updateproject.Shuliang = updateproject.Shuliang;

                }

                //子表
@@ -292,7 +295,7 @@
            List<ProjectDTO> list = new List<ProjectDTO>();
            //筛选
            StringBuilder sql = new StringBuilder();
            sql.Append("SELECT distinct a.[Id],a.[start_time],a.[drhx_defen],a.[dshx_defen] ,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("SELECT distinct a.[Id],a.[start_time],a.[drhx_defen],a.[dshx_defen] ,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.[Fencha],a.[Shuliang],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] ");
@@ -330,6 +333,25 @@
                    sql.Append(" and exists ( select b.[ProjectId] from [Projectzhongbiao] b  where  a.[Id]=b.[ProjectId] and  (b.[defen]-a.[drhx_defen])  <= " + aaaa + " ) ");
                }
            }


            if (!string.IsNullOrWhiteSpace(searchEntity.Shuliang))
            {
                decimal aaaa = 0;
                decimal.TryParse(searchEntity.Shuliang, out aaaa);
                if (aaaa > 0)
                {
                    sql.Append(" and exists ( select * from( select  (   isnull((select  COUNT(*) ProjectIdshuliang from  [Projectzhongbiao] b  where  a.[Id]=b.[ProjectId]   group by b.ProjectId) ,0)+  ");

                    sql.Append(" isnull( (select  COUNT(*) ProjectIdshuliang from  [Projectreason] b  where  a.[Id]=b.[ProjectId] group by b.ProjectId),0)+ ");
                    sql.Append(" isnull( (select  COUNT(*) ProjectIdshuliang from  [Projectyouxiao] b  where  a.[Id]=b.[ProjectId] group by b.ProjectId),0)+ ");
                    sql.Append(" isnull( ( select  COUNT(*) ProjectIdshuliang from  [Project] b    where a.[Id]=b.[Id] and b.drhx is not null ),0)+ ");
                    sql.Append(" isnull(  (select  COUNT(*) ProjectIdshuliang from  [Project] b    where  a.[Id]=b.[Id] and b.dshx is not null ),0) ");
                    sql.Append("  ) as sum_count ) a  where a.sum_count    <=  " + aaaa + "");
                    sql.Append("  ) ");
                }
            }


                if (!string.IsNullOrWhiteSpace(searchEntity.Reasonname))
            {
@@ -389,7 +411,17 @@

            }

            if (!string.IsNullOrWhiteSpace(searchEntity.Caigourenname))
            {
                sql.Append("and a.[caigourenname] like '%" + searchEntity.Caigourenname.Trim().Replace("'", "''") + "%'");

            }

            if (!string.IsNullOrWhiteSpace(searchEntity.Dailiname))
            {
                sql.Append("and a.[dailiname] like '%" + searchEntity.Dailiname.Trim().Replace("'", "''") + "%'");

            }

 


 zhengcaioa/Services/WfRunProcessService.cs

@@ -1284,5 +1284,533 @@

            return result;
        }

        public ResultEntity WfSalaryAppeal(string DanjuId, string step, string tongguojujue, string Userid, string Content, string title, string version)
        {

            ResultEntity result = new ResultEntity();
            result.Result = true;


            WfRunProcessDTO wfRunProcessDTO = this.GetList(DanjuId, "03").FirstOrDefault();
            if (wfRunProcessDTO != null)
            {
                version = wfRunProcessDTO.Version;
            }


            if (version == "v1")
            {
                if (step == "提交")
                {
                    //更新流程实例
                    // WfRunProcessDTO wfRunProcessDTO = this.GetList(DanjuId, "03").FirstOrDefault();
                    if (wfRunProcessDTO == null)
                    {
                        //插入流程实例
                        wfRunProcessDTO = new WfRunProcessDTO();
                        //wfRunProcessDTO.Applyno = 
                        wfRunProcessDTO.Applytime = DateTime.Now;
                        wfRunProcessDTO.Applytiye = "03";
                        wfRunProcessDTO.DanjuId = DanjuId;
                        wfRunProcessDTO.Content = title;
                        wfRunProcessDTO.Step = "人事审批";
                        wfRunProcessDTO.ShenpiStatus = "D";
                        wfRunProcessDTO.Version = version;
                        wfRunProcessDTO.RecStatus = "A";
                        wfRunProcessDTO.Creater = Userid;
                        wfRunProcessDTO.Createtime = DateTime.Now;
                        wfRunProcessDTO.Modifier = Userid;
                        wfRunProcessDTO.Modifytime = DateTime.Now;
                        wfRunProcessDTO.Deelurl = "/SalaryCheck/Appeal?id=" + DanjuId;
                        result = this.save(wfRunProcessDTO);
                        if (result.Result == false)
                        {
                            return result;
                        }
                        //查询处理人
                        var hrPositions = _context.PltRoles.Where(x => x.RecStatus == "A" && x.RoleName == "人事").FirstOrDefault();
                        if (hrPositions == null)
                        {
                            result.Result = false;
                            result.Message = "未找到职位";
                            return result;
                        }
                        var pltUsers = (from a in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A")
                                        join b in _context.PltUserRoles.Where(x => x.RecStatus == "A" && x.RoleId == hrPositions.Id) on a.Id equals b.UserId
                                        select a
                                        ).ToList();

                        if (pltUsers == null || pltUsers.Count == 0)
                        {
                            result.Result = false;
                            result.Message = "未找到处理人";
                            return result;
                        }
                        foreach (var pltUser in pltUsers)
                        {
                            //插入待办
                            WfNeeddeelDTO wfNeeddeelDTO = new WfNeeddeelDTO();
                            wfNeeddeelDTO.RunProcessId = wfRunProcessDTO.Id;
                            wfNeeddeelDTO.SendUserId = Userid;
                            wfNeeddeelDTO.DeelUserId = pltUser.Id;
                            wfNeeddeelDTO.Sendtime = DateTime.Now;
                            wfNeeddeelDTO.Resivetime = DateTime.Now;
                            wfNeeddeelDTO.Step = "人事审批";
                            wfNeeddeelDTO.NeeddeelType = "1";
                            wfNeeddeelDTO.ChuliStatus = "0";
                            wfNeeddeelDTO.Deelurl = "/SalaryCheck/Appeal?id=" + DanjuId;
                            wfNeeddeelDTO.Content = "";
                            wfNeeddeelDTO.Sort = 1;
                            wfNeeddeelDTO.RecStatus = "A";
                            wfNeeddeelDTO.Creater = Userid;
                            wfNeeddeelDTO.Createtime = DateTime.Now;
                            wfNeeddeelDTO.Modifier = Userid;
                            wfNeeddeelDTO.Modifytime = wfNeeddeelDTO.Createtime;
                            result = _wfNeeddeelService.save(wfNeeddeelDTO);
                            if (result.Result == false)
                            {
                                return result;
                            }
                        }

                        //插入新的已办
                        WfHistory wfHistoryDTO1 = new WfHistory();
                        wfHistoryDTO1.Id = Guid.NewGuid().ToString();
                        wfHistoryDTO1.RunProcessId = wfRunProcessDTO.Id;
                        wfHistoryDTO1.SendUserId = Userid;
                        wfHistoryDTO1.DeelUserId = wfRunProcessDTO.Creater;
                        wfHistoryDTO1.Sendtime = DateTime.Now;
                        wfHistoryDTO1.Resivetime = DateTime.Now;
                        wfHistoryDTO1.Step = "提交";
                        wfHistoryDTO1.NeeddeelType = "1";
                        wfHistoryDTO1.ChuliStatus = "2";
                        wfHistoryDTO1.Deelurl = "/SalaryCheck/Appeal?id=" + DanjuId;
                        wfHistoryDTO1.Content = "";
                        wfHistoryDTO1.Sort = 1;
                        wfHistoryDTO1.RecStatus = "A";
                        wfHistoryDTO1.Creater = Userid;
                        wfHistoryDTO1.Createtime = DateTime.Now;
                        wfHistoryDTO1.Modifier = Userid;
                        wfHistoryDTO1.Modifytime = wfHistoryDTO1.Createtime;
                        _context.WfHistories.Add(wfHistoryDTO1);
                        _context.SaveChanges();
                    }
                    else
                    {
                        wfRunProcessDTO.Step = "人事审批";
                        wfRunProcessDTO.Modifier = Userid;
                        wfRunProcessDTO.Modifytime = DateTime.Now;
                        result = this.save(wfRunProcessDTO);
                        if (result.Result == false)
                        {
                            return result;
                        }

                        //更新待办
                        List<WfNeeddeelDTO> wfNeeddeelDTOs = _wfNeeddeelService.GetList(wfRunProcessDTO.Id, "提交");
                        var wfHistoryDTOs = _mapper.Map<List<WfHistoryDTO>>(wfNeeddeelDTOs);

                        var wfHistoryDTO = wfHistoryDTOs.Where(x => x.DeelUserId == Userid).FirstOrDefault();
                        if (wfHistoryDTO == null)
                        {
                            result.Result = false;
                            result.Message = "未找到代办";
                            return result;
                        }
                        wfHistoryDTO.Content = Content;
                        wfHistoryDTO.ChuliStatus = "2";
                        wfHistoryDTO.Modifier = Userid;
                        wfHistoryDTO.Modifytime = DateTime.Now;
                        var wfHistories = _mapper.Map<List<WfHistory>>(wfHistoryDTOs);
                        foreach (var wfHistory in wfHistories)
                        {
                            _context.WfHistories.Add(wfHistory);
                        }
                        var wfNeeddeels = _mapper.Map<List<WfNeeddeel>>(wfNeeddeelDTOs);
                        foreach (var wfNeeddeel in wfNeeddeels)
                        {
                            //_wfNeeddeelService.ModifyStatus(wfNeeddeel.Id, Userid);
                            _context.WfNeeddeels.Remove(wfNeeddeel);
                        }
                        _context.SaveChanges();

                        //查询处理人
                        var hrPositions = _context.PltRoles.Where(x => x.RecStatus == "A" && x.RoleName == "人事").FirstOrDefault();
                        if (hrPositions == null)
                        {
                            result.Result = false;
                            result.Message = "未找到职位";
                            return result;
                        }
                        var pltUsers = (from a in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A")
                                        join b in _context.PltUserRoles.Where(x => x.RecStatus == "A" && x.RoleId == hrPositions.Id) on a.Id equals b.UserId
                                        select a
                                        ).ToList();

                        if (pltUsers == null || pltUsers.Count == 0)
                        {
                            result.Result = false;
                            result.Message = "未找到处理人";
                            return result;
                        }

                        foreach (var pltUser in pltUsers)
                        {
                            //插入新的待办
                            WfNeeddeelDTO wfNeeddeelDTO = new WfNeeddeelDTO();
                            wfNeeddeelDTO.RunProcessId = wfRunProcessDTO.Id;
                            wfNeeddeelDTO.SendUserId = Userid;
                            wfNeeddeelDTO.DeelUserId = pltUser.Id;
                            wfNeeddeelDTO.Sendtime = DateTime.Now;
                            wfNeeddeelDTO.Resivetime = DateTime.Now;
                            wfNeeddeelDTO.Step = "人事审批";
                            wfNeeddeelDTO.NeeddeelType = "1";
                            wfNeeddeelDTO.ChuliStatus = "0";
                            wfNeeddeelDTO.Deelurl = "/SalaryCheck/Appeal?id=" + DanjuId;
                            wfNeeddeelDTO.Content = "";
                            wfNeeddeelDTO.Sort = 2;
                            wfNeeddeelDTO.RecStatus = "A";
                            wfNeeddeelDTO.Creater = Userid;
                            wfNeeddeelDTO.Createtime = DateTime.Now;
                            wfNeeddeelDTO.Modifier = Userid;
                            wfNeeddeelDTO.Modifytime = wfNeeddeelDTO.Createtime;
                            result = _wfNeeddeelService.save(wfNeeddeelDTO);
                            if (result.Result == false)
                            {
                                return result;
                            }
                        }
                    }




                }
                if (step == "人事审批")
                {
                    //更新流程实例
                    //WfRunProcessDTO wfRunProcessDTO = this.GetList(DanjuId, "03").FirstOrDefault();
                    if (wfRunProcessDTO == null)
                    {
                        result.Result = false;
                        result.Message = "未找到流程实例";
                        return result;
                    }
                    if (wfRunProcessDTO.Step != "人事审批")
                    {
                        result.Result = false;
                        result.Message = "当前步骤已经处理";
                        return result;
                    }

                    if (tongguojujue == "A")
                    {
                        wfRunProcessDTO.Step = "总经理审批";
                        wfRunProcessDTO.Modifier = Userid;
                        wfRunProcessDTO.Modifytime = DateTime.Now;
                        result = this.save(wfRunProcessDTO);
                        if (result.Result == false)
                        {
                            return result;
                        }

                        //更新待办
                        List<WfNeeddeelDTO> wfNeeddeelDTOs = _wfNeeddeelService.GetList(wfRunProcessDTO.Id, "人事审批");



                        var wfHistoryDTOs = _mapper.Map<List<WfHistoryDTO>>(wfNeeddeelDTOs);

                        var wfHistoryDTO = wfHistoryDTOs.Where(x => x.DeelUserId == Userid).FirstOrDefault();
                        if (wfHistoryDTO == null)
                        {
                            result.Result = false;
                            result.Message = "未找到代办";
                            return result;
                        }

                        wfHistoryDTO.Content = Content;
                        wfHistoryDTO.ChuliStatus = "2";
                        wfHistoryDTO.Modifier = Userid;
                        wfHistoryDTO.Modifytime = DateTime.Now;


                        var wfHistories = _mapper.Map<List<WfHistory>>(wfHistoryDTOs);
                        foreach (var wfHistory in wfHistories)
                        {
                            _context.WfHistories.Add(wfHistory);
                        }
                        var wfNeeddeels = _mapper.Map<List<WfNeeddeel>>(wfNeeddeelDTOs);
                        foreach (var wfNeeddeel in wfNeeddeels)
                        {
                            //_wfNeeddeelService.ModifyStatus(wfNeeddeel.Id, Userid);
                            _context.WfNeeddeels.Remove(wfNeeddeel);
                        }
                        _context.SaveChanges();

                        //查询处理人
                        var hrPositions = _context.PltRoles.Where(x => x.RecStatus == "A" && x.RoleName == "总经理").FirstOrDefault();
                        if (hrPositions == null)
                        {
                            result.Result = false;
                            result.Message = "未找到职位";
                            return result;
                        }
                        var pltUsers = (from a in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A")
                                        join b in _context.PltUserRoles.Where(x => x.RecStatus == "A" && x.RoleId == hrPositions.Id) on a.Id equals b.UserId
                                        select a
                                        ).ToList();

                        if (pltUsers == null || pltUsers.Count == 0)
                        {
                            result.Result = false;
                            result.Message = "未找到处理人";
                            return result;
                        }

                        foreach (var pltUser in pltUsers)
                        {
                            //插入新的待办
                            WfNeeddeelDTO wfNeeddeelDTO = new WfNeeddeelDTO();
                            wfNeeddeelDTO.RunProcessId = wfRunProcessDTO.Id;
                            wfNeeddeelDTO.SendUserId = Userid;
                            wfNeeddeelDTO.DeelUserId = pltUser.Id;
                            wfNeeddeelDTO.Sendtime = DateTime.Now;
                            wfNeeddeelDTO.Resivetime = DateTime.Now;
                            wfNeeddeelDTO.Step = "总经理审批";
                            wfNeeddeelDTO.NeeddeelType = "1";
                            wfNeeddeelDTO.ChuliStatus = "0";
                            wfNeeddeelDTO.Deelurl = "/SalaryCheck/Appeal?id=" + DanjuId;
                            wfNeeddeelDTO.Content = "";
                            wfNeeddeelDTO.Sort = 3;
                            wfNeeddeelDTO.RecStatus = "A";
                            wfNeeddeelDTO.Creater = Userid;
                            wfNeeddeelDTO.Createtime = DateTime.Now;
                            wfNeeddeelDTO.Modifier = Userid;
                            wfNeeddeelDTO.Modifytime = wfNeeddeelDTO.Createtime;
                            result = _wfNeeddeelService.save(wfNeeddeelDTO);
                            if (result.Result == false)
                            {
                                return result;
                            }
                        }
                    }
                    else
                    {
                        wfRunProcessDTO.Step = "提交";
                        wfRunProcessDTO.Modifier = Userid;
                        wfRunProcessDTO.Modifytime = DateTime.Now;
                        result = this.save(wfRunProcessDTO);
                        if (result.Result == false)
                        {
                            return result;
                        }

                        //更新待办
                        List<WfNeeddeelDTO> wfNeeddeelDTOs = _wfNeeddeelService.GetList(wfRunProcessDTO.Id, "人事审批");
                        var wfHistoryDTOs = _mapper.Map<List<WfHistoryDTO>>(wfNeeddeelDTOs);

                        var wfHistoryDTO = wfHistoryDTOs.Where(x => x.DeelUserId == Userid).FirstOrDefault();
                        if (wfHistoryDTO == null)
                        {
                            result.Result = false;
                            result.Message = "未找到代办";
                            return result;
                        }
                        wfHistoryDTO.Content = Content;
                        wfHistoryDTO.ChuliStatus = "1";
                        wfHistoryDTO.Modifier = Userid;
                        wfHistoryDTO.Modifytime = DateTime.Now;
                        var wfHistories = _mapper.Map<List<WfHistory>>(wfHistoryDTOs);
                        foreach (var wfHistory in wfHistories)
                        {
                            _context.WfHistories.Add(wfHistory);
                        }
                        var wfNeeddeels = _mapper.Map<List<WfNeeddeel>>(wfNeeddeelDTOs);
                        foreach (var wfNeeddeel in wfNeeddeels)
                        {
                            //_wfNeeddeelService.ModifyStatus(wfNeeddeel.Id, Userid);
                            _context.WfNeeddeels.Remove(wfNeeddeel);
                        }
                        _context.SaveChanges();


                        //插入新的待办
                        WfNeeddeelDTO wfNeeddeelDTO = new WfNeeddeelDTO();
                        wfNeeddeelDTO.RunProcessId = wfRunProcessDTO.Id;
                        wfNeeddeelDTO.SendUserId = Userid;
                        wfNeeddeelDTO.DeelUserId = wfRunProcessDTO.Creater;
                        wfNeeddeelDTO.Sendtime = DateTime.Now;
                        wfNeeddeelDTO.Resivetime = DateTime.Now;
                        wfNeeddeelDTO.Step = "提交";
                        wfNeeddeelDTO.NeeddeelType = "1";
                        wfNeeddeelDTO.ChuliStatus = "0";
                        wfNeeddeelDTO.Deelurl = "/SalaryCheck/Appeal?id=" + DanjuId;
                        wfNeeddeelDTO.Content = "";
                        wfNeeddeelDTO.Sort = 1;
                        wfNeeddeelDTO.RecStatus = "A";
                        wfNeeddeelDTO.Creater = Userid;
                        wfNeeddeelDTO.Createtime = DateTime.Now;
                        wfNeeddeelDTO.Modifier = Userid;
                        wfNeeddeelDTO.Modifytime = wfNeeddeelDTO.Createtime;
                        result = _wfNeeddeelService.save(wfNeeddeelDTO);
                        if (result.Result == false)
                        {
                            return result;
                        }

                    }





                }

                if (step == "总经理审批")
                {
                    //更新流程实例
                    //WfRunProcessDTO wfRunProcessDTO = this.GetList(DanjuId, "03").FirstOrDefault();
                    if (wfRunProcessDTO == null)
                    {
                        result.Result = false;
                        result.Message = "未找到流程实例";
                        return result;
                    }
                    if (wfRunProcessDTO.Step != "总经理审批")
                    {
                        result.Result = false;
                        result.Message = "当前步骤已经处理";
                        return result;
                    }
                    if (tongguojujue == "A")
                    {

                        wfRunProcessDTO.Step = "完结";
                        wfRunProcessDTO.ShenpiStatus = "A";
                        wfRunProcessDTO.Modifier = Userid;
                        wfRunProcessDTO.Modifytime = DateTime.Now;
                        result = this.save(wfRunProcessDTO);
                        if (result.Result == false)
                        {
                            return result;
                        }
                        //更新单据
                        var salaryAppeal = _context.HrSalaryAppeal.Find(DanjuId);
                        if (wfRunProcessDTO == null)
                        {
                            result.Result = false;
                            result.Message = "未找到单据";
                            return result;
                        }
                        salaryAppeal.shenpi_status = "A";
                        _context.SaveChanges();

                        List<WfNeeddeelDTO> wfNeeddeelDTOs = _wfNeeddeelService.GetList(wfRunProcessDTO.Id, "总经理审批");

                        var wfHistoryDTOs = _mapper.Map<List<WfHistoryDTO>>(wfNeeddeelDTOs);

                        var wfHistoryDTO = wfHistoryDTOs.Where(x => x.DeelUserId == Userid).FirstOrDefault();
                        if (wfHistoryDTO == null)
                        {
                            result.Result = false;
                            result.Message = "未找到代办";
                            return result;
                        }
                        wfHistoryDTO.Content = Content;
                        wfHistoryDTO.ChuliStatus = "2";
                        wfHistoryDTO.Modifier = Userid;
                        wfHistoryDTO.Modifytime = DateTime.Now;
                        var wfHistories = _mapper.Map<List<WfHistory>>(wfHistoryDTOs);
                        foreach (var wfHistory in wfHistories)
                        {
                            _context.WfHistories.Add(wfHistory);
                        }
                        var wfNeeddeels = _mapper.Map<List<WfNeeddeel>>(wfNeeddeelDTOs);
                        foreach (var wfNeeddeel in wfNeeddeels)
                        {
                            // _wfNeeddeelService.ModifyStatus(wfNeeddeel.Id, Userid);
                            _context.WfNeeddeels.Remove(wfNeeddeel);
                        }
                        _context.SaveChanges();
                    }
                    else
                    {
                        wfRunProcessDTO.Step = "提交";
                        wfRunProcessDTO.Modifier = Userid;
                        wfRunProcessDTO.Modifytime = DateTime.Now;
                        result = this.save(wfRunProcessDTO);
                        if (result.Result == false)
                        {
                            return result;
                        }

                        //更新待办
                        List<WfNeeddeelDTO> wfNeeddeelDTOs = _wfNeeddeelService.GetList(wfRunProcessDTO.Id, "总经理审批");
                        var wfHistoryDTOs = _mapper.Map<List<WfHistoryDTO>>(wfNeeddeelDTOs);

                        var wfHistoryDTO = wfHistoryDTOs.Where(x => x.DeelUserId == Userid).FirstOrDefault();
                        if (wfHistoryDTO == null)
                        {
                            result.Result = false;
                            result.Message = "未找到代办";
                            return result;
                        }
                        wfHistoryDTO.Content = Content;
                        wfHistoryDTO.ChuliStatus = "1";
                        wfHistoryDTO.Modifier = Userid;
                        wfHistoryDTO.Modifytime = DateTime.Now;
                        var wfHistories = _mapper.Map<List<WfHistory>>(wfHistoryDTOs);
                        foreach (var wfHistory in wfHistories)
                        {
                            _context.WfHistories.Add(wfHistory);
                        }
                        var wfNeeddeels = _mapper.Map<List<WfNeeddeel>>(wfNeeddeelDTOs);
                        foreach (var wfNeeddeel in wfNeeddeels)
                        {
                            //_wfNeeddeelService.ModifyStatus(wfNeeddeel.Id, Userid);
                            _context.WfNeeddeels.Remove(wfNeeddeel);
                        }
                        _context.SaveChanges();


                        //插入新的待办
                        WfNeeddeelDTO wfNeeddeelDTO = new WfNeeddeelDTO();
                        wfNeeddeelDTO.RunProcessId = wfRunProcessDTO.Id;
                        wfNeeddeelDTO.SendUserId = Userid;
                        wfNeeddeelDTO.DeelUserId = wfRunProcessDTO.Creater;
                        wfNeeddeelDTO.Sendtime = DateTime.Now;
                        wfNeeddeelDTO.Resivetime = DateTime.Now;
                        wfNeeddeelDTO.Step = "提交";
                        wfNeeddeelDTO.NeeddeelType = "1";
                        wfNeeddeelDTO.ChuliStatus = "0";
                        wfNeeddeelDTO.Deelurl = "/SalaryCheck/Appeal?id=" + DanjuId;
                        wfNeeddeelDTO.Content = "";
                        wfNeeddeelDTO.Sort = 1;
                        wfNeeddeelDTO.RecStatus = "A";
                        wfNeeddeelDTO.Creater = Userid;
                        wfNeeddeelDTO.Createtime = DateTime.Now;
                        wfNeeddeelDTO.Modifier = Userid;
                        wfNeeddeelDTO.Modifytime = wfNeeddeelDTO.Createtime;
                        result = _wfNeeddeelService.save(wfNeeddeelDTO);
                        if (result.Result == false)
                        {
                            return result;
                        }

                    }



                }


            }



            return result;
        }
    }
}

 zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs

@@ -100,7 +100,7 @@
            ViewBag.khlx = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.khly = _liaotianService.GetSYScode("CooperatecustomCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.hyfl = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();

            ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();


@@ -170,6 +170,10 @@
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            data.RecStatus = "A";
            if (string.IsNullOrEmpty(data.Shifoutianjiaweixin))
            {
                data.Shifoutianjiaweixin = "D";
            }
            if (String.IsNullOrEmpty(data.Id))
            {
                data.Creater = curentuser.Id;

 zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs

@@ -121,7 +121,7 @@

            ViewBag.Creater = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();


            ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();


            ViewBag.ShengDropDown = _projectService.Getsheng().Select(x => new { code = x.CodeId, label = x.Name }).ToList();
@@ -258,6 +258,10 @@
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            data.RecStatus = "A";
            if (string.IsNullOrEmpty(data.Shifoutianjiaweixin))
            {
                data.Shifoutianjiaweixin = "D";
            }
            if (String.IsNullOrEmpty(data.Id))
            {
                data.Creater = curentuser.Id;

 zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs

@@ -80,6 +80,8 @@

            ViewBag.users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();

            ViewBag.creater = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();

            ViewBag.Viscustomer = Viscustomer;
            ViewBag.IsYwjl = IsYwjl;

@@ -112,6 +114,14 @@
                {
                    dto.Viscustomer = Viscustomer;
                }

                dto.VisType = "01";
                dto.Jtype = "02";
                dto.Jdr = "02";
                dto.Talk = "介绍公司业务内容和产品。";
                dto.Yx = "03";
                dto.Jy = "02";
                
            }



 zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs

@@ -47,6 +47,15 @@
            List<FiServiceDTO> fiServiceDTOs = _fiServiceService.GetList();
            List<FiMemberDTO> fiMemberDTOs = _fiMemberService.GetList();
            List<FiBookDTO> fiBookDTOs = _fiBookService.GetList();
            foreach (var fiBookDTO in  fiBookDTOs)
            {
                if (fiBookDTO.Chubantime.HasValue)
                {
                    fiBookDTO.ChubantimeName = fiBookDTO.Chubantime.Value.ToString("yyyy-MM-dd");
                }
               
            }

            ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
            decimal? Dianhuazixun = fiServiceDTOs.Where(x => x.ServiceType == "电话咨询").FirstOrDefault().Feiyong;
            serviceChargeDTO.Dianhuazixun = Dianhuazixun.HasValue? Dianhuazixun.Value.ToString("F2"): "";
@@ -65,31 +74,31 @@
            decimal? Xuqiulunzheng5 = fiServiceDTOs.Where(x => x.ServiceType == "需求论证" && x.ServiceTypeTwo == "1000万元以上").FirstOrDefault().Feiyong;
            serviceChargeDTO.Xuqiulunzheng5 = Xuqiulunzheng5.HasValue ? Xuqiulunzheng5.Value.ToString("F2") : "";

            decimal? Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "指导投标文件" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault().Feiyong;
            decimal? Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "标书指导" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault().Feiyong;
            serviceChargeDTO.Zhudaotoubiaowenjian1 = Zhudaotoubiaowenjian1.HasValue ? Zhudaotoubiaowenjian1.Value.ToString("F2") : "";
            decimal? Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "指导投标文件" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault().Feiyong;
            decimal? Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "标书指导" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault().Feiyong;
            serviceChargeDTO.Zhudaotoubiaowenjian2 = Zhudaotoubiaowenjian2.HasValue ? Zhudaotoubiaowenjian2.Value.ToString("F2") : "";
            decimal? Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "指导投标文件" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault().Feiyong;
            decimal? Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "标书指导" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault().Feiyong;
            serviceChargeDTO.Zhudaotoubiaowenjian3 = Zhudaotoubiaowenjian3.HasValue ? Zhudaotoubiaowenjian3.Value.ToString("F2") : "";
            decimal? Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "指导投标文件" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault().Feiyong;
            decimal? Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "标书指导" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault().Feiyong;
            serviceChargeDTO.Zhudaotoubiaowenjian4 = Zhudaotoubiaowenjian4.HasValue ? Zhudaotoubiaowenjian4.Value.ToString("F2") : "";

            decimal? Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "代书质疑" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault().Feiyong;
            decimal? Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "代拟质疑函" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daishuzhiyi1 = Daishuzhiyi1.HasValue ? Daishuzhiyi1.Value.ToString("F2") : "";
            decimal? Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "代书质疑" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault().Feiyong;
            decimal? Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "代拟质疑函" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daishuzhiyi2 = Daishuzhiyi2.HasValue ? Daishuzhiyi2.Value.ToString("F2") : "";
            decimal? Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "代书质疑" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault().Feiyong;
            decimal? Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "代拟质疑函" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daishuzhiyi3 = Daishuzhiyi3.HasValue ? Daishuzhiyi3.Value.ToString("F2") : "";
            decimal? Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "代书质疑" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault().Feiyong;
            decimal? Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "代拟质疑函" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daishuzhiyi4 = Daishuzhiyi4.HasValue ? Daishuzhiyi4.Value.ToString("F2") : "";

            decimal? Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "代书投诉" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault().Feiyong;
            decimal? Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "代拟投诉书" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daushutousu1 = Daushutousu1.HasValue ? Daushutousu1.Value.ToString("F2") : "";
            decimal? Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "代书投诉" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault().Feiyong;
            decimal? Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "代拟投诉书" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daushutousu2 = Daushutousu2.HasValue ? Daushutousu2.Value.ToString("F2") : "";
            decimal? Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "代书投诉" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault().Feiyong;
            decimal? Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "代拟投诉书" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daushutousu3 = Daushutousu3.HasValue ? Daushutousu3.Value.ToString("F2") : "";
            decimal? Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "代书投诉" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault().Feiyong;
            decimal? Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "代拟投诉书" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daushutousu4 = Daushutousu4.HasValue ? Daushutousu4.Value.ToString("F2") : "";

            decimal? Dainizhiyiwenda = fiServiceDTOs.Where(x => x.ServiceType == "代拟质疑答复").FirstOrDefault().Feiyong;
@@ -98,7 +107,7 @@
            decimal? Dainitousuchulijueding = fiServiceDTOs.Where(x => x.ServiceType == "代拟投诉处理决定").FirstOrDefault().Feiyong;
            serviceChargeDTO.Dainitousuchulijueding = Dainitousuchulijueding.HasValue ? Dainitousuchulijueding.Value.ToString("F2") : "";

            decimal? Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "竞争对手和评审专家查询").FirstOrDefault().Feiyong;
            decimal? Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "竞争对手和评审专家参加政府采购数据信息查询").FirstOrDefault().Feiyong;
            serviceChargeDTO.Jinzhengfuishou = Jinzhengfuishou.HasValue ? Jinzhengfuishou.Value.ToString("F2") : "";

            decimal? Zhengcaidai = fiServiceDTOs.Where(x => x.ServiceType == "政采贷").FirstOrDefault().Feiyong;
@@ -255,64 +264,64 @@
                Xuqiulunzheng5.Feiyong = Xuqiulunzheng5decimal;
                resultEntity = _fiServiceService.save(Xuqiulunzheng5);

                FiServiceDTO Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "指导投标文件" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault();
                FiServiceDTO Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "标书指导" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault();
                decimal Zhudaotoubiaowenjian1decimal;
                decimal.TryParse(data.Zhudaotoubiaowenjian1, out Zhudaotoubiaowenjian1decimal);
                Zhudaotoubiaowenjian1.Feiyong = Zhudaotoubiaowenjian1decimal;
                resultEntity = _fiServiceService.save(Zhudaotoubiaowenjian1);
                FiServiceDTO Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "指导投标文件" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault();
                FiServiceDTO Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "标书指导" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault();
                decimal Zhudaotoubiaowenjian2decimal;
                decimal.TryParse(data.Zhudaotoubiaowenjian2, out Zhudaotoubiaowenjian2decimal);
                Zhudaotoubiaowenjian2.Feiyong = Zhudaotoubiaowenjian2decimal;
                resultEntity = _fiServiceService.save(Zhudaotoubiaowenjian2);
                FiServiceDTO Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "指导投标文件" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault();
                FiServiceDTO Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "标书指导" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault();
                decimal Zhudaotoubiaowenjian3decimal;
                decimal.TryParse(data.Zhudaotoubiaowenjian3, out Zhudaotoubiaowenjian3decimal);
                Zhudaotoubiaowenjian3.Feiyong = Zhudaotoubiaowenjian3decimal;
                resultEntity = _fiServiceService.save(Zhudaotoubiaowenjian3);
                FiServiceDTO Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "指导投标文件" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault();
                FiServiceDTO Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "标书指导" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault();
                decimal Zhudaotoubiaowenjian4decimal;
                decimal.TryParse(data.Zhudaotoubiaowenjian4, out Zhudaotoubiaowenjian4decimal);
                Zhudaotoubiaowenjian4.Feiyong = Zhudaotoubiaowenjian4decimal;
                resultEntity = _fiServiceService.save(Zhudaotoubiaowenjian4);

                FiServiceDTO Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "代书质疑" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault();
                FiServiceDTO Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "代拟质疑函" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault();
                decimal Daishuzhiyi1decimal;
                decimal.TryParse(data.Daishuzhiyi1, out Daishuzhiyi1decimal);
                Daishuzhiyi1.Feiyong = Daishuzhiyi1decimal;
                resultEntity = _fiServiceService.save(Daishuzhiyi1);
                FiServiceDTO Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "代书质疑" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault();
                FiServiceDTO Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "代拟质疑函" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault();
                decimal Daishuzhiyi2decimal;
                decimal.TryParse(data.Daishuzhiyi2, out Daishuzhiyi2decimal);
                Daishuzhiyi2.Feiyong = Daishuzhiyi2decimal;
                resultEntity = _fiServiceService.save(Daishuzhiyi2);
                FiServiceDTO Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "代书质疑" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault();
                FiServiceDTO Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "代拟质疑函" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault();
                decimal Daishuzhiyi3decimal;
                decimal.TryParse(data.Daishuzhiyi3, out Daishuzhiyi3decimal);
                Daishuzhiyi3.Feiyong = Daishuzhiyi3decimal;
                resultEntity = _fiServiceService.save(Daishuzhiyi3);
                FiServiceDTO Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "代书质疑" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault();
                FiServiceDTO Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "代拟质疑函" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault();
                decimal Daishuzhiyi4decimal;
                decimal.TryParse(data.Daishuzhiyi4, out Daishuzhiyi4decimal);
                Daishuzhiyi4.Feiyong = Daishuzhiyi4decimal;
                resultEntity = _fiServiceService.save(Daishuzhiyi4);

                FiServiceDTO Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "代书投诉" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault();
                FiServiceDTO Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "代拟投诉书" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault();
                decimal Daushutousu1decimal;
                decimal.TryParse(data.Daushutousu1, out Daushutousu1decimal);
                Daushutousu1.Feiyong = Daushutousu1decimal;
                resultEntity = _fiServiceService.save(Daushutousu1);
                FiServiceDTO Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "代书投诉" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault();
                FiServiceDTO Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "代拟投诉书" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault();
                decimal Daushutousu2decimal;
                decimal.TryParse(data.Daushutousu2, out Daushutousu2decimal);
                Daushutousu2.Feiyong = Daushutousu2decimal;
                resultEntity = _fiServiceService.save(Daushutousu2);
                FiServiceDTO Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "代书投诉" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault();
                FiServiceDTO Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "代拟投诉书" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault();
                decimal Daushutousu3decimal;
                decimal.TryParse(data.Daushutousu3, out Daushutousu3decimal);
                Daushutousu3.Feiyong = Daushutousu3decimal;
                resultEntity = _fiServiceService.save(Daushutousu3);
                FiServiceDTO Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "代书投诉" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault();
                FiServiceDTO Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "代拟投诉书" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault();
                decimal Daushutousu4decimal;
                decimal.TryParse(data.Daushutousu4, out Daushutousu4decimal);
                Daushutousu4.Feiyong = Daushutousu4decimal;
@@ -330,7 +339,7 @@
                Dainitousuchulijueding.Feiyong = Dainitousuchulijuedingdecimal;
                resultEntity = _fiServiceService.save(Dainitousuchulijueding);

                FiServiceDTO Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "竞争对手和评审专家查询").FirstOrDefault();
                FiServiceDTO Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "竞争对手和评审专家参加政府采购数据信息查询").FirstOrDefault();
                decimal Jinzhengfuishoudecimal;
                decimal.TryParse(data.Jinzhengfuishou, out Jinzhengfuishoudecimal);
                Jinzhengfuishou.Feiyong = Jinzhengfuishoudecimal;
@@ -470,7 +479,8 @@
            if (!string.IsNullOrEmpty(id))
            {
                dto = _fiBookService.Get(id);
                dto.DanjiaName = dto.Danjia.Value.ToString("F2"); ;
                dto.DanjiaName = dto.Danjia.Value.ToString("F2"); 
                if(dto.Chubantime.HasValue)
                dto.ChubantimeName = dto.Chubantime.Value.ToString("yyyy-MM-dd");
            }
            ViewData.Model = dto;
@@ -510,6 +520,14 @@
            List<FiServiceDTO> fiServiceDTOs = _fiServiceService.GetList();
            List<FiMemberDTO> fiMemberDTOs = _fiMemberService.GetList();
            List<FiBookDTO> fiBookDTOs = _fiBookService.GetList();
            foreach (var fiBookDTO in fiBookDTOs)
            {
                if (fiBookDTO.Chubantime.HasValue)
                {
                    fiBookDTO.ChubantimeName = fiBookDTO.Chubantime.Value.ToString("yyyy-MM-dd");
                }

            }
            ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
            decimal? Dianhuazixun = fiServiceDTOs.Where(x => x.ServiceType == "电话咨询").FirstOrDefault().Feiyong;
            serviceChargeDTO.Dianhuazixun = Dianhuazixun.HasValue ? Dianhuazixun.Value.ToString("F2") : "";
@@ -528,31 +546,31 @@
            decimal? Xuqiulunzheng5 = fiServiceDTOs.Where(x => x.ServiceType == "需求论证" && x.ServiceTypeTwo == "1000万元以上").FirstOrDefault().Feiyong;
            serviceChargeDTO.Xuqiulunzheng5 = Xuqiulunzheng5.HasValue ? Xuqiulunzheng5.Value.ToString("F2") : "";

            decimal? Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "指导投标文件" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault().Feiyong;
            decimal? Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "标书指导" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault().Feiyong;
            serviceChargeDTO.Zhudaotoubiaowenjian1 = Zhudaotoubiaowenjian1.HasValue ? Zhudaotoubiaowenjian1.Value.ToString("F2") : "";
            decimal? Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "指导投标文件" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault().Feiyong;
            decimal? Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "标书指导" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault().Feiyong;
            serviceChargeDTO.Zhudaotoubiaowenjian2 = Zhudaotoubiaowenjian2.HasValue ? Zhudaotoubiaowenjian2.Value.ToString("F2") : "";
            decimal? Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "指导投标文件" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault().Feiyong;
            decimal? Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "标书指导" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault().Feiyong;
            serviceChargeDTO.Zhudaotoubiaowenjian3 = Zhudaotoubiaowenjian3.HasValue ? Zhudaotoubiaowenjian3.Value.ToString("F2") : "";
            decimal? Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "指导投标文件" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault().Feiyong;
            decimal? Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "标书指导" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault().Feiyong;
            serviceChargeDTO.Zhudaotoubiaowenjian4 = Zhudaotoubiaowenjian4.HasValue ? Zhudaotoubiaowenjian4.Value.ToString("F2") : "";

            decimal? Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "代书质疑" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault().Feiyong;
            decimal? Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "代拟质疑函" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daishuzhiyi1 = Daishuzhiyi1.HasValue ? Daishuzhiyi1.Value.ToString("F2") : "";
            decimal? Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "代书质疑" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault().Feiyong;
            decimal? Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "代拟质疑函" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daishuzhiyi2 = Daishuzhiyi2.HasValue ? Daishuzhiyi2.Value.ToString("F2") : "";
            decimal? Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "代书质疑" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault().Feiyong;
            decimal? Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "代拟质疑函" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daishuzhiyi3 = Daishuzhiyi3.HasValue ? Daishuzhiyi3.Value.ToString("F2") : "";
            decimal? Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "代书质疑" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault().Feiyong;
            decimal? Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "代拟质疑函" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daishuzhiyi4 = Daishuzhiyi4.HasValue ? Daishuzhiyi4.Value.ToString("F2") : "";

            decimal? Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "代书投诉" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault().Feiyong;
            decimal? Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "代拟投诉书" && x.ServiceTypeTwo == "30万元以下").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daushutousu1 = Daushutousu1.HasValue ? Daushutousu1.Value.ToString("F2") : "";
            decimal? Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "代书投诉" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault().Feiyong;
            decimal? Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "代拟投诉书" && x.ServiceTypeTwo == "30-200万元").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daushutousu2 = Daushutousu2.HasValue ? Daushutousu2.Value.ToString("F2") : "";
            decimal? Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "代书投诉" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault().Feiyong;
            decimal? Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "代拟投诉书" && x.ServiceTypeTwo == "200-500万元").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daushutousu3 = Daushutousu3.HasValue ? Daushutousu3.Value.ToString("F2") : "";
            decimal? Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "代书投诉" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault().Feiyong;
            decimal? Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "代拟投诉书" && x.ServiceTypeTwo == "500万元以上").FirstOrDefault().Feiyong;
            serviceChargeDTO.Daushutousu4 = Daushutousu4.HasValue ? Daushutousu4.Value.ToString("F2") : "";

            decimal? Dainizhiyiwenda = fiServiceDTOs.Where(x => x.ServiceType == "代拟质疑答复").FirstOrDefault().Feiyong;
@@ -561,7 +579,7 @@
            decimal? Dainitousuchulijueding = fiServiceDTOs.Where(x => x.ServiceType == "代拟投诉处理决定").FirstOrDefault().Feiyong;
            serviceChargeDTO.Dainitousuchulijueding = Dainitousuchulijueding.HasValue ? Dainitousuchulijueding.Value.ToString("F2") : "";

            decimal? Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "竞争对手和评审专家查询").FirstOrDefault().Feiyong;
            decimal? Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "竞争对手和评审专家参加政府采购数据信息查询").FirstOrDefault().Feiyong;
            serviceChargeDTO.Jinzhengfuishou = Jinzhengfuishou.HasValue ? Jinzhengfuishou.Value.ToString("F2") : "";

            decimal? Zhengcaidai = fiServiceDTOs.Where(x => x.ServiceType == "政采贷").FirstOrDefault().Feiyong;

 zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs

@@ -18,12 +18,19 @@
        private readonly IHrDeptService _hrDeptService;
        private readonly ILogger<SalaryCheckController> _logger;
        private readonly IHrSalaryService _hrSalaryService;
        private readonly IWfRunProcessService _wfRunProcessService;
        private readonly IWfHistoryService _wfHistoryService;
        private readonly IWfNeeddeelService _wfNeeddeelService;

        public SalaryCheckController(ILogger<SalaryCheckController> logger, IHrSalaryService hrSalaryService, IHrDeptService hrDeptService)
        public SalaryCheckController(ILogger<SalaryCheckController> logger, IHrSalaryService hrSalaryService, IHrDeptService hrDeptService, IWfRunProcessService wfRunProcessService
            , IWfHistoryService wfHistoryService, IWfNeeddeelService wfNeeddeelService)
        {
            _logger = logger;            
            _hrDeptService = hrDeptService;
            _hrSalaryService = hrSalaryService;
            _wfRunProcessService = wfRunProcessService;
            _wfHistoryService = wfHistoryService;
            _wfNeeddeelService = wfNeeddeelService;
        }

        public IActionResult Index()
@@ -148,19 +155,69 @@
        }


        public IActionResult Appeal(string id)
        public IActionResult Appeal(string id="",string salaryId = "")
        {
            HrSalaryAppeal dto = new HrSalaryAppeal();
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            if (!string.IsNullOrEmpty(id))
            {
                dto = _hrSalaryService.GetAppeal(id, curentuser.Id);
            dto = _hrSalaryService.GetAppeal(id, curentuser.Id, salaryId);

            //流程相关
            string shifoubiaoji = "A";
            string sifoudangqian = "A";
            string dangqianbuzhou = "提交";
            var lishiyijian = new List<WfHistoryDTO>();

                if(dto==null)
                {
                var  salaryDTO  = _hrSalaryService.Get(salaryId);
                    dto = new HrSalaryAppeal();
                    dto.salary_id = id;
                    dto.salary_id = salaryId;
                    dto.Year = salaryDTO.Year;
                    dto.Month = salaryDTO.Month;
                dto.createrName = curentuser.UserName;
                dto.tittle = "工资申诉（" + curentuser.UserName + "）";
                }
            else  if (dto != null)
            {
                var wfRunProcessDTO = _wfRunProcessService.GetList(dto.id, "03").FirstOrDefault();
                if (wfRunProcessDTO == null)
                {
                    shifoubiaoji = "D";
                    sifoudangqian = "D";
            }
                else
                {
                    dangqianbuzhou = wfRunProcessDTO.Step;
                    //查询历史意见
                    lishiyijian = _wfHistoryService.GetListshenpi(wfRunProcessDTO.Id);
                    if (wfRunProcessDTO.Step != "提交")
                    {
                        shifoubiaoji = "D";
                    }

                    //查询待办
                    var chaxundaiban = _wfNeeddeelService.GetListTracking(wfRunProcessDTO.Id, wfRunProcessDTO.Step).Where(x => x.DeelUserId == curentuser.Id).ToList();
                    if (chaxundaiban != null && chaxundaiban.Count > 0)
                    {
                        sifoudangqian = "A";
                    }
                    else
                    {
                        sifoudangqian = "D";
                    }

                }




            }

            ViewBag.shifoubiaoji = shifoubiaoji;
            ViewBag.sifoudangqian = sifoudangqian;
            ViewBag.lishiyijian = lishiyijian;
            ViewBag.dangqianbuzhou = dangqianbuzhou;

            ViewData.Model = dto;
            return View();
        }
@@ -171,14 +228,24 @@
        /// <param name="data"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult SaveAppeal(HrSalaryAppeal data)
        public IActionResult SaveAppeal(HrSalaryAppealDTO data)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ResultEntity resultEntity = new ResultEntity();
            using (TransactionScope scope = new TransactionScope())
            {
                if (data.Step == "提交")
                {
                data.sub_user = curentuser.Id;
                    data.shenpi_status = "D";
                    data.status = "A";
                resultEntity = _hrSalaryService.CheckAppea(data);
                }
                   

                //发起流程相关

                resultEntity = _wfRunProcessService.WfSalaryAppeal(data.id, data.Step, data.Tongguojujue, curentuser.Id, data.Content, data.tittle, "v1");
                scope.Complete();
            }
            return new JsonResult(resultEntity);

 zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs

@@ -429,7 +429,88 @@


        /// <summary>
        /// ä¿å­˜
        /// æäº¤å¹¶å®¡æ ¸
        /// </summary>
        /// <param name="data">岗位实体类对象</param>
        /// <returns></returns>
        [HttpPost]
        [CheckLogin]
        public async Task<string> TijiaobingshenheAsync(LiaotianDTO data)
        {
            ResultEntity resultEntity = new ResultEntity();
            resultEntity.Result = false;
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            data.RecStatus = "A";
            data.Clientid = "A";
            if (String.IsNullOrEmpty(data.Id))
            {
                data.Creater = curentuser.Id;
                data.Createtime = DateTime.Now;
            }
            data.Modifier = curentuser.Id;
            data.Modifytime = DateTime.Now;
       


            resultEntity = _liaotianService.saveLiaotian(data);

            string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
            string url = $"{api_domain}/liaotian/person/" + data.Id;
            LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
            liaotianElasticsearchDTO.id = data.Id;
            liaotianElasticsearchDTO.question = data.Question;
            liaotianElasticsearchDTO.anwser = data.Anwser;


            string requestJson = JsonConvert.SerializeObject(liaotianElasticsearchDTO); ; 
            try
            {
                string result = string.Empty;
                Uri postUrl = new Uri(url);

                using (HttpContent httpContent = new StringContent(requestJson))
                {
                    httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");

                    var httpClient = _clientFactory.CreateClient();
                    httpClient.Timeout = new TimeSpan(0, 0, 60);
                    var Result = await httpClient.PutAsync(postUrl, httpContent);
                    result = Result.Content.ReadAsStringAsync().Result;



                }

                Newtonsoft.Json.Linq.JObject jobject = (Newtonsoft.Json.Linq.JObject)JsonConvert.DeserializeObject(result);

                if (jobject["error"] == null && jobject["_shards"]["successful"].ToString() == "1")
                {
                    resultEntity.Result = true;
                }
                else
                {
                    resultEntity.Result = false;
                }

            }
            catch (Exception e)
            {
                resultEntity.Result = false;
                throw e;


            }





            return JsonConvert.SerializeObject(resultEntity);
        }

        /// <summary>
        /// å®¡æ ¸
        /// </summary>
        /// <param name="data">岗位实体类对象</param>
        /// <returns></returns>

 zhengcaioa/zhengcaioa/Controllers/OA/WfApplytypeController.cs

@@ -32,7 +32,9 @@

        public IActionResult Index()
        {
            ViewBag.wfApplytypeDTOs  = _wfApplytypeService.GetList();
            

            ViewBag.wfApplytypeDTOs = _wfApplytypeService.GetList().Where(x => x.Applyno != "03").ToList();
            return View();
        }
    }

 zhengcaioa/zhengcaioa/Controllers/ProjectController.cs

@@ -24,15 +24,17 @@
        private readonly ILiaotianService _liaotianService;
        private readonly IIntentionCustomerService _intentionCustomerService;
        private readonly IUserService _userService;
        private readonly ICooperatecustomCustomerService _cooperatecustomCustomerService;


        public ProjectController(ILogger<ProjectController> logger, IProjectService projectService, ILiaotianService liaotianService,IIntentionCustomerService intentionCustomerService, IUserService userService)
        public ProjectController(ILogger<ProjectController> logger, IProjectService projectService, ILiaotianService liaotianService,IIntentionCustomerService intentionCustomerService, IUserService userService
            , ICooperatecustomCustomerService cooperatecustomCustomerService)
        {
            _logger = logger;
            _projectService = projectService;
            _liaotianService = liaotianService;
            _intentionCustomerService = intentionCustomerService;
            _userService = userService;
            _cooperatecustomCustomerService = cooperatecustomCustomerService;
        }
        [CheckLogin]
        public IActionResult Index()
@@ -68,6 +70,7 @@
            {
                projectDTO = _projectService.GetLiaotianEntity(id);
               var intentionCustomerDTOs =  _intentionCustomerService.GetList();
               var  cooperatecustomCustomerDTOs  = _cooperatecustomCustomerService.GetList();

                if (projectDTO.Projectzhongbiaos!=null && projectDTO.Projectzhongbiaos.Count > 0)
                {
@@ -75,6 +78,11 @@
                    {
                        var intt = intentionCustomerDTOs.Count(x=>x.Name == projectDTO.Projectzhongbiaos[i].Names);

                        if (intt > 0)
                        {
                            projectDTO.Projectzhongbiaos[i].ProjectId = "yes";
                        }
                        intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Projectzhongbiaos[i].Names);
                        if (intt > 0)
                        {
                            projectDTO.Projectzhongbiaos[i].ProjectId = "yes";
@@ -89,12 +97,22 @@
                    {
                        projectDTO.Drcunzai = "yes";
                    }
                    intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Drhx);
                    if (intt > 0)
                    {
                        projectDTO.Drcunzai = "yes";
                    }
                }

                if (!string.IsNullOrWhiteSpace(projectDTO.Dshx))
                {
                    var intt = intentionCustomerDTOs.Count(x => x.Name == projectDTO.Dshx);

                    if (intt > 0)
                    {
                        projectDTO.Dscunzai = "yes";
                    }
                    intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Dshx);
                    if (intt > 0)
                    {
                        projectDTO.Dscunzai = "yes";
@@ -106,6 +124,11 @@
                    {
                        var intt = intentionCustomerDTOs.Count(x => x.Name == projectDTO.projectreasons[i].Reasonname);

                        if (intt > 0)
                        {
                            projectDTO.projectreasons[i].ProjectId = "yes";
                        }
                        intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.projectreasons[i].Reasonname);
                        if (intt > 0)
                        {
                            projectDTO.projectreasons[i].ProjectId = "yes";
@@ -123,6 +146,41 @@
                        {
                            projectDTO.Projectyouxiaos[i].ProjectId = "yes";
                        }
                        intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Projectyouxiaos[i].Namesyouxiao);
                        if (intt > 0)
                        {
                            projectDTO.Projectyouxiaos[i].ProjectId = "yes";
                        }
                    }
                }

                if (!string.IsNullOrWhiteSpace(projectDTO.Caigourenname))
                {
                    var intt = intentionCustomerDTOs.Count(x => x.Name == projectDTO.Caigourenname);

                    if (intt > 0)
                    {
                        projectDTO.Caigourennamecunzai = "yes";
                    }
                    intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Caigourenname);
                    if (intt > 0)
                    {
                        projectDTO.Caigourennamecunzai = "yes";
                    }
                }

                if (!string.IsNullOrWhiteSpace(projectDTO.Dailiname))
                {
                    var intt = intentionCustomerDTOs.Count(x => x.Name == projectDTO.Dailiname);

                    if (intt > 0)
                    {
                        projectDTO.Dailinamecunzai = "yes";
                    }
                    intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Dailiname);
                    if (intt > 0)
                    {
                        projectDTO.Dailinamecunzai = "yes";
                    }
                }


 zhengcaioa/zhengcaioa/Controllers/UserController.cs

@@ -262,8 +262,8 @@

            string s = @"^([A-Fa-f0-9]{2}[-,:]){5}[A-Fa-f0-9]{2}$";
            Regex rStr = new Regex(s);
            if (rStr.IsMatch(userdata.IpMac))
            {
            //if (rStr.IsMatch(userdata.IpMac))
            //{
                using (TransactionScope scope = new TransactionScope())
                {
                    bool charujues = false;
@@ -355,11 +355,11 @@
                    }
                    scope.Complete();
                }
            }
            else
            {
                resultEntity.Message = "MAC地址格式错误";
            }
            //}
            //else
            //{
            //    resultEntity.Message = "MAC地址格式错误";
            //}
            return JsonConvert.SerializeObject(resultEntity);
        }
        #endregion

 zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml

@@ -320,8 +320,22 @@
                                        <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>

                                    <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="Weixin" id="Weixin" labtype="txt" addvisible="true" editvisible="true" maxlength="50" reg="" ismust="true" type="text" value="@Model.Weixin">
                                    </div>
                                    <div class="col-sm-2 col-md-2">
                                        æ˜¯å¦æ·»åŠ å¾®ä¿¡
                                        @if (Model.Shifoutianjiaweixin == "A")
                                        {
                                            <input id="Shifoutianjiaweixin" name="Shifoutianjiaweixin" type="radio" checked="checked" value="A" class="type_b">
                                        }
                                        else
                                        {
                                            <input id="Shifoutianjiaweixin" name="Shifoutianjiaweixin" type="radio" value="A" class="type_b">


                                        }
                                    </div>
                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">


 zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml

@@ -10,6 +10,8 @@
        var hyfls = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.hyfl))';
        var users = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.users))';
         var shengDropDown = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShengDropDown))';
        var shifou = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.shifou))';
        
        loseherght = 60;
        gridConfig = { multiselect: true, selectcol: "Id" };
        dataCol = [
@@ -21,7 +23,7 @@
                    return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/CooperatecustomCustomer/Edit?id=" + rowObject.Id + "')\"  >" + cellvalue + "</a>";
                }
            },
             
            { label: '联系电话', name: 'Tel', labtype: 'txt', hidden: false, width: 100 },
            { label: '所属区域', name: 'ShengName', labtype: 'txt', hidden: false, width: 100  },
            { label: '客户来源', name: 'KhlyName', labtype: 'txt', hidden: false, width: 100  },
            { label: '行业分类', name: 'HyflName', labtype: 'txt', hidden: false, width: 100 },
@@ -44,7 +46,7 @@
            { label: '区县', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2%', cccwidth: '8%' },
            { label: '客户单位', name: 'Name', labtype: 'txt', hidden: false },
            { label: '建档时间', name: 'Createtime', labtype: 'datearea', hidden: false },

            { label: '是否有微信', name: 'Shifouweixin', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },

        ];
        var _pageAdd = function () {

 zhengcaioa/zhengcaioa/Views/IntentionCustomer/Edit.cshtml

@@ -318,7 +318,22 @@
                                    <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>
                                    <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="Weixin" id="Weixin" labtype="txt" addvisible="true" editvisible="true" maxlength="50" reg="" ismust="true" type="text" value="@Model.Weixin">
                                    </div>
                                    <div class="col-sm-2 col-md-2">
                                        æ˜¯å¦æ·»åŠ å¾®ä¿¡
                                        @if (Model.Shifoutianjiaweixin == "A")
                                        {
                                            <input id="Shifoutianjiaweixin" name="Shifoutianjiaweixin" type="radio" checked="checked" value="A" class="type_b">
                                        }
                                        else
                                        {
                                            <input id="Shifoutianjiaweixin" name="Shifoutianjiaweixin" type="radio" value="A" class="type_b">

                                        }
                                    </div>


                                </div>

 zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml

@@ -10,6 +10,7 @@
        var users = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.users))';
        var shengDropDown = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShengDropDown))';
         var Creater = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Creater))';
         var shifou = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.shifou))';
        loseherght = 60;
        gridConfig = { multiselect: true, selectcol: "Id" };
        dataCol = [
@@ -49,6 +50,7 @@
            { label: '客户单位', name: 'Name', labtype: 'txt', hidden: false },
            { label: '建档时间', name: 'Createtime', labtype: 'datearea', hidden: false },
            { label: '录入人', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(Creater), cwidth: '5%', cccwidth: '8%' },
            { label: '是否有微信', name: 'Shifouweixin', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },




 zhengcaioa/zhengcaioa/Views/IntentionVisit/Index.cshtml

@@ -11,6 +11,8 @@
        var khlys = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.khly))';
        var hyfls = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.hyfl))';
        var users = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.users))';
        var creater = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.creater))';
        
         var shengDropDown = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShengDropDown))';
        loseherght = 60;
        gridConfig = { multiselect: true, selectcol: "Id" };
@@ -33,6 +35,7 @@
            { label: '客户反馈', name: 'Khfk', labtype: 'txt', hidden: false, width: 100 },
            { label: '成交意向', name: 'YxName', labtype: 'txt', hidden: false, width: 100 },
            { label: '跟踪建议', name: 'JyName', labtype: 'txt', hidden: false, width: 100 },
            { label: '录入人', name: 'CreaterName', labtype: 'txt', hidden: false, width: 100 },

        ];
        dataUrl = "/IntentionVisit/GetList?Viscustomer=@Viscustomer";
@@ -47,6 +50,8 @@
            { label: '区县', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2%', cccwidth: '8%' },
            { label: '客户单位', name: 'Name', labtype: 'txt', hidden: false },
            { label: '拜访时间', name: 'Vistime', labtype: 'datearea', hidden: false },
            { label: '录入人', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(creater), cwidth: '5%', cccwidth: '8%'}, 





 zhengcaioa/zhengcaioa/Views/Liaotian/Edit.cshtml

@@ -5,6 +5,20 @@
    List<SysCodeDtl> questiontype = ViewData["questiontype"] as List<SysCodeDtl>; //问题类型

    List<DTO.PageEntity> pageEntities = ViewData["pageEntities"] as List<DTO.PageEntity>; //问题类型
    var shenhesto = pageEntities.Where(x => x.PageName == "审核").FirstOrDefault();
    string shenhe = "";
    if (shenhesto != null)
    {
        shenhe = shenhesto.PageName;
    }
    var tijiaobingshenhesto = pageEntities.Where(x => x.PageName == "提交并审核").FirstOrDefault();
    string tijiaobingshenhe = "";
    if (tijiaobingshenhesto != null)
    {
        tijiaobingshenhe = tijiaobingshenhesto.PageName;
    }


}
<!DOCTYPE html>
<html>
@@ -178,6 +192,10 @@

        <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" id="tijiaobingshenhebtn" href="javascript:void(0)" onclick="tijiaobingshenhePosition();" 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="delPosition();" style="margin-left:4px; border-radius:4px;">
                    <i class="glyphicon glyphicon-remove"></i>&nbsp;&nbsp;<span class="bold">删除</span>
                </a>
@@ -210,15 +228,23 @@
        $("#div_content").height(hh);

        var id = '@Model.Id';
        var pageEntities = @pageEntities.Count;
        var shenhe = '@shenhe';
        var tijiaobingshenhe = '@tijiaobingshenhe';
        var Clientid = '@Model.Clientid';
        if (id == null || id == '') {
            $("#shenhebtn").hide();
        } else if (pageEntities <= 0 || Clientid == "A") {
        } else if (shenhe == "" || Clientid == "A") {
            $("#shenhebtn").hide();
        } else {
            $("#shenhebtn").show();
        }

        if (tijiaobingshenhe == "") {
            $("#tijiaobingshenhebtn").hide();
        } else {
            $("#tijiaobingshenhebtn").show();
        }

        toastr.options = {
            "closeButton": true,
            "debug": false,
@@ -375,6 +401,63 @@



        // ä¿å­˜å²—位信息
        var tijiaobingshenhePosition = function () {
            if (Verify.isNull($("#Questiontype").val())) {
                toastr.warning("问题类别不能为空");
                return;
            }
            if (Verify.isNull($("#Problemtype").val())) {
                toastr.warning("题目类别不能为空");
                return;
            }
            if (Verify.isNull($("#Question").val())) {
                toastr.warning("问题不能为空");
                return;
            }

            if (Verify.isNull($("#Anwser").val())) {
                toastr.warning("答案不能为空");
                return;
            }

            imgLoad = parent.layer.load(2, { shade: [0.2, '#fff'] });
            $.ajax({
                type: "POST",
                url: "/Liaotian/Tijiaobingshenhe",
                dataType: "json",
                global: false,
                data: { Id: id, Question: $("#Question").val(), Anwser: $("#Anwser").val(), Questiontype: $("#Questiontype").val(), Problemtype: $("#Problemtype").val(), Shiyongfatiao: $("#Shiyongfatiao").val() },
                success: function (data) {


                    if (data.Result) {
                        //  parent._afterSave(true);
                        parent.layer.msg('保存成功', { icon: 6 });
                        _pageAutoClose();//自动关闭页面方法
                    }
                    else {
                        if ($.isNumber(imgLoad)) {
                            parent.layer.close(imgLoad);
                        }
                        // toastr.error("");
                        parent.layer.msg(data.Message, { icon: 5 });
                    }

                },
                error: function () {
                    if ($.isNumber(imgLoad)) {
                        parent.layer.close(imgLoad);
                    }
                    //toastr.error("保存失败");

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


        
       

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

 zhengcaioa/zhengcaioa/Views/Liaotian/Indexcheck.cshtml

@@ -175,7 +175,29 @@
        }


       


        function sendHuidaStatus() {

            var msg = $("#PBSShifoushenhe");


            if (msg.length > 0) {
                $("#PBSShifoushenhe").val("D");
                $("#PBSShifoushenhe").trigger('chosen:updated');//更新选项
                _pageSearch();
            } else {
                setTimeout(sendHuidaStatus, 1000);
            }
        }

        send();
        sendHuidaStatus();
       


        


 

 zhengcaioa/zhengcaioa/Views/Project/Add.cshtml

@@ -476,12 +476,24 @@
                                    <div class="col-sm-3 col-md-3">
                                        <input id="Caigourenname" class="form-control" label="采购人名称" name="Caigourenname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Caigourenname">
                                    </div>
                                    <div class="col-sm-1 col-md-1" style="width:100px;">
                                        @if (Model.Caigourennamecunzai != null && Model.Caigourennamecunzai == "yes")
                                        {
                                            <button type="button" data-type="1">添加供应商</button>
                                        }
                                        else
                                        {
                                            <button type="button" onclick="_pageAdd('@Model.Caigourenname')" data-type="1" style="color:red;">添加供应商</button>
                                        }


                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">地址</label>
                                    <div class="col-sm-3 col-md-3">
                                        <input id="Caigourenaddress" class="form-control" label="地址" name="Caigourenaddress" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Caigourenaddress">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">联系方式</label>
                                    <div class="col-sm-3 col-md-3">
                                    <div class="col-sm-2 col-md-2">
                                        <input id="Caigourencontact" class="form-control" label="联系方式" name="Caigourencontact" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Caigourencontact">
                                    </div>
                                </div>
@@ -491,12 +503,24 @@
                                    <div class="col-sm-3 col-md-3">
                                        <input id="Dailiname" class="form-control" label="采购人名称" name="Dailiname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Dailiname">
                                    </div>
                                    <div class="col-sm-1 col-md-1" style="width:100px;">
                                        @if (Model.Dailinamecunzai != null && Model.Dailinamecunzai == "yes")
                                        {
                                            <button type="button" data-type="1">添加供应商</button>
                                        }
                                        else
                                        {
                                            <button type="button" onclick="_pageAdd('@Model.Dailiname')" data-type="1" style="color:red;">添加供应商</button>
                                        }


                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">地址</label>
                                    <div class="col-sm-3 col-md-3">
                                        <input id="Dailiaddress" class="form-control" label="地址" name="Dailiaddress" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Dailiaddress">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">联系方式</label>
                                    <div class="col-sm-3 col-md-3">
                                    <div class="col-sm-2 col-md-2">
                                        <input id="Dailicontact" class="form-control" label="联系方式" name="Dailicontact" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Dailicontact">
                                    </div>
                                </div>

 zhengcaioa/zhengcaioa/Views/Project/Select.cshtml

@@ -11,7 +11,7 @@
        var ShiFouyReasonname = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShiFouyReasonname))';
        

        loseherght = 70;
        loseherght = 90;
        dataCol = [
            { label: 'id', name: 'Id', labtype: 'txt', hidden: true },

@@ -88,12 +88,16 @@
            //{ label: '公告时间', name: 'StartTimestar', labtype: 'date', hidden: false },
            //{ label: '--', name: 'StartTimeend', labtype: 'date', hidden: false, cwidth: '1%', cccwidth: '15%' },
            { label: '公告时间', name: 'StartTimestar', labtype: 'datearea', hidden: false },
            { label: '项目编号', name: 'Number', labtype: 'txt', hidden: false },
            { label: '省', name: 'Sheng', labtype: 'combox', hidden: false, data: JSON.parse(shengDropDown), cwidth: '2%', cccwidth: '6%' },
            { label: '', name: 'City', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '0%', cccwidth: '6%' },
            { label: '', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '0%', cccwidth: '6%' },
            //{ label: '项目编号', name: 'Number', labtype: 'txt', hidden: false },
            { label: '项目名称', name: 'Name', labtype: 'txt', hidden: false },
            { label: '评审专家', name: 'Zhuanjia', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */},
            { label: '省', name: 'Sheng', labtype: 'combox', hidden: false, data: JSON.parse(shengDropDown), cwidth: '5%', cccwidth: '10%' },
            { label: '市', name: 'City', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2%', cccwidth: '10%' },
            { label: '区县', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2.5%', cccwidth: '10%' },

            { label: '采购代理人', name: 'Caigourenname', labtype: 'txt', hidden: false },
            { label: '采购代理机构', name: 'Dailiname', labtype: 'txt', hidden: false },
          
            { label: '采购方式', name: 'Cgfs', labtype: 'combox', hidden: false, data: JSON.parse(projectDropDown) },
            { label: '是否废标', name: 'fblx', labtype: 'combox', hidden: false, data: JSON.parse(flbx)/*, cwidth: '5%', cccwidth: '8%' */ },
            { label: '中标供应商', name: 'Names', labtype: 'txt', hidden: false },
@@ -105,7 +109,7 @@
            { label: '录入人', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(Creater)/*, cwidth: '5%', cccwidth: '8%'*/ },
            
            { label: '分差小于', name: 'Fencha', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
            
            { label: '供应商数量', name: 'Shuliang', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },

        ];
        var _pageAdd = function () {
@@ -230,13 +234,13 @@
      

        $(function () {


            $("#PBSfblx").parent().prev().prev().remove();
            $("#PBSAreaId").parent().next().remove();
            $("#PBSZhuanjia").parent().after("<br>");
            $("#PBSDailiname").parent().next().remove();
            $("#PBSfblx").parent().after("<br>");
            $("#PBSShiFouyReasonname").parent().next().remove();
            $("#PBSNamesToubiao").parent().next().remove();
            $("#PBSReasonname").parent().after("<br>");
            $("#PBSFencha").parent().next().remove();
            $("#PBSCreater").parent().next().remove();
            
        }); 
        

 zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml

@@ -3,6 +3,13 @@
@using zhengcaioa.Models;
@{
    Layout = null;

    //流程相关
    string shifoubiaoji = ViewBag.shifoubiaoji as string;
    string sifoudangqian = ViewBag.sifoudangqian as string;
    string dangqianbuzhou = ViewBag.dangqianbuzhou as string;

    List<WfHistoryDTO> lishiyijian = ViewData["lishiyijian"] as List<WfHistoryDTO>; //历史意见
}

<!DOCTYPE html>
@@ -57,8 +64,31 @@
                        <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>
                                    <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">
                                        <input type="text" class="form-control" value="@Model.tittle" name="tittle" id="tittle"   validate="RequiredField" autocomplete="off" readonly="readonly">

                                    </div>
                                </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-2 col-md-2">
                                        <input type="text" class="form-control" value="@Model.createrName" name="createrName" id="createrName"   validate="RequiredField" autocomplete="off" readonly="readonly">

                                    </div>
                                </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-2 col-md-2">
                                        <input class="form-control" id="YearMonth" name="YearMonth" type="text" value="@Model.Year-@Model.Month" readonly="readonly">
                                        <input type="hidden" name="Year" value="@Model.Year" />
                                        <input type="hidden" name="Month" value="@Model.Month" />
                                    </div>
                                </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">
                                        <textarea class="form-control bt" id="ssly" name="reason"  maxlength="4000" length="long" style="resize:none;overflow-y:hidden; height:80px;">@Model.reason</textarea>
                                    </div>
                                </div>
@@ -70,10 +100,47 @@
                                </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-2 col-md-2">
                                    <div class="col-sm-6 col-md-6">
                                        <input type="hidden" name="salary_id" value="@Model.salary_id" />
                                        <input class="form-control" id="zdyj" name="basis" labtype="txt" addvisible="true" editvisible="true" type="text" value="@Model.basis">
                                    </div>
                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;" id="shenpiyijian" >
                                    <label class="text-right col-sm-1 col-md-1 control-label">审批意见</label>
                                    <div class="col-sm-6 col-md-6">
                                        <textarea class="form-control data" id="Content" name="Content"  style="resize:none;overflow-y:hidden; height:80px;" maxlength="500"></textarea>
                                    </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">
                                        <table>
                                            @if (lishiyijian.Count > 0)
                                            {
                                            <tr>
                                                <td style="border:1px solid #ccc;width:150px;">步骤 </td>
                                                <td style="border:1px solid #ccc;width:150px;"> æ‰¹å¤çŠ¶æ€</td>
                                                <td style="border:1px solid #ccc;width:150px;">批复时间</td>
                                                <td style="border:1px solid #ccc;width:300px;"> å®¡æ‰¹æ„è§</td>
                                                <td style="border:1px solid #ccc;width:100px;"> æ‰¹å¤äºº</td>
                                            </tr>
                                            }
                                            
                                            @foreach (var wfHistory in lishiyijian)
                                            {
                                                <tr>
                                                    <td style="border:1px solid #ccc;width:150px;">@wfHistory.Step</td>
                                                    <td style="border:1px solid #ccc;width:150px;">@wfHistory.ChuliStatusName</td>
                                                    <td style="border:1px solid #ccc;width:150px;">@wfHistory.ModifytimeName</td>
                                                    <td style="border:1px solid #ccc;width:300px;">@wfHistory.Content</td>
                                                    <td style="border:1px solid #ccc;width:100px;">@wfHistory.DeelUserIdName</td>
                                                </tr>
                                            }
                                        </table>  
                                    </div>
                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:60px;">

                                </div>
                            </div>
                        </div>
@@ -86,9 +153,20 @@
                <a class="btn btn-success" href="javascript:void(0)" onclick="_pageAutoClose();" 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="saveSimCost();" style="margin-left:4px; border-radius:4px;">
                <a class="btn btn-success" id="tijiao" href="javascript:void(0)" onclick="saveSimCost('');" 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" id="tongyi" href="javascript:void(0)" onclick="saveSimCost('A');" style="margin-left:4px; border-radius:4px;">
                    <span class="bold">同意</span>
                </a>

                <a class="btn btn-success" id="jujue" href="javascript:void(0)" onclick="saveSimCost('D');" style="margin-left:4px; border-radius:4px;">
                    <span class="bold">拒绝</span>
                </a>
                <input type="hidden" id="id" name="id" value="@Model.id" />
                <input type="hidden" id="Tongguojujue" name="Tongguojujue" value="" />
                <input type="hidden" id="Step" name="Step" value="@dangqianbuzhou" />
            </div>
        </div>

@@ -115,8 +193,63 @@
            "hideMethod": "fadeOut"
        };


        $(function () {

        



             if ("@shifoubiaoji" != "A") {
                $("input").attr('readonly', true);
                $("textarea").attr('readonly', true);
                $(':radio').attr('disabled', true);
                $(':checkbox').attr('disabled', true);
                $(':button').attr('disabled', true);
                //$('a').removeAttr('onclick');
                 $('select').attr('disabled', true);
                 $("#fileUp").attr('disabled', true);

                 $('.fujianshanchu').removeAttr('onclick');


                 if ("@sifoudangqian" == "A") {
                     $("#Content").attr('readonly', false);
                      $('#tijiao').hide();
                 } else {
                     $('#tongyi').hide();
                      $('#jujue').hide();
                     $('#tijiao').hide();
                     $('#shenpiyijian').hide();
                 }

            } else {


                  //审批相关
                 $('#shenpiyijian').hide();
                 if ("@sifoudangqian" == "A") {
                     $('#tongyi').hide();
                     $('#jujue').hide();
                 } else {
                     $('#tongyi').hide();
                      $('#jujue').hide();
                      $('#tijiao').hide();
                 }

 
            }

        })


        // ä¿å­˜
        function saveSimCost() {
        function saveSimCost(tongyi) {
            if ($("#salary_id").val() == '') {
                toastr.warning("必须和工资挂钩");
                return;
            }


            if ($("#ssly").val() == '') {
                toastr.warning("申诉理由不能为空");
@@ -130,6 +263,7 @@
                toastr.warning("制度依据不能为空");
                return;
            }
            $("#Tongguojujue").val(tongyi);
           
            $.ajax({
                type: "POST",
@@ -145,7 +279,9 @@
                                _pageAutoClose();//自动关闭页面方法
                            }
                            catch (err) {
                                parent._CloseTab1("/SalaryCheck/Appeal/");
                                var pathname = window.location.pathname;
                                var search = window.location.search;
                                parent._CloseTab1(pathname + search);
                            }
                        }
                        else {

 zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml

@@ -90,7 +90,7 @@
                            <div class="clearfix layer-area" style="padding-bottom:15px;">
                                <label class="text-right col-sm-3 col-md-3 control-label">纠错</label>
                                <div class="col-sm-9 col-md-9">
                                    <input class="form-control" id="Jiucuo" name="Jiucuo" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jiucuo" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                    <input class="form-control" id="Jiucuo" name="Jiucuo" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jiucuo" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="CheckNum(this);">
                                </div>
                            </div>

@@ -226,6 +226,18 @@
            parent.layer.close(index);
            return false;
        }

       //用户只能输入正负数与小数
        function CheckNum(obj) {
           
                if (isNaN(obj.value) && !/^-$/.test(obj.value)) {
                    obj.value = "";
                }
                if (!/^[+-]?\d*\.{0,1}\d{0,1}$/.test(obj.value)) {
                    obj.value = obj.value.replace(/\.\d{2,}$/, obj.value.substr(obj.value.indexOf('.'), 3));
                }
           
        }
    </script>
</body>
</html>

 zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml

@@ -196,7 +196,7 @@
                    toastr.error("错误提示：此月份已完成确认,不能申诉！");
                }
                else {
                    OpenWindow('申诉', '40%', '50%', '/SalaryCheck/Appeal?id=' + dt);
                    OpenWindow('申诉', '80%', '80%', '/SalaryCheck/Appeal?salaryId=' + dt);
                }
            }
            else {

 zhengcaioa/zhengcaioa/Views/ServiceCharge/Edit.cshtml

@@ -217,14 +217,14 @@
                return;
            }

            if ($.trim($("#Chubanshe").val()) == '') {
                toastr.warning("出版社不能为空");
                return;
            }
            if ($.trim($("#Chubantime").val()) == '') {
                toastr.warning("出版时间不能为空");
                return;
            }
            //if ($.trim($("#Chubanshe").val()) == '') {
            //    toastr.warning("出版社不能为空");
            //    return;
            //}
            //if ($.trim($("#Chubantime").val()) == '') {
            //    toastr.warning("出版时间不能为空");
            //    return;
            //}
            if ($.trim($("#Danjia").val()) == '') {
                toastr.warning("单价不能为空");
                return;

 zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml

@@ -184,7 +184,7 @@
                                                <th style="width:15%;">
                                                    è´§å·
                                                </th>
                                                <th style="width:15%;">
                                                <th style="width:20%;">
                                                    ä¹¦å
                                                </th>
                                                <th style="width:15%;">
@@ -213,7 +213,10 @@
                                                    <td>@Book[i].BookNo</td>
                                                    <td>@Book[i].BookName</td>
                                                    <td>@Book[i].Chubanshe</td>
                                                    <td>@Book[i].Chubantime.Value.ToString("yyyy-MM-dd")</td>
                                                                                           
                                                                                            <td>@Book[i].ChubantimeName </td>
                                                                                           

                                                    <td>@Book[i].Danjia.Value.ToString("F2")</td>
                                                    <td>
                                                        <a href="javascript:void(0)" onclick="OpenWindow('@Book[i].BookName','98%','100%', '/ServiceCharge/Edit?id=@Book[i].Id');" style="margin-left:4px; border-radius:4px;">
@@ -300,7 +303,7 @@

                                <div class="clearfix layer-area" style="padding-bottom:15px;">

                                    <label class="text-left col-sm-1 col-md-1 control-label">4、指导投标文件：</label>
                                    <label class="text-left col-sm-1 col-md-1 control-label">4、标书指导：</label>

                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -341,7 +344,7 @@
                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">

                                    <label class="text-left col-sm-1 col-md-1 control-label">5、代书质疑：</label>
                                    <label class="text-left col-sm-1 col-md-1 control-label">5、代拟质疑函：</label>

                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -382,7 +385,7 @@
                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">

                                    <label class="text-left col-sm-1 col-md-1 control-label">6、代书投诉：</label>
                                    <label class="text-left col-sm-1 col-md-1 control-label">6、代拟投诉书：</label>

                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -431,17 +434,17 @@
                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">

                                    <label class="text-left col-sm-1 col-md-1 control-label">8、代拟投诉处理决定：</label>
                                    <label class="text-left col-sm-1 col-md-1 control-label" style="width:10%;">8、代拟投诉处理决定：</label>
                                    <div class="col-sm-2 col-md-2">
                                        <input class="form-control" label="8、竞争对手和评审专家查询：" name="Dainitousuchulijueding" id="Dainitousuchulijueding" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Dainitousuchulijueding" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                        <input class="form-control" label="8、代拟投诉处理决定：" name="Dainitousuchulijueding" id="Dainitousuchulijueding" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Dainitousuchulijueding" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                    </div>
                                    <label class="text-left col-sm-1 col-md-1 control-label">元</label>
                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">

                                    <label class="text-left col-sm-1 col-md-1 control-label">9、竞争对手和评审专家查询：</label>
                                    <label class="text-left col-sm-1 col-md-1 control-label" style="width:20%;">9、竞争对手和评审专家参加政府采购数据信息查询：</label>
                                    <div class="col-sm-2 col-md-2">
                                        <input class="form-control" label="9、竞争对手和评审专家查询：" name="Jinzhengfuishou" id="Jinzhengfuishou" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jinzhengfuishou" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                        <input class="form-control" label="9、竞争对手和评审专家参加政府采购数据信息查询：" name="Jinzhengfuishou" id="Jinzhengfuishou" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jinzhengfuishou" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                    </div>
                                    <label class="text-left col-sm-1 col-md-1 control-label">元/å¹´</label>
                                </div>

 zhengcaioa/zhengcaioa/Views/ServiceCharge/Print.cshtml

@@ -233,7 +233,7 @@
                                                            <td>@Book[i].BookNo</td>
                                                            <td>@Book[i].BookName</td>
                                                            <td>@Book[i].Chubanshe</td>
                                                            <td>@Book[i].Chubantime.Value.ToString("yyyy-MM-dd")</td>
                                                            <td>@Book[i].ChubantimeName</td>
                                                            <td>@Book[i].Danjia.Value.ToString("F2")</td>
                                                            
                                                        </tr>
@@ -306,7 +306,7 @@

                                <div class="clearfix layer-area" style="padding-bottom:15px;">

                                    <label class="text-left col-sm-1 col-md-1 control-label">4、指导投标文件：</label>
                                    <label class="text-left col-sm-1 col-md-1 control-label">4、标书指导：</label>

                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -347,7 +347,7 @@
                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">

                                    <label class="text-left col-sm-1 col-md-1 control-label">5、代书质疑：</label>
                                    <label class="text-left col-sm-1 col-md-1 control-label">5、代拟质疑函：</label>

                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -388,7 +388,7 @@
                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">

                                    <label class="text-left col-sm-1 col-md-1 control-label">6、代书投诉：</label>
                                    <label class="text-left col-sm-1 col-md-1 control-label">6、代拟投诉书：</label>

                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -439,7 +439,7 @@
                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">

                                     9、竞争对手和评审专家查询： @Model.Jinzhengfuishou å…ƒ/å¹´ 
                                    9、竞争对手和评审专家参加政府采购数据信息查询： @Model.Jinzhengfuishou å…ƒ/å¹´
                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">


 zhengcaioa/zhengcaioa/Views/Signin/AskLeave.cshtml

@@ -173,11 +173,21 @@
                </tr>
                <tr>
                    <td colspan="10">  <table>
    @if (lishiyijian.Count > 0)
    {
        <tr>
            <td style="border:1px solid #ccc;width:150px;">步骤 </td>
            <td style="border:1px solid #ccc;width:150px;"> æ‰¹å¤çŠ¶æ€</td>
            <td style="border:1px solid #ccc;width:150px;">批复时间</td>
            <td style="border:1px solid #ccc;width:300px;"> å®¡æ‰¹æ„è§</td>
            <td style="border:1px solid #ccc;width:100px;"> æ‰¹å¤äºº</td>
        </tr>
    }
    @foreach (var wfHistory in lishiyijian)
    {
                                           <tr>
                                               <td style="border:1px solid #ccc;width:150px;">@wfHistory.Step</td>
                                               <td style="border:1px solid #ccc;width:50px;">@wfHistory.ChuliStatusName</td>
            <td style="border:1px solid #ccc;width:150px;">@wfHistory.ChuliStatusName</td>
                                               <td style="border:1px solid #ccc;width:150px;">@wfHistory.ModifytimeName</td>
                                               <td style="border:1px solid #ccc;width:300px;">@wfHistory.Content</td>
                                               <td style="border:1px solid #ccc;width:100px;">@wfHistory.DeelUserIdName</td>

 zhengcaioa/zhengcaioa/Views/Signin/AskLeaveOff.cshtml

@@ -204,11 +204,21 @@
                <tr>
                    <td colspan="10">
                        <table>
                            @if (lishiyijian.Count > 0)
                            {
                                <tr>
                                    <td style="border:1px solid #ccc;width:150px;">步骤 </td>
                                    <td style="border:1px solid #ccc;width:150px;"> æ‰¹å¤çŠ¶æ€</td>
                                    <td style="border:1px solid #ccc;width:150px;">批复时间</td>
                                    <td style="border:1px solid #ccc;width:300px;"> å®¡æ‰¹æ„è§</td>
                                    <td style="border:1px solid #ccc;width:100px;"> æ‰¹å¤äºº</td>
                                </tr>
                            }
                            @foreach (var wfHistory in lishiyijian)
                            {
                                <tr>
                                    <td style="border:1px solid #ccc;width:150px;">@wfHistory.Step</td>
                                    <td style="border:1px solid #ccc;width:50px;">@wfHistory.ChuliStatusName</td>
                                    <td style="border:1px solid #ccc;width:150px;">@wfHistory.ChuliStatusName</td>
                                    <td style="border:1px solid #ccc;width:150px;">@wfHistory.ModifytimeName</td>
                                    <td style="border:1px solid #ccc;width:300px;">@wfHistory.Content</td>
                                    <td style="border:1px solid #ccc;width:100px;">@wfHistory.DeelUserIdName</td>

 zhengcaioa/zhengcaioa/Views/User/Edit.cshtml

@@ -447,7 +447,7 @@
                                    </div>
                                   

                                    <label class="text-right col-sm-1 col-md-1 control-label">工作电脑MAC<i class="red">*</i> </label>
                                    <label class="text-right col-sm-1 col-md-1 control-label">工作电脑MAC</label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="IpMac" class="form-control" label="工作电脑MAC" name="IpMac" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@Model.IpMac">
                                    </div>
@@ -946,10 +946,10 @@
                return;
            }

            if ($.trim($("#IpMac").val()) == '') {
                toastr.warning("工作电脑MAC不能为空");
                return;
            }
            //if ($.trim($("#IpMac").val()) == '') {
            //    toastr.warning("工作电脑MAC不能为空");
            //    return;
            //}

            $.ajax({
                type: "POST",

 ±íÐÞ¸Ä.sql

@@ -1,3 +1,323 @@
USE [zhengcaioa]
GO

/****** Object:  Table [dbo].[fi_member]    Script Date: 2021/7/5 14:33:24 ******/
SET ANSI_NULLS ON
GO

SET QUOTED_IDENTIFIER ON
GO
IF EXISTS(Select 1 From Sysobjects Where Name='fi_member')  --查询表名costSeparateConfig是否存在  
drop table  [fi_member] 
GO
CREATE TABLE [dbo].[fi_member](
    [Id] [nvarchar](50) NOT NULL,
    [member_type] [nvarchar](50) NULL,
    [member_authority] [nvarchar](500) NULL,
    [huifei] [money] NULL,
    [rec_status] [nvarchar](1) NOT NULL,
    [creater] [nvarchar](50) NOT NULL,
    [createtime] [datetime] NOT NULL,
    [modifier] [nvarchar](50) NOT NULL,
    [modifytime] [datetime] NOT NULL,
 CONSTRAINT [PK_fi_member] PRIMARY KEY CLUSTERED 
(
    [Id] ASC
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY]
GO

ALTER TABLE [dbo].[fi_member] ADD  CONSTRAINT [DF_fi_member_rec_status]  DEFAULT ('A') FOR [rec_status]
GO

ALTER TABLE [dbo].[fi_member] ADD  CONSTRAINT [DF_fi_member_creater]  DEFAULT ('1') FOR [creater]
GO

ALTER TABLE [dbo].[fi_member] ADD  CONSTRAINT [DF_fi_member_createtime]  DEFAULT (getdate()) FOR [createtime]
GO

ALTER TABLE [dbo].[fi_member] ADD  CONSTRAINT [DF_fi_member_modifier]  DEFAULT ('1') FOR [modifier]
GO

ALTER TABLE [dbo].[fi_member] ADD  CONSTRAINT [DF_fi_member_modifytime]  DEFAULT (getdate()) FOR [modifytime]
GO

EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会员类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'fi_member', @level2type=N'COLUMN',@level2name=N'member_type'
GO

EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会员权限' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'fi_member', @level2type=N'COLUMN',@level2name=N'member_authority'
GO

EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会费' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'fi_member', @level2type=N'COLUMN',@level2name=N'huifei'
GO





ALTER TABLE [dbo].[CooperatecustomCustomer] ADD [weixin] [nvarchar](50) NULL;
GO


ALTER TABLE [dbo].[CooperatecustomCustomer] ADD [shifoutianjiaweixin] [nvarchar](1)   NULL;
GO


update  [CooperatecustomCustomer] set [shifoutianjiaweixin]='D'

GO




ALTER TABLE [dbo].[IntentionCustomer] ADD [weixin] [nvarchar](50) NULL;
GO


ALTER TABLE [dbo].[IntentionCustomer] ADD [shifoutianjiaweixin] [nvarchar](1)   NULL;
GO


update  [IntentionCustomer] set [shifoutianjiaweixin]='D'

GO




USE [zhengcaioa]
GO
delete from  [dbo].[fi_books]
GO
INSERT [dbo].[fi_books] ([Id], [book_no], [book_name], [chubanshe], [chubantime], [danjia], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'b7b78ceb-d3d5-484a-bfd3-12118ce7d8ac', N'1001', N'《四川省政府采购政策文件汇编》', NULL, NULL, 98.0000, N'A', N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:02:12.253' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:20:26.563' AS DateTime))
INSERT [dbo].[fi_books] ([Id], [book_no], [book_name], [chubanshe], [chubantime], [danjia], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'b7b78ceb-d3d5-484a-bfd3-12118ce7d8ad', N'2001', N'《3天学会政府采购》', NULL, NULL, 49.0000, N'A', N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:02:12.253' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:20:32.160' AS DateTime))
INSERT [dbo].[fi_books] ([Id], [book_no], [book_name], [chubanshe], [chubantime], [danjia], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'b7b78ceb-d3d5-484a-bfd3-12118ce7d8ae', N'2002', N'《2022年政府采购100大典型投诉案例 ã€‹', NULL, NULL, 88.0000, N'A', N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:02:12.253' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:20:34.183' AS DateTime))
GO
delete from  [dbo].[fi_member]
INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'0d513d92-41fd-e33f-a55f-47780e03d26d', N'AA1会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、标书制作3件、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 ã€‹ï¼‰ã€å…¶ä»–业务8折', 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:46:10.103' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.730' AS DateTime))
INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'1dcfd55f-b172-855e-bcad-a83869d200b1', N'AAA2会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、质疑投诉6件、履约纠纷5件、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 ã€‹ï¼‰ã€å…¶ä»–业务6折', 50000.0000, N'A', N'1', CAST(N'2021-05-28T10:46:29.513' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.737' AS DateTime))
INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'2ab09dee-6244-e410-fcc9-36dd6152851c', N'AA2会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、标书制作5件、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 ã€‹ï¼‰ã€å…¶ä»–业务8折', 20000.0000, N'A', N'1', CAST(N'2021-05-28T10:46:13.670' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.730' AS DateTime))
INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'34166043-a10f-7767-9b6c-5774dfa39c43', N'普通会员1', N'小采问答', 98.0000, N'A', N'1', CAST(N'2021-05-28T10:45:20.293' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.653' AS DateTime))
INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'34166043-a10f-7767-9b6c-5774dfa39c44', N'普通会员2', N'政采课堂', 398.0000, N'A', N'1', CAST(N'2021-05-28T10:45:20.297' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.723' AS DateTime))
INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'34166043-a10f-7767-9b6c-5774dfa39c45', N'普通会员3', N'小采问答、政采课堂', 498.0000, N'A', N'1', CAST(N'2021-05-28T10:45:20.300' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.727' AS DateTime))
INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'34166043-a10f-7767-9b6c-5774dfa39c46', N'普通会员4', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 ã€‹ï¼‰', 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:45:20.400' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.727' AS DateTime))
INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'c9c8068f-7630-e5ee-eebc-71e6e63cdfab', N'A1会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、标书制作1件、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 ã€‹ï¼‰', 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:45:56.243' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.727' AS DateTime))
INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'd0e3abf0-8f22-5291-d605-c95cbb7ed53c', N'AA4会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、标书制作10个项目、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 ã€‹ï¼‰ã€å…¶ä»–业务8折', 30000.0000, N'A', N'1', CAST(N'2021-05-28T10:46:20.487' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.733' AS DateTime))
INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'e7238216-3448-83d9-798c-ba71a3da6424', N'AA3会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、质疑投诉5件、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 ã€‹ï¼‰ã€å…¶ä»–业务8折', 30000.0000, N'A', N'1', CAST(N'2021-05-28T10:46:16.823' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.733' AS DateTime))
INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'eeb9c016-e265-aa9d-e56f-498387f7a7fe', N'AAA1会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、标书制作10个项目、质疑投诉5件、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 ã€‹ï¼‰ã€å…¶ä»–业务6折', 50000.0000, N'A', N'1', CAST(N'2021-05-28T10:46:25.980' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.733' AS DateTime))
INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'fab8d7f7-f807-9d10-8d99-0f8f16dce2d1', N'A2会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、质疑投诉1件、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 ã€‹ï¼‰', 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:46:06.653' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.730' AS DateTime))
GO
delete from  [dbo].[fi_service]
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'01204ed4-c825-2f6e-d19a-870683c12e56', N'标书指导', N'200-500万元', 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:54.090' AS DateTime), N'1', CAST(N'2021-05-28T10:52:54.090' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'0bbc9d36-3827-29b2-bbc2-96a1dce615e9', N'竞争对手和评审专家参加政府采购数据信息查询', NULL, 20000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:20.923' AS DateTime), N'1', CAST(N'2021-05-28T10:54:20.923' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'0c9559cc-2feb-4f01-4446-91568194538d', N'不具备条件', NULL, 50000.0000, N'A', N'1', CAST(N'2021-05-28T11:06:15.643' AS DateTime), N'1', CAST(N'2021-05-28T11:06:15.643' AS DateTime), N'06')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'1565b317-e3e7-65eb-abbb-0607b1f2d28e', N'标书指导', N'30-200万元', 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:51.117' AS DateTime), N'1', CAST(N'2021-05-28T10:52:51.117' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'1650e01e-dace-5036-5395-a56ef7c3a3a7', N'自动标书制作软件', NULL, 20000.0000, N'A', N'1', CAST(N'2021-05-28T11:08:08.043' AS DateTime), N'1', CAST(N'2021-05-28T11:08:08.043' AS DateTime), N'09')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'17471db7-f6b8-5448-9917-495e1306f77d', N'代拟投诉书', N'30万元以下', 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:53:09.620' AS DateTime), N'1', CAST(N'2021-05-28T10:53:09.620' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'1913662b-acfc-5a82-2bcc-782139e90908', N'需求论证', N'500-1000万元', 8000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:40.247' AS DateTime), N'1', CAST(N'2021-05-28T10:52:40.247' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'1a7fbc0e-89da-88f5-6bbe-a19a6f0eeaa1', N'投标信息管理系统', NULL, 50000.0000, N'A', N'1', CAST(N'2021-05-28T11:08:11.290' AS DateTime), N'1', CAST(N'2021-05-28T11:08:11.290' AS DateTime), N'09')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'1ebde632-88d2-039e-7325-2062c122da67', N'履约纠纷', N'1000万元以上', 100000.0000, N'A', N'1', CAST(N'2021-05-28T11:07:01.997' AS DateTime), N'1', CAST(N'2021-05-28T11:07:01.997' AS DateTime), N'07')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'24d25b49-de97-8f9f-81d4-decdcf30bdb7', N'代拟质疑函', N'200-500万元', 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:53:04.540' AS DateTime), N'1', CAST(N'2021-05-28T10:53:04.540' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'2872e063-a4c3-4c83-2c92-a94e7f333bb4', N'线下讲座', NULL, 998.0000, N'A', N'1', CAST(N'2021-05-28T10:54:38.953' AS DateTime), N'1', CAST(N'2021-05-28T10:54:38.953' AS DateTime), N'04')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'396c50c4-fd7a-66de-c0e9-b50020fc9e8f', N'代拟投诉书', N'500万元以上', 30000.0000, N'A', N'1', CAST(N'2021-05-28T10:53:17.717' AS DateTime), N'1', CAST(N'2021-05-28T10:53:17.717' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'3d892e90-d52b-3d6d-9910-9f0c3b5dfe8a', N'标书指导', N'30万元以下', 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:48.263' AS DateTime), N'1', CAST(N'2021-05-28T10:52:48.263' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'48694773-2045-43cc-7340-dcc8fca74ab6', N'标书制作', N'30万元以下', 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:26.083' AS DateTime), N'1', CAST(N'2021-05-28T10:54:26.083' AS DateTime), N'03')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'4dbac1ab-d980-40a1-8035-b08e386a2f77', N'代拟质疑答复', NULL, 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:14.410' AS DateTime), N'1', CAST(N'2021-05-28T10:54:14.410' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'521aaa43-f2e6-4113-7d50-73695e80768f', N'需求论证', N'200-500万元', 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:30.837' AS DateTime), N'1', CAST(N'2021-05-28T10:52:30.837' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'56c7a576-26cc-3a1b-4ed7-6832e001ffa9', N'标书指导', N'500万元以上', 20000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:56.680' AS DateTime), N'1', CAST(N'2021-05-28T10:52:56.680' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'600688d7-24c4-4ff8-5bc9-b86c17ad4c0b', N'代拟投诉处理决定', NULL, 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:18.210' AS DateTime), N'1', CAST(N'2021-05-28T10:54:18.210' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'606fb37a-9db2-26c8-b0fa-b1e8ebdb3c08', N'履约纠纷', N'30-200万元', 20000.0000, N'A', N'1', CAST(N'2021-05-28T11:06:21.513' AS DateTime), N'1', CAST(N'2021-05-28T11:06:21.513' AS DateTime), N'07')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'7034105f-9a0e-c122-4106-2608272f132e', N'履约纠纷', N'30万元以下', 10000.0000, N'A', N'1', CAST(N'2021-05-28T11:06:18.257' AS DateTime), N'1', CAST(N'2021-05-28T11:06:18.257' AS DateTime), N'07')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'772c660a-3f45-0977-1720-1f3598a029d0', N'标书制作', N'200-500万元', 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:30.943' AS DateTime), N'1', CAST(N'2021-05-28T10:54:30.943' AS DateTime), N'03')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'7be6965b-e08a-6e01-9409-14592b06354b', N'采购人培训', NULL, 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:44.113' AS DateTime), N'1', CAST(N'2021-05-28T10:54:44.113' AS DateTime), N'04')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'7fa99d1a-995f-7b49-6127-2ebeef823104', N'政采贷', NULL, 1.0000, N'A', N'1', CAST(N'2021-05-28T10:54:23.563' AS DateTime), N'1', CAST(N'2021-05-28T10:54:23.563' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'81839b9a-4c55-5fcd-426a-4e9535509af0', N'履约纠纷', N'500-1000万元', 50000.0000, N'A', N'1', CAST(N'2021-05-28T11:06:35.410' AS DateTime), N'1', CAST(N'2021-05-28T11:06:35.410' AS DateTime), N'07')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'9337f9e5-ab86-2be9-72d4-9b1db3078e33', N'增加品目', NULL, 10000.0000, N'A', N'1', CAST(N'2021-05-28T11:06:12.417' AS DateTime), N'1', CAST(N'2021-05-28T11:06:12.417' AS DateTime), N'06')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'94f7a7c6-a73a-f845-9345-28bd8de79ae2', N'代拟质疑函', N'30-200万元', 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:53:01.920' AS DateTime), N'1', CAST(N'2021-05-28T10:53:01.920' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'9934cb44-3aa8-1dda-093e-5d8a2aa6963f', N'需求论证', N'30万元以下', 2000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:19.827' AS DateTime), N'1', CAST(N'2021-05-28T10:52:19.827' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'994491fa-c74d-7df2-f4d1-cfdba128ab35', N'供应商培训', NULL, 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:41.513' AS DateTime), N'1', CAST(N'2021-05-28T10:54:41.513' AS DateTime), N'04')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'9c5f799f-176a-787b-82b9-321aa16422f3', N'当面咨询', NULL, 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:17.007' AS DateTime), N'1', CAST(N'2021-05-28T10:52:17.007' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'9ff378fd-dba7-315c-9a3b-ec9cd07ba597', N'履约纠纷', N'200-500万元', 30000.0000, N'A', N'1', CAST(N'2021-05-28T11:06:25.220' AS DateTime), N'1', CAST(N'2021-05-28T11:06:25.220' AS DateTime), N'07')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'a4971acc-b09d-c56e-f612-e6ca79c374fe', N'在线讲座', NULL, 20.0000, N'A', N'1', CAST(N'2021-05-28T10:54:36.463' AS DateTime), N'1', CAST(N'2021-05-28T10:54:36.463' AS DateTime), N'04')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'b4b5bf29-6887-19d0-695b-e022b207b6cf', N'电话咨询', NULL, 1000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:11.850' AS DateTime), N'1', CAST(N'2021-05-28T10:52:11.850' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'b9d9fd86-da94-3a03-3714-bf962a2af5fd', N'标书制作', N'500万元以上', 20000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:33.800' AS DateTime), N'1', CAST(N'2021-05-28T10:54:33.800' AS DateTime), N'03')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'ca4ef6e0-bab8-e61e-d209-1e9a08fca42e', N'具备条件', NULL, 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:46.593' AS DateTime), N'1', CAST(N'2021-05-28T10:54:46.593' AS DateTime), N'06')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'd945d55b-9392-c97c-71ee-5e83cc1d9c80', N'需求论证', N'30-200万元', 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:23.660' AS DateTime), N'1', CAST(N'2021-05-28T10:52:23.660' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'de752562-a4a3-bf20-04f8-06f2e320b8db', N'代拟质疑函', N'30万元以下', 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:59.240' AS DateTime), N'1', CAST(N'2021-05-28T10:52:59.240' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'e39f6ba7-70c7-822d-c104-fe4a562e0b2a', N'代拟质疑函', N'500万元以上', 20000.0000, N'A', N'1', CAST(N'2021-05-28T10:53:07.117' AS DateTime), N'1', CAST(N'2021-05-28T10:53:07.117' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'e510300a-b278-cc48-3f56-6b98b6b685dd', N'代拟投诉书', N'30-200万元', 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:53:12.380' AS DateTime), N'1', CAST(N'2021-05-28T10:53:12.380' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'ecb0bd60-3653-3ac4-8584-c330a66f6637', N'需求论证', N'1000万元以上', 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:45.873' AS DateTime), N'1', CAST(N'2021-05-28T10:52:45.873' AS DateTime), N'02')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'eeec65e5-94f4-4a7a-4159-d2d1ae83c5c4', N'标书制作', N'30-200万元', 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:28.513' AS DateTime), N'1', CAST(N'2021-05-28T10:54:28.513' AS DateTime), N'03')
INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'fd9cbc17-dbbb-2e54-215c-a87da04603e2', N'代拟投诉书', N'200-500万元', 20000.0000, N'A', N'1', CAST(N'2021-05-28T10:53:14.987' AS DateTime), N'1', CAST(N'2021-05-28T10:53:14.987' AS DateTime), N'02')
GO





































ALTER TABLE [dbo].[Project] ADD [Fencha] [money] NULL;
GO




ALTER TABLE [dbo].[Project] ADD [Shuliang] [int] NULL;
GO




















USE [zhengcaioa]
GO

/****** Object:  Table [dbo].[t_salary_appeal]    Script Date: 2021/7/2 9:06:14 ******/
SET ANSI_NULLS ON
GO

SET QUOTED_IDENTIFIER ON
GO

IF EXISTS(Select 1 From Sysobjects Where Name='t_salary_appeal')  --查询表名costSeparateConfig是否存在  
drop table  [t_salary_appeal] 
GO

CREATE TABLE [dbo].[t_salary_appeal](
    [id] [nvarchar](50)  NOT NULL,
    [salary_id] [nvarchar](50) NULL,
    [year] [int] NOT NULL,
    [month] [int] NOT NULL,
    [reason] [nvarchar](1000) NULL,
    [amount] [decimal](10, 2) NULL,
    [basis] [nvarchar](500) NULL,
    [sub_user] [nvarchar](50) NULL,
    [sub_time] [datetime] NULL,
    [chk_user] [nvarchar](50) NULL,
    [chk_time] [datetime] NULL,
    [chk_result] [nvarchar](1000) NULL,
    [status] [nvarchar](1) NULL,
    [createrName] [nvarchar](50) NULL,
    [tittle] [nvarchar](50) NULL,
    [shenpi_status] [nvarchar](1) NULL,
 CONSTRAINT [PK_T_SALARY_APPEAL] PRIMARY KEY CLUSTERED 
(
    [id] ASC
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY]
GO




































































USE [zhengcaioa]