Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SHJ

SGGL/BLL/Common/Const.cs

@@ -196,9 +196,9 @@ namespace BLL
 
         #region 定义常量
         /// <summary>
-        /// 赛鼎单位id
+        /// 陕化建单位id
         /// </summary>
-        public const string UnitId_SEDIN = "d72a27c9-4ba9-41c5-ab0b-c010409f20f2";
+        public const string UnitId_SEDIN = "37095edf-3815-4e92-8b8d-b8cefe64c8de";
         /// <summary>
         /// 赛鼎宁波单位id
         /// </summary>

SGGL/BLL/Common/Funs.cs

@@ -178,7 +178,7 @@ namespace BLL
         /// <returns></returns>
         public static string getInitialPassword(string unitId, string idCard)
         {
-            string prefixValue = "sedin";
+            string prefixValue = "shj";
             string suffixValue = "1234";
             //var getUnit = UnitService.GetUnitByUnitId(unitId);
             //if (getUnit != null)

SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx

@@ -95,7 +95,7 @@
                             </Toolbars>
                             <Items>
                                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="申请单"
-                                    EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="Id"
+                                    EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="Id" PageSize="1000"
                                     AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="Id"
                                     AllowSorting="true" SortField="CusBillCode" SortDirection="ASC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand"
                                     EnableTextSelection="True" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick">

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -17034,7 +17034,7 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx

@@ -106,7 +106,7 @@
                                             OnClick="btnImport_Click">
                                         </f:Button>
                                          
-                                        <f:Button ID="Button1" ToolTip="同步人员到云眸" Icon="Add" runat="server" Text="同步人员到云眸" OnClick="btnToYunMou_Click">
+                                        <f:Button ID="Button1" ToolTip="同步人员到云眸" Icon="Add" runat="server" Text="同步人员到云眸" Hidden="true" OnClick="btnToYunMou_Click">
                                         </f:Button> 
                                         <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
                                             EnableAjax="false" DisableControlBeforePostBack="false">
@@ -139,11 +139,11 @@
                                     FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="入场时间"
                                     HeaderTextAlign="Center" TextAlign="Center">
                                 </f:RenderField>
-                                <f:RenderField Width="140px" ColumnID="RealNameAddTime" DataField="RealNameAddTime"
+                                <f:RenderField Width="140px" ColumnID="RealNameAddTime" DataField="RealNameAddTime" Hidden="true"
                                     FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss" HeaderText="上报集团时间"
                                     HeaderTextAlign="Center" TextAlign="Center">
                                 </f:RenderField>
-                                  <f:RenderField HeaderText="同步云眸" ColumnID="YunMouState" DataField="YunMouState" SortField="YunMouState"
+                                  <f:RenderField HeaderText="同步云眸" ColumnID="YunMouState" DataField="YunMouState" Hidden="true" SortField="YunMouState"
    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="110px">    
                                       </f:RenderField>
                                <%-- <f:TemplateField Width="70px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">

SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx

@@ -38,9 +38,9 @@
                             <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>                            
                             <f:TextBox runat="server" Label="名称" ID="txtProjectName" EmptyText="输入查询条件" 
                                 AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="50px"></f:TextBox>  
-                             <f:CheckBox runat="server" ID="rbIsCNCECShow" Label="集团穿透展示" LabelWidth="110px"
+                             <f:CheckBox runat="server" ID="rbIsCNCECShow" Label="集团穿透展示" LabelWidth="110px" Hidden="true"
                                 AutoPostBack="true" OnCheckedChanged="rbIsCNCECShow_CheckedChanged"></f:CheckBox>
-                              <f:RadioButtonList runat="server" ID="ckMaster" AutoPostBack="true" Label="" LabelWidth="40px" LabelAlign="Right"
+                              <f:RadioButtonList runat="server" ID="ckMaster" AutoPostBack="true" Label="" LabelWidth="40px" LabelAlign="Right" Hidden="true"
       OnSelectedIndexChanged="TextBox_TextChanged" Width="340px">
       <f:RadioItem Text="全部" Value="" Selected="true" />
       <f:RadioItem Text="已关联主数据" Value="1" />
@@ -52,9 +52,6 @@
                             <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp"
                                 EnableAjax="false" DisableControlBeforePostBack="false">
                             </f:Button>
-                            <f:Button ID="btnUpdata" Text ="推送" Icon="PageSave" runat="server" Hidden="true" ConfirmText="确定推送？"
-                                            ToolTip="推送" ValidateForms="SimpleForm1" OnClick="btnPush_Click" MarginRight="10px">
-                                        </f:Button>
                             <f:HiddenField runat="server" ID="hdStr"></f:HiddenField>
                         </Items>
                     </f:Toolbar>
@@ -113,9 +110,6 @@
                      <f:RenderField Width="250px" ColumnID="ProjectAddress" DataField="ProjectAddress" SortField="ProjectAddress" FieldType="String"
                         HeaderText="项目地址"  HeaderTextAlign="Center" TextAlign="Left">
                     </f:RenderField>        
-                     <f:CheckBoxField Width="90px" SortField="IsCNCECShow" RenderAsStaticField="true" DataField="IsCNCECShow"
-                            HeaderText="集团展示" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:CheckBoxField>
                 </Columns>
                 <Listeners>
                     <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs

@@ -263,7 +263,6 @@ namespace FineUIPro.Web.ProjectData
                 if (buttonList.Contains(BLL.Const.BtnAdd))
                 {
                     this.btnNew.Hidden = false;
-                    this.btnUpdata.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnModify) || buttonList.Contains(BLL.Const.BtnSave))
                 {

SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs

@@ -111,15 +111,6 @@ namespace FineUIPro.Web.ProjectData {
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
         
-        /// <summary>
-        /// btnUpdata 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnUpdata;
-        
         /// <summary>
         /// hdStr 控件。
         /// </summary>

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx

@@ -125,61 +125,7 @@
                    <f:TextBox ID="txtEnglishRemark" runat="server" Label="英文简称" MaxLength="3" Width="300px"></f:TextBox>
                     
                 </Items>
-            </f:FormRow>   
+            </f:FormRow>    
-            <f:FormRow>
-               <Items>
-                   <f:TextBox ID="txtProjectRealCode" runat="server" Label="项目编码" MaxLength="50" 
-                    ></f:TextBox>
-                </Items>
-                <Items>
-                 <f:RadioButtonList runat="server" ID="rbIsCNCECShow" Label="集团展示(穿透页面)" ShowRedStar="true" >
-                     <f:RadioItem  Value="True" Text="是" Selected="true"/>
-                     <f:RadioItem  Value="False" Text="否"/>
-                 </f:RadioButtonList>
-                </Items>
-            </f:FormRow>
-                            <f:FormRow>
-                    <Items>
-                        <f:DropDownBox runat="server" ID="drpMasterBox1" Label="主数据项目"  EmptyText="请从下拉表格中选择项目" DataControlID="Grid1"
-                            EnableMultiSelect="false" MatchFieldWidth="false">
-                            <PopPanel>
-                                <f:Panel ID="Panel7" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true"
-                                    ShowBorder="true" ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-                                    <Items>
-                                        <f:Form ID="Form5" ShowBorder="False" ShowHeader="False" runat="server">
-                                            <Rows>
-                                                <f:FormRow>
-                                                    <Items>
-                                                        <f:TwinTriggerBox Width="200px" runat="server" EmptyText="按项目编号查找" ShowLabel="false" ID="ttbCodeSearch"
-                                                            ShowTrigger1="false" OnTrigger1Click="ttbCodeSearch_Trigger1Click" OnTrigger2Click="ttbCodeSearch_Trigger2Click"
-                                                            Trigger1Icon="Clear" Trigger2Icon="Search">
-                                                        </f:TwinTriggerBox>
-                                                        <f:TwinTriggerBox Width="400px" runat="server" EmptyText="按项目名称查找" ShowLabel="false" ID="ttbNameSearch"
-                                                            ShowTrigger1="false" OnTrigger1Click="ttbNameSearch_Trigger1Click" OnTrigger2Click="ttbNameSearch_Trigger2Click"
-                                                            Trigger1Icon="Clear" Trigger2Icon="Search">
-                                                        </f:TwinTriggerBox>
-                                                    </Items>
-                                                </f:FormRow>
-                                            </Rows>
-                                        </f:Form>
-                                        <f:Grid ID="Grid1" BoxFlex="1" DataKeyNames="SysId" 
-                                            DataIDField="SysId" DataTextField="PrjName" EnableMultiSelect="false"
-                                            PageSize="1000" ShowBorder="true" ShowHeader="false"
-                                            AllowPaging="false" IsDatabasePaging="false" runat="server" EnableCheckBoxSelect="true"
-                                            AllowSorting="false" SortField="PrjName" SortDirection="ASC"
-                                            OnSort="Grid1_Sort">
-                                            <Columns>
-                                                <f:RowNumberField  TextAlign="Center" />
-                                                <f:BoundField Width="200px" DataField="PrjCode" HeaderText="项目编号" />
-                                                <f:BoundField ExpandUnusedSpace="true" MinWidth="400px" DataField="PrjName" HeaderText="项目名称" />
-                                            </Columns>
-                                        </f:Grid>
-                                    </Items>
-                                </f:Panel>
-                            </PopPanel>
-                        </f:DropDownBox>
-                    </Items>
-                </f:FormRow>
         </rows>
         <toolbars>
             <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs

@@ -39,17 +39,12 @@ namespace FineUIPro.Web.ProjectData
                 this.ProjectId = Request.QueryString["ProjectId"];
 
                 UnitService.InitBranchUnitDropDownList(this.drpUnit, true, true);
-                BindGrid();
                 this.drpUnit.SelectedValue = Const.UnitId_SEDIN;
                 if (!String.IsNullOrEmpty(this.ProjectId))
                 {
                     var project = BLL.ProjectService.GetProjectByProjectId(this.ProjectId);
                     if (project != null)
                     {
-                        if (!string.IsNullOrEmpty(project.MasterSysId))
-                        {
-                            this.drpMasterBox1.Value = project.MasterSysId;
-                        }
                         this.txtProjectCode.Text = project.ProjectCode;
                         this.txtProjectName.Text = project.ProjectName;
                         this.txtProjectAddress.Text = project.ProjectAddress;
@@ -105,15 +100,6 @@ namespace FineUIPro.Web.ProjectData
                         }
                         this.txtCity.Text = project.City;
                         this.txtEnglishRemark.Text = project.EnglishRemark;
-                        this.txtProjectRealCode.Text = project.ProjectRealCode;
-                        if (project.IsCNCECShow == true)
-                        {
-                            this.rbIsCNCECShow.SelectedValue = "True";
-                        }
-                        else
-                        {
-                            this.rbIsCNCECShow.SelectedValue = "False";
-                        }
                     }
                 }
                 else
@@ -155,13 +141,7 @@ namespace FineUIPro.Web.ProjectData
                 Country = this.txtCountry.Text.Trim(),
                 City = this.txtCity.Text.Trim(),
                 EnglishRemark = this.txtEnglishRemark.Text.Trim(),
-                ProjectRealCode = this.txtProjectRealCode.Text.Trim(),
-                IsCNCECShow = Convert.ToBoolean(this.rbIsCNCECShow.SelectedValue),
             };
