河北专项检查和移动端
This commit is contained in:
@@ -266,41 +266,41 @@ namespace FineUIPro.Web.OfficeCheck.Inspect
|
||||
}
|
||||
else
|
||||
{
|
||||
InspectionItem=Inspect_InspectionService.GetInspectItemsById(id);
|
||||
//InspectionItem=Inspect_InspectionService.GetInspectItemsById(id);
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(values.Value<string>("InspectionDescribe")))
|
||||
{
|
||||
InspectionItem.InspectionDescribe = values.Value<string>("InspectionDescribe");
|
||||
//InspectionItem.InspectionDescribe = values.Value<string>("InspectionDescribe");
|
||||
}
|
||||
|
||||
var file = AttachFileService.GetAttachFile(id + "_1", BLL.Const.ProjectSafetyInspectionMenuId);
|
||||
if (file != null)
|
||||
{
|
||||
InspectionItem.PhotoUrl = file.AttachUrl.Trim();
|
||||
//InspectionItem.PhotoUrl = file.AttachUrl.Trim();
|
||||
}
|
||||
|
||||
var file1 = AttachFileService.GetAttachFile(id + "_2", BLL.Const.ProjectSafetyInspectionMenuId);
|
||||
if (file1 != null)
|
||||
{
|
||||
InspectionItem.VideoUrl = file1.AttachUrl.Trim();
|
||||
//InspectionItem.VideoUrl = file1.AttachUrl.Trim();
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(InspectionItem.PhotoUrl) &&
|
||||
string.IsNullOrEmpty(InspectionItem.VideoUrl) &&
|
||||
string.IsNullOrEmpty(InspectionItem.InspectionDescribe))
|
||||
{
|
||||
ShowNotify("注意其中有检查项、图片、视频全是空!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
//if (string.IsNullOrEmpty(InspectionItem.PhotoUrl) &&
|
||||
// string.IsNullOrEmpty(InspectionItem.VideoUrl) &&
|
||||
// string.IsNullOrEmpty(InspectionItem.InspectionDescribe))
|
||||
//{
|
||||
// ShowNotify("注意其中有检查项、图片、视频全是空!", MessageBoxIcon.Warning);
|
||||
// return;
|
||||
//}
|
||||
|
||||
if (!ids.Contains(id))
|
||||
{
|
||||
Inspect_InspectionService.AddInspectionItem(InspectionItem);
|
||||
//Inspect_InspectionService.SaveInspection(InspectionItem);
|
||||
}
|
||||
else
|
||||
{
|
||||
Inspect_InspectionService.UpdateInspectionItem(InspectionItem);
|
||||
//Inspect_InspectionService.UpdateInspectionItem(InspectionItem);
|
||||
}
|
||||
ids.Remove(id);
|
||||
|
||||
@@ -443,11 +443,11 @@ namespace FineUIPro.Web.OfficeCheck.Inspect
|
||||
{
|
||||
//获取当前数据的明细
|
||||
var register = Inspect_InspectionService.GetInspectItemsById(this.Grid1.SelectedRowID);
|
||||
if (register.EvaluateResults == "合格")
|
||||
{
|
||||
Alert.ShowInTop("当前项已合格,无需整改!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
//if (register.EvaluateResults == "合格")
|
||||
//{
|
||||
// Alert.ShowInTop("当前项已合格,无需整改!", MessageBoxIcon.Warning);
|
||||
// return;
|
||||
//}
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectSafetyInspectionRectify.aspx?InspectionItemId={0}&type={1}", this.Grid1.SelectedRowID,'0', "编辑 - ")));
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user