From 976aa1a04fff81af4939affa80d3357013157353 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 28 七月 2022 16:51:17 +0800
Subject: [PATCH] 文书管理

---
 zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml             |  266 +++--
 zhengcaioa/DTO/TChallengeItemDTO.cs                                      |    1 
 zhengcaioa/Model/TChallengeItem.cs                                       |    1 
 zhengcaioa/DTO/TChallengeletterDTO.cs                                    |    1 
 zhengcaioa/DTO/TChallengeRequestInfoDTO.cs                               |   15 
 zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml                     |   21 
 zhengcaioa/zhengcaioa/Views/SysCode/Editlawzidingyi.cshtml               |    4 
 zhengcaioa/DTO/TComplaintletterDTO.cs                                    |    2 
 zhengcaioa/Model/zhengcaioaContext.cs                                    |   30 
 zhengcaioa/Services/CooperOrderService.cs                                |  113 ++
 zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs |  346 ++++++-
 zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml              |  624 ++++++++++-----
 zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs                          |    5 
 zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml                      |   64 
 zhengcaioa/DTO/ResultEntity.cs                                           |    1 
 zhengcaioa/DTO/CooperOrderDTO.cs                                         |    5 
 zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml             |  182 ++-
 zhengcaioa/Model/TComplaintItem.cs                                       |    1 
 zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml              |  693 ++++++++++------
 zhengcaioa/DTO/TComplaintItemDTO.cs                                      |    1 
 zhengcaioa/IServices/ICooperOrderService.cs                              |    8 
 zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml                       |    2 
 zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs                   |    3 
 zhengcaioa/Model/TChallengeRequestInfo.cs                                |   15 
 24 files changed, 1,649 insertions(+), 755 deletions(-)

diff --git a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
index f81db77..d317161 100644
--- a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
+++ b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
@@ -323,7 +323,10 @@
             CreateMap<ZhengfuProjectDTO, ZhengfuProject>();
 
             CreateMap<Zxdsfxl, ZxdsfxlDTO>();
-            CreateMap<ZxdsfxlDTO, Zxdsfxl>(); 
+            CreateMap<ZxdsfxlDTO, Zxdsfxl>();
+
+            CreateMap<TChallengeRequestInfo, TChallengeRequestInfoDTO>();
+            CreateMap<TChallengeRequestInfoDTO, TChallengeRequestInfo>();
 
         }
     }
diff --git a/zhengcaioa/DTO/CooperOrderDTO.cs b/zhengcaioa/DTO/CooperOrderDTO.cs
index 088dd5d..d71abc5 100644
--- a/zhengcaioa/DTO/CooperOrderDTO.cs
+++ b/zhengcaioa/DTO/CooperOrderDTO.cs
@@ -141,9 +141,14 @@
 
         public string[] Evidential { get; set; }
         public string[] Question { get; set; }
+        public string[] Questionname { get; set; }
         public string[] Law { get; set; }
         public string[] Lawcoment { get; set; }
 
+        public string[] RequestInfos { get; set; }
+        public string[] RequestInfoname { get; set; }
+        
+
         public string[] challengeItemId { get; set; }
         public string[] challengeItemIdlaw { get; set; }
 
diff --git a/zhengcaioa/DTO/ResultEntity.cs b/zhengcaioa/DTO/ResultEntity.cs
index 20ca713..e8277ce 100644
--- a/zhengcaioa/DTO/ResultEntity.cs
+++ b/zhengcaioa/DTO/ResultEntity.cs
@@ -45,6 +45,7 @@
         /// 濡傛灉鎵ц缁撴灉涓篺alse锛屽叾閿欒淇℃伅 
         /// </summary>
         public string Remark { get; set; }
+        public string Remark2 { get; set; }
         public List<T> DataList { get; set; }
         public T DataInfo { get; set; }
     }
diff --git a/zhengcaioa/DTO/TChallengeItemDTO.cs b/zhengcaioa/DTO/TChallengeItemDTO.cs
index da2350c..4cdc3a4 100644
--- a/zhengcaioa/DTO/TChallengeItemDTO.cs
+++ b/zhengcaioa/DTO/TChallengeItemDTO.cs
@@ -11,6 +11,7 @@
         public string ChallengeId { get; set; }
         public string Question { get; set; }
         public string QuestionName { get; set; }
+        public string Questionname { get; set; }
         public string Evidential { get; set; }
         public string Law { get; set; }
         public string LawName { get; set; }
diff --git a/zhengcaioa/DTO/TChallengeRequestInfoDTO.cs b/zhengcaioa/DTO/TChallengeRequestInfoDTO.cs
new file mode 100644
index 0000000..2ed2adf
--- /dev/null
+++ b/zhengcaioa/DTO/TChallengeRequestInfoDTO.cs
@@ -0,0 +1,15 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DTO
+{
+    public class TChallengeRequestInfoDTO
+    {
+        public int Id { get; set; }
+        public string ChallengeId { get; set; }
+        public string RequestInfo { get; set; }
+        public string RequestInfoname { get; set; }
+        public string RequestInfoNameName { get; set; }
+    }
+}
diff --git a/zhengcaioa/DTO/TChallengeletterDTO.cs b/zhengcaioa/DTO/TChallengeletterDTO.cs
index ff1db58..6fb290b 100644
--- a/zhengcaioa/DTO/TChallengeletterDTO.cs
+++ b/zhengcaioa/DTO/TChallengeletterDTO.cs
@@ -40,6 +40,7 @@
         public int? Status { get; set; }
         public List<TChallengeItemDTO> challengeItemDTOs { get; set; }
         public List<TComplaintShouquandaibiaoDTO> complaintShouquandaibiaoDTOs { get; set; }
+        public List<TChallengeRequestInfoDTO> challengeRequestInfoDTOs { get; set; }
 
         public string khid { get; set; }
     }
diff --git a/zhengcaioa/DTO/TComplaintItemDTO.cs b/zhengcaioa/DTO/TComplaintItemDTO.cs
index 22cd252..3a133b7 100644
--- a/zhengcaioa/DTO/TComplaintItemDTO.cs
+++ b/zhengcaioa/DTO/TComplaintItemDTO.cs
@@ -11,6 +11,7 @@
         public string ComplaintId { get; set; }
         public string Question { get; set; }
         public string QuestionName { get; set; }
+        public string Questionname { get; set; }
         public string Evidential { get; set; }
         public string Law { get; set; }
         public string LawName { get; set; }
diff --git a/zhengcaioa/DTO/TComplaintletterDTO.cs b/zhengcaioa/DTO/TComplaintletterDTO.cs
index dc76405..cbefb00 100644
--- a/zhengcaioa/DTO/TComplaintletterDTO.cs
+++ b/zhengcaioa/DTO/TComplaintletterDTO.cs
@@ -61,6 +61,8 @@
 
         public List<TComplaintGongyingshangDTO> complaintGongyingshangDTOs { get; set; }
 
+        public List<TChallengeRequestInfoDTO> challengeRequestInfoDTOs { get; set; }
+
 
 
     }
diff --git a/zhengcaioa/IServices/ICooperOrderService.cs b/zhengcaioa/IServices/ICooperOrderService.cs
index 8a24255..55c1866 100644
--- a/zhengcaioa/IServices/ICooperOrderService.cs
+++ b/zhengcaioa/IServices/ICooperOrderService.cs
@@ -53,6 +53,14 @@
 
         List<TChallengeItemDTO> GetListChallengeItem(string ChallengeId);
 
+
+        //涓庢姇璇変簨椤圭浉鍏崇殑鎶曡瘔璇锋眰瀛愯〃
+        ResultEntity saveChallengeRequestInfo(TChallengeRequestInfoDTO dto);
+
+        ResultEntity deleteChallengeRequestInfo(string ChallengeId);
+
+        List<TChallengeRequestInfoDTO> GetListChallengeRequestInfo(string ChallengeId);
+
         //鎶曡瘔涔﹀巻鍙茶褰曡〃
         ResultEntity saveComplaintletter(TComplaintletterDTO dto);
 
diff --git a/zhengcaioa/Model/TChallengeItem.cs b/zhengcaioa/Model/TChallengeItem.cs
index e906643..35c83f6 100644
--- a/zhengcaioa/Model/TChallengeItem.cs
+++ b/zhengcaioa/Model/TChallengeItem.cs
@@ -10,6 +10,7 @@
         public int Id { get; set; }
         public string ChallengeId { get; set; }
         public string Question { get; set; }
+        public string Questionname { get; set; }
         public string Evidential { get; set; }
         public string Law { get; set; }
         public string Lawcoment { get; set; }
diff --git a/zhengcaioa/Model/TChallengeRequestInfo.cs b/zhengcaioa/Model/TChallengeRequestInfo.cs
new file mode 100644
index 0000000..17f287c
--- /dev/null
+++ b/zhengcaioa/Model/TChallengeRequestInfo.cs
@@ -0,0 +1,15 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+    public partial class TChallengeRequestInfo
+    {
+        public int Id { get; set; }
+        public string ChallengeId { get; set; }
+        public string RequestInfo { get; set; }
+        public string RequestInfoname { get; set; }
+    }
+}
diff --git a/zhengcaioa/Model/TComplaintItem.cs b/zhengcaioa/Model/TComplaintItem.cs
index 493ed0c..f28d98a 100644
--- a/zhengcaioa/Model/TComplaintItem.cs
+++ b/zhengcaioa/Model/TComplaintItem.cs
@@ -10,6 +10,7 @@
         public int Id { get; set; }
         public string ComplaintId { get; set; }
         public string Question { get; set; }
+        public string Questionname { get; set; }
         public string Evidential { get; set; }
         public string Law { get; set; }
         public string Lawcoment { get; set; }
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index 564d792..a94a147 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -131,6 +131,7 @@
 
         public virtual DbSet<TChallengeItem> TChallengeItems { get; set; }
         public virtual DbSet<TChallengeletter> TChallengeletters { get; set; }
+        public virtual DbSet<TChallengeRequestInfo> TChallengeRequestInfos { get; set; }
         public virtual DbSet<TComplaintItem> TComplaintItems { get; set; }
         public virtual DbSet<TComplaintRespondent> TComplaintRespondents { get; set; }
         public virtual DbSet<TComplaintletter> TComplaintletters { get; set; }
@@ -5820,7 +5821,7 @@
                     .HasColumnName("comments");
 
                 entity.Property(e => e.Contents)
-                    .HasMaxLength(300)
+                    .HasMaxLength(500)
                     .HasColumnName("contents");
 
                 entity.Property(e => e.Creater)
@@ -7087,6 +7088,10 @@
                     .HasMaxLength(300)
                     .HasColumnName("question");
 
+                entity.Property(e => e.Questionname)
+                 .HasMaxLength(500)
+                 .HasColumnName("questionname");
+
                 entity.Property(e => e.Sort).HasColumnName("sort");
             });
 
@@ -7209,6 +7214,25 @@
                     .HasColumnName("xm_package");
             });
 
+            modelBuilder.Entity<TChallengeRequestInfo>(entity =>
+            {
+                entity.ToTable("t_challenge_requestInfo");
+
+                entity.Property(e => e.Id).HasColumnName("id");
+
+                entity.Property(e => e.ChallengeId)
+                    .HasMaxLength(50)
+                    .HasColumnName("challenge_id");
+
+                entity.Property(e => e.RequestInfo)
+                    .HasMaxLength(50)
+                    .HasColumnName("requestInfo");
+
+                entity.Property(e => e.RequestInfoname)
+                    .HasMaxLength(500)
+                    .HasColumnName("requestInfoname");
+            });
+
             modelBuilder.Entity<TComplaintItem>(entity =>
             {
                 entity.ToTable("t_complaint_items");
@@ -7235,6 +7259,10 @@
                     .HasMaxLength(300)
                     .HasColumnName("question");
 
+                entity.Property(e => e.Questionname)
+                .HasMaxLength(500)
+                .HasColumnName("questionname");
+
                 entity.Property(e => e.Sort).HasColumnName("sort");
             });
 
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index 0de12ce..03ed8db 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -1225,6 +1225,7 @@
                     updateproject.Law = entity.Law;
                     updateproject.Sort = entity.Sort;
                     updateproject.Lawcoment = entity.Lawcoment;
+                    updateproject.Questionname = entity.Questionname;
 
                 }
 
@@ -1507,7 +1508,7 @@
                     updateproject.Law = entity.Law;
                     updateproject.Sort = entity.Sort;
                     updateproject.Lawcoment = entity.Lawcoment;
-
+                    updateproject.Questionname = entity.Questionname;
 
                 }
 
@@ -2035,5 +2036,115 @@
 
             return entity;
         }
+
+
+        public List<TChallengeRequestInfoDTO> GetListChallengeRequestInfo(string ChallengeId)
+        {
+
+            var entity = _context.TChallengeRequestInfos.Where(x => x.ChallengeId == ChallengeId).OrderBy(x => x.Id).ToList();
+
+
+
+            var result = _mapper.Map<List<TChallengeRequestInfoDTO>>(entity);
+
+
+            var request_info = (from a in _context.SysCodeDtls
+                            join b in _context.SysCodes
+                            on a.CodeId equals b.Id
+                            where a.RecStatus == "A"
+                                          && b.RecStatus == "A"
+                            select new CodeDataEntity()
+                            {
+                                CodeId = b.Id,
+                                CodeTable = b.CodeTable,
+                                CodeField = b.CodeField,
+                                CodeSn = a.CodeSn,
+                                Comments = a.Comments,
+                                Contents = a.Contents,
+                                RecStatus = a.RecStatus,
+                                Sort = a.Sort
+                            }
+                   ).Where(x => x.CodeTable == "t_challengeletter" && x.CodeField == "request_info").ToList();
+
+
+           
+
+            foreach (var challengeItemDTO in result)
+            {
+                var codeDataEntity = request_info.Where(x => x.CodeSn == challengeItemDTO.RequestInfo).FirstOrDefault();
+                if (codeDataEntity != null)
+                {
+                    challengeItemDTO.RequestInfoNameName = codeDataEntity.Comments;
+                }
+
+              
+            }
+
+
+            return result;
+        }
+
+
+        public ResultEntity saveChallengeRequestInfo(TChallengeRequestInfoDTO dto)
+        {
+            ResultEntity resultEntity = new ResultEntity();
+            try
+            {
+
+
+                var entity = _mapper.Map<TChallengeRequestInfo>(dto);
+
+
+                if (entity.Id <= 0)
+                {
+
+
+                    _context.TChallengeRequestInfos.Add(entity);
+                }
+                else
+                {
+                    var updateproject = _context.TChallengeRequestInfos.Find(entity.Id);
+
+
+                    updateproject.ChallengeId = entity.ChallengeId;
+                    updateproject.RequestInfo = entity.RequestInfo;
+                    updateproject.RequestInfoname = entity.RequestInfoname;
+                    
+
+                }
+
+                _context.SaveChanges();
+                resultEntity.ReturnID = entity.Id.ToString();
+                resultEntity.Result = true;
+            }
+            catch (Exception ex)
+            {
+                resultEntity.Result = false;
+                resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠$悊鍛�";
+
+            }
+            return resultEntity;
+        }
+
+
+        /// <summary>
+        /// 鍒犻櫎璐ㄧ枒鍑藉瓙琛�
+        /// </summary>
+        /// <returns></returns>
+        public ResultEntity deleteChallengeRequestInfo(string ChallengeId)
+        {
+            ResultEntity result = new ResultEntity();
+            result.Result = true;
+
+            var models = _context.TChallengeRequestInfos.Where(x => x.ChallengeId == ChallengeId).ToList(); ;
+
+            foreach (var challengeItem in models)
+            {
+                _context.TChallengeRequestInfos.Remove(challengeItem);
+            }
+            _context.SaveChanges();
+            return result;
+        }
+
     }
 }
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index e4732ad..7eee552 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -418,118 +418,237 @@
             return new JsonResult(_cooperOrderService.SearchByPaging(search));
         }
         [CheckLogin]
