Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

DataBase/版本日志/SGGLDB_V2023-02-28.sql

@@ -0,0 +1,12 @@
+alter table [PHTGL_ActionPlanReview] add DepartId varchar(50)
+alter table PHTGL_BidApproveUserReview add DepartId varchar(50)
+alter table PHTGL_BidDocumentsReview add DepartId varchar(50)
+alter table PHTGL_SetSubReview add DepartId varchar(50)
+alter table PHTGL_ContractReview add DepartId varchar(50)
+
+update [PHTGL_ActionPlanReview] set DepartId =(select DepartId from Base_Depart  where DepartName ='施工管理部' )
+update PHTGL_BidApproveUserReview set DepartId =(select DepartId from Base_Depart  where DepartName ='施工管理部' )
+update PHTGL_BidDocumentsReview set DepartId =(select DepartId from Base_Depart  where DepartName ='施工管理部' )
+update PHTGL_SetSubReview set DepartId =(select DepartId from Base_Depart  where DepartName ='施工管理部' )
+update PHTGL_ContractReview set DepartId =(select DepartId from Base_Depart  where DepartName ='施工管理部' )
+ 

SGGL/BLL/API/HTGL/APIHTGLPersonService.cs

@@ -102,7 +102,7 @@ namespace BLL
 
                             }
                             // db.SubmitChanges();
-                            Person_PersonsService.UpdatePerson(getPerson);
+                            Person_PersonsService.UpdatePerson_Persons(getPerson);
                         }
                         else
                         {

SGGL/BLL/PHTGL/BiddingManagement/ActionPlanReviewService.cs

@@ -36,6 +36,7 @@ namespace BLL
             table.PreliminaryMan = newtable.PreliminaryMan;
             table.ProjectManager = newtable.ProjectManager;
             table.DeputyGeneralManager = newtable.DeputyGeneralManager;
+            table.DepartId = newtable.DepartId;
             Funs.DB.PHTGL_ActionPlanReview.InsertOnSubmit(table);
             Funs.DB.SubmitChanges();
         }
@@ -57,6 +58,8 @@ namespace BLL
                 table.PreliminaryMan = newtable.PreliminaryMan;
                 table.ProjectManager = newtable.ProjectManager;
                 table.DeputyGeneralManager = newtable.DeputyGeneralManager;
+                table.DepartId = newtable.DepartId;
+
                 Funs.DB.SubmitChanges();
             }
 

SGGL/BLL/PHTGL/BiddingManagement/BidApproveUserReviewService.cs

@@ -28,6 +28,8 @@ namespace BLL
             table.ProjectManager = newtable.ProjectManager;
             table.Approval_Construction = newtable.Approval_Construction;
             table.DeputyGeneralManager = newtable.DeputyGeneralManager;
+            table.DepartId = newtable.DepartId;
+
             Funs.DB.PHTGL_BidApproveUserReview.InsertOnSubmit(table);
             Funs.DB.SubmitChanges();
         }
@@ -50,6 +52,8 @@ namespace BLL
                 table.ProjectManager = newtable.ProjectManager;
                 table.Approval_Construction = newtable.Approval_Construction;
                 table.DeputyGeneralManager = newtable.DeputyGeneralManager;
+                table.DepartId = newtable.DepartId;
+
                 Funs.DB.SubmitChanges();
             }
 

SGGL/BLL/PHTGL/BiddingManagement/BidDocumentsReviewService.cs

@@ -35,6 +35,8 @@ namespace BLL
             table.BidDocumentsName = newtable.BidDocumentsName;
             table.BidDocumentsCode = newtable.BidDocumentsCode;
             table.Bidding_SendTime = newtable.Bidding_SendTime;
+            table.DepartId = newtable.DepartId;
+
             Funs.DB.PHTGL_BidDocumentsReview.InsertOnSubmit(table);
             Funs.DB.SubmitChanges();
         }
@@ -65,6 +67,8 @@ namespace BLL
                 table.BidDocumentsName = newtable.BidDocumentsName;
                 table.BidDocumentsCode = newtable.BidDocumentsCode;
                 table.Bidding_SendTime = newtable.Bidding_SendTime;
+                table.DepartId = newtable.DepartId;
+
                 Funs.DB.SubmitChanges();
             }
 

SGGL/BLL/PHTGL/BiddingManagement/SetSubReviewService.cs

@@ -60,6 +60,8 @@ namespace BLL
             table.ProjectManager = newtable.ProjectManager;
             table.Approval_Construction = newtable.Approval_Construction;
             table.IsOwenerApprove = newtable.IsOwenerApprove;
+            table.DepartId = newtable.DepartId;
+
             Funs.DB.PHTGL_SetSubReview.InsertOnSubmit(table);
             Funs.DB.SubmitChanges();
         }
@@ -84,6 +86,8 @@ namespace BLL
                 table.ProjectManager = newtable.ProjectManager;
                 table.Approval_Construction = newtable.Approval_Construction;
                 table.IsOwenerApprove = newtable.IsOwenerApprove;
+                table.DepartId = newtable.DepartId;
+
                 Funs.DB.SubmitChanges();
             }
 

SGGL/BLL/PHTGL/ContractCompile/ContractReviewService.cs

@@ -151,6 +151,7 @@ namespace BLL
             table.Countersign_Law2 = newtable.Countersign_Law2;
             table.Idea = newtable.Idea;
             table.Approval_GeneralLaw = newtable.Approval_GeneralLaw;
+            table.DepartId = newtable.DepartId;
             Funs.DB.PHTGL_ContractReview.InsertOnSubmit(table);
             Funs.DB.SubmitChanges();
         }
