20230607新增月报费用取值，上报集团报表（月报）默认自动取值功能新增

2023-06-07 18:01:30 +08:00
parent e4871bc690
commit c7994e1a5c
21 changed files with 914 additions and 723 deletions
@@ -109,7 +109,12 @@ namespace FineUIPro.Web.Person
                        if (person.IsForeign.HasValue)
                        {
                            this.ckIsForeign.Checked = person.IsForeign.Value;
+                        } 
+                        if (person.IsOffice.HasValue)
+                        {
+                            this.ckIsOffice.Checked = person.IsOffice.Value;
                        }
+
                        this.rbPersonType.SelectedValue = person.PersonType;
                        if (!string.IsNullOrEmpty(person.IdcardType))
                        {
@@ -534,17 +539,10 @@ namespace FineUIPro.Web.Person
                SignatureUrl = this.SignatureUrl,
                IsPost = this.ckIsPost.Checked,
                MultiProject=this.ckIsMultiProject.Checked,
+                IsOffice = this.ckIsOffice.Checked,
            };
            newPerson.HomePageType = this.rblHomePageType.SelectedValue;
-            newPerson.RoleIds = Funs.GetStringByArray(this.drpRole.SelectedValueArray);
-            if (!string.IsNullOrEmpty(newPerson.RoleIds))
-            {
-                newPerson.IsOffice = true;
-            }
-            else
-            {
-                newPerson.IsOffice = false;
-            }
+            newPerson.RoleIds = Funs.GetStringByArray(this.drpRole.SelectedValueArray);         
            if (!string.IsNullOrEmpty(imgPhoto.ImageUrl) && imgPhoto.ImageUrl != "~/res/images/blank.png")
            {
                newPerson.PhotoUrl = imgPhoto.ImageUrl.Replace("~/", "");