-        public IActionResult Edit(string id = null, string ShouliStatus = "1")
+        public IActionResult Edit(string id = null, string ShouliStatus = "1",string dingdantype = "0")
         {
             var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
             ViewData["curentuser"] = curentuser;
 
             CooperOrderDTO dto = new CooperOrderDTO();
-            if (!String.IsNullOrEmpty(id))
+            if(dingdantype == "0")
             {
-                dto = _cooperOrderService.Get(id);
-                ViewBag.ShouliStatus = ShouliStatus;
-                //ViewBag.YouHuiList = _askService.GetAskYouHuiList(dto.Khdw, dto.OrderType);
-                //璐ㄧ枒鍑�
-                List<TChallengeletterDTO> challengeletterDTOs  = _cooperOrderService.GetListChallengeletter(id);
-                TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
-                if (challengeletterDTOs!=null&& challengeletterDTOs.Count > 0)
+
+                if (!String.IsNullOrEmpty(id))
                 {
-                    challengeletterDTO = challengeletterDTOs[0];
-                    if (challengeletterDTO.DocumentsDate.HasValue)
+                    dto = _cooperOrderService.Get(id);
+                    ViewBag.ShouliStatus = ShouliStatus;
+                    //ViewBag.YouHuiList = _askService.GetAskYouHuiList(dto.Khdw, dto.OrderType);
+                    //璐ㄧ枒鍑�
+                    List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengeletter(id);
+                    TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
+                    if (challengeletterDTOs != null && challengeletterDTOs.Count > 0)
                     {
-                        challengeletterDTO.DocumentsDateName = challengeletterDTO.DocumentsDate.Value.ToString("yyyy-MM-dd");
+                        challengeletterDTO = challengeletterDTOs[0];
+                        if (challengeletterDTO.DocumentsDate.HasValue)
+                        {
+                            challengeletterDTO.DocumentsDateName = challengeletterDTO.DocumentsDate.Value.ToString("yyyy-MM-dd");
+                        }
+                        List<TChallengeItemDTO> challengeItemDTOs = _cooperOrderService.GetListChallengeItem(challengeletterDTO.Id);
+                        if (challengeItemDTOs.Count > 0)
+                            challengeletterDTO.challengeItemDTOs = challengeItemDTOs;
+                        else
+                            challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+                        List<TComplaintShouquandaibiaoDTO> complaintShouquandaibiaoDTOs = _cooperOrderService.GetListComplaintShouquandaibiao(challengeletterDTO.Id);
+                        if (complaintShouquandaibiaoDTOs.Count > 0)
+                            challengeletterDTO.complaintShouquandaibiaoDTOs = complaintShouquandaibiaoDTOs;
+                        else
+                            challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+
                     }
-                    List<TChallengeItemDTO> challengeItemDTOs = _cooperOrderService.GetListChallengeItem(challengeletterDTO.Id);
-                    if(challengeItemDTOs.Count>0)
-                        challengeletterDTO.challengeItemDTOs = challengeItemDTOs;
                     else
+                    {
                         challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
-                    List<TComplaintShouquandaibiaoDTO> complaintShouquandaibiaoDTOs = _cooperOrderService.GetListComplaintShouquandaibiao(challengeletterDTO.Id);
-                    if (complaintShouquandaibiaoDTOs.Count > 0)
-                        challengeletterDTO.complaintShouquandaibiaoDTOs = complaintShouquandaibiaoDTOs;
-                    else
                         challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
-
-                }
-                else
-                {
-                    challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
-                    challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
-                }
-                ViewBag.challengeletterDTO = challengeletterDTO;
-                //鎶曡瘔涔�
-                List<TComplaintletterDTO> complaintletterDTOs = _cooperOrderService.GetListComplaintletter(id);
-                TComplaintletterDTO complaintletterDTO = new TComplaintletterDTO();
-                if (complaintletterDTOs != null && complaintletterDTOs.Count > 0)
-                {
-                    complaintletterDTO = complaintletterDTOs[0];
-
-                    if (complaintletterDTO.NoticeDate.HasValue)
-                    {
-                        complaintletterDTO.NoticeDateName = complaintletterDTO.NoticeDate.Value.ToString("yyyy-MM-dd");
                     }
-
-                    if (complaintletterDTO.ResultnoticeDate.HasValue)
+                    ViewBag.challengeletterDTO = challengeletterDTO;
+                    //鎶曡瘔涔�
+                    List<TComplaintletterDTO> complaintletterDTOs = _cooperOrderService.GetListComplaintletter(id);
+                    TComplaintletterDTO complaintletterDTO = new TComplaintletterDTO();
+                    if (complaintletterDTOs != null && complaintletterDTOs.Count > 0)
                     {
-                        complaintletterDTO.ResultnoticeDateName = complaintletterDTO.ResultnoticeDate.Value.ToString("yyyy-MM-dd");
-                    }
+                        complaintletterDTO = complaintletterDTOs[0];
 
-                    List<TComplaintItemDTO> complaintItemDTOs = _cooperOrderService.GetListComplaintItem(complaintletterDTO.Id);
-                    if (complaintItemDTOs.Count > 0)
-                        complaintletterDTO.complaintItemDTOs = complaintItemDTOs;
+                        if (complaintletterDTO.NoticeDate.HasValue)
+                        {
+                            complaintletterDTO.NoticeDateName = complaintletterDTO.NoticeDate.Value.ToString("yyyy-MM-dd");
+                        }
+
+                        if (complaintletterDTO.ResultnoticeDate.HasValue)
+                        {
+                            complaintletterDTO.ResultnoticeDateName = complaintletterDTO.ResultnoticeDate.Value.ToString("yyyy-MM-dd");
+                        }
+
+                        List<TComplaintItemDTO> complaintItemDTOs = _cooperOrderService.GetListComplaintItem(complaintletterDTO.Id);
+                        if (complaintItemDTOs.Count > 0)
+                            complaintletterDTO.complaintItemDTOs = complaintItemDTOs;
+                        else
+                            complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
+
+                        List<TComplaintRespondentDTO> complaintRespondentDTOs = _cooperOrderService.GetListComplaintRespondent(complaintletterDTO.Id);
+                        if (complaintRespondentDTOs.Count > 0)
+                            complaintletterDTO.complaintRespondentDTOs = complaintRespondentDTOs;
+                        else
+                            complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
+
+                        List<TComplaintShouquandaibiaoDTO> complaintShouquandaibiaoDTOs = _cooperOrderService.GetListComplaintShouquandaibiao(complaintletterDTO.Id);
+                        if (complaintShouquandaibiaoDTOs.Count > 0)
+                            complaintletterDTO.complaintShouquandaibiaoDTOs = complaintShouquandaibiaoDTOs;
+                        else
+                            complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+
+                        List<TComplaintGongyingshangDTO> complaintGongyingshangDTOs = _cooperOrderService.GetListComplaintGongyingshang(complaintletterDTO.Id);
+                        if (complaintGongyingshangDTOs.Count > 0)
+                            complaintletterDTO.complaintGongyingshangDTOs = complaintGongyingshangDTOs;
+                        else
+                            complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>()/* { new TComplaintGongyingshangDTO() }*/;
+
+                    }
                     else
+                    {
                         complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
-
-                    List<TComplaintRespondentDTO> complaintRespondentDTOs = _cooperOrderService.GetListComplaintRespondent(complaintletterDTO.Id);
-                    if (complaintRespondentDTOs.Count > 0)
-                        complaintletterDTO.complaintRespondentDTOs = complaintRespondentDTOs;
-                    else
                         complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
-
-                    List<TComplaintShouquandaibiaoDTO> complaintShouquandaibiaoDTOs = _cooperOrderService.GetListComplaintShouquandaibiao(complaintletterDTO.Id);
-                    if (complaintShouquandaibiaoDTOs.Count > 0)
-                        complaintletterDTO.complaintShouquandaibiaoDTOs = complaintShouquandaibiaoDTOs;
-                    else
                         complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
-
-                    List<TComplaintGongyingshangDTO> complaintGongyingshangDTOs = _cooperOrderService.GetListComplaintGongyingshang(complaintletterDTO.Id);
-                    if (complaintGongyingshangDTOs.Count > 0)
-                        complaintletterDTO.complaintGongyingshangDTOs = complaintGongyingshangDTOs;
-                    else
                         complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>()/* { new TComplaintGongyingshangDTO() }*/;
 
+                    }
+                    ViewBag.complaintletterDTO = complaintletterDTO;
                 }
                 else
                 {
+                    dto.XdTime = DateTime.Now;
+                    dto.OrderNum = 1;
+                    ViewBag.ShouliStatus = "1";
+                    dto.OrderNo = _cooperOrderService.GetOrderNo();
+                    //ViewBag.YouHuiList = new List<AdmAskYouHuiDTO>();
+                    //璐ㄧ枒鍑�
+                    TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
+                    challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+                    challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+                    ViewBag.challengeletterDTO = challengeletterDTO;
+                    //鎶曡瘔涔�
+                    TComplaintletterDTO complaintletterDTO = new TComplaintletterDTO();
                     complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
                     complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
                     complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
-                    complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>()/* { new TComplaintGongyingshangDTO() }*/;
+                    complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() /*{ new TComplaintGongyingshangDTO() }*/;
+                    ViewBag.complaintletterDTO = complaintletterDTO;
 
                 }
-                ViewBag.complaintletterDTO = complaintletterDTO;
             }
-            else
+            else if (dingdantype == "1")
             {
-                dto.XdTime = DateTime.Now;
-                dto.OrderNum = 1;
-                ViewBag.ShouliStatus = "1";
-                dto.OrderNo = _cooperOrderService.GetOrderNo();
-                //ViewBag.YouHuiList = new List<AdmAskYouHuiDTO>();
+                dto = _cooperOrderService.Get(id);
+                ViewBag.ShouliStatus = ShouliStatus;
+
+
+
+
+
                 //璐ㄧ枒鍑�
                 TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
                 challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
                 challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
                 ViewBag.challengeletterDTO = challengeletterDTO;
                 //鎶曡瘔涔�
+              
                 TComplaintletterDTO complaintletterDTO = new TComplaintletterDTO();
-                complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
-                complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO()};
-                complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
-                complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() /*{ new TComplaintGongyingshangDTO() }*/;
-                ViewBag.complaintletterDTO = complaintletterDTO;
 
+                complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
+                complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
+                //complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+                complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>()/* { new TComplaintGongyingshangDTO() }*/;
+                List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengeletter(id);
+
+                if (challengeletterDTOs != null && challengeletterDTOs.Count > 0)
+                {
+                    complaintletterDTO.TsrName = challengeletterDTOs[0].GysName;
+                    complaintletterDTO.TsrAddress = challengeletterDTOs[0].GysAddress;
+                    complaintletterDTO.TsrPostcode = challengeletterDTOs[0].GysPostcode;
+                    complaintletterDTO.TsrCorporation = challengeletterDTOs[0].GysContacts;
+                    complaintletterDTO.TsrPhone = challengeletterDTOs[0].GysPhone;
+                    complaintletterDTO.XmName = challengeletterDTOs[0].XmName;
+                    complaintletterDTO.XmCode = challengeletterDTOs[0].XmCode;
+                    complaintletterDTO.XmPackage = challengeletterDTOs[0].XmPackage;
+                    complaintletterDTO.PurchaserName = challengeletterDTOs[0].PurchaserName;
+                    //complaintletterDTO.Agency = challengeletterDTOs[0].PurchaserName;
+
+
+
+
+                    complaintletterDTO.ChallengeDateName = challengeletterDTOs[0].DocumentsDate.HasValue ? challengeletterDTOs[0].DocumentsDate.Value.ToString("yyyy-MM-dd") : "";
+                    complaintletterDTO.RequestInfo = challengeletterDTOs[0].RequestInfo;
+                    complaintletterDTO.Questioned = challengeletterDTOs[0].PurchaserName;
+
+                    List<TComplaintShouquandaibiaoDTO> complaintShouquandaibiaoDTOs = _cooperOrderService.GetListComplaintShouquandaibiao(challengeletterDTOs[0].Id);
+                    if (complaintShouquandaibiaoDTOs.Count > 0)
+                        complaintletterDTO.complaintShouquandaibiaoDTOs = complaintShouquandaibiaoDTOs;
+                    else
+                        complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+                }
+
+
+                    ViewBag.complaintletterDTO = complaintletterDTO;
+
+
+                dto.Id = "";
+                dto.OrderType = "02";
+                dto.OrderType1 = "浠f嫙鎶曡瘔涔�";
+                //dto.OrderType2 = "";
             }
+            else if (dingdantype == "2")
+            {
+                dto = _cooperOrderService.Get(id);
+                ViewBag.ShouliStatus = ShouliStatus;
+                dto.Id = "";
+                dto.OrderType = "08";
+                dto.OrderType1 = "澶嶈璇夎";
+                dto.OrderType2 = "";
+
+                //璐ㄧ枒鍑�
+                TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
+
+                challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+                challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+
+                ViewBag.challengeletterDTO = challengeletterDTO;
+                //鎶曡瘔涔�
+                TComplaintletterDTO complaintletterDTO = new TComplaintletterDTO();
+
+                complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
+                complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
+                complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+                complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>()/* { new TComplaintGongyingshangDTO() }*/;
+
+
+                ViewBag.complaintletterDTO = complaintletterDTO;
+            }
+            else if (dingdantype == "3")
+            {
+                dto = _cooperOrderService.Get(id);
+                ViewBag.ShouliStatus = ShouliStatus;
+                dto.Id = "";
+
+
+                //璐ㄧ枒鍑�
+                TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
+
+                challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+                challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+
+                ViewBag.challengeletterDTO = challengeletterDTO;
+                //鎶曡瘔涔�
+                TComplaintletterDTO complaintletterDTO = new TComplaintletterDTO();
+
+                complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
+                complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
+                complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+                complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>()/* { new TComplaintGongyingshangDTO() }*/;
+
+
+                ViewBag.complaintletterDTO = complaintletterDTO;
+            }
+
+
+
             ViewBag.request_info = _liaotianService.GetSYScode("t_challengeletter", "request_info");//璐ㄧ枒璇锋眰
             ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question"); //	璐ㄧ枒浜嬮」
             ViewBag.law = _liaotianService.GetSYScode("t_complaint_items", "law");//娉曞緥渚濇嵁
@@ -1803,6 +1922,13 @@
                     challengeletterDTO.complaintShouquandaibiaoDTOs = complaintShouquandaibiaoDTOs;
                 else
                     challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+
+                List<TChallengeRequestInfoDTO> challengeRequestInfoDTOs = _cooperOrderService.GetListChallengeRequestInfo(challengeletterDTO.Id);
+
+                if (challengeRequestInfoDTOs.Count > 0)
+                    challengeletterDTO.challengeRequestInfoDTOs = challengeRequestInfoDTOs;
+                else
+                    challengeletterDTO.challengeRequestInfoDTOs = new List<TChallengeRequestInfoDTO>() { new TChallengeRequestInfoDTO() };
             }
             else
             {
@@ -1811,6 +1937,7 @@
                 challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { challengeItemDTO };
                 challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
                 challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+                challengeletterDTO.challengeRequestInfoDTOs = new List<TChallengeRequestInfoDTO>() { new TChallengeRequestInfoDTO() };
             }
             //ViewBag.challengeletterDTO = challengeletterDTO;
 
@@ -1872,6 +1999,7 @@
             //}
             resultEntity.Message = no;
             resultEntity.Remark = challengeItemId;
+            resultEntity.Remark2 = id;
             resultEntity.DataList = sysCodeDtls;
 
             return new JsonResult(resultEntity);
@@ -2191,6 +2319,7 @@
                             var challengeItemDTO = new TChallengeItemDTO();
                             challengeItemDTO.ChallengeId = challengeletterDTO.Id;
                             challengeItemDTO.Question = data.Question[i];
+                            challengeItemDTO.Questionname = data.Questionname[i];
                             challengeItemDTO.Evidential = data.Evidential[i];
                             challengeItemDTO.Law = Law;
                             //challengeItemDTO.Lawcoment = data.Lawcoment[i];
@@ -2200,6 +2329,26 @@
                        
                     }
                 }
+
+                resultEntity = _cooperOrderService.deleteChallengeRequestInfo(challengeletterDTO.Id);
+                if (data.RequestInfos != null && data.RequestInfos.Length > 0)
+                {
+                    for (int i = 0; i < data.RequestInfos.Length; i++)
+                    {
+                        if (!string.IsNullOrEmpty(data.RequestInfos[i]))
+                           
+                        {
+                            var challengeRequestInfoDTO = new TChallengeRequestInfoDTO();
+                            challengeRequestInfoDTO.ChallengeId = challengeletterDTO.Id;
+                            challengeRequestInfoDTO.RequestInfo = data.RequestInfos[i];
+                            challengeRequestInfoDTO.RequestInfoname = data.RequestInfoname[i];
+                             
+                            resultEntity = _cooperOrderService.saveChallengeRequestInfo(challengeRequestInfoDTO);
+                        }
+
+                    }
+                }
+
                 scope.Complete();
             }
 
@@ -2257,12 +2406,21 @@
                     challengeletterDTO.complaintShouquandaibiaoDTOs = complaintShouquandaibiaoDTOs;
                 else
                     challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() /*{ new TComplaintShouquandaibiaoDTO() }*/;
+
+
+                List<TChallengeRequestInfoDTO> challengeRequestInfoDTOs = _cooperOrderService.GetListChallengeRequestInfo(challengeletterDTO.Id);
+
+                if (challengeRequestInfoDTOs.Count > 0)
+                    challengeletterDTO.challengeRequestInfoDTOs = challengeRequestInfoDTOs;
+                else
+                    challengeletterDTO.challengeRequestInfoDTOs = new List<TChallengeRequestInfoDTO>() /*{ new TChallengeRequestInfoDTO() }*/;
             }
             else
             {
                 challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
                 challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
                 challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() /*{ new TComplaintShouquandaibiaoDTO() }*/;
+                challengeletterDTO.challengeRequestInfoDTOs = new List<TChallengeRequestInfoDTO>() /*{ new TChallengeRequestInfoDTO() }*/;
             }
             //ViewBag.challengeletterDTO = challengeletterDTO;
 
