质量月报、周报调整
This commit is contained in:
@@ -2643,6 +2643,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
#region 23.施工照片
|
||||
protected void filePhoto_FileSelected(object sender, EventArgs e)
|
||||
{
|
||||
string fileUrl = "~/upload/WeekReport/";
|
||||
if (filePhoto.HasFile)
|
||||
{
|
||||
string fileName = filePhoto.ShortFileName;
|
||||
@@ -2656,9 +2657,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
|
||||
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
|
||||
|
||||
filePhoto.SaveAs(Server.MapPath("~/upload/" + fileName));
|
||||
filePhoto.SaveAs(Server.MapPath(fileUrl + fileName));
|
||||
|
||||
imgPhoto.ImageUrl = "~/upload/" + fileName;
|
||||
imgPhoto.ImageUrl = fileUrl + fileName;
|
||||
|
||||
// 清空文件上传组件(上传后要记着清空,否则点击提交表单时会再次上传!!)
|
||||
filePhoto.Reset();
|
||||
@@ -2677,9 +2678,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
|
||||
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
|
||||
|
||||
filePhoto2.SaveAs(Server.MapPath("~/upload/" + fileName));
|
||||
filePhoto2.SaveAs(Server.MapPath(fileUrl + fileName));
|
||||
|
||||
imgPhoto2.ImageUrl = "~/upload/" + fileName;
|
||||
imgPhoto2.ImageUrl = fileUrl + fileName;
|
||||
|
||||
// 清空文件上传组件(上传后要记着清空,否则点击提交表单时会再次上传!!)
|
||||
filePhoto2.Reset();
|
||||
@@ -2698,9 +2699,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
|
||||
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
|
||||
|
||||
filePhoto3.SaveAs(Server.MapPath("~/upload/" + fileName));
|
||||
filePhoto3.SaveAs(Server.MapPath(fileUrl + fileName));
|
||||
|
||||
imgPhoto3.ImageUrl = "~/upload/" + fileName;
|
||||
imgPhoto3.ImageUrl = fileUrl + fileName;
|
||||
|
||||
// 清空文件上传组件(上传后要记着清空,否则点击提交表单时会再次上传!!)
|
||||
filePhoto3.Reset();
|
||||
@@ -2719,9 +2720,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
|
||||
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
|
||||
|
||||
filePhoto4.SaveAs(Server.MapPath("~/upload/" + fileName));
|
||||
filePhoto4.SaveAs(Server.MapPath(fileUrl + fileName));
|
||||
|
||||
imgPhoto4.ImageUrl = "~/upload/" + fileName;
|
||||
imgPhoto4.ImageUrl = fileUrl + fileName;
|
||||
|
||||
// 清空文件上传组件(上传后要记着清空,否则点击提交表单时会再次上传!!)
|
||||
filePhoto4.Reset();
|
||||
@@ -2740,9 +2741,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
|
||||
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
|
||||
|
||||
filePhoto5.SaveAs(Server.MapPath("~/upload/" + fileName));
|
||||
filePhoto5.SaveAs(Server.MapPath(fileUrl + fileName));
|
||||
|
||||
imgPhoto5.ImageUrl = "~/upload/" + fileName;
|
||||
imgPhoto5.ImageUrl = fileUrl + fileName;
|
||||
|
||||
// 清空文件上传组件(上传后要记着清空,否则点击提交表单时会再次上传!!)
|
||||
filePhoto5.Reset();
|
||||
@@ -2761,9 +2762,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
|
||||
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
|
||||
|
||||
filePhoto6.SaveAs(Server.MapPath("~/upload/" + fileName));
|
||||
filePhoto6.SaveAs(Server.MapPath(fileUrl + fileName));
|
||||
|
||||
imgPhoto6.ImageUrl = "~/upload/" + fileName;
|
||||
imgPhoto6.ImageUrl = fileUrl + fileName;
|
||||
|
||||
// 清空文件上传组件(上传后要记着清空,否则点击提交表单时会再次上传!!)
|
||||
filePhoto6.Reset();
|
||||
@@ -2811,7 +2812,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
ShowNotify("类似项目管理经验教训应对措施及跟踪字符长度不能大于2000!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
if (this.txtAre22.Text.Length>2000)
|
||||
if (this.txtAre22.Text.Length > 2000)
|
||||
{
|
||||
ShowNotify("附件字符长度不能大于2000!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
@@ -3075,8 +3076,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
//保存19.下月质量控制重点
|
||||
saveNextQualityControl();
|
||||
|
||||
//保存23.施工照片
|
||||
saveImages();
|
||||
////保存23.施工照片
|
||||
//saveImages();
|
||||
|
||||
//保存文本框
|
||||
saveTxtContent();
|
||||
@@ -3219,7 +3220,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3396,7 +3397,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
catch (Exception)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
@@ -3442,7 +3443,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
catch (Exception)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
@@ -3510,6 +3511,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
TextBoxContentService.Delete(ReportId);
|
||||
db.Report_TextBoxContent.InsertAllOnSubmit(txtContentList);
|
||||
db.SubmitChanges();
|
||||
|
||||
//保存23.施工照片
|
||||
saveImages();
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
@@ -3604,11 +3608,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
catch (Exception)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
void saveSbInspection() //检验批统计:设备
|
||||
{
|
||||
{
|
||||
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
|
||||
JArray teamGroupData = GvSb.GetMergedData();
|
||||
foreach (JObject teamGroupRow in teamGroupData)
|
||||
@@ -3652,7 +3656,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
}
|
||||
}
|
||||
void saveGDInspection() //检验批统计:管道
|
||||
{
|
||||
{
|
||||
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
|
||||
JArray teamGroupData = GvGD.GetMergedData();
|
||||
foreach (JObject teamGroupRow in teamGroupData)
|
||||
@@ -3692,7 +3696,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
catch (Exception)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3737,7 +3741,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
catch (Exception)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
void saveYBInspection() //检验批统计:仪表
|
||||
@@ -4336,7 +4340,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl
|
||||
{
|
||||
//NextQualityControlId = values.Value<string>("NextQualityControlId"),
|
||||
NextQualityControlId= SQLHelper.GetNewID(),
|
||||
NextQualityControlId = SQLHelper.GetNewID(),
|
||||
ReportId = ReportId,
|
||||
NextQualityControlContent = values.Value<string>("NextQualityControlContent")
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user