财务模块 日付申请 调整

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -104,6 +104,7 @@ namespace OASystem.API.Controllers
 
             return Ok(JsonView(result.Data));
         }
+        
         /// <summary>
         /// 日付申请 添加
         /// </summary>

OASystem/OASystem.Domain/ViewModels/Financial/Fin_DailyFeePaymentView.cs

@@ -88,12 +88,25 @@ namespace OASystem.Domain.ViewModels.Financial
             {
                 string str = "未审核";
                 if (FAudit == 0) str = "未审核";
-                else if (FAudit == 1) str = "已通过";
-                else if (FAudit == 2) str = "未通过";
+                else if (FAudit == 1) 
+                {
+                    str = "已通过"; 
+                    FAuditName = "朱成梅";
+                }
+                else if (FAudit == 2)
+                {
+                    str = "未通过";
+                    FAuditName = "朱成梅";
+                }
                 return str;
             }
         }
 
+        /// <summary>
+        /// 财务审核人姓名
+        /// </summary>
+        public string? FAuditName { get; set; }
+
         /// <summary>
         /// 总经理审核
         /// </summary>
@@ -108,12 +121,17 @@ namespace OASystem.Domain.ViewModels.Financial
             {
                 string str = "未审核";
                 if (MAudit == 0) str = "未审核";
-                else if (MAudit == 1) str = "已通过";
-                else if (MAudit == 2) str = "未通过";
+                else if (MAudit == 1) { str = "已通过"; MAuditName = "张海麟"; }
+                else if (MAudit == 2) { str = "未通过"; MAuditName = "张海麟"; }
                 return str;
             }
         }
 
+        /// <summary>
+        /// 总经理审核姓名
+        /// </summary>
+        public string? MAuditName { get; set; }
+
         /// <summary>
         /// 费用类型
         /// </summary>