@@ -2432,6 +2590,12 @@
                 else
                     complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
 
+                List<TChallengeRequestInfoDTO> challengeRequestInfoDTOs = _cooperOrderService.GetListChallengeRequestInfo(complaintletterDTO.Id);
+                if (challengeRequestInfoDTOs.Count > 0)
+                    complaintletterDTO.challengeRequestInfoDTOs = challengeRequestInfoDTOs;
+                else
+                    complaintletterDTO.challengeRequestInfoDTOs = new List<TChallengeRequestInfoDTO>() { new TChallengeRequestInfoDTO() };
+
                 List<TComplaintGongyingshangDTO> complaintGongyingshangDTOs = _cooperOrderService.GetListComplaintGongyingshang(complaintletterDTO.Id);
                 if (complaintGongyingshangDTOs.Count > 0)
                     complaintletterDTO.complaintGongyingshangDTOs = complaintGongyingshangDTOs;
@@ -2448,10 +2612,11 @@
                 complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
                 complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
                 complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>()/* { new TComplaintGongyingshangDTO() }*/;
+                complaintletterDTO.challengeRequestInfoDTOs = new List<TChallengeRequestInfoDTO>() { new TChallengeRequestInfoDTO() };
 
             }
             //鍒ゆ柇鏄惁鏈夎川鐤戝嚱
-            if (complaintletterDTO.Status != 2)
+            if (complaintletterDTO.Status != 2 && string.IsNullOrEmpty(complaintletterDTO.complaintItemDTOs[0].Question))
             {
                 CooperOrderDTO cooperOrderDTO = _cooperOrderService.Get(complaintletterDTO.OrderId);
                 List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengelettertousu(cooperOrderDTO.Khdw, complaintletterDTO.XmCode);
@@ -2468,6 +2633,11 @@
                         complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
 
 
+                    complaintletterDTO.challengeRequestInfoDTOs = _cooperOrderService.GetListChallengeRequestInfo(challengeletterDTO.Id);
+                    if (complaintletterDTO.challengeRequestInfoDTOs.Count == 0)
+                        complaintletterDTO.challengeRequestInfoDTOs = new List<TChallengeRequestInfoDTO>() { new TChallengeRequestInfoDTO() };
+
+
                     List<TChallengeItemDTO> challengeItemDTOs = _cooperOrderService.GetListChallengeItem(challengeletterDTO.Id);
                     if (challengeItemDTOs.Count > 0)
                     {
@@ -2478,6 +2648,7 @@
                             complaintItemDTO.Id = challengeItemDTO.Id;
                             complaintItemDTO.ComplaintId = challengeItemDTO.ChallengeId;
                             complaintItemDTO.Question = challengeItemDTO.Question;
+                            complaintItemDTO.Questionname = challengeItemDTO.Questionname;
                             complaintItemDTO.Evidential = challengeItemDTO.Evidential;
                             complaintItemDTO.Law = challengeItemDTO.Law;
                             complaintItemDTO.Lawcoment = challengeItemDTO.Lawcoment;
@@ -2732,6 +2903,7 @@
                             var complaintItemDTO = new TComplaintItemDTO();
                             complaintItemDTO.ComplaintId = complaintletterDTO.Id;
                             complaintItemDTO.Question = data.Question[i];
+                            complaintItemDTO.Questionname = data.Questionname[i];
                             complaintItemDTO.Evidential = data.Evidential[i];
                             complaintItemDTO.Law = Law;
                             //complaintItemDTO.Lawcoment = data.Lawcoment[i];
@@ -2741,6 +2913,26 @@
 
                     }
                 }
+
+                resultEntity = _cooperOrderService.deleteChallengeRequestInfo(complaintletterDTO.Id);
+                if (data.RequestInfos != null && data.RequestInfos.Length > 0)
+                {
+                    for (int i = 0; i < data.RequestInfos.Length; i++)
+                    {
+                        if (!string.IsNullOrEmpty(data.RequestInfos[i]))
+
+                        {
+                            var challengeRequestInfoDTO = new TChallengeRequestInfoDTO();
+                            challengeRequestInfoDTO.ChallengeId = complaintletterDTO.Id;
+                            challengeRequestInfoDTO.RequestInfo = data.RequestInfos[i];
+                            challengeRequestInfoDTO.RequestInfoname = data.RequestInfoname[i];
+
+                            resultEntity = _cooperOrderService.saveChallengeRequestInfo(challengeRequestInfoDTO);
+                        }
+
+                    }
+                }
+
                 scope.Complete();
             }
 
@@ -2823,6 +3015,12 @@
                 else
                     complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() /*{ new TComplaintShouquandaibiaoDTO() }*/;
 
+                List<TChallengeRequestInfoDTO> challengeRequestInfoDTOs = _cooperOrderService.GetListChallengeRequestInfo(complaintletterDTO.Id);
+                if (challengeRequestInfoDTOs.Count > 0)
+                    complaintletterDTO.challengeRequestInfoDTOs = challengeRequestInfoDTOs;
+                else
+                    complaintletterDTO.challengeRequestInfoDTOs = new List<TChallengeRequestInfoDTO>() /*{ new TChallengeRequestInfoDTO() }*/;
+
                 List<TComplaintGongyingshangDTO> complaintGongyingshangDTOs = _cooperOrderService.GetListComplaintGongyingshang(complaintletterDTO.Id);
                 if (complaintGongyingshangDTOs.Count > 0)
                     complaintletterDTO.complaintGongyingshangDTOs = complaintGongyingshangDTOs;
@@ -2837,7 +3035,7 @@
                 complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
                 complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>()/* { new TComplaintShouquandaibiaoDTO() }*/;
                 complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() /*{ new TComplaintGongyingshangDTO() }*/;
-
+                complaintletterDTO.challengeRequestInfoDTOs = new List<TChallengeRequestInfoDTO>() /*{ new TChallengeRequestInfoDTO() }*/;
             }
 
 
diff --git a/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs b/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
index d611613..7b95a97 100644
--- a/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
@@ -760,7 +760,7 @@
 
             SysCodeDtlEntity sysCodeDtlEntity = new SysCodeDtlEntity();
 
-            var sysCodeDtlEntities = _sysCodeService.GetSysCodeDtlInfoss(Classify1, "t_complaint_items", "law");
+            var sysCodeDtlEntities = _sysCodeService.GetSysCodeDtlInfoss("涓嶅瓨鍦�", "t_complaint_items", "law");
             sysCodeDtlEntity.Classify1 = Classify1;
             sysCodeDtlEntity.CodeId = sysCodeDtlEntities[0].CodeId;
 
@@ -769,6 +769,7 @@
             ViewBag.falv = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv");
             ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question");
             ViewBag.sysCodeDtlEntities = sysCodeDtlEntities;
+            ViewBag.Classify1 = Classify1;
 
             return View();
         }
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
index 17af108..3786ce5 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
@@ -1092,8 +1092,8 @@
 
         var id = '@Model.Id';
          var order_type = '@Model.OrderType';
-        var order_type1 = $("#order_type1").val();
-        var order_type2 = $("#order_type2").val();
+        var order_type1 =  '@Html.Raw(Model.OrderType1)';/*$("#order_type1").val();*/
+        var order_type2 =  '@Html.Raw(Model.OrderType2)';/*$("#order_type2").val();*/
 
         var bUpload = false;
         var bAdd = false; // 鏂板鎿嶄綔
@@ -1241,7 +1241,7 @@
                     return;
                 }
 
-                
+
             } else if ($("#OrderType1").val() == "浠f嫙璐ㄧ枒鍑�") {
                 if ($.trim($("#GysName").val()) == '') {
                     toastr.warning("璐ㄧ枒渚涘簲鍟嗕笉鑳戒负绌�");
@@ -1280,11 +1280,11 @@
                     toastr.warning("閲囪喘鏂囦欢鑾峰彇鏃ユ湡涓嶈兘涓虹┖");
                     return;
                 }
-                
-                
-                
-                
-            } 
+
+
+
+
+            }
 
 
 
