From 91bad66d03c07b6cb2a3eb09bdd98faab4b8caa3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 02 十二月 2021 14:03:34 +0800
Subject: [PATCH] 提交

---
 zhengcaioa/DTO/TChallengeItemDTO.cs                                      |    1 
 zhengcaioa/Model/TChallengeItem.cs                                       |    1 
 zhengcaioa/Model/TComplaintGongyingshang.cs                              |   19 
 zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml                      |    4 
 zhengcaioa/Model/TComplaintShouquandaibiao.cs                            |   18 
 zhengcaioa/DTO/TChallengeletterDTO.cs                                    |    2 
 zhengcaioa/DTO/TComplaintShouquandaibiaoDTO.cs                           |   17 
 zhengcaioa/Model/TComplaintletter.cs                                     |    4 
 zhengcaioa/DTO/TComplaintletterDTO.cs                                    |   12 
 zhengcaioa/Model/zhengcaioaContext.cs                                    |   80 ++
 zhengcaioa/Services/CooperOrderService.cs                                |  227 +++++++
 zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs |  302 ++++++++-
 zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs                          |    6 
 zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml                      |  934 +++++++++++++++++++++++++++++-
 zhengcaioa/DTO/TComplaintGongyingshangDTO.cs                             |   18 
 zhengcaioa/DTO/CooperOrderDTO.cs                                         |   49 +
 zhengcaioa/Model/TComplaintItem.cs                                       |    1 
 zhengcaioa/DTO/SysCodeDTO.cs                                             |    2 
 zhengcaioa/DTO/TComplaintItemDTO.cs                                      |    1 
 zhengcaioa/IServices/ICooperOrderService.cs                              |   17 
 zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml                       |   39 +
 zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs                   |   17 
 22 files changed, 1,663 insertions(+), 108 deletions(-)

diff --git a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
index c437e32..01142b5 100644
--- a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
+++ b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
@@ -306,6 +306,12 @@
             CreateMap<HrShebao, HrShebaoDTO>();
             CreateMap<HrShebaoDTO, HrShebao>();
 
+            CreateMap<TComplaintGongyingshang, TComplaintGongyingshangDTO>();
+            CreateMap<TComplaintGongyingshangDTO, TComplaintGongyingshang>();
+
+            CreateMap<TComplaintShouquandaibiao, TComplaintShouquandaibiaoDTO>();
+            CreateMap<TComplaintShouquandaibiaoDTO, TComplaintShouquandaibiao>();
+
         }
     }
 }
diff --git a/zhengcaioa/DTO/CooperOrderDTO.cs b/zhengcaioa/DTO/CooperOrderDTO.cs
index 4050c88..8924bd3 100644
--- a/zhengcaioa/DTO/CooperOrderDTO.cs
+++ b/zhengcaioa/DTO/CooperOrderDTO.cs
@@ -71,6 +71,55 @@
         public DateTime? SonghuoTime1 { get; set; }
         public string HuifangJdr { get; set; }
         public string HuifangKehuyijian { get; set; }
+
+        public string GysName { get; set; }
+        public string GysAddress { get; set; }
+        public string GysPostcode { get; set; }
+        public string GysContacts { get; set; }
+        public string GysPhone { get; set; }
+        public string[] zhiyiShouquandaibiao { get; set; }
+        public string[] zhiyiLianxidianhua { get; set; }
+        public string[] zhiyiDizhi { get; set; }
+        public string[] zhiyiYoubian { get; set; }
+        public string zhiyiXmName { get; set; }
+        public string zhiyiXmCode { get; set; }
+        public string zhiyiXmPackage { get; set; }
+        public string zhiyiPurchaserName { get; set; }
+        public DateTime? zhiyiDocumentsDate { get; set; }
+
+
+        public string TsrName { get; set; }
+        public string TsrAddress { get; set; }
+        public string TsrPostcode { get; set; }
+        public string TsrCorporation { get; set; }
+        public string TsrPhone { get; set; }
+
+        public string[] tousuShouquandaibiao { get; set; }
+        public string[] tousuLianxidianhua { get; set; }
+        public string[] tousuDizhi { get; set; }
+        public string[] tousuYoubian { get; set; }
+
+        public string[] tousuRespondent { get; set; }
+        public string[] tousuAddress { get; set; }
+        public string[] tousuPostcode { get; set; }
+        public string[] tousuContacts { get; set; }
+        public string[] tousuPhone { get; set; }
+
+        public string[] Gongytingshang { get; set; }
+        public string[] gongyingshangDizhi { get; set; }
+        public string[] gongyingshangYoubian { get; set; }
+        public string[] gongyingshangLianxiren { get; set; }
+        public string[] gongyingshangLianxidianhua { get; set; }
+
+        public string tousuXmName { get; set; }
+        public string tousuXmCode { get; set; }
+        public string tousuXmPackage { get; set; }
+        public string tousuPurchaserName { get; set; }
+        public string tousuAgency { get; set; }
+        public string tousuIsNotice { get; set; }
+        public DateTime? tousuNoticeDate { get; set; }
+        public string tousuIsResultnotice { get; set; }
+        public DateTime? tousuResultnoticeDate { get; set; }
     }
 
     public class CooperOrderDTOSearch : SearchEntity
diff --git a/zhengcaioa/DTO/SysCodeDTO.cs b/zhengcaioa/DTO/SysCodeDTO.cs
index 4f4d09a..3837977 100644
--- a/zhengcaioa/DTO/SysCodeDTO.cs
+++ b/zhengcaioa/DTO/SysCodeDTO.cs
@@ -225,6 +225,8 @@
         public string CreatetimeStr { get; set; }
 
         public string RecStatusName { get; set; }
+
+        public string CommentsName { set; get; } 
     }
     #endregion
 
diff --git a/zhengcaioa/DTO/TChallengeItemDTO.cs b/zhengcaioa/DTO/TChallengeItemDTO.cs
index ade70be..fce1650 100644
--- a/zhengcaioa/DTO/TChallengeItemDTO.cs
+++ b/zhengcaioa/DTO/TChallengeItemDTO.cs
@@ -12,5 +12,6 @@
         public string Evidential { get; set; }
         public string Law { get; set; }
         public int? Sort { get; set; }
+        public string Lawcoment { get; set; }
     }
 }
diff --git a/zhengcaioa/DTO/TChallengeletterDTO.cs b/zhengcaioa/DTO/TChallengeletterDTO.cs
index 3f41f98..eb2c59d 100644
--- a/zhengcaioa/DTO/TChallengeletterDTO.cs
+++ b/zhengcaioa/DTO/TChallengeletterDTO.cs
@@ -26,6 +26,7 @@
         public string XmPackage { get; set; }
         public string PurchaserName { get; set; }
         public DateTime? DocumentsDate { get; set; }
+        public string DocumentsDateName { get; set; }
         public string RequestInfo { get; set; }
         public bool? IsReply { get; set; }
         public string Respondent { get; set; }
@@ -37,5 +38,6 @@
         public string Modifier { get; set; }
         public int? Status { get; set; }
         public List<TChallengeItemDTO> challengeItemDTOs { get; set; }
+        public List<TComplaintShouquandaibiaoDTO> complaintShouquandaibiaoDTOs { get; set; }
     }
 }
diff --git a/zhengcaioa/DTO/TComplaintGongyingshangDTO.cs b/zhengcaioa/DTO/TComplaintGongyingshangDTO.cs
new file mode 100644
index 0000000..1220333
--- /dev/null
+++ b/zhengcaioa/DTO/TComplaintGongyingshangDTO.cs
@@ -0,0 +1,18 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DTO
+{
+   public class TComplaintGongyingshangDTO
+    {
+        public int Id { get; set; }
+        public string ComplaintId { get; set; }
+        public string Gongytingshang { get; set; }
+        public string Dizhi { get; set; }
+        public string Youbian { get; set; }
+        public string Lianxiren { get; set; }
+        public string Lianxidianhua { get; set; }
+        public int? Sort { get; set; }
+    }
+}
diff --git a/zhengcaioa/DTO/TComplaintItemDTO.cs b/zhengcaioa/DTO/TComplaintItemDTO.cs
index af3f45f..c959e3f 100644
--- a/zhengcaioa/DTO/TComplaintItemDTO.cs
+++ b/zhengcaioa/DTO/TComplaintItemDTO.cs
@@ -12,5 +12,6 @@
         public string Evidential { get; set; }
         public string Law { get; set; }
         public int? Sort { get; set; }
+        public string Lawcoment { get; set; }
     }
 }
diff --git a/zhengcaioa/DTO/TComplaintShouquandaibiaoDTO.cs b/zhengcaioa/DTO/TComplaintShouquandaibiaoDTO.cs
new file mode 100644
index 0000000..dd987fe
--- /dev/null
+++ b/zhengcaioa/DTO/TComplaintShouquandaibiaoDTO.cs
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DTO
+{
+    public class TComplaintShouquandaibiaoDTO
+    {
+        public int Id { get; set; }
+        public string ComplaintId { get; set; }
+        public string Shouquandaibiao { get; set; }
+        public string Lianxidianhua { get; set; }
+        public string Dizhi { get; set; }
+        public string Youbian { get; set; }
+        public int? Sort { get; set; }
+    }
+}
diff --git a/zhengcaioa/DTO/TComplaintletterDTO.cs b/zhengcaioa/DTO/TComplaintletterDTO.cs
index c81f6aa..518d588 100644
--- a/zhengcaioa/DTO/TComplaintletterDTO.cs
+++ b/zhengcaioa/DTO/TComplaintletterDTO.cs
@@ -32,14 +32,16 @@
         public string XmPackage { get; set; }
         public string PurchaserName { get; set; }
         public string Agency { get; set; }
-        public bool? IsNotice { get; set; }
+        public string IsNotice { get; set; }
         public DateTime? NoticeDate { get; set; }
+        public string NoticeDateName { get; set; }
         public DateTime? ChallengeDate { get; set; }
         public string Questioned { get; set; }
         public string Respondent { get; set; }
         public DateTime? RespondDate { get; set; }