@@ -186,6 +187,7 @@ namespace BLL
                 table.Countersign_Law2 = newtable.Countersign_Law2;
                 table.Idea = newtable.Idea;
                 table.Approval_GeneralLaw = newtable.Approval_GeneralLaw;
+                table.DepartId = newtable.DepartId;
 
                 Funs.DB.SubmitChanges();
             }

SGGL/BLL/Person/Person_PersonsService.cs

@@ -1,5 +1,6 @@
 using FineUIPro;
 using Microsoft.Office.Interop.Excel;
+using Microsoft.Office.Interop.Word;
 using Model;
 using System;
 using System.Collections;
@@ -45,7 +46,7 @@ namespace BLL
         /// <param name="personType">人员类型</param>
         /// <param name="Grid1"></param>
         /// <returns></returns>
-        public static IEnumerable getListData(string unitId, string departId, string projetcId, string name, string idCard, string isPost, string personType, Grid Grid1)
+        public static IEnumerable getListData(string unitId, string departId, string projetcId, string name, string idCard, string isPost, string personType,string account, Grid Grid1)
         {
             IQueryable<Model.Person_Persons> getDataList = getDataLists.OrderBy(x => x.UnitId).ThenBy(x => x.DepartId);
             if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null)
@@ -72,6 +73,10 @@ namespace BLL
             {
                 getDataList = getDataList.Where(e => e.PersonName.Contains(name));
             }
+            if (!string.IsNullOrEmpty(account))
+            {
+                getDataList = getDataList.Where(e => e.Account.Contains(account));
+            }
             if (!string.IsNullOrEmpty(idCard))
             {
                 getDataList = getDataList.Where(e => e.IdentityCard.Contains(idCard));
@@ -812,6 +817,98 @@ namespace BLL
             }
         }
 
+        public static void UpdatePerson_Persons(Model.Person_Persons newtable)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                Model.Person_Persons table = db.Person_Persons.FirstOrDefault(x => x.PersonId == newtable.PersonId);
+                if (table != null)
+                {
+                    table.PersonId = newtable.PersonId;
+                    table.UnitId = newtable.UnitId;
+                    table.DepartId = newtable.DepartId;
+                    table.WorkPostId = newtable.WorkPostId;
+                    table.JobNum = newtable.JobNum;
+                    table.PersonName = newtable.PersonName;
+                    table.Account = newtable.Account;
+                    table.Password = newtable.Password;
+                    table.IsOffice = newtable.IsOffice;
+                    table.RoleIds = newtable.RoleIds;
+                    table.IdentityCard = newtable.IdentityCard;
+                    table.IdcardType = newtable.IdcardType;
+                    table.IdcardStartDate = newtable.IdcardStartDate;
+                    table.IdcardEndDate = newtable.IdcardEndDate;
+                    table.IdcardForever = newtable.IdcardForever;
+                    table.IdcardAddress = newtable.IdcardAddress;
+                    table.Telephone = newtable.Telephone;
+                    table.Sex = newtable.Sex;
+                    table.Birthday = newtable.Birthday;
+                    table.Address = newtable.Address;
+                    table.PhotoUrl = newtable.PhotoUrl;
+                    table.HeadImage = newtable.HeadImage;
+                    table.QRCodeAttachUrl = newtable.QRCodeAttachUrl;
+                    table.IDCardUrl = newtable.IDCardUrl;
+                    table.IDCardBackUrl = newtable.IDCardBackUrl;
+                    table.SignatureUrl = newtable.SignatureUrl;
+                    table.IsForeign = newtable.IsForeign;
+                    table.MaritalStatus = newtable.MaritalStatus;
+                    table.PoliticsStatus = newtable.PoliticsStatus;
+                    table.PostTitleId = newtable.PostTitleId;
+                    table.PostTitleDate = newtable.PostTitleDate;
+                    table.PositionId = newtable.PositionId;
+                    table.Nation = newtable.Nation;
+                    table.EduLevel = newtable.EduLevel;
+                    table.ForeignLanguage = newtable.ForeignLanguage;
+                    table.CountryCode = newtable.CountryCode;
+                    table.ProvinceCode = newtable.ProvinceCode;
+                    table.IsPost = newtable.IsPost;
+                    table.Graduate = newtable.Graduate;
+                    table.Major = newtable.Major;
+                    table.IntoDate = newtable.IntoDate;
+                    table.WorkDate = newtable.WorkDate;
+                    table.RetirementDate = newtable.RetirementDate;
+                    table.ValidityDate = newtable.ValidityDate;
+                    table.OpenId = newtable.OpenId;
+                    table.CurrentProjectId = newtable.CurrentProjectId;
+                    table.CurrentProjectRoleId = newtable.CurrentProjectRoleId;
+                    table.CurrentProjectWorkPostId = newtable.CurrentProjectWorkPostId;
+                    table.LoginProjectId = newtable.LoginProjectId;
+                    table.LastMenuType = newtable.LastMenuType;
+                    table.LastIsOffice = newtable.LastIsOffice;
+                    table.LastProjectId = newtable.LastProjectId;
+                    table.DataFrom = newtable.DataFrom;
+                    table.OldDataId = newtable.OldDataId;
+                    table.IsCardNoOK = newtable.IsCardNoOK;
+                    table.RelativeName = newtable.RelativeName;
+                    table.RelativeTel = newtable.RelativeTel;
+                    table.Email = newtable.Email;
+                    table.CertificateId = newtable.CertificateId;
+                    table.PersonType = newtable.PersonType;
+                    table.MultiProject = newtable.MultiProject;
+                    table.HomePageType = newtable.HomePageType;
+                    if (string.IsNullOrEmpty(newtable.QRCodeAttachUrl))
+                    {
+                        ///生成二维码
+                        table.QRCodeAttachUrl = BLL.CreateQRCodeService.CreateCode_Simple("person$" + newtable.IdentityCard);
+                    }
+                    db.SubmitChanges();
+                }
+            }
+
+             
+
+        }
+        public static void DeletePerson_PersonsById(string PersonId)
+        {
+
+            Model.Person_Persons table = db.Person_Persons.FirstOrDefault(x => x.PersonId == PersonId);
+            if (table != null)
+            {
+                db.Person_Persons.DeleteOnSubmit(table);
+                db.SubmitChanges();
+            }
+
+        }
         /// <summary>
         /// 更新项目人员单位
         /// </summary>

SGGL/BLL/ZHGL/RealName/SynchroSetService.cs

@@ -890,6 +890,7 @@ namespace BLL
             var getCollTeam = (from x in Funs.DB.ProjectData_TeamGroup
                                join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
                                join z in Funs.DB.RealName_Project on y.ContractNo equals z.ProCode
+                               join p in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { p.UnitId, p.ProjectId }
                                join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId
                                join s in Funs.DB.SitePerson_Person on x.GroupLeaderId equals s.PersonId into jonPerson
                                from s in jonPerson.DefaultIfEmpty()
@@ -897,6 +898,7 @@ namespace BLL
                                  && (proCode == null || y.ContractNo == proCode)
                                  && u.CollCropCode != null && u.CollCropCode != ""
                                  && z.JTproCode != null
+                                  && p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4
                                select new
                                {
                                    proCode = z.JTproCode,

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -12820,7 +12820,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>0</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8899/</IISUrl>
+          <IISUrl>http://localhost:1783/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx

@@ -7,6 +7,12 @@
 <head runat="server">
     <title>管线信息</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <style>
+        .customlabel span {
+            color: red;
+            font-weight: bold;
+        }
+    </style>
 </head>
 <body>
     <form id="form1" runat="server">
@@ -54,6 +60,8 @@
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="right">
                                     <Items>
+                                        <f:Label ID="lbSinglePreRate" CssClass="customlabel" runat="server" Label="图纸预制率"></f:Label>
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
                                         <f:Button ID="btnSetShop" ToolTip="工厂预制" Text="工厂预制" Icon="ApplicationEdit"
                                             EnablePostBack="true" OnClick="btnSetShop_Click" runat="server">
                                         </f:Button>

SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs

@@ -212,6 +212,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
              var table = this.GetPagedDataTable(Grid1, list);
             Grid1.DataSource = table;
             Grid1.DataBind();
+            lbSinglePreRate.Text= GetSinglePreRateByUnitWork(this.tvControlItem.SelectedNodeID);
         }
         #endregion
 
@@ -394,7 +395,47 @@ namespace FineUIPro.Web.HJGL.PreDesign
             }
             return PipeAreaValue;
         }
+        /// <summary>
+        /// 获取图纸预制率（工厂预制管线的预制达因/工厂预制管线的总达因）
+        /// </summary>
+        /// <param name="unitworkid"></param>
+        /// <returns></returns>
+        private string GetSinglePreRateByUnitWork(string unitworkid)
+        {
+            var db = Funs.DB;
+            var pipeline=from x in db.View_HJGL_Pipeline where x.UnitWorkId == unitworkid && x.PipeArea=="1" select x;
+            var q = from x in db.View_HJGL_WeldJoint where x.UnitWorkId == unitworkid select x;
+            string rate = "";
  
+            if (q != null && q.Count() > 0)
+            {
+                var proSum = (from x in q
+                              join y in pipeline on x.PipelineId equals y.PipelineId into temp
+                              from tt in temp.DefaultIfEmpty()
+                              where x.JointAttribute == "预制口"
+                              group x by x.UnitWorkId into g
+                              select new
+                              {
+                                  SizeSum = g.Sum(x => x.Size)
+                              }).FirstOrDefault().SizeSum;
+                var AllSum = (from x in pipeline
+                          group x by x.UnitWorkId into g
+                          select new
+                          {
+                              SizeSum = g.Sum(x => x.TotalDin)
+                          }).FirstOrDefault().SizeSum;
+                
+                proSum = (proSum != null) ? proSum : 0;
+                if (AllSum > 0)
+                {
+                    var a = (decimal)100 * proSum / AllSum;
+                    rate = Math.Round((decimal)a, 1).ToString() + "%";
+                }
+
+                return rate;
+            }
+            return "0%";
+        }
 
     }
 }

SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.designer.cs

@@ -131,6 +131,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar4;
 
+        /// <summary>
+        /// lbSinglePreRate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lbSinglePreRate;
+
         /// <summary>
         /// btnSetShop 控件。
         /// </summary>

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx

@@ -95,7 +95,7 @@
                                 </f:Toolbar>
                                 <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                                     <Items>
-                                        <f:Label ID="lbSinglePreRate" CssClass="customlabel" runat="server" Label="图纸预制率"></f:Label>
+                                        <f:Label ID="lbSinglePreRate" CssClass="customlabel" runat="server" Label="主项预制率"></f:Label>
                                         <f:Label ID="lbShopSize" CssClass="customlabel" runat="server" Label="预制口达因"></f:Label>
                                         <f:Label ID="lbFiledSize" CssClass="customlabel" runat="server" Label="安装口达因"></f:Label>
 

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs

@@ -478,6 +478,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             }
             return "0%";
         }
+
+        
         #endregion
 
         #region 焊口信息 维护事件 

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx

@@ -70,7 +70,8 @@
                                         </f:FormRow>
                                         <f:FormRow>
                                             <Items>