@@ -1345,7 +1345,7 @@
 
         });
         $("#Price").change(function () {
-
+           
             var OrderNum = $("#OrderNum").val();
             var Price = $("#Price").val();
             var Money = $("#Money");
@@ -1524,6 +1524,7 @@
 
 
         $("#OrderType2").change(function () {
+           
             var OrderType = $("#OrderType").val();
             var OrderType1 = $("#OrderType1").val();
             var OrderType2 = $("#OrderType2").val();
@@ -1552,7 +1553,7 @@
 
 
 
-        if (id != null  &&  id != '') {
+        if (order_type != null && order_type != '') {
 
             $.ajax({
                 type: "GET",
@@ -1593,7 +1594,6 @@
                     parent.layer.msg('澶辫触', { icon: 5 });
                 }
             });
-
 
 
 
@@ -1640,9 +1640,11 @@
 
 
 
+                    if (id == null || id == '') {
+                        $("#OrderType2").trigger("change");
+                    }
 
-
-
+                  
                 },
                 error: function () {
 
@@ -1651,10 +1653,22 @@
                 }
             });
 
+
+            if (order_type == '03' || order_type == '08') {
+                $("#xiangmuxinxi").show();
+            } else {
+                $("#xiangmuxinxi").hide();
+            }
+
+            if (order_type == '08') {
+                $("#jichujine").show();
+            } else {
+                $("#jichujine").hide();
+            }
         }
 
 
-        
+
 
         $(document).ready(function () {
 
@@ -1711,17 +1725,17 @@
             } else {
                 $("#tousushouquan").hide();
             }
-           
+
             var sheng = $("#OrderType").val();
             if (sheng == '08' || sheng == '11' || sheng == '10') {
                 $('#Price').removeAttr("readonly");//鍘婚櫎input鍏冪礌鐨剅eadonly灞炴��
             } else {
                 $('#Price').attr("readonly", "readonly")//灏唅nput鍏冪礌璁剧疆涓簉eadonly
             }
-            
-            $("#TsrId").chosen();  
 
-        }); 
+            $("#TsrId").chosen();
+
+        });
 
 
         $("#Khdw").change(function () {
@@ -1734,13 +1748,13 @@
                 global: false,
                 data: "",
                 success: function (data) {
-                    
-                   
+
+
                     $("#Shr").val(data.ShrName);
                     $("#ShrAddress").val(data.ShrAddress);
                     $("#ShrTel").val(data.ShrTel);
 
-                    $("#GysName").val(data.Name);  
+                    $("#GysName").val(data.Name);
                     $("#GysAddress").val(data.Address);
                     $("#GysContacts").val(data.FName);
                     $("#GysPhone").val(data.FTel);
@@ -1750,7 +1764,7 @@
                     $("#TsrPostcode").val(data.Postal);
                     $("#TsrCorporation").val(data.FName);
                     $("#TsrPhone").val(data.FTel);
-                   
+
                 },
                 error: function () {
 
@@ -1928,7 +1942,7 @@
                                                 <input class="form-control" label="鐩稿叧渚涘簲鍟哷+ sss + `" name="Gongytingshang" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="">
 
                                             </div>
-                                            
+
 
                                         </div>
 
@@ -1977,7 +1991,7 @@
                 global: false,
                 data: "",
                 success: function (data) {
-                  
+
                     //$('#zhiyishixiang').html(data.GysId);
                     //$("select").chosen();
                     $("#TsrName").val(data.GysName);
@@ -1993,7 +2007,7 @@
                             $("#tousuLianxidianhua").val(data.complaintShouquandaibiaoDTOs[0].Lianxidianhua);
                             $("#tousuDizhi").val(data.complaintShouquandaibiaoDTOs[0].Dizhi);
                             $("#tousuYoubian").val(data.complaintShouquandaibiaoDTOs[0].Youbian);
-                             
+
                         }
                     }
 
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
index 0c2536d..184b291 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
@@ -5,8 +5,8 @@
 
 
 
-    List<SysCodeDtl> request_info = ViewData["request_info"] as List<SysCodeDtl>; //璐ㄧ枒璇锋眰
-    List<SysCodeDtl> question = ViewData["question"] as List<SysCodeDtl>; //璐ㄧ枒浜嬮」
+    List<SysCodeDtl> request_info = ViewData["request_info"] as List<SysCodeDtl>; //鎶曡瘔璇锋眰
+    List<SysCodeDtl> question = ViewData["question"] as List<SysCodeDtl>; //鎶曡瘔浜嬮」
     List<SysCodeDtl> law = ViewData["law"] as List<SysCodeDtl>; //娉曞緥渚濇嵁
 
     List<SysCodeDtl> shifou = ViewData["shifou"] as List<SysCodeDtl>; //娉曞緥渚濇嵁  
@@ -20,7 +20,9 @@
 
     List<TComplaintGongyingshangDTO> complaintGongyingshangDTOs = Model.complaintGongyingshangDTOs;
 
-    List<TChallengeletterDTO> ChallengeletterChosen = ViewData["ChallengeletterChosen"] as List<TChallengeletterDTO>; 
+    List<TChallengeletterDTO> ChallengeletterChosen = ViewData["ChallengeletterChosen"] as List<TChallengeletterDTO>;
+
+    List<TChallengeRequestInfoDTO> challengeRequestInfoDTOs = Model.challengeRequestInfoDTOs;
 }
 @{
     Layout = null;
@@ -166,29 +168,29 @@
                                     </div>
 
                                     @*<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璐ㄧ枒鍑�</label>
-                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
-                                        <select id="TsrId" class="form-control" name="TsrId" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="TsrIdchangge();">
-                                            <option value="" hassubinfo="true">璇烽�夋嫨</option>
-                                            @foreach (var item in ChallengeletterChosen)
-                                            {
-                                                @if (!item.Id.Equals(Model.TsrId))
-                                                {
-                                                    <option value="@item.Id" hassubinfo="true">
-                                                        @item.OrderId
-                                                    </option>
-                                                }
-                                                else
-                                                {
-                                                    <option value="@item.Id" hassubinfo="true" selected="selected">
-                                                        @item.OrderId
-                                                    </option>
-                                                }
+            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                <select id="TsrId" class="form-control" name="TsrId" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="TsrIdchangge();">
+                    <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                    @foreach (var item in ChallengeletterChosen)
+                    {
+                        @if (!item.Id.Equals(Model.TsrId))
+                        {
+                            <option value="@item.Id" hassubinfo="true">
+                                @item.OrderId
+                            </option>
+                        }
+                        else
+                        {
+                            <option value="@item.Id" hassubinfo="true" selected="selected">
+                                @item.OrderId
+                            </option>
+                        }
 
-                                            }
+                    }
 
 
-                                        </select>
-                                    </div>*@
+                </select>
+            </div>*@
 
 
 
@@ -687,232 +689,199 @@
                                     @for (int i = 0; i < complaintItemDTOs.Count; i++)
                                     {
                                         <div class="zhiyishixiangitem">
-    @if (complaintItemDTOs.Count == 1)
-    {
-                                            <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                                <label grouptype="Vdata" id="Questionlabel" class="text-right col-sm-1 col-md-1 control-label">鎶曡瘔浜嬮」</label>
-                                                <div class="col-sm-4 col-md-4" grouptype="Vdata">
-                                                    <select class="form-control" name="Question" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Questionchangge(@i);">
-                                                        <option value="" hassubinfo="true">璇烽�夋嫨</option>
-                                                        @foreach (var item in question)
-                                                        {
-                                                            @if (!item.CodeSn.Equals(complaintItemDTOs[i].Question))
-                                                            {
-                                                                <option value="@item.CodeSn" hassubinfo="true">
-                                                                    @item.Comments
-                                                                </option>
-                                                            }
-                                                            else
-                                                            {
-                                                                <option value="@item.CodeSn" hassubinfo="true" selected="selected">
-                                                                    @item.Comments
-                                                                </option>
-                                                            }
-
-                                                        }
-                                                        }
-
-                                                    </select>
-                                                    <input type="hidden" name="complaintItemId" value="@complaintItemDTOs[i].Id" />
-                                                </div>
-
-                                                @if (i == 0)
-                                                {
-                                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
-                                                        <button type="button" class="addBtn" onclick="OpenWindow('鑷畾涔夋姇璇変簨椤�','98%','100%', '/SysCode/Editquestionzidingyi')" data-type="1">鑷畾涔夋姇璇変簨椤�</button>
-                                                    </div>
-                                                    @*<div class="col-sm-2 col-md-2" grouptype="Vdata">
-                <button type="button" class="addBtn" onclick="addquestion(this)" data-type="1">鏂板璐ㄧ枒浜嬮」</button>
-            </div>*@
-                                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
-                                                        <button type="button" class="addBtn" onclick="addlawinfo(this)" data-type="1">鏂板娉曞緥渚濇嵁</button>
-                                                    </div>
-                                                }
-
-
-                                            </div>
-
-        <div class="clearfix layer-area" style="padding-bottom:15px;">
-            <label grouptype="Vdata" id="Evidentiallabel" class="text-right col-sm-1 col-md-1 control-label">浜嬪疄渚濇嵁</label>
-            <div class="col-sm-8 col-md-8">
-                <textarea class="form-control bt" name="Evidential" title="浜嬪疄渚濇嵁" isempty="" maxlength="3500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@complaintItemDTOs[i].Evidential</textarea>
-            </div>
-        </div>
-
-        <div id="falvyiju@(i)">
-            @for (int j = 0; j < complaintItemDTOs[i].sysCodeDtls.Count; j++)
-            {
-                @if (complaintItemDTOs[i].sysCodeDtls.Count == 1)
-                {
-            <div class="clearfix layer-area" style="padding-bottom:15px;">
-                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
-                <div class="col-sm-8 col-md-8">
-                    銆夽(complaintItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
-                </div>
-                <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].CodeSn" />
-                <input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
-                <div class="col-sm-1 col-md-1" grouptype="Vdata">
-                    <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
-                </div>
-
-            </div>
-                }
-                else
-                {
-        <div class="clearfix layer-area" style="padding-bottom:15px;">
-            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
-            <div class="col-sm-8 col-md-8">
-                銆夽(complaintItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
-            </div>
-            <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].CodeSn" />
-            <input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
-            <div class="col-sm-1 col-md-1" grouptype="Vdata">
-                <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
-            </div>
-
-        </div>
-                }
-            }
-        </div>
-    }
-    else
-    {
-                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鎶曡瘔浜嬮」@(i+1)</label>
-                                            <div class="col-sm-4 col-md-4" grouptype="Vdata">
-                                                <select class="form-control" name="Question" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Questionchangge(@i);">
-                                                    <option value="" hassubinfo="true">璇烽�夋嫨</option>
-                                                    @foreach (var item in question)
-                                                    {
-                                                        @if (!item.CodeSn.Equals(complaintItemDTOs[i].Question))
-                                                        {
-                                                            <option value="@item.CodeSn" hassubinfo="true">
-                                                                @item.Comments
-                                                            </option>
-                                                        }
-                                                        else
-                                                        {
-                                                            <option value="@item.CodeSn" hassubinfo="true" selected="selected">
-                                                                @item.Comments
-                                                            </option>
-                                                        }
-
-                                                    }
-                                                    }
-
-                                                </select>
-                                                <input type="hidden" name="complaintItemId" value="@complaintItemDTOs[i].Id" />
-                                            </div>
-                                            @if (i == 0)
+                                            @if (complaintItemDTOs.Count == 1)
                                             {
-                                                <div class="col-sm-2 col-md-2" grouptype="Vdata">
-                                                    <button type="button" class="addBtn" onclick="OpenWindow('鑷畾涔夋姇璇変簨椤�','98%','100%', '/SysCode/Editquestionzidingyi')" data-type="1">鑷畾涔夋姇璇変簨椤�</button>
-                                                </div>
-                                                <div class="col-sm-2 col-md-2" grouptype="Vdata">
-                                                    <button type="button" class="addBtn" onclick="addlawinfo(this)" data-type="1">鏂板娉曞緥渚濇嵁</button>
-                                                </div>
-                                                @*<div class="col-sm-2 col-md-2" grouptype="Vdata">
-                <button type="button" class="addBtn" onclick="addquestion(this)" data-type="1">鏂板璐ㄧ枒浜嬮」</button>
-            </div>*@
-                                            }
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" id="Questionlabel" class="text-right col-sm-1 col-md-1 control-label">鎶曡瘔浜嬮」</label>
+                                                    <div class="col-sm-4 col-md-4" grouptype="Vdata">
+                                                        <select class="form-control" name="Question" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Questionchangge(@i);">
+                                                            <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                            @foreach (var item in question)
+                                                            {
+                                                                @if (!item.CodeSn.Equals(complaintItemDTOs[i].Question))
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
+                                                                else
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
 
-                                        </div>
+                                                            }
+                                                            }
 
-        <div class="clearfix layer-area" style="padding-bottom:15px;">
-            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">浜嬪疄渚濇嵁</label>
-            <div class="col-sm-8 col-md-8">
-                <textarea class="form-control bt" name="Evidential" title="浜嬪疄渚濇嵁" isempty="" maxlength="3500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@complaintItemDTOs[i].Evidential</textarea>
-            </div>
-        </div>
+                                                        </select>
+                                                        <input type="hidden" name="complaintItemId" value="@complaintItemDTOs[i].Id" />
+                                                    </div>
 
-        <div id="falvyiju@(i)">
-            @for (int j = 0; j < complaintItemDTOs[i].sysCodeDtls.Count; j++)
-            {
-                @if (complaintItemDTOs[i].sysCodeDtls.Count == 1)
-                {
-            <div class="clearfix layer-area" style="padding-bottom:15px;">
-                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
-                <div class="col-sm-8 col-md-8">
-                    銆夽(complaintItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
-                </div>
-                <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].CodeSn" />
-                <input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
-                <div class="col-sm-1 col-md-1" grouptype="Vdata">
-                    <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
-                </div>
-
-            </div>
-                }
-                else
-                {
-        <div class="clearfix layer-area" style="padding-bottom:15px;">
-            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
-            <div class="col-sm-8 col-md-8">
-                銆夽(complaintItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
-            </div>
-
-            <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].CodeSn" />
-            <input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
-            <div class="col-sm-1 col-md-1" grouptype="Vdata">
-                <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
-            </div>
-        </div>
-                }
-            }
-        </div>
-    }
-
-
-</div>
-
-
-
-
-                                            }
-                                        </div>
-
-                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鎶曡瘔浜嬮」</label>
-                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
-
-                                                <button type="button" class="addBtn" onclick="addzhiyishixiang(this)" data-type="3" style="width:32px">+</button>
-                                                <button type="button" class="delBtn" onclick="delBtn(this)" data-type="3" style="width:32px">-</button>
-                                            </div>
-                                        </div>
-
-                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                            <label class="text-left col-sm-2 col-md-2 control-label">浜斻�佷笌鎶曡瘔浜嬮」鐩稿叧鐨勬姇璇夎姹�</label>
-                                        </div>
-
-                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璇锋眰</label>
-                                            <div class="col-sm-4 col-md-4" grouptype="Vdata">
-                                                <select id="RequestInfo" class="form-control" name="RequestInfo" data-placeholder="閫夋嫨 搴忓垪 ...">
-                                                    <option value="" hassubinfo="true">璇烽�夋嫨</option>
-                                                    @foreach (var item in request_info)
+                                                    @if (i == 0)
                                                     {
-                                                        @if (!item.CodeSn.Equals(Model.RequestInfo))
+                                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                            <button type="button" class="addBtn" onclick="OpenWindow('鏂板鎶曡瘔浜嬮」','98%','100%', '/SysCode/Editquestionzidingyi')" data-type="1">鏂板鎶曡瘔浜嬮」</button>
+                                                        </div>
+
+                                                    }
+
+
+                                                </div>
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">缂栬緫鎶曡瘔浜嬮」</label>
+                                                    <div class="col-sm-8 col-md-8" grouptype="Vdata">
+                                                        <input class="form-control" label="缂栬緫鎶曡瘔浜嬮」" id="Questionname@(i)" name="Questionname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@complaintItemDTOs[i].Questionname">
+
+                                                    </div>
+                                                </div>
+
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" id="Evidentiallabel" class="text-right col-sm-1 col-md-1 control-label">浜嬪疄渚濇嵁</label>
+                                                    <div class="col-sm-8 col-md-8">
+                                                        <textarea class="form-control bt" name="Evidential" title="浜嬪疄渚濇嵁" isempty="" maxlength="3500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@complaintItemDTOs[i].Evidential</textarea>
+                                                    </div>
+                                                </div>
+
+                                                <div id="falvyiju@(i)">
+                                                    @for (int j = 0; j < complaintItemDTOs[i].sysCodeDtls.Count; j++)
+                                                    {
+                                                        @if (complaintItemDTOs[i].sysCodeDtls.Count == 1)
                                                         {
-                                                            <option value="@item.CodeSn" hassubinfo="true">
-                                                                @item.Comments
-                                                            </option>
+                                                            <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
+                                                                <div class="col-sm-8 col-md-8">
+                                                                    銆夽(complaintItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
+                                                                </div>
+                                                                <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].CodeSn" />
+                                                                <input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
+                                                                <div class="col-sm-1 col-md-1" grouptype="Vdata">
+                                                                    <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+                                                                </div>
+
+                                                            </div>
                                                         }
                                                         else
                                                         {
-                                                            <option value="@item.CodeSn" hassubinfo="true" selected="selected">
-                                                                @item.Comments
-                                                            </option>
+                                                            <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
+                                                                <div class="col-sm-8 col-md-8">
+                                                                    銆夽(complaintItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
+                                                                </div>
+                                                                <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].CodeSn" />
+                                                                <input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
+                                                                <div class="col-sm-1 col-md-1" grouptype="Vdata">
+                                                                    <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+                                                                </div>
+
+                                                            </div>
                                                         }
+                                                    }
+                                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                            <button type="button" class="addBtn" onclick="addlawinfo('@(complaintItemDTOs[i].Question)')" data-type="1">鏂板娉曞緥渚濇嵁</button>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+
+                                            }
+                                            else
+                                            {
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鎶曡瘔浜嬮」@(i+1)</label>
+                                                    <div class="col-sm-4 col-md-4" grouptype="Vdata">
+                                                        <select class="form-control" name="Question" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Questionchangge(@i);">
+                                                            <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                            @foreach (var item in question)
+                                                            {
+                                                                @if (!item.CodeSn.Equals(complaintItemDTOs[i].Question))
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
+                                                                else
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
+
+                                                            }
+                                                            }
+
+                                                        </select>
+                                                        <input type="hidden" name="complaintItemId" value="@complaintItemDTOs[i].Id" />
+                                                    </div>
+                                                    @if (i == 0)
+                                                    {
+                                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                            <button type="button" class="addBtn" onclick="OpenWindow('鏂板鎶曡瘔浜嬮」','98%','100%', '/SysCode/Editquestionzidingyi')" data-type="1">鏂板鎶曡瘔浜嬮」</button>
+                                                        </div>
 
                                                     }
+
+                                                </div>
+
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">缂栬緫鎶曡瘔浜嬮」</label>
+                                                    <div class="col-sm-8 col-md-8" grouptype="Vdata">
+                                                        <input class="form-control" label="缂栬緫鎶曡瘔浜嬮」" id="Questionname@(i)" name="Questionname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@complaintItemDTOs[i].Questionname">
+
+                                                    </div>
+                                                </div>
+
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">浜嬪疄渚濇嵁</label>
+                                                    <div class="col-sm-8 col-md-8">
+                                                        <textarea class="form-control bt" name="Evidential" title="浜嬪疄渚濇嵁" isempty="" maxlength="3500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@complaintItemDTOs[i].Evidential</textarea>
+                                                    </div>
+                                                </div>
+
+                                                <div id="falvyiju@(i)">
+                                                    @for (int j = 0; j < complaintItemDTOs[i].sysCodeDtls.Count; j++)
+                                                    {
+                                                        @if (complaintItemDTOs[i].sysCodeDtls.Count == 1)
+                                                        {
+                                                            <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
+                                                                <div class="col-sm-8 col-md-8">
+                                                                    銆夽(complaintItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
+                                                                </div>
+                                                                <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].CodeSn" />
+                                                                <input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
+                                                                <div class="col-sm-1 col-md-1" grouptype="Vdata">
+                                                                    <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+                                                                </div>
+
+                                                            </div>
+                                                        }
+                                                        else
+                                                        {
+                                                            <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
+                                                                <div class="col-sm-8 col-md-8">
+                                                                    銆夽(complaintItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
+                                                                </div>
+
+                                                                <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].CodeSn" />
+                                                                <input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
+                                                                <div class="col-sm-1 col-md-1" grouptype="Vdata">
+                                                                    <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+                                                                </div>
+                                                            </div>
+                                                        }
                                                     }
+                                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                            <button type="button" class="addBtn" onclick="addlawinfo('@(complaintItemDTOs[i].Question)')" data-type="1">鏂板娉曞緥渚濇嵁</button>
+                                                        </div>
+                                                    </div>
+                                                </div>
 
-                                                </select>
 
-                                            </div>
-                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
-                    <button type="button" class="addBtn" onclick="addrequestinfo(this)" data-type="1">鏂板鎶曡瘔璇锋眰</button>
-                </div>
+                                            }
 
 
                                         </div>
@@ -920,10 +889,151 @@
 
 
 
+                                    }
+                                </div>
 
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鎶曡瘔浜嬮」</label>
+                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
 
-
+                                        <button type="button" class="addBtn" onclick="addzhiyishixiang(this)" data-type="3" style="width:32px">+</button>
+                                        <button type="button" class="delBtn" onclick="delBtn(this)" data-type="3" style="width:32px">-</button>
                                     </div>
+                                </div>
+
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                    <label class="text-left col-sm-2 col-md-2 control-label">浜斻�佷笌鎶曡瘔浜嬮」鐩稿叧鐨勬姇璇夎姹�</label>
+                                </div>
+
+                                <div id="xiangguanqingqiu">
+                                    @for (int i = 0; i < challengeRequestInfoDTOs.Count; i++)
+                                    {
+                                        <div class="xiangguanqingqiuitem">
+                                            @if (challengeRequestInfoDTOs.Count == 1)
+                                            {
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" id="RequestInfolabel" class="text-right col-sm-1 col-md-1 control-label">璇锋眰</label>
+                                                    <div class="col-sm-4 col-md-4" grouptype="Vdata">
+                                                        <select class="form-control" name="RequestInfos" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="RequestInfochangge(@i);">
+                                                            <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                            @foreach (var item in request_info)
+                                                            {
+                                                                @if (!item.CodeSn.Equals(challengeRequestInfoDTOs[i].RequestInfo))
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
+                                                                else
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
+
+                                                            }
+                                                            }
+
+                                                        </select>
+
+                                                    </div>
+                                                    @if (i == 0)
+                                                    {
+                                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                            <button type="button" class="addBtn" onclick="addrequestinfo(this)" data-type="1">鏂板鎶曡瘔璇锋眰</button>
+                                                        </div>
+
+
+                                                    }
+
+
+
+                                                </div>
+
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">缂栬緫璇锋眰</label>
+                                                    <div class="col-sm-8 col-md-8" grouptype="Vdata">
+                                                        <input class="form-control" label="缂栬緫璇锋眰" id="RequestInfoname@(i)" name="RequestInfoname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@challengeRequestInfoDTOs[i].RequestInfoname">
+
+                                                    </div>
+                                                </div>
+
+
+
+
+                                            }
+                                            else
+                                            {
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璇锋眰@(i+1)</label>
+                                                    <div class="col-sm-4 col-md-4" grouptype="Vdata">
+                                                        <select class="form-control" name="RequestInfos" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="RequestInfochangge(@i);">
+                                                            <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                            @foreach (var item in request_info)
+                                                            {
+                                                                @if (!item.CodeSn.Equals(challengeRequestInfoDTOs[i].RequestInfo))
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
+                                                                else
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
+
+                                                            }
+                                                            }
+
+                                                        </select>
+
+                                                    </div>
+                                                    @if (i == 0)
+                                                    {
+                                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                            <button type="button" class="addBtn" onclick="addrequestinfo(this)" data-type="1">鏂板鎶曡瘔璇锋眰</button>
+                                                        </div>
+
+
+                                                    }
+
+                                                </div>
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">缂栬緫璇锋眰</label>
+                                                    <div class="col-sm-8 col-md-8" grouptype="Vdata">
+                                                        <input class="form-control" label="缂栬緫璇锋眰" id="RequestInfoname@(i)" name="RequestInfoname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@challengeRequestInfoDTOs[i].RequestInfoname">
+
+                                                    </div>
+                                                </div>
+
+
+
+
+                                            }
+                                        </div>
+
+                                    }
+                                </div>
+
+
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鎶曡瘔璇锋眰</label>
+                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
+
+                                        <button type="button" class="addBtn" onclick="addxiangguanqingqiu(this)" data-type="1" style="width:32px">+</button>
+                                        <button type="button" class="delBtn" onclick="delBtnxiangguanqingqiu(this)" data-type="1" style="width:32px">-</button>
+                                    </div>
+                                </div>
+
+
+
+
+
+
+
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -1015,7 +1125,7 @@
 
         // 淇濆瓨宀椾綅淇℃伅
         var savePosition = function (Status) {
-          
+
             if ($.trim($("#TsrName").val()) == '') {
                 toastr.warning("鎶曡瘔浜轰笉鑳戒负绌�");
                 return;
@@ -1112,7 +1222,7 @@
                                 }
                             }
 
