From cfc134f3f7d5734700f0246fdfc7a74a1b1c8b81 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 25 十月 2021 15:06:26 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Views/SysBaimingdan/Index.cshtml | 9 +-
zhengcaioa/Services/SysBaimingdanService.cs | 8 ++
zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml | 28 ++++++-
zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml | 13 +-
zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs | 40 ++++++++-
zhengcaioa/zhengcaioa/Views/ExpertTestTopic/print.cshtml | 4
zhengcaioa/zhengcaioa/Views/SysBaimingdan/Edit.cshtml | 7 +
zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditPeizhi.cshtml | 117 +++++++++++++++++++++++++++-
zhengcaioa/Services/ExpertTestTopicService.cs | 11 ++
zhengcaioa/DTO/ExpertTestTopicDTO.cs | 1
10 files changed, 207 insertions(+), 31 deletions(-)
diff --git a/zhengcaioa/DTO/ExpertTestTopicDTO.cs b/zhengcaioa/DTO/ExpertTestTopicDTO.cs
index f053da0..89c134d 100644
--- a/zhengcaioa/DTO/ExpertTestTopicDTO.cs
+++ b/zhengcaioa/DTO/ExpertTestTopicDTO.cs
@@ -10,6 +10,7 @@
public string Topictype { get; set; }
public string Zhishitype { get; set; }
public string Topic { get; set; }
+ public string Anwsers { get; set; }
public string Area { get; set; }
public string Zhongdian { get; set; }
public string JiexiStatus { get; set; }
diff --git a/zhengcaioa/Services/ExpertTestTopicService.cs b/zhengcaioa/Services/ExpertTestTopicService.cs
index 57fa6ea..d98cbc3 100644
--- a/zhengcaioa/Services/ExpertTestTopicService.cs
+++ b/zhengcaioa/Services/ExpertTestTopicService.cs
@@ -327,7 +327,16 @@
foreach (var quer in querydel)
{
- lian.Topic += quer.Anwserno + " " + quer.Anwser + " </br>";
+ if (lian.Topictype != "03")
+ {
+ lian.Topic += quer.Anwserno + " " + quer.Anwser + " </br>";
+ }
+
+ if(quer.Shifouzhengqu == "A")
+ {
+ lian.Anwsers += quer.Anwserno ;
+ }
+
}
}
diff --git a/zhengcaioa/Services/SysBaimingdanService.cs b/zhengcaioa/Services/SysBaimingdanService.cs
index 6c32627..099bb32 100644
--- a/zhengcaioa/Services/SysBaimingdanService.cs
+++ b/zhengcaioa/Services/SysBaimingdanService.cs
@@ -26,6 +26,14 @@
ResultEntity resultEntity = new ResultEntity();
try
{
+ var checkUserSn = _context.SysBaimingdans.Where(x =>x.PostType == SysBaimingdanDTO.PostType && x.BaimingdanName == SysBaimingdanDTO.BaimingdanName && x.RecStatus == "A" && x.Id != SysBaimingdanDTO.Id).FirstOrDefault();
+ if (checkUserSn != null && (string.IsNullOrWhiteSpace(SysBaimingdanDTO.Id) || (!string.IsNullOrWhiteSpace(SysBaimingdanDTO.Id) && checkUserSn.Id != SysBaimingdanDTO.Id)))
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "鐧藉悕鍗曢噸澶�";
+ return resultEntity;
+ }
+
var SysBaimingdan = _mapper.Map<SysBaimingdan>(SysBaimingdanDTO);
if (String.IsNullOrEmpty(SysBaimingdan.Id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
index 12a24d0..8bef88f 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
@@ -122,7 +122,7 @@
return new JsonResult(_expertTestTopicService.SearchByPaging(search));
}
- public IActionResult Edit(string id = null, string Topictype = "", string Zhishitype = "", string Area = "")
+ public IActionResult Edit(string id = null, string Topictype = "", string Zhishitype = "", string Area = "",string Falv ="")
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
@@ -191,12 +191,39 @@
dto.expertTestTopicanwserDTOs = expertTestTopicanwserDTOs;
}
+ if (!string.IsNullOrEmpty(Falv))
+ {
+ string[] falvs = Falv.Split(',');
+ for(int i=0;i< falvs.Length; i++)
+ {
+ if (i == 0)
+ {
+ var ssssss = new ExpertTestTopicjiexiDTO();
+ ssssss.Flag = "A";
+ ssssss.Falv = falvs[i];
+ expertTestTopicjiexiDTOs.Add(ssssss);
+
+ }
+ else if(!string.IsNullOrEmpty(falvs[i]))
+ {
+ var ssssss = new ExpertTestTopicjiexiDTO();
+ ssssss.Flag = "D";
+ ssssss.Falv = falvs[i];
+ expertTestTopicjiexiDTOs.Add(ssssss);
+
+ }
+ }
+ dto.expertTestTopicjiexiDTOs = expertTestTopicjiexiDTOs;
+ }
+ else
+ {
+ var ssssss = new ExpertTestTopicjiexiDTO();
+ ssssss.Flag = "A";
+ expertTestTopicjiexiDTOs.Add(ssssss);
+ dto.expertTestTopicjiexiDTOs = expertTestTopicjiexiDTOs;
+ }
-
- var ssssss = new ExpertTestTopicjiexiDTO();
- ssssss.Flag = "A";
- expertTestTopicjiexiDTOs.Add(ssssss);
- dto.expertTestTopicjiexiDTOs = expertTestTopicjiexiDTOs;
+
if (string.IsNullOrEmpty(Topictype))
{
@@ -222,6 +249,7 @@
{
dto.Area = Area;
}
+
}
diff --git a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml
index b098fd2..c5b99fe 100644
--- a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml
@@ -261,11 +261,11 @@
</div>
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">
- 鏄惁绛旀
+ 鏄惁绛旀
</label>
- <div class="col-sm-1 col-md-1" grouptype="Vdata" style="width:5%;">
+ <div class="text-left col-sm-1 col-md-1" grouptype="Vdata" style="width:5%;">
@if ("A" == expertTestTopicanwserDTOs[i].Shifouzhengqu)
{
<input type="checkbox" checked="checked" name="ShifouzhengquName" value="A" onclick="checkShifouzhengqu(this)" />
@@ -741,7 +741,17 @@
var Zhishitype = $("#Zhishitype").val();
var Area = $("#Area").val();
- window.location = "/ExpertTestTopic/Edit?Topictype=" + Topictype + "&Zhishitype=" + Zhishitype + "&Area=" + Area + ""
+ var falvs = document.getElementsByName("Falv");
+
+ var Falv = "";
+
+ for (var i = 0; i < falvs.length; i++) {
+
+ Falv += falvs[i].value + ",";
+ }
+
+
+ window.location = "/ExpertTestTopic/Edit?Topictype=" + Topictype + "&Zhishitype=" + Zhishitype + "&Area=" + Area + "&Falv=" + Falv + ""
if ($.isNumber(imgLoad)) {
parent.layer.close(imgLoad);
}
@@ -877,7 +887,17 @@
var Zhishitype = $("#Zhishitype").val();
var Area = $("#Area").val();
- window.location = "/ExpertTestTopic/Edit?Topictype=" + Topictype + "&Zhishitype=" + Zhishitype + "&Area=" + Area +""
+ var falvs = document.getElementsByName("Falv");
+
+ var Falv = "";
+
+ for (var i = 0; i < falvs.length; i++) {
+
+ Falv += falvs[i].value + ",";
+ }
+
+
+ window.location = "/ExpertTestTopic/Edit?Topictype=" + Topictype + "&Zhishitype=" + Zhishitype + "&Area=" + Area + "&Falv=" + Falv + ""
//try {
// _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
diff --git a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditPeizhi.cshtml b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditPeizhi.cshtml
index 76f8d28..dea13f6 100644
--- a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditPeizhi.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditPeizhi.cshtml
@@ -124,7 +124,7 @@
<div class="clearfix layer-area" style="padding-top:15px;">
<div class="col-sm-12 col-md-12" @*style="width:5%;"*@>
- <font>@expertTestTopicpeizhiDTOs[i].Topictype @expertTestTopicpeizhiDTOs[i].TopictypeName 锛堟暟閲忥細</font> <input style="border:none;width:30px;height:30px;" label="鏁伴噺" name="Fenshuszong" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicpeizhiDTOs[i].zongFenshu" readonly="readonly">
+ <font>@expertTestTopicpeizhiDTOs[i].Topictype @expertTestTopicpeizhiDTOs[i].TopictypeName 锛堟暟閲忥細</font> <input style="width:30px;height:30px;border:0.5px solid #ccc;" label="鏁伴噺" name="Fenshuszong" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicpeizhiDTOs[i].zongFenshu" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" onafterpaste="this.value=this.value.replace(/[^0-9]/g,'')" >
<font> 棰� 鍒嗗�硷細 </font> <input label="缁撹绫诲瀷" name="Fenzhizong" style="width:30px;height:30px;border:0.5px solid #ccc;" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicpeizhiDTOs[i].zongFenzhi" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" onafterpaste="this.value=this.value.replace(/[^0-9]/g,'')"> <font>鍒嗭級 </font>
</div>
@@ -142,8 +142,8 @@
<label class="text-right col-sm-1 col-md-1 control-label">@expertTestTopicpeizhiDTOs[i].ZhishitypeName</label>
- <div class="col-sm-2 col-md-2" style="width:5%;">
- <input class="form-control" label="@expertTestTopicpeizhiDTOs[i].ZhishitypeName" name="Fenshus" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicpeizhiDTOs[i].FenshuName" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" onafterpaste="this.value=this.value.replace(/[^0-9]/g,'')" onchange="checknum('@expertTestTopicpeizhiDTOs[i].Topictype');">
+ <div class="col-sm-2 col-md-2" >
+ <input style="width:30px;height:30px;border:0.5px solid #ccc;" label="@expertTestTopicpeizhiDTOs[i].ZhishitypeName" name="Fenshus" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" ismust="true" type="text" value="@expertTestTopicpeizhiDTOs[i].FenshuName" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" onafterpaste="this.value=this.value.replace(/[^0-9]/g,'')" onchange="checknum('@expertTestTopicpeizhiDTOs[i].Topictype',this);">
<input type="hidden" name="Topictypes" value="@expertTestTopicpeizhiDTOs[i].Topictype" />
<input type="hidden" name="Zhishitypes" value="@expertTestTopicpeizhiDTOs[i].Zhishitype" />
@@ -239,7 +239,7 @@
- var checknum = function (Topictype) {
+ var checknum = function (Topictype,obj) {
var Topictypeszong = document.getElementsByName("Topictypeszong");
var Fenshuszongs = document.getElementsByName("Fenshuszong");
@@ -262,7 +262,16 @@
for (var a = 0; a < Topictypeszong.length; a++) {
if (Topictype == Topictypeszong[a].value) {
- Fenshuszongs[a].value = Fenshuszong;
+ if (Fenshuszongs[a].value == "") {
+ Fenshuszongs[a].value = 0;
+ }
+ if (Fenshuszong > parseInt(Fenshuszongs[a].value))
+ {
+ obj.value = "0";
+ toastr.warning("鐭ヨ瘑鐐归鐩暟閲忎笉鑳藉ぇ浜庢�婚鐩暟閲�");
+ return;
+ }
+ //Fenshuszongs[a].value = Fenshuszong;
}
}
@@ -299,10 +308,106 @@
return;
}
}
-
+
+ var Topictypeszong = document.getElementsByName("Topictypeszong");
+ var Fenshuszongs = document.getElementsByName("Fenshuszong");
+ var Fenshus = document.getElementsByName("Fenshus");
+ var Topictypes = document.getElementsByName("Topictypes");
+
+ var Fenshuszong = 0;
+ for (var j = 0; j < Topictypes.length; j++) {
+
+ if (Topictypes[j].value == "01") {
+
+ if (Fenshus[j].value != "") {
+ Fenshuszong += parseInt(Fenshus[j].value);
+ }
+
+ }
+ }
+
+
+
+ for (var a = 0; a < Topictypeszong.length; a++) {
+
+ if ("01" == Topictypeszong[a].value) {
+ if (Fenshuszongs[a].value == "" ) {
+ Fenshuszongs[a].value = 0;
+ }
+ if (Fenshuszong != parseInt(Fenshuszongs[a].value)) {
+
+ toastr.warning("鍗曢�夐鐭ヨ瘑鐐归鐩暟閲忓繀椤荤瓑浜庢�婚鐩暟閲�");
+ return;
+ }
+ //Fenshuszongs[a].value = Fenshuszong;
+ }
+
+ }
+
+
+ Fenshuszong = 0;
+ for (var j = 0; j < Topictypes.length; j++) {
+
+ if (Topictypes[j].value == "02") {
+
+ if (Fenshus[j].value != "") {
+ Fenshuszong += parseInt(Fenshus[j].value);
+ }
+
+ }
+ }
+
+
+
+ for (var a = 0; a < Topictypeszong.length; a++) {
+
+ if ("02" == Topictypeszong[a].value) {
+ if (Fenshuszongs[a].value == "") {
+ Fenshuszongs[a].value = 0;
+ }
+ if (Fenshuszong != parseInt(Fenshuszongs[a].value)) {
+
+ toastr.warning("澶氶�夐鐭ヨ瘑鐐归鐩暟閲忓繀椤荤瓑浜庢�婚鐩暟閲�");
+ return;
+ }
+ //Fenshuszongs[a].value = Fenshuszong;
+ }
+
+ }
+
+ Fenshuszong = 0;
+ for (var j = 0; j < Topictypes.length; j++) {
+
+ if (Topictypes[j].value == "03") {
+
+ if (Fenshus[j].value != "") {
+ Fenshuszong += parseInt(Fenshus[j].value);
+ }
+
+ }
+ }
+
+
+
+ for (var a = 0; a < Topictypeszong.length; a++) {
+
+ if ("03" == Topictypeszong[a].value) {
+ if (Fenshuszongs[a].value == "") {
+ Fenshuszongs[a].value = 0;
+ }
+ if (Fenshuszong != parseInt(Fenshuszongs[a].value)) {
+
+ toastr.warning("鍒ゆ柇棰樼煡璇嗙偣棰樼洰鏁伴噺蹇呴』绛変簬鎬婚鐩暟閲�");
+ return;
+ }
+ //Fenshuszongs[a].value = Fenshuszong;
+ }
+
+ }
+
// 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",
diff --git a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
index df52f34..b9efc2e 100644
--- a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
@@ -16,17 +16,18 @@
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
{
- label: '棰樺瀷', name: 'TopictypeName', labtype: 'txt', hidden: false, width: 50
+ label: '棰樺瀷', name: 'TopictypeName', labtype: 'txt', hidden: false, width: 40
},
{
- label: '鐭ヨ瘑鐐�', name: 'ZhishitypeName', labtype: 'txt', hidden: false, width: 50
+ label: '鐭ヨ瘑鐐�', name: 'ZhishitypeName', labtype: 'txt', hidden: false, width: 40
},
- { label: '鍖哄煙', name: 'AreaName', labtype: 'txt', hidden: false, width: 50 },
+ { label: '鍖哄煙', name: 'AreaName', labtype: 'txt', hidden: false, width: 40 },
{ label: '璇曢', name: 'Topic', labtype: 'txt', hidden: false, width: 300 },
- { label: '閲嶇偣鏍囨敞', name: 'ZhongdianName', labtype: 'txt', hidden: false, width: 50 },
- { label: '瀹℃牳', name: 'ShenpiStatusName', labtype: 'txt', hidden: false, width: 50 },
- { label: '瑙ｆ瀽', name: 'Jiexi', labtype: 'txt', hidden: false, width: 300 },
+ { label: '绛旀', name: 'Anwsers', labtype: 'txt', hidden: false, width: 40 },
+ { label: '閲嶇偣鏍囨敞', name: 'ZhongdianName', labtype: 'txt', hidden: false, width: 40 },
+ { label: '瀹℃牳', name: 'ShenpiStatusName', labtype: 'txt', hidden: false, width: 40 },
+ { label: '绛旀瀵瑰簲鐨勬硶鏉�', name: 'Jiexi', labtype: 'txt', hidden: false, width: 300 },
{
diff --git a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/print.cshtml b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/print.cshtml
index 6380dab..8ac5d36 100644
--- a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/print.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/print.cshtml
@@ -63,9 +63,10 @@
<td style="width:7%;"> 鐭ヨ瘑鐐�</td>
<td style="width:7%;"> 鍖哄煙</td>
<td style="width:30%;"> 璇曢</td>
+ <td style="width:7%;"> 绛旀</td>
<td style="width:7%;"> 閲嶇偣鏍囨敞</td>
<td style="width:7%;"> 瀹℃牳</td>
- <td style="width:30%;"> 瑙ｆ瀽</td>
+ <td style="width:30%;"> 绛旀瀵瑰簲鐨勬硶鏉�</td>
</tr>
@@ -82,6 +83,7 @@
<td> @Html.Raw(ExpertTestTopicDTO.ZhishitypeName)</td>
<td> @Html.Raw(ExpertTestTopicDTO.AreaName)</td>
<td> @Html.Raw(ExpertTestTopicDTO.Topic)</td>
+ <td> @Html.Raw(ExpertTestTopicDTO.Anwsers)</td>
<td> @Html.Raw(ExpertTestTopicDTO.ZhongdianName)</td>
<td> @Html.Raw(ExpertTestTopicDTO.ShenpiStatusName)</td>
<td> @Html.Raw(ExpertTestTopicDTO.Jiexi)</td>
diff --git a/zhengcaioa/zhengcaioa/Views/SysBaimingdan/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/SysBaimingdan/Edit.cshtml
index 360a824..f1405f8 100644
--- a/zhengcaioa/zhengcaioa/Views/SysBaimingdan/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SysBaimingdan/Edit.cshtml
@@ -10,10 +10,11 @@
controllist = [
{ label: '瑙掕壊淇℃伅', name: 'data', labtype: 'panel',islist:'false', data: [
- {label:' 鐢ㄦ埛id ', name: 'Id', labtype: 'txt', addvisible: false, editvisible: false ,reg:''}
- , { label: ' 鐧藉悕鍗曞悕绉� ', name: 'BaimingdanName', labtype: 'txt', addvisible: true, editvisible: true , reg:'',ismust:true }
- , { label: ' 鐧藉悕鍗曠粍 ', name: 'PostType', labtype: 'combox', addvisible: true, editvisible: true, reg: '', ismust: true, data: JSON.parse(PostType)}
+ { label: ' 鐢ㄦ埛id ', name: 'Id', labtype: 'txt', addvisible: false, editvisible: false, reg: '' }
+ , { label: ' 鐧藉悕鍗曠粍 ', name: 'PostType', labtype: 'combox', addvisible: true, editvisible: true, reg: '', ismust: true, data: JSON.parse(PostType) }
+ , { label: ' 鐧藉悕鍗曞悕绉� ', name: 'BaimingdanName', labtype: 'txt', addvisible: true, editvisible: true , reg:'',ismust:true }
+
, { label: ' 鐘舵�� ', name: 'RecStatus', labtype: 'txt', disabled:false, addvisible: false, editvisible: false ,reg:''}
diff --git a/zhengcaioa/zhengcaioa/Views/SysBaimingdan/Index.cshtml b/zhengcaioa/zhengcaioa/Views/SysBaimingdan/Index.cshtml
index 0091347..09a92a3 100644
--- a/zhengcaioa/zhengcaioa/Views/SysBaimingdan/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SysBaimingdan/Index.cshtml
@@ -8,15 +8,16 @@
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
{
+ label: '鐧藉悕鍗曠粍', name: 'PostTypeName', labtype: 'txt', hidden: false
+
+ },
+ {
label: '鐧藉悕鍗曞悕绉�', name: 'BaimingdanName', labtype: 'txt', hidden: false,
formatter: function (cellvalue, options, rowObject) {
return "<a onclick=\"OpenWindow('" + cellvalue + "','98%','100%', '/SysBaimingdan/Edit?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
}
},
- {
- label: '鐧藉悕鍗曠粍', name: 'PostTypeName', labtype: 'txt', hidden: false
-
- },
+
{ label: '鍒涘缓浜�', name: 'Creater', labtype: 'txt', hidden: true },
{ label: '鍒涘缓鏃堕棿', name: 'Createtime', labtype: 'txt', hidden: true },
--
Gitblit v1.9.1