+1

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1714,10 +1714,8 @@ FROM
                 if (_dto.PageId < 1) return Ok(JsonView(false, "页面Id为空"));
                 if (_dto.DiId < 1) return Ok(JsonView(false, "团组Id为空"));
 
-                PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
-
                 #region 页面操作权限验证
-                pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(_dto.UserId, _dto.PageId);
+                var pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(_dto.UserId, _dto.PageId);
 
                 if (pageFunAuthView.CheckAuth == 0) return Ok(JsonView(false, "您没有查看权限"));
                 #endregion
@@ -1733,11 +1731,7 @@ FROM
                 exp.AndIF(_dto.AuditStatus != -1, it => it.IsAuditGM == _dto.AuditStatus);
                 exp.AndIF(_dto.Label != -1, it => it.CTable == _dto.Label);
 
-                var entityList = _groupRepository
-                    .Query<Grp_CreditCardPayment>(s => s.DIId == _dto.DiId && s.IsDel == 0 && s.CreateUserId > 0)
-                    .Where(exp.ToExpression())
-                    .ToList();
-
+                var entityList = _groupRepository .Query<Grp_CreditCardPayment>(s => s.DIId == _dto.DiId && s.IsDel == 0 && s.CreateUserId > 0).Where(exp.ToExpression()).ToList();
 
                 var detailList = new List<Grp_CreditCardPaymentDetailView>();
 
@@ -1877,7 +1871,6 @@ FROM
                             entity.PayMoney = czInfo.Price * czInfo.PriceCount;
                             entity.RMBPrice = czInfo.Price * czInfo.PriceCount * entity.DayRate;
                         }
-
                     }
 
                     /*
@@ -1916,25 +1909,38 @@ FROM
                         {
                             CurrPayStr = (entity.PayMoney * entity.PayPercentage / 100 * entity.DayRate).ConvertToDecimal1();
                         }
+                    }
+                    //if (_dto.Label == 79)
+                    //{
+                    //    string original = string.Empty;
+                    //    if (hotelCurrncyCode.Equals("CNY"))
+                    //    {
+                    //        OriginalCurrPay = CurrPayStr;
+                    //        _detail.CurrPay = CurrPayStr.ToString("#0.00") + " CNY";
+                    //    }
+                    //    else
+                    //    {
+                    //        OriginalCurrPay = ((entity.PayMoney / 100) * entity.PayPercentage).ConvertToDecimal1();
+                    //        //760 EUR（7600.00 CNY）
+                    //        _detail.CurrPay = $"{OriginalCurrPay.ToString("#0.00")} {hotelCurrncyCode}({CurrPayStr.ToString("#0.00")} CNY)";
+                    //    }
+
+                    //}
+                    //else _detail.CurrPay = CurrPayStr.ToString("#0.00") + " CNY";
 
+                    string original = string.Empty;
+                    if (hotelCurrncyCode.Equals("CNY"))
+                    {
+                        OriginalCurrPay = CurrPayStr;
+                        _detail.CurrPay = CurrPayStr.ToString("#0.00") + " CNY";
                     }
-                    if (_dto.Label == 79)
+                    else
                     {
-                        string original = string.Empty;
-                        if (hotelCurrncyCode.Equals("CNY"))
-                        {
-                            OriginalCurrPay = CurrPayStr;
-                            _detail.CurrPay = CurrPayStr.ToString("#0.00") + " CNY";
-                        }
-                        else
-                        {
-                            OriginalCurrPay = ((entity.PayMoney / 100) * entity.PayPercentage).ConvertToDecimal1();
-                            //760 EUR（7600.00 CNY）
-                            _detail.CurrPay = $"{OriginalCurrPay.ToString("#0.00")} {hotelCurrncyCode}({CurrPayStr.ToString("#0.00")} CNY)";
-                        }
-
+                        OriginalCurrPay = ((entity.PayMoney / 100) * entity.PayPercentage).ConvertToDecimal1();
+                        //760 EUR（7600.00 CNY）
+                        _detail.CurrPay = $"{OriginalCurrPay.ToString("#0.00")} {hotelCurrncyCode}({CurrPayStr.ToString("#0.00")} CNY)";
                     }
-                    else _detail.CurrPay = CurrPayStr.ToString("#0.00") + " CNY";
+
 
                     /*
                      * 剩余尾款
@@ -2370,7 +2376,7 @@ FROM
                      * 申请人
                      */
                     string operatorName = " - ";