-                           
+
 
                         }
                         else {
@@ -1158,7 +1268,7 @@
         }
 
         function TsrIdchangge() {
-            var sss = $('#TsrId').val(); 
+            var sss = $('#TsrId').val();
             $.ajax({
                 type: "GET",
                 url: "/CooperOrder/getZhiyihan?id=" + sss ,
@@ -1197,7 +1307,7 @@
 
 
 
- 
+
 
 
 
@@ -1218,7 +1328,12 @@
         function Questionchangge(i) {
 
             var challengeItemId = document.getElementsByName("complaintItemId")[i].value;
-            var sss = document.getElementsByName("Question")[i].value;
+            var Question = document.getElementsByName("Question")[i];
+            var sss = Question.value;
+            var index = Question.selectedIndex; // 閫変腑绱㈠紩
+            var text = Question.options[index].text; // 閫変腑鏂囨湰
+            $("#Questionname" + i).val(text);
+
             $.ajax({
                 type: "GET",
                 url: "/CooperOrder/getQuestionLaw?id=" + sss + "&no=" + i + "&challengeItemId=" + challengeItemId,
@@ -1283,6 +1398,14 @@
                     }
 
                     falvyijuhtml += `   </div> `;
+
+                    falvyijuhtml += `
+                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                <button type="button" class="addBtn" onclick="addlawinfo('` + data.Remark2 + `')" data-type="1">鏂板娉曞緥渚濇嵁</button>
+                            </div>
+                        </div>
+  `;
 
                     falvyiju.html(falvyijuhtml);
 
@@ -1420,7 +1543,7 @@
                 ssss = ssss.replaceAll("鑱旂郴鐢佃瘽", "鑱旂郴鐢佃瘽1");
                 $('#xiangguangongyingshang').html(ssss);
             }
-           
+
 
             $('#xiangguangongyingshang').append(` <div class="clearfix layer-area" style="padding-bottom:15px;">
                                             <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鐩稿叧渚涘簲鍟哷+ sss + `</label>
@@ -1472,7 +1595,7 @@
             var sss = document.getElementsByName("Question").length;
             if (document.getElementsByName("Question").length == 1) {
 
-                $('#Questionlabel').text("璐ㄧ枒浜嬮」1");
+                $('#Questionlabel').text("鎶曡瘔浜嬮」1");
                 $('#Evidentiallabel').text("浜嬪疄渚濇嵁");
             }
 
@@ -1497,7 +1620,13 @@
                                             </div>
 
                                         </div>
+<div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">缂栬緫鎶曡瘔浜嬮」</label>
+                                                <div class="col-sm-8 col-md-8" grouptype="Vdata">
+                                                    <input class="form-control" label="缂栬緫鎶曡瘔浜嬮」" id="Questionname`+ sss + `" name="Questionname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="">
 
+                                                </div>
+                                            </div>
                                         <div class="clearfix layer-area" style="padding-bottom:15px;">
                                             <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">浜嬪疄渚濇嵁</label>
                                             <div class="col-sm-8 col-md-8">
@@ -1512,7 +1641,7 @@
 
                                         </div>
 
-                                        
+
 </div>
 
 </div>
@@ -1535,19 +1664,19 @@
         }
 
         var addquestion = function () {
-            OpenWindow("鏂板璐ㄧ枒浜嬮」", "98%", "90%", "/SysCode/Editquestion/");
+            OpenWindow("鏂板鎶曡瘔浜嬮」", "98%", "90%", "/SysCode/Editquestion/");
         }
 
         var addrequestinfo = function () {
-            OpenWindow("鏂板璐ㄧ枒璇锋眰", "98%", "90%", "/SysCode/Editrequestinfozidingyi/");
+            OpenWindow("鏂板鎶曡瘔璇锋眰", "98%", "90%", "/SysCode/Editrequestinfozidingyi/");
         }
 
-        var addlawinfo = function () {
-            OpenWindow("鏂板娉曞緥渚濇嵁", "98%", "90%", "/SysCode/Editlawzidingyi/");
+        var addlawinfo = function (question) {
+            OpenWindow("鏂板娉曞緥渚濇嵁", "98%", "90%", "/SysCode/Editlawzidingyi?Classify1=" + question);
         }
         $(document).ready(function () {
 
- 
+
 
             if ($("#tousuShouquandaibiao").val() != "") {
                 $("#tousushouquan").show();
@@ -1582,12 +1711,78 @@
                         $('#zhiyishixiang').find('.zhiyishixiangitem:last').remove();
                     }
 
-                
+
+
+            }
+        }
+          function delBtnxiangguanqingqiu(obj) {
+            var num = $(obj).data().type;
+            console.log(num)
+
+            if (num == 1) {
+                if ($('#xiangguanqingqiu').find('.xiangguanqingqiuitem').length > 1) {
+                    $('#xiangguanqingqiu').find('.xiangguanqingqiuitem:last').remove();
+                }
 
             }
         }
 
 
+        function addxiangguanqingqiu(obj) {
+              var sss = document.getElementsByName("RequestInfos").length;
+              if (document.getElementsByName("RequestInfos").length == 1) {
+
+                $('#RequestInfolabel').text("璇锋眰1");
+            }
+
+              $('#xiangguanqingqiu').append(`   <div class="xiangguanqingqiuitem">
+  <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璇锋眰`+ (sss+1) + `</label>
+                                            <div class="col-sm-4 col-md-4" grouptype="Vdata">
+                                                <select class="form-control"  name="RequestInfos" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="RequestInfochangge(`+ sss + `);">
+                                                    <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                    @foreach (var item in request_info)
+                                                    {
+
+                                                            <option value="@item.CodeSn" hassubinfo="true" >
+                                                                @item.Comments
+                                                            </option>
+
+                                                    }
+                                                    }
+
+                                                </select>
+                               <input type="hidden"  name="challengeItemId" value="`+ (guid()) + `" />
+                                            </div>
+
+                                        </div>
+<div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">缂栬緫璇锋眰</label>
+                                                <div class="col-sm-8 col-md-8" grouptype="Vdata">
+                                                    <input class="form-control" label="缂栬緫璇锋眰" id="RequestInfoname`+ sss + `" name="RequestInfoname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="">
+
+                                                </div>
+                                            </div>
+
+
+
+</div>
+`);
+            $("select" + sss).chosen();
+        }
+
+
+        function RequestInfochangge(i) {
+            var RequestInfo = document.getElementsByName("RequestInfos")[i];
+       /*     var sss = RequestInfo.value;*/
+            var index = RequestInfo.selectedIndex; // 閫変腑绱㈠紩
+            var text = RequestInfo.options[index].text; // 閫変腑鏂囨湰
+            $("#RequestInfoname" + i).val(text);
+
+
+
+        }
+
         function dellawBtn(obj) {
 
             $(obj).parent().parent().remove();
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
index 3a98c72..cd5acb7 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
@@ -13,6 +13,8 @@
 
     List<TChallengeItemDTO> challengeItemDTOs = Model.challengeItemDTOs;
 
+    List<TChallengeRequestInfoDTO> challengeRequestInfoDTOs = Model.challengeRequestInfoDTOs;
+
 
 }
 @{
@@ -304,241 +306,201 @@
                                 <div id="zhiyishixiang">
                                     @for (int i = 0; i < challengeItemDTOs.Count; i++)
                                     {
-                                    <div class="zhiyishixiangitem">
-                                        @if (challengeItemDTOs.Count == 1)
-                                        {
-                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                            <label grouptype="Vdata" id="Questionlabel" class="text-right col-sm-1 col-md-1 control-label">璐ㄧ枒浜嬮」</label>
-                                            <div class="col-sm-4 col-md-4" grouptype="Vdata">
-                                                <select class="form-control" name="Question" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Questionchangge(@i);">
-                                                    <option value="" hassubinfo="true">璇烽�夋嫨</option>
-                                                    @foreach (var item in question)
-                                                    {
-                                                        @if (!item.CodeSn.Equals(challengeItemDTOs[i].Question))
-                                                        {
-                                                            <option value="@item.CodeSn" hassubinfo="true">
-                                                                @item.Comments
-                                                            </option>
-                                                        }
-                                                        else
-                                                        {
-                                                            <option value="@item.CodeSn" hassubinfo="true" selected="selected">
-                                                                @item.Comments
-                                                            </option>
-                                                        }
-
-                                                    }
-                                                    }
-
-                                                </select>
-                                                <input type="hidden" name="challengeItemId" value="@challengeItemDTOs[i].Id" />
-                                            </div>
-                                            @if (i == 0)
+                                        <div class="zhiyishixiangitem">
+                                            @if (challengeItemDTOs.Count == 1)
                                             {
-                                                <div class="col-sm-2 col-md-2" grouptype="Vdata">
-                                                    <button type="button" class="addBtn" onclick="OpenWindow('鑷畾涔夎川鐤戜簨椤�','98%','100%', '/SysCode/Editquestionzidingyi')" data-type="1">鑷畾涔夎川鐤戜簨椤�</button>
-                                                </div>
-                                                <div class="col-sm-2 col-md-2" grouptype="Vdata">
-                                                    <button type="button" class="addBtn" onclick="addlawinfo(this)" data-type="1">鏂板娉曞緥渚濇嵁</button>
-                                                </div>
-                                                @*<div class="col-sm-2 col-md-2" grouptype="Vdata">
-                <button type="button" class="addBtn" onclick="addquestion(this)" data-type="1">鏂板璐ㄧ枒浜嬮」</button>
-            </div>*@
-                                            }
-
-
-
-                                        </div>
-
-                                            <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                                <label grouptype="Vdata" id="Evidentiallabel" class="text-right col-sm-1 col-md-1 control-label">浜嬪疄渚濇嵁</label>
-                                                <div class="col-sm-8 col-md-8">
-                                                    <textarea class="form-control bt" name="Evidential" title="浜嬪疄渚濇嵁" isempty="" maxlength="3500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@challengeItemDTOs[i].Evidential</textarea>
-                                                </div>
-                                            </div>
-                                            <div id="falvyiju@(i)">
-                                                @for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
-                                                {
-                                                    @if (challengeItemDTOs[i].sysCodeDtls.Count == 1)
-                                                    {
                                                 <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
-                                                    <div class="col-sm-8 col-md-8">
-                                                        銆夽(challengeItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
+                                                    <label grouptype="Vdata" id="Questionlabel" class="text-right col-sm-1 col-md-1 control-label">璐ㄧ枒浜嬮」</label>
+                                                    <div class="col-sm-4 col-md-4" grouptype="Vdata">
+                                                        <select class="form-control" name="Question" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Questionchangge(@i);">
+                                                            <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                            @foreach (var item in question)
+                                                            {
+                                                                @if (!item.CodeSn.Equals(challengeItemDTOs[i].Question))
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
+                                                                else
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
+
+                                                            }
+                                                            }
+
+                                                        </select>
+                                                        <input type="hidden" name="challengeItemId" value="@challengeItemDTOs[i].Id" />
                                                     </div>
-                                                    <input type="hidden"  name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].CodeSn" />
-                                                    <input type="hidden"  name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
-                                                    <div class="col-sm-1 col-md-1" grouptype="Vdata">
-                                                        <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
-                                                    </div>
-                                                </div>
-                                                    }
-                                                    else
+                                                    @if (i == 0)
                                                     {
-                                            <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
-                                                <div class="col-sm-8 col-md-8">
-                                                    銆夽(challengeItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
-                                                </div>
-                                                <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].CodeSn" />
-                                                <input type="hidden" name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
-                                                <div class="col-sm-1 col-md-1" grouptype="Vdata">
-                                                    <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
-                                                </div>
-                                            </div>
+                                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                            <button type="button" class="addBtn" onclick="OpenWindow('鏂板璐ㄧ枒浜嬮」','98%','100%', '/SysCode/Editquestionzidingyi')" data-type="1">鏂板璐ㄧ枒浜嬮」</button>
+                                                        </div>
+
+
                                                     }
 
 
 
-                                                }
-                                            </div>
-                                        }
-                                        else
-                                        {
-                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璐ㄧ枒浜嬮」@(i+1)</label>
-                                        <div class="col-sm-4 col-md-4" grouptype="Vdata">
-                                            <select class="form-control" name="Question" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Questionchangge(@i);">
-                                                <option value="" hassubinfo="true">璇烽�夋嫨</option>
-                                                @foreach (var item in question)
-                                                {
-                                                    @if (!item.CodeSn.Equals(challengeItemDTOs[i].Question))
-                                                    {
-                                                        <option value="@item.CodeSn" hassubinfo="true">
-                                                            @item.Comments
-                                                        </option>
-                                                    }
-                                                    else
-                                                    {
-                                                        <option value="@item.CodeSn" hassubinfo="true" selected="selected">
-                                                            @item.Comments
-                                                        </option>
-                                                    }
-
-                                                }
-                                                }
-
-                                            </select>
-                                            <input type="hidden" name="challengeItemId" value="@challengeItemDTOs[i].Id" />
-                                        </div>
-                                        @if (i == 0)
-                                        {
-                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
-                                                <button type="button" class="addBtn" onclick="OpenWindow('鑷畾涔夎川鐤戜簨椤�','98%','100%', '/SysCode/Editquestionzidingyi')" data-type="1">鑷畾涔夎川鐤戜簨椤�</button>
-                                            </div>
-                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
-                                                <button type="button" class="addBtn" onclick="addlawinfo(this)" data-type="1">鏂板娉曞緥渚濇嵁</button>
-                                            </div>
-                                            @*<div class="col-sm-2 col-md-2" grouptype="Vdata">
-                <button type="button" class="addBtn" onclick="addquestion(this)" data-type="1">鏂板璐ㄧ枒浜嬮」</button>
-            </div>*@
-                                        }
-
-                                    </div>
-
-                                            <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">浜嬪疄渚濇嵁</label>
-                                                <div class="col-sm-8 col-md-8">
-                                                    <textarea class="form-control bt" name="Evidential" title="浜嬪疄渚濇嵁" isempty="" maxlength="3500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@challengeItemDTOs[i].Evidential</textarea>
                                                 </div>
-                                            </div>
-                                            <div id="falvyiju@(i)">
-                                                @for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
-                                                {
-                                                    @if (challengeItemDTOs[i].sysCodeDtls.Count == 1)
-                                                    {
+
                                                 <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
+                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">缂栬緫璐ㄧ枒浜嬮」</label>
+                                                    <div class="col-sm-8 col-md-8" grouptype="Vdata">
+                                                        <input class="form-control" label="缂栬緫璐ㄧ枒浜嬮」" id="Questionname@(i)" name="Questionname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@challengeItemDTOs[i].Questionname">
+
+                                                    </div>
+                                                </div>
+
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" id="Evidentiallabel" class="text-right col-sm-1 col-md-1 control-label">浜嬪疄渚濇嵁</label>
                                                     <div class="col-sm-8 col-md-8">
-                                                        銆夽(challengeItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
+                                                        <textarea class="form-control bt" name="Evidential" title="浜嬪疄渚濇嵁" isempty="" maxlength="3500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@challengeItemDTOs[i].Evidential</textarea>
                                                     </div>
-                                                    <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].CodeSn" />
-                                                    <input type="hidden" name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
-                                                    <div class="col-sm-1 col-md-1" grouptype="Vdata">
-                                                        <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
-                                                    </div>
-
                                                 </div>
-                                                    }
-                                                    else
+                                                <div id="falvyiju@(i)">
+                                                    @for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
                                                     {
-                                            <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
-                                                <div class="col-sm-8 col-md-8">
-                                                    銆夽(challengeItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
-                                                </div>
-                                                <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].CodeSn" />
-                                                <input type="hidden" name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
-                                                <div class="col-sm-1 col-md-1" grouptype="Vdata">
-                                                    <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
-                                                </div>
-
-                                            </div>
-                                                    }
-                                                }
-                                            </div>
-                                        }
-                                    </div>
-                                         
-
-
-
-
-
-
-
-
-
-                                            }
-                                        </div>
-
-                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璐ㄧ枒浜嬮」</label>
-                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
-
-                                                <button type="button" class="addBtn" onclick="addzhiyishixiang(this)" data-type="1" style="width:32px">+</button>
-                                                <button type="button" class="delBtn" onclick="delBtn(this)" data-type="1" style="width:32px">-</button>
-                                            </div>
-                                        </div>
-
-
-                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                            <label class="text-left col-sm-2 col-md-2 control-label">鍥涖�佷笌璐ㄧ枒浜嬮」鐩稿叧鐨勮川鐤戣姹�</label>
-                                        </div>
-
-                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璇锋眰</label>
-                                            <div class="col-sm-4 col-md-4" grouptype="Vdata">
-                                                <select id="RequestInfo" class="form-control" name="RequestInfo" data-placeholder="閫夋嫨 搴忓垪 ...">
-                                                    <option value="" hassubinfo="true">璇烽�夋嫨</option>
-                                                    @foreach (var item in request_info)
-                                                    {
-                                                        @if (!item.CodeSn.Equals(Model.RequestInfo))
+                                                        @if (challengeItemDTOs[i].sysCodeDtls.Count == 1)
                                                         {
-                                                            <option value="@item.CodeSn" hassubinfo="true">
-                                                                @item.Comments
-                                                            </option>
+                                                            <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
+                                                                <div class="col-sm-8 col-md-8">
+                                                                    銆夽(challengeItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
+                                                                </div>
+                                                                <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].CodeSn" />
+                                                                <input type="hidden" name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
+                                                                <div class="col-sm-1 col-md-1" grouptype="Vdata">
+                                                                    <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+                                                                </div>
+                                                            </div>
                                                         }
                                                         else
                                                         {
-                                                            <option value="@item.CodeSn" hassubinfo="true" selected="selected">
-                                                                @item.Comments
-                                                            </option>
+                                                            <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
+                                                                <div class="col-sm-8 col-md-8">
+                                                                    銆夽(challengeItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
+                                                                </div>
+                                                                <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].CodeSn" />
+                                                                <input type="hidden" name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
+                                                                <div class="col-sm-1 col-md-1" grouptype="Vdata">
+                                                                    <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+                                                                </div>
+                                                            </div>
                                                         }
 
+
+
                                                     }
+                                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                            <button type="button" class="addBtn" onclick="addlawinfo('@(challengeItemDTOs[i].Question)')" data-type="1">鏂板娉曞緥渚濇嵁</button>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+                                            }
+                                            else
+                                            {
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璐ㄧ枒浜嬮」@(i+1)</label>
+                                                    <div class="col-sm-4 col-md-4" grouptype="Vdata">
+                                                        <select class="form-control" name="Question" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Questionchangge(@i);">
+                                                            <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                            @foreach (var item in question)
+                                                            {
+                                                                @if (!item.CodeSn.Equals(challengeItemDTOs[i].Question))
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
+                                                                else
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
+
+                                                            }
+                                                            }
+
+                                                        </select>
+                                                        <input type="hidden" name="challengeItemId" value="@challengeItemDTOs[i].Id" />
+                                                    </div>
+                                                    @if (i == 0)
+                                                    {
+                                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                            <button type="button" class="addBtn" onclick="OpenWindow('鏂板璐ㄧ枒浜嬮」','98%','100%', '/SysCode/Editquestionzidingyi')" data-type="1">鏂板璐ㄧ枒浜嬮」</button>
+                                                        </div>
+
+                                                        @*<div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                    <button type="button" class="addBtn" onclick="addquestion(this)" data-type="1">鏂板璐ㄧ枒浜嬮」</button>
+                                </div>*@
                                                     }
 
-                                                </select>
+                                                </div>
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">缂栬緫璐ㄧ枒浜嬮」</label>
+                                                    <div class="col-sm-8 col-md-8" grouptype="Vdata">
+                                                        <input class="form-control" label="缂栬緫璐ㄧ枒浜嬮」" id="Questionname@(i)" name="Questionname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@challengeItemDTOs[i].Questionname">
 
-                                            </div>
+                                                    </div>
+                                                </div>
 
-                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
-                    <button type="button" class="addBtn" onclick="addrequestinfo(this)" data-type="1">鏂板璐ㄧ枒璇锋眰</button>
-                </div>
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">浜嬪疄渚濇嵁</label>
+                                                    <div class="col-sm-8 col-md-8">
+                                                        <textarea class="form-control bt" name="Evidential" title="浜嬪疄渚濇嵁" isempty="" maxlength="3500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@challengeItemDTOs[i].Evidential</textarea>
+                                                    </div>
+                                                </div>
+                                                <div id="falvyiju@(i)">
+                                                    @for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
+                                                    {
+                                                        @if (challengeItemDTOs[i].sysCodeDtls.Count == 1)
+                                                        {
+                                                            <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
+                                                                <div class="col-sm-8 col-md-8">
+                                                                    銆夽(challengeItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
+                                                                </div>
+                                                                <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].CodeSn" />
+                                                                <input type="hidden" name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
+                                                                <div class="col-sm-1 col-md-1" grouptype="Vdata">
+                                                                    <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+                                                                </div>
 
+                                                            </div>
+                                                        }
+                                                        else
+                                                        {
+                                                            <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
+                                                                <div class="col-sm-8 col-md-8">
+                                                                    銆夽(challengeItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
+                                                                </div>
+                                                                <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].CodeSn" />
+                                                                <input type="hidden" name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
+                                                                <div class="col-sm-1 col-md-1" grouptype="Vdata">
+                                                                    <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+                                                                </div>
 
+                                                            </div>
+                                                        }
+                                                    }
+                                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                            <button type="button" class="addBtn" onclick="addlawinfo('@(challengeItemDTOs[i].Question)')" data-type="1">鏂板娉曞緥渚濇嵁</button>
+                                                        </div>
+                                                    </div>
+                                                </div>
 
+                                            }
                                         </div>
 
 
@@ -547,7 +509,155 @@
 
 
 
+
+
+
+                                    }
+                                </div>
+
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璐ㄧ枒浜嬮」</label>
+                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
+
+                                        <button type="button" class="addBtn" onclick="addzhiyishixiang(this)" data-type="1" style="width:32px">+</button>
+                                        <button type="button" class="delBtn" onclick="delBtn(this)" data-type="1" style="width:32px">-</button>
                                     </div>
