From 89e4a363ec601c1b83990d81d0bb90a3a03962cb Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Wed, 14 Sep 2022 15:50:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91=E4=B8=AA=E4=BA=BA=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2022-09-14.sql | 15 +- .../版本日志/SGGLDB_V2022-09-14修改明细.txt | 5 + .../SGGLDB_V2021-10-29-000删除现场身份证号码为空人员.sql | 0 .../SGGLDB_V2021-10-29-001(公司人员菜单调整).sql | 0 .../SGGLDB_V2021-10-29-002(项目人员菜单调整).sql | 0 .../SGGLDB_V2021-10-29-003人员库表（新增）.sql | 0 .../SGGLDB_V2021-10-29-004项目人员表(删除项目用户表).sql | 0 .../SGGLDB_V2021-10-29-005用户表处理（删除）.sql | 0 .../SGGLDB_V2021-10-29-006人员表相关视图.sql | 0 .../SGGL_SeDin_人员脚本/SGGLDB_V2022-06-29-001索引.sql | 0 .../SGGLDB_V2022-06-30-001（协同办公菜单）.sql | 0 .../SGGLDB_V2022-06-30-001（大数据中心菜单）.sql | 0 .../SGGLDB_V2022-06-30-001（智慧工地菜单）.sql | 0 .../SGGLDB_V2022-06-30-001（综合管理菜单）.sql | 0 .../0-0系统设置（Menu_SysSet）.sql | 13 ++ .../2022-9/637987672456704711_无标题.png | Bin 0 -> 1013 bytes SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs | 4 +- SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx | 58 +++-- .../Personal/PersonalInfo.aspx.cs | 213 ++++++++++++++---- .../Personal/PersonalInfo.aspx.designer.cs | 167 ++++++++------ SGGL/FineUIPro.Web/common/Menu_CQMS.xml | 52 +++-- SGGL/FineUIPro.Web/common/Menu_PZHGL.xml | 11 +- SGGL/FineUIPro.Web/common/Menu_SysSet.xml | 2 + 23 files changed, 374 insertions(+), 166 deletions(-) rename DataBase/{ => 版本日志/已更新脚本}/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-000删除现场身份证号码为空人员.sql (100%) rename DataBase/{ => 版本日志/已更新脚本}/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-001(公司人员菜单调整).sql (100%) rename DataBase/{ => 版本日志/已更新脚本}/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-002(项目人员菜单调整).sql (100%) rename DataBase/{ => 版本日志/已更新脚本}/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-003人员库表（新增）.sql (100%) rename DataBase/{ => 版本日志/已更新脚本}/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-004项目人员表(删除项目用户表).sql (100%) rename DataBase/{ => 版本日志/已更新脚本}/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-005用户表处理（删除）.sql (100%) rename DataBase/{ => 版本日志/已更新脚本}/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-006人员表相关视图.sql (100%) rename DataBase/{ => 版本日志/已更新脚本}/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-29-001索引.sql (100%) rename DataBase/{ => 版本日志/已更新脚本}/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（协同办公菜单）.sql (100%) rename DataBase/{ => 版本日志/已更新脚本}/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（大数据中心菜单）.sql (100%) rename DataBase/{ => 版本日志/已更新脚本}/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（智慧工地菜单）.sql (100%) rename DataBase/{ => 版本日志/已更新脚本}/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（综合管理菜单）.sql (100%) create mode 100644 SGGL/FineUIPro.Web/FileUpload/PersonBaseInfo/2022-9/637987672456704711_无标题.png diff --git a/DataBase/版本日志/SGGLDB_V2022-09-14.sql b/DataBase/版本日志/SGGLDB_V2022-09-14.sql index 8cac6454..908509c9 100644 --- a/DataBase/版本日志/SGGLDB_V2022-09-14.sql +++ b/DataBase/版本日志/SGGLDB_V2022-09-14.sql @@ -4,4 +4,17 @@ GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('9F7C7E64-2743-4CF0-B09E-DDB43444A69A','ר','CQMS/Meeting/SpecialMeetingFile.aspx',32,'390A78F0-43B2-4AF1-81B9-7C216FA7E0A4','Menu_CQMS',0,1,1) -GO \ No newline at end of file +GO + +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('565E9B43-47CF-4C49-906F-539E7DB42A00','ְ','BaseInfo/Position.aspx',60,'5196A6FD-4BF1-46B3-8D24-9A3CE5BB4760','Menu_SysSet',1,1,1) +GO +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('D1B2228D-8D5F-4685-A310-6A3A733A377C','565E9B43-47CF-4C49-906F-539E7DB42A00','',1) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('1A7CBC46-119C-454D-B0FF-B919C4EF4A9D','565E9B43-47CF-4C49-906F-539E7DB42A00','޸',2) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('F1720632-9148-4F53-BCBD-732A05236BDF','565E9B43-47CF-4C49-906F-539E7DB42A00','ɾ',3) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('C96232F6-8D40-42A9-95A0-799BE4AB8754','565E9B43-47CF-4C49-906F-539E7DB42A00','',4) +GO diff --git a/DataBase/版本日志/SGGLDB_V2022-09-14修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-09-14修改明细.txt index 906b910c..e08a1300 100644 --- a/DataBase/版本日志/SGGLDB_V2022-09-14修改明细.txt +++ b/DataBase/版本日志/SGGLDB_V2022-09-14修改明细.txt @@ -1,3 +1,8 @@ --ADD BY gaofei 2022-09-14 1,质量会议增加导出PDF功能 --END + +--ADD BY YangHongwei 2022-09-14 +1、修改个人信息编辑页面，可编辑个人基本信息。 +2、添加职务菜单。 +--END \ No newline at end of file diff --git a/DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-000删除现场身份证号码为空人员.sql b/DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-000删除现场身份证号码为空人员.sql similarity index 100% rename from DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-000删除现场身份证号码为空人员.sql rename to DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-000删除现场身份证号码为空人员.sql diff --git a/DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-001(公司人员菜单调整).sql b/DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-001(公司人员菜单调整).sql similarity index 100% rename from DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-001(公司人员菜单调整).sql rename to DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-001(公司人员菜单调整).sql diff --git a/DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-002(项目人员菜单调整).sql b/DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-002(项目人员菜单调整).sql similarity index 100% rename from DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-002(项目人员菜单调整).sql rename to DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-002(项目人员菜单调整).sql diff --git a/DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-003人员库表（新增）.sql b/DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-003人员库表（新增）.sql similarity index 100% rename from DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-003人员库表（新增）.sql rename to DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-003人员库表（新增）.sql diff --git a/DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-004项目人员表(删除项目用户表).sql b/DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-004项目人员表(删除项目用户表).sql similarity index 100% rename from DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-004项目人员表(删除项目用户表).sql rename to DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-004项目人员表(删除项目用户表).sql diff --git a/DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-005用户表处理（删除）.sql b/DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-005用户表处理（删除）.sql similarity index 100% rename from DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-005用户表处理（删除）.sql rename to DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-005用户表处理（删除）.sql diff --git a/DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-006人员表相关视图.sql b/DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-006人员表相关视图.sql similarity index 100% rename from DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-006人员表相关视图.sql rename to DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2021-10-29-006人员表相关视图.sql diff --git a/DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-29-001索引.sql b/DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-29-001索引.sql similarity index 100% rename from DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-29-001索引.sql rename to DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-29-001索引.sql diff --git a/DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（协同办公菜单）.sql b/DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（协同办公菜单）.sql similarity index 100% rename from DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（协同办公菜单）.sql rename to DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（协同办公菜单）.sql diff --git a/DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（大数据中心菜单）.sql b/DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（大数据中心菜单）.sql similarity index 100% rename from DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（大数据中心菜单）.sql rename to DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（大数据中心菜单）.sql diff --git a/DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（智慧工地菜单）.sql b/DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（智慧工地菜单）.sql similarity index 100% rename from DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（智慧工地菜单）.sql rename to DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（智慧工地菜单）.sql diff --git a/DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（综合管理菜单）.sql b/DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（综合管理菜单）.sql similarity index 100% rename from DataBase/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（综合管理菜单）.sql rename to DataBase/版本日志/已更新脚本/SGGL_SeDin_人员脚本/SGGLDB_V2022-06-30-001（综合管理菜单）.sql diff --git a/DataBase/菜单初始化脚本/0-0系统设置（Menu_SysSet）.sql b/DataBase/菜单初始化脚本/0-0系统设置（Menu_SysSet）.sql index 0a128b9b..8ac6d489 100644 --- a/DataBase/菜单初始化脚本/0-0系统设置（Menu_SysSet）.sql +++ b/DataBase/菜单初始化脚本/0-0系统设置（Menu_SysSet）.sql @@ -113,6 +113,19 @@ GO --INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) --VALUES('145523FE-B49A-4420-9DFB-565A79F4AF36','Աɫ','',60,'5196A6FD-4BF1-46B3-8D24-9A3CE5BB4760','Menu_SysSet',1,1,1) --GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('565E9B43-47CF-4C49-906F-539E7DB42A00','ְ','BaseInfo/Position.aspx',60,'5196A6FD-4BF1-46B3-8D24-9A3CE5BB4760','Menu_SysSet',1,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('D1B2228D-8D5F-4685-A310-6A3A733A377C','565E9B43-47CF-4C49-906F-539E7DB42A00','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('1A7CBC46-119C-454D-B0FF-B919C4EF4A9D','565E9B43-47CF-4C49-906F-539E7DB42A00','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('F1720632-9148-4F53-BCBD-732A05236BDF','565E9B43-47CF-4C49-906F-539E7DB42A00','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('C96232F6-8D40-42A9-95A0-799BE4AB8754','565E9B43-47CF-4C49-906F-539E7DB42A00','',4) + GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('2E424093-81B8-421A-963F-D85D17B1E82A','ְƶ','BaseInfo/PostTitle.aspx',70,'5196A6FD-4BF1-46B3-8D24-9A3CE5BB4760','Menu_SysSet',1,1,1) GO diff --git a/SGGL/FineUIPro.Web/FileUpload/PersonBaseInfo/2022-9/637987672456704711_无标题.png b/SGGL/FineUIPro.Web/FileUpload/PersonBaseInfo/2022-9/637987672456704711_无标题.png new file mode 100644 index 0000000000000000000000000000000000000000..a701b93ae31e3964665aec8bd2554b1aa81e291e GIT binary patch literal 1013 zcmeAS@N?(olHy`uVBq!ia0vp^dx6-Kg9%7J-?kwGNHG=%xjQkeJ16rJ$YDu$^mSxl z*x1kgCy^D%=PdAuEM{PkyavLI5*JUsWnf_L@^o2vlc`IEd0cQDCmX5M`8xqgClfn(<>w)y@kUv?SivES7#Sg_>jP0uH62C4=@{1a#Q zOySLX@cVJkJ=eUVjk@)Zerb0_OYWVgR;Ot4R`t)V0~vy`mwV#0r}~`aEiG(3eNCHFu)>BlX;I>DYL6H{k+8np$y_;{B+boGbG)2Xc0k&1uajv1TQl1=YLlewTfzpZ+eG zmE$GH>P?(>w;x2^i>}dmac`r4_VXL%s~8lk=d!;l7Oz=ts*>6qReod7=hFUq<3LxT z8a{<}JC+o!*y4T1`kdGY4$V0U*)iOnPdS;sUn$$?yPWHV^C2aXd7NwYb>!A=yeRdv zY>r8-{G=`6Pgj5N$*4{In9<9!)uN;@N6M~t{${g7f%j%!c+|4t-zvjBzmECUbN1eQ z;Qs!O?RMetor*bvR-XHJc)u=?*EY#+mcOg~)6G5RY1@XQPQ7|-lWUg_UHog1h{w(eGH_p0p=jYAGcb_yow|@7$i<`Vvzic?z@Al%( zCDAj@g>_5k|C!y{EM)a+i|mS0y@&dC!jJ##dM&BD+G|^_*emCP_KQk)zs5vsS|bqY}U#En`9FCu{_lH(b+{<<6(d+W zxHR0^)A)iTP{K7_=bK(cPfbkshWz9cp}RL`iz&~!t@nO)#g^>T-IJG|7E=~{p!%s= zzopr0AM81Jpcdz literal 0 HcmV?d00001 diff --git a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs index 750f2234..9bdd1563 100644 --- a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs @@ -230,7 +230,7 @@ namespace FineUIPro.Web.Person SynchroSetService.InitCountryDropDownList(this.drpCountryCode, false); this.drpCountryCode.SelectedValue = "101"; CityService.InitCityDropDownList(this.drpProvinceCode, this.drpCountryCode.SelectedValue, true); - PositionService.InitPositionDropDownList(this.drpPosition, true); + DropListService.InitConstRadioButtonList(this.rbPersonType, DropListService.Group_PersonType, "1"); } @@ -483,7 +483,7 @@ namespace FineUIPro.Web.Person IdcardStartDate = Funs.GetNewDateTime(this.txtIdcardStartDate.Text.Trim()), IdcardEndDate = Funs.GetNewDateTime(this.txtIdcardEndDate.Text.Trim()), Telephone = this.txtTelephone.Text.Trim(), - Sex = this.rblSex.SelectedValue ?? "1", + Sex = this.rblSex.SelectedValue, Birthday = Funs.GetNewDateTime(this.txtBirthday.Text.Trim()), IntoDate = Funs.GetNewDateTime(this.txtIntoDate.Text), WorkDate = Funs.GetNewDateTime(this.txtWorkDate.Text), diff --git a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx index 3c17cfa6..834b6b27 100644 --- a/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx +++ b/SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx @@ -34,9 +34,9 @@ - <%-- - --%> + + + @@ -55,13 +55,19 @@ Width="200px" ShowHeader="false"> - - - - + - - + + + + + + + + + + + - + - + - - - - - - - + + + + + + + + CssClass="blockpanel"> - + + + + + + + - +