提交代码

SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEditNew.aspx

@@ -22,7 +22,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpUnit" runat="server" Label="责任单位" LabelWidth="150px" AutoSelectFirstItem="false" AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged"   Required="true" ShowRedStar="true">
+                        <f:DropDownList ID="drpUnit" runat="server" Label="责任单位" LabelWidth="150px" AutoSelectFirstItem="false"  Required="true" ShowRedStar="true">
                         </f:DropDownList>
                     </Items>
                 </f:FormRow>

SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEditNew.aspx.cs

@@ -68,7 +68,8 @@ namespace FineUIPro.Web.JDGL.Check
                 this.Id = Request.Params["Id"];
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 BLL.ProjectUnitService.InitUnitDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false);
-                
+                //五环责任人
+                UserService.Init2(drpDutyPerson, this.CurrUser.LoginProjectId, false);
                 if (!string.IsNullOrEmpty(Id))
                 {
                     var model = Funs.DB.JDGL_MonthPlan.FirstOrDefault(x => x.MonthPlanId == Id);
@@ -78,8 +79,6 @@ namespace FineUIPro.Web.JDGL.Check
                         txtMonths.Readonly = true;
                         drpUnit.SelectedValue = model.UnitId;
 
-                        //责任人
-                        UserService.InitUserDropDownList(drpDutyPerson, this.CurrUser.LoginProjectId, false, model.UnitId);
                         if (!string.IsNullOrEmpty(model.DutyPerson))
                         {
                             List<string> listPersonId = model.DutyPerson.Split(',').ToList();
@@ -101,23 +100,6 @@ namespace FineUIPro.Web.JDGL.Check
             }
         }
 
-        /// <summary>
-        /// 责任单位下拉同步改变责任人
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            drpDutyPerson.Items.Clear();
-            var dropUnitId = this.drpUnit.SelectedValue;
-            if (!string.IsNullOrWhiteSpace(dropUnitId))
-            {
-                //责任人
-                UserService.InitUserDropDownList(drpDutyPerson, this.CurrUser.LoginProjectId, false, dropUnitId);
-                //UserService.Init2(drpDutyPerson, this.CurrUser.LoginProjectId, false);
-            }
-        }
-
         /// <summary>
         /// 保存
         /// </summary>

SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs

@@ -450,7 +450,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
             if (queryData.Count() > 0)
             {
                 var lastItem = queryData.FirstOrDefault();
-                if (lastItem.ProgressStatus.Contains("申请关闭"))
+                if (!string.IsNullOrWhiteSpace(lastItem.ProgressStatus) && lastItem.ProgressStatus.Contains("申请关闭"))
                 {
                     this.Toolbar131.Hidden = true;
                 }