-            if (!string.IsNullOrWhiteSpace(this.drpMasterBox1.Text))
-            {
-                project.MasterSysId = this.drpMasterBox1.Value;
-            }
             if (!string.IsNullOrEmpty(txtStartDate.Text.Trim()))
             {
                 project.StartDate = Funs.GetNewDateTime(this.txtStartDate.Text.Trim());
@@ -304,56 +284,5 @@ namespace FineUIPro.Web.ProjectData
             ///安全经理
             Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpHSSEManager, null, unitId, null, true);
         }
-
-        private void BindGrid()
-        {
-            var list = ProjectService.GetMasterProjectInfos();
-            string code = ttbCodeSearch.Text.Trim();
-            string name = ttbNameSearch.Text.Trim();
-            if (!string.IsNullOrWhiteSpace(code))
-            {
-                list = list.Where(x => x.PrjCode.Contains(code)).ToList();
-            }
-            if (!string.IsNullOrWhiteSpace(name))
-            {
-                list = list.Where(x => x.PrjName.Contains(name)).ToList();
-            }
-
-            // 1.设置总项数（特别注意：数据库分页一定要设置总记录数RecordCount）
-            Grid1.RecordCount = list.Count();
-            // 2.获取当前分页数据
-            DataTable table = Funs.LINQToDataTable(list);
-
-            // 3.绑定到Grid
-            Grid1.DataSource = table;
-            Grid1.DataBind();
-        }
-
-        protected void Grid1_Sort(object sender, GridSortEventArgs e)
-        {
-            BindGrid();
-        }
-        protected void ttbCodeSearch_Trigger1Click(object sender, EventArgs e)
-        {
-            ttbCodeSearch.Text = string.Empty;
-            ttbCodeSearch.ShowTrigger1 = false;
-            BindGrid();
-        }
-        protected void ttbCodeSearch_Trigger2Click(object sender, EventArgs e)
-        {
-            ttbCodeSearch.ShowTrigger1 = true;
-            BindGrid();
-        }
-        protected void ttbNameSearch_Trigger1Click(object sender, EventArgs e)
-        {
-            ttbNameSearch.Text = string.Empty;
-            ttbNameSearch.ShowTrigger1 = false;
-            BindGrid();
-        }
-        protected void ttbNameSearch_Trigger2Click(object sender, EventArgs e)
-        {
-            ttbNameSearch.ShowTrigger1 = true;
-            BindGrid();
-        }
     }
 }

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs

