From adc1171e41f0e8f5321d72884795e89cfc023c91 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 2 Jan 2025 10:57:29 +0800 Subject: [PATCH] =?UTF-8?q?20250102=20=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Evaluation/PerformanceReport.aspx.cs | 4 +- FCL/FineUIPro.Web/File/Excel/FC_list.xlsx | Bin 10453 -> 10463 bytes FCL/FineUIPro.Web/SES/SESRelatedData.aspx | 22 +++++------ FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs | 10 +++-- .../SES/SESRelatedData.aspx.designer.cs | 9 ----- .../SES/SESRelatedDataContractManage10.aspx | 4 +- .../SESRelatedDataContractManage10.aspx.cs | 10 ++--- .../SES/SESRelatedDataContractManage11.aspx | 4 +- .../SESRelatedDataContractManage11.aspx.cs | 10 ++--- .../SES/SESRelatedDataContractManage12.aspx | 4 +- .../SESRelatedDataContractManage12.aspx.cs | 10 ++--- .../SES/SESRelatedDataContractManage13.aspx | 4 +- .../SESRelatedDataContractManage13.aspx.cs | 10 ++--- .../SES/SESRelatedDataContractManage6.aspx | 4 +- .../SES/SESRelatedDataContractManage6.aspx.cs | 10 ++--- .../SES/SESRelatedDataContractManage7.aspx | 4 +- .../SES/SESRelatedDataContractManage7.aspx.cs | 10 ++--- .../SES/SESRelatedDataContractManage8.aspx | 4 +- .../SES/SESRelatedDataContractManage8.aspx.cs | 10 ++--- .../SES/SESRelatedDataContractManage9.aspx | 4 +- .../SES/SESRelatedDataContractManage9.aspx.cs | 10 ++--- FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx | 12 +----- .../SES/SESRelatedDataEdit.aspx.cs | 4 +- .../SES/SESRelatedDataEdit.aspx.designer.cs | 36 ------------------ 24 files changed, 80 insertions(+), 129 deletions(-) diff --git a/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs b/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs index 0fb1935..3afe246 100644 --- a/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs +++ b/FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs @@ -1077,7 +1077,7 @@ namespace FineUIPro.Web.Evaluation Funs.DB.FC_NoEvaluatedUser.DeleteAllOnSubmit(deNoEva); Funs.DB.SubmitChanges(); - var departEva = (from x in Funs.DB.FC_BigDepartEvaRate where x.ReportMonth == txtStartTime.Text select x).ToList(); + var departEva = (from x in Funs.DB.FC_BigDepartEvaRate select x).ToList(); Funs.DB.FC_BigDepartEvaRate.DeleteAllOnSubmit(departEva); Funs.DB.SubmitChanges(); @@ -1088,7 +1088,7 @@ namespace FineUIPro.Web.Evaluation DateTime eTime = DateTime.Parse(mindate.Value.Year.ToString() + "-" + mindate.Value.Month.ToString() + "-13"); - #region + #region 提取常规框架承包商绩效 for (int j = 0; j < toDiff; j++) { percentIn[UserId] = (int)(100 * (j + 1) / (toDiff * 6)); diff --git a/FCL/FineUIPro.Web/File/Excel/FC_list.xlsx b/FCL/FineUIPro.Web/File/Excel/FC_list.xlsx index 4981904b952fe04bc75fcf991df4c340ffee473d..723fdd641667a62ceb14b16c11d551f6aff2a267 100644 GIT binary patch delta 2382 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 AEdT%j delta 2405 zcmV-r37YobQPokfmH`DV(F}A^lbZn`f5RXYh2Ks54-M}vv|YAIy3VNClS@pjneh$b zZfh)*0JH1Am$uui(fA1G+>di^$d*T01)pGSS*rz#BZ2}@ycVU}EznD`3g;-Wjw!*a zTEPOfV9_$azRI|!yf*M;Y7NGfU;|H5mU6v7d*?L8*z!F{W+U%VUfkA3GUtzGe}^^W zA8ZFWA!LdrI3}25xC4gzLPRH|;1{Gmn5qW|j-dhx%2^yoG5+>CFw*`x&?_USEM2R8 zr&HW9Tkt`=xR18H7@MYvnzWDM^T+sg{rKEh4NKMSiUZ0s!6`SuTy63O%4mPMeP?zX zwwg!0mJwGO9$C6|R?ND!-~6@&VsY2z8&IOn@NdDR`z8Y)MBua0p~+d6*1h{@ z6aWAK2mpsp;y}hj>LJ3j8UxY-4p3+k^lvzhsq%P$ocsik8j}+SK?!9yq1UGb003B% zT?Qe4U2~&06n*bZ{{zGO0+MVe&e-0eNz>i7yG=Ly(e{mCIc5Tg1vw=B^?N0_HV6&2 zCo|z1&i&B2=gPv1w=Y@hJoBONn(B@;$6mb*#s$h8cC?X+9pMX(O%Xk#aowA4Qs`EIwjsT zPxkT1WKdt0#HFajMtZTx{HCudUXvKAu1|EcXQo#3cD^S5TK!uEAnLP7ro~9}?$mn~UL?!U| z8M-!RyVa_>E1fmpM7va8i}YKvmfNL&J9qKkCsDuS$>UZ+Db$;)ps`3H0{nNf1k_Aj zCyQS6wQjvVkaMiLXyfVC?mbxR0oT39WX3vwqwbT|9j>iAnR-)tarhf`pSJFBMfbq# zriZvA#m`!IxS~5b!~LRlhimH&b&R9~CN;Zo#dMcP=q0ebXdh*u)5PoWLm~TrNKOJW zY62+rH9ZB2&j^5;Acq!%dd5{ju&<=knW+b%#!AI@kV8La9_>hp!Go~?*bs8)2$>x# z6}v(XZJGD^frXD{g#l|A1_K$MpCKcPJyr$=U}k_yzNYYPGEO1IZYu*r5p$qU3x$2B zV6>s;{Yc}yP`k>>k;)7z#-lxK4wCq1CAXkkUr-uU1%~KODeegyb2cnGn{ea7V%4ytBW9g#PtwC`-qz%g7p!< z4iS?+;&zCb_7T4g5wkvj;@uE&(MP-=A};%g--n2KAMwW!K@3v=v_K42;asbF+~eJ# z^`ix1@cNepVi0?0ff&sGZGjlnezHIeZtpD+gWS&z1g2>(M`E!1WeA}LyI+TisKM^H z1_D#EPecuN|FJ*}cK@|N40ivs)MBt3T85As^oEu(qz1pCZ4eEAfS0Y+C}upKSbqYl2=a3H?YvagRh&ic^TBU6otMEF&~74S6}?Jgi67wgQN_J3=Ww0vqlRz1`a0Il(H5A000aH000yKlR+mIe|?nCZqq;z#_veH!^#pz>;Mu1 zQwWm=*nFvTGtuXcA z$@73%!CqTPuLDV}SrVJ1y-Rjv7)K_Fqjh8xZ8Dv)k~0CWg8BVv>4otTf6ks zR0^YLW~6f44M5~lk)2)7!Yc!Xn|))8q}0Gjf2ygQl3Jw@u@~=PzG9SF0Umc$;brhm13vFeiOQ zg~ofVc*|xXIYA)SW6{Mgkcsu3H?6ud`M~wx!VK;PFMrNg-;P#ipI2vJD|k5aU3eC! z$BQ@Lm-Cb5?5+Ej+uB_{{(L!Kembr08gW~@s|T{yChS6n*XXTZAtrTjV=uzLS@IXN zzY{GH0U(p@BtQX)lP)DQ0j-l_C6fg$(F}A^llmn(8^%NGA;JOx0EP|#022TJ00000 z0096X00008lTRi<0sE7XCNKfjlffo70{kJ9`6etICfAg*76JeO31Kqo;Bu@wLScx*3oba`xLbCY2vAd{{q4gn>Ty(cySOq28{KmoOrH7Gni z90mXYcx*3sZ*psMXk}$|b1zU!0Rj{N6aWAK2mpsp;y`6Lq1UGb003AK000;O00000 X00031AOHXWNRzH8D+ahE00000epz0g diff --git a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx index 81d929d..1d4fccd 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx +++ b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx @@ -87,7 +87,7 @@ - @@ -409,7 +409,7 @@ FieldType="String" HeaderText="Exceed limit(day)" HeaderTextAlign="Center"> - @@ -422,7 +422,7 @@ - + --%> <%-- @@ -939,7 +939,7 @@ - + @@ -987,7 +987,7 @@ - + @@ -1035,7 +1035,7 @@ - + @@ -1083,7 +1083,7 @@ - + @@ -1131,7 +1131,7 @@ - + @@ -1179,7 +1179,7 @@ - + @@ -1227,7 +1227,7 @@ - + @@ -1275,7 +1275,7 @@ - + diff --git a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs index ed2e378..5a7a060 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.cs @@ -1354,10 +1354,14 @@ namespace FineUIPro.Web.SES //Connected Transaction if (reportModel.GetRow(rowIndex).GetCell(27) == null) reportModel.GetRow(rowIndex).CreateCell(27); reportModel.GetRow(rowIndex).GetCell(27).SetCellValue(itemOver.Connectedtransaction); - //Checked Value + //Exceed limit(day) if (reportModel.GetRow(rowIndex).GetCell(28) == null) reportModel.GetRow(rowIndex).CreateCell(28); - reportModel.GetRow(rowIndex).GetCell(28).SetCellValue(itemOver.CheckedValue != null ? (double)itemOver.CheckedValue.Value : 0); - reportModel.GetRow(rowIndex).GetCell(28).CellStyle = styleQfw; + reportModel.GetRow(rowIndex).GetCell(28).SetCellValue(itemOver.ExceedLimit.HasValue ? itemOver.ExceedLimit.ToString() : ""); + + //Checked Value + //if (reportModel.GetRow(rowIndex).GetCell(28) == null) reportModel.GetRow(rowIndex).CreateCell(28); + //reportModel.GetRow(rowIndex).GetCell(28).SetCellValue(itemOver.CheckedValue != null ? (double)itemOver.CheckedValue.Value : 0); + //reportModel.GetRow(rowIndex).GetCell(28).CellStyle = styleQfw; ////Remaining Budget //if (reportModel.GetRow(rowIndex).GetCell(29) == null) reportModel.GetRow(rowIndex).CreateCell(29); //reportModel.GetRow(rowIndex).GetCell(29).SetCellValue(itemOver.RemainingBudget != null ? (double)itemOver.RemainingBudget.Value : 0); diff --git a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.designer.cs b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.designer.cs index f453580..d2b5805 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.designer.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedData.aspx.designer.cs @@ -590,15 +590,6 @@ namespace FineUIPro.Web.SES /// protected global::FineUIPro.DropDownList DropDownList27; - /// - /// DropDownList28 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList DropDownList28; - /// /// DropDownList31 控件。 /// diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx index 9662ea3..ec9f52a 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx @@ -17,14 +17,14 @@ <%----%> - + - + diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx.cs index 36d2ffe..4e0971e 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage10.aspx.cs @@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES /// protected void btnSave_Click(object sender, EventArgs e) { - //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null) - //{ - // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning); - // return; - //} + if (this.drpBycDept.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择BYC负责部门！", MessageBoxIcon.Warning); + return; + } string id = Request.Params["id"]; string fileId = Request.Params["fileId"]; Model.FC_ContractManagement newContract = new Model.FC_ContractManagement(); diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx index 0a04b15..f5d5516 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx @@ -17,14 +17,14 @@ <%----%> - + - + diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx.cs index 1c4459b..223ca7a 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage11.aspx.cs @@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES /// protected void btnSave_Click(object sender, EventArgs e) { - //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null) - //{ - // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning); - // return; - //} + if (this.drpBycDept.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择BYC负责部门！", MessageBoxIcon.Warning); + return; + } string id = Request.Params["id"]; string fileId = Request.Params["fileId"]; Model.FC_ContractManagement newContract = new Model.FC_ContractManagement(); diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx index 606a44c..c04be2c 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx @@ -17,14 +17,14 @@ <%----%> - + - + diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx.cs index 79d0e7c..c10fc3f 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage12.aspx.cs @@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES /// protected void btnSave_Click(object sender, EventArgs e) { - //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null) - //{ - // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning); - // return; - //} + if (this.drpBycDept.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择BYC负责部门！", MessageBoxIcon.Warning); + return; + } string id = Request.Params["id"]; string fileId = Request.Params["fileId"]; Model.FC_ContractManagement newContract = new Model.FC_ContractManagement(); diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx index 193841d..c89318a 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx @@ -17,14 +17,14 @@ <%----%> - + - + diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx.cs index 560e912..6d53b63 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage13.aspx.cs @@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES /// protected void btnSave_Click(object sender, EventArgs e) { - //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null) - //{ - // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning); - // return; - //} + if (this.drpBycDept.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择BYC负责部门！", MessageBoxIcon.Warning); + return; + } string id = Request.Params["id"]; string fileId = Request.Params["fileId"]; Model.FC_ContractManagement newContract = new Model.FC_ContractManagement(); diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx index 9097671..3eed44f 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx @@ -17,14 +17,14 @@ <%----%> - + - + diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx.cs index 72567e9..2d36049 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage6.aspx.cs @@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES /// protected void btnSave_Click(object sender, EventArgs e) { - //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null) - //{ - // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning); - // return; - //} + if (this.drpBycDept.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择BYC负责部门！", MessageBoxIcon.Warning); + return; + } string id = Request.Params["id"]; string fileId = Request.Params["fileId"]; Model.FC_ContractManagement newContract = new Model.FC_ContractManagement(); diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx index 40a55ea..dd8f014 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx @@ -17,14 +17,14 @@ <%----%> - + - + diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx.cs index 97b6ade..c234a26 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage7.aspx.cs @@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES /// protected void btnSave_Click(object sender, EventArgs e) { - //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null) - //{ - // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning); - // return; - //} + if (this.drpBycDept.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择BYC负责部门！", MessageBoxIcon.Warning); + return; + } string id = Request.Params["id"]; string fileId = Request.Params["fileId"]; Model.FC_ContractManagement newContract = new Model.FC_ContractManagement(); diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx index b3a242a..de1c359 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx @@ -17,14 +17,14 @@ <%----%> - + - + diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx.cs index 6e38fef..e895835 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage8.aspx.cs @@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES /// protected void btnSave_Click(object sender, EventArgs e) { - //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null) - //{ - // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning); - // return; - //} + if (this.drpBycDept.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择BYC负责部门！", MessageBoxIcon.Warning); + return; + } string id = Request.Params["id"]; string fileId = Request.Params["fileId"]; Model.FC_ContractManagement newContract = new Model.FC_ContractManagement(); diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx index 5bb5d00..d4c2be4 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx @@ -17,14 +17,14 @@ <%----%> - + - + diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx.cs index a0a054e..443f7b5 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataContractManage9.aspx.cs @@ -134,11 +134,11 @@ namespace FineUIPro.Web.SES /// protected void btnSave_Click(object sender, EventArgs e) { - //if (this.drpFileTypeId.SelectedValue==BLL.Const._Null) - //{ - // Alert.ShowInTop("请选择合同类型", MessageBoxIcon.Warning); - // return; - //} + if (this.drpBycDept.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择BYC负责部门！", MessageBoxIcon.Warning); + return; + } string id = Request.Params["id"]; string fileId = Request.Params["fileId"]; Model.FC_ContractManagement newContract = new Model.FC_ContractManagement(); diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx index 6093785..4595bd9 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx @@ -137,19 +137,11 @@ - + <%----%> - - - - - - - - - + diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs index 4647a86..6d1fa7a 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.cs @@ -211,7 +211,7 @@ namespace FineUIPro.Web.SES { this.drpConnectedTransaction.SelectedValue = data.ConnectedTransaction; } - this.txtCheckedValue.Text = BLL.SESReportService.getSumSSRActualCostByFo(data.FO_NO).ToString(); + //this.txtCheckedValue.Text = BLL.SESReportService.getSumSSRActualCostByFo(data.FO_NO).ToString(); //this.txtRemainingBudget.Text = (Funs.GetNewDecimalOrZero(data.Actual_Budget.ToString()) - Funs.GetNewDecimalOrZero(this.txtCheckedValue.Text)).ToString(); txtNumExceedLimit.Text = data.ExceedLimit != null ? data.ExceedLimit.Value.ToString() : ""; @@ -379,7 +379,7 @@ namespace FineUIPro.Web.SES { this.drpConnectedTransaction.SelectedValue = data.ConnectedTransaction; } - this.txtCheckedValue.Text = BLL.SESReportService.getSumSSRActualCostByFo(data.FO_NO).ToString(); + //this.txtCheckedValue.Text = BLL.SESReportService.getSumSSRActualCostByFo(data.FO_NO).ToString(); //this.txtRemainingBudget.Text = (Funs.GetNewDecimalOrZero(data.Actual_Budget.ToString()) - Funs.GetNewDecimalOrZero(this.txtCheckedValue.Text)).ToString(); txtNumExceedLimit.Text = data.ExceedLimit != null ? data.ExceedLimit.Value.ToString() : ""; diff --git a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.designer.cs b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.designer.cs index 1d70741..b894269 100644 --- a/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.designer.cs +++ b/FCL/FineUIPro.Web/SES/SESRelatedDataEdit.aspx.designer.cs @@ -419,15 +419,6 @@ namespace FineUIPro.Web.SES /// protected global::FineUIPro.TextBox txtMainHeadContact; - /// - /// txtCheckedValue 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtCheckedValue; - /// /// txtSafetyOfficer 控件。 /// @@ -464,33 +455,6 @@ namespace FineUIPro.Web.SES /// protected global::FineUIPro.TextBox txtProjectManagerContact; - /// - /// Label1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label1; - - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label2; - - /// - /// Label3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label3; - /// /// txtRemark 控件。 ///