补丁
This commit is contained in:
@@ -104,6 +104,15 @@ namespace FineUIPro.Web.HSSE.OccupationHealth
|
||||
from teamGroup in teamGroups.DefaultIfEmpty()
|
||||
where person.ProjectId == this.ProjectId
|
||||
&& att.AttachFileId != null
|
||||
&& (drpUnitId.SelectedValue == Const._Null || person.UnitId == drpUnitId.SelectedValue)
|
||||
&& (string.IsNullOrEmpty(txtCardNo.Text) || person.CardNo.Contains(txtCardNo.Text.Trim()))
|
||||
&& (string.IsNullOrEmpty(txtPersonName.Text) ||
|
||||
person.PersonName.Contains(txtPersonName.Text.Trim()))
|
||||
&& (string.IsNullOrEmpty(txtWorkPostName.Text) ||
|
||||
post.WorkPostName.Contains(txtWorkPostName.Text.Trim()))
|
||||
&& person.IsUsed == (drpIsUsedName.SelectedValue == "是" ? true : false)
|
||||
&& project.ProjectState== BLL.Const.ProjectState_1
|
||||
&& (project .IsDelete==null || project.IsDelete==false)
|
||||
select new
|
||||
{
|
||||
person.ProjectId,
|
||||
|
||||
@@ -302,7 +302,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
|
||||
var personQuality = BLL.PersonQualityService.GetPersonQualityByPersonId(fileId);
|
||||
if (personQuality != null)
|
||||
{
|
||||
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PersonBaseInfo&menuId={1}&strParam=4&type=0", personQuality.PersonId, BLL.Const.PersonListMenuId)));
|
||||
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PersonBaseInfo&menuId={1}&strParam=4&type=-1", personQuality.PersonId, BLL.Const.PersonListMenuId)));
|
||||
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PersonQualityAttachUrl&menuId={1}&type=-1", personQuality.PersonQualityId, BLL.Const.PersonQualityMenuId)));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user