修改进度录入页面

SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs

@@ -231,7 +231,7 @@ namespace Web.Controls
 
             for (int i = 0; i < chart1.Series["本月计划工作预算费用-BCWS"].Points.Count; i++)
             {
-                chart1.Series["本月计划工作预算费用-BCWS"].Points[i].ToolTip = "#VALX,#VALY";
+                chart1.Series["本月计划工作预算费用-BCWS"].Points[i].ToolTip = "本月计划工作预算费用-BCWS\n#VALX\n#VALY";
             }
 
             chart1.Series["本月已完工作预算费用-BCWP"].Points.DataBindXY(dv, "月份", dv, "本月已完工作预算费用-BCWP");
@@ -239,7 +239,7 @@ namespace Web.Controls
 
             for (int i = 0; i < chart1.Series["本月已完工作预算费用-BCWP"].Points.Count; i++)
             {
-                chart1.Series["本月已完工作预算费用-BCWP"].Points[i].ToolTip = "#VALX,#VALY";
+                chart1.Series["本月已完工作预算费用-BCWP"].Points[i].ToolTip = "本月已完工作预算费用-BCWP\n#VALX\n#VALY";
             }
 
             chart1.Series["本月已完工作实际费用-ACWP"].Points.DataBindXY(dv, "月份", dv, "本月已完工作实际费用-ACWP");
@@ -247,7 +247,7 @@ namespace Web.Controls
 
             for (int i = 0; i < chart1.Series["本月已完工作实际费用-ACWP"].Points.Count; i++)
             {
-                chart1.Series["本月已完工作实际费用-ACWP"].Points[i].ToolTip = "#VALX,#VALY";
+                chart1.Series["本月已完工作实际费用-ACWP"].Points[i].ToolTip = "本月已完工作实际费用-ACWP\n#VALX\n#VALY";
             }
 
             chart1.Series["累计计划工作预算费用-BCWS"].Points.DataBindXY(dv, "月份", dv, "累计计划工作预算费用-BCWS");
@@ -257,7 +257,7 @@ namespace Web.Controls
 
             for (int i = 0; i < chart1.Series["累计计划工作预算费用-BCWS"].Points.Count; i++)
             {
-                chart1.Series["累计计划工作预算费用-BCWS"].Points[i].ToolTip = "#VALX,#VALY";
+                chart1.Series["累计计划工作预算费用-BCWS"].Points[i].ToolTip = "累计计划工作预算费用-BCWS\n#VALX\n#VALY";
             }
 
             chart1.Series["累计已完工作预算费用-BCWP"].Points.DataBindXY(dv, "月份", dv, "累计已完工作预算费用-BCWP");
@@ -267,7 +267,7 @@ namespace Web.Controls
 
             for (int i = 0; i < chart1.Series["累计已完工作预算费用-BCWP"].Points.Count; i++)
             {
-                chart1.Series["累计已完工作预算费用-BCWP"].Points[i].ToolTip = "#VALX,#VALY";
+                chart1.Series["累计已完工作预算费用-BCWP"].Points[i].ToolTip = "累计已完工作预算费用-BCWP\n#VALX\n#VALY";
             }
 
             chart1.Series["累计已完工作实际费用-ACWP"].Points.DataBindXY(dv, "月份", dv, "累计已完工作实际费用-ACWP");
@@ -277,7 +277,7 @@ namespace Web.Controls
 
             for (int i = 0; i < chart1.Series["累计已完工作实际费用-ACWP"].Points.Count; i++)
             {
-                chart1.Series["累计已完工作实际费用-ACWP"].Points[i].ToolTip = "#VALX,#VALY";
+                chart1.Series["累计已完工作实际费用-ACWP"].Points[i].ToolTip = "累计已完工作实际费用-ACWP\n#VALX\n#VALY";
             }
 
             Controls.Add(chart1);

SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx

@@ -28,6 +28,7 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
                             <Items>
+                                <f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存"
                                     OnClick="btnSave_Click">
@@ -93,9 +94,27 @@
                             </Editor>
                         </f:RenderField>
                     </Columns>
+                    <Listeners>
+                        <f:Listener Event="afteredit" Handler="onGridAfterEdit" />
+                    </Listeners>
                 </f:Grid>
             </Items>
         </f:Panel>
     </form>
+    <script type="text/javascript">
+        var hdIdClientID = '<%= hdId.ClientID %>';
+
+        function onGridAfterEdit(event, value, params) {
+            var me = this, columnId = params.columnId, rowId = params.rowId;
+            var str = F(hdIdClientID).ooIl1;
+            if (str == undefined) {
+                str = rowId;
+            }
+            else {
+                str = str + "," + rowId;
+            }
+            F(hdIdClientID).setValue(str);
+        }
+    </script>
 </body>
 </html>

SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx.cs

@@ -169,15 +169,17 @@ namespace FineUIPro.Web.JDGL.WBS
                                where x.ProjectId == this.CurrUser.LoginProjectId
                                select x;
             Model.SGGLDB db = Funs.DB;
+            string[] ids = this.hdId.Text.Split(',');
+            if (ids.Length > 0)
+            {
                 foreach (JObject mergedRow in Grid1.GetMergedData())
-            //foreach (JObject mergedRow in Grid1.GetModifiedData())
                 {
                     JObject values = mergedRow.Value<JObject>("values");
                     int i = mergedRow.Value<int>("index");
                     if (this.Grid1.Rows[i].DataKeys[2] != null)
                     {
                         Model.WBS_CostControl costControl = oldViewInfos.FirstOrDefault(x => x.CostControlId == this.Grid1.Rows[i].DataKeys[2].ToString());
-                    if (costControl != null)
+                        if (costControl != null && ids.Contains(this.Grid1.Rows[i].DataKeys[2].ToString()))
                         {
                             decimal oldPlanPrice = costControl.PlanPrice ?? 0;
                             decimal oldRealPrice = costControl.RealPrice ?? 0;
@@ -238,8 +240,6 @@ namespace FineUIPro.Web.JDGL.WBS
                                 changeThisPlanValue += thisPlanValue - oldThisPlanValue;
                                 changeThisRealCost += thisRealCost - oldThisRealCost;
                                 changeThisPlanCost += thisPlanCost - oldThisPlanCost;
-                            if (changeThisPlanValue != 0 || changeThisRealCost != 0 || changeThisPlanCost != 0)
-                            {
                                 //更新工作包、工作项
                                 Model.Wbs_WbsSet wbsSet = BLL.WbsSetService.GetWbsSetByWbsSetId(costControl.WbsSetId);
                                 UpdateWbsSetDetail(db, costControl.WbsSetId, months[j], changeThisPlanValue, changeThisRealCost, changeThisPlanCost);

SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx.designer.cs

@@ -57,6 +57,15 @@ namespace FineUIPro.Web.JDGL.WBS {
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
         
+        /// <summary>
+        /// hdId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox hdId;
+        
         /// <summary>
         /// btnSave 控件。
         /// </summary>