From 18db26a9759c18cac8fa3df420ff80d9f0de1ed9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 14 十二月 2021 11:11:42 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/OrderBanciOrderService.cs | 9
zhengcaioa/IServices/IOrderBanciService.cs | 3
zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml | 12
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs | 31 +++
zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Index.cshtml | 66 +++++--
zhengcaioa/zhengcaioa/Views/Shared/_Layout_Search.cshtml | 2
zhengcaioa/Services/OrderBanciService.cs | 13 +
zhengcaioa/zhengcaioa/Views/FiAccount/Index.cshtml | 17 +
zhengcaioa/Services/SysCodeService.cs | 4
zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml | 19 +
zhengcaioa/DTO/OrderBanciOrderDTO.cs | 1
zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Indexzhuanjia.cshtml | 159 +++++++++++++++++
zhengcaioa/Services/FiAccountService.cs | 7
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs | 51 +++++
zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/search.js | 10 +
zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml | 17 +
zhengcaioa/DTO/SysCodeDTO.cs | 1
zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml | 52 ++--
zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs | 2
zhengcaioa/DTO/ResultDataEntity.cs | 29 +++
20 files changed, 429 insertions(+), 76 deletions(-)
diff --git a/zhengcaioa/DTO/OrderBanciOrderDTO.cs b/zhengcaioa/DTO/OrderBanciOrderDTO.cs
index 6e7f266..9d47c5f 100644
--- a/zhengcaioa/DTO/OrderBanciOrderDTO.cs
+++ b/zhengcaioa/DTO/OrderBanciOrderDTO.cs
@@ -40,5 +40,6 @@
public string Lianxidianhua { get; set; }
public string BanciId { get; set; }
+ public string Kechengleixings { get; set; }
}
}
diff --git a/zhengcaioa/DTO/ResultDataEntity.cs b/zhengcaioa/DTO/ResultDataEntity.cs
index 02ceb95..1ba3969 100644
--- a/zhengcaioa/DTO/ResultDataEntity.cs
+++ b/zhengcaioa/DTO/ResultDataEntity.cs
@@ -43,6 +43,7 @@
/// 褰撳墠鏌ヨ鎬婚〉鏁� 濡傚�间负0 锛岄渶瑕侀噸鏂版煡璇笅鎬婚〉鏁颁俊鎭紝濡傚ぇ浜�0 鐩存帴浣跨敤
/// </summary>
public int totalrows { get; set; }
+
}
@@ -70,6 +71,34 @@
/// 鎬荤殑椤垫暟
/// </summary>
public int PageTotal { get; set; }
+
+ /// <summary>
+ /// 鍚堣1
+ /// </summary>
+ public decimal Heji1 { get; set; }
+ /// <summary>
+ /// 鍚堣2
+ /// </summary>
+ public decimal Heji2 { get; set; }
+ /// <summary>
+ /// 鍚堣3
+ /// </summary>
+ public decimal Heji3 { get; set; }
+
+ /// <summary>
+ /// 褰撻〉鍚堣1
+ /// </summary>
+ public decimal DangyeHeji1 { get; set; }
+ /// <summary>
+ /// 褰撻〉鍚堣2
+ /// </summary>
+ public decimal DangyeHeji2 { get; set; }
+ /// <summary>
+ /// 褰撻〉鍚堣3
+ /// </summary>
+ public decimal DangyeHeji3 { get; set; }
+
+
/// <summary>
/// 鏄庣粏鏁版嵁
/// </summary>
diff --git a/zhengcaioa/DTO/SysCodeDTO.cs b/zhengcaioa/DTO/SysCodeDTO.cs
index 9238291..dc0260e 100644
--- a/zhengcaioa/DTO/SysCodeDTO.cs
+++ b/zhengcaioa/DTO/SysCodeDTO.cs
@@ -52,6 +52,7 @@
public string Classify1 { set; get; }
+ public string Sort1 { set; get; }
}
diff --git a/zhengcaioa/IServices/IOrderBanciService.cs b/zhengcaioa/IServices/IOrderBanciService.cs
index f5738a0..3249ed2 100644
--- a/zhengcaioa/IServices/IOrderBanciService.cs
+++ b/zhengcaioa/IServices/IOrderBanciService.cs
@@ -17,5 +17,8 @@
ResultEntity ModifyStatus(string id, string userid);
List<OrderBanciDTO> GetList();
+
+
+ OrderBanciDTO GetAll(string id);
}
}
diff --git a/zhengcaioa/Services/FiAccountService.cs b/zhengcaioa/Services/FiAccountService.cs
index 5ff6fa2..0aea685 100644
--- a/zhengcaioa/Services/FiAccountService.cs
+++ b/zhengcaioa/Services/FiAccountService.cs
@@ -144,8 +144,13 @@
//if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
+ data.Heji1 = Math.Round(query.Sum(x => x.AllIncome) ?? 0, 2);
+ data.Heji2 = Math.Round(query.Sum(x => x.AllExpenses ?? 0), 2);
+ data.Heji3 = Math.Round(query.Sum(x => x.Balance ?? 0), 2);
var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
-
+ data.DangyeHeji1 = Math.Round(rolelist.Sum(x => x.AllIncome) ?? 0, 2);
+ data.DangyeHeji2 = Math.Round(rolelist.Sum(x => x.AllExpenses ?? 0), 2);
+ data.DangyeHeji3 = Math.Round(rolelist.Sum(x => x.Balance ?? 0), 2);
data.LoadData(searchEntity, rolelist);
return data;
}
diff --git a/zhengcaioa/Services/OrderBanciOrderService.cs b/zhengcaioa/Services/OrderBanciOrderService.cs
index 2803819..b7b7bc7 100644
--- a/zhengcaioa/Services/OrderBanciOrderService.cs
+++ b/zhengcaioa/Services/OrderBanciOrderService.cs
@@ -147,7 +147,7 @@
&& (string.IsNullOrWhiteSpace(searchEntity.BanciId) || a.BanciId == searchEntity.BanciId.Trim())
-
+ && ((searchEntity.Kechengleixings==null|| searchEntity.Kechengleixings.Length == 0) || searchEntity.Kechengleixings.Split(new char[] { ',' }).Contains(a.KechengleixingId))
@@ -157,7 +157,7 @@
Id = a.Id,
Baomingtime = a.Baomingtime,
- BaomingtimeName = a.Baomingtime.ToString("yyyy-MM-dd"),
+ BaomingtimeName = a.Baomingtime.ToString("yyyy-MM-dd HH:mm"),
BanciId = a.BanciId,
Peixunbanci = a.Peixunbanci,
@@ -189,7 +189,12 @@
//if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
+ data.Heji1 = Math.Round(query.Sum(x => x.Xuefei) ?? 0, 2);
+ data.Heji2 = Math.Round(new decimal(query.Sum(x => x.Baomingrenshu) ?? 0), 2);
+
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ data.DangyeHeji1 = Math.Round(lianlist.Sum(x => x.Xuefei) ?? 0, 2);
+ data.DangyeHeji2 = Math.Round(new decimal(lianlist.Sum(x => x.Baomingrenshu) ?? 0), 2);
data.LoadData(searchEntity, lianlist);
return data;
}
diff --git a/zhengcaioa/Services/OrderBanciService.cs b/zhengcaioa/Services/OrderBanciService.cs
index 6fc9ab1..08cf13b 100644
--- a/zhengcaioa/Services/OrderBanciService.cs
+++ b/zhengcaioa/Services/OrderBanciService.cs
@@ -84,6 +84,19 @@
return result;
}
+ public OrderBanciDTO GetAll(string id)
+ {
+
+ var entity = _context.OrderBancis.Find(id);
+
+
+
+ var result = _mapper.Map<OrderBanciDTO>(entity);
+
+
+ return result;
+ }
+
public ResultDataEntity<OrderBanciDTO> SearchByPaging(OrderBanciDTOSearch searchEntity)
{
diff --git a/zhengcaioa/Services/SysCodeService.cs b/zhengcaioa/Services/SysCodeService.cs
index 73baf70..26a81e3 100644
--- a/zhengcaioa/Services/SysCodeService.cs
+++ b/zhengcaioa/Services/SysCodeService.cs
@@ -411,6 +411,10 @@
{
listCode = listCode.OrderBy(x => x.CodeSn).ToList();
}
+ else if (!string.IsNullOrEmpty(searchEntity.Sort1))
+ {
+ listCode = listCode.OrderBy(x => x.Classify1).ThenBy(x=>x.CodeSn).ToList();
+ }
//if (searchEntity.totalrows == 0)
//{
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
index ff76167..7fe4a39 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
@@ -320,5 +320,36 @@
return new JsonResult(returnMsg);
}
+
+ public IActionResult GetBanciAll(string id)
+ {
+ ReturnMsg<OrderBanciDTO> returnMsg = new ReturnMsg<OrderBanciDTO>();
+ returnMsg.code = 2;
+ try
+ {
+ var orderBanciDTO = _orderBanciService.GetAll(id);
+ if (orderBanciDTO==null)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鏌ヨ鍒扮彮娆�";
+ returnMsg.count = 0;
+ }
+
+ returnMsg.code = 1;
+ returnMsg.count = 1;
+ returnMsg.returnObj = orderBanciDTO;
+ }
+ catch (Exception ex)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ }
+ return new JsonResult(returnMsg);
+
+
+ }
+
}
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
index f239ecc..3c940aa 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
@@ -81,9 +81,10 @@
ViewData["ActionInfo"] = actionlist;
- ViewBag.kechengleixing = _liaotianService.GetSYScode("order_banci_order", "kechengleixing_id").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+ ViewBag.kechengleixing = _liaotianService.GetSYScode("order_banci_order", "kechengleixing_id").Where(x=>x.CodeSn=="3").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
-
+ ViewBag.Baomingtimebegin = DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
return View();
@@ -95,8 +96,54 @@
return new JsonResult(_orderBanciOrderService.SearchByPaging(search));
}
+ [CheckLogin]
+ public IActionResult Indexzhuanjia()
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ List<ActionEntity> actionlist = new List<ActionEntity>();
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ 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);
+ ActionEntity actionEntity3 = new ActionEntity();
+ actionEntity3.OpenType = 0;
+ actionEntity3.ActionUrl = "";
+ actionEntity3.ActionFun = "Print";
+ actionEntity3.PageIco = "fa fa-print";
+ actionEntity3.ActionName = "鎵撳嵃";
+ actionlist.Add(actionEntity3);
+ ActionEntity actionEntity4 = new ActionEntity();
+ actionEntity4.OpenType = 0;
+ actionEntity4.ActionUrl = "";
+ actionEntity4.ActionFun = "Duanxin";
+ actionEntity4.PageIco = "";
+ actionEntity4.ActionName = "鍙戦�佺煭淇�";
+ actionlist.Add(actionEntity4);
+
+ ViewData["ActionInfo"] = actionlist;
+
+ ViewBag.kechengleixing = _liaotianService.GetSYScode("order_banci_order", "kechengleixing_id").Where(x => x.CodeSn != "3").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+
+ ViewBag.Baomingtimebegin = DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
+
+ return View();
+
+ }
+
[CheckLogin]
public IActionResult print(OrderBanciOrderDTOSearch search)
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs b/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
index ef524e0..ec2426d 100644
--- a/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
@@ -682,7 +682,7 @@
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
searchEntity.CodeTable = "t_complaint_items";
searchEntity.CodeField = "law";
- searchEntity.Sort = "CodeSn";
+ searchEntity.Sort1 = "CodeSn";
ResultDataEntity<SysCodeDtlEntity> resultDataEntity = _sysCodeService.SearchSysCodeDtlPaging(searchEntity);
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
index 426e7f8..feeab8f 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
@@ -584,10 +584,11 @@
<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 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;">
@@ -623,9 +624,13 @@
</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>
+ @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>
+ </div>
+ }
+
</div>
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
index 1441ce3..f147898 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
@@ -305,10 +305,11 @@
<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 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;">
@@ -344,9 +345,13 @@
</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>
+ @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>
+ </div>
+ }
+
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -398,6 +403,8 @@
<button type="button" class="addBtn" onclick="addrequestinfo(this)" data-type="1">鏂板璐ㄧ枒璇锋眰</button>
</div>
+
+
</div>
diff --git a/zhengcaioa/zhengcaioa/Views/FiAccount/Index.cshtml b/zhengcaioa/zhengcaioa/Views/FiAccount/Index.cshtml
index 11cd171..c792538 100644
--- a/zhengcaioa/zhengcaioa/Views/FiAccount/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/FiAccount/Index.cshtml
@@ -50,17 +50,18 @@
}
- var _afterLoadData = function () {
+ var _afterLoadDataload = function (xhr) {
- var rows = jQuery("#jqGrid").jqGrid("getRowData"), total_shouru = 0, total_zhuchu = 0, total_yue = 0;
- for (var i = 0, l = rows.length; i < l; i++) {
- total_shouru += (rows[i].AllIncome - 0);
- total_zhuchu += (rows[i].AllExpenses - 0);
- total_yue += (rows[i].Balance - 0);
- }
+ //var rows = jQuery("#jqGrid").jqGrid("getRowData"), total_shouru = 0, total_zhuchu = 0, total_yue = 0;
+ //for (var i = 0, l = rows.length; i < l; i++) {
+ // total_shouru += (rows[i].AllIncome - 0);
+ // total_zhuchu += (rows[i].AllExpenses - 0);
+ // total_yue += (rows[i].Balance - 0);
+ //}
- jQuery("#jqGrid").jqGrid("footerData", "set", { QiyongStatusName: "<font color='darkgoldenrod'>--鍚堣--</font>", AllIncome: "<font color='darkgoldenrod'>" + total_shouru + "</font>", AllExpenses: "<font color='darkgoldenrod'>" + total_zhuchu + "</font>", Balance: "<font color='darkgoldenrod'>" + total_yue + "</font>" });
+ jQuery("#jqGrid").jqGrid("footerData", "set", { QiyongStatusName: "<font color='darkgoldenrod'>--褰撻〉鍚堣--</font> </br> <font color='darkgoldenrod'>--鍚堣--</font>", AllIncome: "<font color='darkgoldenrod'>" + xhr.DangyeHeji1 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji1 + "</font>", AllExpenses: "<font color='darkgoldenrod'>" + xhr.DangyeHeji2 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji2 + "</font>", Balance: "<font color='darkgoldenrod'>" + xhr.DangyeHeji3 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji3 + "</font>" });
+
};
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Index.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Index.cshtml
index e25057b..2f83fd4 100644
--- a/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Index.cshtml
@@ -5,30 +5,32 @@
@section headerStyle{
<script type="text/javascript">
var kechengleixing = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.kechengleixing))';
+ var Baomingtimebegin = '@Html.Raw(ViewBag.Baomingtimebegin)';
+ var Baomingtimeend = '@Html.Raw(ViewBag.Baomingtimeend)';
gridConfig = { multiselect: true, selectcol: "Id" };
loseherght = 40;
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
{
- label: '鎶ュ悕鏃堕棿', name: 'BaomingtimeName', labtype: 'txt', hidden: false, width: 100
+ label: '鎶ュ悕鏃堕棿', name: 'BaomingtimeName', labtype: 'txt', hidden: false, width: 70
//,
//formatter: function (cellvalue, options, rowObject) {
// return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/OrderBanciOrder/Edit?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
//}
},
{ label: '鍩硅鐝', name: 'Peixunbanci', labtype: 'txt', hidden: false, width: 100 },
- { label: '璇剧▼绫诲瀷', name: 'Kechengleixing', labtype: 'txt', hidden: false, width: 100 },
- { label: '濮撳悕', name: 'Xingming', labtype: 'txt', hidden: false, width: 100 },
- { label: '鑱旂郴鐢佃瘽', name: 'Lianxidianhua', labtype: 'txt', hidden: false, width: 100 },
- { label: '韬唤璇�', name: 'Shenfenzheng', labtype: 'txt', hidden: false, width: 100 },
- { label: '瀛﹁垂', name: 'Xuefei', labtype: 'txt', hidden: false, width: 100 },
- { label: '鎶ュ悕浜烘暟', name: 'Baomingrenshu', labtype: 'txt', hidden: false, width: 100 },
+ { label: '璇剧▼绫诲瀷', name: 'Kechengleixing', labtype: 'txt', hidden: false, width: 300 },
+ { label: '濮撳悕', name: 'Xingming', labtype: 'txt', hidden: false, width: 70 },
+ { label: '鑱旂郴鐢佃瘽', name: 'Lianxidianhua', labtype: 'txt', hidden: false, width: 70 },
+ { label: '韬唤璇�', name: 'Shenfenzheng', labtype: 'txt', hidden: false, width: 70 },
+ { label: '瀛﹁垂', name: 'Xuefei', labtype: 'txt', hidden: false, width: 70 },
+ { label: '鎶ュ悕浜烘暟', name: 'Baomingrenshu', labtype: 'txt', hidden: false, width: 50 },
//{ label: '閲戦', name: 'Jine', labtype: 'txt', hidden: false, width: 100 },
];
- dataUrl = "/OrderBanciOrder/GetList";
+ dataUrl = "/OrderBanciOrder/GetList?Kechengleixings=3&Baomingtime=" + Baomingtimebegin + "|" + Baomingtimeend;
searchCol = [
{ label: '鎶ュ悕鏃堕棿', name: 'Baomingtime', labtype: 'datearea', hidden: false },
{ label: '鍩硅鐝', name: 'Peixunbanci', labtype: 'txt', hidden: false },
@@ -46,16 +48,29 @@
// OpenWindow("鏂板鐝", "98%", "90%", "/OrderBanciOrder/Edit/");
//}
- var _afterLoadData = function () {
-
- var rows = jQuery("#jqGrid").jqGrid("getRowData"), total_Xuefei = 0, total_Baomingrenshu = 0;
- for (var i = 0, l = rows.length; i < l; i++) {
- total_Xuefei += (rows[i].Xuefei - 0);
- total_Baomingrenshu += (rows[i].Baomingrenshu - 0);
+ var _pageSearch = function () {
+ $("#jqGrid").jqGrid('setGridParam', {
+ url: '/OrderBanciOrder/GetList?Kechengleixings=3', postData: jsons, page: 1
+ }); //閲嶆柊杞藉叆
+ var jsons = GetSearchEnd();
+ if (jsons == false) {
+ msg.info("璇峰綍鍏ユ煡璇㈡潯浠�");
+ return false;
}
+ LoadGrid(jsons);
+ }
- jQuery("#jqGrid").jqGrid("footerData", "set", { Shenfenzheng: "<font color='darkgoldenrod'>--鍚堣--</font>", Xuefei: "<font color='darkgoldenrod'>" + total_Xuefei + "</font>", Baomingrenshu: "<font color='darkgoldenrod'>" + total_Baomingrenshu + "</font>" });
-
+ var _afterLoadDataload = function (xhr) {
+ //console.info(xhr);
+ //var rows = jQuery("#jqGrid").jqGrid("getRowData"), total_Xuefei = 0, total_Baomingrenshu = 0;
+ //for (var i = 0, l = rows.length; i < l; i++) {
+ // total_Xuefei += (rows[i].Xuefei - 0);
+ // total_Baomingrenshu += (rows[i].Baomingrenshu - 0);
+ //}
+
+ jQuery("#jqGrid").jqGrid("footerData", "set", { Shenfenzheng: "<font color='darkgoldenrod'>--褰撻〉鍚堣--</font> </br> <font color='darkgoldenrod'>--鍚堣--</font>", Xuefei: "<font color='darkgoldenrod'>" + xhr.DangyeHeji1 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji1 + "</font>", Baomingrenshu: "<font color='darkgoldenrod'>" + xhr.DangyeHeji2 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji2 + "</font>" } );
+
+
};
@@ -103,7 +118,7 @@
var Kechengleixing = $("#PBSKechengleixing").val();
var Xingming = $("#PBSXingming").val();
var Lianxidianhua = $("#PBSLianxidianhua").val();
-
+
var Createtimestart = $("#PBSCreatetimestart").val();
@@ -115,12 +130,27 @@
}
- var url = "/OrderBanciOrder/print?Baomingtime=" + Baomingtime + "&Peixunbanci=" + Peixunbanci + "&Kechengleixing=" + Kechengleixing + "&Xingming=" + Xingming + "&Lianxidianhua=" + Lianxidianhua;
+ var url = "/OrderBanciOrder/print?Kechengleixings=3&Baomingtime=" + Baomingtime + "&Peixunbanci=" + Peixunbanci + "&Kechengleixing=" + Kechengleixing + "&Xingming=" + Xingming + "&Lianxidianhua=" + Lianxidianhua;
var me = window.open(url, "鎵撳嵃"); //鎵撳紑鏂扮獥鍙�
}
+
+ $(function () {
+
+
+
+ $("#PBSBaomingtimeend").val(Baomingtimeend);
+
+ $("#PBSBaomingtimestart").val(Baomingtimebegin);
+
+
+
+
+ });
+
+
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Indexzhuanjia.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Indexzhuanjia.cshtml
new file mode 100644
index 0000000..d951b06
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Indexzhuanjia.cshtml
@@ -0,0 +1,159 @@
+锘緻{
+ ViewBag.Title = "OrderBanciOrder";
+ Layout = "~/Views/Shared/_Layout_Search.cshtml";
+}
+@section headerStyle{
+ <script type="text/javascript">
+ var kechengleixing = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.kechengleixing))';
+ var Baomingtimebegin = '@Html.Raw(ViewBag.Baomingtimebegin)';
+ var Baomingtimeend = '@Html.Raw(ViewBag.Baomingtimeend)';
+ gridConfig = { multiselect: true, selectcol: "Id" };
+ loseherght = 40;
+ dataCol = [
+ { label: 'id', name: 'Id', labtype: 'txt', hidden: true },
+
+ {
+ label: '鎶ュ悕鏃堕棿', name: 'BaomingtimeName', labtype: 'txt', hidden: false, width: 70
+ //,
+ //formatter: function (cellvalue, options, rowObject) {
+ // return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/OrderBanciOrder/Edit?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
+ //}
+ },
+ { label: '鍩硅鐝', name: 'Peixunbanci', labtype: 'txt', hidden: false, width: 300 },
+ { label: '璇剧▼绫诲瀷', name: 'Kechengleixing', labtype: 'txt', hidden: false, width: 70 },
+ { label: '濮撳悕', name: 'Xingming', labtype: 'txt', hidden: false, width: 70 },
+ { label: '鑱旂郴鐢佃瘽', name: 'Lianxidianhua', labtype: 'txt', hidden: false, width: 70 },
+ { label: '韬唤璇�', name: 'Shenfenzheng', labtype: 'txt', hidden: false, width: 70 },
+ { label: '瀛﹁垂', name: 'Xuefei', labtype: 'txt', hidden: false, width: 70 },
+ { label: '鎶ュ悕浜烘暟', name: 'Baomingrenshu', labtype: 'txt', hidden: false, width: 50 },
+ //{ label: '閲戦', name: 'Jine', labtype: 'txt', hidden: false, width: 100 },
+
+
+ ];
+ dataUrl = "/OrderBanciOrder/GetList?Kechengleixings=0,1,2&Baomingtime=" + Baomingtimebegin + "|" + Baomingtimeend;
+ searchCol = [
+ { label: '鎶ュ悕鏃堕棿', name: 'Baomingtime', labtype: 'datearea', hidden: false },
+ { label: '鍩硅鐝', name: 'Peixunbanci', labtype: 'txt', hidden: false },
+ { label: '璇剧▼绫诲瀷', name: 'Kechengleixing', labtype: 'combox', hidden: false, data: JSON.parse(kechengleixing)/*, cwidth: '5%', cccwidth: '8%' */ },
+ { label: '濮撳悕', name: 'Xingming', labtype: 'txt', hidden: false },
+ { label: '鑱旂郴鐢佃瘽', name: 'Lianxidianhua', labtype: 'txt', hidden: false },
+
+
+
+
+
+
+ ];
+ //var _pageAdd = function () {
+ // OpenWindow("鏂板鐝", "98%", "90%", "/OrderBanciOrder/Edit/");
+ //}
+ var _pageSearch = function () {
+ $("#jqGrid").jqGrid('setGridParam', {
+ url: '/OrderBanciOrder/GetList?Kechengleixings=0,1,2', postData: jsons, page: 1
+ }); //閲嶆柊杞藉叆
+ var jsons = GetSearchEnd();
+ if (jsons == false) {
+ msg.info("璇峰綍鍏ユ煡璇㈡潯浠�");
+ return false;
+ }
+ LoadGrid(jsons);
+ }
+ var _afterLoadDataload = function (xhr) {
+ //console.info(xhr);
+ //var rows = jQuery("#jqGrid").jqGrid("getRowData"), total_Xuefei = 0, total_Baomingrenshu = 0;
+ //for (var i = 0, l = rows.length; i < l; i++) {
+ // total_Xuefei += (rows[i].Xuefei - 0);
+ // total_Baomingrenshu += (rows[i].Baomingrenshu - 0);
+ //}
+
+ jQuery("#jqGrid").jqGrid("footerData", "set", { Shenfenzheng: "<font color='darkgoldenrod'>--褰撻〉鍚堣--</font> </br> <font color='darkgoldenrod'>--鍚堣--</font>", Xuefei: "<font color='darkgoldenrod'>" + xhr.DangyeHeji1 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji1 + "</font>", Baomingrenshu: "<font color='darkgoldenrod'>" + xhr.DangyeHeji2 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji2 + "</font>" });
+
+
+
+ };
+
+
+ var _afterSave = function (result) {
+ if (result) {
+ toastr.success("淇濆瓨鎴愬姛");
+ } else {
+ toastr.error("淇濆瓨澶辫触");
+ }
+ }
+
+ var _afterDel = function (result) {
+ if (result) {
+ toastr.success("鍒犻櫎鎴愬姛");
+ } else {
+ /**/
+ toastr.error("鍒犻櫎鎴愬姛");
+ /**/
+ }
+ }
+
+ var _pageDuanxin = function () {
+ var duanxin = GetGridSelect();
+ var baifangid = "";
+ if (duanxin != '') {
+ for (var i = 0; i < duanxin.length; i++) {
+ baifangid += duanxin[i] + ','
+ }
+ baifangid = baifangid.substring(0, baifangid.length - 1);
+ } else {
+ toastr.error("璇烽�夋嫨璁㈠崟");
+ return;
+ }
+
+ OpenWindow("缇ゅ彂鐭俊", "50%", "50%", "/OrderBanciOrder/Duanxin?id=" + baifangid);
+
+ }
+
+
+ var _pagePrint = function () {
+
+ var Baomingtime = $("#PBSBaomingtime").val();
+ var Peixunbanci = $("#PBSPeixunbanci").val();
+ var Kechengleixing = $("#PBSKechengleixing").val();
+ var Xingming = $("#PBSXingming").val();
+ var Lianxidianhua = $("#PBSLianxidianhua").val();
+
+
+
+ var Createtimestart = $("#PBSCreatetimestart").val();
+
+ var Createtimeend = $("#PBSCreatetimeend").val();
+ var Createtime = '';
+ if (Createtimestart != '' && Createtimeend != '') {
+ Createtime = Createtimestart + '|' + Createtimeend;
+ }
+
+
+ var url = "/OrderBanciOrder/print?Kechengleixings=0,1,2&Baomingtime=" + Baomingtime + "&Peixunbanci=" + Peixunbanci + "&Kechengleixing=" + Kechengleixing + "&Xingming=" + Xingming + "&Lianxidianhua=" + Lianxidianhua;
+ var me = window.open(url, "鎵撳嵃"); //鎵撳紑鏂扮獥鍙�
+
+
+ }
+ $(function () {
+
+
+
+ $("#PBSBaomingtimeend").val(Baomingtimeend);
+
+ $("#PBSBaomingtimestart").val(Baomingtimebegin);
+
+
+
+
+ });
+ </script>
+}
+
+@section footerScripts{
+ <script type="text/javascript">
+
+
+
+
+
+ </script>
+}
diff --git a/zhengcaioa/zhengcaioa/Views/Shared/_Layout_Search.cshtml b/zhengcaioa/zhengcaioa/Views/Shared/_Layout_Search.cshtml
index ad6c95d..a46e601 100644
--- a/zhengcaioa/zhengcaioa/Views/Shared/_Layout_Search.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Shared/_Layout_Search.cshtml
@@ -57,7 +57,7 @@
<script src="~/js/plugins/search/searchtoolbar.js?v=20"></script>
<script src="~/js/plugins/chosen/chosen.jquery.js"></script>
<script src="~/js/plugins/iCheck/icheck.min.js"></script>
- <script src="~/js/plugins/search/search.js?v=11111111111"></script>
+ <script src="~/js/plugins/search/search.js?v=1111111111111"></script>
<script src="~/js/plugins/datapicker/bootstrap-datepicker.js"></script>
<script type="text/javascript" src="~/js/plugins/treeview/bootstrap-treeview.js"></script>
<script src="~/js/TUJS.js"></script>
diff --git a/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml b/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml
index 88b471b..3006bb0 100644
--- a/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml
@@ -105,7 +105,33 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
+ <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>
@@ -168,33 +194,7 @@
</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>
diff --git a/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml b/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml
index a8b86b7..babd592 100644
--- a/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml
@@ -9,6 +9,10 @@
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
{
+ label: '璐ㄧ枒浜嬮」', name: 'Classify1Name', labtype: 'txt', hidden: false, width: 300,
+
+ },
+ {
label: '缂栫爜', name: 'CodeSn', labtype: 'txt', hidden: false, width: 50,
formatter: function (cellvalue, options, rowObject) {
return "<a onclick=\"OpenWindow('" + rowObject.Comments + "','98%','100%', '/SysCode/Editlaw?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
@@ -26,10 +30,7 @@
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 },
@@ -40,11 +41,12 @@
];
dataUrl = "/SysCode/GetListlaw";
searchCol = [
+ { label: '璐ㄧ枒浜嬮」', name: 'Classify1', labtype: 'combox', hidden: false, data: JSON.parse(question) },
{ label: '缂栫爜', name: 'CodeSn', 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)},
+
];
diff --git a/zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/search.js b/zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/search.js
index b87836c..33dd3ca 100644
--- a/zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/search.js
+++ b/zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/search.js
@@ -214,6 +214,13 @@
totalrows: "Records" // 琛ㄧず闇�浠嶴erver寰楀埌鎬诲叡澶氬皯琛屾暟鎹殑鍙傛暟鍚嶇О锛屽弬瑙乯qGrid閫夐」涓殑rowTotal
},
gridComplete: completeMethod,
+ loadComplete: function loadcompleteMethod(xhr) {
+
+ if (typeof (_afterLoadDataload) === "function") {
+ _afterLoadDataload(xhr);
+ }
+
+ },
multiselect: gridConfig.multiselect
, beforeRequest: BeforeRequest
});
@@ -321,4 +328,7 @@
_afterLoadData();
}
+
+
+
}
\ No newline at end of file
--
Gitblit v1.9.1