-                                                <f:DropDownList ID="Approval_Construction" runat="server" EnableEdit="true" Label="施工管理部" LabelAlign="Right" LabelWidth="120px"></f:DropDownList>
+                                                <f:DropDownList ID="DropDepart" runat="server" EnableEdit="true" Label="主办部门" LabelAlign="Right" LabelWidth="120px"></f:DropDownList>
+                                                <f:DropDownList ID="Approval_Construction" runat="server" EnableEdit="true" Label="主办部门负责人"  LabelAlign="Right" LabelWidth="120px"></f:DropDownList>
                                             </Items>
                                         </f:FormRow>
                                         <f:FormRow>

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs

@@ -53,6 +53,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ActionPlanReviewId = Request.Params["ActionPlanReviewId"];
                 #region 绑定下拉列表
+                BLL.DepartService.InitDepartDropDownList(DropDepart, true);
                 /// 绑定施工管理部正副主任
                 BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(Approval_Construction, null, CurrUser.UnitId, Const.ConstructionMinister + "," + Const.ConstructionViceMinister, false);
 
@@ -91,6 +92,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
             DropPreliminaryMan.SelectedValue = Convert.ToString(act.PreliminaryMan);
             DropProjectManager.SelectedValue = Convert.ToString(act.ProjectManager);
             DropDeputyGeneralManager.SelectedValue = Convert.ToString(act.DeputyGeneralManager);
+            DropDepart.SelectedValue = Convert.ToString(act.DepartId);
         }
         /// <summary>
         /// 数据绑定
@@ -136,9 +138,15 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                 ShowNotify("请选择合同", MessageBoxIcon.Warning);
                 return isOk;
             }
+            if (DropDepart.SelectedValue == Const._Null)
+            {
+                ShowNotify("请选择部门！", MessageBoxIcon.Warning);
+                return false;
+
+            }
             if (Approval_Construction.SelectedValue == Const._Null)
             {
-                ShowNotify("请选择施工管理部人员", MessageBoxIcon.Warning);
+                ShowNotify("请选择部门审批人员", MessageBoxIcon.Warning);
                 return isOk;
 
             }
@@ -154,6 +162,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
             newmodel.PreliminaryMan = DropPreliminaryMan.SelectedValue;
             newmodel.ProjectManager = DropProjectManager.SelectedValue;
             newmodel.DeputyGeneralManager = DropDeputyGeneralManager.SelectedValue;
+            newmodel.DepartId = DropDepart.SelectedValue;
             BLL.PHTGL_ActionPlanReviewService.UpdatePHTGL_ActionPlanReview(newmodel);
             isOk = true;
             return isOk;

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.PHTGL.BiddingManagement {
+namespace FineUIPro.Web.PHTGL.BiddingManagement
+{
 
 
-    public partial class ActionPlanReviewEdit {
+    public partial class ActionPlanReviewEdit
+    {
 
         /// <summary>
         /// form1 控件。
@@ -102,6 +104,15 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
         /// </remarks>
         protected global::FineUIPro.DropDownList DropPreliminaryMan;
 
+        /// <summary>
+        /// DropDepart 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList DropDepart;
+
         /// <summary>
         /// Approval_Construction 控件。
         /// </summary>

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx

@@ -93,7 +93,9 @@
                 </f:FormRow>--%>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="DropApproval_Construction" runat="server" AutoPostBack="true" EnableEdit="true" Label="施工管理部" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
+                        <f:DropDownList ID="DropDepart" runat="server" EnableEdit="true" Label="主办部门" LabelAlign="Right" LabelWidth="120px"></f:DropDownList>
+
+                        <f:DropDownList ID="DropApproval_Construction" runat="server" AutoPostBack="true" EnableEdit="true" Label="主办部门负责人" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
                     </Items>
                 </f:FormRow>
 

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx.cs

@@ -41,6 +41,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
             {
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ApproveUserReviewID = Request.Params["ApproveUserReviewID"];
+                BLL.DepartService.InitDepartDropDownList(DropDepart, true);
                 BLL.PHTGL_BidDocumentsReviewService.InitGetBidCompleteDropDownList(drpBidDocumentCode, true);
 
                 Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropUser, null, Const.UnitId_SEDIN, null, false);
@@ -108,7 +109,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                     //  DropProjectManager.SelectedValue = Bid.ProjectManager;
                     DropApproval_Construction.SelectedValue = Bid.Approval_Construction;
                     //DropDeputyGeneralManager.SelectedValue = Bid.DeputyGeneralManager;
-
+                    DropDepart.SelectedValue = Bid.DepartId;
                 }
 
             }
@@ -172,9 +173,15 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
             //    return false;
 
             //}
+            if (DropDepart.SelectedValue == Const._Null)
+            {
+                ShowNotify("请选择部门！", MessageBoxIcon.Warning);
+                return false;
+
+            }
             if (DropApproval_Construction.SelectedValue == Const._Null)
             {
-                ShowNotify("请选择施工管理部人员！", MessageBoxIcon.Warning);
+                ShowNotify("请选择部门审批人员！", MessageBoxIcon.Warning);
                 return false;
 
             }
@@ -198,6 +205,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
             // newtable.ProjectManager = DropProjectManager.SelectedValue;
             newtable.Approval_Construction = DropApproval_Construction.SelectedValue;
             // newtable.DeputyGeneralManager = DropDeputyGeneralManager.SelectedValue;
+            newtable.DepartId = DropDepart.SelectedValue;
             if (string.IsNullOrEmpty(ApproveUserReviewID))
             {
                 newtable.ApproveUserReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_BidApproveUserReview));

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.PHTGL.BiddingManagement {
+namespace FineUIPro.Web.PHTGL.BiddingManagement
+{
 
 
-    public partial class ApproveUserReviewEdit {
+    public partial class ApproveUserReviewEdit
+    {
 
         /// <summary>
         /// form1 控件。
@@ -174,6 +176,15 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
         /// </remarks>
         protected global::FineUIPro.DropDownList DropConstructionManager;
 
+        /// <summary>
+        /// DropDepart 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList DropDepart;
+
         /// <summary>
         /// DropApproval_Construction 控件。
         /// </summary>

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewEdit.aspx

@@ -136,7 +136,9 @@
                                         </f:FormRow>
                                         <f:FormRow>
                                             <Items>
-                                                <f:DropDownList ID="Approval_Construction" runat="server" Label="施工管理部"  AutoSelectFirstItem="false" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
+                                                <f:DropDownList ID="DropDepart" runat="server" EnableEdit="true" Label="主办部门" LabelAlign="Right" LabelWidth="120px"></f:DropDownList>
+
+                                                <f:DropDownList ID="Approval_Construction" runat="server" Label="主办部门负责人"  AutoSelectFirstItem="false" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
                                             </Items>
                                         </f:FormRow>
                                     </Rows>

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewEdit.aspx.cs

@@ -75,6 +75,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                 //总承包合同编号
                 // BLL.ProjectService.InitAllProjectCodeDropDownList(this.DropProjectId, true);
                 //招标方式
+                BLL.DepartService.InitDepartDropDownList(DropDepart, true);
                 BLL.PHTGL_BidDocumentsReviewService.InitGetBidTypeDropDownList(this.txtBidType, false);
                 Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropConstructionManager, null, Const.UnitId_SEDIN, null, false);
                 Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropControlManager, null, Const.UnitId_SEDIN, null, false);
@@ -137,6 +138,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                     DropControlManager.SelectedValue = Bid.ControlManager;
                     DropProjectManager.SelectedValue = Bid.ProjectManager;
                     DropPreliminaryMan.SelectedValue = Bid.PreliminaryMan;
+                    DropDepart.SelectedValue = Bid.DepartId;
                 }
             }
         }
