From 827b416782eda317a6b24e0afb88c788e483b86d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 22 八月 2022 15:58:31 +0800
Subject: [PATCH] 财务修改单页统计，摘要订单号
---
zhengcaioa/zhengcaioa/Views/FiAccountIncome/Index.cshtml | 26 ++++-
zhengcaioa/IServices/IFiAccountRecordService.cs | 2
zhengcaioa/zhengcaioa/Views/FiAccountIncome/PrintAll.cshtml | 10 +
zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml | 13 ++
zhengcaioa/Services/HrDeptService.cs | 2
zhengcaioa/zhengcaioa/Views/FiAccount/Liushuizhang.cshtml | 22 +++
zhengcaioa/zhengcaioa/Views/FiAccountExpenses/Index.cshtml | 24 ++++
zhengcaioa/Services/FiBookService.cs | 8
zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml | 2
zhengcaioa/DTO/FiOrderrecievemoneyDTO.cs | 1
zhengcaioa/Services/CooperOrderService.cs | 16 +++
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 29 ++++-
zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs | 29 +++++
zhengcaioa/DTO/FiAccountRecordDTO.cs | 3
zhengcaioa/Services/FiAccountRecordService.cs | 41 ++++++--
zhengcaioa/zhengcaioa/Views/FiAccountIncome/print.cshtml | 30 +++--
zhengcaioa/DTO/CooperOrderDTO.cs | 1
zhengcaioa/Services/HrPositionService.cs | 2
zhengcaioa/Services/FiMemberService.cs | 8
zhengcaioa/Services/FiOrderrecievemoneyService.cs | 14 ++
20 files changed, 221 insertions(+), 62 deletions(-)
diff --git a/zhengcaioa/DTO/CooperOrderDTO.cs b/zhengcaioa/DTO/CooperOrderDTO.cs
index d71abc5..b75b940 100644
--- a/zhengcaioa/DTO/CooperOrderDTO.cs
+++ b/zhengcaioa/DTO/CooperOrderDTO.cs
@@ -26,6 +26,7 @@
public string Remark { get; set; }
public string RecStatus { get; set; }
public string Creater { get; set; }
+ public string CreaterName { get; set; }
public DateTime Createtime { get; set; }
public string Modifier { get; set; }
public DateTime Modifytime { get; set; }
diff --git a/zhengcaioa/DTO/FiAccountRecordDTO.cs b/zhengcaioa/DTO/FiAccountRecordDTO.cs
index e7b3778..10e48b1 100644
--- a/zhengcaioa/DTO/FiAccountRecordDTO.cs
+++ b/zhengcaioa/DTO/FiAccountRecordDTO.cs
@@ -25,6 +25,7 @@
public string Remark { get; set; }
public string RecStatus { get; set; }
public string Creater { get; set; }
+ public string CreaterName { get; set; }
public string CreatetimeName { get; set; }
public DateTime Createtime { get; set; }
public string Modifier { get; set; }
@@ -55,5 +56,7 @@
public string CreaterName { get; set; }
public string RecordTypeId { get; set; }
+
+ public string Remark { get; set; }
}
}
diff --git a/zhengcaioa/DTO/FiOrderrecievemoneyDTO.cs b/zhengcaioa/DTO/FiOrderrecievemoneyDTO.cs
index 3a86a77..6774a32 100644
--- a/zhengcaioa/DTO/FiOrderrecievemoneyDTO.cs
+++ b/zhengcaioa/DTO/FiOrderrecievemoneyDTO.cs
@@ -15,6 +15,7 @@
public string Remark { get; set; }
public string RecStatus { get; set; }
public string Creater { get; set; }
+ public string CreaterName { get; set; }
public DateTime Createtime { get; set; }
public string Modifier { get; set; }
public DateTime Modifytime { get; set; }
diff --git a/zhengcaioa/IServices/IFiAccountRecordService.cs b/zhengcaioa/IServices/IFiAccountRecordService.cs
index 0da6732..288b6ad 100644
--- a/zhengcaioa/IServices/IFiAccountRecordService.cs
+++ b/zhengcaioa/IServices/IFiAccountRecordService.cs
@@ -15,6 +15,6 @@
ResultEntity ModifyStatus(string id, string userid);
- List<FiAccountRecordDTO> GetList(string OperationalMatters = null);
+ List<FiAccountRecordDTO> GetList(string OperationalMatters = null, string Remark = null);
}
}
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index 03ed8db..6226e19 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -245,6 +245,11 @@
into msssss
from mmm in msssss.DefaultIfEmpty()
+ join n in _context.PltUsers
+ on a.Creater equals n.Id
+ into nsssss
+ from nnn in nsssss.DefaultIfEmpty()
+
where a.RecStatus == "A"
&& (string.IsNullOrWhiteSpace(searchEntity.XdTime) || (a.XdTime >= XdTimestart && a.XdTime <= XdTimeend))
&& (string.IsNullOrWhiteSpace(searchEntity.Ywjl) || ggg.Ywjl == searchEntity.Ywjl.Trim())
@@ -289,7 +294,8 @@
Remark = a.Remark,
Creater = a.Creater,
- Createtime = a.Createtime,
+ CreaterName = nnn.UserName,
+ Createtime = a.Createtime,
RecStatus = a.RecStatus,
Modifier = a.Modifier,
@@ -341,7 +347,15 @@
//if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
+ data.Heji1 = Math.Round(query.Sum(x => x.OrderNum) ?? 0, 2);
+ data.Heji2 = Math.Round(query.Sum(x => x.Price) ?? 0, 2);
+ data.Heji3 = Math.Round(query.Sum(x => x.Money) ?? 0, 2);
+ data.Heji4 = Math.Round(query.Sum(x => x.Youhui) ?? 0, 2);
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ data.DangyeHeji1 = Math.Round(lianlist.Sum(x => x.OrderNum) ?? 0, 2);
+ data.DangyeHeji2 = Math.Round(lianlist.Sum(x => x.Price) ?? 0, 2);
+ data.DangyeHeji3 = Math.Round(lianlist.Sum(x => x.Money) ?? 0, 2);
+ data.DangyeHeji4 = Math.Round(lianlist.Sum(x => x.Youhui) ?? 0, 2);
data.LoadData(searchEntity, lianlist);
return data;
}
diff --git a/zhengcaioa/Services/FiAccountRecordService.cs b/zhengcaioa/Services/FiAccountRecordService.cs
index e2e5487..42a09c7 100644
--- a/zhengcaioa/Services/FiAccountRecordService.cs
+++ b/zhengcaioa/Services/FiAccountRecordService.cs
@@ -116,12 +116,28 @@
}
var query = (from a in _context.FiAccountRecords//.Where(x => x.RecStatus == "A")
join z in _context.FiAccounts on a.AccountId equals z.Id
+
join b in listCode.Where(x => x.CodeTable == "fi_account" && x.CodeField == "accounttype")
on z.Accounttype equals b.CodeSn
+ into bsss
+ from bbb in bsss.DefaultIfEmpty()
+
+
join c in listCode.Where(x => x.CodeTable == "fi_account_record" && x.CodeField == "RecordTypeId")
on a.RecordTypeId equals c.CodeSn
+ into csss
+ from ccc in csss.DefaultIfEmpty()
+
+
join f in _context.FiSubjects on a.SubjectId equals f.Id
+ into fsss
+ from fff in fsss.DefaultIfEmpty()
+
+
join y in _context.PltUsers on a.Creater equals y.Id
+ into ysss
+ from yyy in ysss.DefaultIfEmpty()
+
where a.RecStatus == "A"
&& (string.IsNullOrWhiteSpace(searchEntity.Createtime) || (a.Createtime >= XdTimestart && a.Createtime <= XdTimeend))
&& (string.IsNullOrWhiteSpace(searchEntity.Accounttype) || z.Accounttype == searchEntity.Accounttype.Trim())
@@ -130,22 +146,23 @@
&& (string.IsNullOrWhiteSpace(searchEntity.OperationalMatters) || a.OperationalMatters.Contains(searchEntity.OperationalMatters.Trim()))
&& (string.IsNullOrWhiteSpace(searchEntity.PaymentUnit) || a.PaymentUnit.Contains(searchEntity.PaymentUnit.Trim()))
- && (string.IsNullOrWhiteSpace(searchEntity.CreaterName) || y.UserName.Contains(searchEntity.CreaterName.Trim()))
+ && (string.IsNullOrWhiteSpace(searchEntity.CreaterName) || yyy.UserName.Contains(searchEntity.CreaterName.Trim()))
&& (string.IsNullOrWhiteSpace(searchEntity.RecordTypeId) || a.RecordTypeId == searchEntity.RecordTypeId.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.RecordTypeId) || a.RecordTypeId == searchEntity.RecordTypeId.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.Remark) || a.Remark.Contains(searchEntity.Remark.Trim()))
select new FiAccountRecordDTO
{
Id = a.Id,
SubjectId = a.SubjectId,
- SubjectName = f.Subjectname,
+ SubjectName = fff.Subjectname,
AccountId = a.AccountId,
AccountName = z.Accountname,
Accounttype = z.Accounttype,
- AccounttypeName = b.Comments,
+ AccounttypeName = bbb.Comments,
RecordTypeId = a.RecordTypeId,
- RecordTypeName = c.Comments,
+ RecordTypeName = ccc.Comments,
Department = a.Department,
Money = a.Money,
PaymentUnit = a.PaymentUnit,
@@ -154,6 +171,7 @@
CreatetimeName = a.Createtime.ToString("yyyy-MM-dd HH:mm:ss"),
Creater = a.Creater,
+ CreaterName = yyy.UserName,
Createtime = a.Createtime,
Modifier = a.Modifier,
Modifytime = a.Modifytime,
@@ -172,9 +190,10 @@
//if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
- var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
-
- data.LoadData(searchEntity, rolelist);
+ data.Heji1 = Math.Round(query.Sum(x => x.Money) ?? 0, 2);
+ var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ data.DangyeHeji1 = Math.Round(lianlist.Sum(x => x.Money) ?? 0, 2);
+ data.LoadData(searchEntity, lianlist);
return data;
}
@@ -201,17 +220,17 @@
/// 鑾峰彇鎵�鏈夋湁鏁堣鑹�
/// </summary>
/// <returns></returns>
- public List<FiAccountRecordDTO> GetList(string OperationalMatters = null)
+ public List<FiAccountRecordDTO> GetList(string OperationalMatters = null, string Remark = null)
{
var listPosition = _context.FiAccountRecords.Where(r => r.RecStatus == "A" ).ToList();
- if (!string.IsNullOrEmpty(OperationalMatters))
+ if (!string.IsNullOrEmpty(OperationalMatters)&& !string.IsNullOrEmpty(Remark))
{
- listPosition = listPosition.Where(x => x.OperationalMatters == OperationalMatters).ToList();
+ listPosition = listPosition.Where(x => x.OperationalMatters == OperationalMatters || x.Remark == Remark).ToList();
}
-
+
var list = _mapper.Map<List<FiAccountRecordDTO>>(listPosition);
return list;
}
diff --git a/zhengcaioa/Services/FiBookService.cs b/zhengcaioa/Services/FiBookService.cs
index 6b7a137..d0ab33f 100644
--- a/zhengcaioa/Services/FiBookService.cs
+++ b/zhengcaioa/Services/FiBookService.cs
@@ -73,10 +73,10 @@
var entity = _context.FiBooks.Find(id);
- if (entity.RecStatus != "A")
- {
- entity = new FiBook();
- }
+ //if (entity.RecStatus != "A")
+ //{
+ // entity = new FiBook();
+ //}
var result = _mapper.Map<FiBookDTO>(entity);
diff --git a/zhengcaioa/Services/FiMemberService.cs b/zhengcaioa/Services/FiMemberService.cs
index 923754e..9785b37 100644
--- a/zhengcaioa/Services/FiMemberService.cs
+++ b/zhengcaioa/Services/FiMemberService.cs
@@ -71,10 +71,10 @@
var entity = _context.FiMembers.Find(id);
- if (entity.RecStatus != "A")
- {
- entity = new FiMember();
- }
+ //if (entity.RecStatus != "A")
+ //{
+ // entity = new FiMember();
+ //}
var result = _mapper.Map<FiMemberDTO>(entity);
diff --git a/zhengcaioa/Services/FiOrderrecievemoneyService.cs b/zhengcaioa/Services/FiOrderrecievemoneyService.cs
index 4932909..682dddb 100644
--- a/zhengcaioa/Services/FiOrderrecievemoneyService.cs
+++ b/zhengcaioa/Services/FiOrderrecievemoneyService.cs
@@ -192,6 +192,10 @@
into msssss
from mmm in msssss.DefaultIfEmpty()
+ join s in _context.PltUsers
+ on a.Creater equals s.Id
+ into ssssss
+ from sss in ssssss.DefaultIfEmpty()
where a.RecStatus == "A" && a.ChedanStatus == "D"
&& (string.IsNullOrWhiteSpace(searchEntity.XdTime) || (a.XdTime >= XdTimestart && a.XdTime <= XdTimeend))
@@ -233,7 +237,7 @@
Creater = a.Creater,
Createtime = a.Createtime,
-
+ CreaterName = sss.UserName,
RecStatus = a.RecStatus,
Modifier = a.Modifier,
Modifytime = a.Modifytime,
@@ -258,7 +262,15 @@
//if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
+ data.Heji1 = Math.Round(query.Sum(x => x.OrderNum) ?? 0, 2);
+ data.Heji2 = Math.Round(query.Sum(x => x.Money) , 2);
+ data.Heji3 = Math.Round(query.Sum(x => x.YishouMoney), 2);
+ data.Heji4 = Math.Round(query.Sum(x => x.WeishouMoney), 2);
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ data.DangyeHeji1 = Math.Round(lianlist.Sum(x => x.OrderNum)??0, 2);
+ data.DangyeHeji2 = Math.Round(lianlist.Sum(x => x.Money), 2);
+ data.DangyeHeji3 = Math.Round(lianlist.Sum(x => x.YishouMoney) , 2);
+ data.DangyeHeji4 = Math.Round(lianlist.Sum(x => x.WeishouMoney) , 2);
data.LoadData(searchEntity, lianlist);
return data;
}
diff --git a/zhengcaioa/Services/HrDeptService.cs b/zhengcaioa/Services/HrDeptService.cs
index a46c6e3..9408fe0 100644
--- a/zhengcaioa/Services/HrDeptService.cs
+++ b/zhengcaioa/Services/HrDeptService.cs
@@ -97,7 +97,7 @@
{
var entity = _context.HrDepts.Find(id);
- if (entity.RecStatus != "A")
+ if (entity==null || entity.RecStatus != "A")
{
entity = new HrDept();
}
diff --git a/zhengcaioa/Services/HrPositionService.cs b/zhengcaioa/Services/HrPositionService.cs
index 0dcbcb3..3369f80 100644
--- a/zhengcaioa/Services/HrPositionService.cs
+++ b/zhengcaioa/Services/HrPositionService.cs
@@ -63,7 +63,7 @@
public HrPositionDTO Get(string id)
{
var entity = _context.HrPositions.Find(id);
- if (entity.RecStatus != "A")
+ if (entity==null || entity.RecStatus != "A")
{
entity = new HrPosition();
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index 5da7074..8afe2ac 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -1415,11 +1415,13 @@
resultEntity = _cooperOrderService.chedan(dto);
- var fiAccountRecordDTOs = _iFiAccountRecordService.GetList("璁㈠崟鏀舵"+dto.OrderNo);
+ var fiAccountRecordDTOs = _iFiAccountRecordService.GetList("璁㈠崟鏀舵"+dto.OrderNo, dto.OrderNo);
if (fiAccountRecordDTOs!= null && fiAccountRecordDTOs.Count > 0)
{
+ var sysCodeDtls = _liaotianService.GetSYScode("CooperVisit", "jtype");
foreach (var fiAccountRecordDTO in fiAccountRecordDTOs)
{
+
CooperatecustomCustomerDTO cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(dto.Khdw);
FiAccountRecordDTO data1 = new FiAccountRecordDTO();
data1.RecStatus = "A";
@@ -1430,21 +1432,36 @@
data1.SubjectId = fiAccountRecordDTO.SubjectId;
data1.AccountId = fiAccountRecordDTO.AccountId;
- data1.Money = fiAccountRecordDTO.Money;
+ data1.Money = -fiAccountRecordDTO.Money;
data1.PaymentUnit = cooperatecustomCustomerDTO.Name;
- data1.OperationalMatters = "璁㈠崟鎾ゅ崟" + dto.OrderNo;
-
+ var ssss = sysCodeDtls.Where(x => x.CodeSn == dto.OrderType).FirstOrDefault();
+ if (ssss!=null)
+ {
+ dto.OrderTypeName = ssss.Comments;
+ }
+ var book = _fiBookService.Get(dto.OrderType1);
+ var member = _fiMemberService.Get(dto.OrderType1);
+ if (book != null)
+ {
+ dto.OrderType1 = book.BookName;
+ }
+ if (member != null)
+ {
+ dto.OrderType1 = member.MemberType;
+ }
+ data1.OperationalMatters = dto.OrderTypeName + dto.OrderType1 + dto.OrderType2 + " 璁㈠崟鎾ゅ崟閫�娆�" ;
+ data1.Remark = dto.OrderNo;
FiAccountDTO firmAccount = _fiAccountService.Get(data1.AccountId);
- data1.RecordTypeId = "2";//閫�娆�
+ data1.RecordTypeId = "1";//閫�娆�
data1.Department = "";
- firmAccount.AllExpenses = (firmAccount.AllExpenses ?? 0) + fiAccountRecordDTO.Money;
+ firmAccount.AllIncome = (firmAccount.AllIncome ?? 0) - fiAccountRecordDTO.Money;
firmAccount.Balance = (firmAccount.Balance ?? 0) - fiAccountRecordDTO.Money;
data1.AccountMoney = firmAccount.Balance;
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
index e088107..2fa29d2 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
@@ -42,6 +42,8 @@
private readonly IHttpClientFactory _clientFactory;
private readonly IFiMemberService _iMemberService;
private readonly IPltPageService _pltPageService;
+ private readonly IFiBookService _fiBookService;
+ private readonly IFiMemberService _fiMemberService;
public FiOrderrecievemoneyController(ILogger<FiOrderrecievemoneyController> logger, ILiaotianService liaotianService, IFiOrderrecievemoneyService fiOrderrecievemoneyService, ICooperOrderService cooperOrderService, IFiSubjectService ifiSubjectService
, IFiAccountService fiAccountService, IFiAccountRecordService iFiAccountRecordService, ICooperatecustomCustomerService cooperatecustomCustomerService
@@ -51,7 +53,9 @@
, IConfiguration configuration
, IHttpClientFactory clientFactory
, IFiMemberService iMemberService
- , IPltPageService pltPageService)
+ , IPltPageService pltPageService
+ , IFiBookService fiBookService
+ , IFiMemberService fiMemberService)
{
_logger = logger;
_liaotianService = liaotianService;
@@ -68,6 +72,8 @@
_clientFactory = clientFactory;
_iMemberService = iMemberService;
_pltPageService = pltPageService;
+ _fiBookService = fiBookService;
+ _fiMemberService = fiMemberService;
}
public IActionResult Index()
@@ -273,6 +279,9 @@
}
if (data.PayType != "03")
{
+ var sysCodeDtls = _liaotianService.GetSYScode("CooperVisit", "jtype");
+ var book = _fiBookService.Get(cooperOrderDTO.OrderType1);
+ var member = _fiMemberService.Get(cooperOrderDTO.OrderType1);
FiAccountRecordDTO data1 = new FiAccountRecordDTO();
data1.RecStatus = "A";
data1.Creater = curentuser.Id;
@@ -284,8 +293,24 @@
data1.AccountId = data.AccountId;
data1.Money = data.Recievemoney;
data1.PaymentUnit = cooperatecustomCustomerDTO.Name;
- data1.OperationalMatters = "璁㈠崟鏀舵" + cooperOrderDTO.OrderNo;
+ var ssss = sysCodeDtls.Where(x => x.CodeSn == cooperOrderDTO.OrderType).FirstOrDefault();
+ if (ssss != null)
+ {
+ cooperOrderDTO.OrderTypeName = ssss.Comments;
+ }
+ if (book != null)
+ {
+ cooperOrderDTO.OrderType1 = book.BookName;
+ }
+ if (member != null)
+ {
+ cooperOrderDTO.OrderType1 = member.MemberType;
+ }
+ //data1.OperationalMatters = "璁㈠崟鏀舵" + cooperOrderDTO.OrderNo;
+
+ data1.OperationalMatters = cooperOrderDTO.OrderTypeName + cooperOrderDTO.OrderType1 + cooperOrderDTO.OrderType2 + " 璁㈠崟鏀舵";
+ data1.Remark = cooperOrderDTO.OrderNo;
FiAccountDTO firmAccount = _fiAccountService.Get(data1.AccountId);
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
index 2627445..03924b8 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
@@ -83,6 +83,7 @@
{ label: '閲戦', name: 'Money', labtype: 'txt', hidden: false, width: 60 },
{ label: '璁㈠崟鐘舵��', name: 'ShouliStatusName', labtype: 'txt', hidden: false, width: 60 },
+ { label: '鍒跺崟浜�', name: 'CreaterName', labtype: 'txt', hidden: false, width: 60 },
{
label: '鍙楃悊', name: 'ShouliStatus', labtype: 'txt', hidden: shoulibool, width: 60,
formatter: function (cellvalue, options, rowObject) {
@@ -474,6 +475,7 @@
}
+ jQuery("#jqGrid").jqGrid("footerData", "set", { KhdwName: "<font color='darkgoldenrod'>--褰撻〉鍚堣--</font> </br> <font color='darkgoldenrod'>--鍚堣--</font>", OrderNum: "<font color='darkgoldenrod'>" + xhr.DangyeHeji1 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji1 + "</font>", Price: "<font color='darkgoldenrod'>" + xhr.DangyeHeji2 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji2 + "</font>", Money: "<font color='darkgoldenrod'>" + xhr.DangyeHeji3 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji3 + "</font>", Youhui: "<font color='darkgoldenrod'>" + xhr.DangyeHeji4 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji4 + "</font>"});
};
</script>
diff --git a/zhengcaioa/zhengcaioa/Views/FiAccount/Liushuizhang.cshtml b/zhengcaioa/zhengcaioa/Views/FiAccount/Liushuizhang.cshtml
index 0675390..c0744bc 100644
--- a/zhengcaioa/zhengcaioa/Views/FiAccount/Liushuizhang.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/FiAccount/Liushuizhang.cshtml
@@ -5,6 +5,7 @@
@section headerStyle{
<script type="text/javascript">
var FiSubject = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.FiSubject))';
+ loseherght = 60;
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true, width: 60},
{ label: '璐︽埛绫诲瀷', name: 'AccounttypeName', labtype: 'txt', hidden: false, width: 60 },
@@ -18,7 +19,9 @@
{ label: '璐︽埛浣欓', name: 'AccountMoney', labtype: 'txt', hidden: false, width: 60 },
{ label: '閮ㄩ棬', name: 'Department', labtype: 'txt', hidden: false, width: 60 },
{ label: '鏀朵粯娆句汉(鍗曚綅)', name: 'PaymentUnit', labtype: 'txt', hidden: false, width: 100 },
- { label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false, width: 200},
+ { label: '鎿嶄綔浜�', name: 'CreaterName', labtype: 'txt', hidden: false, width: 60 },
+ { label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false, width: 200 },
+ { label: '璁㈠崟鍙�', name: 'Remark', labtype: 'txt', hidden: false, width: 60 },
{ label: '鎿嶄綔鏃堕棿', name: 'CreatetimeName', labtype: 'txt', hidden: false, width: 100},
{
label: '鎿嶄綔', name: 'RecStatus', labtype: 'txt', hidden: false ,
@@ -33,7 +36,7 @@
{ label: '绉戠洰鍚嶇О', name: 'SubjectId', labtype: 'combox', hidden: false, data: JSON.parse(FiSubject) },
{ label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false },
-
+ { label: '璁㈠崟鍙�', name: 'Remark', labtype: 'txt', hidden: false },
{ label: '鏀朵粯娆句汉', name: 'PaymentUnit', labtype: 'txt', hidden: false },
{ label: '鎿嶄綔浜�', name: 'CreaterName', labtype: 'txt', hidden: false },
@@ -61,7 +64,20 @@
toastr.error("鍒犻櫎鎴愬姛");
/**/
}
-}
+ }
+ 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", { RecordTypeName: "<font color='darkgoldenrod'>--褰撻〉鍚堣--</font> </br> <font color='darkgoldenrod'>--鍚堣--</font>", Money: "<font color='darkgoldenrod'>" + xhr.DangyeHeji1 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji1 + "</font>" });
+
+
+
+ };
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/FiAccountExpenses/Index.cshtml b/zhengcaioa/zhengcaioa/Views/FiAccountExpenses/Index.cshtml
index f7b5b52..93c0096 100644
--- a/zhengcaioa/zhengcaioa/Views/FiAccountExpenses/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/FiAccountExpenses/Index.cshtml
@@ -6,6 +6,7 @@
<script type="text/javascript">
var accounttype = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.accounttype))';
var FiSubject = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.FiSubject))';
+ loseherght = 60;
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true, width: 60},
{ label: '璐︽埛绫诲瀷', name: 'AccounttypeName', labtype: 'txt', hidden: false, width: 60 },
@@ -17,7 +18,9 @@
{ label: '璐︽埛浣欓', name: 'AccountMoney', labtype: 'txt', hidden: false, width: 60 },
{ label: '閮ㄩ棬', name: 'Department', labtype: 'txt', hidden: false, width: 60 },
{ label: '鏀舵浜�(鍗曚綅)', name: 'PaymentUnit', labtype: 'txt', hidden: false, width: 100 },
- { label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false, width: 200},
+ { label: '鎿嶄綔浜�', name: 'CreaterName', labtype: 'txt', hidden: false, width: 60 },
+ { label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false, width: 200 },
+ { label: '璁㈠崟鍙�', name: 'Remark', labtype: 'txt', hidden: false, width: 60 },
{ label: '鎿嶄綔鏃堕棿', name: 'CreatetimeName', labtype: 'txt', hidden: false, width: 100},
{
label: '鎿嶄綔', name: 'RecStatus', labtype: 'txt', hidden: false ,
@@ -33,7 +36,7 @@
{ label: '璐︽埛鍚嶇О', name: 'AccountId', labtype: 'combox', hidden: false, data: JSON.parse('[]'),},
{ label: '绉戠洰鍚嶇О', name: 'SubjectId', labtype: 'combox', hidden: false, data: JSON.parse(FiSubject) },
{ label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false },
-
+ { label: '璁㈠崟鍙�', name: 'Remark', labtype: 'txt', hidden: false },
{ label: '浠樻浜�(鍗曚綅)', name: 'PaymentUnit', labtype: 'txt', hidden: false },
{ label: '鎿嶄綔浜�', name: 'CreaterName', labtype: 'txt', hidden: false },
@@ -65,7 +68,22 @@
toastr.error("鍒犻櫎鎴愬姛");
/**/
}
-}
+ }
+ 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", { SubjectName: "<font color='darkgoldenrod'>--褰撻〉鍚堣--</font> </br> <font color='darkgoldenrod'>--鍚堣--</font>", Money: "<font color='darkgoldenrod'>" + xhr.DangyeHeji1 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji1 + "</font>" });
+
+
+
+ };
+
+
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/FiAccountIncome/Index.cshtml b/zhengcaioa/zhengcaioa/Views/FiAccountIncome/Index.cshtml
index a720375..7db0138 100644
--- a/zhengcaioa/zhengcaioa/Views/FiAccountIncome/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/FiAccountIncome/Index.cshtml
@@ -6,6 +6,7 @@
<script type="text/javascript">
var accounttype = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.accounttype))';
var FiSubject = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.FiSubject))';
+ loseherght = 60;
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true, width: 60},
{ label: '璐︽埛绫诲瀷', name: 'AccounttypeName', labtype: 'txt', hidden: false, width: 60 },
@@ -16,7 +17,9 @@
{ label: '鏀跺叆閲戦', name: 'Money', labtype: 'txt', hidden: false, width: 60},
{ label: '璐︽埛浣欓', name: 'AccountMoney', labtype: 'txt', hidden: false, width: 60},
{ label: '浜ゆ浜�(鍗曚綅)', name: 'PaymentUnit', labtype: 'txt', hidden: false, width: 100 },
- { label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false, width: 200},
+ { label: '鎿嶄綔浜�', name: 'CreaterName', labtype: 'txt', hidden: false, width: 60 },
+ { label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false, width: 200 },
+ { label: '璁㈠崟鍙�', name: 'Remark', labtype: 'txt', hidden: false, width: 60 },
{ label: '鎿嶄綔鏃堕棿', name: 'CreatetimeName', labtype: 'txt', hidden: false, width: 100},
{
label: '鎿嶄綔', name: 'RecStatus', labtype: 'txt', hidden: false ,
@@ -32,11 +35,11 @@
{ label: '璐︽埛鍚嶇О', name: 'AccountId', labtype: 'combox', hidden: false, data: JSON.parse('[]'),},
{ label: '绉戠洰鍚嶇О', name: 'SubjectId', labtype: 'combox', hidden: false, data: JSON.parse(FiSubject) },
{ label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false },
-
+ { label: '璁㈠崟鍙�', name: 'Remark', labtype: 'txt', hidden: false },
{ label: '浠樻浜�(鍗曚綅)', name: 'PaymentUnit', labtype: 'txt', hidden: false },
{ label: '鎿嶄綔浜�', name: 'CreaterName', labtype: 'txt', hidden: false },
-
-
+
+
];
@@ -64,7 +67,20 @@
toastr.error("鍒犻櫎鎴愬姛");
/**/
}
-}
+ }
+ 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", { SubjectName: "<font color='darkgoldenrod'>--褰撻〉鍚堣--</font> </br> <font color='darkgoldenrod'>--鍚堣--</font>", Money: "<font color='darkgoldenrod'>" + xhr.DangyeHeji1 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji1 + "</font>" });
+
+
+
+ };
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/FiAccountIncome/PrintAll.cshtml b/zhengcaioa/zhengcaioa/Views/FiAccountIncome/PrintAll.cshtml
index fa116f2..10c4b74 100644
--- a/zhengcaioa/zhengcaioa/Views/FiAccountIncome/PrintAll.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/FiAccountIncome/PrintAll.cshtml
@@ -20,7 +20,9 @@
{ label: '閲戦', name: 'Money', labtype: 'txt', hidden: false, width: 100 },
{ label: '浣欓', name: 'Balance', labtype: 'txt', hidden: false, width: 100 },
{ label: '鏀�(鏀�)娆惧崟浣�', name: 'PaymentUnit', labtype: 'txt', hidden: false, width: 200 },
- { label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false, width: 200 },
+ { label: '鎿嶄綔浜�', name: 'CreaterName', labtype: 'txt', hidden: false, width: 60 },
+ { label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false, width: 200 },
+ { label: '璁㈠崟鍙�', name: 'Remark', labtype: 'txt', hidden: false, width: 60 },
{ label: '鎿嶄綔鏃堕棿', name: 'CreatetimeName', labtype: 'txt', hidden: false, width: 100 },
];
@@ -32,7 +34,7 @@
{ label: '绉戠洰鍚嶇О', name: 'SubjectId', labtype: 'combox', hidden: false, data: JSON.parse(FiSubject) },
{ label: '璁板綍绫诲瀷', name: 'RecordTypeId', labtype: 'combox', hidden: false, data: JSON.parse(RecordTypeId) },
{ label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false },
-
+ { label: '璁㈠崟鍙�', name: 'Remark', labtype: 'txt', hidden: false },
{ label: '浠樻浜�(鍗曚綅)', name: 'PaymentUnit', labtype: 'txt', hidden: false },
{ label: '鎿嶄綔浜�', name: 'CreaterName', labtype: 'txt', hidden: false },
@@ -51,7 +53,7 @@
var PaymentUnit = $("#PBSPaymentUnit").val();
var CreaterName = $("#PBSCreaterName").val();
-
+ var Remark = $("#PBSRemark").val();
var Createtimestart = $("#PBSCreatetimestart").val();
@@ -62,7 +64,7 @@
}
- var url = "/FiAccountIncome/print?Accounttype=" + Accounttype + "&AccountId=" + AccountId + "&SubjectId=" + SubjectId + "&RecordTypeId=" + RecordTypeId + "&OperationalMatters=" + OperationalMatters + "&PaymentUnit=" + PaymentUnit + "&CreaterName=" + CreaterName + "&Createtime=" + Createtime;
+ var url = "/FiAccountIncome/print?Accounttype=" + Accounttype + "&AccountId=" + AccountId + "&SubjectId=" + SubjectId + "&RecordTypeId=" + RecordTypeId + "&OperationalMatters=" + OperationalMatters + "&PaymentUnit=" + PaymentUnit + "&CreaterName=" + CreaterName + "&Createtime=" + Createtime + "&Remark=" + Remark;
var me = window.open(url, "鎵撳嵃"); //鎵撳紑鏂扮獥鍙�
diff --git a/zhengcaioa/zhengcaioa/Views/FiAccountIncome/print.cshtml b/zhengcaioa/zhengcaioa/Views/FiAccountIncome/print.cshtml
index 5559f66..0725fed 100644
--- a/zhengcaioa/zhengcaioa/Views/FiAccountIncome/print.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/FiAccountIncome/print.cshtml
@@ -81,31 +81,35 @@
<td style="width:7%;"> 绉戠洰鍚嶇О</td>
<td style="width:7%;"> 閲戦</td>
<td style="width:7%;"> 浣欓</td>
+ <td style="width:7%;"> 鎿嶄綔浜�</td>
<td style="width:15%;"> 鏀�(鏀�)娆惧崟浣�</td>
<td style="width:15%;"> 鎽樿</td>
+ <td style="width:7%;"> 璁㈠崟鍙�</td>
<td style="width:12%;"> 鏃堕棿</td>
</tr>
@foreach (var liaotianDTO in liaotianDTOs)
{
- <tr>
- <td> @i</td>
- <td> @liaotianDTO.RecordTypeName</td>
- <td> @liaotianDTO.AccounttypeName</td>
- <td> @liaotianDTO.AccountName</td>
- <td> @liaotianDTO.SubjectName</td>
- <td> @liaotianDTO.Money</td>
- <td> @liaotianDTO.Balance</td>
- <td> @liaotianDTO.PaymentUnit</td>
- <td> @liaotianDTO.OperationalMatters</td>
- <td> @liaotianDTO.CreatetimeName</td>
- </tr>
+ <tr>
+ <td> @i</td>
+ <td> @liaotianDTO.RecordTypeName</td>
+ <td> @liaotianDTO.AccounttypeName</td>
+ <td> @liaotianDTO.AccountName</td>
+ <td> @liaotianDTO.SubjectName</td>
+ <td> @liaotianDTO.Money</td>
+ <td> @liaotianDTO.Balance</td>
+ <td> @liaotianDTO.CreaterName</td>
+ <td> @liaotianDTO.PaymentUnit</td>
+ <td> @liaotianDTO.OperationalMatters</td>
+ <td> @liaotianDTO.Remark</td>
+ <td> @liaotianDTO.CreatetimeName</td>
+ </tr>
i++;
}
<tr>
- <td colspan="10" > <span style="color:darkgoldenrod"> 鏀跺叆缁熻锛� @ViewBag.shourusum 鍏� 鏀嚭缁熻锛� @ViewBag.zhichusum 鍏�</span> </td>
+ <td colspan="12" > <span style="color:darkgoldenrod"> 鏀跺叆缁熻锛� @ViewBag.shourusum 鍏� 鏀嚭缁熻锛� @ViewBag.zhichusum 鍏�</span> </td>
</tr>
</table>
diff --git a/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml b/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml
index 9786f2f..9e9a993 100644
--- a/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml
@@ -16,7 +16,15 @@
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
{ label: '涓嬪崟鏃堕棿', name: 'XdTimeName', labtype: 'txt', hidden: false, width: 80 },
{
- label: '璁㈠崟鍙�', name: 'OrderNo', labtype: 'txt', hidden: false, width: 80
+ label: '璁㈠崟鍙�', name: 'OrderNo', labtype: 'txt', hidden: false, width: 80,
+ formatter: function (cellvalue, options, rowObject) {
+ if (rowObject.ShouliStatus == "A") {
+ return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&ShouliStatus=" + rowObject.ShouliStatus + "')\" >" + cellvalue + "</a>";
+ } else {
+ return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&ShouliStatus=" + rowObject.ShouliStatus + "')\" >" + cellvalue + "</a>";
+ }
+
+ }
},
{ label: '鏁伴噺', name: 'OrderNum', labtype: 'txt', hidden: false, width: 50 },
@@ -24,7 +32,7 @@
{ label: '璁㈠崟绫诲瀷', name: 'OrderTypeName', labtype: 'txt', hidden: false, width: 50 },
{ label: '閲戦', name: 'Money', labtype: 'txt', hidden: false, width: 50 },
-
+ { label: '鍒跺崟浜�', name: 'CreaterName', labtype: 'txt', hidden: false, width: 60 },
{ label: '宸叉敹娆�', name: 'YishouMoney', labtype: 'txt', hidden: false, width: 50 },
{ label: '鏈敹娆�', name: 'WeishouMoney', labtype: 'txt', hidden: false, width: 50 },
{ label: '璁㈠崟鐘舵��', name: 'OrderStatus', labtype: 'txt', hidden: false, width: 60 },
@@ -93,6 +101,7 @@
}
+ jQuery("#jqGrid").jqGrid("footerData", "set", { OrderNo: "<font color='darkgoldenrod'>--褰撻〉鍚堣--</font> </br> <font color='darkgoldenrod'>--鍚堣--</font>", OrderNum: "<font color='darkgoldenrod'>" + xhr.DangyeHeji1 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji1 + "</font>", Money: "<font color='darkgoldenrod'>" + xhr.DangyeHeji2 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji2 + "</font>", YishouMoney: "<font color='darkgoldenrod'>" + xhr.DangyeHeji3 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji3 + "</font>", WeishouMoney: "<font color='darkgoldenrod'>" + xhr.DangyeHeji4 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji4 + "</font>" });
};
--
Gitblit v1.9.1