From b453cf9981a555261a589862f19ce26be18aee22 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 10 十一月 2022 10:32:18 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs | 64 ++++++++++++
zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Edit.cshtml | 14 ++
zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml | 2
zhengcaioa/zhengcaioa/Views/OrderBanciOrder/IndexGuwen.cshtml | 165 +++++++++++++++++++++++++++++++++
4 files changed, 240 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
index 3588b97..83c6d9d 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
@@ -179,7 +179,7 @@
var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
ViewData["ActionInfo2"] = pageEntities2;
- 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.kechengleixing = _liaotianService.GetSYScode("order_banci_order", "kechengleixing_id").Where(x => x.CodeSn != "3" && x.CodeSn != "7").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");
@@ -188,6 +188,68 @@
}
+
+ [CheckLogin]
+ public IActionResult IndexGuwen()
+ {
+ 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);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/OrderBanciOrder/IndexGuwen/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ foreach (var pageEntity in pageEntities1)
+ {
+ ActionEntity actionEntity1 = new ActionEntity();
+ actionEntity1.OpenType = pageEntity.OpenType;
+ actionEntity1.ActionUrl = "";
+ actionEntity1.ActionFun = pageEntity.PageShortcut;
+ actionEntity1.PageIco = pageEntity.PageIco;
+ actionEntity1.ActionName = pageEntity.PageName;
+ actionlist.Add(actionEntity1);
+ }
+
+ ViewData["ActionInfo"] = actionlist;
+
+ ViewBag.kechengleixing = _liaotianService.GetSYScode("order_banci_order", "kechengleixing_id").Where(x => x.CodeSn == "7").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 Printhetong(string id = null)
{
diff --git a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml
index ef5ae12..dbeab5c 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml
@@ -361,7 +361,7 @@
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鎺堜俊棰濆害</label>
<div class="col-sm-2 col-md-2" grouptype="Vdata">
- <input class="form-control" label="瀹㈡埛鍚嶇О" readonly="readonly" name="Shouxinedu" id="Shouxinedu" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@(Model.Shouxinedu.HasValue?Model.Shouxinedu.Value.ToString("f2"):"")" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ <input class="form-control" label="瀹㈡埛鍚嶇О" name="Shouxinedu" id="Shouxinedu" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@(Model.Shouxinedu.HasValue?Model.Shouxinedu.Value.ToString("f2"):"")" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
diff --git a/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Edit.cshtml
index 71a3495..1e04847 100644
--- a/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Edit.cshtml
@@ -173,8 +173,8 @@
<div class="clearfix layer-area" style="padding-bottom:15px;" id="AccountSubject">
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璐︽埛鍚嶇О<i class="red">*</i></label>
- <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label" id="AccountSubject1" >璐︽埛鍚嶇О<i class="red">*</i></label>
+ <div class="col-sm-2 col-md-2" grouptype="Vdata" id="AccountSubject2" >
<select id="AccountId" class="form-control" name="AccountId" data-placeholder="閫夋嫨 搴忓垪 ...">
<option value="" hassubinfo="true">璇烽�夋嫨</option>
@@ -357,6 +357,14 @@
} else {
$("#AccountSubject").show();
}
+ if (PayType == "04" || PayType == "05") {
+ $("#AccountSubject1").hide();
+ $("#AccountSubject2").hide();
+ } else {
+ $("#AccountSubject1").show();
+ $("#AccountSubject2").show();
+ }
+
$.ajax({
type: "GET",
url: "/FiAccountIncome/getAccount?Accounttype=" + PayType,
@@ -372,7 +380,7 @@
if (data.length > 0) {
for (var i = 0; i < data.length; i++) {
- var o = '<option value="' + data[i].Id + '" hassubinfo="true">' + data[i].Accountname + '</option>';
+ var o = '<option value="' + data[i].Id + '" hassubinfo="true" selected="selected" >' + data[i].Accountname + '</option>';
city.append(o);
}
}
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/IndexGuwen.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/IndexGuwen.cshtml
new file mode 100644
index 0000000..9f2a763
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/IndexGuwen.cshtml
@@ -0,0 +1,165 @@
+锘緻{
+ 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: 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: true, width: 70 },
+ { label: '瀛﹁垂', name: 'Xuefei', labtype: 'txt', hidden: true, width: 70 },
+ { label: '鎶ュ悕浜烘暟', name: 'Baomingrenshu', labtype: 'txt', hidden: true, width: 50 },
+ //{ label: '閲戦', name: 'Jine', labtype: 'txt', hidden: false, width: 100 },
+ { label: '绉垎', name: 'Jifen', labtype: 'txt', hidden: true, width: 50 },
+
+ ];
+ dataUrl = "/OrderBanciOrder/GetList?Kechengleixings=7&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=7', 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=7&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>
+}
--
Gitblit v1.9.1