-                    Sys_Users _opUser = userItems.Where(s => s.Id == entity.CreateUserId).FirstOrDefault();
+                    var _opUser = userItems.Where(s => s.Id == entity.CreateUserId).FirstOrDefault();
                     if (_opUser != null)
                     {
                         operatorName = _opUser.CnName;
@@ -2416,10 +2422,19 @@ FROM
                     _detail.OverBudget = overBudgetStr;
 
 
-                    decimal auditFee = 0.00M; //已审核金额
+                    decimal auditFee = 0.00M; //已审核金额 人名币
+                    decimal auditedFeeOriginal = 0.00M; ////已审核金额 原始币种
                     decimal unAuditFee = 0.00M; //未审核款项
-                    if (entity.IsAuditGM == 1 || entity.IsAuditGM == 3) auditFee = CurrPayStr;
-                    else if (entity.IsAuditGM == 0) unAuditFee = entity.PayMoney;
+                    if (entity.IsAuditGM == 1 || entity.IsAuditGM == 3)
+                    {
+                        auditedFeeOriginal = entity.PayMoney;
+                        auditFee = CurrPayStr;
+                    }
+                    else if (entity.IsAuditGM == 0)
+                    {
+                        unAuditFee = OriginalCurrPay;
+                        OriginalCurrPay = 0.00M;
+                    }
                     /*
                      * 费用总计
                      */
@@ -2431,6 +2446,7 @@ FROM
                         ThisPayment = OriginalCurrPay,
                         BalancePayment = BalanceStr,
                         AuditedFunds = auditFee,
+                        AuditedFundsOriginal = auditedFeeOriginal,
                         UnAuditFunds = unAuditFee
                     });
 
@@ -2477,14 +2493,7 @@ FROM
                         amountPayableStr += string.Format(@"{0}{1}&nbsp;|", amountPayable.ToString("#0.00"), currencyName);
 
                         //单独处理此次付款金额
-                        if (item.CurrencyId == 836) //人民币
-                        {
-                            thisPaymentStr += string.Format(@"{0}{1}&nbsp;|;", thisPayment.ToString("#0.00"), currencyName);
-                        }
-                        else
-                        {
-                            thisPaymentStr += string.Format(@"{0}{1}&nbsp;|", thisPayment.ToString("#0.00"), currencyName);
-                        }
+                        thisPaymentStr += string.Format(@"{0}{1}&nbsp;|", strs.Sum(x => x.ThisPayment).ToString("#0.00"), currencyName);
 
                         balancePaymentStr += string.Format(@"{0}{1}&nbsp;|", balancePayment.ToString("#0.00"), currencyName);
 
@@ -2498,7 +2507,7 @@ FROM
                         //{
                         //    auditedFundsStr += string.Format(@"{0}{1}&nbsp;|", strs.Sum(x => x.AmountPayable), currencyName);
                         //}
-                        auditedFundsStr += string.Format(@"{0}{1}&nbsp;|", strs.Sum(x => x.AmountPayable), currencyName);
+                        auditedFundsStr += string.Format(@"{0}{1}&nbsp;|", strs.Sum(x => x.ThisPayment), currencyName);
 
                         //未审核费用
                         var unAudit = strs.Sum(x => x.UnAuditFunds);

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

@@ -209,10 +209,15 @@ namespace OASystem.Domain.ViewModels.Groups
         public decimal BalancePayment { get; set; }
 
         /// <summary>
-        /// 已审款项
+        /// 已审款项-人名币币种
         /// </summary>
         public decimal AuditedFunds { get; set; }
 
+        /// <summary>
+        /// 已审款项-原始币种
+        /// </summary>
+        public decimal AuditedFundsOriginal { get; set; }
+
         /// <summary>
         /// 未审核款项
         /// </summary>