+                                </div>
+
+
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                    <label class="text-left col-sm-2 col-md-2 control-label">鍥涖�佷笌璐ㄧ枒浜嬮」鐩稿叧鐨勮川鐤戣姹�</label>
+                                </div>
+
+                                <div id="xiangguanqingqiu">
+                                    @for (int i = 0; i < challengeRequestInfoDTOs.Count; i++)
+                                    {
+                                        <div class="xiangguanqingqiuitem">
+                                            @if (challengeRequestInfoDTOs.Count == 1)
+                                            {
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" id="RequestInfolabel" class="text-right col-sm-1 col-md-1 control-label">璇锋眰</label>
+                                                    <div class="col-sm-4 col-md-4" grouptype="Vdata">
+                                                        <select class="form-control" name="RequestInfos" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="RequestInfochangge(@i);">
+                                                            <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                            @foreach (var item in request_info)
+                                                            {
+                                                                @if (!item.CodeSn.Equals(challengeRequestInfoDTOs[i].RequestInfo))
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
+                                                                else
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
+
+                                                            }
+                                                            }
+
+                                                        </select>
+                                                       
+                                                    </div>
+                                                    @if (i == 0)
+                                                    {
+                                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                            <button type="button" class="addBtn" onclick="addrequestinfo(this)" data-type="1">鏂板璐ㄧ枒璇锋眰</button>
+                                                        </div>
+
+
+                                                    }
+
+
+
+                                                </div>
+
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">缂栬緫璇锋眰</label>
+                                                    <div class="col-sm-8 col-md-8" grouptype="Vdata">
+                                                        <input class="form-control" label="缂栬緫璇锋眰" id="RequestInfoname@(i)" name="RequestInfoname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@challengeRequestInfoDTOs[i].RequestInfoname">
+
+                                                    </div>
+                                                </div>
+
+
+
+
+                                            }
+                                            else
+                                            {
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璇锋眰@(i+1)</label>
+                                                    <div class="col-sm-4 col-md-4" grouptype="Vdata">
+                                                        <select class="form-control" name="RequestInfos" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="RequestInfochangge(@i);">
+                                                            <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                            @foreach (var item in request_info)
+                                                            {
+                                                                @if (!item.CodeSn.Equals(challengeRequestInfoDTOs[i].RequestInfo))
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
+                                                                else
+                                                                {
+                                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                                                        @item.Comments
+                                                                    </option>
+                                                                }
+
+                                                            }
+                                                            }
+
+                                                        </select>
+                                                       
+                                                    </div>
+                                                    @if (i == 0)
+                                                    {
+                                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                            <button type="button" class="addBtn" onclick="addrequestinfo(this)" data-type="1">鏂板璐ㄧ枒璇锋眰</button>
+                                                        </div>
+
+
+                                                    }
+
+                                                </div>
+                                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">缂栬緫璇锋眰</label>
+                                                    <div class="col-sm-8 col-md-8" grouptype="Vdata">
+                                                        <input class="form-control" label="缂栬緫璇锋眰" id="RequestInfoname@(i)" name="RequestInfoname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@challengeRequestInfoDTOs[i].RequestInfoname">
+
+                                                    </div>
+                                                </div>
+
+
+
+
+                                            }
+                                        </div>
+
+                                    }
+                                </div>
+
+
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璐ㄧ枒璇锋眰</label>
+                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
+
+                                        <button type="button" class="addBtn" onclick="addxiangguanqingqiu(this)" data-type="1" style="width:32px">+</button>
+                                        <button type="button" class="delBtn" onclick="delBtnxiangguanqingqiu(this)" data-type="1" style="width:32px">-</button>
+                                    </div>
+                                </div>
+                          
+
+
+
+
+
+
+                            </div>
                             </div>
                     </div>
                 </div>
@@ -704,7 +814,7 @@
                                     parent._CloseTab1("/CooperOrder/EditZhiyihan");
                                 }
                             }