-        public bool? IsResultnotice { get; set; }
+        public string IsResultnotice { get; set; }
         public DateTime? ResultnoticeDate { get; set; }
+        public string ResultnoticeDateName { get; set; }
         public DateTime? DocumentsDate { get; set; }
         public string RequestInfo { get; set; }
         public DateTime? Createtime { get; set; }
@@ -49,7 +51,11 @@
         public int? Status { get; set; }
         public List<TComplaintItemDTO> complaintItemDTOs { get; set; }
         public List<TComplaintRespondentDTO> complaintRespondentDTOs { get; set; }
-        
+
+        public List<TComplaintShouquandaibiaoDTO> complaintShouquandaibiaoDTOs { get; set; }
+
+        public List<TComplaintGongyingshangDTO> complaintGongyingshangDTOs { get; set; }
+
 
 
     }
diff --git a/zhengcaioa/IServices/ICooperOrderService.cs b/zhengcaioa/IServices/ICooperOrderService.cs
index 3cc4bab..8b225e7 100644
--- a/zhengcaioa/IServices/ICooperOrderService.cs
+++ b/zhengcaioa/IServices/ICooperOrderService.cs
@@ -47,22 +47,39 @@
         //璐ㄧ枒鍑戒簨椤瑰唴瀹瑰瓙琛�
         ResultEntity saveChallengeItem(TChallengeItemDTO dto);
 
+        ResultEntity deleteChallengeItem(string ChallengeId);
+
         List<TChallengeItemDTO> GetListChallengeItem(string ChallengeId);
 
         //鎶曡瘔涔﹀巻鍙茶褰曡〃
         ResultEntity saveComplaintletter(TComplaintletterDTO dto);
 
+
         List<TComplaintletterDTO> GetListComplaintletter(string OrderId);
 
         //鎶曡瘔涔︿簨椤瑰唴瀹瑰瓙琛�
         ResultEntity saveComplaintItem(TComplaintItemDTO dto);
+        ResultEntity deleteComplaintItem(string ComplaintId);
 
         List<TComplaintItemDTO> GetListComplaintItem(string ComplaintId);
 
         //鎶曡瘔涔﹁鎶曡瘔浜哄瓙琛�
         ResultEntity saveComplaintRespondent(TComplaintRespondentDTO dto);
+        ResultEntity deleteComplaintRespondent(string ComplaintId);
 
         List<TComplaintRespondentDTO> GetListComplaintRespondent(string ComplaintId);
 
+        //鐩稿叧渚涘簲鍟嗗瓙琛�
+        ResultEntity saveComplaintGongyingshang(TComplaintGongyingshangDTO dto);
+        ResultEntity deleteComplaintGongyingshang(string ComplaintId);
+
+        List<TComplaintGongyingshangDTO> GetListComplaintGongyingshang(string ComplaintId);
+
+        //鎺堟潈浠h〃瀛愯〃
+        ResultEntity saveComplaintShouquandaibiao(TComplaintShouquandaibiaoDTO dto);
+        ResultEntity deleteComplaintShouquandaibiao(string ComplaintId);
+
+        List<TComplaintShouquandaibiaoDTO> GetListComplaintShouquandaibiao(string ComplaintId);
+
     }
 }
diff --git a/zhengcaioa/Model/TChallengeItem.cs b/zhengcaioa/Model/TChallengeItem.cs
index 70d018c..e906643 100644
--- a/zhengcaioa/Model/TChallengeItem.cs
+++ b/zhengcaioa/Model/TChallengeItem.cs
@@ -12,6 +12,7 @@
         public string Question { get; set; }
         public string Evidential { get; set; }
         public string Law { get; set; }
+        public string Lawcoment { get; set; }
         public int? Sort { get; set; }
     }
 }
diff --git a/zhengcaioa/Model/TComplaintGongyingshang.cs b/zhengcaioa/Model/TComplaintGongyingshang.cs
new file mode 100644
index 0000000..7f17d61
--- /dev/null
+++ b/zhengcaioa/Model/TComplaintGongyingshang.cs
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+    public partial class TComplaintGongyingshang
+    {
+        public int Id { get; set; }
+        public string ComplaintId { get; set; }
+        public string Gongytingshang { get; set; }
+        public string Dizhi { get; set; }
+        public string Youbian { get; set; }
+        public string Lianxiren { get; set; }
+        public string Lianxidianhua { get; set; }
+        public int? Sort { get; set; }
+    }
+}
diff --git a/zhengcaioa/Model/TComplaintItem.cs b/zhengcaioa/Model/TComplaintItem.cs
index 7d17eb6..493ed0c 100644
--- a/zhengcaioa/Model/TComplaintItem.cs
+++ b/zhengcaioa/Model/TComplaintItem.cs
@@ -12,6 +12,7 @@
         public string Question { get; set; }
         public string Evidential { get; set; }
         public string Law { get; set; }
+        public string Lawcoment { get; set; }
         public int? Sort { get; set; }
     }
 }
diff --git a/zhengcaioa/Model/TComplaintShouquandaibiao.cs b/zhengcaioa/Model/TComplaintShouquandaibiao.cs
new file mode 100644
index 0000000..db37c2a
--- /dev/null
+++ b/zhengcaioa/Model/TComplaintShouquandaibiao.cs
@@ -0,0 +1,18 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+    public partial class TComplaintShouquandaibiao
+    {
+        public int Id { get; set; }
+        public string ComplaintId { get; set; }
+        public string Shouquandaibiao { get; set; }
+        public string Lianxidianhua { get; set; }
+        public string Dizhi { get; set; }
+        public string Youbian { get; set; }
+        public int? Sort { get; set; }
+    }
+}
diff --git a/zhengcaioa/Model/TComplaintletter.cs b/zhengcaioa/Model/TComplaintletter.cs
index 22bbf63..ccd86d0 100644
--- a/zhengcaioa/Model/TComplaintletter.cs
+++ b/zhengcaioa/Model/TComplaintletter.cs
@@ -33,13 +33,13 @@
         public string XmPackage { get; set; }
         public string PurchaserName { get; set; }
         public string Agency { get; set; }
-        public bool? IsNotice { get; set; }
+        public string IsNotice { get; set; }
         public DateTime? NoticeDate { get; set; }
         public DateTime? ChallengeDate { get; set; }
         public string Questioned { get; set; }
         public string Respondent { get; set; }
         public DateTime? RespondDate { get; set; }
-        public bool? IsResultnotice { get; set; }
+        public string IsResultnotice { get; set; }
         public DateTime? ResultnoticeDate { get; set; }
         public DateTime? DocumentsDate { get; set; }
         public string RequestInfo { get; set; }
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index e60d401..f7cfe57 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -133,6 +133,8 @@
         public virtual DbSet<TComplaintItem> TComplaintItems { get; set; }
         public virtual DbSet<TComplaintRespondent> TComplaintRespondents { get; set; }
         public virtual DbSet<TComplaintletter> TComplaintletters { get; set; }
+        public virtual DbSet<TComplaintGongyingshang> TComplaintGongyingshangs { get; set; }
+        public virtual DbSet<TComplaintShouquandaibiao> TComplaintShouquandaibiaos { get; set; }
 
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
@@ -6950,6 +6952,10 @@
                     .HasMaxLength(300)
                     .HasColumnName("law");
 
+                entity.Property(e => e.Lawcoment)
+                  .HasMaxLength(300)
+                  .HasColumnName("lawcoment");
+
                 entity.Property(e => e.Question)
                     .HasMaxLength(300)
                     .HasColumnName("question");
@@ -7094,6 +7100,10 @@
                     .HasMaxLength(300)
                     .HasColumnName("law");
 
+                entity.Property(e => e.Lawcoment)
+                 .HasMaxLength(300)
+                 .HasColumnName("lawcoment");
+
                 entity.Property(e => e.Question)
                     .HasMaxLength(300)
                     .HasColumnName("question");
@@ -7186,9 +7196,13 @@
                     .HasMaxLength(10)
                     .HasColumnName("gys_postcode");
 
-                entity.Property(e => e.IsNotice).HasColumnName("is_notice");
+                entity.Property(e => e.IsNotice)
+                    .HasMaxLength(1)
+                    .HasColumnName("is_notice");
 
-                entity.Property(e => e.IsResultnotice).HasColumnName("is_resultnotice");
+                entity.Property(e => e.IsResultnotice)
+                    .HasMaxLength(1)
+                    .HasColumnName("is_resultnotice");
 
                 entity.Property(e => e.Modifier)
                     .HasMaxLength(50)
@@ -7295,6 +7309,68 @@
                     .HasColumnName("xm_package");
             });
 
