From 5a50381b4d3b30a8de467d01d657a3a842ee0298 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 06 十二月 2021 16:28:42 +0800
Subject: [PATCH] 提交

---
 zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml              |   15 
 zhengcaioa/DTO/CooperOrderDTO.cs                                         |   13 
 zhengcaioa/zhengcaioa/Views/CooperOrder/IndexWenshu.cshtml               |   19 
 zhengcaioa/Services/CooperOrderService.cs                                |   21 +
 zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs |  311 +++++++++++++++--
 zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml              |  695 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 1,021 insertions(+), 53 deletions(-)

diff --git a/zhengcaioa/DTO/CooperOrderDTO.cs b/zhengcaioa/DTO/CooperOrderDTO.cs
index 9b7e678..59dc920 100644
--- a/zhengcaioa/DTO/CooperOrderDTO.cs
+++ b/zhengcaioa/DTO/CooperOrderDTO.cs
@@ -127,6 +127,19 @@
         public string Agency { get; set; }
         public decimal YishouMoney { get; set; }
         public decimal WeishouMoney { get; set; }
+        public string Status { get; set; }
+        public string StatusName { get; set; }
+
+        public string RequestInfo { get; set; }
+
+
+        public string[] Evidential { get; set; }
+        public string[] Question { get; set; }
+        public string[] Law { get; set; }
+        public string[] Lawcoment { get; set; }
+
+        public string OrderId { get; set; }
+        public int PrintNum { get; set; }
     }
 
     public class CooperOrderDTOSearch : SearchEntity
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index fa1b109..fca347f 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -978,7 +978,7 @@
                     updateproject.RequestInfo = entity.RequestInfo;
 
                     updateproject.IsReply = entity.IsReply;
-                
+                    updateproject.Status = entity.Status; 
 
                     updateproject.Respondent = entity.Respondent;
                     updateproject.RespondDate = entity.RespondDate;
@@ -1568,6 +1568,13 @@
                          into lsss
                           from lll in lsss.DefaultIfEmpty()
 
+
+                      //    join d in listCode.Where(x => x.CodeTable == "t_challengeletter" && x.CodeField == "status")
+                      //on b.Status equals int.Parse(d.CodeSn)
+                      //into dsss
+                      //    from ddd in dsss.DefaultIfEmpty()
+
+
                           where a.RecStatus == "A" && a.OrderType1 == "浠f嫙璐ㄧ枒鍑�"
                           && (string.IsNullOrWhiteSpace(searchEntity.XdTime) || (b.Createtime >= XdTimestart && b.Createtime <= XdTimeend))
                             && (string.IsNullOrWhiteSpace(searchEntity.Wenshuleixing) || a.OrderType1 == searchEntity.Wenshuleixing.Trim())
@@ -1596,6 +1603,8 @@
                               YishouMoney = lll.YishouMoney ?? 0,
                               WeishouMoney = (a.Money ?? 0) /*- (a.Youhui ?? 0)*/ - (lll.YishouMoney ?? 0),
                               OrderType1 = a.OrderType1,
+                              Status = b.Status.ToString(),
+                              //StatusName = ddd.Comments
                           }
                 ).ToList();
 
@@ -1648,6 +1657,7 @@
                            YishouMoney = lll.YishouMoney ?? 0,
                            WeishouMoney = (a.Money ?? 0) /*- (a.Youhui ?? 0)*/ - (lll.YishouMoney ?? 0),
                            OrderType1 = a.OrderType1,
+                           Status = b.Status.ToString(),
                        }
                 ).ToList();
 
@@ -1670,6 +1680,15 @@
             //if (searchEntity.totalrows == 0)
             searchEntity.totalrows = query.Count();
             var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+            foreach (var cooperOrderDTO in lianlist)
+            {
+              var  codeDataEntity  =  listCode.Where(x => x.CodeTable == "t_challengeletter" && x.CodeField == "status" && x.CodeSn == cooperOrderDTO.Status.ToString()).FirstOrDefault();
+                if (codeDataEntity != null) {
+                    cooperOrderDTO.StatusName = codeDataEntity.Comments;
+                }
+            }
+
+
             data.LoadData(searchEntity, lianlist);
             return data;
         }
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index 81d1c77..856dc3f 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -752,14 +752,21 @@
                     {
                         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);
