From 65e60c2c3c2eb2c175cf7d2a08295d08c585f626 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 21 十二月 2021 14:45:20 +0800
Subject: [PATCH] 投诉书，质疑书
---
zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml | 35 +
zhengcaioa/DTO/TChallengeItemDTO.cs | 2
zhengcaioa/DTO/CooperOrderDTO.cs | 2
zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml | 17
zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml | 274 ++++++++++------
zhengcaioa/DTO/TComplaintItemDTO.cs | 2
zhengcaioa/IServices/ICooperOrderService.cs | 1
zhengcaioa/Services/CooperOrderService.cs | 20 +
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 279 +++++++++++++++-
zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml | 295 +++++++++--------
10 files changed, 642 insertions(+), 285 deletions(-)
diff --git a/zhengcaioa/DTO/CooperOrderDTO.cs b/zhengcaioa/DTO/CooperOrderDTO.cs
index 03fbaab..c140c20 100644
--- a/zhengcaioa/DTO/CooperOrderDTO.cs
+++ b/zhengcaioa/DTO/CooperOrderDTO.cs
@@ -87,7 +87,7 @@
public string zhiyiPurchaserName { get; set; }
public DateTime? zhiyiDocumentsDate { get; set; }
-
+ public string TsrId { get; set; }
public string TsrName { get; set; }
public string TsrAddress { get; set; }
public string TsrPostcode { get; set; }
diff --git a/zhengcaioa/DTO/TChallengeItemDTO.cs b/zhengcaioa/DTO/TChallengeItemDTO.cs
index fb4fb1c..da2350c 100644
--- a/zhengcaioa/DTO/TChallengeItemDTO.cs
+++ b/zhengcaioa/DTO/TChallengeItemDTO.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
+using zhengcaioa.Models;
namespace DTO
{
@@ -15,5 +16,6 @@
public string LawName { get; set; }
public int? Sort { get; set; }
public string Lawcoment { get; set; }
+ public List<SysCodeDtl> sysCodeDtls { get; set; }
}
}
diff --git a/zhengcaioa/DTO/TComplaintItemDTO.cs b/zhengcaioa/DTO/TComplaintItemDTO.cs
index 3ae1cfe..22cd252 100644
--- a/zhengcaioa/DTO/TComplaintItemDTO.cs
+++ b/zhengcaioa/DTO/TComplaintItemDTO.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
+using zhengcaioa.Models;
namespace DTO
{
@@ -15,5 +16,6 @@
public string LawName { get; set; }
public int? Sort { get; set; }
public string Lawcoment { get; set; }
+ public List<SysCodeDtl> sysCodeDtls { get; set; }
}
}
diff --git a/zhengcaioa/IServices/ICooperOrderService.cs b/zhengcaioa/IServices/ICooperOrderService.cs
index 15be1fe..9c4c0fc 100644
--- a/zhengcaioa/IServices/ICooperOrderService.cs
+++ b/zhengcaioa/IServices/ICooperOrderService.cs
@@ -43,6 +43,7 @@
ResultEntity saveChallengeletter(TChallengeletterDTO dto);
List<TChallengeletterDTO> GetListChallengeletter(string OrderId);
+ List<TChallengeletterDTO> GetListChallengeletterChosen();
//璐ㄧ枒鍑戒簨椤瑰唴瀹瑰瓙琛�
ResultEntity saveChallengeItem(TChallengeItemDTO dto);
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index b3c3f01..d8facb5 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -962,6 +962,26 @@
}
+ public List<TChallengeletterDTO> GetListChallengeletterChosen()
+ {
+ var query = (from a in _context.TChallengeletters
+ join b in _context.CooperOrders.Where(x => x.RecStatus == "A")
+ on a.OrderId equals b.Id
+
+ select new TChallengeletterDTO
+ {
+ Id = b.Id,
+ OrderId = b.OrderNo
+ }
+ ).ToList();
+
+
+
+
+ return query;
+ }
+
+
public ResultEntity saveChallengeletter(TChallengeletterDTO dto)
{
ResultEntity resultEntity = new ResultEntity();
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index 2fad9f5..cc6a92d 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -1539,6 +1539,13 @@
actionEntity.PageIco = "fa fa-search";
actionEntity.ActionName = "鏌ヨ";
actionlist.Add(actionEntity);
+ ActionEntity actionEntity1 = new ActionEntity();
+ actionEntity1.OpenType = 0;
+ actionEntity1.ActionUrl = "";
+ actionEntity1.ActionFun = "Add";
+ actionEntity1.PageIco = "fa fa-plus";
+ actionEntity1.ActionName = "鏂板";
+ actionlist.Add(actionEntity1);
ViewData["ActionInfo"] = actionlist;
ViewBag.status = _liaotianService.GetSYScode("t_challengeletter", "status").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -1593,6 +1600,14 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
+ var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
+ var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
+ foreach (var sysCodeDtl in sysCodeDtls1)
+ {
+ var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
+ if (sysCodeDtl1 != null)
+ sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+ }
//璐ㄧ枒鍑�
List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengeletter(id);
@@ -1606,9 +1621,20 @@
}
List<TChallengeItemDTO> challengeItemDTOs = _cooperOrderService.GetListChallengeItem(challengeletterDTO.Id);
if (challengeItemDTOs.Count > 0)
+ {
challengeletterDTO.challengeItemDTOs = challengeItemDTOs;
+ foreach (var challengeItemDTO in challengeletterDTO.challengeItemDTOs)
+ {
+ var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == challengeItemDTO.Question).ToList();
+ challengeItemDTO.sysCodeDtls = sysCodeDtls2;
+ }
+ }
else
+ {
challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+ challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
+ }
+
List<TComplaintShouquandaibiaoDTO> complaintShouquandaibiaoDTOs = _cooperOrderService.GetListComplaintShouquandaibiao(challengeletterDTO.Id);
if (complaintShouquandaibiaoDTOs.Count > 0)
@@ -1619,6 +1645,7 @@
else
{
challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+ challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
}
//ViewBag.challengeletterDTO = challengeletterDTO;
@@ -1628,15 +1655,7 @@
ViewBag.request_info = _liaotianService.GetSYScode("t_challengeletter", "request_info").OrderBy(x=>x.CodeSn).ToList();//璐ㄧ枒璇锋眰
ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question").OrderBy(x => x.CodeSn).ToList(); // 璐ㄧ枒浜嬮」
- var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
- var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
- 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;//娉曞緥渚濇嵁
@@ -1680,7 +1699,7 @@
{
var sysCodeDtl1 = sysCodeDtls1.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
if (sysCodeDtl1 != null)
- sysCodeDtl.Comments = sysCodeDtl1.Comments;
+ sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
}
//if (sysCodeDtl != null)
@@ -1691,6 +1710,118 @@
resultEntity.DataList = sysCodeDtls;
return new JsonResult(resultEntity);
+ }
+
+
+ public IActionResult getZhiyihan(string id = null)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
+ var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
+ foreach (var sysCodeDtl in sysCodeDtls1)
+ {
+ var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
+ if (sysCodeDtl1 != null)
+ sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+ }
+
+ //璐ㄧ枒鍑�
+ 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;
+ foreach (var challengeItemDTO in challengeletterDTO.challengeItemDTOs)
+ {
+ var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == challengeItemDTO.Question).ToList();
+ challengeItemDTO.sysCodeDtls = sysCodeDtls2;
+ }
+ }
+ else
+ {
+ challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+ challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
+ }
+
+ 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.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
+ challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
+ }
+ var question = _liaotianService.GetSYScode("t_challenge_items", "question").OrderBy(x => x.CodeSn).ToList(); // 璐ㄧ枒浜嬮」
+ StringBuilder data = new StringBuilder();
+
+ for (int i = 0; i < challengeletterDTO.challengeItemDTOs.Count; i++)
+ {
+ data.Append("<div class=\"clearfix layer-area\" style=\"padding-bottom:15px; \">");
+ data.Append("<label grouptype=\"Vdata\" class=\"text-right col-sm-1 col-md-1 control-label\">鎶曡瘔浜嬮」"+(i != 0 ? (i + "") : "") + "</label>");
+ data.Append("<div class=\"col-sm-4 col-md-4\" grouptype =\"Vdata\" > ");
+ data.Append(" <select class=\"form - control\" name=\"Question\" data-placeholder=\"閫夋嫨 搴忓垪...\" onchange=\"Questionchangge("+ i + "); \">");
+ data.Append("<option value=\"\" hassubinfo=\"true\">璇烽�夋嫨</option>");
+ foreach (var item in question)
+ {
+ if (!item.CodeSn.Equals(challengeletterDTO.challengeItemDTOs[i].Question))
+ {
+ data.Append("<option value=\""+ item.CodeSn + "\" hassubinfo=\"true\">"+ item.Comments + "</option>");
+ }
+ else
+ {
+ data.Append("<option value=\"" + item.CodeSn + "\" hassubinfo=\"true\" selected=\"selected\" >" + item.Comments + "</option>");
+ }
+ }
+ data.Append("</select>");
+ data.Append(" </div>");
+ if (i == 0)
+ {
+ data.Append("<div class=\"col-sm-2 col-md-2\" grouptype=\"Vdata\"> <button type=\"button\" class=\"addBtn\" onclick =\"addzhiyishixiang(this)\" data-type=\"1\" > 鎶曡瘔浜嬮」</button> </div>");
+ }
+ data.Append(" </div>");
+ data.Append("<div class=\"clearfix layer-area\" style =\"padding-bottom:15px; \" > ");
+ data.Append("<label grouptype=\"Vdata\" class=\"text-right col-sm-1 col-md-1 control-label\" > 浜嬪疄渚濇嵁" + (i != 0 ? (i + "") : "") + "</label>");
+ data.Append(" <div class=\"col-sm-8 col-md-8\" > ");
+ data.Append("<textarea class=\"form-control bt\" name =\"Evidential\" title =\"浜嬪疄渚濇嵁\" isempty =\"\" maxlength =\"300\" length =\"long\" > "+ challengeletterDTO.challengeItemDTOs[i].Evidential + "</textarea>");
+ data.Append("</div>");
+ data.Append("</div>");
+ data.Append(" <div id=\"falvyiju" + i + "\">");
+ for (int j = 0; j < challengeletterDTO.challengeItemDTOs[i].sysCodeDtls.Count; j++)
+ {
+ data.Append("<div class=\"clearfix layer-area\" style=\"padding-bottom:15px; \">");
+ data.Append("<label grouptype=\"Vdata\" class=\"text-right col-sm-1 col-md-1 control-label\" > 娉曞緥渚濇嵁" + (i != 0 ? (i + "") : "") + "</label>");
+ data.Append("<div class=\"col-sm-8 col-md-8\" > " + challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].CodeSn + "</div>");
+ data.Append("</div>");
+
+ data.Append("<div class=\"clearfix layer-area\" style=\"padding-bottom:15px; \">");
+ data.Append("<label grouptype=\"Vdata\" class=\"text-right col-sm-1 col-md-1 control-label\" > 鍐呭" + (i != 0 ? (i + "") : "") + "</label>");
+ data.Append("<div class=\"col-sm-8 col-md-8\" > " + challengeletterDTO.challengeItemDTOs[i].sysCodeDtls[j].Contents + "</div>");
+ data.Append("</div>");
+ }
+
+
+ data.Append("</div>");
+ }
+
+ challengeletterDTO.GysId = data.ToString();
+
+ return new JsonResult(challengeletterDTO);
+
+
}
/// <summary>
@@ -1806,8 +1937,8 @@
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.Law = data.Law[i];
+ //challengeItemDTO.Lawcoment = data.Lawcoment[i];
challengeItemDTO.Sort = i;
resultEntity = _cooperOrderService.saveChallengeItem(challengeItemDTO);
}
@@ -1826,7 +1957,14 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
+ var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
+ foreach (var sysCodeDtl in sysCodeDtls1)
+ {
+ var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
+ if (sysCodeDtl1 != null)
+ sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+ }
//璐ㄧ枒鍑�
List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengeletter(id);
TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
@@ -1839,9 +1977,21 @@
}
List<TChallengeItemDTO> challengeItemDTOs = _cooperOrderService.GetListChallengeItem(challengeletterDTO.Id);
if (challengeItemDTOs.Count > 0)
+ {
challengeletterDTO.challengeItemDTOs = challengeItemDTOs;
+ foreach (var challengeItemDTO in challengeletterDTO.challengeItemDTOs)
+ {
+ var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == challengeItemDTO.Question).ToList();
+ challengeItemDTO.sysCodeDtls = sysCodeDtls2;
+ }
+ }
+
else
+ {
challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+ challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
+ }
+
List<TComplaintShouquandaibiaoDTO> complaintShouquandaibiaoDTOs = _cooperOrderService.GetListComplaintShouquandaibiao(challengeletterDTO.Id);
if (complaintShouquandaibiaoDTOs.Count > 0)
@@ -1852,6 +2002,7 @@
else
{
challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+ challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
}
//ViewBag.challengeletterDTO = challengeletterDTO;
@@ -1885,7 +2036,15 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
+ var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
+ var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
+ foreach (var sysCodeDtl in sysCodeDtls1)
+ {
+ var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
+ if (sysCodeDtl1 != null)
+ sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+ }
//鎶曡瘔涔�
List<TComplaintletterDTO> complaintletterDTOs = _cooperOrderService.GetListComplaintletter(id);
TComplaintletterDTO complaintletterDTO = new TComplaintletterDTO();
@@ -1915,9 +2074,20 @@
List<TComplaintItemDTO> complaintItemDTOs = _cooperOrderService.GetListComplaintItem(complaintletterDTO.Id);
if (complaintItemDTOs.Count > 0)
+ {
complaintletterDTO.complaintItemDTOs = complaintItemDTOs;
+ foreach (var complaintItemDTO in complaintletterDTO.complaintItemDTOs)
+ {
+ var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == complaintItemDTO.Question).ToList();
+ complaintItemDTO.sysCodeDtls = sysCodeDtls2;
+ }
+ }
else
+ {
complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
+ complaintletterDTO.complaintItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
+ }
+
List<TComplaintRespondentDTO> complaintRespondentDTOs = _cooperOrderService.GetListComplaintRespondent(complaintletterDTO.Id);
if (complaintRespondentDTOs.Count > 0)
@@ -1941,6 +2111,7 @@
else
{
complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
+ complaintletterDTO.complaintItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() { new TComplaintGongyingshangDTO() };
@@ -1952,21 +2123,13 @@
ViewBag.request_info = _liaotianService.GetSYScode("t_challengeletter", "request_info").OrderBy(x => x.CodeSn).ToList();//璐ㄧ枒璇锋眰
ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question").OrderBy(x => x.CodeSn).ToList(); // 璐ㄧ枒浜嬮」
- var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
- var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
-
- 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;//娉曞緥渚濇嵁
ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou");
-
+ ViewBag.ChallengeletterChosen = _cooperOrderService.GetListChallengeletterChosen();
ViewData.Model = complaintletterDTO;
return View();
@@ -2036,6 +2199,7 @@
complaintletterDTO.Status = 2;
complaintletterDTO.RequestInfo = data.RequestInfo;
complaintletterDTO.PrintNum = data.PrintNum;
+ complaintletterDTO.TsrId = data.TsrId;
resultEntity = _cooperOrderService.saveComplaintletter(complaintletterDTO);
}
else
@@ -2074,6 +2238,7 @@
complaintletterDTO.Status = 2;
complaintletterDTO.RequestInfo = data.RequestInfo;
complaintletterDTO.PrintNum = data.PrintNum;
+ complaintletterDTO.TsrId = data.TsrId;
resultEntity = _cooperOrderService.saveComplaintletter(complaintletterDTO);
}
@@ -2169,8 +2334,8 @@
complaintItemDTO.ComplaintId = complaintletterDTO.Id;
complaintItemDTO.Question = data.Question[i];
complaintItemDTO.Evidential = data.Evidential[i];
- complaintItemDTO.Law = data.Law[i];
- complaintItemDTO.Lawcoment = data.Lawcoment[i];
+ //complaintItemDTO.Law = data.Law[i];
+ //complaintItemDTO.Lawcoment = data.Lawcoment[i];
complaintItemDTO.Sort = i;
resultEntity = _cooperOrderService.saveComplaintItem(complaintItemDTO);
}
@@ -2190,7 +2355,14 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
+ var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
+ foreach (var sysCodeDtl in sysCodeDtls1)
+ {
+ var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
+ if (sysCodeDtl1 != null)
+ sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+ }
//鎶曡瘔涔�
List<TComplaintletterDTO> complaintletterDTOs = _cooperOrderService.GetListComplaintletter(id);
TComplaintletterDTO complaintletterDTO = new TComplaintletterDTO();
@@ -2210,19 +2382,31 @@
if (complaintletterDTO.ChallengeDate.HasValue)
{
- complaintletterDTO.ChallengeDateName = complaintletterDTO.ChallengeDate.Value.ToString("yyyy-MM-dd");
+ complaintletterDTO.ChallengeDateName = complaintletterDTO.ChallengeDate.Value.ToString("yyyy骞碝M鏈坉d鏃�");
}
if (complaintletterDTO.RespondDate.HasValue)
{
- complaintletterDTO.RespondDateName = complaintletterDTO.RespondDate.Value.ToString("yyyy-MM-dd");
+ complaintletterDTO.RespondDateName = complaintletterDTO.RespondDate.Value.ToString("yyyy骞碝M鏈坉d鏃�");
}
List<TComplaintItemDTO> complaintItemDTOs = _cooperOrderService.GetListComplaintItem(complaintletterDTO.Id);
if (complaintItemDTOs.Count > 0)
+ {
complaintletterDTO.complaintItemDTOs = complaintItemDTOs;
+ foreach (var complaintItemDTO in complaintletterDTO.complaintItemDTOs)
+ {
+ var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == complaintItemDTO.Question).ToList();
+ complaintItemDTO.sysCodeDtls = sysCodeDtls2;
+ }
+ }
+
else
+ {
complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
+ complaintletterDTO.complaintItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
+ }
+
List<TComplaintRespondentDTO> complaintRespondentDTOs = _cooperOrderService.GetListComplaintRespondent(complaintletterDTO.Id);
if (complaintRespondentDTOs.Count > 0)
@@ -2246,6 +2430,7 @@
else
{
complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
+ complaintletterDTO.complaintItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
complaintletterDTO.complaintGongyingshangDTOs = new List<TComplaintGongyingshangDTO>() { new TComplaintGongyingshangDTO() };
@@ -2253,10 +2438,46 @@
}
+ if (string.IsNullOrEmpty(complaintletterDTO.ChallengeDateName))
+ {
+ complaintletterDTO.ChallengeDateName = "銆�銆�骞淬��鏈堛��鏃�";
+ }
+ if (string.IsNullOrEmpty(complaintletterDTO.Questioned))
+ {
+ complaintletterDTO.Questioned = "銆�銆�銆�銆�銆�銆�";
+ }
+ if (string.IsNullOrEmpty(complaintletterDTO.Respondent))
+ {
+ complaintletterDTO.Respondent = "銆�銆�銆�銆�銆�銆�";
+ }
+ if (string.IsNullOrEmpty(complaintletterDTO.RespondDateName))
+ {
+ complaintletterDTO.RespondDateName = "銆�銆�骞淬��鏈堛��鏃�";
+ }
+ //璐ㄧ枒鍑�
+ List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengeletter(complaintletterDTO.TsrId);
+ TChallengeletterDTO challengeletterDTO = new TChallengeletterDTO();
+ if (challengeletterDTOs != null && challengeletterDTOs.Count > 0)
+ {
+ challengeletterDTO = challengeletterDTOs[0];
+ List<TChallengeItemDTO> challengeItemDTOs = _cooperOrderService.GetListChallengeItem(challengeletterDTO.Id);
+ complaintletterDTO.SqdbId = "";
+ if (challengeItemDTOs.Count > 0)
+ {
+
+ foreach (var challengeItemDTO in challengeItemDTOs)
+ {
+
+ complaintletterDTO.SqdbId += challengeItemDTO.QuestionName+";";
+ }
+ }
+
-
+
+ }
+
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
index feeab8f..9ea6770 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
@@ -20,7 +20,7 @@
List<TComplaintGongyingshangDTO> complaintGongyingshangDTOs = Model.complaintGongyingshangDTOs;
-
+ List<TChallengeletterDTO> ChallengeletterChosen = ViewData["ChallengeletterChosen"] as List<TChallengeletterDTO>;
}
@{
Layout = null;
@@ -522,10 +522,35 @@
<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="tousuQuestioned" id="tousuQuestioned" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="@Model.Questioned" >
+ <input class="form-control" label="琚川鐤戜富浣�" name="tousuQuestioned" id="tousuQuestioned" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="@Model.Questioned">
</div>
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璐ㄧ枒鍑�</label>
+ <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <select id="TsrId" class="form-control" name="TsrId" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="TsrIdchangge();" >
+ <option value="" hassubinfo="true">璇烽�夋嫨</option>
+ @foreach (var item in ChallengeletterChosen)
+ {
+ @if (!item.Id.Equals(Model.TsrId))
+ {
+ <option value="@item.Id" hassubinfo="true">
+ @item.OrderId
+ </option>
+ }
+ else
+ {
+ <option value="@item.Id" hassubinfo="true" selected="selected">
+ @item.OrderId
+ </option>
+ }
+ }
+
+
+ </select>
+ </div>
+
+
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -553,59 +578,14 @@
<div id="zhiyishixiang">
@for (int i = 0; i < complaintItemDTOs.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="閫夋嫨 搴忓垪 ..." onchange="Questionchangge(@i);">
- <option value="" hassubinfo="true">璇烽�夋嫨</option>
- @foreach (var item in question)
- {
- @if (!item.CodeSn.Equals(complaintItemDTOs[i].Question))
- {
- <option value="@item.CodeSn" hassubinfo="true">
- @item.Comments
- </option>
- }
- else
- {
- <option value="@item.CodeSn" hassubinfo="true" selected="selected">
- @item.Comments
- </option>
- }
-
- }
- }
-
- </select>
-
- </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 class="col-sm-2 col-md-2" grouptype="Vdata">
- <button type="button" class="addBtn" onclick="addquestion(this)" data-type="1">鏂板鎶曡瘔浜嬮」</button>
- </div>
- }
-
- </div>
-
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">浜嬪疄渚濇嵁@(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">@complaintItemDTOs[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>
+ <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 Law" id="Law@(i)" name="Law" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Lawchangge(@i);">
+ <select class="form-control" name="Question" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Questionchangge(@i);">
<option value="" hassubinfo="true">璇烽�夋嫨</option>
- @foreach (var item in law)
+ @foreach (var item in question)
{
- @if (!item.CodeSn.Equals(complaintItemDTOs[i].Law))
+ @if (!item.CodeSn.Equals(complaintItemDTOs[i].Question))
{
<option value="@item.CodeSn" hassubinfo="true">
@item.Comments
@@ -627,19 +607,44 @@
@if (i == 0)
{
<div class="col-sm-2 col-md-2" grouptype="Vdata">
- <button type="button" class="addBtn" onclick="addLaw(this)" data-type="1">鏂板娉曞緥渚濇嵁</button>
+ <button type="button" class="addBtn" onclick="addzhiyishixiang(this)" data-type="1">鎶曡瘔浜嬮」</button>
</div>
+ @*<div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <button type="button" class="addBtn" onclick="addquestion(this)" data-type="1">鏂板鎶曡瘔浜嬮」</button>
+ </div>*@
}
-
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍐呭@(i!=0?(i+""):"")</label>
+ <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">@complaintItemDTOs[i].Lawcoment</textarea>
+ <textarea class="form-control bt" name="Evidential" title="浜嬪疄渚濇嵁" isempty="" maxlength="300" length="long">@complaintItemDTOs[i].Evidential</textarea>
</div>
</div>
+
+ <div id="falvyiju@(i)">
+ @for (int j = 0; j < complaintItemDTOs[i].sysCodeDtls.Count; j++)
+ {
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j!=0?(j+""):"")</label>
+ <div class="col-sm-8 col-md-8">
+ @complaintItemDTOs[i].sysCodeDtls[j].CodeSn
+ </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">鍐呭@(j != 0?(j + ""):"")</label>
+ <div class="col-sm-8 col-md-8">
+ @complaintItemDTOs[i].sysCodeDtls[j].Contents
+ </div>
+ </div>
+ }
+ </div>
+
+
@@ -678,9 +683,9 @@
</select>
</div>
- <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ @*<div class="col-sm-2 col-md-2" grouptype="Vdata">
<button type="button" class="addBtn" onclick="addrequestinfo(this)" data-type="1">鏂板鎶曡瘔璇锋眰</button>
- </div>
+ </div>*@
</div>
@@ -757,11 +762,11 @@
var attachment_id = 0; // 闄勪欢id
var imgLoad = new Object();
- var aaaaaa = document.getElementsByName("Question");
- for (var aa = 0; aa < aaaaaa.length;aa++) {
- Questionchangge(aa);
- }
-
+ //var aaaaaa = document.getElementsByName("Question");
+ //for (var aa = 0; aa < aaaaaa.length;aa++) {
+ // Questionchangge(aa);
+ //}
+
var printPosition = function () {
OpenWindow("鎵撳嵃鎶曡瘔涔�", "100%", "100%", "/CooperOrder/Printtousushu?id=@Model.OrderId");
@@ -909,7 +914,41 @@
}
});
}
+
+ function TsrIdchangge() {
+ var sss = $('#TsrId').val();
+ $.ajax({
+ type: "GET",
+ url: "/CooperOrder/getZhiyihan?id=" + sss ,
+ dataType: "json",
+ global: false,
+ data: "",
+ success: function (data) {
+ console.info(data.GysId);
+ $('#zhiyishixiang').html(data.GysId);
+ $("select").chosen();
+
+
+
+
+
+
+
+
+ },
+ error: function () {
+
+
+ parent.layer.msg('鏌ヨ澶辫触', { icon: 5 });
+ }
+ });
+ }
+
+
+
function Questionchangge(i) {
+
+
var sss = document.getElementsByName("Question")[i].value;
$.ajax({
type: "GET",
@@ -918,33 +957,79 @@
global: false,
data: "",
success: function (data) {
-
- var Law = $("#Law" + data.Message);
- var Lawval = Law.val();
- Law.find('option').remove();
- var aaa = '<option value="" hassubinfo="true"> </option>';
- Law.append(aaa);
+ var falvyiju = $("#falvyiju" + data.Message);
+
+ var falvyijuhtml = "";
+ falvyijuhtml += ` <div id="falvyiju` + data.Message + `">`;
+
if (data.DataList.length > 0) {
- var sss = false;;
for (var i = 0; i < data.DataList.length; i++) {
-
- if (Lawval == data.DataList[i].CodeSn) {
- var o = '<option value="' + data.DataList[i].CodeSn + '" hassubinfo="true" selected="selected">' + data.DataList[i].Comments + '</option>';
- Law.append(o);
- sss = true;
+ if (i == 0) {
+ falvyijuhtml += `
+
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
+ <div class="col-sm-8 col-md-8" >
+ ` + data.DataList[i].CodeSn + `
+
+ </div>
+
+ </div>
+
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍐呭</label>
+ <div class="col-sm-8 col-md-8" >
+ ` + data.DataList[i].Contents + `
+
+ </div>
+ </div> `;
} else {
- var o = '<option value="' + data.DataList[i].CodeSn + '" hassubinfo="true">' + data.DataList[i].Comments + '</option>';
- Law.append(o);
+ falvyijuhtml += `
+
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁 ` + i + `</label>
+ <div class="col-sm-8 col-md-8" >
+ ` + data.DataList[i].CodeSn + `
+
+ </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 + `</label>
+ <div class="col-sm-8 col-md-8" >
+ ` + data.DataList[i].Contents + `
+
+ </div>
+ </div> `;
}
-
+
}
- if (!sss) {
- Law.val("");
- }
+
+
}
- Law.trigger('chosen:updated');//鏇存柊閫夐」
- Lawchangge(parseInt(data.Message));
+ else {
+ falvyijuhtml += `
+
+ <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>
+
+ <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> `;
+ }
+
+ falvyijuhtml += ` </div> `;
+
+ falvyiju.html(falvyijuhtml);
+
+
+
},
error: function () {
@@ -1133,33 +1218,18 @@
</div>
</div>
+ <div id="falvyiju`+ sss + `">
<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 Law" id="Law`+ sss + `" name="Law" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Lawchangge(`+ sss + `);">
- <option value="" hassubinfo="true">璇烽�夋嫨</option>
- @foreach (var item in law)
- {
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
- <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>
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍐呭</label>
+
</div>
+</div>
`);
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
index f147898..83fa20a 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
@@ -274,59 +274,14 @@
<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="閫夋嫨 搴忓垪 ..." onchange="Questionchangge(@i);">
- <option value="" hassubinfo="true">璇烽�夋嫨</option>
- @foreach (var item in question)
- {
- @if (!item.CodeSn.Equals(challengeItemDTOs[i].Question))
- {
- <option value="@item.CodeSn" hassubinfo="true">
- @item.Comments
- </option>
- }
- else
- {
- <option value="@item.CodeSn" hassubinfo="true" selected="selected">
- @item.Comments
- </option>
- }
-
- }
- }
-
- </select>
-
- </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 class="col-sm-2 col-md-2" grouptype="Vdata">
- <button type="button" class="addBtn" onclick="addquestion(this)" data-type="1">鏂板璐ㄧ枒浜嬮」</button>
- </div>
- }
-
- </div>
-
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">浜嬪疄渚濇嵁@(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>
+ <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" id="Law@(i)" name="Law" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Lawchangge(@i);">
+ <select class="form-control" name="Question" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Questionchangge(@i);">
<option value="" hassubinfo="true">璇烽�夋嫨</option>
- @foreach (var item in law)
+ @foreach (var item in question)
{
- @if (!item.CodeSn.Equals(challengeItemDTOs[i].Law))
+ @if (!item.CodeSn.Equals(challengeItemDTOs[i].Question))
{
<option value="@item.CodeSn" hassubinfo="true">
@item.Comments
@@ -348,72 +303,101 @@
@if (i == 0)
{
<div class="col-sm-2 col-md-2" grouptype="Vdata">
- <button type="button" class="addBtn" onclick="addLaw(this)" data-type="1">鏂板娉曞緥渚濇嵁</button>
+ <button type="button" class="addBtn" onclick="addzhiyishixiang(this)" data-type="1">璐ㄧ枒浜嬮」</button>
</div>
+ @*<div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <button type="button" class="addBtn" onclick="addquestion(this)" data-type="1">鏂板璐ㄧ枒浜嬮」</button>
+ </div>*@
}
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍐呭@(i!=0?(i+""):"")</label>
+ <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>
+ <textarea class="form-control bt" name="Evidential" title="浜嬪疄渚濇嵁" isempty="" maxlength="300" length="long">@challengeItemDTOs[i].Evidential</textarea>
</div>
+ </div>
+ <div id="falvyiju@(i)">
+ @for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
+ {
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j!=0?(j+""):"")</label>
+ <div class="col-sm-8 col-md-8">
+ @challengeItemDTOs[i].sysCodeDtls[j].CodeSn
+ </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">鍐呭@(j != 0?(j + ""):"")</label>
+ <div class="col-sm-8 col-md-8">
+ @challengeItemDTOs[i].sysCodeDtls[j].Contents
+ </div>
+ </div>
+ }
+ </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 class="col-sm-2 col-md-2" grouptype="Vdata">
+ <button type="button" class="addBtn" onclick="addrequestinfo(this)" data-type="1">鏂板璐ㄧ枒璇锋眰</button>
+ </div>*@
- <div class="clearfix layer-area" style="padding-bottom:15px;">
- <label 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>
- }
+ </div>
- }
- }
- </select>
+
+
+
+
</div>
-
- <div class="col-sm-2 col-md-2" grouptype="Vdata">
- <button type="button" class="addBtn" onclick="addrequestinfo(this)" data-type="1">鏂板璐ㄧ枒璇锋眰</button>
- </div>
-
-
-
- </div>
-
-
-
-
-
-
-
- </div>
</div>
</div>
</div>
@@ -475,10 +459,10 @@
var attachment_id = 0; // 闄勪欢id
var imgLoad = new Object();
- var aaaaaa = document.getElementsByName("Question");
- for (var aa = 0; aa < aaaaaa.length; aa++) {
- Questionchangge(aa);
- }
+ //var aaaaaa = document.getElementsByName("Question");
+ //for (var aa = 0; aa < aaaaaa.length; aa++) {
+ // Questionchangge(aa);
+ //}
var printPosition = function () {
OpenWindow("鎵撳嵃璐ㄧ枒鍑�", "100%", "100%", "/CooperOrder/PrintZhiyihan?id=@Model.OrderId");
@@ -601,6 +585,8 @@
}
function Questionchangge(i) {
+
+
var sss = document.getElementsByName("Question")[i].value;
$.ajax({
type: "GET",
@@ -609,33 +595,79 @@
global: false,
data: "",
success: function (data) {
+ var falvyiju = $("#falvyiju" + data.Message);
- var Law = $("#Law" + data.Message);
- var Lawval = Law.val();
- Law.find('option').remove();
- var aaa = '<option value="" hassubinfo="true"> </option>';
- Law.append(aaa);
+ var falvyijuhtml = "";
+ falvyijuhtml += ` <div id="falvyiju` + data.Message + `">`;
+
if (data.DataList.length > 0) {
- var sss = false;;
for (var i = 0; i < data.DataList.length; i++) {
+ if (i == 0) {
+ falvyijuhtml += `
+
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
+ <div class="col-sm-8 col-md-8" >
+ ` + data.DataList[i].CodeSn + `
- if (Lawval == data.DataList[i].CodeSn) {
- var o = '<option value="' + data.DataList[i].CodeSn + '" hassubinfo="true" selected="selected">' + data.DataList[i].Comments + '</option>';
- Law.append(o);
- sss = true;
+ </div>
+
+ </div>
+
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍐呭</label>
+ <div class="col-sm-8 col-md-8" >
+ ` + data.DataList[i].Contents + `
+
+ </div>
+ </div> `;
} else {
- var o = '<option value="' + data.DataList[i].CodeSn + '" hassubinfo="true">' + data.DataList[i].Comments + '</option>';
- Law.append(o);
+ falvyijuhtml += `
+
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁 ` + i + `</label>
+ <div class="col-sm-8 col-md-8" >
+ ` + data.DataList[i].CodeSn + `
+
+ </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 + `</label>
+ <div class="col-sm-8 col-md-8" >
+ ` + data.DataList[i].Contents + `
+
+ </div>
+ </div> `;
}
}
- if (!sss) {
- Law.val("");
- }
+
+
}
- Law.trigger('chosen:updated');//鏇存柊閫夐」
- Lawchangge(parseInt(data.Message));
+ else {
+ falvyijuhtml += `
+
+ <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>
+
+ <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> `;
+ }
+
+ falvyijuhtml += ` </div> `;
+
+ falvyiju.html(falvyijuhtml);
+
+
+
},
error: function () {
@@ -722,40 +754,23 @@
</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>
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">浜嬪疄渚濇嵁</label>
<div class="col-sm-8 col-md-8">
<textarea class="form-control bt" name="Evidential" title="浜嬪疄渚濇嵁" isempty="" maxlength="4000" length="long"></textarea>
</div>
</div>
-
+ <div id="falvyiju`+ sss + `">
<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" id="Law`+ sss + `" 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>
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 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">鍐呭`+ 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>
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍐呭</label>
+
</div>
-
+</div>
`);
$("select").chosen();
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
index 3a6e1eb..d1af538 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
@@ -130,14 +130,21 @@
{
<tr>
<td colspan="2">
- 璐ㄧ枒浜嬮」@((i+1)+"")锛�<span style="text-indent:10px">@challengeItemDTOs[i].QuestionName </span>
+ 璐ㄧ枒浜嬮」@((i + 1) + "")锛�<span style="text-indent:10px">@challengeItemDTOs[i].QuestionName </span>
<br />
浜嬪疄渚濇嵁锛�<span>@challengeItemDTOs[i].Evidential</span>
<br />
- 娉曞緥渚濇嵁锛�<span>@challengeItemDTOs[i].LawName</span>
- <br />
- 鍐呭锛�<span>@challengeItemDTOs[i].Lawcoment</span>
- <br />
+ @for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
+ {
+
+
+ @Html.Raw("娉曞緥渚濇嵁" + (j + 1) + "锛�")<span>@challengeItemDTOs[i].sysCodeDtls[j].CodeSn</span>
+ <br />
+ @Html.Raw("鍐呭" + (j + 1) + "锛�")<span>@challengeItemDTOs[i].sysCodeDtls[j].Contents</span>
+ <br />
+ }
+
+
</td>
</tr>
}
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml
index 27c1fdf..ef9e40c 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml
@@ -172,12 +172,26 @@
<td colspan="2" style="font-family:'SimHei';">涓夈�佽川鐤戝熀鏈儏鍐�</td>
</tr>
<tr>
- <td align="left">璐ㄧ枒鎻愬嚭鏃ユ湡锛�<span style="width:290px;">@Model.ChallengeDateName </span></td>
- <td align="left">琚川鐤戜富浣擄細<span style="width:160px;">@Model.Questioned </span></td>
+ <td align="left" colspan="2">
+ 鎶曡瘔浜轰簬<span>@(Model.ChallengeDateName)</span>锛屽悜<span>@(Model.Questioned)</span>鎻愬嚭璐ㄧ枒锛岃川鐤戜簨椤逛负锛�
+ @if (string.IsNullOrEmpty(Model.SqdbId))
+ {
+ @Html.Raw("<span>銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�銆�</span>");
+ }
+ else
+ {
+ @Html.Raw("<span>"+ @Model.SqdbId + "</span>");
+ }
+
+
+
+
+
+ </td>
+
</tr>
<tr>
- <td align="left">璐ㄧ枒鍥炲涓讳綋锛�<span style="width:290px;">@Model.Respondent </span></td>
- <td align="left">鍥炲鏃ユ湡锛�<span style="width:160px;">@Model.RespondDateName </span></td>
+ <td align="left" colspan="2"><span>@(Model.Respondent)</span>浜�<span>@(Model.RespondDateName)</span>,灏辫川鐤戜簨椤瑰仛鍑轰簡绛斿/娌℃湁鍦ㄦ硶瀹氭湡闄愬唴鍋氬嚭绛斿</td>
</tr>
<tr>
@@ -193,10 +207,15 @@
<br />
浜嬪疄渚濇嵁锛�<span>@complaintItemDTOs[i].Evidential</span>
<br />
- 娉曞緥渚濇嵁锛�<span>@complaintItemDTOs[i].LawName</span>
- <br />
- 鍐呭锛�<span>@complaintItemDTOs[i].Lawcoment</span>
- <br />
+ @for (int j = 0; j < complaintItemDTOs[i].sysCodeDtls.Count; j++)
+ {
+
+
+ @Html.Raw("娉曞緥渚濇嵁" + (j + 1) + "锛�")<span>@complaintItemDTOs[i].sysCodeDtls[j].CodeSn</span>
+ <br />
+ @Html.Raw("鍐呭" + (j + 1) + "锛�")<span>@complaintItemDTOs[i].sysCodeDtls[j].Contents</span>
+ <br />
+ }
</td>
</tr>
}
--
Gitblit v1.9.1