+            modelBuilder.Entity<TComplaintGongyingshang>(entity =>
+            {
+                entity.ToTable("t_complaint_gongyingshang");
+
+                entity.Property(e => e.Id).HasColumnName("id");
+
+                entity.Property(e => e.ComplaintId)
+                    .HasMaxLength(50)
+                    .HasColumnName("complaint_id");
+
+                entity.Property(e => e.Dizhi)
+                    .HasMaxLength(300)
+                    .HasColumnName("dizhi");
+
+                entity.Property(e => e.Gongytingshang)
+                    .HasMaxLength(300)
+                    .HasColumnName("gongytingshang");
+
+                entity.Property(e => e.Lianxidianhua)
+                    .HasMaxLength(300)
+                    .HasColumnName("lianxidianhua");
+
+                entity.Property(e => e.Lianxiren)
+                    .HasMaxLength(300)
+                    .HasColumnName("lianxiren");
+
+                entity.Property(e => e.Sort).HasColumnName("sort");
+
+                entity.Property(e => e.Youbian)
+                    .HasMaxLength(300)
+                    .HasColumnName("youbian");
+            });
+
+            modelBuilder.Entity<TComplaintShouquandaibiao>(entity =>
+            {
+                entity.ToTable("t_complaint_shouquandaibiao");
+
+                entity.Property(e => e.Id).HasColumnName("id");
+
+                entity.Property(e => e.ComplaintId)
+                    .HasMaxLength(50)
+                    .HasColumnName("complaint_id");
+
+                entity.Property(e => e.Dizhi)
+                    .HasMaxLength(300)
+                    .HasColumnName("dizhi");
+
+                entity.Property(e => e.Lianxidianhua)
+                    .HasMaxLength(300)
+                    .HasColumnName("lianxidianhua");
+
+                entity.Property(e => e.Shouquandaibiao)
+                    .HasMaxLength(300)
+                    .HasColumnName("shouquandaibiao");
+
+                entity.Property(e => e.Sort).HasColumnName("sort");
+
+                entity.Property(e => e.Youbian)
+                    .HasMaxLength(300)
+                    .HasColumnName("youbian");
+            });
+
             OnModelCreatingPartial(modelBuilder);
         }
 
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index 272594e..7bf10c7 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -35,6 +35,7 @@
                 if (String.IsNullOrEmpty(entity.Id))
                 {
                     entity.Id = Guid.NewGuid().ToString();
+                    dto.Id = entity.Id;
                     var datestreing = DateTime.Now.ToString("yyyyMMdd");
                     var OrderNo =  _context.CooperOrders.Where(x => x.OrderNo.Contains(datestreing)).Max(x=>x.OrderNo);
                     if (string.IsNullOrEmpty(OrderNo))
@@ -1006,7 +1007,7 @@
         public List<TChallengeItemDTO> GetListChallengeItem(string ChallengeId)
         {
 
-            var entity = _context.TChallengeItems.Where(x =>  x.ChallengeId == ChallengeId).ToList();
+            var entity = _context.TChallengeItems.Where(x =>  x.ChallengeId == ChallengeId).OrderBy(x => x.Sort).ToList();
 
 
 
@@ -1043,7 +1044,7 @@
                     updateproject.Evidential = entity.Evidential;
                     updateproject.Law = entity.Law;
                     updateproject.Sort = entity.Sort;
-                    
+                    updateproject.Lawcoment = entity.Lawcoment;
 
                 }
 
@@ -1172,7 +1173,7 @@
         public List<TComplaintItemDTO> GetListComplaintItem(string ComplaintId)
         {
 
-            var entity = _context.TComplaintItems.Where(x => x.ComplaintId == ComplaintId).ToList();
+            var entity = _context.TComplaintItems.Where(x => x.ComplaintId == ComplaintId).OrderBy(x => x.Sort).ToList();
 
 
 
@@ -1209,6 +1210,7 @@
                     updateproject.Evidential = entity.Evidential;
                     updateproject.Law = entity.Law;
                     updateproject.Sort = entity.Sort;
+                    updateproject.Lawcoment = entity.Lawcoment;
 
 
                 }
@@ -1229,7 +1231,7 @@
         public List<TComplaintRespondentDTO> GetListComplaintRespondent(string ComplaintId)
         {
 
-            var entity = _context.TComplaintRespondents.Where(x => x.ComplaintId == ComplaintId).ToList();
+            var entity = _context.TComplaintRespondents.Where(x => x.ComplaintId == ComplaintId).OrderBy(x => x.Sort).ToList();
 
 
 
@@ -1285,5 +1287,222 @@
             return resultEntity;
         }
 
+        public List<TComplaintGongyingshangDTO> GetListComplaintGongyingshang(string ComplaintId)
+        {
+
+            var entity = _context.TComplaintGongyingshangs.Where(x => x.ComplaintId == ComplaintId).OrderBy(x => x.Sort).ToList();
+
+
+
+            var result = _mapper.Map<List<TComplaintGongyingshangDTO>>(entity);
+
+
+            return result;
+        }
+
+
+        public ResultEntity saveComplaintGongyingshang(TComplaintGongyingshangDTO dto)
+        {
+            ResultEntity resultEntity = new ResultEntity();
+            try
+            {
+
+
+                var entity = _mapper.Map<TComplaintGongyingshang>(dto);
+
+
+                if (entity.Id <= 0)
+                {
+
+
+                    _context.TComplaintGongyingshangs.Add(entity);
+                }
+                else
+                {
+                    var updateproject = _context.TComplaintGongyingshangs.Find(entity.Id);
+
+
+                    updateproject.ComplaintId = entity.ComplaintId;
+                    updateproject.Gongytingshang = entity.Gongytingshang;
+                    updateproject.Dizhi = entity.Dizhi;
+                    updateproject.Youbian = entity.Youbian;
+                    updateproject.Lianxiren = entity.Lianxiren;
+                    updateproject.Lianxidianhua = entity.Lianxidianhua;
+
+                    updateproject.Sort = entity.Sort;
+
+
+                }
+
+                _context.SaveChanges();
+                resultEntity.ReturnID = entity.Id.ToString();
+                resultEntity.Result = true;
+            }
+            catch (Exception ex)
+            {
+                resultEntity.Result = false;
+                resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠$悊鍛�";
+
+            }
+            return resultEntity;
+        }
+
+        public List<TComplaintShouquandaibiaoDTO> GetListComplaintShouquandaibiao(string ComplaintId)
+        {
+
+            var entity = _context.TComplaintShouquandaibiaos.Where(x => x.ComplaintId == ComplaintId).OrderBy(x=>x.Sort).ToList();
+
+
+
+            var result = _mapper.Map<List<TComplaintShouquandaibiaoDTO>>(entity);
+
+
+            return result;
+        }
+
+
+        public ResultEntity saveComplaintShouquandaibiao(TComplaintShouquandaibiaoDTO dto)
+        {
+            ResultEntity resultEntity = new ResultEntity();
+            try
+            {
+
+
+                var entity = _mapper.Map<TComplaintShouquandaibiao>(dto);
+
+
+                if (entity.Id <= 0)
+                {
+
+
+                    _context.TComplaintShouquandaibiaos.Add(entity);
+                }
+                else
+                {
+                    var updateproject = _context.TComplaintShouquandaibiaos.Find(entity.Id);
+
+
+                    updateproject.ComplaintId = entity.ComplaintId;
+                    updateproject.Shouquandaibiao = entity.Shouquandaibiao;
+                    updateproject.Dizhi = entity.Dizhi;
+                    updateproject.Youbian = entity.Youbian;
+                    updateproject.Lianxidianhua = entity.Lianxidianhua;
+                    updateproject.Sort = entity.Sort;
+                   
+
+
+                }
+
+                _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 deleteChallengeItem(string ChallengeId)
+        {
+            ResultEntity result = new ResultEntity();
+            result.Result = true;
+
+            var models = _context.TChallengeItems.Where(x => x.ChallengeId == ChallengeId).ToList(); ;
+
+            foreach(var challengeItem in models)
+            {
+                _context.TChallengeItems.Remove(challengeItem);
+            }
+            _context.SaveChanges();
+            return result;
+        }
+
+        /// <summary>
+        /// 鍒犻櫎鎶曡瘔涔﹀瓙琛�
+        /// </summary>
+        /// <returns></returns>
+        public ResultEntity deleteComplaintItem(string ComplaintId)
+        {
+            ResultEntity result = new ResultEntity();
+            result.Result = true;
+
+            var models = _context.TComplaintItems.Where(x => x.ComplaintId == ComplaintId).ToList(); ;
+
+            foreach (var complaintItem in models)
+            {
+                _context.TComplaintItems.Remove(complaintItem);
+            }
+            _context.SaveChanges();
+            return result;
+        }
+
+
+        /// <summary>
+        /// 鍒犻櫎琚姇璇変汉瀛愯〃
+        /// </summary>
+        /// <returns></returns>
+        public ResultEntity deleteComplaintRespondent(string ComplaintId)
+        {
+            ResultEntity result = new ResultEntity();
+            result.Result = true;
+
+            var models = _context.TComplaintRespondents.Where(x => x.ComplaintId == ComplaintId).ToList(); ;
+
+            foreach (var complaintRespondent in models)
+            {
+                _context.TComplaintRespondents.Remove(complaintRespondent);
+            }
+            _context.SaveChanges();
+            return result;
+        }
+
+        /// <summary>
+        /// 鍒犻櫎鐩稿叧渚涘簲鍟嗗瓙琛�
+        /// </summary>
+        /// <returns></returns>
+        public ResultEntity deleteComplaintGongyingshang(string ComplaintId)
+        {
+            ResultEntity result = new ResultEntity();
+            result.Result = true;
+
+            var models = _context.TComplaintGongyingshangs.Where(x => x.ComplaintId == ComplaintId).ToList(); ;
+
+            foreach (var complaintGongyingshang in models)
+            {
+                _context.TComplaintGongyingshangs.Remove(complaintGongyingshang);
+            }
+            _context.SaveChanges();
+            return result;
+        }
+
+        /// <summary>
+        /// 鍒犻櫎鐩稿叧渚涘簲鍟嗗瓙琛�
+        /// </summary>
+        /// <returns></returns>
+        public ResultEntity deleteComplaintShouquandaibiao(string ComplaintId)
+        {
+            ResultEntity result = new ResultEntity();
+            result.Result = true;
+
+            var models = _context.TComplaintShouquandaibiaos.Where(x => x.ComplaintId == ComplaintId).ToList(); ;
+
+            foreach (var complaintShouquandaibiao in models)
+            {
+                _context.TComplaintShouquandaibiaos.Remove(complaintShouquandaibiao);
+            }
+            _context.SaveChanges();
+            return result;
+        }
     }
 }
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index 9465279..3c04b37 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -423,15 +423,26 @@
                 if (challengeletterDTOs!=null&& challengeletterDTOs.Count > 0)
                 {
                     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() };
+
                 }
                 else
                 {
                     challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+                    challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
                 }
                 ViewBag.challengeletterDTO = challengeletterDTO;
                 //鎶曡瘔涔�
@@ -440,6 +451,17 @@
                 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)
