From b69b0a86c77a9453167576ab01c542383d53f260 Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期五, 23 九月 2022 10:18:55 +0800 Subject: [PATCH] 项目质疑投诉列表 --- zhengcaioa/Services/ProjectService.cs | 204 ++++++++ zhengcaioa/DTO/ProjectDTO.cs | 51 ++ zhengcaioa/Model/Project.cs | 12 zhengcaioa/DTO/ProjectzhongbiaoDTO.cs | 6 zhengcaioa/zhengcaioa/Views/Project/Select.cshtml | 21 zhengcaioa/Model/Projectyouxiao.cs | 6 zhengcaioa/zhengcaioa/Views/Project/Zhiyi.cshtml | 291 ++++++++++++ zhengcaioa/Model/zhengcaioaContext.cs | 133 +++++ zhengcaioa/zhengcaioa/Views/Project/Tousu.cshtml | 295 ++++++++++++ zhengcaioa/zhengcaioa/Views/Project/Add.cshtml | 110 ++++ zhengcaioa/IServices/IProjectService.cs | 4 zhengcaioa/Model/Projectreason.cs | 6 zhengcaioa/zhengcaioa/Controllers/ProjectController.cs | 190 ++++++++ zhengcaioa/Model/Projectzhongbiao.cs | 6 14 files changed, 1,319 insertions(+), 16 deletions(-) diff --git a/zhengcaioa/DTO/ProjectDTO.cs b/zhengcaioa/DTO/ProjectDTO.cs index 3b7862b..2d1d04c 100644 --- a/zhengcaioa/DTO/ProjectDTO.cs +++ b/zhengcaioa/DTO/ProjectDTO.cs @@ -8,6 +8,8 @@ public class ProjectDTO { public string Id { get; set; } + public string MingxiId { get; set; } + public string Type { get; set; } public DateTime StartTime { get; set; } public string StartTimestr { get; set; } public string Sheng { get; set; } @@ -48,15 +50,41 @@ public string[] Reasonname { get; set; } public string[] Reasonremark { get; set; } + + public string[] WxZhiyistatus { get; set; } + public DateTime?[] WxZhiyishijian { get; set; } + public string[] WxZhiyichengli { get; set; } + public string[] WxTousustatus { get; set; } + public DateTime?[] WxTousushijian { get; set; } + public string[] WxTousuchengli { get; set; } + public string[] YouxiaoId { get; set; } public string[] Namesyouxiao { get; set; } public string[] Priceyouxiao { get; set; } + + + public string[] YxZhiyistatus { get; set; } + public DateTime?[] YxZhiyishijian { get; set; } + public string[] YxZhiyichengli { get; set; } + public string[] YxTousustatus { get; set; } + public DateTime?[] YxTousushijian { get; set; } + public string[] YxTousuchengli { get; set; } + + public string[] ZhongbiaoId { get; set; } public string[] Names { get; set; } public string[] Price { get; set; } public decimal?[] Defen { get; set; } - + + public string[] ZbZhiyistatus { get; set; } + public DateTime?[] ZbZhiyishijian { get; set; } + public string[] ZbZhiyichengli { get; set; } + public string[] ZbTousustatus { get; set; } + public DateTime?[] ZbTousushijian { get; set; } + public string[] ZbTousuchengli { get; set; } + + public string NamesZhongbiao { get; set; } public string Fblx { get; set; } @@ -87,6 +115,27 @@ public decimal? Caigouyusuan { get; set; } public string CaigouyusuanName { get; set; } + + public string DehxZhiyistatus { get; set; } + public DateTime? DehxZhiyishijian { get; set; } + public string DehxZhiyichengli { get; set; } + public string DshxZhiyistatus { get; set; } + public DateTime? DshxZhiyishijian { get; set; } + public string DshxZhiyichengli { get; set; } + public string DehxTousustatus { get; set; } + public DateTime? DehxTousushijian { get; set; } + public string DehxTousuchengli { get; set; } + public string DshxTousustatus { get; set; } + public DateTime? DshxTousushijian { get; set; } + public string DshxTousuchengli { get; set; } + + + public string Zhiyistatus { get; set; } + public DateTime? Zhiyishijian { get; set; } + public string Zhiyichengli { get; set; } + public string Tousustatus { get; set; } + public DateTime? Tousushijian { get; set; } + public string Tousuchengli { get; set; } } public class ProjectDTOSearch : SearchEntity diff --git a/zhengcaioa/DTO/ProjectzhongbiaoDTO.cs b/zhengcaioa/DTO/ProjectzhongbiaoDTO.cs index 26b45f9..ebfa353 100644 --- a/zhengcaioa/DTO/ProjectzhongbiaoDTO.cs +++ b/zhengcaioa/DTO/ProjectzhongbiaoDTO.cs @@ -13,5 +13,11 @@ public string Price { get; set; } public decimal? Defen { get; set; } public string DefenName { get; set; } + public string ZbZhiyistatus { get; set; } + public DateTime? ZbZhiyishijian { get; set; } + public string ZbZhiyichengli { get; set; } + public string ZbTousustatus { get; set; } + public DateTime? ZbTousushijian { get; set; } + public string ZbTousuchengli { get; set; } } } diff --git a/zhengcaioa/IServices/IProjectService.cs b/zhengcaioa/IServices/IProjectService.cs index c20d2cf..3af513d 100644 --- a/zhengcaioa/IServices/IProjectService.cs +++ b/zhengcaioa/IServices/IProjectService.cs @@ -45,5 +45,9 @@ List<ZxdsfxlDTO> GetListZxdsfxl(string userid, DateTime datemin, DateTime datemax,string leixing); + ResultEntity savezhiyi(string zhiyistatus, DateTime? zhiyishijian, string zhiyichengli, string projiectid, string mingxiid, string type); + + ResultEntity savetousu(string tousustatus, DateTime? tousushijian, string tousuchengli, string projiectid, string mingxiid, string type); + } } diff --git a/zhengcaioa/Model/Project.cs b/zhengcaioa/Model/Project.cs index 83d6377..db62cef 100644 --- a/zhengcaioa/Model/Project.cs +++ b/zhengcaioa/Model/Project.cs @@ -44,5 +44,17 @@ public decimal? Fencha { get; set; } public int? Shuliang { get; set; } public decimal? Caigouyusuan { get; set; } + public string DehxZhiyistatus { get; set; } + public DateTime? DehxZhiyishijian { get; set; } + public string DehxZhiyichengli { get; set; } + public string DshxZhiyistatus { get; set; } + public DateTime? DshxZhiyishijian { get; set; } + public string DshxZhiyichengli { get; set; } + public string DehxTousustatus { get; set; } + public DateTime? DehxTousushijian { get; set; } + public string DehxTousuchengli { get; set; } + public string DshxTousustatus { get; set; } + public DateTime? DshxTousushijian { get; set; } + public string DshxTousuchengli { get; set; } } } diff --git a/zhengcaioa/Model/Projectreason.cs b/zhengcaioa/Model/Projectreason.cs index 08a7a23..503daf5 100644 --- a/zhengcaioa/Model/Projectreason.cs +++ b/zhengcaioa/Model/Projectreason.cs @@ -11,5 +11,11 @@ public string ProjectId { get; set; } public string Reasonname { get; set; } public string Reasonremark { get; set; } + public string WxZhiyistatus { get; set; } + public DateTime? WxZhiyishijian { get; set; } + public string WxZhiyichengli { get; set; } + public string WxTousustatus { get; set; } + public DateTime? WxTousushijian { get; set; } + public string WxTousuchengli { get; set; } } } diff --git a/zhengcaioa/Model/Projectyouxiao.cs b/zhengcaioa/Model/Projectyouxiao.cs index 9c6f65f..62a1b8e 100644 --- a/zhengcaioa/Model/Projectyouxiao.cs +++ b/zhengcaioa/Model/Projectyouxiao.cs @@ -11,5 +11,11 @@ public string ProjectId { get; set; } public string Namesyouxiao { get; set; } public string Priceyouxiao { get; set; } + public string YxZhiyistatus { get; set; } + public DateTime? YxZhiyishijian { get; set; } + public string YxZhiyichengli { get; set; } + public string YxTousustatus { get; set; } + public DateTime? YxTousushijian { get; set; } + public string YxTousuchengli { get; set; } } } diff --git a/zhengcaioa/Model/Projectzhongbiao.cs b/zhengcaioa/Model/Projectzhongbiao.cs index b7d142b..7cb5527 100644 --- a/zhengcaioa/Model/Projectzhongbiao.cs +++ b/zhengcaioa/Model/Projectzhongbiao.cs @@ -12,5 +12,11 @@ public string Names { get; set; } public string Price { get; set; } public decimal? Defen { get; set; } + public string ZbZhiyistatus { get; set; } + public DateTime? ZbZhiyishijian { get; set; } + public string ZbZhiyichengli { get; set; } + public string ZbTousustatus { get; set; } + public DateTime? ZbTousushijian { get; set; } + public string ZbTousuchengli { get; set; } } } diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs index a94a147..3ab97ed 100644 --- a/zhengcaioa/Model/zhengcaioaContext.cs +++ b/zhengcaioa/Model/zhengcaioaContext.cs @@ -5424,6 +5424,10 @@ .HasDefaultValueSql("('')") .HasComment("閲囪喘浜哄悕绉�"); + entity.Property(e => e.Caigouyusuan) + .HasColumnType("money") + .HasColumnName("caigouyusuan"); + entity.Property(e => e.Cgfs) .HasMaxLength(50) .HasColumnName("cgfs"); @@ -5461,6 +5465,30 @@ .HasDefaultValueSql("('')") .HasComment("閲囪喘浜哄悕绉�"); + entity.Property(e => e.DehxTousuchengli) + .HasMaxLength(1) + .HasColumnName("dehx_tousuchengli"); + + entity.Property(e => e.DehxTousushijian) + .HasColumnType("datetime") + .HasColumnName("dehx_tousushijian"); + + entity.Property(e => e.DehxTousustatus) + .HasMaxLength(1) + .HasColumnName("dehx_tousustatus"); + + entity.Property(e => e.DehxZhiyichengli) + .HasMaxLength(1) + .HasColumnName("dehx_zhiyichengli"); + + entity.Property(e => e.DehxZhiyishijian) + .HasColumnType("datetime") + .HasColumnName("dehx_zhiyishijian"); + + entity.Property(e => e.DehxZhiyistatus) + .HasMaxLength(1) + .HasColumnName("dehx_zhiyistatus"); + entity.Property(e => e.Drhx) .HasMaxLength(500) .HasColumnName("drhx"); @@ -5468,10 +5496,6 @@ entity.Property(e => e.DrhxDefen) .HasColumnType("money") .HasColumnName("drhx_defen"); - - entity.Property(e => e.Caigouyusuan) - .HasColumnType("money") - .HasColumnName("caigouyusuan"); entity.Property(e => e.DrhxPrice) .HasMaxLength(500) @@ -5488,6 +5512,30 @@ entity.Property(e => e.DshxPrice) .HasMaxLength(500) .HasColumnName("dshx_price"); + + entity.Property(e => e.DshxTousuchengli) + .HasMaxLength(1) + .HasColumnName("dshx_tousuchengli"); + + entity.Property(e => e.DshxTousushijian) + .HasColumnType("datetime") + .HasColumnName("dshx_tousushijian"); + + entity.Property(e => e.DshxTousustatus) + .HasMaxLength(1) + .HasColumnName("dshx_tousustatus"); + + entity.Property(e => e.DshxZhiyichengli) + .HasMaxLength(1) + .HasColumnName("dshx_zhiyichengli"); + + entity.Property(e => e.DshxZhiyishijian) + .HasColumnType("datetime") + .HasColumnName("dshx_zhiyishijian"); + + entity.Property(e => e.DshxZhiyistatus) + .HasMaxLength(1) + .HasColumnName("dshx_zhiyistatus"); entity.Property(e => e.Fblx).HasMaxLength(500); @@ -5579,6 +5627,30 @@ entity.Property(e => e.Reasonremark) .HasMaxLength(500) .HasColumnName("reasonremark"); + + entity.Property(e => e.WxTousuchengli) + .HasMaxLength(1) + .HasColumnName("wx_tousuchengli"); + + entity.Property(e => e.WxTousushijian) + .HasColumnType("datetime") + .HasColumnName("wx_tousushijian"); + + entity.Property(e => e.WxTousustatus) + .HasMaxLength(1) + .HasColumnName("wx_tousustatus"); + + entity.Property(e => e.WxZhiyichengli) + .HasMaxLength(1) + .HasColumnName("wx_zhiyichengli"); + + entity.Property(e => e.WxZhiyishijian) + .HasColumnType("datetime") + .HasColumnName("wx_zhiyishijian"); + + entity.Property(e => e.WxZhiyistatus) + .HasMaxLength(1) + .HasColumnName("wx_zhiyistatus"); }); modelBuilder.Entity<Projectyouxiao>(entity => @@ -5602,6 +5674,30 @@ entity.Property(e => e.ProjectId) .IsRequired() .HasMaxLength(50); + + entity.Property(e => e.YxTousuchengli) + .HasMaxLength(1) + .HasColumnName("yx_tousuchengli"); + + entity.Property(e => e.YxTousushijian) + .HasColumnType("datetime") + .HasColumnName("yx_tousushijian"); + + entity.Property(e => e.YxTousustatus) + .HasMaxLength(1) + .HasColumnName("yx_tousustatus"); + + entity.Property(e => e.YxZhiyichengli) + .HasMaxLength(1) + .HasColumnName("yx_zhiyichengli"); + + entity.Property(e => e.YxZhiyishijian) + .HasColumnType("datetime") + .HasColumnName("yx_zhiyishijian"); + + entity.Property(e => e.YxZhiyistatus) + .HasMaxLength(1) + .HasColumnName("yx_zhiyistatus"); }); modelBuilder.Entity<Projectzhongbiao>(entity => @@ -5615,6 +5711,10 @@ .HasMaxLength(50) .HasColumnName("zhongbiaoId"); + entity.Property(e => e.Defen) + .HasColumnType("money") + .HasColumnName("defen"); + entity.Property(e => e.Names) .HasMaxLength(500) .HasColumnName("names"); @@ -5627,8 +5727,29 @@ .IsRequired() .HasMaxLength(50); - entity.Property(e => e.Defen).HasColumnType("money") - .HasColumnName("defen"); ; + entity.Property(e => e.ZbTousuchengli) + .HasMaxLength(1) + .HasColumnName("zb_tousuchengli"); + + entity.Property(e => e.ZbTousushijian) + .HasColumnType("datetime") + .HasColumnName("zb_tousushijian"); + + entity.Property(e => e.ZbTousustatus) + .HasMaxLength(1) + .HasColumnName("zb_tousustatus"); + + entity.Property(e => e.ZbZhiyichengli) + .HasMaxLength(1) + .HasColumnName("zb_zhiyichengli"); + + entity.Property(e => e.ZbZhiyishijian) + .HasColumnType("datetime") + .HasColumnName("zb_zhiyishijian"); + + entity.Property(e => e.ZbZhiyistatus) + .HasMaxLength(1) + .HasColumnName("zb_zhiyistatus"); }); modelBuilder.Entity<SysAttachment>(entity => diff --git a/zhengcaioa/Services/ProjectService.cs b/zhengcaioa/Services/ProjectService.cs index 1ac1682..5368435 100644 --- a/zhengcaioa/Services/ProjectService.cs +++ b/zhengcaioa/Services/ProjectService.cs @@ -128,6 +128,12 @@ projectreason.Reasonname = projectDTO.Reasonname[i]; projectreason.Reasonremark = projectDTO.Reasonremark[i]; projectreason.ProjectId = project.Id; + projectreason.WxZhiyistatus = projectDTO.WxZhiyistatus[i]; + projectreason.WxZhiyishijian = projectDTO.WxZhiyishijian[i]; + projectreason.WxZhiyichengli = projectDTO.WxZhiyichengli[i]; + projectreason.WxTousustatus = projectDTO.WxTousustatus[i]; + projectreason.WxTousushijian = projectDTO.WxTousushijian[i]; + projectreason.WxTousuchengli = projectDTO.WxTousuchengli[i]; _context.Projectreasons.Add(projectreason); } } @@ -162,6 +168,13 @@ projectyouxiao.Namesyouxiao = projectDTO.Namesyouxiao[i]; projectyouxiao.Priceyouxiao = projectDTO.Priceyouxiao[i]; projectyouxiao.ProjectId = project.Id; + + projectyouxiao.YxZhiyistatus = projectDTO.YxZhiyistatus[i]; + projectyouxiao.YxZhiyishijian = projectDTO.YxZhiyishijian[i]; + projectyouxiao.YxZhiyichengli = projectDTO.YxZhiyichengli[i]; + projectyouxiao.YxTousustatus = projectDTO.YxTousustatus[i]; + projectyouxiao.YxTousushijian = projectDTO.YxTousushijian[i]; + projectyouxiao.YxTousuchengli = projectDTO.YxTousuchengli[i]; _context.Projectyouxiaos.Add(projectyouxiao); } } @@ -197,6 +210,14 @@ projectzhongbiao.Price = projectDTO.Price[i]; projectzhongbiao.Defen = projectDTO.Defen[i]; projectzhongbiao.ProjectId = project.Id; + + projectzhongbiao.ZbZhiyistatus = projectDTO.ZbZhiyistatus[i]; + projectzhongbiao.ZbZhiyishijian = projectDTO.ZbZhiyishijian[i]; + projectzhongbiao.ZbZhiyichengli = projectDTO.ZbZhiyichengli[i]; + projectzhongbiao.ZbTousustatus = projectDTO.ZbTousustatus[i]; + projectzhongbiao.ZbTousushijian = projectDTO.ZbTousushijian[i]; + projectzhongbiao.ZbTousuchengli = projectDTO.ZbTousuchengli[i]; + _context.Projectzhongbiaos.Add(projectzhongbiao); } } @@ -274,7 +295,14 @@ projectzhongbiaoDTO.Price = projectzhongbiao.Price; projectzhongbiaoDTO.Defen = projectzhongbiao.Defen; - projectzhongbiaoDTOs.Add(projectzhongbiaoDTO); + projectzhongbiaoDTO.ZbZhiyichengli = projectzhongbiao.ZbZhiyichengli; + projectzhongbiaoDTO.ZbZhiyishijian = projectzhongbiao.ZbZhiyishijian; + projectzhongbiaoDTO.ZbZhiyistatus = projectzhongbiao.ZbZhiyistatus; + projectzhongbiaoDTO.ZbTousuchengli = projectzhongbiao.ZbTousuchengli; + projectzhongbiaoDTO.ZbTousushijian = projectzhongbiao.ZbTousushijian; + projectzhongbiaoDTO.ZbTousustatus = projectzhongbiao.ZbTousustatus; + + projectzhongbiaoDTOs.Add(projectzhongbiaoDTO); } projectDTO.Projectzhongbiaos = projectzhongbiaoDTOs; } @@ -297,7 +325,7 @@ List<ProjectDTO> list = new List<ProjectDTO>(); //绛涢�� StringBuilder sql = new StringBuilder(); - sql.Append("SELECT distinct a.[Id],a.[start_time],a.[drhx_defen],a.[caigouyusuan],a.[dshx_defen] ,a.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 "); //zhuanjia = stuff((select ','+name from [Zhuanjia] f where CHARINDEX(f.id,a.[zhuanjia]) >0 for xml path('')), 1,1, '') = stuff((select '銆�'+ f.[names] from [Projectzhongbiao] f where f.[ProjectId] = a.[Id] for xml path('')), 1,1, '') + sql.Append("SELECT distinct a.[Id],a.[start_time],a.[drhx_defen],a.[caigouyusuan],a.[dshx_defen] ,a.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 ,a.[dehx_zhiyistatus],a.[dehx_zhiyishijian],a.[dehx_zhiyichengli],a.[dshx_zhiyistatus],a.[dshx_zhiyishijian],a.[dshx_zhiyichengli],a.[dehx_tousustatus],a.[dehx_tousushijian],a.[dehx_tousuchengli],a.[dshx_tousustatus],a.[dshx_tousushijian],a.[dshx_tousuchengli] "); //zhuanjia = stuff((select ','+name from [Zhuanjia] f where CHARINDEX(f.id,a.[zhuanjia]) >0 for xml path('')), 1,1, '') = stuff((select '銆�'+ f.[names] from [Projectzhongbiao] f where f.[ProjectId] = a.[Id] 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] "); @@ -620,8 +648,19 @@ projiectid.Add(projectDTO.Id); } var projectzhongbiaos = _context.Projectzhongbiaos.Where(x => projiectid.Contains(x.ProjectId)).ToList(); + var projectreasons = _context.Projectreasons.Where(x => projiectid.Contains(x.ProjectId)).ToList(); + var projectyouxiaos = _context.Projectyouxiaos.Where(x => projiectid.Contains(x.ProjectId)).ToList(); foreach (var projectDTO in list) { + if (projectDTO.DehxZhiyistatus == "A"|| projectDTO.DshxZhiyistatus == "A") + { + projectDTO.Zhiyistatus = "鈭�"; + } + if (projectDTO.DehxTousustatus == "A" || projectDTO.DshxTousustatus == "A") + { + projectDTO.Tousustatus = "鈭�"; + } + var ProjectIds = projectzhongbiaos.Where(x => x.ProjectId == projectDTO.Id).ToList(); projectDTO.Toubiaocishu = ""; for (int i=0;i< ProjectIds.Count; i++) @@ -635,7 +674,50 @@ projectDTO.Toubiaocishu += ProjectIds[i].Names + "銆�"; } - + if (ProjectIds[i].ZbZhiyistatus == "A" ) + { + projectDTO.Zhiyistatus = "鈭�"; + } + if (ProjectIds[i].ZbTousustatus == "A") + { + projectDTO.Tousustatus = "鈭�"; + } + + } + + var projectreasons1 = projectreasons.Where(x => x.ProjectId == projectDTO.Id).ToList(); + for (int i = 0; i < projectreasons1.Count; i++) + { + if (projectreasons1[i].WxZhiyistatus == "A") + { + projectDTO.Zhiyistatus = "鈭�"; + } + if (projectreasons1[i].WxZhiyistatus == "A") + { + projectDTO.Tousustatus = "鈭�"; + } + } + + var projectyouxiaos1 = projectyouxiaos.Where(x => x.ProjectId == projectDTO.Id).ToList(); + for (int i = 0; i < projectyouxiaos1.Count; i++) + { + if (projectyouxiaos1[i].YxZhiyistatus == "A") + { + projectDTO.Zhiyistatus = "鈭�"; + } + if (projectyouxiaos1[i].YxZhiyistatus == "A") + { + projectDTO.Tousustatus = "鈭�"; + } + } + + if (projectDTO.Zhiyistatus != "鈭�") + { + projectDTO.Zhiyistatus = "璐ㄧ枒"; + } + if (projectDTO.Tousustatus != "鈭�") + { + projectDTO.Tousustatus = "鎶曡瘔"; } } @@ -805,5 +887,121 @@ var list = _mapper.Map<List<ZxdsfxlDTO>>(listPosition); return list; } + + + public ResultEntity savezhiyi(string zhiyistatus, DateTime? zhiyishijian, string zhiyichengli, string projiectid, string mingxiid, string type) + { + ResultEntity resultEntity = new ResultEntity(); + try + { + if (type == "1") + { + var updateliaotian = _context.Projectzhongbiaos.Find(mingxiid); + updateliaotian.ZbZhiyistatus = zhiyistatus; + updateliaotian.ZbZhiyishijian = zhiyishijian; + updateliaotian.ZbZhiyichengli = zhiyichengli; + } + else if (type == "2") + { + var updateliaotian = _context.Projects.Find(projiectid); + updateliaotian.DehxZhiyistatus = zhiyistatus; + updateliaotian.DehxZhiyishijian = zhiyishijian; + updateliaotian.DehxZhiyichengli = zhiyichengli; + } + else if (type == "3") + { + var updateliaotian = _context.Projects.Find(projiectid); + updateliaotian.DshxZhiyistatus = zhiyistatus; + updateliaotian.DshxZhiyishijian = zhiyishijian; + updateliaotian.DshxZhiyichengli = zhiyichengli; + } + else if (type == "4") + { + var updateliaotian = _context.Projectyouxiaos.Find(mingxiid); + updateliaotian.YxZhiyistatus = zhiyistatus; + updateliaotian.YxZhiyishijian = zhiyishijian; + updateliaotian.YxZhiyichengli = zhiyichengli; + } + else if (type == "5") + { + var updateliaotian = _context.Projectreasons.Find(mingxiid); + updateliaotian.WxZhiyistatus = zhiyistatus; + updateliaotian.WxZhiyishijian = zhiyishijian; + updateliaotian.WxZhiyichengli = zhiyichengli; + } + + + + _context.SaveChanges(); + resultEntity.ReturnID = projiectid; + resultEntity.Result = true; + } + catch (Exception ex) + { + resultEntity.Result = false; + resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠$悊鍛�"; + + } + return resultEntity; + } + + + + public ResultEntity savetousu(string tousustatus, DateTime? tousushijian, string tousuchengli, string projiectid, string mingxiid, string type) + { + ResultEntity resultEntity = new ResultEntity(); + try + { + if (type == "1") + { + var updateliaotian = _context.Projectzhongbiaos.Find(mingxiid); + updateliaotian.ZbTousustatus = tousustatus; + updateliaotian.ZbTousushijian = tousushijian; + updateliaotian.ZbTousuchengli = tousuchengli; + } + else if (type == "2") + { + var updateliaotian = _context.Projects.Find(projiectid); + updateliaotian.DehxTousustatus = tousustatus; + updateliaotian.DehxTousushijian = tousushijian; + updateliaotian.DehxTousuchengli = tousuchengli; + } + else if (type == "3") + { + var updateliaotian = _context.Projects.Find(projiectid); + updateliaotian.DshxTousustatus = tousustatus; + updateliaotian.DshxTousushijian = tousushijian; + updateliaotian.DshxTousuchengli = tousuchengli; + } + else if (type == "4") + { + var updateliaotian = _context.Projectyouxiaos.Find(mingxiid); + updateliaotian.YxTousustatus = tousustatus; + updateliaotian.YxTousushijian = tousushijian; + updateliaotian.YxTousuchengli = tousuchengli; + } + else if (type == "5") + { + var updateliaotian = _context.Projectreasons.Find(mingxiid); + updateliaotian.WxTousustatus = tousustatus; + updateliaotian.WxTousushijian = tousushijian; + updateliaotian.WxTousuchengli = tousuchengli; + } + + + + _context.SaveChanges(); + resultEntity.ReturnID = projiectid; + resultEntity.Result = true; + } + catch (Exception ex) + { + resultEntity.Result = false; + resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠$悊鍛�"; + + } + return resultEntity; + } + } } diff --git a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs index 7f7a075..8d1c173 100644 --- a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs +++ b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs @@ -1131,5 +1131,195 @@ return new JsonResult(returnMsg); } + + + + /// <summary> + /// 璐ㄧ枒 + /// </summary> + /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param> + /// <returns></returns> + /// + [CheckLogin] + public IActionResult Zhiyi(string projectid, string mingid, string type) + { + var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User")); + ViewData["curentuser"] = curentuser; + ViewData["projectid"] = projectid; + ViewData["mingid"] = mingid; + ViewData["type"] = type; + var zhiyistatus = ""; + var zhiyishijian = ""; + var zhiyichengli = ""; + + var projectDTO = _projectService.GetLiaotianEntity(projectid); + if (type == "1") + { + var projectzhongbiaoDTO = projectDTO.Projectzhongbiaos.Where(x => x.ZhongbiaoId == mingid).FirstOrDefault(); + if (projectzhongbiaoDTO != null) + { + zhiyistatus = projectzhongbiaoDTO.ZbZhiyistatus; + zhiyishijian = projectzhongbiaoDTO.ZbZhiyishijian.HasValue? projectzhongbiaoDTO.ZbZhiyishijian.Value.ToString("yyyy-MM-dd"):""; + zhiyichengli = projectzhongbiaoDTO.ZbZhiyichengli; + } + } + else if (type == "2") + { + zhiyistatus = projectDTO.DehxZhiyistatus; + zhiyishijian = projectDTO.DehxZhiyishijian.HasValue ? projectDTO.DehxZhiyishijian.Value.ToString("yyyy-MM-dd") : ""; + zhiyichengli = projectDTO.DehxZhiyichengli; + } + else if (type == "3") + { + zhiyistatus = projectDTO.DshxZhiyistatus; + zhiyishijian = projectDTO.DshxZhiyishijian.HasValue ? projectDTO.DshxZhiyishijian.Value.ToString("yyyy-MM-dd") : ""; + zhiyichengli = projectDTO.DshxZhiyichengli; + } + else if (type == "4") + { + var projectyouxiao = projectDTO.Projectyouxiaos.Where(x => x.YouxiaoId == mingid).FirstOrDefault(); + if (projectyouxiao != null) + { + zhiyistatus = projectyouxiao.YxZhiyistatus; + zhiyishijian = projectyouxiao.YxZhiyishijian.HasValue ? projectyouxiao.YxZhiyishijian.Value.ToString("yyyy-MM-dd") : ""; + zhiyichengli = projectyouxiao.YxZhiyichengli; + } + } + else if (type == "5") + { + var projectreason = projectDTO.projectreasons.Where(x => x.ReasonId == mingid).FirstOrDefault(); + if (projectreason != null) + { + zhiyistatus = projectreason.WxZhiyistatus; + zhiyishijian = projectreason.WxZhiyishijian.HasValue ? projectreason.WxZhiyishijian.Value.ToString("yyyy-MM-dd") : ""; + zhiyichengli = projectreason.WxZhiyichengli; + } + } + + + if (string.IsNullOrWhiteSpace(zhiyishijian)) + { + zhiyishijian = DateTime.Now.ToString("yyyy-MM-dd"); + } + + ViewData["zhiyistatus"] = zhiyistatus; + ViewData["zhiyishijian"] = zhiyishijian; + ViewData["zhiyichengli"] = zhiyichengli; + ViewData.Model = new ProjectDTO(); + + return View(); + + + } + + + [CheckLogin] + public IActionResult Zhiyibaocun(ProjectDTO dto) + { + ResultEntity resultEntity = new ResultEntity(); + resultEntity.Result = true; + var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User")); + ViewData["curentuser"] = curentuser; + + + + resultEntity = _projectService.savezhiyi("A", dto.Zhiyishijian, dto.Zhiyichengli, dto.Id, dto.MingxiId,dto.Type); + + return new JsonResult(resultEntity); + } + + /// <summary> + /// 鎶曡瘔 + /// </summary> + /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param> + /// <returns></returns> + /// + [CheckLogin] + public IActionResult Tousu(string projectid, string mingid, string type) + { + var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User")); + ViewData["curentuser"] = curentuser; + ViewData["projectid"] = projectid; + ViewData["mingid"] = mingid; + ViewData["type"] = type; + var tousustatus = ""; + var tousushijian = ""; + var tousuchengli = ""; + + var projectDTO = _projectService.GetLiaotianEntity(projectid); + if (type == "1") + { + var projectzhongbiaoDTO = projectDTO.Projectzhongbiaos.Where(x => x.ZhongbiaoId == mingid).FirstOrDefault(); + if (projectzhongbiaoDTO != null) + { + tousustatus = projectzhongbiaoDTO.ZbTousustatus; + tousushijian = projectzhongbiaoDTO.ZbTousushijian.HasValue ? projectzhongbiaoDTO.ZbTousushijian.Value.ToString("yyyy-MM-dd") : ""; ; + tousuchengli = projectzhongbiaoDTO.ZbTousuchengli; + } + } + else if (type == "2") + { + tousustatus = projectDTO.DehxTousustatus; + tousushijian = projectDTO.DehxTousushijian.HasValue ? projectDTO.DehxTousushijian.Value.ToString("yyyy-MM-dd") : ""; ; + tousuchengli = projectDTO.DehxTousuchengli; + } + else if (type == "3") + { + tousustatus = projectDTO.DshxTousustatus; + tousushijian = projectDTO.DshxTousushijian.HasValue ? projectDTO.DshxTousushijian.Value.ToString("yyyy-MM-dd") : ""; ; + tousuchengli = projectDTO.DshxTousuchengli; + } + else if (type == "4") + { + var projectyouxiao = projectDTO.Projectyouxiaos.Where(x => x.YouxiaoId == mingid).FirstOrDefault(); + if (projectyouxiao != null) + { + tousustatus = projectyouxiao.YxTousustatus; + tousushijian = projectyouxiao.YxTousushijian.HasValue ? projectyouxiao.YxTousushijian.Value.ToString("yyyy-MM-dd") : ""; ; + tousuchengli = projectyouxiao.YxTousuchengli; + } + } + else if (type == "5") + { + var projectreason = projectDTO.projectreasons.Where(x => x.ReasonId == mingid).FirstOrDefault(); + if (projectreason != null) + { + tousustatus = projectreason.WxTousustatus; + tousushijian = projectreason.WxTousushijian.HasValue ? projectreason.WxTousushijian.Value.ToString("yyyy-MM-dd") : ""; ; + tousuchengli = projectreason.WxTousuchengli; + } + } + + + if (string.IsNullOrWhiteSpace(tousushijian)) + { + tousushijian = DateTime.Now.ToString("yyyy-MM-dd"); + } + + ViewData["tousustatus"] = tousustatus; + ViewData["tousushijian"] = tousushijian; + ViewData["tousuchengli"] = tousuchengli; + ViewData.Model = new ProjectDTO(); + + return View(); + + + } + + + [CheckLogin] + public IActionResult Tousubaocun(ProjectDTO dto) + { + ResultEntity resultEntity = new ResultEntity(); + resultEntity.Result = true; + var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User")); + ViewData["curentuser"] = curentuser; + + + + resultEntity = _projectService.savetousu("A", dto.Tousushijian, dto.Tousuchengli, dto.Id, dto.MingxiId, dto.Type); + + return new JsonResult(resultEntity); + } } } diff --git a/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml index 5968002..27cfca3 100644 --- a/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml +++ b/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml @@ -248,6 +248,12 @@ <div class="col-sm-2 col-md-2" style="width:10%;"> <input class="form-control" label="鎶ヤ环" name="Price" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Projectzhongbiaos[i].Price"> <input type="hidden" name="ZhongbiaoId" value="@Projectzhongbiaos[i].ZhongbiaoId" /> + <input type="hidden" name="ZbZhiyistatus" value="@Projectzhongbiaos[i].ZbZhiyistatus" /> + <input type="hidden" name="ZbZhiyishijian" value="@Projectzhongbiaos[i].ZbZhiyishijian" /> + <input type="hidden" name="ZbZhiyichengli" value="@Projectzhongbiaos[i].ZbZhiyichengli" /> + <input type="hidden" name="ZbTousustatus" value="@Projectzhongbiaos[i].ZbTousustatus" /> + <input type="hidden" name="ZbTousushijian" value="@Projectzhongbiaos[i].ZbTousushijian" /> + <input type="hidden" name="ZbTousuchengli" value="@Projectzhongbiaos[i].ZbTousuchengli" /> </div> <label class="text-right col-sm-1 col-md-1 control-label" style="width:60px;">璇勫寰楀垎</label> <div class="col-sm-2 col-md-2" style="width:10%;"> @@ -263,6 +269,13 @@ <button type="button" onclick="_pageAdd('@Projectzhongbiaos[i].Names')" data-type="1" style="color:red;">娣诲姞渚涘簲鍟�</button> } + + </div> + <div class="col-sm-1 col-md-1" style="width: 120px;"> + + <button type="button" onclick="zhiyi('@Projectzhongbiaos[i].ProjectId','@Projectzhongbiaos[i].ZhongbiaoId','1','@(Projectzhongbiaos[i].Names)璐ㄧ枒')" data-type="1">@(Projectzhongbiaos[i].ZbZhiyistatus == "A"? "宸茶川鐤�" : "璐ㄧ枒") </button> + + <button type="button" onclick="tousu('@Projectzhongbiaos[i].ProjectId','@Projectzhongbiaos[i].ZhongbiaoId','1','@(Projectzhongbiaos[i].Names)鎶曡瘔')" data-type="1">@(Projectzhongbiaos[i].ZbTousustatus == "A"? "宸叉姇璇�" : "鎶曡瘔") </button> </div> @if (i == 0) @@ -303,7 +316,14 @@ </div> + <div class="col-sm-1 col-md-1" style="width: 120px;"> + <button type="button" onclick="zhiyi('@Model.Id','','2','@(Model.Drhx)璐ㄧ枒')" data-type="1">@(Model.DehxZhiyistatus == "A"? "宸茶川鐤�" : "璐ㄧ枒") </button> + + <button type="button" onclick="tousu('@Model.Id','','2','@(Model.Drhx)鎶曡瘔')" data-type="1">@(Model.DehxTousustatus == "A"? "宸叉姇璇�" : "鎶曡瘔") </button> + + + </div> </div> <div class="clearfix layer-area" style="padding-bottom:15px;"> <label class="text-right col-sm-1 col-md-1 control-label">绗笁鍊欓�変緵搴斿晢</label> @@ -330,6 +350,13 @@ </div> + <div class="col-sm-1 col-md-1" style="width: 120px;"> + + <button type="button" onclick="zhiyi('@Model.Id','','3','@(Model.Dshx)璐ㄧ枒')" data-type="1">@(Model.DshxZhiyistatus == "A"? "宸茶川鐤�" : "璐ㄧ枒") </button> + + <button type="button" onclick="tousu('@Model.Id','','3','@(Model.Dshx)鎶曡瘔')" data-type="1">@(Model.DshxTousustatus == "A"? "宸叉姇璇�" : "鎶曡瘔") </button> + + </div> </div> <div id="addlist_2"> @for (int i = 0; i < Projectyouxiaos.Count; i++) @@ -340,20 +367,33 @@ <input class="form-control" label="鍏憡鏃堕棿" name="namesyouxiao" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Projectyouxiaos[i].Namesyouxiao"> </div> <label class="text-right col-sm-1 col-md-1 control-label" style="width:30px;">鎶ヤ环</label> - <div class="col-sm-2 col-md-2" style="width:10%;"> + <div class="col-sm-2 col-md-2" style="width:10%;"> <input class="form-control" label="鍏憡鏃堕棿" name="priceyouxiao" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Projectyouxiaos[i].Priceyouxiao"> <input type="hidden" name="YouxiaoId" value="@Projectyouxiaos[i].YouxiaoId" /> + <input type="hidden" name="YxZhiyistatus" value="@Projectyouxiaos[i].YxZhiyistatus" /> + <input type="hidden" name="YxZhiyishijian" value="@Projectyouxiaos[i].YxZhiyishijian" /> + <input type="hidden" name="YxZhiyichengli" value="@Projectyouxiaos[i].YxZhiyichengli" /> + <input type="hidden" name="YxTousustatus" value="@Projectyouxiaos[i].YxTousustatus" /> + <input type="hidden" name="YxTousushijian" value="@Projectyouxiaos[i].YxTousushijian" /> + <input type="hidden" name="YxTousuchengli" value="@Projectyouxiaos[i].YxTousuchengli" /> </div> - <div class="col-sm-1 col-md-1" style="width:100px;"> + <div class="col-sm-1 col-md-1" style="width:100px;"> @if (Projectyouxiaos[i].ProjectId != null && Projectyouxiaos[i].ProjectId == "yes") { - <button type="button" data-type="1" >娣诲姞渚涘簲鍟�</button> + <button type="button" data-type="1">娣诲姞渚涘簲鍟�</button> } else { <button type="button" onclick="_pageAdd('@Projectyouxiaos[i].Namesyouxiao')" data-type="1" style="color:red;">娣诲姞渚涘簲鍟�</button> } + + </div> + <div class="col-sm-1 col-md-1" style="width: 120px;"> + + <button type="button" onclick="zhiyi('@Projectyouxiaos[i].ProjectId','@Projectyouxiaos[i].YouxiaoId','4','@(Projectyouxiaos[i].Namesyouxiao)璐ㄧ枒')" data-type="1">@(Projectyouxiaos[i].YxZhiyistatus == "A"? "宸茶川鐤�" : "璐ㄧ枒") </button> + + <button type="button" onclick="tousu('@Projectyouxiaos[i].ProjectId','@Projectyouxiaos[i].YouxiaoId','4','@(Projectyouxiaos[i].Namesyouxiao)鎶曡瘔')" data-type="1">@(Projectyouxiaos[i].YxTousustatus == "A"? "宸叉姇璇�" : "鎶曡瘔") </button> </div> @if (i == 0) @@ -376,20 +416,36 @@ <input class="form-control" label="鏃犳晥渚涘簲鍟�" name="reasonname" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="500" ismust="true" type="text" value="@projectreasons[i].Reasonname"> </div> <label class="text-right col-sm-1 col-md-1 control-label" style="width:30px;">鍘熷洜</label> - <div class="col-sm-2 col-md-2" style="width:10%;"> + <div class="col-sm-2 col-md-2" style="width:10%;"> @*<textarea class="form-control bt" name="reasonremark" maxlength="4000" title="鍘熷洜" isempty="" length="long">@projectreasons[i].Reasonremark</textarea>*@ <input class="form-control" label="鍘熷洜" name="reasonremark" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="flase" type="text" value="@projectreasons[i].Reasonremark"> <input type="hidden" name="ReasonId" value="@projectreasons[i].ReasonId" /> + + <input type="hidden" name="WxZhiyistatus" value="@projectreasons[i].WxZhiyistatus" /> + <input type="hidden" name="WxZhiyishijian" value="@projectreasons[i].WxZhiyishijian" /> + <input type="hidden" name="WxZhiyichengli" value="@projectreasons[i].WxZhiyichengli" /> + <input type="hidden" name="WxTousustatus" value="@projectreasons[i].WxTousustatus" /> + <input type="hidden" name="WxTousushijian" value="@projectreasons[i].WxTousushijian" /> + <input type="hidden" name="WxTousuchengli" value="@projectreasons[i].WxTousuchengli" /> + </div> <div class="col-sm-1 col-md-1" style="width:100px;"> @if (projectreasons[i].ProjectId != null && projectreasons[i].ProjectId == "yes") { - <button type="button" data-type="1" >娣诲姞渚涘簲鍟�</button> + <button type="button" data-type="1">娣诲姞渚涘簲鍟�</button> } else { <button type="button" onclick="_pageAdd('@projectreasons[i].Reasonname')" data-type="1" style="color:red;">娣诲姞渚涘簲鍟�</button> } + + + </div> + <div class="col-sm-1 col-md-1" style="width:120px;"> + + <button type="button" onclick="zhiyi('@projectreasons[i].ProjectId','@projectreasons[i].ReasonId','5','@(projectreasons[i].Reasonname)璐ㄧ枒')" data-type="1">@(projectreasons[i].WxZhiyistatus == "A"? "宸茶川鐤�" : "璐ㄧ枒") </button> + + <button type="button" onclick="tousu('@projectreasons[i].ProjectId','@projectreasons[i].ReasonId','5','@(projectreasons[i].Reasonname)鎶曡瘔')" data-type="1">@(projectreasons[i].WxTousustatus == "A"? "宸叉姇璇�" : "鎶曡瘔") </button> </div> @@ -622,6 +678,12 @@ <div class="col-sm-2 col-md-2" style="width:10%;"> <input class="form-control" label="鍏憡鏃堕棿" name="Price" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value=""> <input type="hidden" name="ZhongbiaoId" value="" /> + <input type="hidden" name="ZbZhiyistatus" /> + <input type="hidden" name="ZbZhiyishijian" /> + <input type="hidden" name="ZbZhiyichengli" /> + <input type="hidden" name="ZbTousustatus" /> + <input type="hidden" name="ZbTousushijian" /> + <input type="hidden" name="ZbTousuchengli" /> </div> <label class="text-right col-sm-1 col-md-1 control-label" style="width:60px;">璇勫寰楀垎</label> <div class="col-sm-2 col-md-2" style="width:10%;"> @@ -640,6 +702,12 @@ <div class="col-sm-2 col-md-2" style="width:10%;"> <input class="form-control" label="鍏憡鏃堕棿" name="Priceyouxiao" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value=""> <input type="hidden" name="YouxiaoId" value="" /> + <input type="hidden" name="YxZhiyistatus" /> + <input type="hidden" name="YxZhiyishijian" /> + <input type="hidden" name="YxZhiyichengli" /> + <input type="hidden" name="YxTousustatus" /> + <input type="hidden" name="YxTousushijian" /> + <input type="hidden" name="YxTousuchengli" /> </div> @@ -656,6 +724,12 @@ <input class="form-control" label="鍘熷洜" name="reasonremark" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="flase" type="text" value=""> <input type="hidden" name="ReasonId" value="" /> + <input type="hidden" name="WxZhiyistatus" /> + <input type="hidden" name="WxZhiyishijian" /> + <input type="hidden" name="WxZhiyichengli" /> + <input type="hidden" name="WxTousustatus" /> + <input type="hidden" name="WxTousushijian" /> + <input type="hidden" name="WxTousuchengli" /> </div> @@ -913,6 +987,12 @@ + '<div class="col-sm-2 col-md-2" style="width:10%;">' + '<input class="form-control" label="涓爣锛堟垚浜わ級渚涘簲鍟�" name="Price" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="' + data.Projectzhongbiaos[i].Price +'">' + '<input type="hidden" name="ZhongbiaoId" value="" />' + + ' < input type = "hidden" name = "ZbZhiyistatus" />' + + ' <input type="hidden" name="ZbZhiyishijian" />' + + '<input type="hidden" name="ZbZhiyichengli" />' + + '<input type="hidden" name="ZbTousustatus" />' + + '<input type="hidden" name="ZbTousushijian" />' + + '<input type="hidden" name="ZbTousuchengli" />' + ' </div>' + ' <label class="text-right col-sm-1 col-md-1 control-label" style="width:60px;">璇勫寰楀垎</label>' + ' <div class="col-sm-2 col-md-2" style="width:10%;">' @@ -963,6 +1043,26 @@ } }); + + function zhiyi(projectid, mingid, type, title) { + if ((type == "1" || type == "4" || type == "5") && mingid == "") { + parent.layer.msg('鏃犱緵搴斿晢', { icon: 5 }); + return; + } + + OpenWindow(title, "50%", "60%", "/Project/Zhiyi?projectid=" + projectid + "&mingid=" + mingid + "&type=" + type); + + } + + function tousu(projectid, mingid, type, title) { + if ((type == "1" || type == "4" || type == "5") && mingid == "") { + parent.layer.msg('鏃犱緵搴斿晢', { icon: 5 }); + return; + } + OpenWindow(title, "50%", "60%", "/Project/Tousu?projectid=" + projectid + "&mingid=" + mingid + "&type=" + type); + + } + </script> </body> </html> \ No newline at end of file diff --git a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml index 48f9f0a..0cdf0e0 100644 --- a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml +++ b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml @@ -93,7 +93,26 @@ { label: '鎶曟爣娆℃暟', name: 'Toubiaocishu', labtype: 'txt', hidden: true }, { label: '涓爣娆℃暟', name: 'Zhongbiaocishu', labtype: 'txt', hidden: true }, { label: '搴熸爣娆℃暟', name: 'Feibiaocishu', labtype: 'txt', hidden: true }, - { label: '涓爣閲戦', name: 'Zhongbiaojine', labtype: 'txt', hidden: true } + { label: '涓爣閲戦', name: 'Zhongbiaojine', labtype: 'txt', hidden: true }, + { + label: '璐ㄧ枒', name: 'Zhiyistatus', labtype: 'txt', hidden: false, width: 60, + formatter: function (cellvalue, options, rowObject) { + + + + return "<a onclick=\"OpenWindow('" + rowObject.Name + "','98%','100%', '/Project/Add?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>"; + } + }, + { + label: '鎶曡瘔', name: 'Tousustatus', labtype: 'txt', hidden: false, width: 60, + formatter: function (cellvalue, options, rowObject) { + + + + return "<a onclick=\"OpenWindow('" + rowObject.Name + "','98%','100%', '/Project/Add?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>"; + } + }, + ]; dataUrl = "/Project/GetLiaotianList?StartTimestar=" + Baomingtimebegin + "|" + Baomingtimeend +"@(string.IsNullOrEmpty(Creater11) ?"":"&Creater="+ Creater11)"; searchCol = [ diff --git a/zhengcaioa/zhengcaioa/Views/Project/Tousu.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Tousu.cshtml new file mode 100644 index 0000000..9b85d53 --- /dev/null +++ b/zhengcaioa/zhengcaioa/Views/Project/Tousu.cshtml @@ -0,0 +1,295 @@ +锘緻model DTO.ProjectDTO +@using DTO; +@using zhengcaioa.Models; +@{ + string projectid = ViewData["projectid"] as string; //鎷滆鏂瑰紡 + string mingid = ViewData["mingid"] as string; //鎷滆鏂瑰紡 + string type = ViewData["type"] as string; //鎷滆鏂瑰紡 + string tousustatus = ViewData["tousustatus"] as string; //鎷滆鏂瑰紡 + string tousushijian = ViewData["tousushijian"] as string; //鎷滆鏂瑰紡 + string tousuchengli = ViewData["tousuchengli"] as string; //鎷滆鏂瑰紡 + +} +@{ + Layout = null; +} + +<!DOCTYPE html> +<html> +<head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"> + <meta name="description" content=""> + <meta name="author" content="ThemeBucket"> + <title>@(SiteConfig.SiteName)</title> + <link href="~/css/bootstrap.min.css" rel="stylesheet"> + <link href="~/css/font-awesome.min.css" rel="stylesheet"> + <link href="~/css/animate.min.css" rel="stylesheet"> + + @*<link href="~/css/plugins/iCheck/custom.css" rel="stylesheet">*@ + <link href="~/css/style.min.css" rel="stylesheet"> + <link href="~/css/plugins/chosen/chosen.css" rel="stylesheet"> + @*<link href="~/js/plugins/layer/skin/layer.css" rel="stylesheet">*@ + @*<link href="~/css/plugins/datapicker/datepicker3.css" rel="stylesheet">*@ + <link href="~/css/style.min.css" rel="stylesheet"> + <link href="~/css/plugins/toastr/toastr.min.css" rel="stylesheet" /> + <link href="~/css/plugins/webuploader/webuploader.css" rel="stylesheet" /> + + <style type="text/css"> + .webuploader-pick { + position: relative; + display: inline-block; + cursor: pointer; + background: #00b7ee; + padding: 8px 14px 7px 14px; + color: #fff; + text-align: center; + border-radius: 3px; + overflow: hidden; + } + + div.clearfix > label { + padding-top: 8px; + } + + .chosen-container { + border-radius: 1px; + border: 1px solid #e5e6e7; + } + + .col-md-1.control-label { + padding-right: 0px; + font-weight: 400; + } + </style> + + <!-- jqgrid--> + @*<link href="~/css/plugins/jqgrid/ui.jqgrid.css" rel="stylesheet">*@ + <script language="javascript" src="~/js/jquery.min.js" type="text/javascript"></script> + <script src="~/js/bootstrap.min.js"></script> + @*<script src="~/js/plugins/bootstro/bootstro.js"></script>*@ + + <!--瀹瑰櫒--> + @*<script language="javascript" src="~/js/datehelper.js" type="text/javascript"></script>*@ + @*<script language="javascript" src="~/js/plugins/query/jquery.query-object.js" type="text/javascript"></script>*@ + @*<script language="javascript" src="~/js/plugins/iCheck/icheck.min.js" type="text/javascript"></script>*@ + <script language="javascript" src="~/js/plugins/chosen/chosen.jquery.js" type="text/javascript"></script> + @*<script language="javascript" src="~/js/plugins/datapicker/bootstrap-datepicker.js" type="text/javascript"></script>*@ + <script language="javascript" src="~/js/plugins/layer/layer.js" type="text/javascript"></script> + @*<script src="~/js/plugins/jqgrid/jquery.jqGrid.min.js" type="text/javascript"></script>*@ + @*<script src="~/js/plugins/jqgrid/i18n/grid.locale-cn.js" type="text/javascript"></script>*@ + <script src="~/js/plugins/toastr/toastr.min.js" type="text/javascript"></script> + <script src="~/js/plugins/webuploader/webuploader.min.js"></script> + + <script language="javascript" src="~/js/common-layout.js" type="text/javascript"></script> + <script src="~/js/plugins/layer/laydate/laydate.js" type="text/javascript"></script> + @*<script src="~/js/plugins/iTexbox/itextbox.js" type="text/javascript"></script>*@ + @*<script src="~/js/plugins/iuploader/iuploader.js"></script>*@ + <script src="~/js/TUJS.js"></script> +</head> +<body class="gray-bg" style="overflow:auto"> + <form id="formtest"> + <div class="wrapper wrapper-content" id="ibox-content" style="padding:15px;"> + <div class="row"> + <div class="col-sm-12"> + <div class="ibox float-e-margins"> + <div class="ibox-title"> + <h5> <i class="fa fa-list"></i> 閫佽揣</h5> + </div> + <div id="div_content" class="ibox-content" style="background-color:white;"> + <div class="row"> + + + + + <div class="clearfix layer-area" style="padding-bottom:15px;"> + <label class="text-right col-sm-2 col-md-2 control-label">鍏憡鏃堕棿<i class="red">*</i></label> + <div class="col-sm-6 col-md-6"> + <input id="Tousushijian" class="form-control" label="鍏憡鏃堕棿" name="Tousushijian" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@tousushijian" readonly="readonly"> + <input type="hidden" id="Id" name="Id" value="@projectid" /> + <input type="hidden" id="MingxiId" name="MingxiId" value="@mingid" /> + <input type="hidden" id="Type" name="Type" value="@type" /> + <input type="hidden" id="Tousustatus" name="Tousustatus" value="@tousustatus" /> + </div> + </div> + <div class="clearfix layer-area" style="padding-bottom:15px;"> + <label class="text-right col-sm-2 col-md-2 control-label">鏄惁鎴愮珛<i class="red">*</i></label> + <div class="col-sm-6 col-md-6"> + <select id="Tousuchengli" class="form-control" name="Tousuchengli" data-placeholder="閫夋嫨 搴忓垪 ..." style="font-weight:normal;"> + <option value="" hassubinfo="true">璇烽�夋嫨</option> + + + @if (tousuchengli == "A") + { + <option value = "A" hassubinfo = "true" selected = "selected" > 鎴愮珛 </option > + + + <option value = "D" hassubinfo = "true" > 鏈垚绔� </option > + } + else if (tousuchengli == "D") + { + + + <option value = "A" hassubinfo = "true" > 鎴愮珛 </option > + + + + + <option value = "D" hassubinfo = "true" selected = "selected" > 鏈垚绔� </option > + } + else + { + <option value = "A" hassubinfo = "true" > 鎴愮珛 </option > + + + + + <option value = "D" hassubinfo = "true" > 鏈垚绔� </option > + } + + + </select> + </div> + </div> + + + + + + + + + + </div> + </div> + </div> + </div> + </div> + </div> + <div class="wrapper wrapper-content" style="margin-top:0px"></div> + <div class="ibox-content" id="top" style="z-index:100; position:fixed; height:50px; width:100%;bottom:0; text-align: right; padding-top:8px "> + <div class="" style="float:right;" data-bootstro-width="500px" data-bootstro-content="鍔熻兘鎸夐挳锛氣�滀繚瀛樷�濓紝鈥滃垹闄も��"> + @*<a class="btn btn-success" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;"> + <i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span> + </a>*@ + + <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;"> + <i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span> + </a> + </div> + </div> + + </form> + <script type="text/javascript"> + + + + var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2 - 95; + $("#div_content").height(hh); + + toastr.options = { + "closeButton": true, + "debug": false, + "progressBar": true, + "positionClass": "toast-bottom-right", + "onclick": null, + "showDuration": "300", + "hideDuration": "600", + "timeOut": "4500", + "extendedTimeOut": "600", + "showEasing": "swing", + "hideEasing": "linear", + "showMethod": "fadeIn", + "hideMethod": "fadeOut" + }; + + + // var id = '@Model.'; + + $(document).ready(function () { + if ("@tousustatus" == "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); + $('.btn-success').hide(); + + } else { + laydate({ elem: "#Tousushijian", format: 'YYYY-MM-DD', istime: true, event: "focus" }); + } + }); + + // 淇濆瓨宀椾綅淇℃伅 + var savePosition = function () { + + + + + + if ($.trim($("#Tousuchengli").val()) == '') { + toastr.warning("鏄惁鎴愮珛涓嶈兘涓虹┖"); + return; + } + + if ($.trim($("#Tousushijian").val()) == '') { + toastr.warning("鍏憡鏃堕棿涓嶈兘涓虹┖"); + return; + } + + + + // var data = { Huifangid: $("#Huifangid").val(), Huifangremark: $("#Huifangremark").val()} + $.ajax({ + type: "POST", + url: "/Project/Tousubaocun", + dataType: "json", + global: false, + data: $('form').serializeArray(), + success: function (data) { + + + + if (data.Result) { + // parent._afterSave(true); + parent.layer.msg('淇濆瓨鎴愬姛', { icon: 6 }); + //window.location = "/Project/add?id=" + data.ReturnID; + + + + _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶 + + + } + else { + // toastr.error("澶辫触"); + parent.layer.msg(data.Message, { icon: 5 }); + } + + }, + error: function () { + + + parent.layer.msg('澶辫触', { icon: 5 }); + } + }); + } + + + + + + + function _pageAutoClose() { + parent.window.location = "/Project/Add?id=@projectid"; + var index = parent.layer.getFrameIndex(window.name); + parent.layer.isRefresh = true; + parent.layer.closeAll('loading'); + parent.layer.close(index); + return false; + } + </script> +</body> +</html> \ No newline at end of file diff --git a/zhengcaioa/zhengcaioa/Views/Project/Zhiyi.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Zhiyi.cshtml new file mode 100644 index 0000000..7482f66 --- /dev/null +++ b/zhengcaioa/zhengcaioa/Views/Project/Zhiyi.cshtml @@ -0,0 +1,291 @@ +锘緻model DTO.ProjectDTO +@using DTO; +@using zhengcaioa.Models; +@{ + string projectid = ViewData["projectid"] as string; //鎷滆鏂瑰紡 + string mingid = ViewData["mingid"] as string; //鎷滆鏂瑰紡 + string type = ViewData["type"] as string; //鎷滆鏂瑰紡 + string zhiyistatus = ViewData["zhiyistatus"] as string; //鎷滆鏂瑰紡 + string zhiyishijian = ViewData["zhiyishijian"] as string; //鎷滆鏂瑰紡 + string zhiyichengli = ViewData["zhiyichengli"] as string; //鎷滆鏂瑰紡 + +} +@{ + Layout = null; +} + +<!DOCTYPE html> +<html> +<head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"> + <meta name="description" content=""> + <meta name="author" content="ThemeBucket"> + <title>@(SiteConfig.SiteName)</title> + <link href="~/css/bootstrap.min.css" rel="stylesheet"> + <link href="~/css/font-awesome.min.css" rel="stylesheet"> + <link href="~/css/animate.min.css" rel="stylesheet"> + + @*<link href="~/css/plugins/iCheck/custom.css" rel="stylesheet">*@ + <link href="~/css/style.min.css" rel="stylesheet"> + <link href="~/css/plugins/chosen/chosen.css" rel="stylesheet"> + @*<link href="~/js/plugins/layer/skin/layer.css" rel="stylesheet">*@ + @*<link href="~/css/plugins/datapicker/datepicker3.css" rel="stylesheet">*@ + <link href="~/css/style.min.css" rel="stylesheet"> + <link href="~/css/plugins/toastr/toastr.min.css" rel="stylesheet" /> + <link href="~/css/plugins/webuploader/webuploader.css" rel="stylesheet" /> + + <style type="text/css"> + .webuploader-pick { + position: relative; + display: inline-block; + cursor: pointer; + background: #00b7ee; + padding: 8px 14px 7px 14px; + color: #fff; + text-align: center; + border-radius: 3px; + overflow: hidden; + } + + div.clearfix > label { + padding-top: 8px; + } + + .chosen-container { + border-radius: 1px; + border: 1px solid #e5e6e7; + } + + .col-md-1.control-label { + padding-right: 0px; + font-weight: 400; + } + </style> + + <!-- jqgrid--> + @*<link href="~/css/plugins/jqgrid/ui.jqgrid.css" rel="stylesheet">*@ + <script language="javascript" src="~/js/jquery.min.js" type="text/javascript"></script> + <script src="~/js/bootstrap.min.js"></script> + @*<script src="~/js/plugins/bootstro/bootstro.js"></script>*@ + + <!--瀹瑰櫒--> + @*<script language="javascript" src="~/js/datehelper.js" type="text/javascript"></script>*@ + @*<script language="javascript" src="~/js/plugins/query/jquery.query-object.js" type="text/javascript"></script>*@ + @*<script language="javascript" src="~/js/plugins/iCheck/icheck.min.js" type="text/javascript"></script>*@ + <script language="javascript" src="~/js/plugins/chosen/chosen.jquery.js" type="text/javascript"></script> + @*<script language="javascript" src="~/js/plugins/datapicker/bootstrap-datepicker.js" type="text/javascript"></script>*@ + <script language="javascript" src="~/js/plugins/layer/layer.js" type="text/javascript"></script> + @*<script src="~/js/plugins/jqgrid/jquery.jqGrid.min.js" type="text/javascript"></script>*@ + @*<script src="~/js/plugins/jqgrid/i18n/grid.locale-cn.js" type="text/javascript"></script>*@ + <script src="~/js/plugins/toastr/toastr.min.js" type="text/javascript"></script> + <script src="~/js/plugins/webuploader/webuploader.min.js"></script> + + <script language="javascript" src="~/js/common-layout.js" type="text/javascript"></script> + <script src="~/js/plugins/layer/laydate/laydate.js" type="text/javascript"></script> + @*<script src="~/js/plugins/iTexbox/itextbox.js" type="text/javascript"></script>*@ + @*<script src="~/js/plugins/iuploader/iuploader.js"></script>*@ + <script src="~/js/TUJS.js"></script> +</head> +<body class="gray-bg" style="overflow:auto"> + <form id="formtest"> + <div class="wrapper wrapper-content" id="ibox-content" style="padding:15px;"> + <div class="row"> + <div class="col-sm-12"> + <div class="ibox float-e-margins"> + <div class="ibox-title"> + <h5> <i class="fa fa-list"></i> 閫佽揣</h5> + </div> + <div id="div_content" class="ibox-content" style="background-color:white;"> + <div class="row"> + + + + + <div class="clearfix layer-area" style="padding-bottom:15px;"> + <label class="text-right col-sm-2 col-md-2 control-label">鍏憡鏃堕棿<i class="red">*</i></label> + <div class="col-sm-6 col-md-6"> + <input id="Zhiyishijian" class="form-control" label="鍏憡鏃堕棿" name="Zhiyishijian" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@zhiyishijian" readonly="readonly"> + <input type="hidden" id="Id" name="Id" value="@projectid" /> + <input type="hidden" id="MingxiId" name="MingxiId" value="@mingid" /> + <input type="hidden" id="Type" name="Type" value="@type" /> + <input type="hidden" id="Zhiyistatus" name="Zhiyistatus" value="@zhiyistatus" /> + </div> + </div> + <div class="clearfix layer-area" style="padding-bottom:15px;"> + <label class="text-right col-sm-2 col-md-2 control-label">鏄惁鎴愮珛<i class="red">*</i></label> + <div class="col-sm-6 col-md-6"> + <select id="Zhiyichengli" class="form-control" name="Zhiyichengli" data-placeholder="閫夋嫨 搴忓垪 ..." style="font-weight:normal;"> + <option value="" hassubinfo="true">璇烽�夋嫨</option> + @if (zhiyichengli == "A") + { + <option value="A" hassubinfo="true" selected="selected"> 鎴愮珛 </option> + + + <option value="D" hassubinfo="true"> 鏈垚绔� </option> + } + else if (zhiyichengli == "D") + { + + + <option value="A" hassubinfo="true"> 鎴愮珛 </option> + + + + + <option value="D" hassubinfo="true" selected="selected"> 鏈垚绔� </option> + } + else + { + <option value="A" hassubinfo="true"> 鎴愮珛 </option> + + + + + <option value="D" hassubinfo="true"> 鏈垚绔� </option> + } + </select> + </div> + </div> + + + + + + + + + + </div> + </div> + </div> + </div> + </div> + </div> + <div class="wrapper wrapper-content" style="margin-top:0px"></div> + <div class="ibox-content" id="top" style="z-index:100; position:fixed; height:50px; width:100%;bottom:0; text-align: right; padding-top:8px "> + <div class="" style="float:right;" data-bootstro-width="500px" data-bootstro-content="鍔熻兘鎸夐挳锛氣�滀繚瀛樷�濓紝鈥滃垹闄も��"> + @*<a class="btn btn-success" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;"> + <i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span> + </a>*@ + + <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;"> + <i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span> + </a> + </div> + </div> + + </form> + <script type="text/javascript"> + + + + var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2 - 95; + $("#div_content").height(hh); + + toastr.options = { + "closeButton": true, + "debug": false, + "progressBar": true, + "positionClass": "toast-bottom-right", + "onclick": null, + "showDuration": "300", + "hideDuration": "600", + "timeOut": "4500", + "extendedTimeOut": "600", + "showEasing": "swing", + "hideEasing": "linear", + "showMethod": "fadeIn", + "hideMethod": "fadeOut" + }; + + + // var id = '@Model.'; + + $(document).ready(function () { + if ("@zhiyistatus" == "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); + $('.btn-success').hide(); + + } else { + laydate({ elem: "#Zhiyishijian", format: 'YYYY-MM-DD', istime: true, event: "focus" }); + } + }); + + // 淇濆瓨宀椾綅淇℃伅 + var savePosition = function () { + + + + + + if ($.trim($("#Zhiyichengli").val()) == '') { + toastr.warning("鏄惁鎴愮珛涓嶈兘涓虹┖"); + return; + } + + if ($.trim($("#Zhiyishijian").val()) == '') { + toastr.warning("鍏憡鏃堕棿涓嶈兘涓虹┖"); + return; + } + + + + // var data = { Huifangid: $("#Huifangid").val(), Huifangremark: $("#Huifangremark").val()} + $.ajax({ + type: "POST", + url: "/Project/Zhiyibaocun", + dataType: "json", + global: false, + data: $('form').serializeArray(), + success: function (data) { + + + + if (data.Result) { + // parent._afterSave(true); + parent.layer.msg('淇濆瓨鎴愬姛', { icon: 6 }); + //window.location = "/Project/add?id=" + data.ReturnID; + + + + _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶 + + + } + else { + // toastr.error("澶辫触"); + parent.layer.msg(data.Message, { icon: 5 }); + } + + }, + error: function () { + + + parent.layer.msg('澶辫触', { icon: 5 }); + } + }); + } + + + + + + + function _pageAutoClose() { + parent.window.location = "/Project/Add?id=@projectid"; + var index = parent.layer.getFrameIndex(window.name); + parent.layer.isRefresh = true; + parent.layer.closeAll('loading'); + parent.layer.close(index); + return false; + } + </script> +</body> +</html> \ No newline at end of file -- Gitblit v1.9.1