From 6c0b60ad8577af7a2ea98fbf446e3cb83e79c776 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 25 七月 2022 11:24:12 +0800
Subject: [PATCH] 文书管理
---
zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml | 12 +-
zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml | 12 +-
zhengcaioa/IServices/ISysCodeService.cs | 3
zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml | 39 +++--
zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs | 60 ++++++++++
zhengcaioa/zhengcaioa/Views/SysCode/Editlawzidingyi.cshtml | 6
zhengcaioa/Services/SysCodeService.cs | 78 +++++++++++++
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 71 +++++++++--
zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml | 39 +++---
9 files changed, 256 insertions(+), 64 deletions(-)
diff --git a/zhengcaioa/IServices/ISysCodeService.cs b/zhengcaioa/IServices/ISysCodeService.cs
index e3474a6..d81265f 100644
--- a/zhengcaioa/IServices/ISysCodeService.cs
+++ b/zhengcaioa/IServices/ISysCodeService.cs
@@ -72,5 +72,8 @@
ResultEntity SaveSysCodeDtls(SysCodeDtlEntity Entity);
+
+ ResultEntity addSysCodeDtls(SysCodeDtlEntity Entity);
+
}
}
diff --git a/zhengcaioa/Services/SysCodeService.cs b/zhengcaioa/Services/SysCodeService.cs
index 97d4b8e..cb525f1 100644
--- a/zhengcaioa/Services/SysCodeService.cs
+++ b/zhengcaioa/Services/SysCodeService.cs
@@ -714,5 +714,83 @@
return resultEntity;
}
+
+
+ public ResultEntity addSysCodeDtls(SysCodeDtlEntity Entity)
+ {
+ var resultEntity = new ResultEntity();
+
+
+ //浜嬪姟
+ resultEntity.Result = true;
+ resultEntity.ReturnID = "";
+ try
+ {
+
+
+ //var sysCodeDtls = _context.SysCodeDtls.Where(x => x.RecStatus == "A" && x.CodeId == Entity.CodeId && x.Classify1 == Entity.Classify1).ToList();
+ //if (sysCodeDtls != null && sysCodeDtls.Count > 0)
+ //{
+ // foreach (var sysCodeDtl in sysCodeDtls)
+ // {
+ // _context.SysCodeDtls.Remove(sysCodeDtl);
+ // }
+ //}
+
+ var CodeSns = Entity.CodeSns;
+ if (CodeSns != null && CodeSns.Length > 0)
+ {
+ for (int i = 0; i < CodeSns.Length; i++)
+ {
+ if (!string.IsNullOrEmpty(Entity.CodeSns[i]) || !string.IsNullOrEmpty(Entity.Commentss[i]))
+ {
+ var id = Guid.NewGuid().ToString();
+ _context.SysCodeDtls.Add(new SysCodeDtl()
+ {
+ Id = id,
+ CodeSn = Entity.CodeSns[i],
+ RoleId = "",
+ CodeId = Entity.CodeId,
+ Comments = Entity.Commentss[i],
+ Contents = Entity.Contentss[i],
+ Sort = Entity.Sorts[i],
+ RecStatus = "A",
+ Creater = Entity.Modifier,
+ Createtime = Entity.Modifytime,
+ Modifier = Entity.Modifier,
+ Modifytime = Entity.Modifytime,
+ Classify1 = Entity.Classify1,
+ Classify2 = Entity.Classify2s[i],
+ });
+
+ if(i == CodeSns.Length - 1)
+ {
+ resultEntity.ReturnID += Entity.CodeSns[i];
+ }
+ else
+ {
+ resultEntity.ReturnID += Entity.CodeSns[i] + ",";
+ }
+
+ }
+ }
+ }
+
+
+
+
+ _context.SaveChanges();
+
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Message = "淇℃伅淇濆瓨澶辫触锛岃鑱旂郴绠＄悊浜哄憳銆�" + ex.Message; ;
+ resultEntity.Result = false;
+
+ }
+
+ return resultEntity;
+ }
+
}
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index 617b2c6..b1ed7a0 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -1732,7 +1732,7 @@
- public IActionResult EditZhiyihan(string id = null)
+ public IActionResult EditZhiyihan(string id = null, string ReturnID = null)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
@@ -1742,7 +1742,7 @@
{
var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
if (sysCodeDtl1 != null)
- sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+ sysCodeDtl.Classify3 = sysCodeDtl1.Comments;
}
//璐ㄧ枒鍑�
@@ -1762,9 +1762,29 @@
foreach (var challengeItemDTO in challengeletterDTO.challengeItemDTOs)
{
var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == challengeItemDTO.Question).ToList();
- if (!string.IsNullOrEmpty(challengeItemDTO.Law))
+ if (!string.IsNullOrEmpty(challengeItemDTO.Law) || !string.IsNullOrEmpty(ReturnID))
{
- sysCodeDtls2 = sysCodeDtls2.Where(x => challengeItemDTO.Law.Split(',').Contains(x.Comments)).ToList();
+ var law = "";
+ if (!string.IsNullOrEmpty(challengeItemDTO.Law))
+ {
+ law = challengeItemDTO.Law;
+ if (!string.IsNullOrEmpty(ReturnID))
+ {
+ law += "," + ReturnID;
+ }
+
+ }
+ else
+ {
+ law = ReturnID;
+ }
+
+ if (!string.IsNullOrEmpty(law))
+ {
+ sysCodeDtls2 = sysCodeDtls2.Where(x => law.Split(',').Contains(x.CodeSn)).ToList();
+ }
+
+
}
challengeItemDTO.sysCodeDtls = sysCodeDtls2;
}
@@ -1843,7 +1863,7 @@
{
var sysCodeDtl1 = sysCodeDtls1.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
if (sysCodeDtl1 != null)
- sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+ sysCodeDtl.Classify3 = sysCodeDtl1.Comments;
}
//if (sysCodeDtl != null)
@@ -1868,7 +1888,7 @@
{
var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
if (sysCodeDtl1 != null)
- sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+ sysCodeDtl.Classify3 = sysCodeDtl1.Comments;
}
//璐ㄧ枒鍑�
@@ -2198,7 +2218,7 @@
{
var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
if (sysCodeDtl1 != null)
- sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+ sysCodeDtl.Classify3 = sysCodeDtl1.Comments;
}
//璐ㄧ枒鍑�
List<TChallengeletterDTO> challengeletterDTOs = _cooperOrderService.GetListChallengeletter(id);
@@ -2219,7 +2239,7 @@
var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == challengeItemDTO.Question).ToList();
if (!string.IsNullOrEmpty(challengeItemDTO.Law))
{
- sysCodeDtls2 = sysCodeDtls2.Where(x => challengeItemDTO.Law.Split(',').Contains(x.Comments)).ToList();
+ sysCodeDtls2 = sysCodeDtls2.Where(x => challengeItemDTO.Law.Split(',').Contains(x.CodeSn)).ToList();
}
challengeItemDTO.sysCodeDtls = sysCodeDtls2;
}
@@ -2314,7 +2334,7 @@
}
- public IActionResult EditTousushu(string id = null)
+ public IActionResult EditTousushu(string id = null, string ReturnID = null)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
@@ -2325,7 +2345,7 @@
{
var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
if (sysCodeDtl1 != null)
- sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+ sysCodeDtl.Classify3 = sysCodeDtl1.Comments;
}
//鎶曡瘔涔�
List<TComplaintletterDTO> complaintletterDTOs = _cooperOrderService.GetListComplaintletter(id);
@@ -2361,10 +2381,33 @@
foreach (var complaintItemDTO in complaintletterDTO.complaintItemDTOs)
{
var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == complaintItemDTO.Question).ToList();
- if (!string.IsNullOrEmpty(complaintItemDTO.Law))
+
+
+ if (!string.IsNullOrEmpty(complaintItemDTO.Law) || !string.IsNullOrEmpty(ReturnID))
{
- sysCodeDtls2 = sysCodeDtls2.Where(x => complaintItemDTO.Law.Split(',').Contains(x.Comments)).ToList();
+ var law = "";
+ if (!string.IsNullOrEmpty(complaintItemDTO.Law))
+ {
+ law = complaintItemDTO.Law;
+ if (!string.IsNullOrEmpty(ReturnID))
+ {
+ law += "," + ReturnID;
+ }
+
+ }
+ else
+ {
+ law = ReturnID;
+ }
+
+ if (!string.IsNullOrEmpty(law))
+ {
+ sysCodeDtls2 = sysCodeDtls2.Where(x => law.Split(',').Contains(x.CodeSn)).ToList();
+ }
+
+
}
+
complaintItemDTO.sysCodeDtls = sysCodeDtls2;
}
}
@@ -2717,7 +2760,7 @@
{
var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
if (sysCodeDtl1 != null)
- sysCodeDtl.CodeSn = sysCodeDtl1.Comments;
+ sysCodeDtl.Classify3 = sysCodeDtl1.Comments;
}
//鎶曡瘔涔�
List<TComplaintletterDTO> complaintletterDTOs = _cooperOrderService.GetListComplaintletter(id);
@@ -2755,7 +2798,7 @@
var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == complaintItemDTO.Question).ToList();
if (!string.IsNullOrEmpty(complaintItemDTO.Law))
{
- sysCodeDtls2 = sysCodeDtls2.Where(x => complaintItemDTO.Law.Split(',').Contains(x.Comments)).ToList();
+ sysCodeDtls2 = sysCodeDtls2.Where(x => complaintItemDTO.Law.Split(',').Contains(x.CodeSn)).ToList();
}
complaintItemDTO.sysCodeDtls = sysCodeDtls2;
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs b/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
index c123f4c..d611613 100644
--- a/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
@@ -781,6 +781,66 @@
/// <returns></returns>
[HttpPost]
+ public string addquestiontypes(SysCodeDtlEntity data)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = false;
+ ViewData["curentuser"] = curentuser;
+ data.RecStatus = "A";
+ if (String.IsNullOrEmpty(data.Id))
+ {
+ data.Creater = curentuser.Id;
+ data.Createtime = DateTime.Now;
+ }
+ data.Modifier = curentuser.Id;
+ data.Modifytime = DateTime.Now;
+ if (data.CodeSns == null || data.CodeSns.Length == 0)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "娉曞緥渚濇嵁涓嶈兘涓虹┖锛�";
+ return JsonConvert.SerializeObject(resultEntity);
+ }
+ foreach (var CodeSn in data.CodeSns)
+ {
+ if (string.IsNullOrWhiteSpace(CodeSn))
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "缂栫爜涓嶈兘涓虹┖锛�";
+ return JsonConvert.SerializeObject(resultEntity);
+ }
+ }
+ if (data.Commentss == null || data.Commentss.Length == 0)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "娉曞緥鍚嶇О涓嶈兘涓虹┖锛�";
+ return JsonConvert.SerializeObject(resultEntity);
+ }
+ foreach (var Comment in data.Commentss)
+ {
+ if (string.IsNullOrWhiteSpace(Comment))
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "娉曞緥鍚嶇О涓嶈兘涓虹┖锛�";
+ return JsonConvert.SerializeObject(resultEntity);
+ }
+ }
+
+
+ resultEntity = _sysCodeService.addSysCodeDtls(data);
+
+ return JsonConvert.SerializeObject(resultEntity);
+ }
+
+
+
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
+ /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+ /// <returns></returns>
+ [HttpPost]
+
public string Savequestiontypes(SysCodeDtlEntity data)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
index fb36eb3..0c2536d 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
@@ -725,7 +725,7 @@
<button type="button" class="addBtn" onclick="addquestion(this)" data-type="1">鏂板璐ㄧ枒浜嬮」</button>
</div>*@
<div class="col-sm-2 col-md-2" grouptype="Vdata">
- <button type="button" class="addBtn" onclick="addlawinfo(this)" data-type="1">鑷畾涔夋硶寰嬩緷鎹�</button>
+ <button type="button" class="addBtn" onclick="addlawinfo(this)" data-type="1">鏂板娉曞緥渚濇嵁</button>
</div>
}
@@ -747,9 +747,9 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
<div class="col-sm-8 col-md-8">
- 銆夽(complaintItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
+ 銆夽(complaintItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
</div>
- <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].CodeSn" />
<input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
<div class="col-sm-1 col-md-1" grouptype="Vdata">
<button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
@@ -762,9 +762,9 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
<div class="col-sm-8 col-md-8">
- 銆夽(complaintItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
+ 銆夽(complaintItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
</div>
- <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].CodeSn" />
<input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
<div class="col-sm-1 col-md-1" grouptype="Vdata">
<button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
@@ -809,7 +809,7 @@
<button type="button" class="addBtn" onclick="OpenWindow('鑷畾涔夋姇璇変簨椤�','98%','100%', '/SysCode/Editquestionzidingyi')" data-type="1">鑷畾涔夋姇璇変簨椤�</button>
</div>
<div class="col-sm-2 col-md-2" grouptype="Vdata">
- <button type="button" class="addBtn" onclick="addlawinfo(this)" data-type="1">鑷畾涔夋硶寰嬩緷鎹�</button>
+ <button type="button" class="addBtn" onclick="addlawinfo(this)" data-type="1">鏂板娉曞緥渚濇嵁</button>
</div>
@*<div class="col-sm-2 col-md-2" grouptype="Vdata">
<button type="button" class="addBtn" onclick="addquestion(this)" data-type="1">鏂板璐ㄧ枒浜嬮」</button>
@@ -819,7 +819,7 @@
</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+1)</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="3500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@complaintItemDTOs[i].Evidential</textarea>
</div>
@@ -833,9 +833,9 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
<div class="col-sm-8 col-md-8">
- 銆夽(complaintItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
+ 銆夽(complaintItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
</div>
- <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].CodeSn" />
<input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
<div class="col-sm-1 col-md-1" grouptype="Vdata">
<button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
@@ -848,10 +848,10 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
<div class="col-sm-8 col-md-8">
- 銆夽(complaintItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
+ 銆夽(complaintItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
</div>
- <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].CodeSn" />
<input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
<div class="col-sm-1 col-md-1" grouptype="Vdata">
<button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
@@ -1238,10 +1238,10 @@
<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 + `銆媊 + data.DataList[i].Classify2 + `锛歚 + data.DataList[i].Contents + `
+ 銆奰 + data.DataList[i].Classify3 + `銆媊 + data.DataList[i].Classify2 + `锛歚 + data.DataList[i].Contents + `
</div>
-<input type="hidden" name="Law" value="` + data.DataList[i].Comments + `" />
+<input type="hidden" name="Law" value="` + data.DataList[i].CodeSn + `" />
<input type="hidden" name="complaintItemIdlaw" value="` + data.Remark + `" />
<div class="col-sm-1 col-md-1" grouptype="Vdata">
<button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
@@ -1253,10 +1253,10 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁 ` + (i + 1) + `</label>
<div class="col-sm-8 col-md-8" >
- 銆奰 + data.DataList[i].CodeSn + `銆媊 + data.DataList[i].Classify2 + `锛歚 + data.DataList[i].Contents + `
+ 銆奰 + data.DataList[i].Classify3 + `銆媊 + data.DataList[i].Classify2 + `锛歚 + data.DataList[i].Contents + `
</div>
-<input type="hidden" name="Law" value="` + data.DataList[i].Comments + `" />
+<input type="hidden" name="Law" value="` + data.DataList[i].CodeSn + `" />
<input type="hidden" name="complaintItemIdlaw" value="` + data.Remark + `" />
<div class="col-sm-1 col-md-1" grouptype="Vdata">
<button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
@@ -1473,7 +1473,7 @@
if (document.getElementsByName("Question").length == 1) {
$('#Questionlabel').text("璐ㄧ枒浜嬮」1");
- $('#Evidentiallabel').text("浜嬪疄渚濇嵁1");
+ $('#Evidentiallabel').text("浜嬪疄渚濇嵁");
}
$('#zhiyishixiang').append(` <div class="zhiyishixiangitem">
@@ -1499,7 +1499,7 @@
</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 + 1) + `</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="3500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'"></textarea>
</div>
@@ -1529,6 +1529,11 @@
var _reloadPageData = function () {
window.location = "/CooperOrder/EditTousushu?id=" + $("#OrderId").val();
}
+
+ var _reloadPageData1 = function (ReturnID) {
+ window.location = "/CooperOrder/EditTousushu?id=" + $("#OrderId").val() + "&ReturnID=" + ReturnID;
+ }
+
var addquestion = function () {
OpenWindow("鏂板璐ㄧ枒浜嬮」", "98%", "90%", "/SysCode/Editquestion/");
}
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
index b0015ce..3a98c72 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
@@ -339,7 +339,7 @@
<button type="button" class="addBtn" onclick="OpenWindow('鑷畾涔夎川鐤戜簨椤�','98%','100%', '/SysCode/Editquestionzidingyi')" data-type="1">鑷畾涔夎川鐤戜簨椤�</button>
</div>
<div class="col-sm-2 col-md-2" grouptype="Vdata">
- <button type="button" class="addBtn" onclick="addlawinfo(this)" data-type="1">鑷畾涔夋硶寰嬩緷鎹�</button>
+ <button type="button" class="addBtn" onclick="addlawinfo(this)" data-type="1">鏂板娉曞緥渚濇嵁</button>
</div>
@*<div class="col-sm-2 col-md-2" grouptype="Vdata">
<button type="button" class="addBtn" onclick="addquestion(this)" data-type="1">鏂板璐ㄧ枒浜嬮」</button>
@@ -364,9 +364,9 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
<div class="col-sm-8 col-md-8">
- 銆夽(challengeItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
+ 銆夽(challengeItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
</div>
- <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].CodeSn" />
<input type="hidden" name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
<div class="col-sm-1 col-md-1" grouptype="Vdata">
<button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
@@ -378,9 +378,9 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
<div class="col-sm-8 col-md-8">
- 銆夽(challengeItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
+ 銆夽(challengeItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
</div>
- <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].CodeSn" />
<input type="hidden" name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
<div class="col-sm-1 col-md-1" grouptype="Vdata">
<button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
@@ -427,7 +427,7 @@
<button type="button" class="addBtn" onclick="OpenWindow('鑷畾涔夎川鐤戜簨椤�','98%','100%', '/SysCode/Editquestionzidingyi')" data-type="1">鑷畾涔夎川鐤戜簨椤�</button>
</div>
<div class="col-sm-2 col-md-2" grouptype="Vdata">
- <button type="button" class="addBtn" onclick="addlawinfo(this)" data-type="1">鑷畾涔夋硶寰嬩緷鎹�</button>
+ <button type="button" class="addBtn" onclick="addlawinfo(this)" data-type="1">鏂板娉曞緥渚濇嵁</button>
</div>
@*<div class="col-sm-2 col-md-2" grouptype="Vdata">
<button type="button" class="addBtn" onclick="addquestion(this)" data-type="1">鏂板璐ㄧ枒浜嬮」</button>
@@ -437,7 +437,7 @@
</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+1)</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="3500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@challengeItemDTOs[i].Evidential</textarea>
</div>
@@ -450,9 +450,9 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
<div class="col-sm-8 col-md-8">
- 銆夽(challengeItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
+ 銆夽(challengeItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
</div>
- <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].CodeSn" />
<input type="hidden" name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
<div class="col-sm-1 col-md-1" grouptype="Vdata">
<button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
@@ -465,9 +465,9 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
<div class="col-sm-8 col-md-8">
- 銆夽(challengeItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
+ 銆夽(challengeItemDTOs[i].sysCodeDtls[j].Classify3)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
</div>
- <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].CodeSn" />
<input type="hidden" name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
<div class="col-sm-1 col-md-1" grouptype="Vdata">
<button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
@@ -774,10 +774,10 @@
<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 + `銆媊 + data.DataList[i].Classify2 + `锛歚 + data.DataList[i].Contents + `
+ 銆奰 + data.DataList[i].Classify3 + `銆媊 + data.DataList[i].Classify2 + `锛歚 + data.DataList[i].Contents + `
</div>
-<input type="hidden" name="Law" value="` + data.DataList[i].Comments + `" />
+<input type="hidden" name="Law" value="` + data.DataList[i].CodeSn + `" />
<input type="hidden" name="challengeItemIdlaw" value="` + data.Remark + `" />
<div class="col-sm-1 col-md-1" grouptype="Vdata">
<button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
@@ -791,10 +791,10 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁 ` + (i+1) + `</label>
<div class="col-sm-8 col-md-8" >
- 銆奰 + data.DataList[i].CodeSn + `銆媊 + data.DataList[i].Classify2 + `锛歚 + data.DataList[i].Contents + `
+ 銆奰 + data.DataList[i].Classify3 + `銆媊 + data.DataList[i].Classify2 + `锛歚 + data.DataList[i].Contents + `
</div>
-<input type="hidden" name="Law" value="` + data.DataList[i].Comments + `" />
+<input type="hidden" name="Law" value="` + data.DataList[i].CodeSn + `" />
<input type="hidden" name="challengeItemIdlaw" value="` + data.Remark + `" />
<div class="col-sm-1 col-md-1" grouptype="Vdata">
<button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
@@ -893,7 +893,7 @@
if (document.getElementsByName("Question").length == 1) {
$('#Questionlabel').text("璐ㄧ枒浜嬮」1");
- $('#Evidentiallabel').text("浜嬪疄渚濇嵁1");
+ $('#Evidentiallabel').text("浜嬪疄渚濇嵁");
}
$('#zhiyishixiang').append(` <div class="zhiyishixiangitem">
@@ -919,9 +919,9 @@
</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 + 1) + `</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="浜嬪疄渚濇嵁`+ sss + `" isempty="" maxlength="3500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'"></textarea>
+ <textarea class="form-control bt" name="Evidential" title="浜嬪疄渚濇嵁" isempty="" maxlength="3500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'"></textarea>
</div>
</div>
<div id="falvyiju`+ sss + `">
@@ -944,6 +944,9 @@
var _reloadPageData = function () {
window.location = "/CooperOrder/EditZhiyihan?id=" + $("#OrderId").val();
}
+ var _reloadPageData1 = function (ReturnID) {
+ window.location = "/CooperOrder/EditZhiyihan?id=" + $("#OrderId").val() + "&ReturnID=" + ReturnID;
+ }
var addquestion = function () {
OpenWindow("鏂板璐ㄧ枒浜嬮」", "98%", "90%", "/SysCode/Editquestion/");
}
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
index ea2f944..36dd1ed 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
@@ -187,13 +187,13 @@
@for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
{
var sssss = "";
- if (challengeItemDTOs[i].sysCodeDtls[j].CodeSn.IndexOf("銆�") >= 0)
+ if (challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�") >= 0)
{
- sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].CodeSn.Insert(challengeItemDTOs[i].sysCodeDtls[j].CodeSn.IndexOf("銆�"), "銆�");
+ sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3.Insert(challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
}
else
{
- sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].CodeSn + "銆�";
+ sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
}
if (j != (challengeItemDTOs[i].sysCodeDtls.Count - 1))
@@ -234,13 +234,13 @@
@for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
{
var sssss = "";
- if (challengeItemDTOs[i].sysCodeDtls[j].CodeSn.IndexOf("銆�") >= 0)
+ if (challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�") >= 0)
{
- sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].CodeSn.Insert(challengeItemDTOs[i].sysCodeDtls[j].CodeSn.IndexOf("銆�"), "銆�");
+ sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3.Insert(challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
}
else
{
- sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].CodeSn + "銆�";
+ sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
}
if (j != (challengeItemDTOs[i].sysCodeDtls.Count - 1))
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml
index cc15906..d4c78f1 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml
@@ -291,13 +291,13 @@
@for (int j = 0; j < complaintItemDTOs[i].sysCodeDtls.Count; j++)
{
var sssss = "";
- if (complaintItemDTOs[i].sysCodeDtls[j].CodeSn.IndexOf("銆�")>=0)
+ if (complaintItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�")>=0)
{
- sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].CodeSn.Insert(complaintItemDTOs[i].sysCodeDtls[j].CodeSn.IndexOf("銆�"), "銆�");
+ sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].Classify3.Insert(complaintItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
}
else
{
- sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].CodeSn + "銆�";
+ sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
}
if (j != (complaintItemDTOs[i].sysCodeDtls.Count - 1))
{
@@ -334,13 +334,13 @@
@for (int j = 0; j < complaintItemDTOs[i].sysCodeDtls.Count; j++)
{
var sssss = "";
- if (complaintItemDTOs[i].sysCodeDtls[j].CodeSn.IndexOf("銆�") >= 0)
+ if (complaintItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�") >= 0)
{
- sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].CodeSn.Insert(complaintItemDTOs[i].sysCodeDtls[j].CodeSn.IndexOf("銆�"), "銆�");
+ sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].Classify3.Insert(complaintItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
}
else
{
- sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].CodeSn + "銆�";
+ sssss = "銆�" + complaintItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
}
if (j != (complaintItemDTOs[i].sysCodeDtls.Count - 1))
{
diff --git a/zhengcaioa/zhengcaioa/Views/SysCode/Editlawzidingyi.cshtml b/zhengcaioa/zhengcaioa/Views/SysCode/Editlawzidingyi.cshtml
index b3a90f8..87f1170 100644
--- a/zhengcaioa/zhengcaioa/Views/SysCode/Editlawzidingyi.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SysCode/Editlawzidingyi.cshtml
@@ -381,7 +381,7 @@
// var data = { id: $("#Id").val(), DocType: $("#DocType").val(), DocDept: $("#DocDept").val(), PublishTime: $("#PublishTime").val(), DocNo: $("#DocNo").val(), DocTitle: $("#DocTitle").val(), DocContent: ueue, DocZtc: $("#DocZtc").val(), Printtimes: $("#Printtimes").val(), DocCsdw: $("#DocCsdw").val(), PrintStatus: $("#PrintStatus").val()}
$.ajax({
type: "POST",
- url: "/SysCode/Savequestiontypes",
+ url: "/SysCode/addquestiontypes",
dataType: "json",
global: false,
data: $('form').serializeArray(),
@@ -392,7 +392,7 @@
if (data.Result) {
// parent._afterSave(true);
parent.layer.msg('鎴愬姛淇濆瓨', { icon: 6 });
-
+ parent.window._reloadPageData1(data.ReturnID);
_pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
@@ -422,7 +422,7 @@
function _pageAutoClose() {
- parent.window._reloadPageData();
+
var index = parent.layer.getFrameIndex(window.name);
parent.layer.isRefresh = true;
parent.layer.closeAll('loading');
--
Gitblit v1.9.1