+                    {
+                        complaintletterDTO.ResultnoticeDateName = complaintletterDTO.ResultnoticeDate.Value.ToString("yyyy-MM-dd");
+                    }
+
                     List<TComplaintItemDTO> complaintItemDTOs = _cooperOrderService.GetListComplaintItem(complaintletterDTO.Id);
                     if (complaintItemDTOs.Count > 0)
                         complaintletterDTO.complaintItemDTOs = complaintItemDTOs;
@@ -452,11 +474,26 @@
                     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() };
                     complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
+                    complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+                    complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() { new TComplaintGongyingshangDTO() };
+
                 }
                 ViewBag.complaintletterDTO = complaintletterDTO;
             }
@@ -470,11 +507,14 @@
                 //璐ㄧ枒鍑�
                 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;
 
             }
@@ -486,6 +526,8 @@
 
 
             ViewBag.OrderType = _liaotianService.GetSYScode("CooperVisit", "jtype");
+
+            ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou");
 
             ViewBag.customer = _cooperatecustomCustomerService.GetList();
 
@@ -527,8 +569,7 @@
         public async Task<IActionResult> SaveAsync(CooperOrderDTO data)
         {
             ResultEntity resultEntity = new ResultEntity();
-            //using (TransactionScope scope = new TransactionScope())
-            //{
+            
                 var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
                 ViewData["curentuser"] = curentuser;
                 data.RecStatus = "A";
@@ -603,47 +644,226 @@
                     
                 }
 
-            var youHuiDTOs = _askService.GetAskYouHuiList(data.Khdw, data.OrderType).FirstOrDefault();
-            if (youHuiDTOs != null)
+            using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+                new TransactionOptions
+                {
+                    IsolationLevel = IsolationLevel.ReadCommitted,
+                    Timeout = TransactionManager.MaximumTimeout
+                }
+                ))
             {
-                data.Youhuier = youHuiDTOs.Id;
-                if(youHuiDTOs.Youhuistandard == "01")
-                {
-                    data.Youhui = youHuiDTOs.YouHui.Value;
-                    if(data.Money.Value < data.Youhui.Value)
-                    {
-                        data.Money = 0;
-                    }
-                    else
-                    {
-                        data.Money = data.Money.Value - data.Youhui.Value;
-                    }
-                   
-                }
-                else if (youHuiDTOs.Youhuistandard == "02")
-                {
-                    if (youHuiDTOs.YouHui.Value >= 100)
-                    {
-                        data.Youhui = data.Money.Value;
-                        data.Money = 0;
-                    }
-                    else
-                    {
-                        data.Youhui =Math.Round(data.Money.Value * youHuiDTOs.YouHui.Value * new decimal(0.01),2);
-                        data.Money = data.Money.Value - data.Youhui.Value;
-                    }
-                }
-                  
-                  
-            }
-            
-            data.ShouliStatus = "1";
-            data.Modifier = curentuser.Id;
-            data.Modifytime = DateTime.Now;
 
-            resultEntity = _cooperOrderService.save(data);
-            //    scope.Complete();
-            //}
+                var youHuiDTOs = _askService.GetAskYouHuiList(data.Khdw, data.OrderType).FirstOrDefault();
+                if (youHuiDTOs != null)
+                {
+                    data.Youhuier = youHuiDTOs.Id;
+                    if (youHuiDTOs.Youhuistandard == "01")
+                    {
+                        data.Youhui = youHuiDTOs.YouHui.Value;
+                        if (data.Money.Value < data.Youhui.Value)
+                        {
+                            data.Money = 0;
+                        }
+                        else
+                        {
+                            data.Money = data.Money.Value - data.Youhui.Value;
+                        }
+
+                    }
+                    else if (youHuiDTOs.Youhuistandard == "02")
+                    {
+                        if (youHuiDTOs.YouHui.Value >= 100)
+                        {
+                            data.Youhui = data.Money.Value;
+                            data.Money = 0;
+                        }
+                        else
+                        {
+                            data.Youhui = Math.Round(data.Money.Value * youHuiDTOs.YouHui.Value * new decimal(0.01), 2);
+                            data.Money = data.Money.Value - data.Youhui.Value;
+                        }
+                    }
+
+
+                }
+
+                data.ShouliStatus = "1";
+                data.Modifier = curentuser.Id;
+                data.Modifytime = DateTime.Now;
+
+                resultEntity = _cooperOrderService.save(data);
+
+                if (data.OrderType1 == "浠f嫙鎶曡瘔涔�")
+                {
+                    //鏌ヨ涓昏〃
+                    var complaintletterDTO = _cooperOrderService.GetListComplaintletter(data.Id).FirstOrDefault();
+                    if (complaintletterDTO != null)
+                    {
+                        complaintletterDTO.TsrName = data.TsrName;
+                        complaintletterDTO.TsrAddress = data.TsrAddress;
+                        complaintletterDTO.TsrPostcode = data.TsrPostcode;
+                        complaintletterDTO.TsrCorporation = data.TsrCorporation;
+                        complaintletterDTO.TsrPhone = data.TsrPhone;
+
+                        complaintletterDTO.XmName = data.tousuXmName;
+                        complaintletterDTO.XmCode = data.tousuXmCode;
+                        complaintletterDTO.XmPackage = data.tousuXmPackage;
+                        complaintletterDTO.PurchaserName = data.tousuPurchaserName;
+
+                        complaintletterDTO.Agency = data.tousuAgency;
+                        complaintletterDTO.IsNotice = data.tousuIsNotice;
+                        complaintletterDTO.NoticeDate = data.tousuNoticeDate;
+                        complaintletterDTO.IsResultnotice = data.tousuIsResultnotice;
+                        complaintletterDTO.ResultnoticeDate = data.tousuResultnoticeDate;
+                        complaintletterDTO.Modifier = curentuser.Id;
+                        complaintletterDTO.Modifytime = DateTime.Now;
+                        complaintletterDTO.Status = 1;
+                        resultEntity = _cooperOrderService.saveComplaintletter(complaintletterDTO);
+                    }
+                    else
+                    {
+                        complaintletterDTO = new TComplaintletterDTO();
+                        complaintletterDTO.OrderId = data.Id;
+                        complaintletterDTO.TsrName = data.TsrName;
+                        complaintletterDTO.TsrAddress = data.TsrAddress;
+                        complaintletterDTO.TsrPostcode = data.TsrPostcode;
+                        complaintletterDTO.TsrCorporation = data.TsrCorporation;
+                        complaintletterDTO.TsrPhone = data.TsrPhone;
+
+                        complaintletterDTO.XmName = data.tousuXmName;
+                        complaintletterDTO.XmCode = data.tousuXmCode;
+                        complaintletterDTO.XmPackage = data.tousuXmPackage;
+                        complaintletterDTO.PurchaserName = data.tousuPurchaserName;
+
+                        complaintletterDTO.Agency = data.tousuAgency;
+                        complaintletterDTO.IsNotice = data.tousuIsNotice;
+                        complaintletterDTO.NoticeDate = data.tousuNoticeDate;
+                        complaintletterDTO.IsResultnotice = data.tousuIsResultnotice;
+                        complaintletterDTO.ResultnoticeDate = data.tousuResultnoticeDate;
+                        complaintletterDTO.Modifier = curentuser.Id;
+                        complaintletterDTO.Modifytime = DateTime.Now;
+                        complaintletterDTO.Creater = curentuser.Id;
+                        complaintletterDTO.Createtime = complaintletterDTO.Modifytime;
+                        complaintletterDTO.Status = 1;
+                        resultEntity = _cooperOrderService.saveComplaintletter(complaintletterDTO);
+                    }
+                    resultEntity = _cooperOrderService.deleteComplaintShouquandaibiao(complaintletterDTO.Id);
+                    if (data.tousuShouquandaibiao != null && data.tousuShouquandaibiao.Length > 0)
+                    {
+                        for (int i = 0; i < data.tousuShouquandaibiao.Length; i++)
+                        {
+                            var complaintShouquandaibiaoDTO = new TComplaintShouquandaibiaoDTO();
+                            complaintShouquandaibiaoDTO.ComplaintId = complaintletterDTO.Id;
+                            complaintShouquandaibiaoDTO.Shouquandaibiao = data.tousuShouquandaibiao[i];
+                            complaintShouquandaibiaoDTO.Lianxidianhua = data.tousuLianxidianhua[i];
+                            complaintShouquandaibiaoDTO.Dizhi = data.tousuDizhi[i];
+                            complaintShouquandaibiaoDTO.Youbian = data.tousuYoubian[i];
+                            complaintShouquandaibiaoDTO.Sort = i;
+                            resultEntity = _cooperOrderService.saveComplaintShouquandaibiao(complaintShouquandaibiaoDTO);
+                        }
+                    }
+
+
+                    resultEntity = _cooperOrderService.deleteComplaintRespondent(complaintletterDTO.Id);
+                    if (data.tousuRespondent != null && data.tousuRespondent.Length > 0)
+                    {
+                        for (int i = 0; i < data.tousuRespondent.Length; i++)
+                        {
+                            var complaintRespondentDTO = new TComplaintRespondentDTO();
+                            complaintRespondentDTO.ComplaintId = complaintletterDTO.Id;
+                            complaintRespondentDTO.Respondent = data.tousuRespondent[i];
+                            complaintRespondentDTO.Address = data.tousuAddress[i];
+                            complaintRespondentDTO.Postcode = data.tousuPostcode[i];
+                            complaintRespondentDTO.Contacts = data.tousuContacts[i];
+                            complaintRespondentDTO.Phone = data.tousuPhone[i];
+                            complaintRespondentDTO.Sort = i;
+                            resultEntity = _cooperOrderService.saveComplaintRespondent(complaintRespondentDTO);
+                        }
+                    }
+
+                    resultEntity = _cooperOrderService.deleteComplaintGongyingshang(complaintletterDTO.Id);
+                    if (data.Gongytingshang != null && data.Gongytingshang.Length > 0)
+                    {
+                        for (int i = 0; i < data.Gongytingshang.Length; i++)
+                        {
+                            var complaintGongyingshangDTO = new TComplaintGongyingshangDTO();
+                            complaintGongyingshangDTO.ComplaintId = complaintletterDTO.Id;
+                            complaintGongyingshangDTO.Gongytingshang = data.Gongytingshang[i];
+                            complaintGongyingshangDTO.Youbian = data.gongyingshangYoubian[i];
+                            complaintGongyingshangDTO.Lianxiren = data.gongyingshangLianxiren[i];
+                            complaintGongyingshangDTO.Lianxidianhua = data.gongyingshangLianxidianhua[i];
+                            complaintGongyingshangDTO.Dizhi = data.gongyingshangDizhi[i];
+                            complaintGongyingshangDTO.Sort = i;
+                            resultEntity = _cooperOrderService.saveComplaintGongyingshang(complaintGongyingshangDTO);
+                        }
+                    }
+
+                }
+                else if (data.OrderType1 == "浠f嫙璐ㄧ枒鍑�")
+                {
+                    //鏌ヨ涓昏〃
+                    var challengeletterDTO = _cooperOrderService.GetListChallengeletter(data.Id).FirstOrDefault();
+                    if (challengeletterDTO != null)
+                    {
+                        challengeletterDTO.GysName = data.GysName;
+                        challengeletterDTO.GysAddress = data.GysAddress;
+                        challengeletterDTO.GysPostcode = data.GysPostcode;
+                        challengeletterDTO.GysContacts = data.GysContacts;
+                        challengeletterDTO.GysPhone = data.GysPhone;
+
+                        challengeletterDTO.XmName = data.zhiyiXmName;
+                        challengeletterDTO.XmCode = data.zhiyiXmCode;
+                        challengeletterDTO.XmPackage = data.zhiyiXmPackage;
+                        challengeletterDTO.PurchaserName = data.zhiyiPurchaserName;
+                        challengeletterDTO.DocumentsDate = data.zhiyiDocumentsDate;
+                        challengeletterDTO.Modifier = curentuser.Id;
+                        challengeletterDTO.Modifytime = DateTime.Now;
+                        challengeletterDTO.Status = 1;
+                        resultEntity = _cooperOrderService.saveChallengeletter(challengeletterDTO);
+                    }
+                    else
+                    {
+                        challengeletterDTO = new TChallengeletterDTO();
+                        challengeletterDTO.OrderId = data.Id;
+                        challengeletterDTO.GysName = data.GysName;
+                        challengeletterDTO.GysAddress = data.GysAddress;
+                        challengeletterDTO.GysPostcode = data.GysPostcode;
+                        challengeletterDTO.GysContacts = data.GysContacts;
+                        challengeletterDTO.GysPhone = data.GysPhone;
+
+                        challengeletterDTO.XmName = data.zhiyiXmName;
+                        challengeletterDTO.XmCode = data.zhiyiXmCode;
+                        challengeletterDTO.XmPackage = data.zhiyiXmPackage;
+                        challengeletterDTO.PurchaserName = data.zhiyiPurchaserName;
+                        challengeletterDTO.DocumentsDate = data.zhiyiDocumentsDate;
+                        challengeletterDTO.Modifier = curentuser.Id;
+                        challengeletterDTO.Modifytime = DateTime.Now;
+                        challengeletterDTO.Creater = curentuser.Id;
+                        challengeletterDTO.Createtime = challengeletterDTO.Modifytime;
+                        challengeletterDTO.Status = 1;
+                        resultEntity = _cooperOrderService.saveChallengeletter(challengeletterDTO);
+                    }
+
+                    resultEntity = _cooperOrderService.deleteComplaintShouquandaibiao(challengeletterDTO.Id);
+                    if (data.zhiyiShouquandaibiao != null && data.zhiyiShouquandaibiao.Length > 0)
+                    {
+                        for (int i = 0; i < data.zhiyiShouquandaibiao.Length; i++)
+                        {
+                            var complaintShouquandaibiaoDTO = new TComplaintShouquandaibiaoDTO();
+                            complaintShouquandaibiaoDTO.ComplaintId = challengeletterDTO.Id;
+                            complaintShouquandaibiaoDTO.Shouquandaibiao = data.zhiyiShouquandaibiao[i];
+                            complaintShouquandaibiaoDTO.Lianxidianhua = data.zhiyiLianxidianhua[i];
+                            complaintShouquandaibiaoDTO.Dizhi = data.zhiyiDizhi[i];
+                            complaintShouquandaibiaoDTO.Youbian = data.zhiyiYoubian[i];
+                            complaintShouquandaibiaoDTO.Sort = i;
+                            resultEntity = _cooperOrderService.saveComplaintShouquandaibiao(complaintShouquandaibiaoDTO);
+                        }
+                    }
+
+
+                }
+                scope.Complete();
+            }
 
 
             return new JsonResult(resultEntity);
