From e687b713efad2b215d21c3631d0c6415caae205e Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 05 八月 2021 14:10:04 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs | 2 +-
zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
index c90fb3d..ae887b2 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
@@ -105,7 +105,7 @@
CooperOrderDTO cooperOrderDTO = _cooperOrderService.Get(OrderId);
List<FiOrderrecievemoneyDTO> fiOrderrecievemoneyDTOs = _fiOrderrecievemoneyService.GetList(OrderId);
- dto.Money = cooperOrderDTO.Money.Value - (cooperOrderDTO.Youhui??0);
+ dto.Money = cooperOrderDTO.Money.Value;
if(fiOrderrecievemoneyDTOs!=null&& fiOrderrecievemoneyDTOs.Count > 0)
{
dto.YishouMoney = fiOrderrecievemoneyDTOs.Sum(x => x.Recievemoney).Value;
diff --git a/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml b/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml
index 622fc57..7c90620 100644
--- a/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml
@@ -28,8 +28,13 @@
{
label: '鎿嶄綔', name: 'Caozuo', labtype: 'txt', hidden: false, width: 50,
formatter: function (cellvalue, options, rowObject) {
-
- return "<a onclick=\"OpenWindow('" + rowObject.OrderNo + "','98%','100%', '/FiOrderrecievemoney/Edit?OrderId=" + rowObject.Id + "')\" > 璁㈠崟鏀舵</a>";
+ if (rowObject.WeishouMoney > 0) {
+ return "<a onclick=\"OpenWindow('" + rowObject.OrderNo + "','98%','100%', '/FiOrderrecievemoney/Edit?OrderId=" + rowObject.Id + "')\" > 璁㈠崟鏀舵</a>";
+
+ } else {
+ return "宸蹭粯娆�";
+
+ }
}
--
Gitblit v1.9.1