@@ -212,6 +214,12 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
 
         private bool Save()
         {
+            if (DropDepart.SelectedValue == Const._Null)
+            {
+                ShowNotify("请选择部门！", MessageBoxIcon.Warning);
+                return false;
+
+            }
             //if (Approval_Construction.SelectedValue==Const._Null)
             //{
             //    ShowNotify("请选择施工管理部审批人员！", MessageBoxIcon.Warning);
@@ -247,6 +255,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                 pHTGL_Bid.ControlManager = DropControlManager.SelectedValue;
                 pHTGL_Bid.PreliminaryMan = DropPreliminaryMan.SelectedValue;
                 pHTGL_Bid.ProjectManager = DropProjectManager.SelectedValue;
+                pHTGL_Bid.DepartId = DropDepart.SelectedValue;
             }
 
             if (string.IsNullOrEmpty(BidDocumentsReviewId))

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewEdit.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.PHTGL.BiddingManagement {
+namespace FineUIPro.Web.PHTGL.BiddingManagement
+{
 
 
-    public partial class BidDocumentsReviewEdit {
+    public partial class BidDocumentsReviewEdit
+    {
 
         /// <summary>
         /// form1 控件。
@@ -219,6 +221,15 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
         /// </remarks>
         protected global::FineUIPro.DropDownList DropPreliminaryMan;
 
+        /// <summary>
+        /// DropDepart 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList DropDepart;
+
         /// <summary>
         /// Approval_Construction 控件。
         /// </summary>

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx

@@ -141,7 +141,8 @@
                                         </f:FormRow>
                                         <f:FormRow>
                                             <Items>
-                                                <f:DropDownList ID="DropApproval_Construction" runat="server" AutoPostBack="true" EnableEdit="true" Label="施工管理部" LabelAlign="Right" LabelWidth="120px"></f:DropDownList>
+                                                <f:DropDownList ID="DropDepart" runat="server" EnableEdit="true" Label="主办部门" LabelAlign="Right" LabelWidth="120px"></f:DropDownList>
+                                                <f:DropDownList ID="DropApproval_Construction" runat="server" AutoPostBack="true" EnableEdit="true" Label="主办部门负责人" LabelAlign="Right" LabelWidth="120px"></f:DropDownList>
                                             </Items>
                                         </f:FormRow>
                                         <f:FormRow>

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx.cs

@@ -43,7 +43,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
             {
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 SetSubReviewID = Request.Params["SetSubReviewID"];
-
+                BLL.DepartService.InitDepartDropDownList(DropDepart, true);
                 PHTGL_BidApproveUserReviewService.InitGetBidCompleteDropDownList(DropBidCode, true);
                 Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropConstructionManager, null, Const.UnitId_SEDIN, null, true);
                 Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropProjectManager, null, Const.UnitId_SEDIN, null, true);
@@ -125,7 +125,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                     StartTime.SelectedDate = BidDocument.Bidding_StartTime;
                     string[] a = { _SetSubReview.IsOwenerApprove.ToString() };
                     CBIsOwenerApprove.SelectedValueArray = a;
-
+                    DropDepart.SelectedValue = _SetSubReview.DepartId;
                     this.DropConstructionManager.SelectedValue = _SetSubReview.ConstructionManager;
                     this.DropProjectManager.SelectedValue = _SetSubReview.ProjectManager;
                     this.DropApproval_Construction.SelectedValue = _SetSubReview.Approval_Construction;
@@ -208,10 +208,16 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                 ShowNotify("请选择项目经理！", MessageBoxIcon.Warning);
                 return false;
 
+            }
+            if (DropDepart.SelectedValue == Const._Null)
+            {
+                ShowNotify("请选择部门！", MessageBoxIcon.Warning);
+                return false;
+
             }
             if (DropApproval_Construction.SelectedValue == Const._Null)
             {
-                ShowNotify("请选择施工管理部人员！", MessageBoxIcon.Warning);
+                ShowNotify("请选择部门审批人员！", MessageBoxIcon.Warning);
                 return false;
 
             }
@@ -257,6 +263,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
             _SetSubReview.ProjectManager = DropProjectManager.SelectedValue;
             _SetSubReview.Approval_Construction = DropApproval_Construction.SelectedValue;
             _SetSubReview.DeputyGeneralManager = DropDeputyGeneralManager.SelectedValue;
+            _SetSubReview.DepartId = DropDepart.SelectedValue;
             _SetSubReview.IsOwenerApprove = Convert.ToInt32(CBIsOwenerApprove.SelectedValueArray[0]);
             if (string.IsNullOrEmpty(SetSubReviewID))
             {

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.PHTGL.BiddingManagement {
+namespace FineUIPro.Web.PHTGL.BiddingManagement
+{
 
 
-    public partial class SetSubReviewEdit {
+    public partial class SetSubReviewEdit
+    {
 
         /// <summary>
         /// form1 控件。
@@ -246,6 +248,15 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
         /// </remarks>
         protected global::FineUIPro.DropDownList DropConstructionManager;
 
+        /// <summary>
+        /// DropDepart 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList DropDepart;
+
         /// <summary>
         /// DropApproval_Construction 控件。
         /// </summary>

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx

@@ -122,7 +122,9 @@
                                         </f:FormRow>
                                         <f:FormRow>
                                             <Items>
-                                                <f:DropDownList ID="DropApproval_Construction" runat="server" AutoPostBack="true" EnableEdit="true" Label="施工管理部" LabelAlign="Right" LabelWidth="120px"></f:DropDownList>
+                                                <f:DropDownList ID="DropDepart" runat="server" EnableEdit="true" Label="主办部门" LabelAlign="Right" LabelWidth="120px"></f:DropDownList>
+
+                                                <f:DropDownList ID="DropApproval_Construction" runat="server" AutoPostBack="true" EnableEdit="true" Label="主办部门负责人" LabelAlign="Right" LabelWidth="120px"></f:DropDownList>
                                             </Items>
                                         </f:FormRow>
                                         <f:FormRow>

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs

@@ -42,7 +42,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
             {
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 SetSubReviewID = Request.Params["SetSubReviewID"];
-
+                BLL.DepartService.InitDepartDropDownList(DropDepart, true);
                 PHTGL_BidApproveUserReviewService.InitGetBidCompleteDropDownList(DropBidCode, true);
                 Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropConstructionManager, null, Const.UnitId_SEDIN, null, true);
                 Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropProjectManager, null, Const.UnitId_SEDIN, null, true);
@@ -124,6 +124,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                     this.DropProjectManager.SelectedValue = _SetSubReview.ProjectManager;
                     this.DropApproval_Construction.SelectedValue = _SetSubReview.Approval_Construction;
                     this.DropDeputyGeneralManager.SelectedValue = _SetSubReview.DeputyGeneralManager;
+                    DropDepart.SelectedValue = _SetSubReview.DepartId;
                 }
 
             }
@@ -200,10 +201,16 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
                 ShowNotify("请选择项目经理！", MessageBoxIcon.Warning);
                 return false;
 
+            }
+            if (DropDepart.SelectedValue == Const._Null)
+            {
+                ShowNotify("请选择部门！", MessageBoxIcon.Warning);
+                return false;
+
             }
             if (DropApproval_Construction.SelectedValue == Const._Null)
             {
-                ShowNotify("请选择施工管理部人员！", MessageBoxIcon.Warning);
+                ShowNotify("请选择部门审批人员！", MessageBoxIcon.Warning);
                 return false;
 
             }
@@ -249,7 +256,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
             _SetSubReview.Approval_Construction = DropApproval_Construction.SelectedValue;
             _SetSubReview.DeputyGeneralManager = DropDeputyGeneralManager.SelectedValue;
             _SetSubReview.IsOwenerApprove = Convert.ToInt32(CBIsOwenerApprove.SelectedValueArray[0]);
-
+            _SetSubReview.DepartId = DropDepart.SelectedValue;
             if (string.IsNullOrEmpty(SetSubReviewID))
             {
                 _SetSubReview.SetSubReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_SetSubReview));

SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.PHTGL.BiddingManagement {
+namespace FineUIPro.Web.PHTGL.BiddingManagement
+{
 
 
-    public partial class SetSubReviewEdit2 {
+    public partial class SetSubReviewEdit2
+    {
 
         /// <summary>
         /// form1 控件。
@@ -219,6 +221,15 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
         /// </remarks>
         protected global::FineUIPro.DropDownList DropConstructionManager;
 
+        /// <summary>
+        /// DropDepart 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList DropDepart;
+
         /// <summary>
         /// DropApproval_Construction 控件。
         /// </summary>

SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractReviewEdit.aspx

@@ -101,7 +101,9 @@
                                         </f:FormRow>
                                         <f:FormRow>
                                             <Items>
-                                                <f:DropDownList ID="dropCountersign_Construction" runat="server" Label="施工管理部" Required="true" AutoSelectFirstItem="false" ShowRedStar="true" AutoPostBack="true" EnableEdit="true" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
+                                                <f:DropDownList ID="DropDepart" runat="server" EnableEdit="true" Label="主办部门" LabelAlign="Right" LabelWidth="120px"></f:DropDownList>
+
+                                                <f:DropDownList ID="dropCountersign_Construction" runat="server" Label="主办部门负责人" Required="true" AutoSelectFirstItem="false" ShowRedStar="true" AutoPostBack="true" EnableEdit="true" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
                                             </Items>
                                         </f:FormRow>
                                         <f:FormRow>
@@ -140,7 +142,7 @@
                                         </f:FormRow>
                                         <f:FormRow>
                                             <Items>
-                                                <f:DropDownList ID="dropApproval_Construction" runat="server" Label="施工管理部" Required="true" ShowRedStar="true" AutoSelectFirstItem="false" EnableEdit="true" LabelAlign="Right" AutoPostBack="true" LabelWidth="140px"></f:DropDownList>
+                                                <f:DropDownList ID="dropApproval_Construction" runat="server" Label="部门审批人" Required="true" ShowRedStar="true" AutoSelectFirstItem="false" EnableEdit="true" LabelAlign="Right" AutoPostBack="true" LabelWidth="140px"></f:DropDownList>
                                                 <f:DropDownList ID="DropGeneralAccountant" runat="server" Label="总会计师" Required="true" Hidden="true" ShowRedStar="true" AutoSelectFirstItem="false" AutoPostBack="true" EnableEdit="true" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
                                             </Items>
                                         </f:FormRow>

SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractReviewEdit.aspx.cs

@@ -33,6 +33,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                     dropApproval_Construction.Label = "劳务管理组";
                     DropProjectManager2.Label = "运营管理部";
                 }
+                BLL.DepartService.InitDepartDropDownList(DropDepart, true);
+
                 #region 会签下拉框
                 BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropConstructionManager, null, Const.UnitId_SEDIN, null, true);//施工经理
                 BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropPurchasingManager, null, Const.UnitId_SEDIN, null, true);//采购经理
@@ -151,6 +153,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
             DropGeneralManager.SelectedValue = Convert.ToString(newmodel.Approval_GeneralManager);
             DropGeneral_Law.SelectedValue = Convert.ToString(newmodel.Approval_GeneralLaw);
             DropChairman.SelectedValue = Convert.ToString(newmodel.Approval_Chairman);
+            DropDepart.SelectedValue = Convert.ToString(newmodel.DepartId);
             // DropProjectManager_SelectedIndexChanged(null, null);
             Model.PHTGL_Contract table = BLL.ContractService.GetContractById(this.drpProjectId.Value);
             txtContractNum.Text = BLL.ContractService.GetContractByProjectId(table.ProjectId).ContractNum;
@@ -215,6 +218,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
             newmodel.Approval_GeneralLaw = DropGeneral_Law.SelectedValue;
             newmodel.CreateUser = this.CurrUser.PersonId;
             newmodel.Idea = txtIdea.Text;
+            newmodel.DepartId = DropDepart.SelectedValue;
             if (ContractReviewId == null)
             {
                 newmodel.ContractReviewId = SQLHelper.GetNewID(typeof(Model.PHTGL_ContractReview));

SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractReviewEdit.aspx.designer.cs

@@ -149,6 +149,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
         /// </remarks>
         protected global::FineUIPro.DropDownList DropProjectManager;
 
+        /// <summary>
+        /// DropDepart 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList DropDepart;
+
         /// <summary>
         /// dropCountersign_Construction 控件。
         /// </summary>

SGGL/FineUIPro.Web/Person/CompanyPerson.aspx.cs

@@ -39,7 +39,7 @@ namespace FineUIPro.Web.Person
         private void BindGrid()
         {
             var getData = Person_PersonsService.getListData(Const.UnitId_SEDIN, this.drpDepart.SelectedValue, this.drpProject.SelectedValue,
-                this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue,this.drpPersonType.SelectedValue, Grid1);
+                this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, null, Grid1);
             Grid1.RecordCount = Person_PersonsService.count;
             Grid1.DataSource = getData;
             Grid1.DataBind();

SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs

@@ -90,7 +90,7 @@ namespace FineUIPro.Web.Person
         private void BindGrid()
         {
             var getData = Person_PersonsService.getListData(Const.UnitId_SEDIN, Const.Depart_constructionId, this.drpProject.SelectedValue,
-              this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, Grid1);
+              this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, null, Grid1);
             Grid1.RecordCount = Person_PersonsService.count;
             Grid1.DataSource = getData;
             Grid1.DataBind();

SGGL/FineUIPro.Web/Person/PersonLib.aspx

@@ -35,6 +35,7 @@
                                 </f:DropDownList>
                                 <f:TextBox runat="server" ID="txtPersonName" EmptyText="按姓名查询" ></f:TextBox>
                                 <f:TextBox runat="server" ID="txtIdCard" EmptyText="按身份证查询" ></f:TextBox>
+                                      <f:TextBox runat="server" ID="txtAccount" EmptyText="按账号查询" ></f:TextBox>
                                     <f:DropDownList runat="server" ID="drpIsPost" EnableEdit="true"  
                                     LabelAlign="Right" EmptyText="请选择人员状态" AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click">
                                 </f:DropDownList>

SGGL/FineUIPro.Web/Person/PersonLib.aspx.cs

@@ -43,7 +43,7 @@ namespace FineUIPro.Web.Person
         private void BindGrid()
         {
             var getData = Person_PersonsService.getListData(this.drpUnit.SelectedValue, this.drpDepart.SelectedValue, this.drpProject.SelectedValue,
-                this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, Grid1);
+                this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, this.txtAccount.Text.Trim(), Grid1);
             Grid1.RecordCount = Person_PersonsService.count;
             Grid1.DataSource = getData;
             Grid1.DataBind();

SGGL/FineUIPro.Web/Person/PersonLib.aspx.designer.cs

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

SGGL/FineUIPro.Web/ZHGL/RealName/BasicData.aspx

@@ -22,7 +22,7 @@
         <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
         <f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" MarginRight="5px">
             <Items>
-                <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="550px" ShowBorder="true"
+                <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple"  ShowBorder="true" Height="650px"
                     TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server"
                     ActiveTabIndex="0">
                     <Tabs>

SGGL/Model/Model.cs

@@ -73403,7 +73403,7 @@ namespace Model
 			OnCreated();
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(15) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
 		public string MaterialCode
 		{
 			get
@@ -73507,7 +73507,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(3000)")]
 		public string MaterialDef
 		{
 			get
@@ -78097,7 +78097,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(15)")]
 		public string MaterialCode
 		{
 			get
@@ -82445,7 +82445,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(200)")]
 		public string CanWelderCode
 		{
 			get
@@ -141917,6 +141917,8 @@ namespace Model
 		
 		private string _DeputyGeneralManager;
 		
+		private string _DepartId;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -141939,6 +141941,8 @@ namespace Model
     partial void OnProjectManagerChanged();
     partial void OnDeputyGeneralManagerChanging(string value);
     partial void OnDeputyGeneralManagerChanged();
+    partial void OnDepartIdChanging(string value);
+    partial void OnDepartIdChanged();
     #endregion
 		
 		public PHTGL_ActionPlanReview()
@@ -142126,6 +142130,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartId", DbType="VarChar(50)")]
+		public string DepartId
+		{
+			get
+			{
+				return this._DepartId;
+			}
+			set
+			{
+				if ((this._DepartId != value))
+				{
+					this.OnDepartIdChanging(value);
+					this.SendPropertyChanging();
+					this._DepartId = value;
+					this.SendPropertyChanged("DepartId");
+					this.OnDepartIdChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -149205,6 +149229,8 @@ namespace Model
 		
 		private string _DeputyGeneralManager;
 		
+		private string _DepartId;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -149231,6 +149257,8 @@ namespace Model
     partial void OnApproval_ConstructionChanged();
     partial void OnDeputyGeneralManagerChanging(string value);
     partial void OnDeputyGeneralManagerChanged();
+    partial void OnDepartIdChanging(string value);
+    partial void OnDepartIdChanged();
     #endregion
 		
 		public PHTGL_BidApproveUserReview()
@@ -149458,6 +149486,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartId", DbType="VarChar(50)")]
+		public string DepartId
+		{
+			get
+			{
+				return this._DepartId;
+			}
+			set
+			{
+				if ((this._DepartId != value))
+				{
+					this.OnDepartIdChanging(value);
+					this.SendPropertyChanging();
+					this._DepartId = value;
+					this.SendPropertyChanged("DepartId");
+					this.OnDepartIdChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -149705,6 +149753,8 @@ namespace Model
 		
 		private string _ProjectManager;
 		
+		private string _DepartId;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -149747,6 +149797,8 @@ namespace Model
     partial void OnPreliminaryManChanged();
     partial void OnProjectManagerChanging(string value);
     partial void OnProjectManagerChanged();
+    partial void OnDepartIdChanging(string value);
+    partial void OnDepartIdChanged();
     #endregion
 		
 		public PHTGL_BidDocumentsReview()
@@ -150134,6 +150186,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartId", DbType="VarChar(50)")]
+		public string DepartId
+		{
+			get
+			{
+				return this._DepartId;
+			}
+			set
+			{
+				if ((this._DepartId != value))
+				{
+					this.OnDepartIdChanging(value);
+					this.SendPropertyChanging();
+					this._DepartId = value;
+					this.SendPropertyChanged("DepartId");
+					this.OnDepartIdChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -152022,6 +152094,8 @@ namespace Model
 		
 		private string _Approval_GeneralLaw;
 		
+		private string _DepartId;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -152076,6 +152150,8 @@ namespace Model
     partial void OnIdeaChanged();
     partial void OnApproval_GeneralLawChanging(string value);
     partial void OnApproval_GeneralLawChanged();
+    partial void OnDepartIdChanging(string value);
+    partial void OnDepartIdChanged();
     #endregion
 		
 		public PHTGL_ContractReview()
@@ -152583,6 +152659,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartId", DbType="VarChar(50)")]
+		public string DepartId
+		{
+			get
+			{
+				return this._DepartId;
+			}
+			set
+			{
+				if ((this._DepartId != value))
+				{
+					this.OnDepartIdChanging(value);
+					this.SendPropertyChanging();
+					this._DepartId = value;
+					this.SendPropertyChanged("DepartId");
+					this.OnDepartIdChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -152634,6 +152730,8 @@ namespace Model
 		
 		private System.Nullable<int> _IsOwenerApprove;
 		
+		private string _DepartId;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -152662,6 +152760,8 @@ namespace Model
     partial void OnDeputyGeneralManagerChanged();
     partial void OnIsOwenerApproveChanging(System.Nullable<int> value);
     partial void OnIsOwenerApproveChanged();
+    partial void OnDepartIdChanging(string value);
+    partial void OnDepartIdChanged();
     #endregion
 		
 		public PHTGL_SetSubReview()
@@ -152909,6 +153009,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartId", DbType="VarChar(50)")]
+		public string DepartId
+		{
+			get
+			{
+				return this._DepartId;
+			}
+			set
+			{
+				if ((this._DepartId != value))
+				{
+					this.OnDepartIdChanging(value);
+					this.SendPropertyChanging();
+					this._DepartId = value;
+					this.SendPropertyChanged("DepartId");
+					this.OnDepartIdChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -234539,7 +234659,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(200)")]
 		public string CanWelderCode
 		{
 			get