diff --git a/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs b/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
index 0473139..04308d5 100644
--- a/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
@@ -681,7 +681,20 @@
             searchEntity.CodeTable = "t_complaint_items";
             searchEntity.CodeField = "law";
             searchEntity.Sort = "CodeSn";
-            return new JsonResult(_sysCodeService.SearchSysCodeDtlPaging(searchEntity));
+
+            ResultDataEntity<SysCodeDtlEntity> resultDataEntity = _sysCodeService.SearchSysCodeDtlPaging(searchEntity);
+
+
+           var sysCodeDtls  = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv");
+
+            foreach(var sysCodeDtlEntity in resultDataEntity.DataList)
+            {
+                var sysCodeDtl  = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtlEntity.Comments).FirstOrDefault();
+                sysCodeDtlEntity.CommentsName = sysCodeDtl.Comments;
+            }
+
+
+            return new JsonResult(resultDataEntity);
         }
 
 
@@ -700,7 +713,7 @@
 
             ViewData.Model = sysCodeDtlEntity;
 
-
+            ViewBag.falv = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv");
 
 
             return View();
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
index e42be0b..500f0e2 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
@@ -18,17 +18,26 @@
 
     List<TChallengeItemDTO> challengeItemDTOs = challengeletterDTO.challengeItemDTOs;
 
+    List<TComplaintShouquandaibiaoDTO> challengecomplaintShouquandaibiaoDTOs = challengeletterDTO.complaintShouquandaibiaoDTOs;
+
     TComplaintletterDTO complaintletterDTO = ViewData["complaintletterDTO"] as TComplaintletterDTO; //鎶曡瘔涔�
 
     List<TComplaintItemDTO> complaintItemDTOs = complaintletterDTO.complaintItemDTOs;
 
     List<TComplaintRespondentDTO> complaintRespondentDTOs = complaintletterDTO.complaintRespondentDTOs;
 
+    List<TComplaintShouquandaibiaoDTO> complaintShouquandaibiaoDTOs = complaintletterDTO.complaintShouquandaibiaoDTOs;
+
+    List<TComplaintGongyingshangDTO> complaintGongyingshangDTOs = complaintletterDTO.complaintGongyingshangDTOs;
+
     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>; //鏄惁