+                            if (!(string.IsNullOrEmpty(data.tousuShouquandaibiao[i])
+                             && string.IsNullOrEmpty(data.tousuLianxidianhua[i])
+                             && string.IsNullOrEmpty(data.tousuDizhi[i])
+                             && string.IsNullOrEmpty(data.tousuYoubian[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);
+                            }
+                              
                         }
                     }
 
@@ -769,15 +776,23 @@
                     {
                         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);
+                            if (!(string.IsNullOrEmpty(data.tousuRespondent[i])
+                           && string.IsNullOrEmpty(data.tousuAddress[i])
+                           && string.IsNullOrEmpty(data.tousuPostcode[i])
+                           && string.IsNullOrEmpty(data.tousuContacts[i])
+                            && string.IsNullOrEmpty(data.tousuPhone[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);
+                            }
+                               
                         }
                     }
 
@@ -786,15 +801,23 @@
                     {
                         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);
+                            if (!(string.IsNullOrEmpty(data.Gongytingshang[i])
+                          && string.IsNullOrEmpty(data.gongyingshangYoubian[i])
+                          && string.IsNullOrEmpty(data.gongyingshangLianxiren[i])
+                          && string.IsNullOrEmpty(data.gongyingshangLianxidianhua[i])
+                           && string.IsNullOrEmpty(data.gongyingshangDizhi[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);
+                            }
+                               
                         }
                     }
 
@@ -849,14 +872,21 @@
                     {
                         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);
+                            if (!(string.IsNullOrEmpty(data.zhiyiShouquandaibiao[i])
+                           && string.IsNullOrEmpty(data.zhiyiLianxidianhua[i])
+                           && string.IsNullOrEmpty(data.zhiyiDizhi[i])
+                           && string.IsNullOrEmpty(data.zhiyiYoubian[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);
+                            }
+                                
                         }
                     }
 
@@ -1463,7 +1493,7 @@
             actionlist.Add(actionEntity);
 
             ViewData["ActionInfo"] = actionlist;
-
+            ViewBag.status = _liaotianService.GetSYScode("t_challengeletter", "status").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
 
 
 
@@ -1503,13 +1533,220 @@
 
 
             ViewBag.Wenshuleixing = _liaotianService.GetSYScode("t_challengeletter", "Wenshuleixing").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
-
+            ViewBag.status = _liaotianService.GetSYScode("t_challengeletter", "status").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
 
             return View();
 
         }
 
- 
 
