diff --git a/SGGL/FineUIPro.Web/CQMS/Models/QualityModel.aspx b/SGGL/FineUIPro.Web/CQMS/Models/QualityModel.aspx index f91f0916..bfe57471 100644 --- a/SGGL/FineUIPro.Web/CQMS/Models/QualityModel.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Models/QualityModel.aspx @@ -20,9 +20,15 @@ + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Models/QualityModel.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Models/QualityModel.aspx.cs index f051c876..c33beaa2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Models/QualityModel.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Models/QualityModel.aspx.cs @@ -16,6 +16,7 @@ namespace FineUIPro.Web.CQMS.Models if (!IsPostBack) { GetButtonPower(); + BLL.CompanyModelKindService.InitCompanyModelKindDownList(this.drpCompanyModelKind, true); BindGrid(); btnNew.OnClientClick = Window1.GetShowReference("QualityModelEdit.aspx") + "return false;"; } @@ -29,6 +30,11 @@ namespace FineUIPro.Web.CQMS.Models string strSql = @"select q.*,c.ModelType,CompanyModelKindName,CompanyModelKindCode from Model_QualityModel q left join Base_CompanyModel c on c.CompanyModelId=q.CompanyModelId left join Base_CompanyModelKind d on d.CompanyModelKindId=c.CompanyModelKindId where ProjectId=@ProjectId "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + if (this.drpCompanyModelKind.SelectedValue != BLL.Const._Null) + { + strSql += " and c.CompanyModelKindId=@CompanyModelKindId"; + listStr.Add(new SqlParameter("@CompanyModelKindId", this.drpCompanyModelKind.SelectedValue)); + } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); Grid1.RecordCount = tb.Rows.Count; @@ -200,6 +206,7 @@ namespace FineUIPro.Web.CQMS.Models if (buttonList.Contains(BLL.Const.BtnAdd)) { this.btnNew.Hidden = false; + this.btnLoad.Hidden = false; } if (buttonList.Contains(BLL.Const.BtnModify)) { @@ -212,6 +219,45 @@ namespace FineUIPro.Web.CQMS.Models } } } - #endregion + #endregion + + #region 抽取公司质量样板内容 + /// + /// 抽取公司质量样板内容 + /// + /// + /// + protected void btnLoad_Click(object sender, EventArgs e) + { + var qualityModels = from x in Funs.DB.Model_QualityModel where x.ProjectId == this.CurrUser.LoginProjectId select x; + if (qualityModels.Count() == 0) + { + var companyModels = from x in Funs.DB.Base_CompanyModel select x; + foreach (var item in companyModels) + { + Model.Model_QualityModel newQualityModel = new Model.Model_QualityModel(); + newQualityModel.ProjectId = this.CurrUser.LoginProjectId; + newQualityModel.CompanyModelId = item.CompanyModelId; + newQualityModel.QualityModelId = SQLHelper.GetNewID(typeof(Model.Model_QualityModel)); + newQualityModel.CompileMan = this.CurrUser.PersonId; + newQualityModel.CompileDate = DateTime.Now; + BLL.QualityModelService.AddQualityModel(newQualityModel); + } + } + else + { + Alert.ShowInTop("该项目已存在公司质量样板内容,无法抽取!"); + return; + } + //BLL.LogService.AddSys_Log(this.CurrUser, "抽取公司质量样板内容", null, BLL.Const.QualityModelMenuId, BLL.Const.BtnDownload); + ShowNotify("抽取公司质量样板内容成功!", MessageBoxIcon.Success); + BindGrid(); + } + #endregion + + protected void drpCompanyModelKind_SelectedIndexChanged(object sender, EventArgs e) + { + BindGrid(); + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Models/QualityModel.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Models/QualityModel.aspx.designer.cs index b65d7fe5..935c5763 100644 --- a/SGGL/FineUIPro.Web/CQMS/Models/QualityModel.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Models/QualityModel.aspx.designer.cs @@ -57,6 +57,15 @@ namespace FineUIPro.Web.CQMS.Models { /// protected global::FineUIPro.Toolbar ToolSearch; + /// + /// drpCompanyModelKind 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCompanyModelKind; + /// /// btnNew 控件。 /// @@ -66,6 +75,15 @@ namespace FineUIPro.Web.CQMS.Models { /// protected global::FineUIPro.Button btnNew; + /// + /// btnLoad 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnLoad; + /// /// lblPageIndex 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Models/QualityModelEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Models/QualityModelEdit.aspx index e1064988..7b62902c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Models/QualityModelEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Models/QualityModelEdit.aspx @@ -25,7 +25,7 @@ - +