@@ -273,78 +273,6 @@ namespace FineUIPro.Web.ProjectData {
         /// </remarks>
         protected global::FineUIPro.TextBox txtEnglishRemark;
         
-        /// <summary>
-        /// txtProjectRealCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtProjectRealCode;
-        
-        /// <summary>
-        /// rbIsCNCECShow 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.RadioButtonList rbIsCNCECShow;
-        
-        /// <summary>
-        /// drpMasterBox1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownBox drpMasterBox1;
-        
-        /// <summary>
-        /// Panel7 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Panel Panel7;
-        
-        /// <summary>
-        /// Form5 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Form Form5;
-        
-        /// <summary>
-        /// ttbCodeSearch 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TwinTriggerBox ttbCodeSearch;
-        
-        /// <summary>
-        /// ttbNameSearch 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TwinTriggerBox ttbNameSearch;
-        
-        /// <summary>
-        /// Grid1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Grid Grid1;
-        
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>

SGGL/FineUIPro.Web/index.aspx

@@ -189,7 +189,7 @@
                                     </div>
                                 </div>
                                 <div class="sd-header-title js-hiddenTab-item">
-                                    赛鼎施工管理信息平台<f:Button runat="server" CssClass="bgbtn2" EnablePostBack="true" OnClick="btnHome_Click"
+                                    陕西化建施工管理信息平台<f:Button runat="server" CssClass="bgbtn2" EnablePostBack="true" OnClick="btnHome_Click"
                                         EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome" OnClientClick="parent.removeActiveTab();">
                                     </f:Button>
                                 </div>

SGGL/FineUIPro.Web/indexProject.aspx

@@ -213,7 +213,7 @@
                             <div class="sd-header2">
                                 <div class="sd-header2-left">
                                     <div class="sd-cname js-hiddenTab-item">
-                                        赛鼎工程有限公司
+                                        陕西化建工程有限责任公司
                                         <f:Button runat="server" CssClass="bgbtn2" EnablePostBack="true" OnClick="btnHome_Click"
                                             EnableDefaultState="true" EnableDefaultCorner="false" ID="Button21">
                                         </f:Button>

SGGL/FineUIPro.Web/indexProject.aspx.cs

@@ -325,20 +325,23 @@ namespace FineUIPro.Web
 
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]))
                 {
-                    var getp = projectlist.FirstOrDefault(x => x.ProjectId == Request.Params["projectId"]);
+                    if (projectlist != null)
-                    if (getp == null)
                     {
-                        Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(Request.Params["projectId"]);
+                        var getp = projectlist.FirstOrDefault(x => x.ProjectId == Request.Params["projectId"]);
-                        if (project != null)
+                        if (getp == null)
                         {
-                            projectlist.Add(project);
+                            Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(Request.Params["projectId"]);
-                            this.drpProject.Items.Clear();
+                            if (project != null)
-                            this.drpProject.DataSource = projectlist;
+                            {
-                            this.drpProject.DataBind();
+                                projectlist.Add(project);
+                                this.drpProject.Items.Clear();
+                                this.drpProject.DataSource = projectlist;
+                                this.drpProject.DataBind();
+                            }
                         }
-                    }
 
-                    this.drpProject.SelectedValue = Request.Params["projectId"];
+                        this.drpProject.SelectedValue = Request.Params["projectId"];
+                    }
                 }
 
                 // 首次进页面设置消息的数量