From d14b82fec13361486c49165371b5dee1b7089c09 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 09 十二月 2021 13:35:23 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml | 12 +
zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml | 144 +++++++++++++++----
zhengcaioa/DTO/SysCodeDTO.cs | 9 +
zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml | 35 ++++
zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs | 15 +
zhengcaioa/Services/CooperOrderService.cs | 4
zhengcaioa/Services/SysCodeService.cs | 10 +
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 40 ++++-
zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml | 135 ++++++++++++++----
9 files changed, 318 insertions(+), 86 deletions(-)
diff --git a/zhengcaioa/DTO/SysCodeDTO.cs b/zhengcaioa/DTO/SysCodeDTO.cs
index 3837977..9238291 100644
--- a/zhengcaioa/DTO/SysCodeDTO.cs
+++ b/zhengcaioa/DTO/SysCodeDTO.cs
@@ -50,6 +50,9 @@
/// </summary>
public string Sort { set; get; }
+
+ public string Classify1 { set; get; }
+
}
public class SysCodeSearchEntity : SearchEntity
@@ -226,7 +229,11 @@
public string RecStatusName { get; set; }
- public string CommentsName { set; get; }
+ public string CommentsName { set; get; }
+
+ public string Classify1 { get; set; }
+ public string Classify1Name { set; get; }
+
}
#endregion
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index d04c90f..b3c3f01 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -1826,6 +1826,7 @@
WeishouMoney = (a.Money ?? 0) /*- (a.Youhui ?? 0)*/ - (lll.YishouMoney ?? 0),
OrderType1 = a.OrderType1,
Status = b.Status.ToString(),
+ Modifytime = b.Modifytime.Value,
//StatusName = ddd.Comments
}
).ToList();
@@ -1880,11 +1881,12 @@
WeishouMoney = (a.Money ?? 0) /*- (a.Youhui ?? 0)*/ - (lll.YishouMoney ?? 0),
OrderType1 = a.OrderType1,
Status = b.Status.ToString(),
+ Modifytime = b.Modifytime.Value,
}
).ToList();
query2.AddRange(query1);
- var query = query2.Where(x => x.WeishouMoney <= 0).OrderByDescending(x => x.Createtime).ToList();
+ var query = query2.Where(x => x.WeishouMoney <= 0).OrderByDescending(x => x.Modifytime).ToList();
diff --git a/zhengcaioa/Services/SysCodeService.cs b/zhengcaioa/Services/SysCodeService.cs
index 59459b6..73baf70 100644
--- a/zhengcaioa/Services/SysCodeService.cs
+++ b/zhengcaioa/Services/SysCodeService.cs
@@ -402,7 +402,8 @@
(string.IsNullOrWhiteSpace(searchEntity.Comments) ? true : a.Comments.Contains(searchEntity.Comments)) &&
(string.IsNullOrWhiteSpace(searchEntity.CodeSn) ? true : a.CodeSn.Contains(searchEntity.CodeSn)) &&
(string.IsNullOrWhiteSpace(searchEntity.Contents) ? true : a.Contents.Contains(searchEntity.Contents)) &&
- (string.IsNullOrWhiteSpace(searchEntity.WentiId) ? true : a.Contents == searchEntity.WentiId)
+ (string.IsNullOrWhiteSpace(searchEntity.WentiId) ? true : a.Contents == searchEntity.WentiId) &&
+ (string.IsNullOrWhiteSpace(searchEntity.Classify1) ? true : a.Classify1.Contains(searchEntity.Classify1))
select a
).OrderBy(x=>x.Sort).ToList();
@@ -433,7 +434,7 @@
Comments = l.Comments,
Contents = l.Contents,
Sort = l.Sort,
-
+ Classify1 = l.Classify1,
Creater = l.Creater,
Createtime = l.Createtime,
RecStatus = l.RecStatus,
@@ -473,6 +474,7 @@
alldtl.Createtime = model.Createtime;
alldtl.Modifier = model.Modifier;
alldtl.Modifytime = model.Modifytime;
+ alldtl.Classify1 = model.Classify1;
alldtl.CreatetimeStr = model.Createtime.ToString();
alldtl.RecStatusName = model.RecStatus.ToString().Equals("A") ? "鍚敤" : "鍋滅敤";
}
@@ -533,6 +535,7 @@
mModel.Contents = Entity.Contents + "";
mModel.Sort = Entity.Sort;
mModel.RecStatus = "A";
+ mModel.Classify1 = Entity.Classify1;
mModel.Modifier = Entity.Modifier;
mModel.Modifytime = Entity.Modifytime;
@@ -561,7 +564,8 @@
Creater = Entity.Modifier,
Createtime = Entity.Modifytime,
Modifier = Entity.Modifier,
- Modifytime = Entity.Modifytime
+ Modifytime = Entity.Modifytime,
+ Classify1 = Entity.Classify1,
});
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index c6c4013..5ec446f 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -1578,10 +1578,10 @@
- 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");//娉曞緥渚濇嵁
+ 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();
@@ -1619,7 +1619,31 @@
return new JsonResult(resultEntity);
}
+ public IActionResult getQuestionLaw(string id, string no)
+ {
+ ResultEntity<SysCodeDtl> resultEntity = new ResultEntity<SysCodeDtl>();
+ resultEntity.Result = true;
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ var sysCodeDtls = _liaotianService.GetSYScode("t_complaint_items", "law").Where(x => x.Classify1 == id).OrderBy(x => x.CodeSn).ToList().ToList();//娉曞緥渚濇嵁
+ var sysCodeDtls1 = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv");//娉曞緥
+ foreach (var sysCodeDtl in sysCodeDtls)
+ {
+ var sysCodeDtl1 = sysCodeDtls1.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
+ if (sysCodeDtl1 != null)
+ sysCodeDtl.Comments = sysCodeDtl1.Comments;
+ }
+
+ //if (sysCodeDtl != null)
+ //{
+ // resultEntity.Message = sysCodeDtl.Contents;
+ //}
+ resultEntity.Message = no;
+ resultEntity.DataList = sysCodeDtls;
+
+ return new JsonResult(resultEntity);
+ }
/// <summary>
/// 淇濆瓨
@@ -1878,10 +1902,10 @@
- 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");//娉曞緥渚濇嵁
+ 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)
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs b/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
index 04308d5..ef524e0 100644
--- a/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
@@ -669,6 +669,8 @@
actionEntity1.ActionName = "鏂板";
actionlist.Add(actionEntity1);
ViewData["ActionInfo"] = actionlist;
+ ViewBag.falv = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+ ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
return View();
}
@@ -690,9 +692,16 @@
foreach(var sysCodeDtlEntity in resultDataEntity.DataList)
{
var sysCodeDtl = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtlEntity.Comments).FirstOrDefault();
- sysCodeDtlEntity.CommentsName = sysCodeDtl.Comments;
+ if (sysCodeDtl != null)
+ sysCodeDtlEntity.CommentsName = sysCodeDtl.Comments;
}
-
+ sysCodeDtls = _liaotianService.GetSYScode("t_challenge_items", "question");
+ foreach (var sysCodeDtlEntity in resultDataEntity.DataList)
+ {
+ var sysCodeDtl = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtlEntity.Classify1).FirstOrDefault();
+ if(sysCodeDtl!=null)
+ sysCodeDtlEntity.Classify1Name = sysCodeDtl.Comments;
+ }
return new JsonResult(resultDataEntity);
}
@@ -714,7 +723,7 @@
ViewData.Model = sysCodeDtlEntity;
ViewBag.falv = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv");
-
+ ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question");
return View();
}
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
index a1371f2..426e7f8 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
@@ -553,39 +553,42 @@
<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="閫夋嫨 搴忓垪 ...">
- <option value="" hassubinfo="true">璇烽�夋嫨</option>
- @foreach (var item in question)
+ <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))
{
- @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>
- }
-
+ <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>
- }
+ </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>
@@ -597,7 +600,7 @@
<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);">
+ <select class="form-control Law" id="Law@(i)" name="Law" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Lawchangge(@i);">
<option value="" hassubinfo="true">璇烽�夋嫨</option>
@foreach (var item in law)
{
@@ -619,6 +622,9 @@
</select>
+ </div>
+ <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <button type="button" class="addBtn" onclick="addLaw(this)" data-type="1">鏂板娉曞緥渚濇嵁</button>
</div>
</div>
@@ -667,7 +673,9 @@
</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>
@@ -727,7 +735,7 @@
"hideMethod": "fadeOut"
};
-
+
laydate({ elem: "#tousuResultnoticeDate", format: 'YYYY-MM-DD', istime: true, event: "focus" });
laydate({ elem: "#tousuNoticeDate", format: 'YYYY-MM-DD', istime: true, event: "focus" });
laydate({ elem: "#tousuChallengeDate", format: 'YYYY-MM-DD', istime: true, event: "focus" });
@@ -743,6 +751,12 @@
var bDeleteFile = false; // 鍒犻櫎鎿嶄綔
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 printPosition = function () {
OpenWindow("鎵撳嵃鎶曡瘔涔�", "100%", "100%", "/CooperOrder/Printtousushu?id=@Model.OrderId");
@@ -845,7 +859,7 @@
_pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
}
catch (err) {
- parent._CloseTab1("/CooperOrder/EditZhiyihan");
+ parent._CloseTab1("/CooperOrder/EditTousushu");
}
}
@@ -890,6 +904,51 @@
}
});
}
+ function Questionchangge(i) {
+ var sss = document.getElementsByName("Question")[i].value;
+ $.ajax({
+ type: "GET",
+ url: "/CooperOrder/getQuestionLaw?id=" + sss + "&no=" + i,
+ dataType: "json",
+ 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);
+ 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;
+ } else {
+ var o = '<option value="' + data.DataList[i].CodeSn + '" hassubinfo="true">' + data.DataList[i].Comments + '</option>';
+ Law.append(o);
+ }
+
+
+ }
+ if (!sss) {
+ Law.val("");
+ }
+ }
+ Law.trigger('chosen:updated');//鏇存柊閫夐」
+ Lawchangge(parseInt(data.Message));
+ },
+ error: function () {
+
+
+ parent.layer.msg('鏌ヨ澶辫触', { icon: 5 });
+ }
+ });
+ }
+
function _pageAutoClose() {
parent.window._reloadPageData();
@@ -997,7 +1056,7 @@
<input class="form-control" label="鐩稿叧渚涘簲鍟哷+ sss + `" name="Gongytingshang" labtype="txt" addvisible="true" maxlength="300" editvisible="true" reg="" ismust="true" type="text" value="">
</div>
-
+
</div>
@@ -1044,7 +1103,7 @@
<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="閫夋嫨 搴忓垪 ...">
+ <select class="form-control" name="Question" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Questionchangge(`+ sss + `);">
<option value="" hassubinfo="true">璇烽�夋嫨</option>
@foreach (var item in question)
{
@@ -1072,7 +1131,7 @@
<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 + `);">
+ <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)
{
@@ -1102,6 +1161,23 @@
$("select").chosen();
}
+
+
+ var addLaw = function () {
+ OpenWindow("鏂板娉曞緥渚濇嵁", "98%", "90%", "/SysCode/Editlaw/");
+ }
+
+ var _reloadPageData = function () {
+ window.location = "/CooperOrder/EditTousushu?id=" + $("#OrderId").val();
+ }
+ var addquestion = function () {
+ OpenWindow("鏂板璐ㄧ枒浜嬮」", "98%", "90%", "/SysCode/Editquestion/");
+ }
+
+ var addrequestinfo = function () {
+ OpenWindow("鏂板璐ㄧ枒璇锋眰", "98%", "90%", "/SysCode/Editrequestinfo/");
+ }
+
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
index 9127a4e..1441ce3 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
@@ -274,39 +274,42 @@
<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)
+ <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))
{
- @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>
- }
-
+ <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>
- }
+ </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>
@@ -318,7 +321,7 @@
<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);">
+ <select class="form-control" id="Law@(i)" name="Law" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Lawchangge(@i);">
<option value="" hassubinfo="true">璇烽�夋嫨</option>
@foreach (var item in law)
{
@@ -341,7 +344,9 @@
</select>
</div>
-
+ <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <button type="button" class="addBtn" onclick="addLaw(this)" data-type="1">鏂板娉曞緥渚濇嵁</button>
+ </div>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -389,7 +394,9 @@
</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>
@@ -460,6 +467,11 @@
var bDeleteFile = false; // 鍒犻櫎鎿嶄綔
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 printPosition = function () {
OpenWindow("鎵撳嵃璐ㄧ枒鍑�", "100%", "100%", "/CooperOrder/PrintZhiyihan?id=@Model.OrderId");
@@ -581,6 +593,52 @@
});
}
+ function Questionchangge(i) {
+ var sss = document.getElementsByName("Question")[i].value;
+ $.ajax({
+ type: "GET",
+ url: "/CooperOrder/getQuestionLaw?id=" + sss + "&no=" + i,
+ dataType: "json",
+ 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);
+ 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;
+ } else {
+ var o = '<option value="' + data.DataList[i].CodeSn + '" hassubinfo="true">' + data.DataList[i].Comments + '</option>';
+ Law.append(o);
+ }
+
+
+ }
+ if (!sss) {
+ Law.val("");
+ }
+ }
+ Law.trigger('chosen:updated');//鏇存柊閫夐」
+ Lawchangge(parseInt(data.Message));
+ },
+ error: function () {
+
+
+ parent.layer.msg('鏌ヨ澶辫触', { icon: 5 });
+ }
+ });
+ }
+
+
function _pageAutoClose() {
parent.window._reloadPageData();
var index = parent.layer.getFrameIndex(window.name);
@@ -638,7 +696,7 @@
<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="閫夋嫨 搴忓垪 ...">
+ <select class="form-control" name="Question" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Questionchangge(`+ sss + `);">
<option value="" hassubinfo="true">璇烽�夋嫨</option>
@foreach (var item in question)
{
@@ -666,7 +724,7 @@
<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 + `);">
+ <select class="form-control" id="Law`+ sss + `" name="Law" data-placeholder="閫夋嫨 搴忓垪 ..." onchange="Lawchangge(`+ sss + `);">
<option value="" hassubinfo="true">璇烽�夋嫨</option>
@foreach (var item in law)
{
@@ -695,7 +753,20 @@
`);
$("select").chosen();
}
+ var addLaw = function () {
+ OpenWindow("鏂板娉曞緥渚濇嵁", "98%", "90%", "/SysCode/Editlaw/");
+ }
+ var _reloadPageData = function () {
+ window.location = "/CooperOrder/EditTousushu?id=" + $("#OrderId").val();
+ }
+ var addquestion = function () {
+ OpenWindow("鏂板璐ㄧ枒浜嬮」", "98%", "90%", "/SysCode/Editquestion/");
+ }
+
+ var addrequestinfo = function () {
+ OpenWindow("鏂板璐ㄧ枒璇锋眰", "98%", "90%", "/SysCode/Editrequestinfo/");
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml b/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml
index ea931d6..88b471b 100644
--- a/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml
@@ -6,7 +6,7 @@
List<SysCodeDtl> falv = ViewData["falv"] as List<SysCodeDtl>; //娉曞緥
-
+ List<SysCodeDtl> question = ViewData["question"] as List<SysCodeDtl>; //娉曞緥
@@ -167,7 +167,35 @@
</div>
</div>
+
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-1 col-md-1 control-label">璐ㄧ枒浜嬮」</label>
+ <div class="col-sm-10 col-md-10">
+ @*<input class="form-control" label="娉曞緥鍚嶇О" id="Comments" name="Comments" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="100" ismust="true" type="text" value="@Model.Comments">*@
+
+ <select id="Classify1" class="form-control" name="Classify1" data-placeholder="閫夋嫨 搴忓垪 ...">
+ <option value="" hassubinfo="true">璇烽�夋嫨</option>
+ @foreach (var item in question)
+ {
+ @if (!item.CodeSn.Equals(Model.Classify1))
+ {
+ <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>
@@ -309,7 +337,10 @@
return;
}
-
+ if ($.trim($("#Classify1").val()) == '') {
+ toastr.warning("璐ㄧ枒浜嬮」涓嶈兘涓虹┖");
+ return;
+ }
diff --git a/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml b/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml
index 2ef75ae..a8b86b7 100644
--- a/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml
@@ -4,6 +4,8 @@
}
@section headerStyle{
<script type="text/javascript">
+ var falv = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.falv))';
+ var question = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.question))';
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
{
@@ -13,7 +15,7 @@
}
},
{
- label: '娉曞緥鍚嶇О', name: 'CommentsName', labtype: 'txt', hidden: false, width: 300,
+ label: '娉曞緥鍚嶇О', name: 'CommentsName', labtype: 'txt', hidden: false, width: 100,
},
{
@@ -24,6 +26,11 @@
label: '鍐呭', name: 'Contents', labtype: 'txt', hidden: false, width: 300,
},
+ {
+ label: '璐ㄧ枒浜嬮」', name: 'Classify1Name', labtype: 'txt', hidden: false, width: 100,
+
+ },
+
{ label: '鐘舵��', name: 'RecStatus', labtype: 'txt', hidden: true },
{ label: '鍒涘缓浜�', name: 'Creater', labtype: 'txt', hidden: true },
{ label: '鍒涘缓鏃堕棿', name: 'Createtime', labtype: 'txt', hidden: true },
@@ -35,8 +42,9 @@
searchCol = [
{ label: '缂栫爜', name: 'CodeSn', labtype: 'txt', hidden: false },
- { label: '鍚嶇О', name: 'Comments', labtype: 'txt', hidden: false },
+ { label: '鍚嶇О', name: 'Comments', labtype: 'combox', hidden: false, data: JSON.parse(falv) },
+ { label: '璐ㄧ枒浜嬮」', name: 'Classify1', labtype: 'combox', hidden: false, data: JSON.parse(question)},
];
--
Gitblit v1.9.1