+1

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -2423,8 +2423,9 @@ FROM
 
 
                     decimal auditFee = 0.00M; //已审核金额 人名币
-                    decimal auditedFeeOriginal = 0.00M; ////已审核金额 原始币种
-                    decimal unAuditFee = 0.00M; //未审核款项
+                    decimal auditedFeeOriginal = 0.00M; ////已审核金额 原始
+                    decimal unAuditFeeCNY = 0.00M; //未审核款项 原始
+                    decimal unAuditFeeOriginal = 0.00M; //未审核款项 人名币
                     if (entity.IsAuditGM == 1 || entity.IsAuditGM == 3)
                     {
                         auditedFeeOriginal = entity.PayMoney;
@@ -2432,7 +2433,8 @@ FROM
                     }
                     else if (entity.IsAuditGM == 0)
                     {
-                        unAuditFee = OriginalCurrPay;
+                        unAuditFeeCNY = CurrPayStr;
+                        unAuditFeeOriginal = OriginalCurrPay;
                         OriginalCurrPay = 0.00M;
                     }
                     /*
@@ -2447,7 +2449,8 @@ FROM
                         BalancePayment = BalanceStr,
                         AuditedFunds = auditFee,
                         AuditedFundsOriginal = auditedFeeOriginal,
-                        UnAuditFunds = unAuditFee
+                        UnAuditFundsCNY = unAuditFeeCNY,
+                        UnAuditFundsOriginal = unAuditFeeOriginal
                     });
 
                     _detail.IsAuditGM = entity.IsAuditGM;
@@ -2507,11 +2510,20 @@ FROM
                         //{
                         //    auditedFundsStr += string.Format(@"{0}{1} |", strs.Sum(x => x.AmountPayable), currencyName);
                         //}
-                        auditedFundsStr += string.Format(@"{0}{1} |", strs.Sum(x => x.ThisPayment), currencyName);
-
-                        //未审核费用
-                        var unAudit = strs.Sum(x => x.UnAuditFunds);
-                        unAuditedFundsStr += string.Format(@"{0}{1} |", unAudit.ToString("#0.00"), currencyName);
+                        if (currencyName.Equals("CNY"))
+                        {
+                            //已审核费用
+                            auditedFundsStr += string.Format(@"{0}{1} |", strs.Sum(x => x.AuditedFundsOriginal).ToString("#0.00"), currencyName);
+                            //未审核费用
+                            unAuditedFundsStr += string.Format(@"{0}{1} |", strs.Sum(x => x.UnAuditFundsOriginal).ToString("#0.00"), currencyName);
+                        }
+                        else
+                        {
+                            //已审核费用
+                            auditedFundsStr += string.Format(@"{0}{1}({2}CNY) |", strs.Sum(x => x.AuditedFundsOriginal).ToString("#0.00"), currencyName, strs.Sum(x => x.AuditedFunds).ToString("#0.00"));
+                            //未审核费用
+                            unAuditedFundsStr += string.Format(@"{0}{1}({2}CNY) |", strs.Sum(x => x.UnAuditFundsOriginal).ToString("#0.00"), currencyName, strs.Sum(x => x.UnAuditFundsCNY).ToString("#0.00"));
+                        }
                     }
                 }
 

OASystem/OASystem.Domain/ViewModels/Groups/Grp_CreditCardPaymentView.cs

@@ -219,8 +219,12 @@ namespace OASystem.Domain.ViewModels.Groups
         public decimal AuditedFundsOriginal { get; set; }
 
         /// <summary>
-        /// 未审核款项
+        /// 未审核款项-原始金额
         /// </summary>
-        public decimal UnAuditFunds { get; set; }
+        public decimal UnAuditFundsOriginal { get; set; }
+        /// <summary>
+        /// 未审核款项-人名币
+        /// </summary>
+        public decimal UnAuditFundsCNY { get; set; }
     }
 }