diff --git a/DataBase/版本日志/SGGLDB_WH_2023-10-31.sql b/DataBase/版本日志/SGGLDB_WH_2023-10-31.sql
new file mode 100644
index 00000000..ca5ab1ea
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2023-10-31.sql
@@ -0,0 +1,17 @@
+--ӳ
+alter table CQMS_Performance add OutDay int null;
+GO
+--ӹ
+alter table CQMS_Performance add Workloads decimal(18, 2) null;
+GO
+--ӹΧ
+alter table CQMS_Performance add WorkRange nvarchar(200) null;
+GO
+--Ӵ
+alter table CQMS_Performance add ScorMan nvarchar(50) null;
+GO
+--Ӳ˵ʩЧ
+insert into sys_menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('F2133BD6-C786-407A-AD6F-3EEF613229A8','ʩЧ','ZHGL/Performance/PerformanceAllData.aspx',150,
+'0','Menu_ZHGL','1','1','1')
+GO
\ No newline at end of file
diff --git a/SGGL/BLL/API/CQMS/Performance/PerformanceService.cs b/SGGL/BLL/API/CQMS/Performance/PerformanceService.cs
index a15c8e23..122af555 100644
--- a/SGGL/BLL/API/CQMS/Performance/PerformanceService.cs
+++ b/SGGL/BLL/API/CQMS/Performance/PerformanceService.cs
@@ -74,6 +74,36 @@ namespace BLL
}
}
+ ///
+ /// 用户下拉框
+ ///
+ /// 下拉框名字
+ /// 项目id
+ /// 是否显示请选择
+ public static void InitUserDropDownListByUser(FineUIPro.DropDownList dropName, string projectId,string userId, bool isShowPlease)
+ {
+ dropName.DataValueField = "CreateMan";
+ dropName.DataTextField = "CreateManName";
+ dropName.DataSource = GetProjectUserListByProjectId(projectId, userId);
+ dropName.DataBind();
+ if (isShowPlease)
+ {
+ Funs.FineUIPleaseSelect(dropName);
+ }
+ }
+
+ public static void InitAllUserDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
+ {
+ dropName.DataValueField = "CreateMan";
+ dropName.DataTextField = "CreateManName";
+ dropName.DataSource = GetProjectAllUserListByProjectId();
+ dropName.DataBind();
+ if (isShowPlease)
+ {
+ Funs.FineUIPleaseSelect(dropName);
+ }
+ }
+
public class PerformanceUser {
public string CreateMan { get; set; }
@@ -94,5 +124,39 @@ namespace BLL
}
}
+ public static List GetProjectUserListByProjectId(string projectId,string userId)
+ {
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+ {
+ var list = (from x in db.CQMS_Performance
+ join y in db.Sys_User on x.CreateMan equals y.UserId
+ where x.ProjectId == projectId && x.States == "1" && x.ScorMan== userId
+ select new PerformanceUser
+ {
+ CreateMan = x.CreateMan,
+ CreateManName = BLL.UserService.GetUserByUserId(x.CreateMan).UserName
+ }).ToList();
+ return list;
+ }
+ }
+
+
+ public static List GetProjectAllUserListByProjectId()
+ {
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+ {
+ var list = (from x in db.CQMS_Performance
+ join y in db.Sys_User on x.CreateMan equals y.UserId
+ where x.States == "1"
+ select new PerformanceUser
+ {
+ CreateMan = x.CreateMan,
+ CreateManName = BLL.UserService.GetUserByUserId(x.CreateMan).UserName
+ }).Distinct().ToList();
+
+ return list;
+ }
+ }
+
}
}
diff --git a/SGGL/FineUIPro.Web/CQMS/Performance/OutDayEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Performance/OutDayEdit.aspx
new file mode 100644
index 00000000..2d9051bc
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Performance/OutDayEdit.aspx
@@ -0,0 +1,48 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OutDayEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Performance.OutDayEdit" %>
+
+
+
+
+
+
+ 修改出差天数
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/CQMS/Performance/OutDayEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Performance/OutDayEdit.aspx.cs
new file mode 100644
index 00000000..053b0703
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Performance/OutDayEdit.aspx.cs
@@ -0,0 +1,48 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.CQMS.Performance
+{
+ public partial class OutDayEdit : PageBase
+ {
+ //主键
+ public string PerformanceGid
+ {
+ get
+ {
+ return (string)ViewState["PerformanceGid"];
+ }
+ set
+ {
+ ViewState["PerformanceGid"] = value;
+ }
+ }
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ //主键
+ PerformanceGid = Request.Params["PerformanceGid"];
+ //根据主键加载主表
+ var pModel = Funs.DB.CQMS_Performance.FirstOrDefault(x => x.PerformanceGid == PerformanceGid);
+ txtOutDay.Text = pModel.OutDay.ToString();
+ txtWorkRange.Text = pModel.WorkRange;
+ }
+ }
+
+ protected void btnEdit_Click(object sender, EventArgs e)
+ {
+ var pModel = Funs.DB.CQMS_Performance.FirstOrDefault(x => x.PerformanceGid == PerformanceGid);
+ pModel.OutDay = Convert.ToInt32(txtOutDay.Text);
+ pModel.WorkRange = txtWorkRange.Text.Trim();
+ Funs.DB.SubmitChanges();
+ ShowNotify("修改成功。", MessageBoxIcon.Success);
+ }
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Performance/OutDayEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Performance/OutDayEdit.aspx.designer.cs
new file mode 100644
index 00000000..4e11b87d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Performance/OutDayEdit.aspx.designer.cs
@@ -0,0 +1,89 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为，如果
+// 重新生成代码，则所做更改将丢失。
+//
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.Performance
+{
+
+
+ public partial class OutDayEdit
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// Window1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window Window1;
+
+ ///
+ /// SimpleForm2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Form SimpleForm2;
+
+ ///
+ /// txtOutDay 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtOutDay;
+
+ ///
+ /// txtWorkRange 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtWorkRange;
+
+ ///
+ /// Toolbar4 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar4;
+
+ ///
+ /// Button2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button Button2;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/Performance/Performance.aspx b/SGGL/FineUIPro.Web/CQMS/Performance/Performance.aspx
index a2040d55..e7d9a82e 100644
--- a/SGGL/FineUIPro.Web/CQMS/Performance/Performance.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Performance/Performance.aspx
@@ -34,6 +34,10 @@
+
+
+
@@ -46,7 +50,7 @@
OnClick="btnWorkPlan">
-
@@ -100,6 +104,13 @@
Title="编辑" EnableIFrame="true" Height="650px"
Width="1200px">
+
+
+
+