-                           
+
 
                         }
                         else {
@@ -750,9 +860,12 @@
         }
 
         function Questionchangge(i) {
+            var Question = document.getElementsByName("Question")[i];
+            var sss = Question.value;
+            var index = Question.selectedIndex; // 閫変腑绱㈠紩
+            var text = Question.options[index].text; // 閫変腑鏂囨湰
+            $("#Questionname" + i).val(text);
 
-            var sss = document.getElementsByName("Question")[i].value;
-            
             var challengeItemId = document.getElementsByName("challengeItemId")[i].value;
             $.ajax({
                 type: "GET",
@@ -807,7 +920,6 @@
 
                         }
 
-
                     }
                     else {
                         falvyijuhtml += `
@@ -823,6 +935,13 @@
 
                     falvyijuhtml += `   </div> `;
 
+                    falvyijuhtml += `
+                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                <button type="button" class="addBtn" onclick="addlawinfo('` + data.Remark2 + `')" data-type="1">鏂板娉曞緥渚濇嵁</button>
+                            </div>
+                        </div>
+  `;
                     falvyiju.html(falvyijuhtml);
 
 
@@ -917,6 +1036,13 @@
                                             </div>
 
                                         </div>
+<div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">缂栬緫璐ㄧ枒浜嬮」</label>
+                                                <div class="col-sm-8 col-md-8" grouptype="Vdata">
+                                                    <input class="form-control" label="缂栬緫璐ㄧ枒浜嬮」" id="Questionname`+ sss + `" name="Questionname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="">
+
+                                                </div>
+                                            </div>
 
                                         <div class="clearfix layer-area" style="padding-bottom:15px;">
                                             <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">浜嬪疄渚濇嵁</label>
@@ -954,10 +1080,10 @@
         var addrequestinfo = function () {
             OpenWindow("鏂板璐ㄧ枒璇锋眰", "98%", "90%", "/SysCode/Editrequestinfozidingyi/");
         }
-        var addlawinfo = function () {
-            OpenWindow("鏂板娉曞緥渚濇嵁", "98%", "90%", "/SysCode/Editlawzidingyi/");
+        var addlawinfo = function (question) {
+            OpenWindow("鏂板娉曞緥渚濇嵁", "98%", "90%", "/SysCode/Editlawzidingyi?Classify1=" + question);
         }
-        
+
 
         //function PrintNumzichangge() {
         //    var sss = $('#PrintNumzi').val();
@@ -991,6 +1117,76 @@
 
             }
         }
+
+        function delBtnxiangguanqingqiu(obj) {
+            var num = $(obj).data().type;
+            console.log(num)
+
+            if (num == 1) {
+                if ($('#xiangguanqingqiu').find('.xiangguanqingqiuitem').length > 1) {
+                    $('#xiangguanqingqiu').find('.xiangguanqingqiuitem:last').remove();
+                }
+
+            }
+        }
+
+
+        function addxiangguanqingqiu(obj) {
+              var sss = document.getElementsByName("RequestInfos").length;
+              if (document.getElementsByName("RequestInfos").length == 1) {
+
+                $('#RequestInfolabel').text("璇锋眰1");
+            }
+
+              $('#xiangguanqingqiu').append(`   <div class="xiangguanqingqiuitem">
+  <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璇锋眰`+ (sss+1) + `</label>
+                                            <div class="col-sm-4 col-md-4" grouptype="Vdata">
+                                                <select class="form-control"  name="RequestInfos" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="RequestInfochangge(`+ sss + `);">
+                                                    <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                    @foreach (var item in request_info)
+                                                    {
+
+                                                            <option value="@item.CodeSn" hassubinfo="true" >
+                                                                @item.Comments
+                                                            </option>
+
+                                                    }
+                                                    }
+
+                                                </select>
+                               <input type="hidden"  name="challengeItemId" value="`+ (guid()) + `" />
+                                            </div>
+
+                                        </div>
+<div class="clearfix layer-area" style="padding-bottom:15px;">
+                                                <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">缂栬緫璇锋眰</label>
+                                                <div class="col-sm-8 col-md-8" grouptype="Vdata">
+                                                    <input class="form-control" label="缂栬緫璇锋眰" id="RequestInfoname`+ sss + `" name="RequestInfoname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="">
+
+                                                </div>
+                                            </div>
+
+                                      
+ 
+</div>
+`);
+            $("select" + sss).chosen();
+        }
+
+
+        function RequestInfochangge(i) {
+            var RequestInfo = document.getElementsByName("RequestInfos")[i];
+       /*     var sss = RequestInfo.value;*/
+            var index = RequestInfo.selectedIndex; // 閫変腑绱㈠紩
+            var text = RequestInfo.options[index].text; // 閫変腑鏂囨湰
+            $("#RequestInfoname" + i).val(text);
+
+         
+           
+        }
+
+
         function dellawBtn(obj) {
 
             $(obj).parent().parent().remove();
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
index f6743f1..34368e1 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
@@ -218,6 +218,27 @@
                 }
             },
 
+            {
+                label: '鏂板璁㈠崟', name: 'dingdantype', labtype: 'txt', hidden: false, width: 60,
+                formatter: function (cellvalue, options, rowObject) {
+                    if (rowObject.OrderType == '02' && rowObject.OrderType1 == '浠f嫙璐ㄧ枒鍑�' ) {
+                        return "<a onclick=\"OpenWindow('浠f嫙鎶曡瘔涔�','100%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&dingdantype=1')\"  >浠f嫙鎶曡瘔涔�</a>";
+                    }
+                    else if (rowObject.OrderType == '02' && rowObject.OrderType1 == '浠f嫙鎶曡瘔涔�') {
+                        return "<a onclick=\"OpenWindow('澶嶈璇夎','100%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&dingdantype=2')\"  >澶嶈璇夎</a>";
+                    }
+                    else if (rowObject.OrderType == '08' && rowObject.OrderType1 == '澶嶈璇夎') {
+                        return "<a onclick=\"OpenWindow('澶嶈璇夎','100%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&dingdantype=3')\"  >澶嶈璇夎</a>";
+                    }
+                    else {
+                        return "";
+                    }
+
+
+
+
+                }
+            },
         ];
 
 
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
index 191605e..7c00765 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
@@ -15,8 +15,10 @@
 
     int PrintNum = Model.PrintNum.HasValue? Model.PrintNum.Value:0;
 
+    List<TChallengeRequestInfoDTO> challengeRequestInfoDTOs = Model.challengeRequestInfoDTOs;
 
- ResultDataEntity<SysAttachmentDTO> yinyezhizhao = ViewBag.yinyezhizhao as ResultDataEntity<SysAttachmentDTO>; //钀ヤ笟鎵х収
+
+    ResultDataEntity<SysAttachmentDTO> yinyezhizhao = ViewBag.yinyezhizhao as ResultDataEntity<SysAttachmentDTO>; //钀ヤ笟鎵х収
     List<SysAttachmentDTO> yinyezhizhaosssss = new List<SysAttachmentDTO>();
     if (yinyezhizhao.DataList != null)
     {
@@ -30,7 +32,7 @@
         shenfenzhengsssss = shenfenzheng.DataList;
     }
 
-  CooperatecustomCustomerDTO cooperatecustomCustomerDTO = ViewBag.cooperatecustomCustomerDTO as CooperatecustomCustomerDTO; //瀹㈡埛
+    CooperatecustomCustomerDTO cooperatecustomCustomerDTO = ViewBag.cooperatecustomCustomerDTO as CooperatecustomCustomerDTO; //瀹㈡埛
 
 }
 @{
@@ -94,14 +96,14 @@
                     <style type="text/css">
                         table {
                             width: 595px;
-                            font-size: 16pt;
+                            font-size: 14pt;
                             font-family: 'FangSong';
                             background: #fff;
                             line-height: 1.5;
                         }
 
                         span {
-                            font-size: 16pt;
+                            font-size: 14pt;
                             display: inline;
                             /*  border-bottom: 1px dashed #111;*/
                         }
@@ -136,15 +138,15 @@
                             @for (int i = 0; i < challengecomplaintShouquandaibiaoDTOs.Count; i++)
                             {
 
-                            <tr>
-                                <td colspan="2" align="left">鎺堟潈浠h〃@(i!=0?(i+""):"")锛�<span style="width:480px;">@challengecomplaintShouquandaibiaoDTOs[i].Shouquandaibiao </span></td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" align="left">鑱旂郴鐢佃瘽@(i!=0?(i+""):"")锛�<span style="width:480px;">@challengecomplaintShouquandaibiaoDTOs[i].Lianxidianhua </span></td>
-                            </tr>
-                            <tr>
-                                <td align="left" colspan="2">鍦板潃@(i!=0?(i+""):"")锛�<span style="width:290px;">@challengecomplaintShouquandaibiaoDTOs[i].Dizhi </span>&nbsp; &nbsp; @(string.IsNullOrEmpty(challengecomplaintShouquandaibiaoDTOs[i].Youbian)?"":"閭紪")@(i!=0?(i+""):"")锛�<span style="width:160px;">@challengecomplaintShouquandaibiaoDTOs[i].Youbian </span></td>
-                            </tr>
+                                <tr>
+                                    <td colspan="2" align="left">鎺堟潈浠h〃@(i!=0?(i+""):"")锛�<span style="width:480px;">@challengecomplaintShouquandaibiaoDTOs[i].Shouquandaibiao </span></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="2" align="left">鑱旂郴鐢佃瘽@(i!=0?(i+""):"")锛�<span style="width:480px;">@challengecomplaintShouquandaibiaoDTOs[i].Lianxidianhua </span></td>
+                                </tr>
+                                <tr>
+                                    <td align="left" colspan="2">鍦板潃@(i!=0?(i+""):"")锛�<span style="width:290px;">@challengecomplaintShouquandaibiaoDTOs[i].Dizhi </span>&nbsp; &nbsp; @(string.IsNullOrEmpty(challengecomplaintShouquandaibiaoDTOs[i].Youbian)?"":"閭紪")@(i!=0?(i+""):"")锛�<span style="width:160px;">@challengecomplaintShouquandaibiaoDTOs[i].Youbian </span></td>
+                                </tr>
                             }
                             <tr>
                                 <td colspan="2"><b>浜屻�佽川鐤戦」鐩熀鏈儏鍐�</b></td>
@@ -171,47 +173,48 @@
                                 {
                                     if (challengeItemDTOs.Count == 1)
                                     {
-                                <tr>
-                                    <td colspan="2">
-                                        璐ㄧ枒浜嬮」锛�<span style="text-indent:10px">@challengeItemDTOs[i].QuestionName </span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">
-                                        浜嬪疄渚濇嵁锛欯Html.Raw("<span>" + (string.IsNullOrEmpty(challengeItemDTOs[i].Evidential) ? "" : challengeItemDTOs[i].Evidential.Replace(" ", "&nbsp;").Replace("\r", "<br/>")) + "</span>")
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">
-                                        娉曞緥渚濇嵁锛�
-                                        @for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
+                                        <tr>
+                                            <td colspan="2">
+                                                璐ㄧ枒浜嬮」锛�<span style="text-indent:10px">@(string.IsNullOrEmpty(challengeItemDTOs[i].Questionname)?challengeItemDTOs[i].QuestionName: challengeItemDTOs[i].Questionname) </span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="2">
+                                                浜嬪疄渚濇嵁锛欯Html.Raw("<span>" + (string.IsNullOrEmpty(challengeItemDTOs[i].Evidential) ? "" : challengeItemDTOs[i].Evidential.Replace(" ", "&nbsp;").Replace("\r", "<br/>")) + "</span>")
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="2">
+                                                娉曞緥渚濇嵁锛�
+                                                @for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
                                                 {
                                                     var sssss = "";
-                                                  if(j == 0 || challengeItemDTOs[i].sysCodeDtls[j].Classify3 != challengeItemDTOs[i].sysCodeDtls[j-1].Classify3){
-                                          if (challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�") >= 0)
+                                                    if (j == 0 || challengeItemDTOs[i].sysCodeDtls[j].Classify3 != challengeItemDTOs[i].sysCodeDtls[j - 1].Classify3)
                                                     {
-                                                        sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3.Insert(challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
+                                                        if (challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�") >= 0)
+                                                        {
+                                                            sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3.Insert(challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
+                                                        }
+                                                        else
+                                                        {
+                                                            sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
+                                                        }
                                                     }
-                                                    else
-                                                    {
-                                                        sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
-                                                    }
-                                        }
-                                                  
+
 
                                                     if (j != (challengeItemDTOs[i].sysCodeDtls.Count - 1))
                                                     {
-                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2 + "銆�")
+                                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2 + "銆�")
                                                     }
                                                     else
                                                     {
-                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2  )
+                                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2)
                                                     }
 
                                                 }
 
-                                    </td>
-                                </tr>
+                                            </td>
+                                        </tr>
 
 
 
@@ -220,47 +223,48 @@
                                     }
                                     else
                                     {
-                                <tr>
-                                    <td colspan="2">
-                                        璐ㄧ枒浜嬮」@((i + 1) + "")锛�<span style="text-indent:10px">@challengeItemDTOs[i].QuestionName </span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">
-                                        浜嬪疄渚濇嵁@((i + 1) + "")锛� @Html.Raw("<span>" + (string.IsNullOrEmpty(challengeItemDTOs[i].Evidential) ? "" : challengeItemDTOs[i].Evidential.Replace(" ", "&nbsp;").Replace("\r", "<br/>")) + "</span>")
-                                    </td>
-                                </tr>
+                                        <tr>
+                                            <td colspan="2">
+                                                璐ㄧ枒浜嬮」@((i + 1) + "")锛�<span style="text-indent:10px">@(string.IsNullOrEmpty(challengeItemDTOs[i].Questionname)?challengeItemDTOs[i].QuestionName: challengeItemDTOs[i].Questionname) </span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="2">
+                                                浜嬪疄渚濇嵁锛� @Html.Raw("<span>" + (string.IsNullOrEmpty(challengeItemDTOs[i].Evidential) ? "" : challengeItemDTOs[i].Evidential.Replace(" ", "&nbsp;").Replace("\r", "<br/>")) + "</span>")
+                                            </td>
+                                        </tr>
 
-                                <tr>
-                                    <td colspan="2">
-                                        娉曞緥渚濇嵁锛�
-                                        @for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
+                                        <tr>
+                                            <td colspan="2">
+                                                娉曞緥渚濇嵁锛�
+                                                @for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
                                                 {
                                                     var sssss = "";
-                                                    if(j == 0 || challengeItemDTOs[i].sysCodeDtls[j].Classify3 != challengeItemDTOs[i].sysCodeDtls[j-1].Classify3){
-                                          if (challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�") >= 0)
+                                                    if (j == 0 || challengeItemDTOs[i].sysCodeDtls[j].Classify3 != challengeItemDTOs[i].sysCodeDtls[j - 1].Classify3)
                                                     {
-                                                        sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3.Insert(challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
+                                                        if (challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�") >= 0)
+                                                        {
+                                                            sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3.Insert(challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
+                                                        }
+                                                        else
+                                                        {
+                                                            sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
+                                                        }
                                                     }
-                                                    else
-                                                    {
-                                                        sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
-                                                    }
-                                        }
 
                                                     if (j != (challengeItemDTOs[i].sysCodeDtls.Count - 1))
                                                     {
-                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2 + "銆�")
+                                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2 + "銆�")
                                                     }
                                                     else
                                                     {
-                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2)
+                                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2)
                                                     }
 
                                                 }
 
-                                    </td>
-                                </tr>
+                                            </td>
+                                        </tr>
 
 
                                     }
@@ -270,12 +274,46 @@
                             <tr>
                                 <td colspan="2"><b>鍥涖�佷笌璐ㄧ枒浜嬮」鐩稿叧鐨勮川鐤戣姹�</b></td>
                             </tr>
-                            <tr>
-                                <td colspan="2" align="left">璇锋眰锛�<span>@Model.RequestInfoName</span></td>
-                            </tr>
+
+                            @{
+                                @for (int i = 0; i < challengeRequestInfoDTOs.Count; i++)
+                                {
+                                    if (challengeRequestInfoDTOs.Count == 1)
+                                    {
+                                        <tr>
+                                            <td colspan="2">
+                                                璇锋眰锛�<span style="text-indent:10px">@(string.IsNullOrEmpty(challengeRequestInfoDTOs[i].RequestInfoname)? challengeRequestInfoDTOs[i].RequestInfoNameName: challengeRequestInfoDTOs[i].RequestInfoname) </span>
+                                            </td>
+                                        </tr>
+                                         
+
+
+
+
+
+                                    }
+                                    else
+                                    {
+                                        <tr>
+                                            <td colspan="2">
+                                                璇锋眰@((i + 1) + "")锛�<span style="text-indent:10px">@(string.IsNullOrEmpty(challengeRequestInfoDTOs[i].RequestInfoname)? challengeRequestInfoDTOs[i].RequestInfoNameName: challengeRequestInfoDTOs[i].RequestInfoname)  </span>
+                                            </td>
+                                        </tr>
+                                         
+
+                                        
+
+
+                                    }
+
+                                }
+                            }
                             @*<tr>
-                        <td colspan="2" style="height:15px"></td>
-                    </tr>*@
+            <td colspan="2" align="left">璇锋眰锛�<span>@Model.RequestInfoName</span></td>
+        </tr>*@
+                            @*<tr>
+            <td colspan="2" style="height:15px"></td>
+        </tr>*@
                             <tr>
                                 <td align="left">绛惧瓧(绛剧珷)锛�</td>
                                 <td align="left">鍏珷锛�</td>
@@ -325,7 +363,7 @@
                                 <td colspan="2" style="height:50px"></td>
                             </tr>
                             <tr>
-                                <td colspan="2" align="right">宸濆嵃鏂囧寲闆嗗洟鑲′唤鏈夐檺鍏徃锛堝叕绔狅級<img src="~/img/images/gongzhang.png?v=3" alt="" /></td>
+                                <td colspan="2" align="right">宸濆嵃鏂囧寲闆嗗洟鑲′唤鏈夐檺鍏徃锛堝叕绔狅級</td>
                             </tr>
                             <tr>
                                 <td colspan="2" align="right">鏃ユ湡锛欯Model.Modifytime.Value.ToString("yyyy骞碝M鏈坉d鏃�")</td>
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml
index 69fdc16..4b41243 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml
@@ -15,12 +15,15 @@
 
     List<TComplaintGongyingshangDTO> complaintGongyingshangDTOs = Model.complaintGongyingshangDTOs;
 
+
+    List<TChallengeRequestInfoDTO> challengeRequestInfoDTOs = Model.challengeRequestInfoDTOs;
+
     List<TComplaintItemDTO> complaintItemDTOs = Model.complaintItemDTOs;
 
     int PrintNum = Model.PrintNum.HasValue ? Model.PrintNum.Value : 0;
 
 
- ResultDataEntity<SysAttachmentDTO> yinyezhizhao = ViewBag.yinyezhizhao as ResultDataEntity<SysAttachmentDTO>; //钀ヤ笟鎵х収
+    ResultDataEntity<SysAttachmentDTO> yinyezhizhao = ViewBag.yinyezhizhao as ResultDataEntity<SysAttachmentDTO>; //钀ヤ笟鎵х収
     List<SysAttachmentDTO> yinyezhizhaosssss = new List<SysAttachmentDTO>();
     if (yinyezhizhao.DataList != null)
     {
@@ -34,7 +37,7 @@
         shenfenzhengsssss = shenfenzheng.DataList;
     }
 
- CooperatecustomCustomerDTO cooperatecustomCustomerDTO = ViewBag.cooperatecustomCustomerDTO as CooperatecustomCustomerDTO; //瀹㈡埛
+    CooperatecustomCustomerDTO cooperatecustomCustomerDTO = ViewBag.cooperatecustomCustomerDTO as CooperatecustomCustomerDTO; //瀹㈡埛
 
 }
 @{
@@ -98,14 +101,14 @@
                     <style type="text/css">
                         table {
                             width: 595px;
-                            font-size: 16pt;
+                            font-size: 14pt;
                             font-family: 'FangSong';
                             background: #fff;
                             line-height: 1.5;
                         }
 
                         span {
-                            font-size: 16pt;
+                            font-size: 14pt;
                             display: inline;
                             /*  border-bottom: 1px dashed #111;*/
                         }
@@ -144,43 +147,43 @@
                             @for (int i = 0; i < complaintShouquandaibiaoDTOs.Count; i++)
                             {
 
-                            <tr>
-                                <td colspan="2" align="left">鎺堟潈浠h〃@(i!=0?(i+""):"")锛�<span style="width:480px;">@complaintShouquandaibiaoDTOs[i].Shouquandaibiao </span></td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" align="left">鑱旂郴鐢佃瘽@(i!=0?(i+""):"")锛�<span style="width:480px;">@complaintShouquandaibiaoDTOs[i].Lianxidianhua </span></td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" align="left">鍦板潃@(i!=0?(i+""):"")锛�<span style="width:290px;">@complaintShouquandaibiaoDTOs[i].Dizhi </span>&nbsp; &nbsp; @(string.IsNullOrEmpty(complaintShouquandaibiaoDTOs[i].Youbian)?"":"閭紪锛�")@(i!=0?(i+""):"")<span style="width:160px;">@complaintShouquandaibiaoDTOs[i].Youbian </span></td>
-                            </tr>
+                                <tr>
+                                    <td colspan="2" align="left">鎺堟潈浠h〃@(i!=0?(i+""):"")锛�<span style="width:480px;">@complaintShouquandaibiaoDTOs[i].Shouquandaibiao </span></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="2" align="left">鑱旂郴鐢佃瘽@(i!=0?(i+""):"")锛�<span style="width:480px;">@complaintShouquandaibiaoDTOs[i].Lianxidianhua </span></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="2" align="left">鍦板潃@(i!=0?(i+""):"")锛�<span style="width:290px;">@complaintShouquandaibiaoDTOs[i].Dizhi </span>&nbsp; &nbsp; @(string.IsNullOrEmpty(complaintShouquandaibiaoDTOs[i].Youbian)?"":"閭紪锛�")@(i!=0?(i+""):"")<span style="width:160px;">@complaintShouquandaibiaoDTOs[i].Youbian </span></td>
+                                </tr>
                             }
                             @for (int i = 0; i < complaintRespondentDTOs.Count; i++)
                             {
                                 if (complaintRespondentDTOs.Count == 1)
                                 {
-                            <tr>
-                                <td colspan="2" align="left">琚姇璇変汉锛�<span style="width:480px;">@complaintRespondentDTOs[i].Respondent </span></td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" align="left">鍦板潃锛�<span style="width:290px;">@complaintRespondentDTOs[i].Address </span>&nbsp; &nbsp; @(string.IsNullOrEmpty(complaintRespondentDTOs[i].Postcode)?"":"閭紪锛�")<span style="width:160px;">@complaintRespondentDTOs[i].Postcode </span></td>
-                            </tr>
-                            <tr>
-                                <td align="left" width="50%">鑱旂郴浜猴細<span style="width:290px;">@complaintRespondentDTOs[i].Contacts </span></td>
-                                <td align="left" width="50%">鑱旂郴鐢佃瘽锛�<span style="width:160px;">@complaintRespondentDTOs[i].Phone </span></td>
-                            </tr>
+                                    <tr>
+                                        <td colspan="2" align="left">琚姇璇変汉锛�<span style="width:480px;">@complaintRespondentDTOs[i].Respondent </span></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="2" align="left">鍦板潃锛�<span style="width:290px;">@complaintRespondentDTOs[i].Address </span>&nbsp; &nbsp; @(string.IsNullOrEmpty(complaintRespondentDTOs[i].Postcode)?"":"閭紪锛�")<span style="width:160px;">@complaintRespondentDTOs[i].Postcode </span></td>
+                                    </tr>
+                                    <tr>
+                                        <td align="left" width="50%">鑱旂郴浜猴細<span style="width:290px;">@complaintRespondentDTOs[i].Contacts </span></td>
+                                        <td align="left" width="50%">鑱旂郴鐢佃瘽锛�<span style="width:160px;">@complaintRespondentDTOs[i].Phone </span></td>
+                                    </tr>
                                 }
                                 else
                                 {
-                            <tr>
-                                <td colspan="2" align="left">琚姇璇変汉@(i+1)锛�<span style="width:480px;">@complaintRespondentDTOs[i].Respondent </span></td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" align="left">鍦板潃@(i+1)锛�<span style="width:290px;">@complaintRespondentDTOs[i].Address </span>&nbsp; &nbsp;@(string.IsNullOrEmpty(complaintRespondentDTOs[i].Postcode)?"":"閭紪锛�")@(i+1)锛�<span style="width:160px;">@complaintRespondentDTOs[i].Postcode </span></td>
-                            </tr>
-                            <tr>
-                                <td align="left" width="50%">鑱旂郴浜篅(i+1)锛�<span style="width:290px;">@complaintRespondentDTOs[i].Contacts </span></td>
-                                <td align="left" width="50%">鑱旂郴鐢佃瘽@(i+1)锛�<span style="width:160px;">@complaintRespondentDTOs[i].Phone </span></td>
-                            </tr>
+                                    <tr>
+                                        <td colspan="2" align="left">琚姇璇変汉@(i+1)锛�<span style="width:480px;">@complaintRespondentDTOs[i].Respondent </span></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="2" align="left">鍦板潃@(i+1)锛�<span style="width:290px;">@complaintRespondentDTOs[i].Address </span>&nbsp; &nbsp;@(string.IsNullOrEmpty(complaintRespondentDTOs[i].Postcode)?"":"閭紪锛�")@(i+1)锛�<span style="width:160px;">@complaintRespondentDTOs[i].Postcode </span></td>
+                                    </tr>
+                                    <tr>
+                                        <td align="left" width="50%">鑱旂郴浜篅(i+1)锛�<span style="width:290px;">@complaintRespondentDTOs[i].Contacts </span></td>
+                                        <td align="left" width="50%">鑱旂郴鐢佃瘽@(i+1)锛�<span style="width:160px;">@complaintRespondentDTOs[i].Phone </span></td>
+                                    </tr>
                                 }
 
 
@@ -189,29 +192,29 @@
                             {
                                 if (complaintGongyingshangDTOs.Count == 1)
                                 {
-                            <tr>
-                                <td colspan="2" align="left">鐩稿叧渚涘簲鍟嗭細<span style="width:480px;">@complaintGongyingshangDTOs[i].Gongytingshang </span></td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" align="left">鍦板潃锛�<span style="width:290px;">@complaintGongyingshangDTOs[i].Dizhi </span>&nbsp; &nbsp;@(string.IsNullOrEmpty(complaintGongyingshangDTOs[i].Youbian)?"":"閭紪锛�")<span style="width:160px;">@complaintGongyingshangDTOs[i].Youbian </span></td>
-                            </tr>
-                            <tr>
-                                <td align="left" width="50%">鑱旂郴浜猴細<span style="width:290px;">@complaintGongyingshangDTOs[i].Dizhi </span></td>
-                                <td align="left" width="50%">鑱旂郴鐢佃瘽锛�<span style="width:160px;">@complaintGongyingshangDTOs[i].Youbian </span></td>
-                            </tr>
+                                    <tr>
+                                        <td colspan="2" align="left">鐩稿叧渚涘簲鍟嗭細<span style="width:480px;">@complaintGongyingshangDTOs[i].Gongytingshang </span></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="2" align="left">鍦板潃锛�<span style="width:290px;">@complaintGongyingshangDTOs[i].Dizhi </span>&nbsp; &nbsp;@(string.IsNullOrEmpty(complaintGongyingshangDTOs[i].Youbian)?"":"閭紪锛�")<span style="width:160px;">@complaintGongyingshangDTOs[i].Youbian </span></td>
+                                    </tr>
+                                    <tr>
+                                        <td align="left" width="50%">鑱旂郴浜猴細<span style="width:290px;">@complaintGongyingshangDTOs[i].Dizhi </span></td>
+                                        <td align="left" width="50%">鑱旂郴鐢佃瘽锛�<span style="width:160px;">@complaintGongyingshangDTOs[i].Youbian </span></td>
+                                    </tr>
                                 }
                                 else
                                 {
-                            <tr>
-                                <td colspan="2" align="left">鐩稿叧渚涘簲鍟咢(i+1)锛�<span style="width:480px;">@complaintGongyingshangDTOs[i].Gongytingshang </span></td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" align="left">鍦板潃@(i+1)锛�<span style="width:290px;">@complaintGongyingshangDTOs[i].Dizhi </span>&nbsp; &nbsp;@(string.IsNullOrEmpty(complaintGongyingshangDTOs[i].Youbian)?"":"閭紪锛�")@(i+1)锛�<span style="width:160px;">@complaintGongyingshangDTOs[i].Youbian </span></td>
-                            </tr>
-                            <tr>
-                                <td align="left" width="50%">鑱旂郴浜篅(i+1)锛�<span style="width:290px;">@complaintGongyingshangDTOs[i].Dizhi </span></td>
-                                <td align="left" width="50%">鑱旂郴鐢佃瘽@(i+1)锛�<span style="width:160px;">@complaintGongyingshangDTOs[i].Youbian </span></td>
-                            </tr>
+                                    <tr>
+                                        <td colspan="2" align="left">鐩稿叧渚涘簲鍟咢(i+1)锛�<span style="width:480px;">@complaintGongyingshangDTOs[i].Gongytingshang </span></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="2" align="left">鍦板潃@(i+1)锛�<span style="width:290px;">@complaintGongyingshangDTOs[i].Dizhi </span>&nbsp; &nbsp;@(string.IsNullOrEmpty(complaintGongyingshangDTOs[i].Youbian)?"":"閭紪锛�")@(i+1)锛�<span style="width:160px;">@complaintGongyingshangDTOs[i].Youbian </span></td>
+                                    </tr>
+                                    <tr>
+                                        <td align="left" width="50%">鑱旂郴浜篅(i+1)锛�<span style="width:290px;">@complaintGongyingshangDTOs[i].Dizhi </span></td>
+                                        <td align="left" width="50%">鑱旂郴鐢佃瘽@(i+1)锛�<span style="width:160px;">@complaintGongyingshangDTOs[i].Youbian </span></td>
+                                    </tr>
                                 }
 
 
@@ -247,11 +250,11 @@
                                     鎶曡瘔浜轰簬<span>@(Model.ChallengeDateName)</span>锛屽悜<span>@(Model.Questioned)</span>鎻愬嚭璐ㄧ枒锛岃川鐤戜簨椤逛负锛�
                                     @if (string.IsNullOrEmpty(Model.SqdbId))
                                     {
-                                    @Html.Raw("<span>銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�</span>");
+                                        @Html.Raw("<span>銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�</span>");
                                     }
                                     else
                                     {
-                                    @Html.Raw("<span>" + @Model.SqdbId + "</span>");
+                                        @Html.Raw("<span>" + @Model.SqdbId + "</span>");
                                     }
 
 
@@ -274,92 +277,94 @@
                                 {
                                     if (complaintItemDTOs.Count == 1)
                                     {
-                                <tr>
-                                    <td colspan="2">
-                                        鎶曡瘔浜嬮」锛�<span style="text-indent:10px">@complaintItemDTOs[i].QuestionName </span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">
-                                        浜嬪疄渚濇嵁锛� @Html.Raw("<span>" + (string.IsNullOrEmpty(complaintItemDTOs[i].Evidential) ? "" : complaintItemDTOs[i].Evidential.Replace(" ", "&nbsp;").Replace("\r", "<br/>")) + "</span>")
-                                    </td>
-                                </tr>
+                                        <tr>
+                                            <td colspan="2">
+                                                鎶曡瘔浜嬮」锛�<span style="text-indent:10px">@(string.IsNullOrEmpty(complaintItemDTOs[i].Questionname)? complaintItemDTOs[i].QuestionName: complaintItemDTOs[i].Questionname)  </span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="2">
+                                                浜嬪疄渚濇嵁锛� @Html.Raw("<span>" + (string.IsNullOrEmpty(complaintItemDTOs[i].Evidential) ? "" : complaintItemDTOs[i].Evidential.Replace(" ", "&nbsp;").Replace("\r", "<br/>")) + "</span>")
+                                            </td>
+                                        </tr>
 
-                                <tr>
-                                    <td colspan="2">
-                                        娉曞緥渚濇嵁锛�
-                                        @for (int j = 0; j < complaintItemDTOs[i].sysCodeDtls.Count; j++)
+                                        <tr>
+                                            <td colspan="2">
+                                                娉曞緥渚濇嵁锛�
+                                                @for (int j = 0; j < complaintItemDTOs[i].sysCodeDtls.Count; j++)
                                                 {
                                                     var sssss = "";
-                                           if(j == 0 || complaintItemDTOs[i].sysCodeDtls[j].Classify3 != complaintItemDTOs[i].sysCodeDtls[j-1].Classify3){
-                                        if (complaintItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�")>=0)
+                                                    if (j == 0 || complaintItemDTOs[i].sysCodeDtls[j].Classify3 != complaintItemDTOs[i].sysCodeDtls[j - 1].Classify3)
                                                     {
-                                                        sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].Classify3.Insert(complaintItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
+                                                        if (complaintItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�") >= 0)
+                                                        {
+                                                            sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].Classify3.Insert(complaintItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
+                                                        }
+                                                        else
+                                                        {
+                                                            sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
+                                                        }
                                                     }
-                                                    else
-                                                    {
-                                                        sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
-                                                    }
-                                        }
-                                                    
+
                                                     if (j != (complaintItemDTOs[i].sysCodeDtls.Count - 1))
                                                     {
-                                        @Html.Raw(sssss + complaintItemDTOs[i].sysCodeDtls[j].Classify2 + "銆�")
+                                                        @Html.Raw(sssss + complaintItemDTOs[i].sysCodeDtls[j].Classify2 + "銆�")
                                                     }
                                                     else
                                                     {
-                                        @Html.Raw(sssss + complaintItemDTOs[i].sysCodeDtls[j].Classify2)
+                                                        @Html.Raw(sssss + complaintItemDTOs[i].sysCodeDtls[j].Classify2)
                                                     }
 
                                                 }
 
-                                    </td>
-                                </tr>
+                                            </td>
+                                        </tr>
 
 
 
                                     }
                                     else
                                     {
-                                <tr>
-                                    <td colspan="2">
-                                        鎶曡瘔浜嬮」@((i+1)+"")锛�<span style="text-indent:10px">@complaintItemDTOs[i].QuestionName </span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">
-                                        浜嬪疄渚濇嵁@((i+1)+"")锛欯Html.Raw("<span>" + (string.IsNullOrEmpty(complaintItemDTOs[i].Evidential) ? "" : complaintItemDTOs[i].Evidential.Replace(" ", "&nbsp;").Replace("\r", "<br/>")) + "</span>")
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">
-                                        娉曞緥渚濇嵁锛�
-                                        @for (int j = 0; j < complaintItemDTOs[i].sysCodeDtls.Count; j++)
+                                        <tr>
+                                            <td colspan="2">
+                                                鎶曡瘔浜嬮」@((i+1)+"")锛�<span style="text-indent:10px">@(string.IsNullOrEmpty(complaintItemDTOs[i].Questionname)? complaintItemDTOs[i].QuestionName: complaintItemDTOs[i].Questionname) </span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="2">
+                                                浜嬪疄渚濇嵁锛欯Html.Raw("<span>" + (string.IsNullOrEmpty(complaintItemDTOs[i].Evidential) ? "" : complaintItemDTOs[i].Evidential.Replace(" ", "&nbsp;").Replace("\r", "<br/>")) + "</span>")
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="2">
+                                                娉曞緥渚濇嵁锛�
+                                                @for (int j = 0; j < complaintItemDTOs[i].sysCodeDtls.Count; j++)
                                                 {
                                                     var sssss = "";
-                                                   if(j == 0 || complaintItemDTOs[i].sysCodeDtls[j].Classify3 != complaintItemDTOs[i].sysCodeDtls[j-1].Classify3){
-                                        if (complaintItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�")>=0)
+                                                    if (j == 0 || complaintItemDTOs[i].sysCodeDtls[j].Classify3 != complaintItemDTOs[i].sysCodeDtls[j - 1].Classify3)
                                                     {
-                                                        sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].Classify3.Insert(complaintItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
+                                                        if (complaintItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�") >= 0)
+                                                        {
+                                                            sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].Classify3.Insert(complaintItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
+                                                        }
+                                                        else
+                                                        {
+                                                            sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
+                                                        }
                                                     }
-                                                    else
-                                                    {
-                                                        sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
-                                                    }
-                                        }
                                                     if (j != (complaintItemDTOs[i].sysCodeDtls.Count - 1))
                                                     {
-                                        @Html.Raw(sssss + complaintItemDTOs[i].sysCodeDtls[j].Classify2 + "銆�")
+                                                        @Html.Raw(sssss + complaintItemDTOs[i].sysCodeDtls[j].Classify2 + "銆�")
                                                     }
                                                     else
                                                     {
-                                        @Html.Raw(sssss + complaintItemDTOs[i].sysCodeDtls[j].Classify2)
+                                                        @Html.Raw(sssss + complaintItemDTOs[i].sysCodeDtls[j].Classify2)
                                                     }
 
                                                 }
 
-                                    </td>
-                                </tr>
+                                            </td>
+                                        </tr>
 
                                     }
 
@@ -368,12 +373,45 @@
                             <tr>
                                 <td colspan="2"><b>浜斻�佷笌鎶曡瘔浜嬮」鐩稿叧鐨勬姇璇夎姹�</b></td>
                             </tr>
-                            <tr>
-                                <td colspan="2" align="left">璇锋眰锛�<span>@Model.RequestInfoName</span></td>
-                            </tr>
+                            @{
+                                @for (int i = 0; i < challengeRequestInfoDTOs.Count; i++)
+                                {
+                                    if (challengeRequestInfoDTOs.Count == 1)
+                                    {
+                                        <tr>
+                                            <td colspan="2">
+                                                璇锋眰锛�<span style="text-indent:10px">@(string.IsNullOrEmpty(challengeRequestInfoDTOs[i].RequestInfoname)? challengeRequestInfoDTOs[i].RequestInfoNameName: challengeRequestInfoDTOs[i].RequestInfoname) </span>
+                                            </td>
+                                        </tr>
+
+
+
+
+
+
+                                    }
+                                    else
+                                    {
+                                        <tr>
+                                            <td colspan="2">
+                                                璇锋眰@((i + 1) + "")锛�<span style="text-indent:10px">@(string.IsNullOrEmpty(challengeRequestInfoDTOs[i].RequestInfoname)? challengeRequestInfoDTOs[i].RequestInfoNameName: challengeRequestInfoDTOs[i].RequestInfoname)  </span>
+                                            </td>
+                                        </tr>
+
+
+
+
+
+                                    }
+
+                                }
+                            }
                             @*<tr>
-                        <td colspan="2" style="height:15px"></td>
-                    </tr>*@
+            <td colspan="2" align="left">璇锋眰锛�<span>@Model.RequestInfoName</span></td>
+        </tr>*@
+                            @*<tr>
+            <td colspan="2" style="height:15px"></td>
+        </tr>*@
                             <tr>
                                 <td align="left">绛惧瓧(绛剧珷)锛�</td>
                                 <td align="left">鍏珷锛�</td>
@@ -423,7 +461,7 @@
                                 <td colspan="2" style="height:50px"></td>
                             </tr>
                             <tr>
-                                <td colspan="2" align="right">宸濆嵃鏂囧寲闆嗗洟鑲′唤鏈夐檺鍏徃锛堝叕绔狅級<img src="~/img/images/gongzhang.png?v=3" alt="" id="zhutiqiznhang" /></td>
+                                <td colspan="2" align="right">宸濆嵃鏂囧寲闆嗗洟鑲′唤鏈夐檺鍏徃锛堝叕绔狅級</td>
                             </tr>
                             <tr>
                                 <td colspan="2" align="right">鏃ユ湡锛欯Model.Modifytime.Value.ToString("yyyy骞碝M鏈坉d鏃�")</td>
diff --git a/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml b/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml
index 9905069..7ca128a 100644
--- a/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml
@@ -483,7 +483,7 @@
                                                 <label class="text-right col-sm-1 col-md-1 control-label">鍐呭</label>
                                                 <div class="col-sm-10 col-md-10">
                                                     
-                                                    <textarea class="form-control bt"  name="Contentss" title="鍐呭" isempty="" maxlength="300" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'"></textarea>
+                                                    <textarea class="form-control bt"  name="Contentss" title="鍐呭" isempty="" maxlength="500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'"></textarea>
                                                 </div>
 
                                             </div>
diff --git a/zhengcaioa/zhengcaioa/Views/SysCode/Editlawzidingyi.cshtml b/zhengcaioa/zhengcaioa/Views/SysCode/Editlawzidingyi.cshtml
index 87f1170..5160bc4 100644
--- a/zhengcaioa/zhengcaioa/Views/SysCode/Editlawzidingyi.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SysCode/Editlawzidingyi.cshtml
@@ -10,7 +10,7 @@
 
     List<SysCodeDtlEntity> sysCodeDtlEntities = ViewData["sysCodeDtlEntities"] as List<SysCodeDtlEntity>; //娉曞緥
 
-
+    string  Classify1 = ViewData["Classify1"] as string; //娉曞緥
 
 
 }
@@ -114,7 +114,7 @@
                                                 <option value="" hassubinfo="true">璇烽�夋嫨</option>
                                                 @foreach (var item in question)
                                                 {
-                                                    @if (!item.CodeSn.Equals(Model.Classify1))
+                                                    @if (!item.CodeSn.Equals(Classify1))
                                                     {
                                                         <option value="@item.CodeSn" hassubinfo="true">
                                                             @item.Comments

--
Gitblit v1.9.1