+
 
 }
 @{
@@ -135,17 +144,17 @@
                                             <option value="" hassubinfo="true">璇烽�夋嫨</option>
                                             @foreach (var item in customer)
                                             {
-                                                @if (!item.Id.Equals(Model.Khdw))
+                                            @if (!item.Id.Equals(Model.Khdw))
                                                 {
-                                                    <option value="@item.Id" hassubinfo="true">
-                                                        @item.Name
-                                                    </option>
+                                            <option value="@item.Id" hassubinfo="true">
+                                                @item.Name
+                                            </option>
                                                 }
                                                 else
                                                 {
-                                                    <option value="@item.Id" hassubinfo="true" selected="selected">
-                                                        @item.Name
-                                                    </option>
+                                            <option value="@item.Id" hassubinfo="true" selected="selected">
+                                                @item.Name
+                                            </option>
                                                 }
 
                                             }
@@ -166,17 +175,17 @@
                                             <option value="" hassubinfo="true">璇烽�夋嫨</option>
                                             @foreach (var item in OrderType)
                                             {
-                                                @if (!item.CodeSn.Equals(Model.OrderType))
+                                            @if (!item.CodeSn.Equals(Model.OrderType))
                                                 {
-                                                    <option value="@item.CodeSn" hassubinfo="true">
-                                                        @item.Comments
-                                                    </option>
+                                            <option value="@item.CodeSn" hassubinfo="true">
+                                                @item.Comments
+                                            </option>
                                                 }
                                                 else
                                                 {
-                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
-                                                        @item.Comments
-                                                    </option>
+                                            <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                                @item.Comments
+                                            </option>
                                                 }
 
                                             }
@@ -262,32 +271,526 @@
 
 
                                 </div>
-
-                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                <div id="putong">
+                                    <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">
-                                        <input class="form-control" label="瀹㈡埛鍚嶇О" name="Shr" id="Shr" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Shr">
+                                        <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">
+                                            <input class="form-control" label="鏀惰揣浜�" name="Shr" id="Shr" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Shr">
+
+                                        </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">
+                                            <input class="form-control" label="鏀惰揣鍦板潃" name="ShrAddress" id="ShrAddress" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.ShrAddress">
+
+                                        </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">
+                                            <input class="form-control" label="鑱旂郴鐢佃瘽" name="ShrTel" id="ShrTel" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.ShrTel">
+
+                                        </div>
+
 
                                     </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">
-                                        <input class="form-control" label="瀹㈡埛鍚嶇О" name="ShrAddress" id="ShrAddress" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.ShrAddress">
-
-                                    </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">
-                                        <input class="form-control" label="瀹㈡埛鍚嶇О" name="ShrTel" id="ShrTel" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.ShrTel">
-
-                                    </div>
-
 
                                 </div>
+
+                                <div id="zhiyi">
+                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
+
+
+
+
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璐ㄧ枒渚涘簲鍟�<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="璐ㄧ枒渚涘簲鍟�" name="GysName" id="GysName" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@challengeletterDTO.GysName">
+
+                                        </div>
+                                    </div>
+                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍦板潃<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="鍦板潃" name="GysAddress" id="GysAddress" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@challengeletterDTO.GysAddress">
+
+                                        </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">
+                                            <input class="form-control" label="閭紪" name="GysPostcode" id="GysPostcode" labtype="txt" addvisible="true" maxlength="10" editvisible="true" reg="" ismust="true" type="text" value="@challengeletterDTO.GysPostcode">
+
+                                        </div>
+
+
+                                    </div>
+                                   
+
+                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱旂郴浜�<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="鑱旂郴浜�" name="GysContacts" id="GysContacts" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@challengeletterDTO.GysContacts">
+
+                                        </div>
+
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鐢佃瘽<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="鑱旂郴鐢佃瘽" name="GysPhone" id="GysPhone" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@challengeletterDTO.GysPhone">
+
+                                        </div>
+
+
+                                    </div>
+                                    <div id="zhiyishouquan">
+                                        @for(int i=0;i<challengecomplaintShouquandaibiaoDTOs.Count;i++){
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鎺堟潈浠h〃@(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鎺堟潈浠h〃@(i!=0?(i+""):"")" name="zhiyiShouquandaibiao" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="@challengecomplaintShouquandaibiaoDTOs[i].Shouquandaibiao">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鐢佃瘽@(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鑱旂郴鐢佃瘽@(i!=0?(i+""):"")" name="zhiyiLianxidianhua" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="@challengecomplaintShouquandaibiaoDTOs[i].Lianxidianhua">
+
+                                            </div>
+                                            @if(i==0){
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <button type="button" class="addBtn" onclick="addzhiyishouquan(this)" data-type="1">鎺堟潈浠h〃</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">鍦板潃@(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鍦板潃@(i!=0?(i+""):"")" name="zhiyiDizhi" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="@challengecomplaintShouquandaibiaoDTOs[i].Dizhi">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">閭紪@(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="閭紪@(i!=0?(i+""):"")" name="zhiyiYoubian" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="@challengecomplaintShouquandaibiaoDTOs[i].Youbian">
+
+                                            </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">椤圭洰鍚嶇О<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="椤圭洰鍚嶇О" name="zhiyiXmName" id="zhiyiXmName" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@challengeletterDTO.XmName">
+
+                                        </div>
+
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">椤圭洰缂栧彿<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="椤圭洰缂栧彿" name="zhiyiXmCode" id="zhiyiXmCode" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@challengeletterDTO.XmCode">
+
+                                        </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">
+                                            <input class="form-control" label="鍖呭彿" name="zhiyiXmPackage" id="zhiyiXmPackage" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@challengeletterDTO.XmPackage">
+
+                                        </div>
+
+                                    </div>
+
+                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">閲囪喘浜哄悕绉�<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="閲囪喘浜哄悕绉�" name="zhiyiPurchaserName" id="zhiyiPurchaserName" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@challengeletterDTO.PurchaserName">
+
+                                        </div>
+
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">閲囪喘鏂囦欢鑾峰彇鏃ユ湡<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="閲囪喘鏂囦欢鑾峰彇鏃ユ湡" name="zhiyiDocumentsDate" id="zhiyiDocumentsDate" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@challengeletterDTO.DocumentsDateName" readonly="readonly">
+
+                                        </div>
+
+
+
+                                    </div>
+
+                                </div>
+
+
+                                <div id="tousu">
+                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
+
+
+
+
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鎶曡瘔浜�<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="鎶曡瘔浜�" name="TsrName" id="TsrName" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@complaintletterDTO.TsrName">
+
+                                        </div>
+                                    </div>
+                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍦板潃<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="鍦板潃" name="TsrAddress" id="TsrAddress" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@complaintletterDTO.TsrAddress">
+
+                                        </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">
+                                            <input class="form-control" label="閭紪" name="TsrPostcode" id="TsrPostcode" labtype="txt" addvisible="true" maxlength="10" editvisible="true" reg="" ismust="true" type="text" value="@complaintletterDTO.TsrPostcode">
+
+                                        </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">娉曞畾浠h〃浜�<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="娉曞畾浠h〃浜�" name="TsrCorporation" id="TsrCorporation" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@complaintletterDTO.TsrCorporation">
+
+                                        </div>
+
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鐢佃瘽<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="鑱旂郴鐢佃瘽" name="TsrPhone" id="TsrPhone" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@complaintletterDTO.TsrPhone">
+
+                                        </div>
+
+
+                                    </div>
+                                    <div id="tousushouquan">
+                                        @for(int i=0;i<complaintShouquandaibiaoDTOs.Count;i++){
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鎺堟潈浠h〃@(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鎺堟潈浠h〃@(i!=0?(i+""):"")" name="tousuShouquandaibiao" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="@complaintShouquandaibiaoDTOs[i].Shouquandaibiao">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鐢佃瘽@(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鑱旂郴鐢佃瘽@(i!=0?(i+""):"")" name="tousuLianxidianhua" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="@complaintShouquandaibiaoDTOs[i].Lianxidianhua">
+
+                                            </div>
+                                            @if(i==0){
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <button type="button" class="addBtn" onclick="addtousushouquan(this)" data-type="1">鎺堟潈浠h〃</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">鍦板潃@(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鍦板潃@(i!=0?(i+""):"")" name="tousuDizhi" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="@complaintShouquandaibiaoDTOs[i].Dizhi">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">閭紪@(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="閭紪@(i!=0?(i+""):"")" name="tousuYoubian" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="@complaintShouquandaibiaoDTOs[i].Youbian">
+
+                                            </div>
+
+
+                                        </div>
+                                    }
+                                    </div>
+
+
+                                    <div id="beitousuren">
+                                        @for(int i=0;i<complaintRespondentDTOs.Count;i++){
+                                        @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">琚姇璇変汉<i class="red">*</i></label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="琚姇璇変汉" name="tousuRespondent" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@complaintRespondentDTOs[i].Respondent">
+
+                                            </div>
+
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <button type="button" class="addBtn" onclick="addbeitousuren(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">鍦板潃<i class="red">*</i></label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鍦板潃" name="tousuAddress" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@complaintRespondentDTOs[i].Address">
+
+                                            </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">
+                                                <input class="form-control" label="閭紪" name="tousuPostcode" labtype="txt" addvisible="true" maxlength="10" editvisible="true" reg="" ismust="true" type="text" value="@complaintRespondentDTOs[i].Postcode">
+
+                                            </div>
+
+
+
+                                        </div>
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱旂郴浜�<i class="red">*</i></label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鑱旂郴浜�" name="tousuContacts" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@complaintRespondentDTOs[i].Contacts">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鐢佃瘽<i class="red">*</i></label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鑱旂郴鐢佃瘽" name="tousuPhone" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@complaintRespondentDTOs[i].Phone">
+
+                                            </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!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="琚姇璇変汉@(i!=0?(i+""):"")" name="tousuRespondent" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@complaintRespondentDTOs[i].Respondent">
+
+                                            </div>
+
+                                          
+
+
+
+                                        </div>
+
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍦板潃@(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鍦板潃@(i!=0?(i+""):"")" name="tousuAddress" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@complaintRespondentDTOs[i].Address">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">閭紪@(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="閭紪@(i!=0?(i+""):"")" name="tousuPostcode" labtype="txt" addvisible="true" maxlength="10" editvisible="true" reg="" ismust="true" type="text" value="@complaintRespondentDTOs[i].Postcode">
+
+                                            </div>
+
+
+
+                                        </div>
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱旂郴浜篅(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鑱旂郴浜篅(i!=0?(i+""):"")" name="tousuContacts" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@complaintRespondentDTOs[i].Contacts">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鐢佃瘽@(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鑱旂郴鐢佃瘽@(i!=0?(i+""):"")" name="tousuPhone" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@complaintRespondentDTOs[i].Phone">
+
+                                            </div>
+
+
+                                        </div>
+                                        }
+
+                                    }
+                                    </div>
+
+
+
+
+
+                                    <div id="xiangguangongyingshang">
+                                        @for(int i=0;i<complaintGongyingshangDTOs.Count;i++){
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鐩稿叧渚涘簲鍟咢(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鐩稿叧渚涘簲鍟咢(i!=0?(i+""):"")" name="Gongytingshang" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="@complaintGongyingshangDTOs[i].Gongytingshang">
+
+                                            </div>
+                                            @if(i==0){
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <button type="button" class="addBtn" onclick="addxiangguangongyingshang(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">鍦板潃@(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鍦板潃@(i!=0?(i+""):"")" name="gongyingshangDizhi" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="@complaintGongyingshangDTOs[i].Dizhi">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">閭紪@(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="閭紪@(i!=0?(i+""):"")" name="gongyingshangYoubian" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="@complaintGongyingshangDTOs[i].Youbian">
+
+                                            </div>
+
+
+
+                                        </div>
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱旂郴浜篅(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鑱旂郴浜篅(i!=0?(i+""):"")" name="gongyingshangLianxiren" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="@complaintGongyingshangDTOs[i].Lianxiren">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鐢佃瘽@(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鑱旂郴鐢佃瘽@(i!=0?(i+""):"")" name="gongyingshangLianxidianhua" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="@complaintGongyingshangDTOs[i].Lianxidianhua">
+
+                                            </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">椤圭洰鍚嶇О<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="椤圭洰鍚嶇О" name="tousuXmName" id="tousuXmName" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@complaintletterDTO.XmName">
+
+                                        </div>
+
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">椤圭洰缂栧彿<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="椤圭洰缂栧彿" name="tousuXmCode" id="tousuXmCode" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@complaintletterDTO.XmCode">
+
+                                        </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">
+                                            <input class="form-control" label="鍖呭彿" name="tousuXmPackage" id="tousuXmPackage" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@complaintletterDTO.XmPackage">
+
+                                        </div>
+
+                                    </div>
+
+                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">閲囪喘浜哄悕绉�<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="閲囪喘浜哄悕绉�" name="tousuPurchaserName" id="tousuPurchaserName" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@complaintletterDTO.PurchaserName">
+
+                                        </div>
+
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">浠g悊鏈烘瀯鍚嶇О<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="浠g悊鏈烘瀯鍚嶇О" name="tousuAgency" id="tousuAgency" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@complaintletterDTO.Agency">
+
+                                        </div>
+
+
+
+                                    </div>
+
+                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">閲囪喘鏂囦欢鍏憡<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <select id="tousuIsNotice" class="form-control" name="tousuIsNotice" data-placeholder="閫夋嫨 搴忓垪 ...">
+                                                <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                @foreach (var item in shifou)
+                                            {
+                                                @if (!item.CodeSn.Equals(complaintletterDTO.IsNotice))
+                                                {
+                                                <option value="@item.CodeSn" hassubinfo="true">
+                                                    @item.Comments
+                                                </option>
+                                                }
+                                                else
+                                                {
+                                                <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                                    @item.Comments
+                                                </option>
+                                                }
+
+                                            }
+
+
+                                            </select>
+                                        </div>
+
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍏憡鏈熼檺</label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="鍏憡鏈熼檺" name="tousuNoticeDate" id="tousuNoticeDate" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@complaintletterDTO.NoticeDateName" readonly="readonly">
+
+                                        </div>
+
+
+
+                                    </div>
+
+                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">閲囪喘缁撴灉鍏憡<i class="red">*</i></label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <select id="tousuIsResultnotice" class="form-control" name="tousuIsResultnotice" data-placeholder="閫夋嫨 搴忓垪 ...">
+                                                <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                @foreach (var item in shifou)
+                                            {
+                                                @if (!item.CodeSn.Equals(complaintletterDTO.IsResultnotice))
+                                                {
+                                                <option value="@item.CodeSn" hassubinfo="true">
+                                                    @item.Comments
+                                                </option>
+                                                }
+                                                else
+                                                {
+                                                <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                                    @item.Comments
+                                                </option>
+                                                }
+
+                                            }
+
+
+                                            </select>
+                                        </div>
+
+                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍏憡鏈熼檺</label>
+                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                            <input class="form-control" label="鍏憡鏈熼檺" name="tousuResultnoticeDate" id="tousuResultnoticeDate" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@complaintletterDTO.ResultnoticeDateName" readonly="readonly">
+
+                                        </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>
@@ -299,7 +802,7 @@
 
                                 <div class="clearfix layer-area" style="padding-bottom:15px;">
                                     <div class="col-sm-1 col-md-1">
-                                        
+
                                     </div>
                                     <div class="col-sm-8 col-md-8" style="color:red;">
                                         绯荤粺鑷姩鏍规嵁8澶╁唴鐢宠鐨勪紭鎯犻」鐩绠椾紭鎯犻噾棰�
@@ -329,7 +832,7 @@
 
     </form>
     <script type="text/javascript">
-        var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2 - 95;
+        var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2 +600;
         $("#div_content").height(hh);
 
         toastr.options = {
@@ -347,8 +850,9 @@
             "showMethod": "fadeIn",
             "hideMethod": "fadeOut"
         };
-
-
+        laydate({ elem: "#zhiyiDocumentsDate", format: 'YYYY-MM-DD', istime: true, event: "focus" });
+        laydate({ elem: "#tousuResultnoticeDate", format: 'YYYY-MM-DD', istime: true, event: "focus" });
+        laydate({ elem: "#tousuNoticeDate", format: 'YYYY-MM-DD', istime: true, event: "focus" });
 
 
         $(document).ready(function () {
@@ -501,6 +1005,118 @@
             }
 
 
+            if ($("#OrderType1").val() == "浠f嫙鎶曡瘔涔�") {
+                if ($.trim($("#TsrName").val()) == '') {
+                    toastr.warning("鎶曡瘔浜轰笉鑳戒负绌�");
+                    return;
+                }
+                if ($.trim($("#TsrAddress").val()) == '') {
+                    toastr.warning("鎶曡瘔浜哄湴鍧�涓嶈兘涓虹┖");
+                    return;
+                }
+                //if ($.trim($("#TsrPostcode").val()) == '') {
+                //    toastr.warning("鎶曡瘔浜洪偖缂栦笉鑳戒负绌�");
+                //    return;
+                //}
+                if ($.trim($("#TsrCorporation").val()) == '') {
+                    toastr.warning("鎶曡瘔浜烘硶瀹氫唬琛ㄤ汉涓嶈兘涓虹┖");
+                    return;
+                }
+                if ($.trim($("#TsrPhone").val()) == '') {
+                    toastr.warning("鎶曡瘔浜鸿仈绯荤數璇濅笉鑳戒负绌�");
+                    return;
+                }
+
+
+                if ($.trim($("#tousuXmName").val()) == '') {
+                    toastr.warning("椤圭洰鍚嶇О涓嶈兘涓虹┖");
+                    return;
+                }
+                if ($.trim($("#tousuXmName").val()) == '') {
+                    toastr.warning("椤圭洰缂栧彿涓嶈兘涓虹┖");
+                    return;
+                }
+                if ($.trim($("#tousuPurchaserName").val()) == '') {
+                    toastr.warning("閲囪喘浜哄悕绉颁笉鑳戒负绌�");
+                    return;
+                }
+                if ($.trim($("#tousuAgency").val()) == '') {
+                    toastr.warning("浠g悊鏈烘瀯鍚嶇О涓嶈兘涓虹┖");
+                    return;
+                }
+                if ($.trim($("#tousuIsNotice").val()) == '') {
+                    toastr.warning("閲囪喘鏂囦欢鍏憡涓嶈兘涓虹┖");
+                    return;
+                }
+                if ($.trim($("#tousuIsResultnotice").val()) == '') {
+                    toastr.warning("閲囪喘缁撴灉鍏憡涓嶈兘涓虹┖");
+                    return;
+                }
+
+
+                if ($.trim(document.getElementsByName("tousuRespondent")[0].value) == '') {
+                    toastr.warning("琚姇璇変汉涓嶈兘涓虹┖");
+                    return;
+                }
+                if ($.trim(document.getElementsByName("tousuAddress")[0].value) == '') {
+                    toastr.warning("琚姇璇変汉鍦板潃涓嶈兘涓虹┖");
+                    return;
+                }
+                if ($.trim(document.getElementsByName("tousuContacts")[0].value) == '') {
+                    toastr.warning("琚姇璇変汉鑱旂郴浜轰笉鑳戒负绌�");
+                    return;
+                }
+                if ($.trim(document.getElementsByName("tousuPhone")[0].value) == '') {
+                    toastr.warning("琚姇璇変汉鑱旂郴鐢佃瘽涓嶈兘涓虹┖");
+                    return;
+                }
+
+                
+            } else if ($("#OrderType1").val() == "浠f嫙璐ㄧ枒鍑�") {
+                if ($.trim($("#GysName").val()) == '') {
+                    toastr.warning("璐ㄧ枒渚涘簲鍟嗕笉鑳戒负绌�");
+                    return;
+                }
+                if ($.trim($("#GysAddress").val()) == '') {
+                    toastr.warning("璐ㄧ枒渚涘簲鍟嗗湴鍧�涓嶈兘涓虹┖");
+                    return;
+                }
+                //if ($.trim($("#GysPostcode").val()) == '') {
+                //    toastr.warning("璐ㄧ枒渚涘簲鍟嗛偖缂栦笉鑳戒负绌�");
+                //    return;
+                //}
+                if ($.trim($("#GysContacts").val()) == '') {
+                    toastr.warning("璐ㄧ枒渚涘簲鍟嗚仈绯讳汉涓嶈兘涓虹┖");
+                    return;
+                }
+                if ($.trim($("#GysPhone").val()) == '') {
+                    toastr.warning("璐ㄧ枒渚涘簲鍟嗚仈绯荤數璇濅笉鑳戒负绌�");
+                    return;
+                }
+
+                if ($.trim($("#zhiyiXmName").val()) == '') {
+                    toastr.warning("椤圭洰鍚嶇О涓嶈兘涓虹┖");
+                    return;
+                }
+                if ($.trim($("#zhiyiXmCode").val()) == '') {
+                    toastr.warning("椤圭洰缂栧彿涓嶈兘涓虹┖");
+                    return;
+                }
+                if ($.trim($("#zhiyiPurchaserName").val()) == '') {
+                    toastr.warning("閲囪喘浜哄悕绉颁笉鑳戒负绌�");
+                    return;
+                }
+                if ($.trim($("#zhiyiDocumentsDate").val()) == '') {
+                    toastr.warning("閲囪喘鏂囦欢鑾峰彇鏃ユ湡涓嶈兘涓虹┖");
+                    return;
+                }
+                
+                
+                
+                
+            } 
+
+
 
 
             //var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
@@ -590,9 +1206,9 @@
                     var city = $("#OrderType1");
                     city.find('option').remove();
                     $("#OrderType2").find('option').remove();
-                   
+
                         $("#Price").val("");
-                   
+
                     var aaa = '<option value="" hassubinfo="true">璇烽�夋嫨</option>';
                     city.append(aaa);
                     if (data.length > 0) {
@@ -617,6 +1233,9 @@
                     parent.layer.msg('澶辫触', { icon: 5 });
                 }
             });
+            $("#putong").show();
+            $("#zhiyi").hide();
+            $("#tousu").hide();
         });
 
 
@@ -633,9 +1252,9 @@
                 success: function (data) {
                     var city = $("#OrderType2");
                     city.find('option').remove();
-                   
+
                         $("#Price").val("");
-                   
+
 
                     if (OrderType != "02" || sheng == "鐢佃瘽鍜ㄨ" || sheng == "褰撻潰鍜ㄨ" || sheng == "浠f嫙璐ㄧ枒绛斿" || sheng == "浠f嫙鎶曡瘔澶勭悊鍐冲畾" || sheng == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹跺弬鍔犳斂搴滈噰璐暟鎹俊鎭煡璇�" || sheng == "鏀块噰璐�") {
                         if (OrderType == "01") {
@@ -672,7 +1291,19 @@
                         $("#dingdanleixing3").show();
                     }
 
-
+                    if ($("#OrderType1").val() == "浠f嫙鎶曡瘔涔�") {
+                        $("#putong").hide();
+                        $("#zhiyi").hide();
+                        $("#tousu").show();
+                    } else if ($("#OrderType1").val() == "浠f嫙璐ㄧ枒鍑�") {
+                        $("#putong").hide();
+                        $("#zhiyi").show();
+                        $("#tousu").hide();
+                    } else {
+                        $("#putong").show();
+                        $("#zhiyi").hide();
+                        $("#tousu").hide();
+                    }
 
 
 
@@ -730,7 +1361,7 @@
                     var city = $("#OrderType1");
 
 
-                
+
                     var aaa = '';
                     city.append(aaa);
 
@@ -759,7 +1390,7 @@
             });
 
 
-            
+
 
             $.ajax({
                 type: "GET",
@@ -811,13 +1442,40 @@
         }
 
 
+        
+
+        $(document).ready(function () {
+
+            if ($("#OrderType").val() == "02") {
+                if ($("#OrderType1").val() == "浠f嫙鎶曡瘔涔�") {
+                    $("#putong").hide();
+                    $("#zhiyi").hide();
+                    $("#tousu").show();
+                } else if ($("#OrderType1").val() == "浠f嫙璐ㄧ枒鍑�") {
+                    $("#putong").hide();
+                    $("#zhiyi").show();
+                    $("#tousu").hide();
+                } else {
+                    $("#putong").show();
+                    $("#zhiyi").hide();
+                    $("#tousu").hide();
+                }
+            } else {
+                $("#putong").show();
+                $("#zhiyi").hide();
+                $("#tousu").hide();
+            }
+           
+          
+            
 
 
+        }); 
 
 
         $("#Khdw").change(function () {
             var Khdw = $("#Khdw").val();
-            
+
             $.ajax({
                 type: "GET",
                 url: "/CooperatecustomCustomer/GetCustomer?id=" + Khdw,
@@ -825,10 +1483,23 @@
                 global: false,
                 data: "",
                 success: function (data) {
-
+                    
+                   
                     $("#Shr").val(data.ShrName);
                     $("#ShrAddress").val(data.ShrAddress);
                     $("#ShrTel").val(data.ShrTel);
+
+                    $("#GysName").val(data.Name);  
+                    $("#GysAddress").val(data.Address);
+                    $("#GysPostcode").val("");
+                    $("#GysContacts").val(data.FName);
+                    $("#GysPhone").val(data.FTel);
+
+                    $("#TsrName").val(data.Name);
+                    $("#TsrAddress").val(data.ShrName);
+                    $("#TsrPostcode").val("");
+                    $("#TsrCorporation").val(data.FName);
+                    $("#TsrPhone").val(data.FTel);
 
                 },
                 error: function () {
@@ -848,6 +1519,179 @@
             parent.layer.close(index);
             return false;
         }
+
+
+        function addzhiyishouquan(obj) {
+            var sss = document.getElementsByName("zhiyiShouquandaibiao").length;
+
+                $('#zhiyishouquan').append(` <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鎺堟潈浠h〃`+ sss +`</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鎺堟潈浠h〃`+ sss +`" name="zhiyiShouquandaibiao" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鐢佃瘽`+ sss +`</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鑱旂郴鐢佃瘽`+ sss +`" name="zhiyiLianxidianhua" labtype="txt" addvisible="true" maxlength="300" 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">鍦板潃`+ sss +`</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鍦板潃`+ sss +`" name="zhiyiDizhi" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value=" ">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">閭紪`+ sss +`</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="閭紪`+ sss +`" name="zhiyiYoubian" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value=" ">
+
+                                            </div>
+
+
+                                        </div>`);
+
+        }
+
+
+        function addtousushouquan(obj) {
+            var sss = document.getElementsByName("tousuShouquandaibiao").length;
+
+            $('#tousushouquan').append(` <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鎺堟潈浠h〃`+ sss + `</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鎺堟潈浠h〃`+ sss + `" name="tousuShouquandaibiao" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鐢佃瘽`+ sss + `</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鑱旂郴鐢佃瘽`+ sss + `" name="tousuLianxidianhua" labtype="txt" addvisible="true" maxlength="300" 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">鍦板潃`+ sss + `</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鍦板潃`+ sss + `" name="tousuDizhi" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value=" ">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">閭紪`+ sss + `</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="閭紪`+ sss + `" name="tousuYoubian" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value=" ">
+
+                                            </div>
+
+
+                                        </div>`);
+
+        }
+
+
+        function addbeitousuren(obj) {
+            var sss = document.getElementsByName("tousuRespondent").length;
+
+            $('#beitousuren').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>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="琚姇璇変汉`+ sss + `" name="tousuRespondent" labtype="txt" addvisible="true" maxlength="50" 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">鍦板潃`+ sss + `</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鍦板潃`+ sss + `" name="tousuAddress" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">閭紪`+ sss + `</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="閭紪`+ sss + `" name="tousuPostcode" labtype="txt" addvisible="true" maxlength="10" 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">鑱旂郴浜篳+ sss + `</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鑱旂郴浜篳+ sss + `" name="tousuContacts" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鐢佃瘽`+ sss + `</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鑱旂郴鐢佃瘽`+ sss + `" name="tousuPhone" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="">
+
+                                            </div>
+
+
+                                        </div>`);
+
+        }
+
+        function addxiangguangongyingshang(obj) {
+            var sss = document.getElementsByName("Gongytingshang").length;
+
+            $('#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>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鐩稿叧渚涘簲鍟哷+ sss + `" name="Gongytingshang" labtype="txt" addvisible="true" maxlength="300" 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">鍦板潃`+ sss + `</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鍦板潃`+ sss + `" name="gongyingshangDizhi" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">閭紪`+ sss + `</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="閭紪`+ sss + `" name="gongyingshangYoubian" labtype="txt" addvisible="true" maxlength="300" 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">鑱旂郴浜篳+ sss + `</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鑱旂郴浜篳+ sss + `" name="gongyingshangLianxiren" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="">
+
+                                            </div>
+
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鐢佃瘽`+ sss + `</label>
+                                            <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                <input class="form-control" label="鑱旂郴鐢佃瘽`+ sss + `" name="gongyingshangLianxidianhua" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="">
+
+                                            </div>
+
+
+                                        </div>`);
+
+        }
+
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml b/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml
index a287ee4..ea931d6 100644
--- a/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml
@@ -3,7 +3,7 @@
 @using zhengcaioa.Models;
 @{
 
-
+    List<SysCodeDtl> falv = ViewData["falv"] as List<SysCodeDtl>; //娉曞緥
 
 
 
@@ -124,11 +124,30 @@
                                     </div>
 
                                     <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                        <label class="text-right col-sm-1 col-md-1 control-label">鍚嶇О</label>
+                                        <label class="text-right col-sm-1 col-md-1 control-label">娉曞緥鍚嶇О</label>
                                         <div class="col-sm-10 col-md-10">
-                                            <input class="form-control" label="鍚嶇О" id="Comments" name="Comments" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="100" ismust="true" type="text" value="@Model.Comments">
+                                            @*<input class="form-control" label="娉曞緥鍚嶇О" id="Comments" name="Comments" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="100" ismust="true" type="text" value="@Model.Comments">*@
 
+                                            <select id="Comments" class="form-control" name="Comments" data-placeholder="閫夋嫨 搴忓垪 ...">
+                                                <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                @foreach (var item in falv)
+                                                {
+                                                    @if (!item.CodeSn.Equals(Model.Comments))
+                                                    {
+                                                        <option value="@item.CodeSn" hassubinfo="true">
+                                                            @item.Comments
+                                                        </option>
+                                                    }
+                                                    else
+                                                    {
+                                                        <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                                            @item.Comments
+                                                        </option>
+                                                    }
 
+                                                }
+                                                }
+                                            </select>
                                         </div>
                                     </div>
                                     <div class="clearfix layer-area" style="padding-bottom:15px;display:none;">
@@ -140,12 +159,14 @@
 
                                     </div>
                                     <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                        <label class="text-right col-sm-1 col-md-1 control-label">澶囨敞</label>
+                                        <label class="text-right col-sm-1 col-md-1 control-label">鍐呭</label>
                                         <div class="col-sm-10 col-md-10">
-                                            <input class="form-control" label="澶囨敞" id="Contents" name="Contents" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="300" ismust="true" type="text" value="@Model.Contents">
+                                            @*<input class="form-control" label="鍐呭" id="Contents" name="Contents" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="300" ismust="true" type="text" value="@Model.Contents">*@
 
-
+                                            <textarea class="form-control bt" id="Contents" name="Contents" title="鍐呭" isempty="" maxlength="450" 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'">@Model.Contents</textarea>
                                         </div>
+
+                                    </div>
                                     </div>
 
 
@@ -198,6 +219,10 @@
 
         var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2;
         $("#div_content").height(hh);
+
+        var Contents = document.getElementById("Contents");
+
+        Contents.style.height = Contents.scrollHeight + 'px';
 
         toastr.options = {
             "closeButton": true,
@@ -280,7 +305,7 @@
 
 
             if ($.trim($("#Comments").val()) == '') {
-                toastr.warning("鍚嶇О涓嶈兘涓虹┖");
+                toastr.warning("娉曞緥鍚嶇О涓嶈兘涓虹┖");
                 return;
             }
 
diff --git a/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml b/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml
index 09e2b73..2ef75ae 100644
--- a/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml
@@ -13,7 +13,7 @@
                 }
             },
             {
-                label: '鍚嶇О', name: 'Comments', labtype: 'txt', hidden: false, width: 300,
+                label: '娉曞緥鍚嶇О', name: 'CommentsName', labtype: 'txt', hidden: false, width: 300,
 
             },
             {
@@ -21,7 +21,7 @@
 
             },
             {
-                label: '澶囨敞', name: 'Contents', labtype: 'txt', hidden: false, width: 300,
+                label: '鍐呭', name: 'Contents', labtype: 'txt', hidden: false, width: 300,
 
             },
             { label: '鐘舵��', name: 'RecStatus', labtype: 'txt', hidden: true },

--
Gitblit v1.9.1