+
+        public IActionResult EditZhiyihan(string id = null)
+        {
+            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+            ViewData["curentuser"] = curentuser;
+
+            //璐ㄧ枒鍑�
+            List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengeletter(id);
+            TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
+            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;
+
+
+
+
+            ViewBag.request_info = _liaotianService.GetSYScode("t_challengeletter", "request_info");//璐ㄧ枒璇锋眰
+            ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question"); //	璐ㄧ枒浜嬮」
+            var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv");//娉曞緥
+            var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law");//娉曞緥渚濇嵁
+            foreach ( var sysCodeDtl in sysCodeDtls1)
+            {
+                var sysCodeDtl1  = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
+                if (sysCodeDtl1 != null)
+                    sysCodeDtl.Comments = sysCodeDtl1.Comments;
+            }
+
+            ViewBag.law = sysCodeDtls1;//娉曞緥渚濇嵁
+
+
+
+
+
+            ViewData.Model = challengeletterDTO;
+            return View();
+        }
+
+
+        public IActionResult getLaw(string id)
+        {
+            ResultEntity resultEntity = new ResultEntity();
+            resultEntity.Result = true;
+            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+            ViewData["curentuser"] = curentuser;
+
+           var sysCodeDtl  = _liaotianService.GetSYScode("t_complaint_items", "law").Where(x=>x.CodeSn== id).FirstOrDefault();//娉曞緥渚濇嵁
+
+          
+            if (sysCodeDtl != null )
+            {
+                resultEntity.Message = sysCodeDtl.Contents;
+            }
+
+
+            return new JsonResult(resultEntity);
+        }
+
+
+
+        /// <summary>
+        /// 淇濆瓨
+        /// </summary>
+        /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+        /// <returns></returns>
+        /// 
+        [CheckLogin]
+        [HttpPost]
+        public IActionResult SaveChallengeletter(CooperOrderDTO data)
+        {
+            ResultEntity resultEntity = new ResultEntity();
+
+            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+            ViewData["curentuser"] = curentuser;
+            
+
+            using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+                new TransactionOptions
+                {
+                    IsolationLevel = IsolationLevel.ReadCommitted,
+                    Timeout = TransactionManager.MaximumTimeout
+                }
+                ))
+            {
+
+
+
+
+                //鏌ヨ涓昏〃
+                var challengeletterDTO = _cooperOrderService.GetListChallengeletter(data.OrderId).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 = 2;
+                    challengeletterDTO.RequestInfo = data.RequestInfo;
+                    challengeletterDTO.PrintNum = data.PrintNum;
+                    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 = 2;
+                    challengeletterDTO.RequestInfo = data.RequestInfo;
+                    challengeletterDTO.PrintNum = data.PrintNum;
+                    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++)
+                    {
+                        if (!(string.IsNullOrEmpty(data.zhiyiShouquandaibiao[i])
+                              && string.IsNullOrEmpty(data.zhiyiLianxidianhua[i])
+                              && string.IsNullOrEmpty(data.zhiyiDizhi[i])
+                              && string.IsNullOrEmpty(data.zhiyiYoubian[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);
+                        }
+                           
+                    }
+                }
+
+
+                resultEntity = _cooperOrderService.deleteChallengeItem(challengeletterDTO.Id);
+                if (data.Question != null && data.Question.Length > 0)
+                {
+                    for (int i = 0; i < data.Question.Length; i++)
+                    {
+                        if (!(string.IsNullOrEmpty(data.Question[i])
+                            && string.IsNullOrEmpty(data.Evidential[i])
+                            && string.IsNullOrEmpty(data.Law[i])
+                            && string.IsNullOrEmpty(data.Lawcoment[i])))
+                        {
+                            var challengeItemDTO = new TChallengeItemDTO();
+                            challengeItemDTO.ChallengeId = challengeletterDTO.Id;
+                            challengeItemDTO.Question = data.Question[i];
+                            challengeItemDTO.Evidential = data.Evidential[i];
+                            challengeItemDTO.Law = data.Law[i];
+                            challengeItemDTO.Lawcoment = data.Lawcoment[i];
+                            challengeItemDTO.Sort = i;
+                            resultEntity = _cooperOrderService.saveChallengeItem(challengeItemDTO);
+                        }
+                       
+                    }
+                }
+                scope.Complete();
+            }
+
+
+            return new JsonResult(resultEntity);
+        }
     }
 }
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
new file mode 100644
index 0000000..a2a6538
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
@@ -0,0 +1,695 @@
+锘緻model DTO.TChallengeletterDTO
+@using DTO;
+@using zhengcaioa.Models;
+@{
+
+
+
+    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<TComplaintShouquandaibiaoDTO> challengecomplaintShouquandaibiaoDTOs = Model.complaintShouquandaibiaoDTOs;
+
+    List<TChallengeItemDTO> challengeItemDTOs = Model.challengeItemDTOs;
+
+
+}
+@{
+    Layout = null;
+}
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="ThemeBucket">
+    <title>@(SiteConfig.SiteName)</title>
+    <link href="~/css/bootstrap.min.css" rel="stylesheet">
+    <link href="~/css/font-awesome.min.css" rel="stylesheet">
+    <link href="~/css/animate.min.css" rel="stylesheet">
+
+    @*<link href="~/css/plugins/iCheck/custom.css" rel="stylesheet">*@
+    <link href="~/css/style.min.css" rel="stylesheet">
+    <link href="~/css/plugins/chosen/chosen.css" rel="stylesheet">
+    @*<link href="~/js/plugins/layer/skin/layer.css" rel="stylesheet">*@
+    @*<link href="~/css/plugins/datapicker/datepicker3.css" rel="stylesheet">*@
+    <link href="~/css/style.min.css" rel="stylesheet">
+    <link href="~/css/plugins/toastr/toastr.min.css" rel="stylesheet" />
+    <link href="~/css/plugins/webuploader/webuploader.css" rel="stylesheet" />
+
+    <style type="text/css">
+        .webuploader-pick {
+            position: relative;
+            display: inline-block;
+            cursor: pointer;
+            background: #00b7ee;
+            padding: 8px 14px 7px 14px;
+            color: #fff;
+            text-align: center;
+            border-radius: 3px;
+            overflow: hidden;
+        }
+
+        div.clearfix > label {
+            padding-top: 8px;
+        }
+
+        .chosen-container {
+            border-radius: 1px;
+            border: 1px solid #e5e6e7;
+        }
+
+        .col-md-1.control-label {
+            padding-right: 0px;
+            font-weight: 400;
+        }
+
+
+
+
+        table {
+            border-collapse: collapse;
+            border: none;
+            width: 900px;
+            margin-left: 0px;
+            text-align: center;
+        }
+
+        td {
+            border: solid #000000 1px;
+            height: 30px;
+        }
+    </style>
+
+    <!-- jqgrid-->
+    @*<link href="~/css/plugins/jqgrid/ui.jqgrid.css" rel="stylesheet">*@
+    <script language="javascript" src="~/js/jquery.min.js" type="text/javascript"></script>
+    <script src="~/js/bootstrap.min.js"></script>
+    @*<script src="~/js/plugins/bootstro/bootstro.js"></script>*@
+
+    <!--瀹瑰櫒-->
+    @*<script language="javascript" src="~/js/datehelper.js" type="text/javascript"></script>*@
+    @*<script language="javascript" src="~/js/plugins/query/jquery.query-object.js" type="text/javascript"></script>*@
+    @*<script language="javascript" src="~/js/plugins/iCheck/icheck.min.js" type="text/javascript"></script>*@
+    <script language="javascript" src="~/js/plugins/chosen/chosen.jquery.js" type="text/javascript"></script>
+    @*<script language="javascript" src="~/js/plugins/datapicker/bootstrap-datepicker.js" type="text/javascript"></script>*@
+    <script language="javascript" src="~/js/plugins/layer/layer.js" type="text/javascript"></script>
+    @*<script src="~/js/plugins/jqgrid/jquery.jqGrid.min.js" type="text/javascript"></script>*@
+    @*<script src="~/js/plugins/jqgrid/i18n/grid.locale-cn.js" type="text/javascript"></script>*@
+    <script src="~/js/plugins/toastr/toastr.min.js" type="text/javascript"></script>
+    <script src="~/js/plugins/webuploader/webuploader.min.js"></script>
+
+    <script language="javascript" src="~/js/common-layout.js" type="text/javascript"></script>
+    <script src="~/js/plugins/layer/laydate/laydate.js" type="text/javascript"></script>
+    @*<script src="~/js/plugins/iTexbox/itextbox.js" type="text/javascript"></script>*@
+    @*<script src="~/js/plugins/iuploader/iuploader.js"></script>*@
+    <script src="~/js/TUJS.js"></script>
+</head>
+<body class="gray-bg" style="overflow:auto">
+    <form id="formtest">
+        <div class="wrapper wrapper-content" id="ibox-content" style="padding:15px;">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="ibox float-e-margins">
+                        <div class="ibox-title">
+                            <h5>                            <i class="fa fa-list"></i>&nbsp;鍩烘湰淇℃伅</h5>
+                        </div>
+                        <div id="div_content" class="ibox-content" style="background-color:white;">
+                            <div class="row">
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+
+                                    <label class="text-right col-sm-1 col-md-1 control-label">鍓湰鏁伴噺锛�<i class="red">*</i></label>
+                                    <div class="col-sm-2 col-md-2">
+                                        <input class="form-control" label="鍓湰鏁伴噺" name="PrintNum" id="PrintNum" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.PrintNum" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" onafterpaste="this.value=this.value.replace(/[^0-9]/g,'')">
+                                    </div>
+
+
+
+
+                                    <input type="hidden" id="OrderId" name="OrderId" value="@Model.OrderId" />
+                                    <input type="hidden" id="Id" name="Id" value="@Model.Id" />
+                                </div>
+
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                    <label class="text-left col-sm-2 col-md-2 control-label">涓�銆佽川鐤戜緵搴斿晢鍩烘湰淇℃伅</label>
+                                </div>
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+
+
+
+
+                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璐ㄧ枒渚涘簲鍟�<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="@Model.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="@Model.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="@Model.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="@Model.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="@Model.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 class="text-left col-sm-2 col-md-2 control-label">浜屻�佽川鐤戦」鐩熀鏈俊鎭�</label>
+                                </div>
+
+
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璐ㄧ枒椤圭洰鍚嶇О<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="@Model.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="@Model.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="@Model.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="@Model.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="@Model.DocumentsDateName" readonly="readonly">
+
+                                    </div>
+
+
+
+                                </div>
+
+
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                    <label class="text-left col-sm-2 col-md-2 control-label">涓夈�佽川鐤戜簨椤瑰叿浣撳唴瀹�</label>
+                                </div>
+                                <div id="zhiyishixiang">
+                                    @for (int i = 0; i < challengeItemDTOs.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-4 col-md-4" grouptype="Vdata">
+                                                <select class="form-control"  name="Question" data-placeholder="閫夋嫨 搴忓垪 ...">
+                                                    <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                    @foreach (var item in question)
+                                                    {
+                                                        @if (!item.CodeSn.Equals(challengeItemDTOs[i].Question))
+                                                        {
+                                                            <option value="@item.CodeSn" hassubinfo="true">
+                                                                @item.Comments
+                                                            </option>
+                                                        }
+                                                        else
+                                                        {
+                                                            <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                                                @item.Comments
+                                                            </option>
+                                                        }
+
+                                                    }
+                                                    }
+
+                                                </select>
+
+                                            </div>
+                                            @if (i == 0)
+                                            {
+                                                <div class="col-sm-2 col-md-2" grouptype="Vdata">
+                                                    <button type="button" class="addBtn" onclick="addzhiyishixiang(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-8 col-md-8">
+                                                <textarea class="form-control bt" name="Evidential" title="浜嬪疄渚濇嵁" isempty="" maxlength="300" length="long">@challengeItemDTOs[i].Evidential</textarea>
+                                            </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-4 col-md-4" grouptype="Vdata">
+                                                <select class="form-control"   name="Law" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Lawchangge(@i);">
+                                                    <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                    @foreach (var item in law)
+                                                    {
+                                                        @if (!item.CodeSn.Equals(challengeItemDTOs[i].Law))
+                                                        {
+                                                            <option value="@item.CodeSn" hassubinfo="true">
+                                                                @item.Comments
+                                                            </option>
+                                                        }
+                                                        else
+                                                        {
+                                                            <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                                                @item.Comments
+                                                            </option>
+                                                        }
+
+                                                    }
+                                                    }
+
+                                                </select>
+
+                                            </div>
+
+                                        </div>
+
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍐呭@(i!=0?(i+""):"")</label>
+                                            <div class="col-sm-8 col-md-8">
+                                                <textarea class="form-control bt" name="Lawcoment" title="鍐呭" isempty="" maxlength="300" length="long">@challengeItemDTOs[i].Lawcoment</textarea>
+                                            </div>
+                                        </div>
+
+
+
+
+                                    }
+                                </div>
+
+
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                    <label class="text-left col-sm-2 col-md-2 control-label">鍥涖�佷笌璐ㄧ枒浜嬮」鐩稿叧鐨勮川鐤戣姹�</label>
+                                </div>
+
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璇锋眰</label>
+                                    <div class="col-sm-4 col-md-4" grouptype="Vdata">
+                                        <select id="RequestInfo" class="form-control" name="RequestInfo" data-placeholder="閫夋嫨 搴忓垪 ...">
+                                            <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                            @foreach (var item in request_info)
+                                            {
+                                                @if (!item.CodeSn.Equals(Model.RequestInfo))
+                                                {
+                                                    <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>
+                            </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="wrapper wrapper-content" style="margin-top:0px"></div>
+        <div class="ibox-content" id="top" style="z-index:100; position:fixed; height:50px; width:100%;bottom:0; text-align: right; padding-top:8px ">
+            <div class="" style="float:right;" data-bootstro-width="500px" data-bootstro-content="鍔熻兘鎸夐挳锛氣�滀繚瀛樷�濓紝鈥滃垹闄も��">
+                @*<a class="btn btn-success" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;">
+                    <i class="glyphicon glyphicon-remove"></i>&nbsp;&nbsp;<span class="bold">鍒犻櫎</span>
+                </a>*@
+
+                <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+                    <i class="glyphicon glyphicon-ok"></i>&nbsp;&nbsp;<span class="bold">鎻愪氦</span>
+                </a>
+            </div>
+        </div>
+
+
+
+    </form>
+    <script type="text/javascript">
+
+        //var DuanxinNeirong = document.getElementById("DuanxinNeirong");
+
+        //DuanxinNeirong.style.height = DuanxinNeirong.scrollHeight + 'px';
+
+        var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2 + 1000;
+        $("#div_content").height(hh);
+
+        toastr.options = {
+            "closeButton": true,
+            "debug": false,
+            "progressBar": true,
+            "positionClass": "toast-bottom-right",
+            "onclick": null,
+            "showDuration": "300",
+            "hideDuration": "600",
+            "timeOut": "4500",
+            "extendedTimeOut": "600",
+            "showEasing": "swing",
+            "hideEasing": "linear",
+            "showMethod": "fadeIn",
+            "hideMethod": "fadeOut"
+        };
+
+        laydate({ elem: "#zhiyiDocumentsDate", format: 'YYYY-MM-DD', istime: true, event: "focus" });
+
+        $("select").chosen();
+
+        var id = '@Model.Id';
+        var bUpload = false;
+        var bAdd = false; // 鏂板鎿嶄綔
+        var fileId = ""; // 涓婁紶鏂囦欢鐢熸垚鐨処d
+        var bEditFile = false; // 缂栬緫鏃讹紝鏄惁鍏宠仈浜嗛檮浠�
+        var bDeleteFile = false; // 鍒犻櫎鎿嶄綔
+        var attachment_id = 0; // 闄勪欢id
+        var imgLoad = new Object();
+
+
+
+
+        // 淇濆瓨宀椾綅淇℃伅
+        var savePosition = function () {
+
+            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;
+            }
+            if ($("#PrintNum").val() == '') {
+                toastr.warning("鍓湰鏁伴噺涓嶈兘涓虹┖");
+                return;
+            }
+
+
+            //var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
+            $.ajax({
+                type: "POST",
+                url: "/CooperOrder/SaveChallengeletter",
+                dataType: "json",
+                global: false,
+                data: $('form').serializeArray(),
+                success: function (data) {
+
+
+
+                        if (data.Result) {
+                            //  parent._afterSave(true);
+                            parent.layer.msg('鎴愬姛淇濆瓨', { icon: 6 });
+                            //window.location = "/Project/add?id=" + data.ReturnID;
+
+
+                            try {
+                                _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
+                            }
+                            catch (err) {
+                                parent._CloseTab1("/CooperOrder/EditZhiyihan");
+                            }
+
+                        }
+                        else {
+                            // toastr.error("澶辫触");
+                            parent.layer.msg(data.Message, { icon: 5 });
+                        }
+
+                },
+                error: function () {
+
+
+                    parent.layer.msg('澶辫触', { icon: 5 });
+                }
+            });
+        }
+
+
+
+
+        function Lawchangge(i) {
+            var sss = document.getElementsByName("Law")[i].value;
+            $.ajax({
+                type: "GET",
+                url: "/CooperOrder/getLaw?id=" + sss,
+                dataType: "json",
+                global: false,
+                data: "",
+                success: function (data) {
+
+                    if (data.Result) {
+                        document.getElementsByName("Lawcoment")[i].value = data.Message;
+
+                    } else {
+                        parent.layer.msg('鏌ヨ澶辫触', { icon: 5 });
+                    }
+                },
+                error: function () {
+
+
+                    parent.layer.msg('鏌ヨ澶辫触', { icon: 5 });
+                }
+            });
+        }
+
+        function _pageAutoClose() {
+            parent.window._reloadPageData();
+            var index = parent.layer.getFrameIndex(window.name);
+            parent.layer.isRefresh = true;
+            parent.layer.closeAll('loading');
+            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 addzhiyishixiang(obj) {
+            var sss = document.getElementsByName("Question").length;
+
+            $('#zhiyishixiang').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-4 col-md-4" grouptype="Vdata">
+                                                <select class="form-control"  name="Question" data-placeholder="閫夋嫨 搴忓垪 ...">
+                                                    <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                    @foreach (var item in question)
+                                                    {
+                                                        
+                                                            <option value="@item.CodeSn" hassubinfo="true" >
+                                                                @item.Comments
+                                                            </option>
+                                                         
+                                                    }
+                                                    }
+
+                                                </select>
+
+                                            </div>
+
+                                        </div>
+
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">浜嬪疄渚濇嵁`+ sss + `</label>
+                                            <div class="col-sm-8 col-md-8">
+                                                <textarea class="form-control bt" name="Evidential" title="浜嬪疄渚濇嵁" isempty="" maxlength="4000" length="long"></textarea>
+                                            </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-4 col-md-4" grouptype="Vdata">
+                                                <select class="form-control"   name="Law" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Lawchangge(`+ sss + `);">
+                                                    <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                                                    @foreach (var item in law)
+                                                    {
+                                                        
+                                                            <option value="@item.CodeSn" hassubinfo="true" >
+                                                                @item.Comments
+                                                            </option>
+                                                        
+                                                    }
+                                                    }
+
+                                                </select>
+
+                                            </div>
+
+                                        </div>
+
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍐呭`+ sss + `</label>
+                                            <div class="col-sm-8 col-md-8">
+                                                <textarea class="form-control bt" name="Lawcoment" title="鍐呭" isempty="" maxlength="4000" length="long"></textarea>
+                                            </div>
+                                        </div>
+
+
+`);
+            $("select").chosen();
+        }
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/IndexWenshu.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/IndexWenshu.cshtml
index 8de6cd3..0801fa1 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/IndexWenshu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/IndexWenshu.cshtml
@@ -4,7 +4,7 @@
 }
 @section headerStyle{
     <script type="text/javascript">
-       
+        var status = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.status))';
         gridConfig = { multiselect: true, selectcol: "Id" };
         loseherght = 40;
         dataCol = [
@@ -21,20 +21,21 @@
             { label: '閲囪喘浜�', name: 'PurchaserName', labtype: 'txt', hidden: false, width: 100 },
             { label: '閲囪喘浠g悊鏈烘瀯', name: 'Agency', labtype: 'txt', hidden: false, width: 100 },
             { label: '瀹㈡埛鍗曚綅', name: 'KhdwName', labtype: 'txt', hidden: false, width: 100 },
-           
+            { label: '鐘舵��', name: 'StatusName', labtype: 'txt', hidden: false, width: 100 }, 
+
             {
                 label: '鐢熸垚鏂囦功', name: 'Status', labtype: 'txt', hidden: false, width: 100
                 ,
                 formatter: function (cellvalue, options, rowObject) {
-                  
+
                     if (rowObject.OrderType1 == "浠f嫙鎶曡瘔涔�") {
-                        return "<a onclick=\"OpenWindow('鐢熸垚鎶曡瘔涔�','98%','100%', '/OrderBanciOrder/Edit?id=" + rowObject.Id + "')\"  >鐢熸垚鎶曡瘔涔�</a>";
+                        return "<a onclick=\"OpenWindow('鐢熸垚鎶曡瘔涔�','98%','100%', '/CooperOrder/EditZhiyihan?id=" + rowObject.Id + "')\"  >鐢熸垚鎶曡瘔涔�</a>";
                     }
                     else if (rowObject.OrderType1 == "浠f嫙璐ㄧ枒鍑�") {
-                        return "<a onclick=\"OpenWindow('鐢熸垚璐ㄧ枒鍑�','98%','100%', '/OrderBanciOrder/Edit?id=" + rowObject.Id + "')\"  >鐢熸垚璐ㄧ枒鍑�</a>";
+                        return "<a onclick=\"OpenWindow('鐢熸垚璐ㄧ枒鍑�','98%','100%', '/CooperOrder/EditZhiyihan?id=" + rowObject.Id + "')\"  >鐢熸垚璐ㄧ枒鍑�</a>";
                     }
 
-                  
+
                 }
             },
 
@@ -44,13 +45,13 @@
         searchCol = [
             { label: '椤圭洰鍚嶇О', name: 'XmName', labtype: 'txt', hidden: false },
             { label: '椤圭洰缂栧彿', name: 'XmCode', labtype: 'txt', hidden: false },
-            
+
             { label: '閲囪喘浜�', name: 'PurchaserName', labtype: 'txt', hidden: false },
             { label: '閲囪喘浠g悊鏈烘瀯', name: 'Agency', labtype: 'txt', hidden: false },
             { label: '瀹㈡埛鍚嶇О', name: 'KhdwName', labtype: 'txt', hidden: false },
             //{ label: '鏂囦功绫诲埆', name: 'Wenshuleixing', labtype: 'txt', hidden: false },
             //{ label: '鏃堕棿', name: 'XdTime', labtype: 'datearea', hidden: false },
-
+            { label: '鐢熸垚鐘舵��', name: 'status', labtype: 'combox', hidden: false, data: JSON.parse(status) },
 
 
 
@@ -61,7 +62,7 @@
         //    OpenWindow("鏂板鐝", "98%", "90%", "/CooperOrder/Edit/");
         //}
 
-         
+
 
 
         var _afterSave = function (result) {
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml
index ec1d653..7d3cd03 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml
@@ -5,6 +5,9 @@
 @section headerStyle{
     <script type="text/javascript">
         var Wenshuleixing = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Wenshuleixing))';
+
+        var status = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.status))';
+        
         gridConfig = { multiselect: true, selectcol: "Id" };
         loseherght = 40;
         dataCol = [
@@ -21,17 +24,17 @@
             { label: '閲囪喘浜�', name: 'PurchaserName', labtype: 'txt', hidden: false, width: 100 },
             { label: '閲囪喘浠g悊鏈烘瀯', name: 'Agency', labtype: 'txt', hidden: false, width: 100 },
             { label: '瀹㈡埛鍗曚綅', name: 'KhdwName', labtype: 'txt', hidden: false, width: 100 },
-
+            { label: '鐘舵��', name: 'StatusName', labtype: 'txt', hidden: false, width: 100 }, 
             {
                 label: '鏌ョ湅鏂囦功', name: 'Status', labtype: 'txt', hidden: false, width: 100
                 ,
                 formatter: function (cellvalue, options, rowObject) {
-                    
+
                     if (rowObject.OrderType1 == "浠f嫙鎶曡瘔涔�") {
-                        return "<a onclick=\"OpenWindow('鏌ョ湅鎶曡瘔涔�','98%','100%', '/OrderBanciOrder/Edit?id=" + rowObject.Id + "')\"  >鏌ョ湅鎶曡瘔涔�</a>";
+                        return "<a onclick=\"OpenWindow('鏌ョ湅鎶曡瘔涔�','98%','100%', '/CooperOrder/EditZhiyihan?id=" + rowObject.Id + "')\"  >鏌ョ湅鎶曡瘔涔�</a>";
                     }
                     else if (rowObject.OrderType1 == "浠f嫙璐ㄧ枒鍑�") {
-                        return "<a onclick=\"OpenWindow('鏌ョ湅璐ㄧ枒鍑�','98%','100%', '/OrderBanciOrder/Edit?id=" + rowObject.Id + "')\"  >鏌ョ湅璐ㄧ枒鍑�</a>";
+                        return "<a onclick=\"OpenWindow('鏌ョ湅璐ㄧ枒鍑�','98%','100%', '/CooperOrder/EditZhiyihan?id=" + rowObject.Id + "')\"  >鏌ョ湅璐ㄧ枒鍑�</a>";
                     }
                 }
             },
@@ -48,8 +51,8 @@
             { label: '閲囪喘浜�', name: 'PurchaserName', labtype: 'txt', hidden: false },
             { label: '閲囪喘浠g悊鏈烘瀯', name: 'Agency', labtype: 'txt', hidden: false },
             { label: '瀹㈡埛鍚嶇О', name: 'KhdwName', labtype: 'txt', hidden: false },
-           
-
+            { label: '鐢熸垚鐘舵��', name: 'status', labtype: 'combox', hidden: false, data: JSON.parse(status) },
+            
 
 
 

--
Gitblit v1.9.1