lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Person/CompanyPerson.aspx.cs
+1 -1
View File
@@ -39,7 +39,7 @@ namespace FineUIPro.Web.Person
private void BindGrid()
{
var getData = Person_PersonsService.getListData(Const.UnitId_SEDIN, this.drpDepart.SelectedValue, this.drpProject.SelectedValue,
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, null,null, Grid1);
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, null, null, Grid1);
Grid1.RecordCount = Person_PersonsService.count;
Grid1.DataSource = getData;
Grid1.DataBind();
SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs
+6 -7
View File
@@ -1,5 +1,4 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -28,7 +27,7 @@ namespace FineUIPro.Web.Person
this.drpIsPost.SelectedValue = Const._True;
DropListService.InitConstDropDownList(this.drpPersonType, DropListService.Group_PersonType, false);
Funs.FineUIPleaseSelect(drpPersonType, "按员工类别查询");
WorkPostService.InitWorkPostDropDownList(this.drpWorkPost, false);
Funs.FineUIPleaseSelect(drpWorkPost, "按岗位查询");
// 绑定表格
@@ -46,7 +45,7 @@ namespace FineUIPro.Web.Person
string personId = Grid1.SelectedRowID;
if (args.Length > 0 && !string.IsNullOrEmpty(personId))
{
var commandName = args[0];
var commandName = args[0];
if (commandName == "editit")
{
if (!this.btnMenuEdit.Hidden)
@@ -103,7 +102,7 @@ namespace FineUIPro.Web.Person
/// </summary>
private void BindGrid()
{
string[] workPostIds= this.drpWorkPost.SelectedValueArray.Where(x => x != Const._Null).ToArray();
string[] workPostIds = this.drpWorkPost.SelectedValueArray.Where(x => x != Const._Null).ToArray();
var getData = Person_PersonsService.getListData(Const.UnitId_SEDIN, Const.Depart_constructionId, this.drpProject.SelectedValue,
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, null, workPostIds, Grid1);
Grid1.RecordCount = Person_PersonsService.count;
@@ -164,7 +163,7 @@ namespace FineUIPro.Web.Person
/// <param name="e"></param>
protected void btnMenuDelete_Click(object sender, EventArgs e)
{
// this.PageSize = this.Grid1.PageIndex;
// this.PageSize = this.Grid1.PageIndex;
this.DeleteData();
}
@@ -332,7 +331,7 @@ namespace FineUIPro.Web.Person
if (getPerson != null && getPerson.IsPost == true)
{
var getcuuProject = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == getPerson.IdentityCard && x.States == Const.ProjectPersonStates_1);
if (getcuuProject != null && (getPerson.MultiProject == false|| !getPerson.MultiProject.HasValue))
if (getcuuProject != null && (getPerson.MultiProject == false || !getPerson.MultiProject.HasValue))
{
SitePerson_PersonService.SetSitePerson_PersonStates(getcuuProject.SitePersonId, Const.ProjectPersonStates_2, DateTime.Now);
}
@@ -351,7 +350,7 @@ namespace FineUIPro.Web.Person
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
int count = 0;
var getSitePersons = db.SitePerson_PersonItem.Where(x=>x.IdentityCard != null).Select(x => x.IdentityCard).Distinct();
var getSitePersons = db.SitePerson_PersonItem.Where(x => x.IdentityCard != null).Select(x => x.IdentityCard).Distinct();
if (getSitePersons.Count() > 0)
{
foreach (var item in getSitePersons)
SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx.cs
+9 -13
View File
@@ -1,11 +1,7 @@
using BLL;
using FastReport.DevComponents.Editors;
using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using AspNet = System.Web.UI.WebControls;
@@ -29,7 +25,7 @@ namespace FineUIPro.Web.Person
this.GetButtonPower();
WorkPostService.InitWorkPostNameByTypeDropDownList2(this.drpWorkPost, "1", false); //加载管理岗位
Funs.FineUIPleaseSelect(this.drpWorkPost, "请选择岗位");
WorkPostService.InitWorkPostNameByTypeDropDownList(this.drpWP, Const.PostType_1, false); //加载管理岗位
Funs.FineUIPleaseSelectNull(this.drpWP, "请选择岗位");
@@ -53,7 +49,7 @@ namespace FineUIPro.Web.Person
/// </summary>
private void BindGrid()
{
var getData = Person_ShuntService.getListData(this.drpWorkPost.SelectedValue,this.drpPostTitle.SelectedValue,String.Empty,this.drpCertificate.SelectedValue, Grid1);
var getData = Person_ShuntService.getListData(this.drpWorkPost.SelectedValue, this.drpPostTitle.SelectedValue, String.Empty, this.drpCertificate.SelectedValue, Grid1);
Grid1.RecordCount = Person_ShuntService.count;
Grid1.DataSource = getData;
Grid1.DataBind();
@@ -79,7 +75,7 @@ namespace FineUIPro.Web.Person
/// <returns></returns>
private void GetButtonPower()
{
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.DepartPersonShuntMenuId);
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.DepartPersonShuntMenuId);
if (buttonList.Count() > 0)
{
if (buttonList.Contains(BLL.Const.BtnAdd))
@@ -101,7 +97,7 @@ namespace FineUIPro.Web.Person
}
#endregion
/// <summary>
/// 关闭弹出窗
/// </summary>
@@ -295,7 +291,7 @@ namespace FineUIPro.Web.Person
return;
}
int count=0;
int count = 0;
int outCount = 0;
var workPosts = BLL.WorkPostService.GetWorkPostList();
foreach (JObject mergedRow in Grid1.GetMergedData())
@@ -306,7 +302,7 @@ namespace FineUIPro.Web.Person
if (cb.Checked) //选择项
{
string personId = this.Grid1.Rows[i].RowID;
string workPostId = string.Empty;
string workPostId = string.Empty;
var getWorkPost = WorkPostService.GetWorkPostByName(values.Value<string>("WorkPost"));
if (getWorkPost != null)
{
@@ -331,7 +327,7 @@ namespace FineUIPro.Web.Person
string message = "批量派遣成功！共计成功" + count.ToString() + "人。";
if (outCount > 0)
{
message+="未能派遣（不在职）人员" + outCount.ToString() + "人。";
message += "未能派遣（不在职）人员" + outCount.ToString() + "人。";
}
ShowNotify(message, MessageBoxIcon.Success);
BindGrid();
@@ -390,12 +386,12 @@ namespace FineUIPro.Web.Person
DataId = newProjectPerson.PersonId,
ProjectId = newProjectPerson.ProjectId,
};
SitePerson_PersonService.UpdateSitePerson(newProjectPerson,newlog);
SitePerson_PersonService.UpdateSitePerson(newProjectPerson, newlog);
LogService.AddSys_Log(this.CurrUser, newProjectPerson.IdentityCard, newProjectPerson.SitePersonId, BLL.Const.ProjectPersonMenuId, BLL.Const.BtnModify);
}
else
{
newProjectPerson.SitePersonId = SQLHelper.GetNewID();
newProjectPerson.SitePersonId = SQLHelper.GetNewID();
SitePerson_PersonService.AddSitePerson(newProjectPerson);
LogService.AddSys_Log(this.CurrUser, newProjectPerson.IdentityCard, newProjectPerson.SitePersonId, BLL.Const.ProjectPersonMenuId, BLL.Const.BtnAdd);
}
SGGL/FineUIPro.Web/Person/PersonContractEdit.aspx.cs
+3 -3
View File
@@ -70,7 +70,7 @@ namespace FineUIPro.Web.Person
{
this.PersonId = getData.PersonId;
this.drpUnit.SelectedValue = getData.UnitId;
this.drpProject.SelectedValue = getData.ProjectId;
this.drpProject.SelectedValue = getData.ProjectId;
this.txtTelephone.Text = getData.Telephone;
this.drpContractType.SelectedValue = getData.ContractType;
this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", getData.StartDate);
@@ -87,7 +87,7 @@ namespace FineUIPro.Web.Person
this.txtPersonName.Text = person.PersonName;
this.txtIdentityCard.Text = person.IdentityCard;
}
if (Request.Params["value"] == "0")
{
this.btnSave.Hidden = true;
@@ -120,7 +120,7 @@ namespace FineUIPro.Web.Person
PersonContractId = this.PersonContractId,
StartDate = Funs.GetNewDateTime(this.txtStartDate.Text.Trim()),
EndDate = Funs.GetNewDateTime(this.txtEndDate.Text.Trim()),
Telephone=this.txtTelephone.Text.Trim(),
Telephone = this.txtTelephone.Text.Trim(),
};
if (!string.IsNullOrEmpty(this.drpProject.SelectedValue) && this.drpProject.SelectedValue != Const._Null)
{
SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs
+6 -9
View File
@@ -1,6 +1,4 @@
using BLL;
using FineUIPro.Web.HSSE.SitePerson;
using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -8,7 +6,6 @@ using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Web.UI.DataVisualization.Charting;
namespace FineUIPro.Web.Person
{
@@ -113,7 +110,7 @@ namespace FineUIPro.Web.Person
if (person.IsForeign.HasValue)
{
this.ckIsForeign.Checked = person.IsForeign.Value;
}
}
if (person.IsOffice.HasValue)
{
this.ckIsOffice.Checked = person.IsOffice.Value;
@@ -241,7 +238,7 @@ namespace FineUIPro.Web.Person
}
}
}
else
{
@@ -284,7 +281,7 @@ namespace FineUIPro.Web.Person
SynchroSetService.InitCountryDropDownList(this.drpCountryCode, false);
this.drpCountryCode.SelectedValue = "101";
CityService.InitCityDropDownList(this.drpProvinceCode, this.drpCountryCode.SelectedValue, true);
DropListService.InitConstRadioButtonList(this.rbPersonType, DropListService.Group_PersonType, "1");
}
@@ -560,12 +557,12 @@ namespace FineUIPro.Web.Person
Address = this.txtAddress.Text.Trim(),
SignatureUrl = this.SignatureUrl,
IsPost = this.ckIsPost.Checked,
MultiProject=this.ckIsMultiProject.Checked,
MultiProject = this.ckIsMultiProject.Checked,
IsOffice = this.ckIsOffice.Checked,
};
newPerson.HomePageType = this.rblHomePageType.SelectedValue;
newPerson.IsInspectionBrigade = cbIsInspectionBrigade.Checked;
newPerson.RoleIds = Funs.GetStringByArray(this.drpRole.SelectedValueArray);
newPerson.RoleIds = Funs.GetStringByArray(this.drpRole.SelectedValueArray);
if (!string.IsNullOrEmpty(imgPhoto.ImageUrl) && imgPhoto.ImageUrl != "~/res/images/blank.png")
{
newPerson.PhotoUrl = imgPhoto.ImageUrl.Replace("~/", "");
@@ -711,7 +708,7 @@ namespace FineUIPro.Web.Person
}
}
#endregion
#region 证书信息
/// <summary>
///
SGGL/FineUIPro.Web/Person/PersonItemEdit.aspx.cs
+7 -7
View File
@@ -65,7 +65,7 @@ namespace FineUIPro.Web.Person
this.drpUnit.SelectedValue = getData.UnitId;
this.txtUnitName.Text = getData.UnitName;
this.drpProject.SelectedValue = getData.ProjectId;
this.txtProjectName.Text = getData.ProjectName;
this.txtProjectName.Text = getData.ProjectName;
this.txtTeamGroupName.Text = getData.TeamGroupName;
this.drpWorkPost.SelectedValue = getData.WorkPostId;
this.txtWorkPostName.Text = getData.WorkPostName;
@@ -73,7 +73,7 @@ namespace FineUIPro.Web.Person
this.txtOutTime.Text = string.Format("{0:yyyy-MM-dd}", getData.OutTime);
this.txtOutResult.Text = getData.OutResult;
TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroup, getData.ProjectId,getData.UnitId, true);
TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroup, getData.ProjectId, getData.UnitId, true);
this.drpTeamGroup.SelectedValue = getData.TeamGroupId;
}
}
@@ -84,7 +84,7 @@ namespace FineUIPro.Web.Person
this.txtPersonName.Text = person.PersonName;
this.txtIdentityCard.Text = person.IdentityCard;
}
if (Request.Params["value"] == "0")
{
this.btnSave.Hidden = true;
@@ -155,7 +155,7 @@ namespace FineUIPro.Web.Person
{
newData.TeamGroupName = this.txtTeamGroupName.Text.Trim();
}
if (!string.IsNullOrEmpty(this.PersonItemId))
{
BLL.SitePerson_PersonItemService.UpdatePersonItem(newData);
@@ -165,7 +165,7 @@ namespace FineUIPro.Web.Person
{
this.PersonItemId = SQLHelper.GetNewID();
newData.PersonItemId = this.PersonItemId;
BLL.SitePerson_PersonItemService.AddPersonItem(newData,null);
BLL.SitePerson_PersonItemService.AddPersonItem(newData, null);
BLL.LogService.AddSys_Log(this.CurrUser, newData.PersonName, newData.PersonItemId, BLL.Const.ProjectPersonMenuId, BLL.Const.BtnAdd);
}
@@ -186,7 +186,7 @@ namespace FineUIPro.Web.Person
{
this.txtProjectName.Text = this.drpProject.SelectedText;
}
SetTeam();
SetTeam();
}
/// <summary>
@@ -196,7 +196,7 @@ namespace FineUIPro.Web.Person
/// <param name="e"></param>
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
{
if(!string.IsNullOrEmpty(this.drpUnit.SelectedValue) && this.drpUnit.SelectedValue != Const._Null)
if (!string.IsNullOrEmpty(this.drpUnit.SelectedValue) && this.drpUnit.SelectedValue != Const._Null)
{
this.txtUnitName.Text = this.drpUnit.SelectedText;
}
SGGL/FineUIPro.Web/Person/PersonLib.aspx.cs
+6 -7
View File
@@ -1,5 +1,4 @@
using BLL;
using Model;
using System;
using System.Linq;
@@ -47,7 +46,7 @@ namespace FineUIPro.Web.Person
private void BindGrid()
{
var getData = Person_PersonsService.getListData(this.drpUnit.SelectedValue, this.drpDepart.SelectedValue, this.drpProject.SelectedValue,
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, this.txtAccount.Text.Trim(),null, Grid1);
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, this.txtAccount.Text.Trim(), null, Grid1);
Grid1.RecordCount = Person_PersonsService.count;
Grid1.DataSource = getData;
Grid1.DataBind();
@@ -253,8 +252,8 @@ namespace FineUIPro.Web.Person
{
int countRecod = 0;
int pCountRecod = 0;
string info=string.Empty;
var getPerson = (from x in Funs.DB.Person_Persons
string info = string.Empty;
var getPerson = (from x in Funs.DB.Person_Persons
where x.IdentityCard != null && x.IdentityCard.Length > 1 && !x.Birthday.HasValue && x.IsCardNoOK.Value
select x).Take(1000);
foreach (var item in getPerson)
@@ -265,18 +264,18 @@ namespace FineUIPro.Web.Person
string qrUrl = BLL.CreateQRCodeService.CreateCode_Simple("person$" + item.IdentityCard);
item.QRCodeAttachUrl = ("~/" + qrUrl);
}
DateTime? birth = IDCardValid.getBirthByIDCard(item.IdentityCard);
if (birth.HasValue)
{
item.Birthday = birth.Value;
}
Funs.DB.SubmitChanges();
countRecod++;
}
info = "操作完成，共处理人员按身份证设置年龄" + countRecod.ToString() + "条。";
//var getPPersons = (from x in Funs.DB.SitePerson_Person
// join y in Funs.DB.Person_Persons on x.PersonId equals y.PersonId
// where x.States == Const.ProjectPersonStates_1 && y.CurrentProjectId == null
SGGL/FineUIPro.Web/Person/PersonTrainEdit.aspx.cs
+3 -3
View File
@@ -58,7 +58,7 @@ namespace FineUIPro.Web.Person
if (getData != null)
{
this.PersonId = getData.PersonId;
this.drpTrainType.SelectedValue = getData.TrainTypeId;
this.drpTrainType.SelectedValue = getData.TrainTypeId;
this.txtTrainDate.Text = string.Format("{0:yyyy-MM-dd}", getData.TrainDate);
this.txtTrainPlace.Text = getData.TrainPlace;
this.txtTrainResult.Text = getData.TrainResult;
@@ -71,7 +71,7 @@ namespace FineUIPro.Web.Person
this.txtPersonName.Text = person.PersonName;
this.txtIdentityCard.Text = person.IdentityCard;
}
if (Request.Params["value"] == "0")
{
this.btnSave.Hidden = true;
@@ -106,7 +106,7 @@ namespace FineUIPro.Web.Person
TrainPlace = this.txtTrainPlace.Text.Trim(),
TrainResult = this.txtTrainResult.Text.Trim(),
};
if (!string.IsNullOrEmpty(this.PersonTrainId))
{
BLL.Person_PersonTrainService.UpdateData(newData);
SGGL/FineUIPro.Web/Person/ProjectPerson.aspx.cs
+3 -3
View File
@@ -20,7 +20,7 @@ namespace FineUIPro.Web.Person
this.GetButtonPower();
this.btnNew.OnClientClick = Window1.GetShowReference("ProjectPersonEdit.aspx") + "return false;";
ProjectService.InitProjectShortNameDropDownList(this.drpProject, false);
this.drpProject.SelectedIndex= 0;
this.drpProject.SelectedIndex = 0;
Funs.FineUIPleaseSelect(drpProject, "按项目查询");
Funs.FineUIPleaseSelect(drpUnit, "按单位查询");
@@ -99,7 +99,7 @@ namespace FineUIPro.Web.Person
/// </summary>
private void BindGrid()
{
var getData = SitePerson_PersonService.getListData(this.drpProject.SelectedValue, this.drpUnit.SelectedValue,this.drpDepart.SelectedValue, this.drpWorkPost.SelectedValue,
var getData = SitePerson_PersonService.getListData(this.drpProject.SelectedValue, this.drpUnit.SelectedValue, this.drpDepart.SelectedValue, this.drpWorkPost.SelectedValue,
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.rbIsPostStates.SelectedValue, this.drpPersonType.SelectedValue, Grid1);
Grid1.RecordCount = SitePerson_PersonService.count;
Grid1.DataSource = getData;
@@ -328,7 +328,7 @@ namespace FineUIPro.Web.Person
Alert.ShowInParent("操作完成！共补卡号" + count.ToString() + "个。", MessageBoxIcon.Information);
BindGrid();
}
else
else
{
Alert.ShowInParent("请先选择项目！", MessageBoxIcon.Warning);
}
SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
+9 -10
View File
@@ -1,5 +1,4 @@
using BLL;
using FastReport.Editor.Syntax;
using Model;
using Newtonsoft.Json.Linq;
using System;
@@ -97,7 +96,7 @@ namespace FineUIPro.Web.Person
{
SetPersonInfo(getPersons);
}
this.txtIdentityCard.Focus();
}
@@ -165,7 +164,7 @@ namespace FineUIPro.Web.Person
this.drpProjectRole.Enabled = true;
}
}
}
}
}
#endregion
#endregion
@@ -202,7 +201,7 @@ namespace FineUIPro.Web.Person
this.txtIdentityCard.Readonly = true;
}
var getProjectPersom = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.drpProject.SelectedValue,this.PersonId);
var getProjectPersom = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.drpProject.SelectedValue, this.PersonId);
if (getProjectPersom != null)
{
this.SitePersonId = getProjectPersom.SitePersonId;
@@ -215,7 +214,7 @@ namespace FineUIPro.Web.Person
this.SitePersonId = getProjectPerson.SitePersonId;
}
}
#region 基本信息
this.txtPersonName.Text = person.PersonName;
this.drpUnit.SelectedValue = person.UnitId;
@@ -224,13 +223,13 @@ namespace FineUIPro.Web.Person
string name = UnitService.GetUnitNameByUnitId(person.UnitId);
var getIsPost = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == person.IdentityCard && x.States != Const.ProjectPersonStates_2 && x.ProjectId != this.drpProject.SelectedValue);
if (getIsPost != null)
{
{
Alert.ShowInParent("当前人员所属单位【" + name + "】不在该项目单位中且人员在项目" + ProjectService.GetProjectNameByProjectId(getIsPost.ProjectId) + "不是【离岗】状态，请查证！", MessageBoxIcon.Warning);
}
else
{
Alert.ShowInParent("当前人员所属单位【" + name + "】不在该项目单位中，请重新选择所属单位！", MessageBoxIcon.Warning);
}
}
}
this.txtAccount.Text = person.Account;
if (person.IsForeign.HasValue)
@@ -431,7 +430,7 @@ namespace FineUIPro.Web.Person
{
this.drpUnit.SelectedValue = this.CurrUser.UnitId ?? ProjectService.getProjectUnitIdByUnitType(this.drpProject.SelectedValue, Const.ProjectUnitType_1);
}
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAuditor, this.drpProject.SelectedValue, ProjectService.getProjectUnitIdByUnitType(this.drpProject.SelectedValue,Const.ProjectUnitType_1), BLL.Const.HSSEManager + "," + BLL.Const.HSSEAssistantManager, false);
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAuditor, this.drpProject.SelectedValue, ProjectService.getProjectUnitIdByUnitType(this.drpProject.SelectedValue, Const.ProjectUnitType_1), BLL.Const.HSSEManager + "," + BLL.Const.HSSEAssistantManager, false);
TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroup, this.drpProject.SelectedValue, this.drpUnit.SelectedValue, false);
gvWorkArea.DataSource = UnitWorkService.GetUnitWorkLists(this.drpProject.SelectedValue);
gvWorkArea.DataBind();//单位工程
@@ -774,7 +773,7 @@ namespace FineUIPro.Web.Person
}
else
{
string info="提示：";
string info = "提示：";
if (!string.IsNullOrEmpty(personInfo))
{
info += personInfo;
@@ -888,7 +887,7 @@ namespace FineUIPro.Web.Person
OutTime = Funs.GetNewDateTime(this.txtOutTime.Text),
OutResult = this.txtOutResult.Text.Trim(),
States = string.IsNullOrEmpty(this.hdStates.Text) ? Const.ProjectPersonStates_0 : this.hdStates.Text,
IsSafetyMonitoring=this.ckIsSafetyMonitoring.Checked,
IsSafetyMonitoring = this.ckIsSafetyMonitoring.Checked,
IsCQMSCheck = this.ckIsCQMSCheck.Checked
};
if (newPerson.States == Const.ProjectPersonStates_2 || newPerson.States == Const.ProjectPersonStates_R)
SGGL/FineUIPro.Web/Person/ProjectPersonView.aspx.cs
+2 -5
View File
@@ -1,8 +1,5 @@
using BLL;
using FastReport.Editor.Syntax;
using Newtonsoft.Json.Linq;
using System;
using System.IO;
using System.Linq;
namespace FineUIPro.Web.Person
@@ -79,7 +76,7 @@ namespace FineUIPro.Web.Person
this.drpProject.Readonly = false;
Alert.ShowInParent("请先选择项目！", MessageBoxIcon.Warning);
}
getInitGridCertificate();
getInitGridTestRecord();
getInitGridInOut();
@@ -221,7 +218,7 @@ namespace FineUIPro.Web.Person
}
this.hdStates.Text = getProjectPerson.States;
this.lbStates.Text = GetProjectPersonStates(getProjectPerson.States);
this.drpProject.SelectedValue = getProjectPerson.ProjectId;
InitDropDownListProject();
this.drpUnit.SelectedValue = getProjectPerson.UnitId;