lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
高飞 2024-03-07 15:30:48 +08:00
parent 7b9c28bc91
commit 7772c5b682
4 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>false</Use64BitIISExpress>
<IISExpressSSLPort />

47
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
View File

@ -144,20 +144,20 @@ namespace FineUIPro.Web.PZHGL.GJSX
Model.GJSX gjsx = BLL.GJSXService.GetGJSXById(ID);
List<SqlParameter> listStr = new List<SqlParameter>();
string projectId = this.CurrUser.LoginProjectId;
if (gjsx != null)
{
projectId = gjsx.ProjectId;
}
listStr.Add(new SqlParameter("@ProjectId", projectId));
string sql = "and GJSXID='" + ID + "'";
listStr.Add(new SqlParameter("@sql_where", sql));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("Sp_GJSX_getlist", parameter);
//List<SqlParameter> listStr = new List<SqlParameter>();
//string projectId = this.CurrUser.LoginProjectId;
//if (gjsx != null)
//{
// projectId = gjsx.ProjectId;
//}
//listStr.Add(new SqlParameter("@ProjectId", projectId));
//string sql = "and GJSXID='" + ID + "'";
//listStr.Add(new SqlParameter("@sql_where", sql));
//SqlParameter[] parameter = listStr.ToArray();
//DataTable tb = SQLHelper.GetDataTableRunProc("Sp_GJSX_getlist", parameter);
if (tb != null && tb.Rows.Count > 0)
{
//if (tb != null && tb.Rows.Count > 0)
//{
txtGJSXID.Text = gjsx.GJSXID;
DropUnitId.SelectedValue = gjsx.UnitId;
if (!string.IsNullOrEmpty(gjsx.CNProfessional_ID))
@ -181,13 +181,24 @@ namespace FineUIPro.Web.PZHGL.GJSX
DropUser_ReceiveID.SelectedValueArray = list_User_ReceiveID.ToArray();
}
// Date_CloseDate.Text = tb.Rows[0]["CloseDate"].ToString();
txtDetail.Text = tb.Rows[0]["detail"].ToString();
txtUserID.Text = tb.Rows[0]["username"].ToString().Trim();
Date_CreateDate.Text = tb.Rows[0]["createDate"].ToString();
Date_CompleteDate.Text = tb.Rows[0]["CompleteDate"].ToString();
//txtDetail.Text = tb.Rows[0]["detail"].ToString();
//txtUserID.Text = tb.Rows[0]["username"].ToString().Trim();
//Date_CreateDate.Text = tb.Rows[0]["createDate"].ToString();
//Date_CompleteDate.Text = tb.Rows[0]["CompleteDate"].ToString();
txtDetail.Text = gjsx.Detail;
txtUserID.Text = BLL.UserService.GetUserNameByUserId(gjsx.UserID);
if (gjsx.CreateDate != null)
{
Date_CreateDate.Text = string.Format("{0:yyyy-MM-dd}",gjsx.CreateDate);
}
if (gjsx.CompleteDate != null)
{
Date_CompleteDate.Text = string.Format("{0:yyyy-MM-dd}", gjsx.CompleteDate);
}
rblState.SelectedValue = gjsx.State.ToString().Trim();
}
//}
if (this.CurrUser.UserId == BLL.Const.sysglyId || this.CurrUser.UserId == BLL.Const.SystemManager)//如果当前登录人是管理员

2
SGGL/FineUIPro.Web/Web.config
View File

@ -77,7 +77,7 @@
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
</httpHandlers>
<compilation debug="false" targetFramework="4.6.1"/>
<compilation debug="true" targetFramework="4.6.1"/>
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
<authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />